Changeset 94e46c9 in mainline for uspace/drv/audio/hdaudio/stream.h

Timestamp:

2015-05-23T04:09:11Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b5143bd

Parents:

a25d893 (diff), 0683992 (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:

Mainline changes

File:

• uspace/drv/audio/hdaudio/stream.h (modified) (2 diffs)

uspace/drv/audio/hdaudio/stream.h

@@ -48 +48 @@
 } hda_stream_dir_t;
 
-typedef struct hda_stream {
-        hda_t *hda;
-        /** Stream ID */
-        uint8_t sid;
-        /** Stream descriptor index */
-        uint8_t sdid;
-        /** Direction */
-        hda_stream_dir_t dir;
+typedef struct hda_stream_buffers {
         /** Number of buffers */
         size_t nbuffers;
@@ -68 +61 @@
         /** Physical addresses of buffers */
         uintptr_t *buf_phys;
+} hda_stream_buffers_t;
+
+typedef struct hda_stream {
+        hda_t *hda;
+        /** Stream ID */
+        uint8_t sid;
+        /** Stream descriptor index */
+        uint8_t sdid;
+        /** Direction */
+        hda_stream_dir_t dir;
+        /** Buffers */
+        hda_stream_buffers_t *buffers;
         /** Stream format */
         uint32_t fmt;
 } hda_stream_t;
 
-extern hda_stream_t *hda_stream_create(hda_t *, hda_stream_dir_t, uint32_t);
+extern int hda_stream_buffers_alloc(hda_t *, hda_stream_buffers_t **);
+extern void hda_stream_buffers_free(hda_stream_buffers_t *);
+extern hda_stream_t *hda_stream_create(hda_t *, hda_stream_dir_t,
+    hda_stream_buffers_t *, uint32_t);
 extern void hda_stream_destroy(hda_stream_t *);
 extern void hda_stream_start(hda_stream_t *);