Add some limited support for low-speed devices to SL811 USB controller
(at least "usb reset" now passes successfully and "usb info" displays
correct information)
diff --git a/CHANGELOG b/CHANGELOG
index 0ddcc61..5e9c5e5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,10 @@
Changes since U-Boot 1.1.1:
======================================================================
+* Add some limited support for low-speed devices to SL811 USB controller
+ (at least "usb reset" now passes successfully and "usb info" displays
+ correct information)
+
* Change init sequence for multiple network interfaces: initialize
on-chip interfaces before external cards.
diff --git a/drivers/sl811_usb.c b/drivers/sl811_usb.c
index 5136cdc..61604e5 100644
--- a/drivers/sl811_usb.c
+++ b/drivers/sl811_usb.c
@@ -228,7 +228,7 @@
static int calc_needed_buswidth(int bytes, int low_speed)
{
- return bytes * 8 + 512;
+ return low_speed ? 0 : bytes * 8 + 512;
}
static int sl811_send_packet(int dir_to_host, int data1, __u8 *buffer, int len)
@@ -253,7 +253,8 @@
if (!dir_to_host && len)
sl811_write_buf(0x10, buffer, len);
- if (sl811_read(SL811_SOFCNTDIV)*64 < calc_needed_buswidth(len, 0))
+ if (sl811_read(SL811_SOFCNTDIV)*64 <
+ calc_needed_buswidth(len, rh_status.wPortStatus & USB_PORT_STAT_LOW_SPEED))
ctrl |= SL811_USB_CTRL_SOF;
else
ctrl &= ~SL811_USB_CTRL_SOF;