thomas/mittos64
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up interface

Browse Source
This commit is contained in:
Thomas Lovén 2018-02-15 09:26:07 +01:00
parent 79ca4681ff
commit e4e891bb86
3 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/kernel/boot/multiboot.c
View File

@ -4,11 +4,25 @@
#define MBOOT_REPLY 0x36D76289 #define MBOOT_REPLY 0x36D76289
struct taglist{
uint32_t total_size;
uint32_t reserved;
}__attribute__((packed));
struct tag {
uint32_t type;
uint32_t size;
uint8_t data[];
}__attribute__((packed));
#define MBOOT2_COMMANDLINE 1
#define MBOOT2_BOOTLOADER 2
struct kernel_boot_data_st kernel_boot_data; struct kernel_boot_data_st kernel_boot_data;
int parse_multiboot2(struct mboot2_taglist *tags) int parse_multiboot2(struct taglist *tags)
{ {
struct mboot2_tag *tag = incptr(tags, sizeof(struct mboot2_taglist)); struct tag *tag = incptr(tags, sizeof(struct taglist));
while(tag->type) while(tag->type)
{ {
switch(tag->type) switch(tag->type)

3
src/kernel/boot/multiboot.tt
View File

@ -1,9 +1,6 @@
// vim: ft=c // vim: ft=c
#include <ttest.h> #include <ttest.h>
#include <debug.h>
#undef debug
#define debug(...)
#include "multiboot.c" #include "multiboot.c"
#include <string.h> #include <string.h>

15
src/kernel/include/multiboot.h
View File

@ -7,19 +7,6 @@ struct kernel_boot_data_st
char *commandline; char *commandline;
}; };
struct kernel_boot_data_st kernel_boot_data; extern struct kernel_boot_data_st kernel_boot_data;
struct mboot2_taglist{
uint32_t total_size;
uint32_t reserved;
}__attribute__((packed));
struct mboot2_tag {
uint32_t type;
uint32_t size;
uint8_t data[];
}__attribute__((packed));
#define MBOOT2_COMMANDLINE 1
#define MBOOT2_BOOTLOADER 2
int multiboot_init(uint64_t magic, void *mboot_info); int multiboot_init(uint64_t magic, void *mboot_info);