Changes in uspace/lib/hound/src/protocol.c [fafb8e5:ca48672] in mainline

File:

• uspace/lib/hound/src/protocol.c (modified) (7 diffs)

uspace/lib/hound/src/protocol.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2012 Jan Vesely
  * All rights reserved.
@@ -84 +85 @@
 const char *HOUND_SERVICE = "audio/hound";
 
+/** Server object */
+static loc_srv_t *hound_srv;
+
 /**
  * Start a new audio session.
@@ -394 +398 @@
         void *sink;
 
-        /* Accept connection if there is a valid iface*/
+        /* Accept connection if there is a valid iface */
         if (server_iface) {
                 async_accept_0(icall);
@@ -547 +551 @@
                         ret = async_data_write_accept(&source, true, 0, 0, 0,
                             0);
-                        /*read sink name */
+                        /* read sink name */
                         if (ret == EOK)
                                 ret = async_data_write_accept(&sink,
@@ -611 +615 @@
                 case IPC_M_HOUND_STREAM_EXIT:
                 case IPC_M_HOUND_STREAM_DRAIN:
-                        /* Stream exit/drain is only allowed in stream context*/
+                        /* Stream exit/drain is only allowed in stream context */
                         async_answer_0(&call, EINVAL);
                         break;
@@ -730 +734 @@
 errno_t hound_server_register(const char *name, service_id_t *id)
 {
+        errno_t rc;
+
         if (!name || !id)
                 return EINVAL;
 
-        errno_t ret = loc_server_register(name);
-        if (ret != EOK)
-                return ret;
-
-        return loc_service_register(HOUND_SERVICE, id);
+        if (hound_srv != NULL)
+                return EBUSY;
+
+        rc = loc_server_register(name, &hound_srv);
+        if (rc != EOK)
+                return rc;
+
+        rc = loc_service_register(hound_srv, HOUND_SERVICE,
+            fallback_port_id, id);
+        if (rc != EOK) {
+                loc_server_unregister(hound_srv);
+                return rc;
+        }
+
+        return EOK;
 }
 
@@ -746 +762 @@
 void hound_server_unregister(service_id_t id)
 {
-        loc_service_unregister(id);
+        loc_service_unregister(hound_srv, id);
+        loc_server_unregister(hound_srv);
 }