Changes in uspace/lib/drv/generic/remote_audio_mixer.c [33b8d024:7f80313] in mainline

File:

• uspace/lib/drv/generic/remote_audio_mixer.c (modified) (11 diffs)

uspace/lib/drv/generic/remote_audio_mixer.c

@@ -94 +94 @@
  * @return Error code.
  */
-errno_t audio_mixer_get_info(async_exch_t *exch, char **name, unsigned *items)
+int audio_mixer_get_info(async_exch_t *exch, const char **name, unsigned *items)
 {
         if (!exch)
                 return EINVAL;
         sysarg_t name_size, itemc;
-        const errno_t ret = async_req_1_2(exch, DEV_IFACE_ID(AUDIO_MIXER_IFACE),
+        const int ret = async_req_1_2(exch, DEV_IFACE_ID(AUDIO_MIXER_IFACE),
             IPC_M_AUDIO_MIXER_GET_INFO, &name_size, &itemc);
         if (ret == EOK && name) {
@@ -109 +109 @@
                         return ENOMEM;
                 }
-                const errno_t ret =
+                const int ret =
                     async_data_read_start(exch, name_place, name_size);
                 if (ret != EOK) {
@@ -130 +130 @@
  * @return Error code.
  */
-errno_t audio_mixer_get_item_info(async_exch_t *exch, unsigned item,
-    char **name, unsigned *levels)
+int audio_mixer_get_item_info(async_exch_t *exch, unsigned item,
+    const char **name, unsigned *levels)
 {
         if (!exch)
                 return EINVAL;
         sysarg_t name_size, lvls;
-        const errno_t ret = async_req_2_2(exch, DEV_IFACE_ID(AUDIO_MIXER_IFACE),
+        const int ret = async_req_2_2(exch, DEV_IFACE_ID(AUDIO_MIXER_IFACE),
             IPC_M_AUDIO_MIXER_GET_ITEM_INFO, item, &name_size, &lvls);
         if (ret == EOK && name) {
@@ -146 +146 @@
                         return ENOMEM;
                 }
-                const errno_t ret =
+                const int ret =
                     async_data_read_start(exch, name_place, name_size);
                 if (ret != EOK) {
@@ -166 +166 @@
  * @return Error code.
  */
-errno_t audio_mixer_set_item_level(async_exch_t *exch, unsigned item,
+int audio_mixer_set_item_level(async_exch_t *exch, unsigned item,
     unsigned level)
 {
@@ -183 +183 @@
  * @return Error code.
  */
-errno_t audio_mixer_get_item_level(async_exch_t *exch, unsigned item,
+int audio_mixer_get_item_level(async_exch_t *exch, unsigned item,
     unsigned *level)
 {
@@ -189 +189 @@
                 return EINVAL;
         sysarg_t current;
-        const errno_t ret = async_req_2_1(exch, DEV_IFACE_ID(AUDIO_MIXER_IFACE),
+        const int ret = async_req_2_1(exch, DEV_IFACE_ID(AUDIO_MIXER_IFACE),
             IPC_M_AUDIO_MIXER_GET_ITEM_LEVEL, item, &current);
         if (ret == EOK && level)
@@ -229 +229 @@
         const char *name = NULL;
         unsigned items = 0;
-        const errno_t ret = mixer_iface->get_info(fun, &name, &items);
+        const int ret = mixer_iface->get_info(fun, &name, &items);
         const size_t name_size = name ? str_size(name) + 1 : 0;
         async_answer_2(callid, ret, name_size, items);
@@ -261 +261 @@
         const char *name = NULL;
         unsigned values = 0;
-        const errno_t ret = mixer_iface->get_item_info(fun, item, &name, &values);
+        const int ret = mixer_iface->get_item_info(fun, item, &name, &values);
         const size_t name_size = name ? str_size(name) + 1 : 0;
         async_answer_2(callid, ret, name_size, values);
@@ -291 +291 @@
         const unsigned item = DEV_IPC_GET_ARG1(*call);
         const unsigned value = DEV_IPC_GET_ARG2(*call);
-        const errno_t ret = mixer_iface->set_item_level(fun, item, value);
+        const int ret = mixer_iface->set_item_level(fun, item, value);
         async_answer_0(callid, ret);
 }
@@ -306 +306 @@
         const unsigned item = DEV_IPC_GET_ARG1(*call);
         unsigned current = 0;
-        const errno_t ret =
+        const int ret =
             mixer_iface->get_item_level(fun, item, &current);
         async_answer_1(callid, ret, current);