Changeset af60409 in mainline for uspace/drv/bus

Timestamp:

2018-03-26T20:04:11Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

eb748a0

Parents:

b752a31

Message:

Modify PADDn macros so that their use is easier to parse.

Location:

uspace/drv/bus/usb

Files:

• ehci/ehci_regs.h (modified) (2 diffs)
• ohci/hw_struct/hcca.h (modified) (1 diff)
• uhci/hc.h (modified) (1 diff)
• xhci/hw_struct/regs.h (modified) (6 diffs)

uspace/drv/bus/usb/ehci/ehci_regs.h

@@ -48 +48 @@
 typedef struct ehci_cap_regs {
         const ioport8_t caplength;
-        PADD8;
+        PADD8(1);
         const ioport16_t hciversion;
         const ioport32_t hcsparams;
@@ -126 +126 @@
 #define USB_ASYNCLIST_MASK   0xfffffff0
 
-        PADD32[9];
+        PADD32(9);
 
         ioport32_t configflag;

uspace/drv/bus/usb/ohci/hw_struct/hcca.h

@@ -54 +54 @@
         /** Frame number. */
         uint16_t frame_number;
-        PADD16;
+        PADD16(1);
         /** Pointer to the last completed TD. (useless) */
         uint32_t done_head;
         /** Padding to make the size 256B */
-        PADD32[30];
+        PADD32(30);
 } hcca_t;
 

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

@@ -91 +91 @@
         ioport8_t sofmod;
 
-        PADD8[3];
+        PADD8(3);
         ioport16_t ports[];
 } uhci_regs_t;

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

@@ -140 +140 @@
         const ioport8_t caplength;
 
-        const PADD8;
+        const PADD8(1);
 
         /* BCD of specification version */
@@ -360 +360 @@
         ioport32_t pagesize;
 
-        PADD32[2];
+        PADD32(2);
 
         /*
@@ -373 +373 @@
         ioport64_t crcr;
 
-        PADD32[4];
+        PADD32(4);
 
         ioport64_t dcbaap;
@@ -385 +385 @@
 
         /* Offset of portrs from op_regs addr is 0x400. */
-        PADD32[241];
+        PADD32(241);
 
         /*
@@ -452 +452 @@
         ioport32_t erstsz;
 
-        PADD32;
+        PADD32(1);
 
         ioport64_t erstba;
@@ -480 +480 @@
         ioport32_t mfindex;
 
-        PADD32 [7];
+        PADD32(7);
 
         xhci_interrupter_regs_t ir [];