Changes in uspace/lib/c/generic/irc.c [f9b2cb4c:9a2eb14] in mainline

File:

• uspace/lib/c/generic/irc.c (modified) (4 diffs)

uspace/lib/c/generic/irc.c

@@ -35 +35 @@
 #include <assert.h>
 #include <errno.h>
+#include <fibril_synch.h>
 #include <ipc/irc.h>
 #include <ipc/services.h>
 #include <irc.h>
-#include <ns.h>
+#include <loc.h>
+#include <stdlib.h>
 #include <sysinfo.h>
 
@@ -49 +51 @@
 static int irc_init(void)
 {
+        category_id_t irc_cat;
+        service_id_t *svcs;
+        size_t count;
+        int rc;
+
         assert(irc_sess == NULL);
+        rc = loc_category_get_id("irc", &irc_cat, IPC_FLAG_BLOCKING);
+        if (rc != EOK)
+                return EIO;
 
-        irc_sess = service_connect_blocking(SERVICE_IRC, INTERFACE_IRC, 0);
+        while (true) {
+                rc = loc_category_get_svcs(irc_cat, &svcs, &count);
+                if (rc != EOK)
+                        return EIO;
+
+                if (count > 0)
+                        break;
+
+                free(svcs);
+
+                // XXX This is just a temporary hack
+                fibril_usleep(500 * 1000);
+        }
+
+        irc_sess = loc_service_connect(svcs[0], INTERFACE_IRC,
+            IPC_FLAG_BLOCKING);
+        free(svcs);
 
         if (irc_sess == NULL)
@@ -60 +86 @@
 
 /** Enable interrupt.
+ *
+ * Allow interrupt delivery.
  *
  * @param irq   IRQ number
@@ -80 +108 @@
 }
 
-
 /** Disable interrupt.
+ *
+ * Disallow interrupt delivery.
  *
  * @param irq   IRQ number
  */
 int irc_disable_interrupt(int irq)
+{
+        int rc;
+
+        if (irc_sess == NULL) {
+                rc = irc_init();
+                if (rc != EOK)
+                        return rc;
+        }
+
+        async_exch_t *exch = async_exchange_begin(irc_sess);
+        rc = async_req_1_0(exch, IRC_DISABLE_INTERRUPT, irq);
+        async_exchange_end(exch);
+
+        return rc;
+}
+
+/** Clear interrupt.
+ *
+ * Clear/acknowledge interrupt in interrupt controller so that
+ * another interrupt can be delivered.
+ *
+ * @param irq   IRQ number
+ */
+int irc_clear_interrupt(int irq)
 {
         int rc;