malloc: Rename csm_malloc_preinit() to malloc_csm_preinit()

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

diff --git a/src/fw/csm.c b/src/fw/csm.c
index c837d17e253c441d98ef8f9d02a58ce4018baa2b..7cadd12e5b99cda517fce05a4b9625249db0e129 100644 (file)
--- a/src/fw/csm.c
+++ b/src/fw/csm.c
@@ -10,7 +10,7 @@
 #include "farptr.h" // MAKE_FLATPTR
 #include "hw/pci.h" // pci_probe_devices
 #include "hw/pic.h" // pic_irqmask_read
-#include "malloc.h" // csm_malloc_preinit
+#include "malloc.h" // malloc_csm_preinit
 #include "memmap.h" // SYMBOL
 #include "output.h" // dprintf
 #include "paravirt.h" // qemu_preinit
@@ -95,7 +95,7 @@ handle_csm_0000(struct bregs *regs)
     dprintf(3, "LoPmmMemory     %08x\n", csm_init_table->LowPmmMemory);
     dprintf(3, "LoPmmMemorySize %08x\n", csm_init_table->LowPmmMemorySizeInBytes);
 
-    csm_malloc_preinit(csm_init_table->LowPmmMemory,
+    malloc_csm_preinit(csm_init_table->LowPmmMemory,
                        csm_init_table->LowPmmMemorySizeInBytes,
                        csm_init_table->HiPmmMemory,
                        csm_init_table->HiPmmMemorySizeInBytes);

diff --git a/src/malloc.c b/src/malloc.c
index 5113bb6c4931023a670e5ca1ec003d2b212906c4..3733855caf2c0c25b1eacec4fbbaefa6fdf5c734 100644 (file)
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -451,7 +451,7 @@ malloc_preinit(void)
 }
 
 void
-csm_malloc_preinit(u32 low_pmm, u32 low_pmm_size, u32 hi_pmm, u32 hi_pmm_size)
+malloc_csm_preinit(u32 low_pmm, u32 low_pmm_size, u32 hi_pmm, u32 hi_pmm_size)
 {
     ASSERT32FLAT();
 

diff --git a/src/malloc.h b/src/malloc.h
index f148bfe00034e9bcc0d5f40ad977b9f15fcc3d69..960a7f8000f886c3aee64302f81e0b45df9e7448 100644 (file)
--- a/src/malloc.h
+++ b/src/malloc.h
@@ -9,7 +9,7 @@ u32 rom_get_max(void);
 u32 rom_get_last(void);
 struct rom_header *rom_reserve(u32 size);
 int rom_confirm(u32 size);
-void csm_malloc_preinit(u32 low_pmm, u32 low_pmm_size, u32 hi_pmm,
+void malloc_csm_preinit(u32 low_pmm, u32 low_pmm_size, u32 hi_pmm,
                         u32 hi_pmm_size);
 void malloc_preinit(void);
 extern u32 LegacyRamSize;