Changeset 8e7c9fe in mainline for uspace/srv/hw/irc/icp-ic/icp-ic_hw.h

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/srv/hw/irc/icp-ic/icp-ic_hw.h (moved) (moved from uspace/lib/c/arch/mips64/include/libarch/elf_linux.h ) (2 diffs)

uspace/srv/hw/irc/icp-ic/icp-ic_hw.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Jiri Svoboda
+ * Copyright (c) 2014 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libcmips64
+/** @addtogroup pl050
  * @{
  */
-/** @file
+/** @file ARM PrimeCell PS2 Keyboard/Mouse Interface (PL050) registers
  */
 
-#ifndef LIBC_mips64_ELF_LINUX_H_
-#define LBIC_mips64_ELF_LINUX_H_
+#ifndef ICP_IC_HW_H
+#define ICP_IC_HW_H
 
-#include <libarch/istate.h>
+#include <ddi.h>
 #include <sys/types.h>
 
 typedef struct {
-        /* TODO */
-        uint64_t pad[16];
-} elf_regs_t;
-
-static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs)
-{
-        /* TODO */
-        (void) istate; (void) elf_regs;
-}
+        ioport32_t irq_status;
+        ioport32_t irq_rawstat;
+        ioport32_t irq_enableset;
+        ioport32_t irq_enableclr;
+        ioport32_t int_softset;
+        ioport32_t int_softclr;
+        ioport32_t fiq_status;
+        ioport32_t fiq_rawstat;
+        ioport32_t fiq_enableset;
+        ioport32_t fiq_enableclr;
+} icpic_regs_t;
 
 #endif