Changeset 99718a2e in mainline

Timestamp:

2010-06-30T20:42:42Z (14 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

Location:

kernel

Files:

• arch/ia32/include/smp/apic.h (modified) (2 diffs)
• arch/ia32/src/smp/apic.c (modified) (4 diffs)
• arch/ia32/src/smp/smp.c (modified) (2 diffs)
• genarch/src/acpi/madt.c (modified) (7 diffs)

kernel/arch/ia32/include/smp/apic.h

@@ -347 +347 @@
 
 extern uint32_t apic_id_mask;
+extern uint8_t bsp_l_apic;
 
 extern void apic_init(void);
@@ -355 +356 @@
 extern int l_apic_send_init_ipi(uint8_t);
 extern void l_apic_debug(void);
-extern uint8_t l_apic_id(void);
 
 extern uint32_t io_apic_read(uint8_t);

kernel/arch/ia32/src/smp/apic.c

@@ -76 +76 @@
 
 uint32_t apic_id_mask = 0;
+uint8_t bsp_l_apic = 0;
+
 static irq_t l_apic_timer_irq;
 
@@ -154 +156 @@
 }
 
+/** Get Local APIC ID.
+ *
+ * @return Local APIC ID.
+ *
+ */
+static uint8_t l_apic_id(void)
+{
+        l_apic_id_t idreg;
+        
+        idreg.value = l_apic[L_APIC_ID];
+        return idreg.apic_id;
+}
+
 /** Initialize APIC on BSP. */
 void apic_init(void)
@@ -208 +223 @@
         l_apic_init();
         l_apic_debug();
+        
+        bsp_l_apic = l_apic_id();
 }
 
@@ -460 +477 @@
 {
 #ifdef LAPIC_VERBOSE
-        printf("LVT on cpu%" PRIs ", LAPIC ID: %" PRIu8 "\n", CPU->id, l_apic_id());
+        printf("LVT on cpu%" PRIs ", LAPIC ID: %" PRIu8 "\n",
+            CPU->id, l_apic_id());
         
         lvt_tm_t tm;
         tm.value = l_apic[LVT_Tm];
-        printf("LVT Tm: vector=%hhd, %s, %s, %s\n", tm.vector, delivs_str[tm.delivs], mask_str[tm.masked], tm_mode_str[tm.mode]);
+        printf("LVT Tm: vector=%" PRIu8 ", %s, %s, %s\n",
+            tm.vector, delivs_str[tm.delivs], mask_str[tm.masked],
+            tm_mode_str[tm.mode]);
         
         lvt_lint_t lint;
         lint.value = l_apic[LVT_LINT0];
-        printf("LVT LINT0: vector=%hhd, %s, %s, %s, irr=%d, %s, %s\n", tm.vector, delmod_str[lint.delmod], delivs_str[lint.delivs], intpol_str[lint.intpol], lint.irr, trigmod_str[lint.trigger_mode], mask_str[lint.masked]);
-        lint.value = l_apic[LVT_LINT1]; 
-        printf("LVT LINT1: vector=%hhd, %s, %s, %s, irr=%d, %s, %s\n", tm.vector, delmod_str[lint.delmod], delivs_str[lint.delivs], intpol_str[lint.intpol], lint.irr, trigmod_str[lint.trigger_mode], mask_str[lint.masked]);  
+        printf("LVT LINT0: vector=%" PRIu8 ", %s, %s, %s, irr=%u, %s, %s\n",
+            tm.vector, delmod_str[lint.delmod], delivs_str[lint.delivs],
+            intpol_str[lint.intpol], lint.irr, trigmod_str[lint.trigger_mode],
+            mask_str[lint.masked]);
+        
+        lint.value = l_apic[LVT_LINT1];
+        printf("LVT LINT1: vector=%" PRIu8 ", %s, %s, %s, irr=%u, %s, %s\n",
+            tm.vector, delmod_str[lint.delmod], delivs_str[lint.delivs],
+            intpol_str[lint.intpol], lint.irr, trigmod_str[lint.trigger_mode],
+            mask_str[lint.masked]);
         
         lvt_error_t error;
         error.value = l_apic[LVT_Err];
-        printf("LVT Err: vector=%hhd, %s, %s\n", error.vector, delivs_str[error.delivs], mask_str[error.masked]);
+        printf("LVT Err: vector=%" PRIu8 ", %s, %s\n", error.vector,
+            delivs_str[error.delivs], mask_str[error.masked]);
 #endif
-}
-
-/** Get Local APIC ID.
- *
- * @return Local APIC ID.
- *
- */
-uint8_t l_apic_id(void)
-{
-        l_apic_id_t idreg;
-        
-        idreg.value = l_apic[L_APIC_ID];
-        return idreg.apic_id;
 }
 

kernel/arch/ia32/src/smp/smp.c

@@ -113 +113 @@
         apic_init();
         
-        uint8_t apic = l_apic_id();
-        
         for (i = 0; i < config.cpu_count; i++) {
                 /*
@@ -128 +126 @@
                         continue;
                 
-                if (ops->cpu_apic_id(i) == apic) {
-                        printf("%s: bad processor entry #%u, will not send IPI "
-                            "to myself\n", __FUNCTION__, i);
+                if (ops->cpu_apic_id(i) == bsp_l_apic) {
+                        printf("kmp: bad processor entry #%u, will not send IPI "
+                            "to myself\n", i);
                         continue;
                 }

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 */