diff options
| author | Wolfgang Denk <[email protected]> | 2008-12-09 22:30:22 +0100 |
|---|---|---|
| committer | Wolfgang Denk <[email protected]> | 2008-12-09 22:30:22 +0100 |
| commit | f68a0c91496b75156006ef43fd87d37ee28bc569 (patch) | |
| tree | cd0a7aeca4f0c2cdaf35e52fa80116ef6d19a522 /include | |
| parent | d5e710a3974e0e9bbac5bf15d815b0ead1bec8a8 (diff) | |
| parent | 695a5f339a898b6512a1677eafeb0418caba48a6 (diff) | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'include')
| -rw-r--r-- | include/usb.h | 2 | ||||
| -rw-r--r-- | include/usbdcore_omap1510.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/usb.h b/include/usb.h index 84a77b2f8ba..510df95d628 100644 --- a/include/usb.h +++ b/include/usb.h @@ -91,7 +91,7 @@ struct usb_endpoint_descriptor { unsigned char bInterval; unsigned char bRefresh; unsigned char bSynchAddress; -} __attribute__ ((packed)); +} __attribute__ ((packed)) __attribute__ ((aligned(2))); /* Interface descriptor */ struct usb_interface_descriptor { diff --git a/include/usbdcore_omap1510.h b/include/usbdcore_omap1510.h index 526fcd920db..ece0e95b61d 100644 --- a/include/usbdcore_omap1510.h +++ b/include/usbdcore_omap1510.h @@ -168,8 +168,8 @@ #define UDC_IN_ENDPOINT 1 #define UDC_IN_PACKET_SIZE 64 #define UDC_INT_ENDPOINT 5 -#define UDC_INT_PKTSIZE 16 -#define UDC_BULK_PKTSIZE 16 +#define UDC_INT_PACKET_SIZE 16 +#define UDC_BULK_PACKET_SIZE 16 void udc_irq (void); /* Flow control */ @@ -177,7 +177,7 @@ void udc_set_nak(int epid); void udc_unset_nak (int epid); /* Higher level functions for abstracting away from specific device */ -void udc_endpoint_write(struct usb_endpoint_instance *endpoint); +int udc_endpoint_write(struct usb_endpoint_instance *endpoint); int udc_init (void); |