Changeset 1c6c3e1d in mainline for uspace/lib/hound/src/protocol.c

Timestamp:

2023-10-22T17:55:33Z (20 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

ticket/834-toolchain-update

Children:

350ec74

Parents:

315d487 (diff), 133461c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ticket

File:

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

uspace/lib/hound/src/protocol.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2023 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.
@@ -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, id);
+        if (rc != EOK) {
+                loc_server_unregister(hound_srv);
+                return rc;
+        }
+
+        return EOK;
 }
 
@@ -746 +761 @@
 void hound_server_unregister(service_id_t id)
 {
-        loc_service_unregister(id);
+        loc_service_unregister(hound_srv, id);
+        loc_server_unregister(hound_srv);
 }