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

Timestamp:

2011-03-17T12:45:23Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

4fec9ee, 6e3b9a58

Parents:

45dd8bf (diff), 039c66c (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:

Merged development changes

File:

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

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

@@ -54 +54 @@
 #define NAME  "apic"
 
+static bool apic_found = false;
+
 static int apic_enable_irq(sysarg_t irq)
 {
@@ -79 +81 @@
                 callid = async_get_call(&call);
                 
-                switch (IPC_GET_IMETHOD(call)) {
+                sysarg_t method = IPC_GET_IMETHOD(call);
+                if (method == IPC_M_PHONE_HUNGUP) {
+                        return;
+                }
+
+                if (!apic_found) {
+                        async_answer_0(callid, ENOTSUP);
+                        break;
+                }
+
+                switch (method) {
                 case IRC_ENABLE_INTERRUPT:
                         async_answer_0(callid, apic_enable_irq(IPC_GET_ARG1(call)));
@@ -97 +109 @@
  *
  */
-static bool apic_init(void)
+static void apic_init(void)
 {
         sysarg_t apic;
         
-        if ((sysinfo_get_value("apic", &apic) != EOK) || (!apic)) {
-                printf(NAME ": No APIC found\n");
-                return false;
+        apic_found = sysinfo_get_value("apic", &apic) && apic;
+        if (!apic_found) {
+                printf(NAME ": Warning: no APIC found\n");
         }
         
         async_set_client_connection(apic_connection);
         service_register(SERVICE_APIC);
-        
-        return true;
 }
 
@@ -116 +126 @@
         printf(NAME ": HelenOS APIC driver\n");
         
-        if (!apic_init())
-                return -1;
-        
+        apic_init();
+
         printf(NAME ": Accepting connections\n");
         async_manager();