diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-12-09 22:30:11 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-12-09 22:30:11 +0100 |
| commit | 695a5f339a898b6512a1677eafeb0418caba48a6 (patch) | |
| tree | 9344767986a6dea39d8f1bde5f3f8cbf894154d4 /include | |
| parent | ee2e9ba917a62cc2e3a484bb79c8da0e01cb93ed (diff) | |
| parent | d2776827315c3d469b8cb4cec14d58877798daa2 (diff) | |
| download | u-boot-695a5f339a898b6512a1677eafeb0418caba48a6.tar.gz u-boot-695a5f339a898b6512a1677eafeb0418caba48a6.tar.xz u-boot-695a5f339a898b6512a1677eafeb0418caba48a6.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
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 84a77b2f8b..510df95d62 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 526fcd920d..ece0e95b61 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); |