diff options
Diffstat (limited to 'src/drivers/usb')
-rw-r--r-- | src/drivers/usb/ehci.h | 8 | ||||
-rw-r--r-- | src/drivers/usb/usb_ch9.h | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/drivers/usb/ehci.h b/src/drivers/usb/ehci.h index 25c08a0a1b..33b7854df5 100644 --- a/src/drivers/usb/ehci.h +++ b/src/drivers/usb/ehci.h @@ -19,6 +19,8 @@ #ifndef EHCI_H #define EHCI_H +#include <compiler.h> + /* EHCI register interface, corresponds to EHCI Revision 0.95 specification */ /* Section 2.2 Host Controller Capability Registers */ @@ -52,7 +54,7 @@ struct ehci_caps { #define HCC_PGM_FRAMELISTLEN(p) ((p)&(1 << 1)) /* true: periodic_size changes*/ #define HCC_64BIT_ADDR(p) ((p)&(1)) /* true: can use 64-bit addr */ u8 portroute[8]; /* nibbles for routing - offset 0xC */ -} __attribute__ ((packed)); +} __packed; /* Section 2.3 Host Controller Operational Registers */ @@ -148,7 +150,7 @@ struct ehci_regs { #define PORT_CSC (1<<1) /* connect status change */ #define PORT_CONNECT (1<<0) /* device connected */ #define PORT_RWC_BITS (PORT_CSC | PORT_PEC | PORT_OCC) -} __attribute__ ((packed)); +} __packed; #define USBMODE 0x68 /* USB Device mode */ #define USBMODE_SDIS (1<<3) /* Stream disable */ @@ -192,7 +194,7 @@ struct ehci_dbg_port { u32 data47; u32 address; #define DBGP_EPADDR(dev, ep) (((dev)<<8)|(ep)) -} __attribute__ ((packed)); +} __packed; #define USB_DEBUG_DEVNUM 127 diff --git a/src/drivers/usb/usb_ch9.h b/src/drivers/usb/usb_ch9.h index 4509287ce4..271b7d1cac 100644 --- a/src/drivers/usb/usb_ch9.h +++ b/src/drivers/usb/usb_ch9.h @@ -17,6 +17,8 @@ #ifndef USB_CH9_H #define USB_CH9_H +#include <compiler.h> + #define USB_DIR_OUT 0 /* to device */ #define USB_DIR_IN 0x80 /* to host */ @@ -111,7 +113,7 @@ struct usb_ctrlrequest { u16 wValue; u16 wIndex; u16 wLength; -} __attribute__ ((packed)); +} __packed; struct usb_debug_descriptor { u8 bLength; |