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

Timestamp:

2010-06-30T20:42:42Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

873c681

Parents:

50f4b95

Message:

improve code readability

File:

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

kernel/genarch/src/acpi/madt.c

@@ -111 +111 @@
         return ((struct madt_l_apic *)
             madt_entries_index[madt_l_apic_entry_index + i])->apic_id ==
-            l_apic_id();
+            bsp_l_apic;
 }
 
@@ -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 */