Changeset 2983

Timestamp:

May 21, 2012 10:59:18 AM (12 months ago)

Author:

quozl

Message:

OLPC XO-1.75 - avoid Data Abort during preparation for Linux kernel load when a PL2303 USB serial adapter is present, by removing the device from the console multiplexor and closing it. #11871.

File:

• cpu/arm/olpc/1.75/usb.fth (modified) (3 diffs)

cpu/arm/olpc/1.75/usb.fth

@@ -97 +97 @@
 
 0 value usb-keyboard-ih
+0 value usb-serial-ih
 
 : attach-usb-keyboard  ( -- )
@@ -118 +119 @@
 ;
 
+: 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
-   " /usb/serial" open-dev  ?dup  if
-      add-input
-   then
+   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
@@ -146 +162 @@
    silent-probe-usb
    attach-usb-keyboard
+   attach-usb-serial
 ;