From 7b66b81ee42299ec90b6a7fa41a3b3e499a71f2f Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Fri, 14 Nov 2003 22:23:30 +0000 Subject: [PATCH] Convert a couple of pointers to integers for source compatability with amd64. --- sys/amd64/include/mptable.h | 8 ++++---- sys/i386/include/mptable.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h index 5f58cf68dd9..d56a418a5b5 100644 --- a/sys/amd64/include/mptable.h +++ b/sys/amd64/include/mptable.h @@ -41,7 +41,7 @@ enum busTypes { /* MP Floating Pointer Structure */ typedef struct MPFPS { char signature[4]; - void *pap; + u_int32_t pap; u_char length; u_char spec_rev; u_char checksum; @@ -63,10 +63,10 @@ typedef struct MPCTH { u_char checksum; u_char oem_id[8]; u_char product_id[12]; - void *oem_table_pointer; + u_int32_t oem_table_pointer; u_short oem_table_size; u_short entry_count; - void *apic_address; + u_int32_t apic_address; u_short extended_table_length; u_char extended_table_checksum; u_char reserved; @@ -103,7 +103,7 @@ typedef struct IOAPICENTRY { u_char apic_id; u_char apic_version; u_char apic_flags; - void *apic_address; + u_int32_t apic_address; } *io_apic_entry_ptr; #define IOAPICENTRY_FLAG_EN 0x01 diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h index 5f58cf68dd9..d56a418a5b5 100644 --- a/sys/i386/include/mptable.h +++ b/sys/i386/include/mptable.h @@ -41,7 +41,7 @@ enum busTypes { /* MP Floating Pointer Structure */ typedef struct MPFPS { char signature[4]; - void *pap; + u_int32_t pap; u_char length; u_char spec_rev; u_char checksum; @@ -63,10 +63,10 @@ typedef struct MPCTH { u_char checksum; u_char oem_id[8]; u_char product_id[12]; - void *oem_table_pointer; + u_int32_t oem_table_pointer; u_short oem_table_size; u_short entry_count; - void *apic_address; + u_int32_t apic_address; u_short extended_table_length; u_char extended_table_checksum; u_char reserved; @@ -103,7 +103,7 @@ typedef struct IOAPICENTRY { u_char apic_id; u_char apic_version; u_char apic_flags; - void *apic_address; + u_int32_t apic_address; } *io_apic_entry_ptr; #define IOAPICENTRY_FLAG_EN 0x01