merge

diff --git a/grubload/Makefile b/grubload/Makefile
index bc4c1fe77ea1acde3845739c08019dbf52ea9790..ae3b7a2aa2877f7166c73ca944002ce5a78f312e 100644 (file)
--- 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 e4843c36da97e8b23e2a55521a21fb098b523dd5..be11ab14c4314bb2f17d3122987073230987bf46 100644 (file)
--- a/grubload/multiboot_c.c
+++ b/grubload/multiboot_c.c
@@ -1,9 +1,12 @@
 #include "console.h"
+#include "loader.h"
+
 #include <minilib.h>
 #include <io.h>
 #include <smram.h>
 #include <multiboot.h>
 #include <smi.h>
+#include <pci.h>
 
 #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 0f5edff26ca37725b4f72321860cb03e159882ac..aa8bf7364d16220e854c019518178fd0479060b0 100644 (file)
--- a/include/minilib.h
+++ b/include/minilib.h
@@ -7,9 +7,9 @@ extern void memcpy(void *dest, void *src, int bytes);
 extern void memmove(void *dest, void *src, int bytes);
 extern int memcmp(const char *a2, const char *a1, int bytes);
 extern int strcmp(const char *a2, const char *a1);
-extern int strlen(char *c);
+extern int strlen(const char *c);
 extern void strcpy(char *a2, const char *a1);
-extern void puts(char *c);
+extern void puts(const char *c);
 extern void tohex(char *s, unsigned long l);
 extern void puthex(unsigned long l);
 extern int vsprintf(char *s, const char *fmt, va_list args);

diff --git a/lib/minilib.c b/lib/minilib.c
index 595341e192a18fa981bbeebe03eef3abd1954700..7baca595ed4c62fa3ff0d09d1c8bbcaf1c0815d6 100644 (file)
--- 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));
 }