Changeset 3004

Timestamp:

Jun 7, 2012 8:05:24 AM (12 months ago)

Author:

quozl

Message:

OLPC - probe all ports of the EHC during a test, regardless of whether they are in use. Remove fisheye test from default testing, because it is not used in manufacturing, and had been incorrectly used in the field to verify a port is working. No change to manufacturing tests. #11845.

File:

• dev/usb2/hcd/ehci/probe.fth (modified) (2 diffs)

dev/usb2/hcd/ehci/probe.fth

@@ -61 +61 @@
 ;
 
+\ Port owned by usb 1.1 controller (2000) or device is present (1)
 : port-connected?  ( port# -- flag )  portsc@ h# 2001 and  ;
 : wait-connect  ( port# -- error? )
@@ -154 +155 @@
 ;
 
+: .occupied  ( port -- )  ." USB 2.0 port " u. ."  in use" cr  ;
+: regs{  ( -- prev )  ehci-reg dup 0=  if  map-regs  then  ;
+: }regs  ( prev -- )  0=  if  unmap-regs  then  ;
+
+: fisheye  ( -- )
+   regs{
+   #testable-ports  0  ?do
+      i port-connected?  if
+         i .occupied
+      else
+         ." Fisheye pattern out to USB 2.0 port " i u. cr
+         i test-port-begin
+         d# 2,000 ms
+         i test-port-end
+         0 i portsc!  i reset-port  i power-port
+      then
+   loop
+   }regs
+;
+
+: thorough  ( -- error? )
+   #testable-ports  0  ?do
+      i port-connected?  if
+         i .occupied
+      else
+         ." Please connect a device to USB port " i u. cr
+         i wait-connect  if  true unloop exit  then
+      then
+   loop
+   false
+;
+
+: sagacity  ( -- error? )
+   #testable-ports  0  ?do
+      ." USB port " i u. ." ... "
+      i port-connected?  if
+         i wait-connect  if  true unloop exit  then
+      else
+         ." Empty" cr
+      then
+   loop
+   false
+;
+
 : selftest  ( -- error? )
-   ehci-reg dup 0=  if  map-regs  then
-
-   #testable-ports  0  ?do
-      i port-connected?  if             \ Port owned by usb 1.1 controller (2000) or device is present (1)
-         ." USB 2.0 port " i u. ."  in use" cr
-      else
-         diagnostic-mode?  if
-            ." Please connect a device to USB port " i u. cr
-            i wait-connect  if  true unloop exit  then
-         else
-            ." Fisheye pattern out to USB 2.0 port " i u. cr
-            i test-port-begin
-            d# 2,000 ms
-            i test-port-end
-            0 i portsc!  i reset-port  i power-port
-         then
-      then
-   loop
-   0=  if  unmap-regs  then
-   false
+   regs{                        ( prev )
+   diagnostic-mode?  if
+      thorough
+   else
+      sagacity
+   then                         ( prev error? )
+   swap }regs                   ( error? )
 ;