Changeset 95f1b8f in mainline for uspace/drv/bus/usb/ehci

Timestamp:

2018-02-24T19:51:28Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

5ef3afd

Parents:

0539c14

git-author:

Ondřej Hlavatý <aearsis@…> (2018-02-24 18:29:28)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-02-24 19:51:28)

Message:

usb: structures shared with hardware are both packed and aligned

Location:

uspace/drv/bus/usb/ehci/hw_struct

Files:

• iso_transfer_descriptor.h (modified) (1 diff)
• queue_head.h (modified) (1 diff)
• split_iso_transfer_descriptor.h (modified) (1 diff)
• transfer_descriptor.h (modified) (1 diff)

uspace/drv/bus/usb/ehci/hw_struct/iso_transfer_descriptor.h

@@ -72 +72 @@
         /* 64 bit struct only */
         volatile uint32_t extended_bp[7];
-} itd_t;
+} __attribute__((packed,aligned(32))) itd_t;
 #endif
 /**

uspace/drv/bus/usb/ehci/hw_struct/queue_head.h

@@ -143 +143 @@
         /* 64 bit struct only */
         volatile uint32_t extended_bp[5];
-} qh_t;
+} __attribute__((packed,aligned(32))) qh_t;
 
 static inline void qh_append_qh(qh_t *qh, const qh_t *next)

uspace/drv/bus/usb/ehci/hw_struct/split_iso_transfer_descriptor.h

@@ -89 +89 @@
         /* 64 bit struct only */
         volatile uint32_t extended_bp[2];
-} sitd_t;
+} __attribute__((packed,aligned(32))) sitd_t;
 #endif
 /**

uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.h

@@ -77 +77 @@
         volatile uint32_t extended_bp[5];
 
-        /* TDs must be 32-byte aligned */
-        PADD32 [3];
-
-} __attribute__((packed)) td_t;
+} __attribute__((packed,aligned(32))) td_t;
 
 static_assert(sizeof(td_t) % 32 == 0);