1
0
Fork 0
mirror of https://github.com/tailix/kernel.git synced 2025-04-14 17:33:13 -04:00
This commit is contained in:
Braiden Vasco 2017-11-01 12:28:19 +00:00
parent fe3686cc2d
commit 6290d80b25

View file

@ -4,6 +4,8 @@
#include "gdt.h"
#include "idt.h"
static void print_multiboot2_info(unsigned long addr);
void main(unsigned int multiboot_magic, unsigned long multiboot_info)
{
logger_initialize();
@ -13,6 +15,7 @@ void main(unsigned int multiboot_magic, unsigned long multiboot_info)
}
else if (multiboot_magic == KERNELMQ_MULTIBOOT_2_MAGIC) {
logger_info("Loaded with Multiboot-compliant bootloader, specification version 2.");
print_multiboot2_info(multiboot_info);
}
else {
logger_warn("Loaded with no Multiboot-compliant bootloader.");
@ -33,3 +36,121 @@ void main(unsigned int multiboot_magic, unsigned long multiboot_info)
logger_warn("Nothing to do.");
logger_fail("Halt.");
}
#include "console.h"
#define COLUMNS 80
#define LINES 24
#define ATTRIBUTE 7
#define VIDEO 0xB8000
static int xpos;
static int ypos;
static volatile unsigned char *video;
static void itoa(char *buf, int base, int d);
static void printf(const char *format, ...);
void print_multiboot2_info(unsigned long addr)
{
logger_info("Multiboot 2 info:");
}
void itoa(char *buf, int base, int d)
{
char *p = buf;
char *p1, *p2;
unsigned long ud = d;
int divisor = 10;
/*
* If %d is specified and D is minus, put '-' in the head.
* */
if (base == 'd' && d < 0)
{
*p++ = '-';
buf++;
ud = -d;
}
else if (base == 'x')
divisor = 16;
/*
* Divide UD by DIVISOR until UD == 0.
* */
do
{
int remainder = ud % divisor;
*p++ = (remainder < 10) ? remainder + '0' : remainder + 'a' - 10;
}
while (ud /= divisor);
/*
* Terminate BUF.
* */
*p = 0;
/*
* Reverse BUF.
* */
p1 = buf;
p2 = p - 1;
while (p1 < p2)
{
char tmp = *p1;
*p1 = *p2;
*p2 = tmp;
p1++;
p2--;
}
}
void printf(const char *format, ...)
{
char **arg = (char **) &format;
int c;
char buf[20];
arg++;
while ((c = *format++) != 0)
{
if (c != '%')
console_putc(c);
else
{
char *p, *p2;
int pad0 = 0, pad = 0;
c = *format++;
if (c == '0')
{
pad0 = 1;
c = *format++;
}
if (c >= '0' && c <= '9')
{
pad = c - '0';
c = *format++;
}
switch (c)
{
case 'd':
case 'u':
case 'x':
itoa (buf, c, *((int *) arg++));
p = buf;
goto string;
break;
case 's':
p = *arg++;
if (! p)
p = "(null)";
string:
for (p2 = p; *p2; p2++);
for (; p2 < p + pad; p2++)
console_putc(pad0 ? '0' : ' ');
while (*p)
console_putc(*p++);
break;
default:
console_putc(*((int *) arg++));
break;
}
}
}
}