Changeset 8e7c9fe in mainline for uspace/app/wavplay/dplay.c

Timestamp:

2014-09-12T03:45:25Z (10 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/app/wavplay/dplay.c (modified) (2 diffs)

uspace/app/wavplay/dplay.c

@@ -41 +41 @@
 #include <fibril_synch.h>
 #include <pcm/format.h>
-#include <sys/mman.h>
+#include <as.h>
 #include <sys/time.h>
 #include <inttypes.h>
@@ -397 +397 @@
 cleanup:
         fclose(pb.source);
-        munmap(pb.buffer.base, pb.buffer.size);
+        as_area_destroy(pb.buffer.base);
         audio_pcm_release_buffer(pb.device);
 close_session: