Changeset 8e7c9fe in mainline for uspace/drv/audio/hdaudio/regif.c

Timestamp:

2014-09-12T03:45:25Z (11 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/regif.c (moved) (moved from kernel/arch/mips64/src/smp/smp.c ) (2 diffs)

uspace/drv/audio/hdaudio/regif.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Martin Decky
+ * Copyright (c) 2014 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup mips64
+/** @addtogroup hdaudio
  * @{
  */
-/** @file
+/** @file High Definition Audio register interface
  */
 
-#include <config.h>
-#include <smp/smp.h>
-#include <arch/arch.h>
+#include <byteorder.h>
+#include <ddi.h>
+#include <stdint.h>
 
-#ifdef CONFIG_SMP
+#include "regif.h"
 
-void smp_init(void)
+uint8_t hda_reg8_read(uint8_t *r)
 {
-        config.cpu_count = cpu_count;
+        return pio_read_8(r);
 }
 
-void kmp(void *arg __attribute__((unused)))
+uint16_t hda_reg16_read(uint16_t *r)
 {
+        return uint16_t_le2host(pio_read_16(r));
 }
 
-#endif /* CONFIG_SMP */
+uint32_t hda_reg32_read(uint32_t *r)
+{
+        return uint32_t_le2host(pio_read_32(r));
+}
+
+void hda_reg8_write(uint8_t *r, uint8_t val)
+{
+        pio_write_8(r, val);
+}
+
+void hda_reg16_write(uint16_t *r, uint16_t val)
+{
+        pio_write_16(r, host2uint16_t_le(val));
+}
+
+void hda_reg32_write(uint32_t *r, uint32_t val)
+{
+        pio_write_32(r, host2uint32_t_le(val));
+}
 
 /** @}