Changeset 9b1baac in mainline for uspace/srv/devman/main.c

Timestamp:

2018-07-18T08:35:42Z (7 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0b05082

Parents:

edc64c0

Message:

ns: register service interfaces individually

Each service interface is now registered individually with the naming
service. This adds a degree of type safety, potentially allows the
individual interfaces to be implemented by independent tasks and moves
the code slightly closer to the full-fledged ports design.

Broker services (e.g. the location service) can still register a
fallback port for receiving connections to all interface types
explicitly using service_register_broker().

File:

• uspace/srv/devman/main.c (modified) (2 diffs)

uspace/srv/devman/main.c

@@ -325 +325 @@
         async_set_client_data_destructor(devman_client_data_destroy);
 
-        port_id_t port;
-        rc = async_create_port(INTERFACE_DDF_DRIVER,
-            devman_connection_driver, NULL, &port);
-        if (rc != EOK) {
-                printf("%s: Error creating DDF driver port: %s\n", NAME, str_error(rc));
-                return rc;
-        }
-
-        rc = async_create_port(INTERFACE_DDF_CLIENT,
-            devman_connection_client, NULL, &port);
-        if (rc != EOK) {
-                printf("%s: Error creating DDF client port: %s\n", NAME, str_error(rc));
-                return rc;
-        }
-
-        rc = async_create_port(INTERFACE_DEVMAN_DEVICE,
-            devman_connection_device, NULL, &port);
-        if (rc != EOK) {
-                printf("%s: Error creating devman device port: %s\n", NAME, str_error(rc));
-                return rc;
-        }
-
-        rc = async_create_port(INTERFACE_DEVMAN_PARENT,
-            devman_connection_parent, NULL, &port);
-        if (rc != EOK) {
-                printf("%s: Error creating devman parent port: %s\n", NAME, str_error(rc));
-                return rc;
-        }
-
         async_set_fallback_port_handler(devman_forward, NULL);
 
@@ -362 +333 @@
 
         /* Register device manager at naming service. */
-        rc = service_register(SERVICE_DEVMAN);
-        if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering as a service: %s", str_error(rc));
+        rc = service_register(SERVICE_DEVMAN, INTERFACE_DDF_DRIVER,
+            devman_connection_driver, NULL);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering driver port: %s", str_error(rc));
+                return rc;
+        }
+
+        rc = service_register(SERVICE_DEVMAN, INTERFACE_DDF_CLIENT,
+            devman_connection_client, NULL);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering client port: %s", str_error(rc));
+                return rc;
+        }
+
+        rc = service_register(SERVICE_DEVMAN, INTERFACE_DEVMAN_DEVICE,
+            devman_connection_device, NULL);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering device port: %s", str_error(rc));
+                return rc;
+        }
+
+        rc = service_register(SERVICE_DEVMAN, INTERFACE_DEVMAN_PARENT,
+            devman_connection_parent, NULL);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering parent port: %s", str_error(rc));
                 return rc;
         }