Changeset 059490c2 in mainline

Timestamp:

2013-03-17T13:57:57Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

504f1ea3

Parents:

fe0b448

Message:

libhound: Add protocol header

Location:

uspace/lib/hound/src

Files:

• client.c (modified) (4 diffs)
• protocol.c (modified) (2 diffs)
• protocol.h (added)

uspace/lib/hound/src/client.c

@@ -43 +43 @@
 
 #include "client.h"
-#include "server.h"
-
-static const char *HOUND_SERVICE = "audio/hound";
+#include "protocol.h"
 
 /***
@@ -57 +55 @@
 
 typedef struct hound_context {
-        async_sess_t *session;
+        hound_sess_t *session;
         const char *name;
         bool record;
@@ -71 +69 @@
 } hound_context_t;
 
-async_sess_t *hound_get_session(void)
-{
-        service_id_t id = 0;
-        const int ret =
-            loc_service_get_id(HOUND_SERVICE, &id, IPC_FLAG_BLOCKING);
-        if (ret != EOK)
-                return NULL;
-        return loc_service_connect(EXCHANGE_SERIALIZE, id, IPC_FLAG_BLOCKING);
-}
-
-void hound_release_session(async_sess_t *sess)
-{
-        if (sess)
-                async_hangup(sess);
-}
 
 static hound_context_t *hound_context_create(const char *name, bool record,
@@ -101 +84 @@
                 new_context->name = cont_name;
                 new_context->record = record;
-                new_context->session = hound_get_session();
+                new_context->session = hound_service_connect(HOUND_SERVICE);
                 new_context->main_stream = NULL;
                 new_context->main_format.sample = format;

uspace/lib/hound/src/protocol.c

@@ -42 +42 @@
 #include <libarch/types.h>
 
+#include "protocol.h"
 #include "client.h"
 #include "server.h"
 
-static const char *HOUND_SERVICE = "audio/hound";
+const char *HOUND_SERVICE = "audio/hound";
+
+hound_sess_t *hound_service_connect(const char *service)
+{
+        service_id_t id = 0;
+        const int ret =
+            loc_service_get_id(service, &id, IPC_FLAG_BLOCKING);
+        if (ret != EOK)
+                return NULL;
+        return loc_service_connect(EXCHANGE_PARALLEL, id, IPC_FLAG_BLOCKING);
+}
+
+void hound_service_disconnect(hound_sess_t *sess)
+{
+        if (sess)
+                async_hangup(sess);
+}
 
 /***
@@ -55 +72 @@
         void *arg;
 } callback_t;
+
+hound_sess_t *hound_get_session(void)
+{
+        return hound_service_connect(HOUND_SERVICE);
+}
+
+void hound_release_session(hound_sess_t *sess)
+{
+        hound_service_disconnect(sess);
+}