Changeset 8e7c9fe in mainline for uspace/drv/audio/hdaudio/codec.h

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/drv/audio/hdaudio/codec.h (moved) (moved from kernel/arch/mips64/include/arch/mm/frame.h ) (2 diffs)

uspace/drv/audio/hdaudio/codec.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2005 Jakub Jermar
+ * Copyright (c) 2014 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup mips64mm
+/** @addtogroup hdaudio
  * @{
  */
-/** @file
+/** @file High Definition Audio controller
  */
 
-#ifndef KERN_mips64_FRAME_H_
-#define KERN_mips64_FRAME_H_
+#ifndef CODEC_H
+#define CODEC_H
 
-#define FRAME_WIDTH  14  /* 16K */
-#define FRAME_SIZE   (1 << FRAME_WIDTH)
+#include "hdaudio.h"
+#include "stream.h"
 
-#define FRAME_LOWPRIO  0
+#define MAX_OUT_AW 256
 
-#ifndef __ASM__
+typedef struct hda_codec {
+        hda_t *hda;
+        uint8_t address;
+        uint8_t out_aw_list[MAX_OUT_AW];
+        int out_aw_num;
+        int out_aw_sel;
+} hda_codec_t;
 
-extern void frame_low_arch_init(void);
-extern void frame_high_arch_init(void);
-extern void physmem_print(void);
-
-#endif /* __ASM__ */
+extern hda_codec_t *hda_codec_init(hda_t *, uint8_t);
+extern void hda_codec_fini(hda_codec_t *);
+extern int hda_out_converter_setup(hda_codec_t *, hda_stream_t *);
 
 #endif