tailix
/
kernel
mirror of https://github.com/tailix/kernel.git
1
0
Fork 0
Code Releases Activity

tmp

This commit is contained in:
Braiden Vasco 2017-11-01 12:41:32 +00:00
parent 40dd65e007
commit f59f8849ac
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/main.c
View File

@ -14,13 +14,15 @@ void main(unsigned int multiboot_magic, unsigned long multiboot_info)
logger_info("Loaded with Multiboot-compliant bootloader, specification version 1."); logger_info("Loaded with Multiboot-compliant bootloader, specification version 1.");
} }
else if (multiboot_magic == KERNELMQ_MULTIBOOT_2_MAGIC) { else if (multiboot_magic == KERNELMQ_MULTIBOOT_2_MAGIC) {
logger_info("Loaded with Multiboot-compliant bootloader, specification version 2."); //logger_info("Loaded with Multiboot-compliant bootloader, specification version 2.");
print_multiboot2_info(multiboot_info); print_multiboot2_info(multiboot_info);
} }
else { else {
logger_warn("Loaded with no Multiboot-compliant bootloader."); logger_warn("Loaded with no Multiboot-compliant bootloader.");
} }
return;
logger_info("Kernel initialization started."); logger_info("Kernel initialization started.");
gdt_initialize(); gdt_initialize();
@ -53,8 +55,6 @@ void print_multiboot2_info(unsigned long addr)
struct multiboot_tag *tag; struct multiboot_tag *tag;
unsigned size; unsigned size;
logger_info("Multiboot 2 info:");
if (addr & 7) if (addr & 7)
{ {
printf ("Unaligned mbi: 0x%x\n", addr); printf ("Unaligned mbi: 0x%x\n", addr);
@ -84,6 +84,7 @@ void print_multiboot2_info(unsigned long addr)
((struct multiboot_tag_module *) tag)->mod_end, ((struct multiboot_tag_module *) tag)->mod_end,
((struct multiboot_tag_module *) tag)->cmdline); ((struct multiboot_tag_module *) tag)->cmdline);
break; break;
/*
case MULTIBOOT_TAG_TYPE_BASIC_MEMINFO: case MULTIBOOT_TAG_TYPE_BASIC_MEMINFO:
printf ("mem_lower = %uKB, mem_upper = %uKB\n", printf ("mem_lower = %uKB, mem_upper = %uKB\n",
((struct multiboot_tag_basic_meminfo *) tag)->mem_lower, ((struct multiboot_tag_basic_meminfo *) tag)->mem_lower,
@ -193,6 +194,7 @@ void print_multiboot2_info(unsigned long addr)
} }
break; break;
} }
*/
} }
} }
tag = (struct multiboot_tag *) ((multiboot_uint8_t *) tag tag = (struct multiboot_tag *) ((multiboot_uint8_t *) tag