Changeset 15d0046 in mainline for uspace/app/mixerctl/mixerctl.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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 mainline changes

File:

• uspace/app/mixerctl/mixerctl.c (modified) (4 diffs)

uspace/app/mixerctl/mixerctl.c

@@ -35 +35 @@
 #include <assert.h>
 #include <errno.h>
+#include <loc.h>
 #include <str_error.h>
 #include <str.h>
-#include <devman.h>
 #include <audio_mixer_iface.h>
 #include <stdio.h>
 
-#define DEFAULT_DEVICE "/hw/pci0/00:01.0/sb16/control"
+#define DEFAULT_SERVICE "devices/\\hw\\pci0\\00:01.0\\sb16\\control"
 
 /**
@@ -128 +128 @@
 int main(int argc, char *argv[])
 {
-        const char *device = DEFAULT_DEVICE;
+        const char *service = DEFAULT_SERVICE;
         void (*command)(async_exch_t *, int, char*[]) = NULL;
 
@@ -134 +134 @@
                 command = set_level;
                 if (argc == 5)
-                        device = argv[1];
+                        service = argv[1];
         }
 
@@ -140 +140 @@
                 command = get_level;
                 if (argc == 4)
-                        device = argv[1];
+                        service = argv[1];
         }
 
         if ((argc == 2 && command == NULL))
-                device = argv[1];
+                service = argv[1];
 
 
-        devman_handle_t mixer_handle;
-        int ret = devman_fun_get_handle(device, &mixer_handle, 0);
-        if (ret != EOK) {
-                printf("Failed to get device(%s) handle: %s.\n",
-                    device, str_error(ret));
+        service_id_t mixer_sid;
+        int rc = loc_service_get_id(service, &mixer_sid, 0);
+        if (rc != EOK) {
+                printf("Failed to resolve service '%s': %s.\n",
+                    service, str_error(rc));
                 return 1;
         }
 
-        async_sess_t *session = devman_device_connect(
-            EXCHANGE_ATOMIC, mixer_handle, IPC_FLAG_BLOCKING);
+        async_sess_t *session = loc_service_connect(
+            EXCHANGE_ATOMIC, mixer_sid, 0);
         if (!session) {
-                printf("Failed to connect to device.\n");
+                printf("Failed connecting mixer service '%s'.\n", service);
                 return 1;
         }