Changeset a35b458 in mainline for kernel/arch/ia32/src/smp/mps.c

Timestamp:

2018-03-02T20:10:49Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:

• kernel/arch/ia32/src/smp/mps.c (modified) (27 diffs)

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

@@ -75 +75 @@
 {
         assert(i < processor_entry_cnt);
-        
+
         return processor_entries[i].l_apic_id;
 }
@@ -82 +82 @@
 {
         assert(i < processor_entry_cnt);
-        
+
         /*
          * FIXME: The current local APIC driver limits usable
@@ -90 +90 @@
         if (i > 7)
                 return false;
-        
+
         return ((processor_entries[i].cpu_flags & 0x01) == 0x01);
 }
@@ -97 +97 @@
 {
         assert(i < processor_entry_cnt);
-        
+
         return ((processor_entries[i].cpu_flags & 0x02) == 0x02);
 }
@@ -104 +104 @@
 {
         size_t i;
-        
+
         for (i = 0; i < io_intr_entry_cnt; i++) {
                 if (io_intr_entries[i].src_bus_irq == irq &&
@@ -110 +110 @@
                         return io_intr_entries[i].dst_io_apic_pin;
         }
-        
+
         return -1;
 }
@@ -131 +131 @@
         unsigned int i;
         uint8_t sum;
-        
+
         for (i = 0, sum = 0; i < 16; i++)
                 sum = (uint8_t) (sum + base[i]);
-        
+
         return (sum == 0);
 }
@@ -147 +147 @@
         uint8_t sum;
         uint16_t i;
-        
+
         /* Compute the checksum for the base table */
         for (i = 0, sum = 0; i < ct->base_table_length; i++)
                 sum = (uint8_t) (sum + base[i]);
-        
+
         if (sum)
                 return false;
-        
+
         /* Compute the checksum for the extended table */
         for (i = 0, sum = 0; i < ct->ext_table_length; i++)
                 sum = (uint8_t) (sum + ext[i]);
-        
+
         return (sum == ct->ext_table_checksum);
 }
@@ -169 +169 @@
         if ((pr->cpu_flags & (1 << 0)) == 0)
                 return;
-        
+
         apic_id_mask |= (1 << pr->l_apic_id);
 }
@@ -177 +177 @@
 #ifdef MPSCT_VERBOSE
         char buf[7];
-        
+
         memcpy((void *) buf, (void *) bus->bus_type, 6);
         buf[6] = 0;
-        
+
         log(LF_ARCH, LVL_DEBUG, "MPS: bus=%" PRIu8 " (%s)", bus->bus_id, buf);
 #endif
@@ -190 +190 @@
         if ((ioa->io_apic_flags & 1) == 0)
                 return;
-        
+
         if (io_apic_cnt++ > 0) {
                 /*
@@ -197 +197 @@
                 return;
         }
-        
+
         io_apic = (uint32_t *) (uintptr_t) ioa->io_apic;
 }
@@ -207 +207 @@
         log_begin(LF_ARCH, LVL_DEBUG);
         log_printf("MPS: ");
-        
+
         switch (iointr->intr_type) {
         case 0:
@@ -222 +222 @@
                 break;
         }
-        
+
         log_printf(", ");
-        
+
         switch (iointr->poel & 3) {
         case 0:
@@ -239 +239 @@
                 break;
         }
-        
+
         log_printf(", ");
-        
+
         switch ((iointr->poel >> 2) & 3) {
         case 0:
@@ -256 +256 @@
                 break;
         }
-        
+
         log_printf(", bus=%" PRIu8 " irq=%" PRIu8 " io_apic=%" PRIu8" pin=%"
             PRIu8, iointr->src_bus_id, iointr->src_bus_irq,
@@ -270 +270 @@
         log_begin(LF_ARCH, LVL_DEBUG);
         log_printf("MPS: ");
-        
+
         switch (lintr->intr_type) {
         case 0:
@@ -285 +285 @@
                 break;
         }
-        
+
         log_printf(", ");
-        
+
         switch (lintr->poel & 3) {
         case 0:
@@ -302 +302 @@
                 break;
         }
-        
+
         log_printf(", ");
-        
+
         switch ((lintr->poel >> 2) & 3) {
         case 0:
@@ -319 +319 @@
                 break;
         }
-        
+
         log_printf(", bus=%" PRIu8 " irq=%" PRIu8 " l_apic=%" PRIu8" pin=%"
             PRIu8, lintr->src_bus_id, lintr->src_bus_irq,
@@ -331 +331 @@
         uint8_t *ext = (uint8_t *) ct + ct->base_table_length;
         uint8_t *cur;
-        
+
         for (cur = ext; cur < ext + ct->ext_table_length;
             cur += cur[CT_EXT_ENTRY_LEN]) {
@@ -349 +349 @@
                 return;
         }
-        
+
         if (!mps_ct_check()) {
                 log(LF_ARCH, LVL_WARN, "MPS: Wrong ct checksum");
                 return;
         }
-        
+
         if (ct->oem_table) {
                 log(LF_ARCH, LVL_WARN, "MPS: ct->oem_table not supported");
                 return;
         }
-        
+
         l_apic = (uint32_t *) (uintptr_t) ct->l_apic;
-        
+
         uint8_t *cur = &ct->base_table[0];
         uint16_t i;
-        
+
         for (i = 0; i < ct->entry_count; i++) {
                 switch (*cur) {
@@ -411 +411 @@
                 }
         }
-        
+
         /*
          * Process extended entries.
@@ -432 +432 @@
         unsigned int j;
         unsigned int length[2] = { 1024, 64 * 1024 };
-        
+
         /*
          * Find MP Floating Pointer Structure
@@ -439 +439 @@
          *  2.  search 64K starting at 0xf0000
          */
-        
+
         addr[0] = (uint8_t *) PA2KA(ebda ? ebda : 639 * 1024);
         for (i = 0; i < 2; i++) {
@@ -450 +450 @@
                 }
         }
-        
+
         return;
-        
+
 fs_found:
         log(LF_ARCH, LVL_NOTE, "%p: MPS Floating Pointer Structure", fs);
-        
+
         if ((fs->config_type == 0) && (fs->configuration_table)) {
                 if (fs->mpfib2 >> 7) {
@@ -461 +461 @@
                         return;
                 }
-                
+
                 ct = (struct mps_ct *) PA2KA((uintptr_t) fs->configuration_table);
                 configure_via_ct();
         } else
                 configure_via_default(fs->config_type);
-        
+
         if (processor_entry_cnt > 0)
                 config.cpu_count = processor_entry_cnt;