Changeset 77ded647 in mainline for uspace/drv/bus/usb/xhci/hw_struct

Timestamp:

2018-02-01T11:42:11Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

3e6ff9a

Parents:

17d34a8

Message:

xhci: do not avoid 64-bit writes

File:

• uspace/drv/bus/usb/xhci/hw_struct/regs.h (modified) (5 diffs)

uspace/drv/bus/usb/xhci/hw_struct/regs.h

@@ -371 +371 @@
          * 64:6 - Command Ring Pointer
          */
-        ioport32_t crcr_lo;
-        ioport32_t crcr_hi;
+        ioport64_t crcr;
 
         PADD32[4];
 
-        ioport32_t dcbaap_lo;
-        ioport32_t dcbaap_hi;
+        ioport64_t dcbaap;
 
         /*
@@ -416 +414 @@
 #define XHCI_OP_PAGESIZE      pagesize, 32, FIELD
 #define XHCI_OP_NOTIFICATION    dnctrl, 32, RANGE, 15, 0
-#define XHCI_OP_RCS            crcr_lo, 32,  FLAG, 0
-#define XHCI_OP_CS             crcr_lo, 32,  FLAG, 1
-#define XHCI_OP_CA             crcr_lo, 32,  FLAG, 2
-#define XHCI_OP_CRR            crcr_lo, 32,  FLAG, 3
+#define XHCI_OP_RCS               crcr, 64,  FLAG, 0
+#define XHCI_OP_CS                crcr, 64,  FLAG, 1
+#define XHCI_OP_CA                crcr, 64,  FLAG, 2
+#define XHCI_OP_CRR               crcr, 64,  FLAG, 3
 /*
  * This shall be RANGE, 6, 0, but the value containing CR pointer and RCS flag
  * must be written at once.
  */
-#define XHCI_OP_CRCR_LO        crcr_lo, 32, FIELD
-#define XHCI_OP_CRCR_HI        crcr_hi, 32, FIELD
-#define XHCI_OP_DCBAAP_LO    dcbaap_lo, 32, FIELD
-#define XHCI_OP_DCBAAP_HI    dcbaap_hi, 32, FIELD
+#define XHCI_OP_CRCR              crcr, 64, FIELD
+#define XHCI_OP_DCBAAP          dcbaap, 64, FIELD
 #define XHCI_OP_MAX_SLOTS_EN    config, 32, RANGE, 7, 0
 #define XHCI_OP_U3E             config, 32,  FLAG, 8
@@ -458 +454 @@
         PADD32;
 
-        ioport32_t erstba_lo;
-        ioport32_t erstba_hi;
+        ioport64_t erstba;
 
         /*
@@ -466 +461 @@
          * 63:4 - Event Ring Dequeue Pointer
          */
-        ioport32_t erdp_lo;
-        ioport32_t erdp_hi;
+        ioport64_t erdp;
 } xhci_interrupter_regs_t;
 
@@ -475 +469 @@
 #define XHCI_INTR_IMC             imod, 32, RANGE, 31, 16
 #define XHCI_INTR_ERSTSZ        erstsz, 32, FIELD
-#define XHCI_INTR_ERSTBA_LO  erstba_lo, 32, FIELD
-#define XHCI_INTR_ERSTBA_HI  erstba_hi, 32, FIELD
-#define XHCI_INTR_ERDP_ESI     erdp_lo, 32, RANGE,  2, 0
-#define XHCI_INTR_ERDP_EHB     erdp_lo, 32,  FLAG,  3
-#define XHCI_INTR_ERDP_LO      erdp_lo, 32, FIELD
-#define XHCI_INTR_ERDP_HI      erdp_hi, 32, FIELD
+#define XHCI_INTR_ERSTBA        erstba, 64, FIELD
+#define XHCI_INTR_ERDP_ESI        erdp, 64, RANGE,  2, 0
+#define XHCI_INTR_ERDP_EHB        erdp, 64,  FLAG,  3
+#define XHCI_INTR_ERDP            erdp, 64, FIELD
 
 /**