Changeset 7e7def5 in mainline

Timestamp:

2013-04-05T16:58:55Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2373ba7

Parents:

f465461

Message:

libhound: remove deprecated server interface

Location:

uspace/lib/hound

Files:

• include/hound/server.h (modified) (2 diffs)
• src/protocol.c (modified) (3 diffs)

uspace/lib/hound/include/hound/server.h

@@ -38 +38 @@
 
 #include <async.h>
-#include <stdbool.h>
 #include <loc.h>
-#include <pcm/format.h>
-
-
-
-enum {
-        HOUND_REGISTER_PLAYBACK = IPC_FIRST_USER_METHOD,
-        HOUND_REGISTER_RECORDING,
-        HOUND_UNREGISTER_PLAYBACK,
-        HOUND_UNREGISTER_RECORDING,
-        HOUND_CONNECT,
-        HOUND_DISCONNECT,
-};
 
 typedef void (*dev_change_callback_t)(void);
 typedef int (*device_callback_t)(service_id_t, const char *);
-
 
 int hound_server_register(const char *name, service_id_t *id);
@@ -61 +47 @@
 int hound_server_set_device_change_callback(dev_change_callback_t cb);
 int hound_server_devices_iterate(device_callback_t callback);
-int hound_server_get_register_params(const char **name, async_sess_t **sess,
-    unsigned *channels, unsigned *rate, pcm_sample_format_t *format);
-int hound_server_get_unregister_params(const char **name);
-int hound_server_get_connection_params(const char **source, const char **sink);
 
 #endif

uspace/lib/hound/src/protocol.c

@@ -554 +554 @@
 }
 
+
 /***
- * SERVER SIDE - DEPRECATED
+ * SERVER SIDE
  ***/
-
-static const char * get_name(void);
 
 int hound_server_register(const char *name, service_id_t *id)
@@ -581 +580 @@
         return loc_register_cat_change_cb(cb);
 }
+
 
 int hound_server_devices_iterate(device_callback_t callback)
@@ -612 +612 @@
         return EOK;
 }
-
-int hound_server_get_register_params(const char **name, async_sess_t **sess,
-    unsigned *channels, unsigned *rate, pcm_sample_format_t *format)
-{
-        if (!name || !sess || !channels || !rate || !format)
-                return EINVAL;
-
-        const char *n = get_name();
-        if (!n)
-                return ENOMEM;
-
-        ipc_call_t call;
-        ipc_callid_t callid = async_get_call(&call);
-
-        unsigned ch = IPC_GET_ARG1(call);
-        unsigned r = IPC_GET_ARG2(call);
-        pcm_sample_format_t f = IPC_GET_ARG3(call);
-
-        async_sess_t *s = async_callback_receive_start(EXCHANGE_ATOMIC, &call);
-        async_answer_0(callid, s ? EOK : ENOMEM);
-
-        *name = n;
-        *sess = s;
-        *channels = ch;
-        *rate = r;
-        *format = f;
-
-        return ENOTSUP;
-}
-
-int hound_server_get_unregister_params(const char **name)
-{
-        if (!name)
-                return EINVAL;
-        *name = get_name();
-        if (!*name)
-                return ENOMEM;
-        return EOK;
-}
-
-int hound_server_get_connection_params(const char **source, const char **sink)
-{
-        if (!source || !sink)
-                return EINVAL;
-
-        const char *source_name = get_name();
-        if (!source_name)
-                return ENOMEM;
-
-        const char *sink_name = get_name();
-        if (!sink_name)
-                return ENOMEM;
-
-        *source = source_name;
-        *sink = sink_name;
-        return EOK;
-}
-
-static const char * get_name(void)
-{
-        size_t size = 0;
-        ipc_callid_t callid;
-        async_data_write_receive(&callid, &size);
-        char *buffer = malloc(size + 1);
-        if (buffer) {
-                async_data_write_finalize(callid, buffer, size);
-                buffer[size] = 0;
-        }
-        return buffer;
-}
-
 /**
  * @}