Changeset bf9da656 in mainline

Timestamp:

2011-10-29T19:19:08Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

e8ab32f

Parents:

0dc91833 (diff), b50bf6c2 (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.

Message:

Merge with mainline

Files:

• kernel/genarch/src/acpi/madt.c (modified) (2 diffs)
• uspace/srv/hw/irc/apic/apic.c (modified) (1 diff)

kernel/genarch/src/acpi/madt.c

@@ -116 +116 @@
 static int madt_irq_to_pin(unsigned int irq)
 {
-        ASSERT(irq < sizeof(isa_irq_map) / sizeof(int));
+        if (irq >= sizeof(isa_irq_map) / sizeof(int))
+                return (int) irq;
         
         return isa_irq_map[irq];
@@ -178 +179 @@
         ASSERT(override->source < sizeof(isa_irq_map) / sizeof(int));
         
-        printf("MADT: Ignoring %s entry: bus=%" PRIu8 ", source=%" PRIu8
-            ", global_int=%" PRIu32 ", flags=%#" PRIx16 "\n",
-            entry[override->header.type], override->bus, override->source,
-            override->global_int, override->flags);
+        isa_irq_map[override->source] = override->global_int;
 }
 

uspace/srv/hw/irc/apic/apic.c

@@ -133 +133 @@
         // FIXME: get the map from the kernel, even though this may work
         //        for simple cases
+        if (irq == 0)
+                return 2;
         return irq;
 }