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

Timestamp:

2018-03-02T20:10:49Z (7 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/genarch/src/acpi/madt.c (modified) (14 diffs)

kernel/genarch/src/acpi/madt.c

@@ -83 +83 @@
 {
         assert(i < madt_l_apic_entry_cnt);
-        
+
         return ((struct madt_l_apic *)
             madt_entries_index[madt_l_apic_entry_index + i])->apic_id;
@@ -91 +91 @@
 {
         assert(i < madt_l_apic_entry_cnt);
-        
+
         /*
          * FIXME: The current local APIC driver limits usable
@@ -99 +99 @@
         if (i > 7)
                 return false;
-        
+
         return ((struct madt_l_apic *)
             madt_entries_index[madt_l_apic_entry_index + i])->flags & 0x1;
@@ -107 +107 @@
 {
         assert(i < madt_l_apic_entry_cnt);
-        
+
         return ((struct madt_l_apic *)
             madt_entries_index[madt_l_apic_entry_index + i])->apic_id ==
@@ -117 +117 @@
         if (irq >= sizeof(isa_irq_map) / sizeof(int))
                 return (int) irq;
-        
+
         return isa_irq_map[irq];
 }
@@ -135 +135 @@
         uint8_t typea = (*((struct madt_apic_header **) a))->type;
         uint8_t typeb = (*((struct madt_apic_header **) b))->type;
-        
+
         if (typea > typeb)
                 return 1;
-        
+
         if (typea < typeb)
                 return -1;
-        
+
         return 0;
 }
@@ -149 +149 @@
         if (madt_l_apic_entry_cnt == 0)
                 madt_l_apic_entry_index = i;
-        
+
         madt_l_apic_entry_cnt++;
-        
+
         if (!(la->flags & 0x1)) {
                 /* Processor is unusable, skip it. */
                 return;
         }
-        
+
         apic_id_mask |= 1 << la->apic_id;
 }
@@ -169 +169 @@
                 /* Currently not supported */
         }
-        
+
         madt_io_apic_entry_cnt++;
 }
@@ -177 +177 @@
 {
         assert(override->source < sizeof(isa_irq_map) / sizeof(int));
-        
+
         isa_irq_map[override->source] = override->global_int;
 }
@@ -186 +186 @@
             (((uint8_t *) acpi_madt) + acpi_madt->header.length);
         struct madt_apic_header *hdr;
-        
+
         l_apic = (uint32_t *) (sysarg_t) acpi_madt->l_apic_address;
-        
+
         /* Count MADT entries */
         unsigned int madt_entries_index_cnt = 0;
@@ -194 +194 @@
             hdr = (struct madt_apic_header *) (((uint8_t *) hdr) + hdr->length))
                 madt_entries_index_cnt++;
-        
+
         /* Create MADT APIC entries index array */
         madt_entries_index = (struct madt_apic_header **)
@@ -201 +201 @@
         if (!madt_entries_index)
                 panic("Memory allocation error.");
-        
+
         size_t i = 0;
-        
+
         for (hdr = acpi_madt->apic_header; hdr < end;
             hdr = (struct madt_apic_header *) (((uint8_t *) hdr) + hdr->length)) {
@@ -209 +209 @@
                 i++;
         }
-        
+
         /* Sort MADT index structure */
         if (!gsort(madt_entries_index, madt_entries_index_cnt,
             sizeof(struct madt_apic_header *), madt_cmp, NULL))
                 panic("Sorting error.");
-        
+
         /* Parse MADT entries */
         for (i = 0; i < madt_entries_index_cnt; i++) {
                 hdr = madt_entries_index[i];
-                
+
                 switch (hdr->type) {
                 case MADT_L_APIC:
@@ -245 +245 @@
                                     "MADT: Skipping reserved entry (type=%" PRIu8 ")",
                                     hdr->type);
-                                
+
                         if (hdr->type >= MADT_RESERVED_OEM_BEGIN)
                                 log(LF_ARCH, LVL_NOTE,
                                     "MADT: Skipping OEM entry (type=%" PRIu8 ")",
                                     hdr->type);
-                        
+
                         break;
                 }
         }
-        
+
         if (madt_l_apic_entry_cnt > 0)
                 config.cpu_count = madt_l_apic_entry_cnt;