Changeset 9a2eb14 in mainline for uspace/srv/hw/irc/obio/obio.c

Timestamp:

2017-10-15T15:04:15Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1974f56a

Parents:

75911d24

Message:

As a temporary measure, let IRC servers use the location service for DDF-compatible naming. This is needed until all interrupt controller drivers are in DDF and we can switch to DDF-based naming.

File:

• uspace/srv/hw/irc/obio/obio.c (modified) (4 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>
@@ -55 +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
@@ -120 +118 @@
 static bool obio_init(void)
 {
+        category_id_t irc_cat;
+        service_id_t svc_id;
+        int rc;
+        
         base_phys = (uintptr_t) 0x1fe00000000ULL;
         
@@ -135 +137 @@
         
         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;