Changeset 00aece0 in mainline for uspace/srv/hw/irc/apic/apic.c

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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 mainline changes.

File:

• uspace/srv/hw/irc/apic/apic.c (modified) (2 diffs)

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;
 }
@@ -206 +208 @@
         }
 
-        if (pio_enable((void *) IO_APIC_BASE, IO_APIC_SIZE,
-            (void **) &io_apic) != EOK)
+        int rc = pio_enable((void *) IO_APIC_BASE, IO_APIC_SIZE,
+                (void **) &io_apic);
+        if (rc != EOK) {
+                printf("%s: Failed to enable PIO for APIC: %d\n", NAME, rc);
                 return false;   
+        }
         
         async_set_client_connection(apic_connection);