From: Jacob Potter Date: Fri, 19 Sep 2008 20:51:37 +0000 (-0400) Subject: Wkesden in grubload X-Git-Url: http://git.joshuawise.com/netwatch.git/commitdiff_plain/f2da2cd360ec68bd03100e10d5b24daefc97c1ab?ds=sidebyside Wkesden in grubload --- diff --git a/grubload/Makefile b/grubload/Makefile index bc4c1fe..ae3b7a2 100644 --- a/grubload/Makefile +++ b/grubload/Makefile @@ -1,6 +1,6 @@ OBJS=multiboot_c.o multiboot_asm.o realmode.o loader.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o ../ich2/smram-ich2.o ../ich2/smi.o CC=gcc -CFLAGS=-nostdlib -I../include -I../include/raw -I. -D__RAW__ -fno-builtin -nostdinc +CFLAGS=-nostdlib -I../include -I../include/raw -I. -D__RAW__ -fno-builtin -nostdinc -Wall -Werror -pedantic -std=gnu99 all: multiboot diff --git a/grubload/multiboot_c.c b/grubload/multiboot_c.c index e4843c3..be11ab1 100644 --- a/grubload/multiboot_c.c +++ b/grubload/multiboot_c.c @@ -1,9 +1,12 @@ #include "console.h" +#include "loader.h" + #include #include #include #include #include +#include #define INFO_SIGNATURE 0x5754454E @@ -23,14 +26,14 @@ void panic(const char *msg) puts("PANIC: "); puts(msg); puts("\nSystem halted\n"); - while(1) asm("hlt"); + while(1) { __asm__("hlt"); } } void c_start(unsigned int magic, struct mb_info *mbinfo) { struct mod_info *mods = mbinfo->mods; - unsigned short *grubptr = (unsigned short *)0x7CFE; - unsigned char smramc; + smram_state_t old_smramc; + struct info_section * info; int i; void (*realmode)() = (void (*)()) 0x4000; @@ -44,8 +47,8 @@ void c_start(unsigned int magic, struct mb_info *mbinfo) for (i = 0; i < mbinfo->mod_cnt; i++) { puts("Module found:\n"); - puts(" Start: "); puthex(mods[i].mod_start); puts("\n"); - puts(" Size: "); puthex(mods[i].mod_end - mods[i].mod_start); puts("\n"); + puts(" Start: "); puthex((unsigned long) mods[i].mod_start); puts("\n"); + puts(" Size: "); puthex((unsigned long)mods[i].mod_end - (unsigned long)mods[i].mod_start); puts("\n"); puts(" Name: "); puts(mods[i].mod_string); puts("\n"); } @@ -65,14 +68,14 @@ void c_start(unsigned int magic, struct mb_info *mbinfo) pci_write16(0, 31, 4, 0xC0, 0); /* Open the SMRAM aperture and load our ELF. */ - smram_state_t old_smramc = smram_save_state(); + old_smramc = smram_save_state(); if (smram_aseg_set_state(SMRAM_ASEG_OPEN) != 0) panic("Opening SMRAM failed; cannot load ELF."); - load_elf(mods[0].mod_start, mods[0].mod_end - mods[0].mod_start); + load_elf(mods[0].mod_start, (unsigned long)mods[0].mod_end - (unsigned long)mods[0].mod_start); - struct info_section * info = (struct info_section *)0x10000; + info = (struct info_section *)0x10000; if (info->signature != INFO_SIGNATURE) { smram_restore_state(old_smramc); /* Restore so that video ram is touchable again. */ @@ -92,6 +95,6 @@ void c_start(unsigned int magic, struct mb_info *mbinfo) puts("\n"); puts("Now returning to real mode.\n"); - memcpy(0x4000, _binary_realmode_bin_start, (int)&_binary_realmode_bin_size); + memcpy((void *)0x4000, _binary_realmode_bin_start, (int)&_binary_realmode_bin_size); realmode(); // goodbye! } diff --git a/include/minilib.h b/include/minilib.h index 747b2aa..b583046 100644 --- a/include/minilib.h +++ b/include/minilib.h @@ -1,9 +1,13 @@ #ifndef MINILIB_H #define MINILIB_H +void memcpy(void *dest, void *src, int bytes); void memmove(void *dest, void *src, int bytes); int strcmp(const char *a2, const char *a1); void strcpy(char *a2, const char *a1); void tohex(char *s, unsigned long l); +void puts(const char *c); +void puthex(unsigned long l); + #endif diff --git a/lib/minilib.c b/lib/minilib.c index 232878b..1ef4731 100644 --- a/lib/minilib.c +++ b/lib/minilib.c @@ -43,7 +43,7 @@ int strcmp (const char *a2, const char *a1) { } } -int strlen(char *c) +int strlen(const char *c) { int l = 0; while (*(c++)) @@ -58,7 +58,7 @@ void strcpy(char *a2, const char *a1) } while (*(a1++)); } -void puts(char *c) +void puts(const char *c) { putbytes(c, strlen(c)); }