Revert "Unify ps2 port data processing."

[seabios.git] / src / pmm.c

diff --git a/src/pmm.c b/src/pmm.c
index d05cc6fe54acf970efed762a0ca92950a4c6be5c..0461e4139eb810688531c490f91cc931209568f1 100644 (file)
--- a/src/pmm.c
+++ b/src/pmm.c
@@ -150,7 +150,7 @@ zone_free(void *data, u32 olddata)
 
 // Report the status of all the zones.
 static void
-dumpZones()
+dumpZones(void)
 {
     int i;
     for (i=0; i<ARRAY_SIZE(Zones); i++) {
@@ -282,7 +282,7 @@ pmm_find(u32 handle)
 }
 
 void
-malloc_setup()
+malloc_setup(void)
 {
     ASSERT32FLAT();
     dprintf(3, "malloc setup\n");
@@ -290,10 +290,11 @@ malloc_setup()
     PMMAllocs = NULL;
 
     // Memory in 0xf0000 area.
-    extern u8 code32_start[];
-    if ((u32)code32_start > BUILD_BIOS_ADDR)
+    extern u8 code32flat_start[];
+    if ((u32)code32flat_start > BUILD_BIOS_ADDR)
         // Clear unused parts of f-segment
-        memset((void*)BUILD_BIOS_ADDR, 0, (u32)code32_start - BUILD_BIOS_ADDR);
+        memset((void*)BUILD_BIOS_ADDR, 0
+               , (u32)code32flat_start - BUILD_BIOS_ADDR);
     memset(BiosTableSpace, 0, CONFIG_MAX_BIOSTABLE);
     ZoneFSeg.bottom = (u32)BiosTableSpace;
     ZoneFSeg.top = ZoneFSeg.cur = ZoneFSeg.bottom + CONFIG_MAX_BIOSTABLE;
@@ -326,7 +327,7 @@ malloc_setup()
 }
 
 void
-malloc_finalize()
+malloc_finalize(void)
 {
     dprintf(3, "malloc finalize\n");
 
@@ -481,10 +482,10 @@ handle_pmm(u16 *args)
 }
 
 // romlayout.S
-extern void entry_pmm();
+extern void entry_pmm(void);
 
 void
-pmm_setup()
+pmm_setup(void)
 {
     if (! CONFIG_PMM)
         return;
@@ -497,7 +498,7 @@ pmm_setup()
 }
 
 void
-pmm_finalize()
+pmm_finalize(void)
 {
     if (! CONFIG_PMM)
         return;