Changeset d52ab7b in mainline

Timestamp:

2014-03-16T16:33:39Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2e231aba

Parents:

8cffdf5

Message:

Use proper ioport8/16/32_t for I/O register representation in UHCI HC.

Location:

uspace/drv/bus/usb/uhci

Files:

• hc.c (modified) (1 diff)
• hc.h (modified) (4 diffs)

uspace/drv/bus/usb/uhci/hc.c

@@ -123 +123 @@
         memcpy(cmds, uhci_irq_commands, sizeof(uhci_irq_commands));
         uhci_regs_t *registers = (uhci_regs_t *) RNGABSPTR(*regs);
-        cmds[0].addr = &registers->usbsts;
-        cmds[3].addr = &registers->usbsts;
+        cmds[0].addr = (void *) &registers->usbsts;
+        cmds[3].addr = (void *) &registers->usbsts;
 
         return EOK;

uspace/drv/bus/usb/uhci/hc.h

@@ -46 +46 @@
 typedef struct uhci_regs {
         /** Command register, controls HC behaviour */
-        uint16_t usbcmd;
+        ioport16_t usbcmd;
 #define UHCI_CMD_MAX_PACKET (1 << 7)
 #define UHCI_CMD_CONFIGURE  (1 << 6)
@@ -57 +57 @@
 
         /** Status register, 1 means interrupt is asserted (if enabled) */
-        uint16_t usbsts;
+        ioport16_t usbsts;
 #define UHCI_STATUS_HALTED (1 << 5)
 #define UHCI_STATUS_PROCESS_ERROR (1 << 4)
@@ -68 +68 @@
 
         /** Interrupt enabled registers */
-        uint16_t usbintr;
+        ioport16_t usbintr;
 #define UHCI_INTR_SHORT_PACKET (1 << 3)
 #define UHCI_INTR_COMPLETE (1 << 2)
@@ -75 +75 @@
 
         /** Register stores frame number used in SOF packet */
-        uint16_t frnum;
+        ioport16_t frnum;
 
         /** Pointer(physical) to the Frame List */
-        uint32_t flbaseadd;
+        ioport32_t flbaseadd;
 
         /** SOF modification to match external timers */
-        uint8_t sofmod;
+        ioport8_t sofmod;
 } uhci_regs_t;