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

Timestamp:

2018-03-02T20:34:50Z (8 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (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.

git-author:

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

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

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;