r1573 - cpu/x86/pc/olpc/via dev/geode

Author: wmb
Date: 2009-12-11 07:18:41 +0100 (Fri, 11 Dec 2009)
New Revision: 1573

Modified:
   cpu/x86/pc/olpc/via/usb.fth
   dev/geode/usb.fth
Log:
OLPC - added silent-probe-usb command.

Modified: cpu/x86/pc/olpc/via/usb.fth
===================================================================
--- cpu/x86/pc/olpc/via/usb.fth	2009-12-11 06:14:07 UTC (rev 1572)
+++ cpu/x86/pc/olpc/via/usb.fth	2009-12-11 06:18:41 UTC (rev 1573)
@@ -45,18 +45,19 @@
    then
 ;

+: silent-probe-usb  ( -- )
+   " /" ['] (probe-usb2) scan-subtree
+   " /" ['] (probe-usb1) scan-subtree
+   report-disk report-net report-keyboard
+;
 : probe-usb  ( -- )
+   silent-probe-usb
+
    ." USB2 devices:" cr
-   " /" ['] (probe-usb2) scan-subtree
    " /" ['] (show-usb2) scan-subtree

." USB1 devices:" cr
-   " /" ['] (probe-usb1) scan-subtree
    " /" ['] (show-usb1) scan-subtree
-
-   report-disk
-   report-net
-   report-keyboard
 ;
 alias p2 probe-usb

Modified: dev/geode/usb.fth
===================================================================
--- dev/geode/usb.fth	2009-12-11 06:14:07 UTC (rev 1572)
+++ dev/geode/usb.fth	2009-12-11 06:18:41 UTC (rev 1573)
@@ -31,19 +31,22 @@
    r> to exit?
 ;

-: probe-usb  ( -- )
-   ." USB2 devices:" cr
+: silent-probe-usb  ( -- )
    " /usb@f,5" open-dev  ?dup  if  close-dev  then
-   " /usb@f,5" $nopage-show-devs
-
-   ." USB1 devices:" cr
    " /usb@f,4" open-dev  ?dup  if  close-dev  then
-   " /usb@f,4" $nopage-show-devs

report-disk
    report-net
    report-keyboard
 ;
+: probe-usb  ( -- )
+   silent-probe-usb
+
+   ." USB2 devices:" cr
+   " /usb@f,5" $nopage-show-devs
+   ." USB1 devices:" cr
+   " /usb@f,4" $nopage-show-devs
+;
 alias probe-usb2 probe-usb
 alias p2 probe-usb2