Changeset 15d0046 in mainline for uspace/drv/audio/hdaudio/stream.h

Timestamp:

2014-09-12T13:22:33Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (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

File:

• uspace/drv/audio/hdaudio/stream.h (moved) (moved from kernel/arch/mips64/include/arch/mm/page.h ) (2 diffs)

uspace/drv/audio/hdaudio/stream.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2003-2004 Jakub Jermar
+ * Copyright (c) 2014 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup mips64mm
+/** @addtogroup hdaudio
  * @{
  */
-/** @file
+/** @file High Definition Audio stream
  */
 
-#ifndef KERN_mips64_PAGE_H_
-#define KERN_mips64_PAGE_H_
+#ifndef STREAM_H
+#define STREAM_H
 
-#include <arch/mm/frame.h>
-#include <trace.h>
+#include "hdaudio.h"
+#include "spec/bdl.h"
 
-#define PAGE_WIDTH  FRAME_WIDTH
-#define PAGE_SIZE   FRAME_SIZE
+typedef enum {
+        /** Input Stream */
+        sdir_input,
+        /** Output Stream */
+        sdir_output,
+        /** Bidirectional Stream */
+        sdir_bidi
+} hda_stream_dir_t;
 
-#ifndef __ASM__
-        #define KA2PA(addr)  (((uintptr_t) (addr)) - 0xffffffff80000000)
-        #define PA2KA(addr)  (((uintptr_t) (addr)) + 0xffffffff80000000)
-#else
-        #define KA2PA(addr)  ((addr) - 0xffffffff80000000)
-        #define PA2KA(addr)  ((addr) + 0xffffffff80000000)
-#endif
+typedef struct hda_stream {
+        hda_t *hda;
+        /** Stream ID */
+        uint8_t sid;
+        /** Stream descriptor index */
+        uint8_t sdid;
+        /** Direction */
+        hda_stream_dir_t dir;
+        /** Number of buffers */
+        size_t nbuffers;
+        /** Buffer size */
+        size_t bufsize;
+        /** Buffer Descriptor List */
+        hda_buffer_desc_t *bdl;
+        /** Physical address of BDL */
+        uintptr_t bdl_phys;
+        /** Buffers */
+        void **buf;
+        /** Physical addresses of buffers */
+        uintptr_t *buf_phys;
+        /** Stream format */
+        uint32_t fmt;
+} hda_stream_t;
 
-#ifndef __ASM__
-
-extern void page_arch_init(void);
-
-#endif /* __ASM__ */
+extern hda_stream_t *hda_stream_create(hda_t *, hda_stream_dir_t, uint32_t);
+extern void hda_stream_destroy(hda_stream_t *);
+extern void hda_stream_start(hda_stream_t *);
+extern void hda_stream_stop(hda_stream_t *);
+extern void hda_stream_reset(hda_stream_t *);
 
 #endif