瀏覽代碼

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)

wdenk 21 年之前
父節點
當前提交
9d9e283790
共有 2 個文件被更改,包括 7 次插入2 次删除
  1. 4 0
      CHANGELOG
  2. 3 2
      drivers/sl811_usb.c

+ 4 - 0
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.
 

+ 3 - 2
drivers/sl811_usb.c

@@ -228,7 +228,7 @@ int usb_lowlevel_stop(void)
 
 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 @@ static int sl811_send_packet(int dir_to_host, int data1, __u8 *buffer, int len)
 		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;