Changeset 2164

Timestamp:

Feb 3, 2011 7:57:03 AM (2 years ago)

Author:

wmb

Message:

USB - fixed OHCI breakage from recent probing rewrite.

Location:

dev/usb2/hcd/ohci

Files:

• ohci.fth (modified) (2 diffs)
• probe.fth (modified) (1 diff)

dev/usb2/hcd/ohci/ohci.fth

@@ -59 +59 @@
 : hc-cntl-set  ( bit-mask -- )  hc-cntl@ swap or hc-cntl!  ;
 
+: reset-port  ( port -- )
+   >r
+   h# 1.0002 r@ hc-rh-psta!             \ enable port
+   h# 10 r@ hc-rh-psta!                 \ reset port
+   r@ d# 10 0  do
+      d# 10 ms
+      dup hc-rh-psta@ 10.0000 and  ?leave
+   loop  drop
+   r@ hc-rh-psta@ 10.0000 and 0=  if  abort  then
+   h# 1f.0000 r> hc-rh-psta!            \ clear status change bits
+   d# 256 ms
+;
+
 : reset-usb  ( -- )
    ohci-reg dup 0=  if  map-regs  then
@@ -66 +79 @@
    0= if  unmap-regs  then
 ;
+
 : init-ohci-regs  ( -- )
    hcca-phys hc-hcca!           \ physical address of hcca

dev/usb2/hcd/ohci/probe.fth

@@ -4 +4 @@
 hex
 headers
-
-: reset-port  ( port -- )
-   >r
-   h# 1.0002 r@ hc-rh-psta!             \ enable port
-   10 r@ hc-rh-psta!                    \ reset port
-   r@ d# 10 0  do
-      d# 10 ms
-      dup hc-rh-psta@ 10.0000 and  ?leave
-   loop  drop
-   r@ hc-rh-psta@ 10.0000 and 0=  if  abort  then
-   h# 1f.0000 r> hc-rh-psta!            \ clear status change bits
-   100 ms
-;
 
 : probe-root-hub-port  ( port -- )