diff options
| author | Björn Stenberg <bjorn@haxx.se> | 2008-02-11 14:26:25 +0000 |
|---|---|---|
| committer | Björn Stenberg <bjorn@haxx.se> | 2008-02-11 14:26:25 +0000 |
| commit | 2f7cffa204eaa2675b0c6782462b19f4f09bff12 (patch) | |
| tree | 54ffb4cada2c8db9d0feb4c31efc02cb3ab18a1d /firmware/export | |
| parent | 9811fc9abf6c3b2bb9500a99c14a64ee29641b09 (diff) | |
Major USB fixes by Frank Gevaerts. Still disabled in builds, #define USE_ROCKBOX_USB to test.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16279 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
| -rw-r--r-- | firmware/export/disk.h | 5 | ||||
| -rw-r--r-- | firmware/export/usb_ch9.h | 2 | ||||
| -rw-r--r-- | firmware/export/usb_drv.h | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/firmware/export/disk.h b/firmware/export/disk.h index 9672a6d318..d6d6796e9e 100644 --- a/firmware/export/disk.h +++ b/firmware/export/disk.h @@ -39,4 +39,9 @@ int disk_mount_all(void); /* returns the # of successful mounts */ int disk_mount(int drive); int disk_unmount(int drive); +/* The number of 512-byte sectors in a "logical" sector. Needed for ipod 5.5G */ +#ifdef MAX_LOG_SECTOR_SIZE +extern int disk_sector_multiplier; +#endif + #endif diff --git a/firmware/export/usb_ch9.h b/firmware/export/usb_ch9.h index b8fe181158..1bfc152a8a 100644 --- a/firmware/export/usb_ch9.h +++ b/firmware/export/usb_ch9.h @@ -244,7 +244,7 @@ struct usb_string_descriptor { uint8_t bLength; uint8_t bDescriptorType; - uint16_t wData[1]; /* UTF-16LE encoded */ + uint16_t wString[]; /* UTF-16LE encoded */ } __attribute__ ((packed)); /* note that "string" zero is special, it holds language codes that diff --git a/firmware/export/usb_drv.h b/firmware/export/usb_drv.h index c503a846ed..6a37144c1a 100644 --- a/firmware/export/usb_drv.h +++ b/firmware/export/usb_drv.h @@ -32,5 +32,8 @@ void usb_drv_set_address(int address); void usb_drv_reset_endpoint(int endpoint, bool send); void usb_drv_wait(int endpoint, bool send); bool usb_drv_powered(void); +int usb_drv_get_last_transfer_status(void); +int usb_drv_get_last_transfer_length(void); +int usb_drv_port_speed(void); #endif |