diff options
author | Tomasz Malesinski <tomal@rockbox.org> | 2006-02-12 23:18:36 +0000 |
---|---|---|
committer | Tomasz Malesinski <tomal@rockbox.org> | 2006-02-12 23:18:36 +0000 |
commit | d1e55082ee116180bc5fa279adb10a41349a8173 (patch) | |
tree | a83146976d2946fccfa7a88eb44cfaefbf7cf025 /firmware | |
parent | e7f7c3d15c2eccdc77d866fce6d4fe918567cac1 (diff) | |
download | rockbox-d1e55082ee116180bc5fa279adb10a41349a8173.tar.gz rockbox-d1e55082ee116180bc5fa279adb10a41349a8173.zip |
Changed endpoint 0 max packet size to 64 in order to make the driver
work in highspeed mode. Changed debugging code a little.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8669 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/usb_serial.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/firmware/usb_serial.c b/firmware/usb_serial.c index 0c4fb9d896..4c49b1b631 100644 --- a/firmware/usb_serial.c +++ b/firmware/usb_serial.c | |||
@@ -153,7 +153,7 @@ static unsigned char device_descriptor[18] = { | |||
153 | 0x10, 0x01, /* USB version (1.1) */ | 153 | 0x10, 0x01, /* USB version (1.1) */ |
154 | 0xff, 0xff, /* class and subclass */ | 154 | 0xff, 0xff, /* class and subclass */ |
155 | 0xff, /* protocol */ | 155 | 0xff, /* protocol */ |
156 | 0x08, /* max packet size 0 */ | 156 | 0x40, /* max packet size 0 */ |
157 | 0x02, 0x41, /* vendor (iRiver) */ | 157 | 0x02, 0x41, /* vendor (iRiver) */ |
158 | 0x07, 0xee, /* product (0xee07) */ | 158 | 0x07, 0xee, /* product (0xee07) */ |
159 | 0x01, 0x00, /* device version */ | 159 | 0x01, 0x00, /* device version */ |
@@ -310,8 +310,8 @@ void usb_setup(int reset) | |||
310 | 310 | ||
311 | ISP1582_ADDRESS = reset ? 0x80: 0; | 311 | ISP1582_ADDRESS = reset ? 0x80: 0; |
312 | 312 | ||
313 | usb_setup_endpoint(ep_index(0, DIR_RX), 8, 0); | 313 | usb_setup_endpoint(ep_index(0, DIR_RX), 64, 0); |
314 | usb_setup_endpoint(ep_index(0, DIR_TX), 8, 0); | 314 | usb_setup_endpoint(ep_index(0, DIR_TX), 64, 0); |
315 | 315 | ||
316 | ISP1582_MODE |= 1; /* SOFTCT on */ | 316 | ISP1582_MODE |= 1; /* SOFTCT on */ |
317 | 317 | ||
@@ -808,11 +808,11 @@ static void usb_handle_int(int i) | |||
808 | #ifdef LCD_DEBUG | 808 | #ifdef LCD_DEBUG |
809 | /* | 809 | /* |
810 | char s[10]; | 810 | char s[10]; |
811 | int_count[i]++; | ||
812 | snprintf(s, sizeof(s), "%02d", i); | 811 | snprintf(s, sizeof(s), "%02d", i); |
813 | lcd_puts(0, 2, s); | 812 | lcd_puts(0, 2, s); |
814 | lcd_update(); | 813 | lcd_update(); |
815 | */ | 814 | */ |
815 | int_count[i]++; | ||
816 | if (i == 10) | 816 | if (i == 10) |
817 | log_char('o'); | 817 | log_char('o'); |
818 | if (i == 11) | 818 | if (i == 11) |
@@ -845,7 +845,7 @@ static void usb_handle_int(int i) | |||
845 | void usb_handle_interrupts(void) | 845 | void usb_handle_interrupts(void) |
846 | { | 846 | { |
847 | #ifdef LCD_DEBUG | 847 | #ifdef LCD_DEBUG |
848 | /* char s[20]; */ | 848 | char s[20]; |
849 | #endif | 849 | #endif |
850 | 850 | ||
851 | while (1) | 851 | while (1) |
@@ -870,14 +870,12 @@ void usb_handle_interrupts(void) | |||
870 | usb_handle_int(i); | 870 | usb_handle_int(i); |
871 | 871 | ||
872 | #ifdef LCD_DEBUG | 872 | #ifdef LCD_DEBUG |
873 | /* | ||
874 | for (i = 0; i < 8; i++) | 873 | for (i = 0; i < 8; i++) |
875 | snprintf(s + i * 2, 3, "%02x", int_count[i]); | 874 | snprintf(s + i * 2, 3, "%02x", int_count[i]); |
876 | lcd_puts(0, 6, s); | 875 | lcd_puts(0, 6, s); |
877 | for (i = 0; i < 8; i++) | 876 | for (i = 0; i < 8; i++) |
878 | snprintf(s + i * 2, 3, "%02x", int_count[i + 8]); | 877 | snprintf(s + i * 2, 3, "%02x", int_count[i + 8]); |
879 | lcd_puts(0, 7, s); | 878 | lcd_puts(0, 7, s); |
880 | */ | ||
881 | #endif | 879 | #endif |
882 | } | 880 | } |
883 | #ifdef LCD_DEBUG | 881 | #ifdef LCD_DEBUG |