Changes in / [b711f62:92b41f33] in mainline

Location:

uspace

Files:

• drv/pciintel/pci.c (modified) (1 diff)
• srv/hw/irc/apic/apic.c (modified) (4 diffs)

uspace/drv/pciintel/pci.c

@@ -92 +92 @@
         pci_fun_t *dev_data = (pci_fun_t *) fnode->driver_data;
 
-        sysarg_t apic;
-        sysarg_t i8259;
+  sysarg_t apic;
+  sysarg_t i8259;
 
         int irc_phone = -1;
-        int irc_service = -1;
-
-        if ((sysinfo_get_value("apic", &apic) == EOK) && (apic)) {
-                irc_service = SERVICE_APIC;
+        int irc_service = 0;
+
+  if ((sysinfo_get_value("apic", &apic) == EOK) && (apic)) {
+    irc_service = SERVICE_APIC;
         } else if ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259)) {
-                irc_service = SERVICE_I8259;
-        }
-
-        if (irc_service == -1) {
+    irc_service = SERVICE_I8259;
+        }
+
+  if (irc_service == 0)
                 return false;
-        }
 
         irc_phone = service_connect_blocking(irc_service, 0, 0);
-        if (irc_phone < 0) {
+        if (irc_phone < 0)
                 return false;
-        }
 
         size_t i;
-        for (i = 0; i < dev_data->hw_resources.count; i++) {
+  for (i = 0; i < dev_data->hw_resources.count; i++) {
                 if (dev_data->hw_resources.resources[i].type == INTERRUPT) {
                         int irq = dev_data->hw_resources.resources[i].res.interrupt.irq;

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