Moved multiboot structs to kmultiboot.h
This commit is contained in:
parent
8734cd4da6
commit
745cf9045c
2 changed files with 23 additions and 11 deletions
21
include/kmultiboot.h
Normal file
21
include/kmultiboot.h
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
#ifndef KMULTIBOOT_H
|
||||||
|
#define KMULTIBOOT_H
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
uint32_t flags;
|
||||||
|
uint32_t mem_lower;
|
||||||
|
uint32_t mem_upper;
|
||||||
|
uint32_t boot_device;
|
||||||
|
uint32_t cmdline;
|
||||||
|
uint32_t mods_count;
|
||||||
|
uint32_t mods_addr;
|
||||||
|
} multiboot_info_t;
|
||||||
|
|
||||||
|
typedef struct multiboot_mmap_entry {
|
||||||
|
uint32_t ssize; //size of the entry
|
||||||
|
uint64_t addr; //physical location of memory
|
||||||
|
uint64_t msize;
|
||||||
|
uint32_t type;
|
||||||
|
} __attribute__((packed));
|
||||||
|
|
||||||
|
#endif
|
||||||
11
src/main.c
11
src/main.c
|
|
@ -3,16 +3,7 @@
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "kio.h"
|
#include "kio.h"
|
||||||
#include "kttools.h"
|
#include "kttools.h"
|
||||||
|
#include "kmultiboot.h"
|
||||||
typedef struct {
|
|
||||||
uint32_t flags;
|
|
||||||
uint32_t mem_lower;
|
|
||||||
uint32_t mem_upper;
|
|
||||||
uint32_t boot_device;
|
|
||||||
uint32_t cmdline;
|
|
||||||
uint32_t mods_count;
|
|
||||||
uint32_t mods_addr;
|
|
||||||
} multiboot_info_t;
|
|
||||||
|
|
||||||
//finally, main.
|
//finally, main.
|
||||||
void kern_main(uint32_t multiboot_magic, multiboot_info_t* multiboot_info)
|
void kern_main(uint32_t multiboot_magic, multiboot_info_t* multiboot_info)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue