[commit] r2985 - cpu/arm/olpc/1.75 cpu/arm/olpc/3.0 cpu/x86/pc/olpc/via dev/geode

[repository service]

Author: quozl
Date: Thu May 24 01:44:15 2012
New Revision: 2985
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2985

Log:
OLPC - remove USB serial adapter keyboard support from all models, #11871 #11887

Modified:
   cpu/arm/olpc/1.75/usb.fth
   cpu/arm/olpc/3.0/usb.fth
   cpu/x86/pc/olpc/via/usb.fth
   dev/geode/usb.fth

Modified: cpu/arm/olpc/1.75/usb.fth
==============================================================================
--- cpu/arm/olpc/1.75/usb.fth	Thu May 24 01:44:04 2012	(r2984)
+++ cpu/arm/olpc/1.75/usb.fth	Thu May 24 01:44:15 2012	(r2985)
@@ -96,7 +96,6 @@
 alias p2 probe-usb

0 value usb-keyboard-ih
-0 value usb-serial-ih

: attach-usb-keyboard  ( -- )
    " usb-keyboard" expand-alias  if   ( devspec$ )
@@ -118,34 +117,16 @@
    then
 ;

-: attach-usb-serial  ( -- )
-   " /usb/serial" open-dev  ?dup  if
-      to usb-serial-ih
-      usb-serial-ih add-input
-   then
-;
-
-: detach-usb-serial  ( -- )
-   usb-serial-ih  if
-      usb-serial-ih remove-input
-      usb-serial-ih close-dev
-      0 to usb-serial-ih
-   then
-;
-
 : ?usb-keyboard  ( -- )
    attach-usb-keyboard
-   attach-usb-serial
 ;

: usb-quiet  ( -- )
    detach-usb-keyboard
-   detach-usb-serial
    " /usb" " reset-usb" execute-device-method drop
 ;

: suspend-usb  ( -- )
-   detach-usb-serial
    detach-usb-keyboard
    " /usb" " sleep" execute-device-method drop
 ;
@@ -161,7 +142,6 @@
    then
    silent-probe-usb
    attach-usb-keyboard
-   attach-usb-serial
 ;

\ Unlink every node whose phys.hi component matches port

Modified: cpu/arm/olpc/3.0/usb.fth
==============================================================================
--- cpu/arm/olpc/3.0/usb.fth	Thu May 24 01:44:04 2012	(r2984)
+++ cpu/arm/olpc/3.0/usb.fth	Thu May 24 01:44:15 2012	(r2985)
@@ -159,9 +159,6 @@

: ?usb-keyboard  ( -- )
    attach-usb-keyboard
-   " /usb/serial" open-dev  ?dup  if
-      add-input
-   then
 ;

: usb-quiet  ( -- )

Modified: cpu/x86/pc/olpc/via/usb.fth
==============================================================================
--- cpu/x86/pc/olpc/via/usb.fth	Thu May 24 01:44:04 2012	(r2984)
+++ cpu/x86/pc/olpc/via/usb.fth	Thu May 24 01:44:15 2012	(r2985)
@@ -85,9 +85,6 @@

: ?usb-keyboard  ( -- )
    attach-usb-keyboard
-   " /usb/serial" open-dev  ?dup  if
-      add-input
-   then
 ;
 : suspend-usb  ( -- )
    detach-usb-keyboard

Modified: dev/geode/usb.fth
==============================================================================
--- dev/geode/usb.fth	Thu May 24 01:44:04 2012	(r2984)
+++ dev/geode/usb.fth	Thu May 24 01:44:15 2012	(r2985)
@@ -74,9 +74,6 @@

: ?usb-keyboard  ( -- )
    attach-usb-keyboard
-   " /usb/serial" open-dev  ?dup  if
-      add-input
-   then
 ;

\ Unlink every node whose phys.hi component matches port