Changeset 8e7c9fe in mainline for uspace/srv/audio/hound/audio_device.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/audio_device.c (modified) (2 diffs)

uspace/srv/audio/hound/audio_device.c

@@ -42 +42 @@
 #include <str.h>
 #include <str_error.h>
+#include <as.h>
 
 
@@ -380 +381 @@
         const int ret = audio_pcm_release_buffer(dev->sess);
         if (ret == EOK) {
+                as_area_destroy(dev->buffer.base);
                 dev->buffer.base = NULL;
                 dev->buffer.size = 0;