[openfirmware] [commit] r3618 - in cpu/x86/pc/olpc: . via

[repository service]

Author: quozl
Date: Sat Mar 16 01:27:46 2013
New Revision: 3618
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3618

Log:
OLPC XO-1.5 - add serial terminal

Modified:
   cpu/x86/pc/olpc/terminal.fth
   cpu/x86/pc/olpc/via/fw.bth

Modified: cpu/x86/pc/olpc/terminal.fth
==============================================================================
--- cpu/x86/pc/olpc/terminal.fth	Sat Mar 16 01:08:03 2013	(r3617)
+++ cpu/x86/pc/olpc/terminal.fth	Sat Mar 16 01:27:46 2013	(r3618)
@@ -182,6 +182,20 @@
    until                               ( adr len' )
 ;
 
+\
+\ FIXME: XO-1, seen only once, ukey? did stop returning true, and ukey
+\ therefore hung waiting for ukey?
+\
+\ condition was cleared by  0 uart@  despite ukey? returning false
+\
+\ when it occurs again, try looking at fifo error summary bit, and
+\ line status reg, and consider comment from 16550.fth:
+\
+\ "I have seen conditions where a UART will report, via an interrupt,
+\ that a character is available, but the line status register won't
+\ report it."
+\
+
 : use-uart
    uart-console-off
    ['] uart-open   to  serial-open
@@ -200,10 +214,13 @@
 
 : usb-open  ( -- )
    " /usb/serial" open-dev ?dup if  to serial-ih  exit  then
-[ifdef] olpc-cl1
-   " /usb at f,4/serial" open-dev ?dup if  to serial-ih  exit  then
-   " /usb at f,5/serial" open-dev ?dup if  to serial-ih  exit  then
-[then]
+   [ifdef] olpc-cl1
+      \ XO-1.5
+      " /usb at 10/serial" open-dev ?dup if  to serial-ih  exit  then
+      \ XO-1
+      " /usb at f,4/serial" open-dev ?dup if  to serial-ih  exit  then
+      " /usb at f,5/serial" open-dev ?dup if  to serial-ih  exit  then
+   [then]
    true abort" can't open USB serial adapter"
 ;
 

Modified: cpu/x86/pc/olpc/via/fw.bth
==============================================================================
--- cpu/x86/pc/olpc/via/fw.bth	Sat Mar 16 01:08:03 2013	(r3617)
+++ cpu/x86/pc/olpc/via/fw.bth	Sat Mar 16 01:27:46 2013	(r3618)
@@ -743,6 +743,7 @@
 
 fload ${BP}/cpu/x86/pc/olpc/charge.fth     \ Fancy battery charge logger
 fload ${BP}/cpu/x86/pc/olpc/diskspeed.fth  \ Mass storage speed test
+fload ${BP}/cpu/x86/pc/olpc/terminal.fth   \ Serial terminal emulator
 fload ${BP}/cpu/x86/pc/olpc/apt.fth        \ Common developer utilities
 
 tag-file @ fclose  tag-file off