Changeset 3013

Timestamp:

Jun 19, 2012 4:17:19 AM (12 months ago)

Author:

quozl

Message:

OLPC - dev/usb2, revert svn 3011 as it broke production use of USB scanners, reproduced also by me.

Location:

dev/usb2/hcd

Files:

• device.fth (modified) (4 diffs)
• ehci/probe.fth (modified) (2 diffs)

dev/usb2/hcd/device.fth

@@ -392 +392 @@
 \ Executed in root hub node context
 : get-str-descriptors  ( -- )
-   language                                     ( lang )
-   dup d# 14 dev-desc@ v$-desc-buf get-string to /v$-desc-buf
-   dup d# 15 dev-desc@ d$-desc-buf get-string to /d$-desc-buf
-       d# 16 dev-desc@ s$-desc-buf get-string to /s$-desc-buf
+   language                                     ( lang )
+   dup dev-desc-buf d# 14 + c@ v$-desc-buf get-string to /v$-desc-buf
+   dup dev-desc-buf d# 15 + c@ d$-desc-buf get-string to /d$-desc-buf
+       dev-desc-buf d# 16 + c@ s$-desc-buf get-string to /s$-desc-buf
 ;
 
@@ -401 +401 @@
 : refresh-desc-bufs  ( dev -- )
    set-target
-   dev-desc-buf d# 18 get-dev-desc to /dev-desc-buf             \ Refresh dev-desc-buf
-   cfg-desc-buf     0 get-cfg-desc to /cfg-desc-buf             \ Refresh cfg-desc-buf
+   dev-desc-buf 12 get-dev-desc to /dev-desc-buf                \ Refresh dev-desc-buf
+   cfg-desc-buf  0 get-cfg-desc to /cfg-desc-buf                \ Refresh cfg-desc-buf
    get-str-descriptors
 ;
 
 \ Executed in root hub node context
-: get-initial-descriptors  ( -- )
-   \ Re-read the full device descriptor to pick up the vendor info
-   dev-desc-buf d# 18 get-dev-desc  drop                ( )
-   cfg-desc-buf     0 get-cfg-desc to /cfg-desc-buf     ( )
+: get-initial-descriptors  ( dev -- )
+   dev-desc-buf /pipe0 get-dev-desc  if         ( dev )
+      dev-desc-buf 7 + c@ 0 rot di-maxpayload!  ( )
+   else                                         ( dev )
+      drop                                      ( )
+   then                                         ( )
+   cfg-desc-buf 0 get-cfg-desc to /cfg-desc-buf ( )
 ;
 
 \ Executed in hub node context (root hub or subordinate hub) - creates new child nodes via (make-device-node)
 : make-device-node  ( port dev -- )
-   " get-initial-descriptors" my-self $call-method      ( port dev )
+   dup " get-initial-descriptors" my-self $call-method  ( port dev )
    /cfg-desc-buf 0=  if  2drop  exit  then              ( port dev )
    asso-class?  if  1  else  cfg-desc-buf 4 + c@  then  ( port dev #intf )
@@ -441 +444 @@
 ;
 
-: get-initial-dev-desc  ( dev -- )
-   dev-desc-buf d# 18 erase                     ( dev )
-   dev-desc-buf d# 64 get-dev-desc  0=  if      ( dev )
-      dev-desc-buf /pipe0 get-dev-desc  0=  if  ( dev )
-         drop exit
-      then
-   then
-   7 dev-desc@ 0 rot di-maxpayload!             ( )
-;
-
 \ Executed in the root hub node context
 : setup-new-node  ( port speed hub-port hub-dev -- true | port dev xt false )
@@ -461 +454 @@
 
    0 set-target                         ( port dev )    \ Address it as device 0
-
-   \ Some devices (e.g. Lexar USB-to-SD and at least one USB FLASH drive) fail
-   \ on set-address unless you first read the device descriptor from address 0.
-   dup get-initial-dev-desc             ( port dev )
-
+   over reset-port                      ( port dev )    \ Some devices want to be reset here
    dup set-address  if                  ( port dev )    \ Assign it usb addr dev
       ." Retrying with a delay" cr

dev/usb2/hcd/ehci/probe.fth

@@ -8 +8 @@
 
 : make-root-hub-node  ( port -- )
+   \ Some devices (e.g. Lexar USB-to-SD) fail unless you get the cfg desc from device 0 first
    0 set-target \ First address it as device 0  ( port )
    port-speed 0 di-speed!     \ Use high speed for getting the device descriptor
-   dup reset-port                               ( port )
+   dev-desc-buf h# 40 get-cfg-desc drop         ( port )
+
    port-speed                                   ( port speed )
 
@@ -17 +19 @@
 
    \ Execute setup-new-node in root context and make-device-node in hub node context
-   setup-new-node  if  execute  then            ( )
+   setup-new-node  if  execute  then    ( )
 ;