Changeset 8e7c9fe in mainline for uspace/srv/audio/hound/main.c

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/srv/audio/hound/main.c (modified) (2 diffs)

uspace/srv/audio/hound/main.c

@@ -43 +43 @@
 #include <hound/server.h>
 #include <hound/protocol.h>
+#include <task.h>
 
 #include "hound.h"
@@ -69 +70 @@
 {
         printf("%s: HelenOS sound service\n", NAME);
+
+        if (log_init(NAME) != EOK) {
+                printf(NAME ": Failed to initialize logging.\n");
+                return 1;
+        }
 
         int ret = hound_init(&hound);