Changeset 23b7c02 in mainline for uspace/srv

Timestamp:

2013-09-04T06:58:57Z (12 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

7664469

Parents:

caf5382 (diff), aa2a049 (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 with Mainline changes.

Location:

uspace/srv

Files:

• audio/hound/Makefile (added)
• audio/hound/audio_data.c (added)
• audio/hound/audio_data.h (added)
• audio/hound/audio_device.c (added)
• audio/hound/audio_device.h (added)
• audio/hound/audio_sink.c (added)
• audio/hound/audio_sink.h (added)
• audio/hound/audio_source.c (added)
• audio/hound/audio_source.h (added)
• audio/hound/connection.c (added)
• audio/hound/connection.h (added)
• audio/hound/hound.c (added)
• audio/hound/hound.h (added)
• audio/hound/hound_ctx.c (added)
• audio/hound/hound_ctx.h (added)
• audio/hound/iface.c (added)
• audio/hound/log.h (added)
• audio/hound/main.c (added)
• hid/compositor/compositor.c (modified) (4 diffs)
• locsrv/locsrv.c (modified) (1 diff)

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 viewports.\n", NAME);
                 input_disconnect();
                 return -1;

uspace/srv/locsrv/locsrv.c

@@ -1377 +1377 @@
         categ_dir_add_cat(&cdir, cat);
         
+        cat = category_new("audio-pcm");
+        categ_dir_add_cat(&cdir, cat);
+        
         return true;
 }