Changeset 7f1c620 in mainline for genarch/src/acpi/madt.c

Timestamp:

2006-07-04T17:17:56Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0ffa3ef5

Parents:

991779c5

Message:

Replace old u?? types with respective C99 variants (e.g. uint32_t, int64_t, uintptr_t etc.).

File:

• genarch/src/acpi/madt.c (modified) (8 diffs)

genarch/src/acpi/madt.c

@@ -56 +56 @@
 int isa_irq_map[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
 
-static void madt_l_apic_entry(struct madt_l_apic *la, __u32 index);
-static void madt_io_apic_entry(struct madt_io_apic *ioa, __u32 index);
-static void madt_intr_src_ovrd_entry(struct madt_intr_src_ovrd *override, __u32 index);
+static void madt_l_apic_entry(struct madt_l_apic *la, uint32_t index);
+static void madt_io_apic_entry(struct madt_io_apic *ioa, uint32_t index);
+static void madt_intr_src_ovrd_entry(struct madt_intr_src_ovrd *override, uint32_t index);
 static int madt_cmp(void * a, void * b);
 
@@ -91 +91 @@
 static bool madt_cpu_enabled(index_t i);
 static bool madt_cpu_bootstrap(index_t i);
-static __u8 madt_cpu_apic_id(index_t i);
+static uint8_t madt_cpu_apic_id(index_t i);
 static int madt_irq_to_pin(int irq);
 
@@ -120 +120 @@
 }
 
-__u8 madt_cpu_apic_id(index_t i)
+uint8_t madt_cpu_apic_id(index_t i)
 {
         ASSERT(i < madt_l_apic_entry_cnt);
@@ -142 +142 @@
 void acpi_madt_parse(void)
 {
-        struct madt_apic_header *end = (struct madt_apic_header *) (((__u8 *) acpi_madt) + acpi_madt->header.length);
+        struct madt_apic_header *end = (struct madt_apic_header *) (((uint8_t *) acpi_madt) + acpi_madt->header.length);
         struct madt_apic_header *h;
         
-        l_apic = (__u32 *) (__native) acpi_madt->l_apic_address;
+        l_apic = (uint32_t *) (unative_t) acpi_madt->l_apic_address;
 
         /* calculate madt entries */
-        for (h = &acpi_madt->apic_header[0]; h < end; h = (struct madt_apic_header *) (((__u8 *) h) + h->length)) {
+        for (h = &acpi_madt->apic_header[0]; h < end; h = (struct madt_apic_header *) (((uint8_t *) h) + h->length)) {
                 madt_entries_index_cnt++;
         }
@@ -157 +157 @@
                 panic("Memory allocation error.");
 
-        __u32 index = 0;
-
-        for (h = &acpi_madt->apic_header[0]; h < end; h = (struct madt_apic_header *) (((__u8 *) h) + h->length)) {
+        uint32_t index = 0;
+
+        for (h = &acpi_madt->apic_header[0]; h < end; h = (struct madt_apic_header *) (((uint8_t *) h) + h->length)) {
                 madt_entries_index[index++] = h;
         }
 
         /* Quicksort MADT index structure */
-        qsort(madt_entries_index, madt_entries_index_cnt, sizeof(__address), &madt_cmp);
+        qsort(madt_entries_index, madt_entries_index_cnt, sizeof(uintptr_t), &madt_cmp);
 
         /* Parse MADT entries */        
@@ -207 +207 @@
  
 
-void madt_l_apic_entry(struct madt_l_apic *la, __u32 index)
+void madt_l_apic_entry(struct madt_l_apic *la, uint32_t index)
 {
         if (!madt_l_apic_entry_cnt++) {
@@ -222 +222 @@
 }
 
-void madt_io_apic_entry(struct madt_io_apic *ioa, __u32 index)
+void madt_io_apic_entry(struct madt_io_apic *ioa, uint32_t index)
 {
         if (!madt_io_apic_entry_cnt++) {
                 /* remember index of the first io apic entry */
                 madt_io_apic_entry_index = index;
-                io_apic = (__u32 *) (__native) ioa->io_apic_address;
+                io_apic = (uint32_t *) (unative_t) ioa->io_apic_address;
         } else {
                 /* currently not supported */
@@ -234 +234 @@
 }
 
-void madt_intr_src_ovrd_entry(struct madt_intr_src_ovrd *override, __u32 index)
+void madt_intr_src_ovrd_entry(struct madt_intr_src_ovrd *override, uint32_t index)
 {
         ASSERT(override->source < sizeof(isa_irq_map)/sizeof(int));