Changes in kernel/genarch/src/acpi/madt.c [99718a2e:fe32163] in mainline

File:

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

kernel/genarch/src/acpi/madt.c

@@ -95 +95 @@
         /*
          * FIXME: The current local APIC driver limits usable
-         * CPU IDs to 8.
+         * APIC IDs to 8.
          *
          */
-        if (i > 7)
+        if (madt_cpu_apic_id(i) > 7)
                 return false;
         
@@ -111 +111 @@
         return ((struct madt_l_apic *)
             madt_entries_index[madt_l_apic_entry_index + i])->apic_id ==
-            bsp_l_apic;
+            l_apic_id();
 }
 
@@ -131 +131 @@
 };
 
-static int madt_cmp(void *a, void *b, void *arg)
-{
-        uint8_t typea = (*((struct madt_apic_header **) a))->type;
-        uint8_t typeb = (*((struct madt_apic_header **) b))->type;
+static int madt_cmp(void *a, void *b)
+{
+        uint8_t typea = ((struct madt_apic_header *) a)->type;
+        uint8_t typeb = ((struct madt_apic_header *) b)->type;
         
         if (typea > typeb)
@@ -147 +147 @@
 static void madt_l_apic_entry(struct madt_l_apic *la, size_t i)
 {
-        if (madt_l_apic_entry_cnt == 0)
+        if (!madt_l_apic_entry_cnt++)
                 madt_l_apic_entry_index = i;
-        
-        madt_l_apic_entry_cnt++;
         
         if (!(la->flags & 0x1)) {
@@ -162 +160 @@
 static void madt_io_apic_entry(struct madt_io_apic *ioa, size_t i)
 {
-        if (madt_io_apic_entry_cnt == 0) {
+        if (!madt_io_apic_entry_cnt++) {
                 /* Remember index of the first io apic entry */
                 madt_io_apic_entry_index = i;
@@ -169 +167 @@
                 /* Currently not supported */
         }
-        
-        madt_io_apic_entry_cnt++;
 }
 
@@ -194 +190 @@
         /* Count MADT entries */
         unsigned int madt_entries_index_cnt = 0;
-        for (hdr = acpi_madt->apic_header; hdr < end;
+        for (hdr = &acpi_madt->apic_header[0]; hdr < end;
             hdr = (struct madt_apic_header *) (((uint8_t *) hdr) + hdr->length))
                 madt_entries_index_cnt++;
@@ -200 +196 @@
         /* Create MADT APIC entries index array */
         madt_entries_index = (struct madt_apic_header **)
-            malloc(madt_entries_index_cnt * sizeof(struct madt_apic_header *),
+            malloc(madt_entries_index_cnt * sizeof(struct madt_apic_header **),
             FRAME_ATOMIC);
         if (!madt_entries_index)
@@ -207 +203 @@
         size_t i = 0;
         
-        for (hdr = acpi_madt->apic_header; hdr < end;
-            hdr = (struct madt_apic_header *) (((uint8_t *) hdr) + hdr->length)) {
-                madt_entries_index[i] = hdr;
-                i++;
-        }
+        for (hdr = &acpi_madt->apic_header[0]; hdr < end;
+            hdr = (struct madt_apic_header *) (((uint8_t *) hdr) + hdr->length))
+                madt_entries_index[i++] = hdr;
         
         /* Sort MADT index structure */
-        if (!gsort(madt_entries_index, madt_entries_index_cnt,
-            sizeof(struct madt_apic_header *), madt_cmp, NULL))
-                panic("Sorting error.");
+        qsort(madt_entries_index, madt_entries_index_cnt, sizeof(uintptr_t),
+            &madt_cmp);
         
         /* Parse MADT entries */