Changeset e2ea4ab1 in mainline for kernel/genarch/src/acpi/madt.c

Timestamp:

2010-07-02T14:22:35Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

09b859c

Parents:

4d1be48 (diff), e3ee9b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

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