Changeset ab92305 in mainline for uspace/srv/hid/compositor/compositor.c

Timestamp:

2013-08-19T17:23:31Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4da8fdb

Parents:

2921602 (diff), 4a9728ec (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 audio support.

Includes audio server and sb16 driver.

Tested on ia32 and amd64 (qemu).

File:

• uspace/srv/hid/compositor/compositor.c (modified) (4 diffs)

uspace/srv/hid/compositor/compositor.c

@@ -2172 +2172 @@
         /* Establish input bidirectional connection. */
         rc = input_connect(input_svc);
-        if (rc != EOK)
+        if (rc != EOK) {
+                printf("%s: Failed to connect to input service.\n", NAME);
                 return rc;
+        }
 
         /* Create viewports and connect them to visualizers. */
@@ -2179 +2181 @@
         rc = loc_category_get_id("visualizer", &cat_id, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
+                printf("%s: Failed to get visualizer category.\n", NAME);
                 input_disconnect();
                 return -1;
@@ -2187 +2190 @@
         rc = loc_category_get_svcs(cat_id, &svcs, &svcs_cnt);
         if (rc != EOK || svcs_cnt == 0) {
+                printf("%s: Failed to get visualizer category services.\n", NAME);
                 input_disconnect();
                 return -1;
@@ -2203 +2207 @@
         
         if (list_empty(&viewport_list)) {
+                printf("%s: Failed to get view ports.\n", NAME);
                 input_disconnect();
                 return -1;