Changes in uspace/srv/hw/irc/obio/obio.c [df01d303:9a2eb14] in mainline

File:

• uspace/srv/hw/irc/obio/obio.c (modified) (5 diffs)

uspace/srv/hw/irc/obio/obio.c

@@ -42 +42 @@
  */
 
-#include <ipc/services.h>
 #include <ipc/irc.h>
-#include <ns.h>
+#include <loc.h>
 #include <as.h>
 #include <ddi.h>
 #include <align.h>
+#include <inttypes.h>
 #include <stdbool.h>
 #include <errno.h>
@@ -54 +54 @@
 #include <async.h>
 #include <stdio.h>
-#include <ipc/loc.h>
 
 #define NAME "obio"
 
-#define OBIO_SIZE       0x1898  
+#define OBIO_SIZE       0x1898
 
 #define OBIO_IMR_BASE   0x200
@@ -97 +96 @@
                         async_answer_0(callid, EOK);
                         break;
+                case IRC_DISABLE_INTERRUPT:
+                        /* XXX TODO */
+                        async_answer_0(callid, EOK);
+                        break;
                 case IRC_CLEAR_INTERRUPT:
                         inr = IPC_GET_ARG1(call);
@@ -115 +118 @@
 static bool obio_init(void)
 {
+        category_id_t irc_cat;
+        service_id_t svc_id;
+        int rc;
+        
         base_phys = (uintptr_t) 0x1fe00000000ULL;
         
@@ -127 +134 @@
         }
         
-        printf("%s: OBIO registers with base at %lx\n", NAME, base_phys);
+        printf("%s: OBIO registers with base at 0x%" PRIun "\n", NAME, base_phys);
         
         async_set_fallback_port_handler(obio_connection, NULL);
-        service_register(SERVICE_IRC);
+        
+        rc = loc_server_register(NAME);
+        if (rc != EOK) {
+                printf("%s: Failed registering server. (%d)\n", NAME, rc);
+                return false;
+        }
+        
+        rc = loc_service_register("irc/" NAME, &svc_id);
+        if (rc != EOK) {
+                printf("%s: Failed registering service. (%d)\n", NAME, rc);
+                return false;
+        }
+        
+        rc = loc_category_get_id("irc", &irc_cat, IPC_FLAG_BLOCKING);
+        if (rc != EOK) {
+                printf("%s: Failed resolving category 'iplink' (%d).\n", NAME,
+                    rc);
+                return false;
+        }
+        
+        rc = loc_service_add_to_cat(svc_id, irc_cat);
+        if (rc != EOK) {
+                printf("%s: Failed adding service to category (%d).\n", NAME,
+                    rc);
+                return false;
+        }
         
         return true;