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

Timestamp:

2011-04-07T09:46:11Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6639ae1

Parents:

f6bffee (diff), 8e80d3f (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

@@ -56 +56 @@
 static int apic_enable_irq(sysarg_t irq)
 {
-        // FIXME: TODO
+        /* FIXME: TODO */
         return ENOTSUP;
 }
@@ -107 +107 @@
         
         async_set_client_connection(apic_connection);
-        service_register(SERVICE_APIC);
+        service_register(SERVICE_IRC);
         
         return true;