Changeset 8e7c9fe in mainline for uspace/drv/audio/hdaudio/hdactl.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/hdactl.h (moved) (moved from kernel/arch/mips64/include/arch/context.h ) (2 diffs)

uspace/drv/audio/hdaudio/hdactl.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2003-2004 Jakub Jermar
+ * Copyright (c) 2014 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup mips64
+/** @addtogroup hdaudio
  * @{
  */
-/** @file
+/** @file High Definition Audio controller
  */
 
-#ifndef KERN_mips64_CONTEXT_H_
-#define KERN_mips64_CONTEXT_H_
+#ifndef HDACTL_H
+#define HDACTL_H
 
-#include <align.h>
-#include <arch/stack.h>
+#include <fibril_synch.h>
+#include <stdbool.h>
+#include "hdaudio.h"
+#include "spec/regs.h"
 
-/*
- * Put one item onto the stack to support get_stack_base() and align it up.
- */
-#define SP_DELTA  (ABI_STACK_FRAME + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT))
+enum {
+        /** Software response buffer size in entries */
+        softrb_entries = 128
+};
 
-#ifndef __ASM__
+typedef struct hda_ctl {
+        bool ok64bit;
+        int iss;
+        int oss;
+        int bss;
 
-#include <typedefs.h>
+        uintptr_t corb_phys;
+        void *corb_virt;
+        size_t corb_entries;
 
-#define context_set(ctx, pc, stack, size) \
-    context_set_generic(ctx, pc, stack, size)
+        uintptr_t rirb_phys;
+        void *rirb_virt;
+        size_t rirb_entries;
+        size_t rirb_rp;
 
-/*
- * Only save registers that must be preserved across
- * function calls.
- */
-typedef struct {
-        uintptr_t sp;
-        uintptr_t pc;
-        
-        uint64_t s0;
-        uint64_t s1;
-        uint64_t s2;
-        uint64_t s3;
-        uint64_t s4;
-        uint64_t s5;
-        uint64_t s6;
-        uint64_t s7;
-        uint64_t s8;
-        uint64_t gp;
-        
-        ipl_t ipl;
-} context_t;
+        fibril_mutex_t solrb_lock;
+        fibril_condvar_t solrb_cv;
+        hda_rirb_entry_t solrb[softrb_entries];
+        size_t solrb_rp;
+        size_t solrb_wp;
 
-#endif /* __ASM__ */
+        hda_rirb_entry_t unsolrb[softrb_entries];
+        size_t unsolrb_rp;
+        size_t unsolrb_wp;
+
+        struct hda_codec *codec;
+        struct hda *hda;
+} hda_ctl_t;
+
+extern hda_ctl_t *hda_ctl_init(hda_t *);
+extern void hda_ctl_fini(hda_ctl_t *);
+extern void hda_ctl_interrupt(hda_ctl_t *);
+extern int hda_cmd(hda_t *, uint32_t, uint32_t *);
+extern void hda_ctl_dump_info(hda_ctl_t *);
 
 #endif