Minor - change checksum functions to take a (void *).

This reduces the casts in calling code.

diff --git a/src/acpi.c b/src/acpi.c
index 17b0a922693f8c4ec2e99602a2c6cd2d82f7ae78..79276a27b1f812474b566e5907e5a256abaa8556 100644 (file)
--- a/src/acpi.c
+++ b/src/acpi.c
@@ -236,7 +236,7 @@ static void acpi_build_table_header(struct acpi_table_header *h,
     memcpy(h->oem_table_id + 4, (void*)&sig, 4);
     h->oem_revision = cpu_to_le32(1);
     h->asl_compiler_revision = cpu_to_le32(1);
-    h->checksum = -checksum((void *)h, len);
+    h->checksum = -checksum(h, len);
 }
 
 #define SSDT_SIGNATURE 0x54445353// SSDT
@@ -369,7 +369,7 @@ void acpi_bios_init(void)
     rsdp->signature = RSDP_SIGNATURE;
     memcpy(rsdp->oem_id, CONFIG_APPNAME6, 6);
     rsdp->rsdt_physical_address = cpu_to_le32(rsdt_addr);
-    rsdp->checksum = -checksum((void *)rsdp, 20);
+    rsdp->checksum = -checksum(rsdp, 20);
     RsdpAddr = rsdp;
 
     /* RSDT */

diff --git a/src/ata.c b/src/ata.c
index a28332857560865345958e197b923d623e9ba256..5eefd320ea3a0fda43d7ca71dbc3937d29dc46b3 100644 (file)
--- a/src/ata.c
+++ b/src/ata.c
@@ -911,7 +911,7 @@ fill_fdpt(int driveid)
     fdpt->a0h_signature = 0xa0;
 
     // Checksum structure.
-    u8 sum = checksum((u8*)fdpt, sizeof(*fdpt)-1);
+    u8 sum = checksum(fdpt, sizeof(*fdpt)-1);
     fdpt->checksum = -sum;
 }
 

diff --git a/src/optionroms.c b/src/optionroms.c
index 14d84d2cebf949da7aa55dfa17cc4dcecef6cb8c..e750bbb6f4214dd03b8930814319e508657f10f1 100644 (file)
--- a/src/optionroms.c
+++ b/src/optionroms.c
@@ -114,7 +114,7 @@ is_valid_rom(struct rom_header *rom)
     if (rom->signature != OPTION_ROM_SIGNATURE)
         return 0;
     u32 len = rom->size * 512;
-    u8 sum = checksum((void*)rom, len);
+    u8 sum = checksum(rom, len);
     if (sum != 0) {
         dprintf(1, "Found option rom with bad checksum: loc=%p len=%d sum=%x\n"
                 , rom, len, sum);

diff --git a/src/pirtable.c b/src/pirtable.c
index ad5cf272ca8cbb7284a2272a893e44068d5cc757..777a94bb402f05e36cd1d23bb352e70ad28ade93 100644 (file)
--- a/src/pirtable.c
+++ b/src/pirtable.c
@@ -100,6 +100,6 @@ create_pirtable()
     dprintf(3, "init PIR table\n");
 
     PIR_TABLE.pir.signature = PIR_SIGNATURE;
-    PIR_TABLE.pir.checksum = -checksum((u8*)&PIR_TABLE, sizeof(PIR_TABLE));
+    PIR_TABLE.pir.checksum = -checksum(&PIR_TABLE, sizeof(PIR_TABLE));
     PirOffset = (u32)&PIR_TABLE.pir - BUILD_BIOS_ADDR;
 }

diff --git a/src/pnpbios.c b/src/pnpbios.c
index 4c512b68d883e48155858fa602120c1507f20ee5..b07b5857cbfc5f2e1f1e27e04d85177c0e755e85 100644 (file)
--- a/src/pnpbios.c
+++ b/src/pnpbios.c
@@ -99,5 +99,5 @@ pnp_setup()
 
     PNPHEADER.real_ip = (u32)entry_pnp_real - BUILD_BIOS_ADDR;
     PNPHEADER.prot_ip = (u32)entry_pnp_prot - BUILD_BIOS_ADDR;
-    PNPHEADER.checksum = -checksum((u8*)&PNPHEADER, sizeof(PNPHEADER));
+    PNPHEADER.checksum = -checksum(&PNPHEADER, sizeof(PNPHEADER));
 }

diff --git a/src/util.c b/src/util.c
index 2c543a4220abad3d2db87a9476e8729cd78b0fe8..2c925fed1c51eab2181cb2f1fdf13a52af50e003 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -101,18 +101,18 @@ stack_hop(u32 eax, u32 edx, u32 ecx, void *func)
 
 // Sum the bytes in the specified area.
 u8
-checksum_far(u16 buf_seg, u8 *buf_far, u32 len)
+checksum_far(u16 buf_seg, void *buf_far, u32 len)
 {
     SET_SEG(ES, buf_seg);
     u32 i;
     u8 sum = 0;
     for (i=0; i<len; i++)
-        sum += GET_VAR(ES, buf_far[i]);
+        sum += GET_VAR(ES, ((u8*)buf_far)[i]);
     return sum;
 }
 
 u8
-checksum(u8 *buf, u32 len)
+checksum(void *buf, u32 len)
 {
     return checksum_far(GET_SEG(SS), buf, len);
 }

diff --git a/src/util.h b/src/util.h
index 0c90f498529560f31187c4d1100ad837b22f9c21..3a6347d4244cb0bb6a48794bde9499ec01743770 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -67,8 +67,8 @@ static inline u64 rdtscll(void)
 
 // util.c
 inline u32 stack_hop(u32 eax, u32 edx, u32 ecx, void *func);
-u8 checksum_far(u16 buf_seg, u8 *buf_far, u32 len);
-u8 checksum(u8 *buf, u32 len);
+u8 checksum_far(u16 buf_seg, void *buf_far, u32 len);
+u8 checksum(void *buf, u32 len);
 void *memset(void *s, int c, size_t n);
 void *memcpy(void *d1, const void *s1, size_t len);
 inline void memcpy_far(u16 d_seg, void *d_far