Author: quozl Date: Wed Feb 15 01:29:24 2012 New Revision: 2865 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2865
Log: Terminal Emulator - global change, black-letters replaced with cancel, provides identical display on OpenFirmware, fixes display on black background terminal emulators, such as Linux console, xterm, and others.
Modified: cpu/arm/olpc/1.75/testinstructions.fth cpu/arm/olpc/3.0/testinstructions.fth cpu/arm/olpc/build-fw.fth cpu/arm/olpc/help.fth cpu/x86/pc/alex/fw.bth cpu/x86/pc/biosload/fw.bth cpu/x86/pc/biosload/usb.fth cpu/x86/pc/linux.fth cpu/x86/pc/lxdevel/fw.bth cpu/x86/pc/neptune/fw.bth cpu/x86/pc/newton/fw.bth cpu/x86/pc/olpc/copynand.fth cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/help.fth cpu/x86/pc/olpc/keyinsert.fth cpu/x86/pc/olpc/keyject.fth cpu/x86/pc/olpc/mfgdata.fth cpu/x86/pc/olpc/mfgkeyject.fth cpu/x86/pc/olpc/nandstat.fth cpu/x86/pc/olpc/security.fth cpu/x86/pc/olpc/via/banner.fth cpu/x86/pc/olpc/via/cstate.fth cpu/x86/pc/olpc/via/factory.fth cpu/x86/pc/olpc/via/fsupdate.fth cpu/x86/pc/olpc/via/fw.bth cpu/x86/pc/olpc/via/help.fth cpu/x86/pc/olpc/via/keyject.fth cpu/x86/pc/olpc/via/mfgtest.fth cpu/x86/pc/olpc/via/temptest.fth cpu/x86/pc/olpc/via/testinstructions.fth dev/olpc/kb3700/ecio.fth dev/olpc/touchpad/touchpad.fth ofw/core/ofwcore.fth
Modified: cpu/arm/olpc/1.75/testinstructions.fth ============================================================================== --- cpu/arm/olpc/1.75/testinstructions.fth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/arm/olpc/1.75/testinstructions.fth Wed Feb 15 01:29:24 2012 (r2865) @@ -422,7 +422,7 @@ idle ; : message-off ( -- ) d# 2 d# 27 at-xy kill-line ; -: message ( adr len -- ) cursor-off message-off red-letters type black-letters ; +: message ( adr len -- ) cursor-off message-off red-letters type cancel ;
: performed ( -- ) -1 to blink-state
Modified: cpu/arm/olpc/3.0/testinstructions.fth ============================================================================== --- cpu/arm/olpc/3.0/testinstructions.fth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/arm/olpc/3.0/testinstructions.fth Wed Feb 15 01:29:24 2012 (r2865) @@ -423,7 +423,7 @@ idle ; : message-off ( -- ) d# 2 d# 27 at-xy kill-line ; -: message ( adr len -- ) cursor-off message-off red-letters type black-letters ; +: message ( adr len -- ) cursor-off message-off red-letters type cancel ;
: performed ( -- ) -1 to blink-state
Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/arm/olpc/build-fw.fth Wed Feb 15 01:29:24 2012 (r2865) @@ -1038,7 +1038,7 @@ unfreeze visible cursor-on ( no-banner? ) if banner then \ Reissue banner if it was suppressed
- blue-letters ." Type 'help' for more information." black-letters cancel + blue-letters ." Type 'help' for more information." cancel cr cr
enable-user-aborts
Modified: cpu/arm/olpc/help.fth ============================================================================== --- cpu/arm/olpc/help.fth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/arm/olpc/help.fth Wed Feb 15 01:29:24 2012 (r2865) @@ -2,32 +2,32 @@
warning @ warning off : help ( -- ) - blue-letters ." INSTALLATION:" black-letters mcr + blue-letters ." INSTALLATION:" cancel mcr \ ================================================================================ ." fs-update u:\os1.zd4 Install OS from USB drive to internal storage" mcr ." flash u:\q4b07.rom Install firmware from USB drive" mcr ." flash ext:\q4b07.rom Install firmware from external SD card" mcr - blue-letters ." DIRECTORY LISTING:" black-letters mcr + blue-letters ." DIRECTORY LISTING:" cancel mcr ." dir u:\ List USB drive root directory" mcr ." dir u:\boot\ List USB drive /boot directory" mcr ." dir int:\boot*.zip List .zip files in internal SD /boot directory" mcr - blue-letters ." BOOTING:" black-letters mcr + blue-letters ." BOOTING:" cancel mcr ." boot Start the OS from list of default locations" mcr ." printenv boot-device Show the list of default locations used by boot" mcr ." boot u:\test.fth Start the OS from a specific location" mcr - blue-letters ." CONFIGURATION VARIABLES FOR BOOTING:" black-letters mcr + blue-letters ." CONFIGURATION VARIABLES FOR BOOTING:" cancel mcr ." boot-device Kernel or boot script paths. Example: ext:\boot\olpc.fth" mcr ." boot-file Default kernel command line. Example: console=ttyS0,115200" mcr ." ramdisk Initial RAMDISK path. Example: int:\boot\initrd.img" mcr - blue-letters ." MANAGING CONFIGURATION VARIABLES:" black-letters mcr + blue-letters ." MANAGING CONFIGURATION VARIABLES:" cancel mcr ." printenv [ <name> ] Show configuration variables" mcr ." setenv <name> <value> Set configuration variable" mcr ." editenv <name> Edit configuration variable" mcr - blue-letters ." DIAGNOSTICS:" black-letters mcr + blue-letters ." DIAGNOSTICS:" cancel mcr ." test <device-name> Test device. Example: test mouse" mcr ." test-all Test all devices that have test routines" mcr ." menu Graphical interface to selftests" mcr - blue-letters ." More information: " black-letters mcr - green-letters ." http://wiki.laptop.org/go/OFW_FAQ" black-letters cr + blue-letters ." More information: " cancel mcr + green-letters ." http://wiki.laptop.org/go/OFW_FAQ" cancel cr ; warning !
Modified: cpu/x86/pc/alex/fw.bth ============================================================================== --- cpu/x86/pc/alex/fw.bth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/x86/pc/alex/fw.bth Wed Feb 15 01:29:24 2012 (r2865) @@ -299,7 +299,7 @@ ." Open Firmware demonstration version by FirmWorks" cr
." See " - blue-letters ." http://wiki.laptop.org/go/Forth_Lessons" black-letters + blue-letters ." http://wiki.laptop.org/go/Forth_Lessons" cancel cr cr ." Type menu to run diagnostics" cr
Modified: cpu/x86/pc/biosload/fw.bth ============================================================================== --- cpu/x86/pc/biosload/fw.bth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/x86/pc/biosload/fw.bth Wed Feb 15 01:29:24 2012 (r2865) @@ -376,7 +376,7 @@
[ifdef] linux-support ." See " - blue-letters ." http://www.firmworks.com/linux/demo.html" black-letters + blue-letters ." http://www.firmworks.com/linux/demo.html" cancel cr cr
." Type 'help-linux' to learn about Linux loading options" cr
Modified: cpu/x86/pc/biosload/usb.fth ============================================================================== --- cpu/x86/pc/biosload/usb.fth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/x86/pc/biosload/usb.fth Wed Feb 15 01:29:24 2012 (r2865) @@ -55,13 +55,13 @@ : ?usb-keyboard ( -- ) " keyboard" expand-alias if ( devspec$ ) drop " /usb" comp 0= if ( ) - red-letters ." Using USB keyboard." cr black-letters + red-letters ." Using USB keyboard." cr cancel " keyboard" input exit then then " /usb/serial" open-dev ?dup if - red-letters ." Using USB serial console." cr black-letters + red-letters ." Using USB serial console." cr cancel dup set-stdin set-stdout then ;
Modified: cpu/x86/pc/linux.fth ============================================================================== --- cpu/x86/pc/linux.fth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/x86/pc/linux.fth Wed Feb 15 01:29:24 2012 (r2865) @@ -305,7 +305,7 @@ red-letters ." Debugging the Linux kernel requires a few patches to keep Linux from" mcr ." overwriting the firmware debug vector." mcr mcr - black-letters + cancel
." COMMAND STACK EFFECT DESCRIPTION" mcr ." .registers ( -- ) Display registers" mcr
Modified: cpu/x86/pc/lxdevel/fw.bth ============================================================================== --- cpu/x86/pc/lxdevel/fw.bth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/x86/pc/lxdevel/fw.bth Wed Feb 15 01:29:24 2012 (r2865) @@ -476,7 +476,7 @@ auto-boot then
- blue-letters ." Type 'help' for more information." black-letters + blue-letters ." Type 'help' for more information." cancel cr cr
quit
Modified: cpu/x86/pc/neptune/fw.bth ============================================================================== --- cpu/x86/pc/neptune/fw.bth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/x86/pc/neptune/fw.bth Wed Feb 15 01:29:24 2012 (r2865) @@ -432,7 +432,7 @@ interpreter-init auto-boot
- blue-letters ." Type 'help' for more information." black-letters + blue-letters ." Type 'help' for more information." cancel cr cr
quit
Modified: cpu/x86/pc/newton/fw.bth ============================================================================== --- cpu/x86/pc/newton/fw.bth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/x86/pc/newton/fw.bth Wed Feb 15 01:29:24 2012 (r2865) @@ -301,7 +301,7 @@ ." Open Firmware demonstration version by FirmWorks" cr
." See " - blue-letters ." http://wiki.laptop.org/go/Forth_Lessons" black-letters + blue-letters ." http://wiki.laptop.org/go/Forth_Lessons" cancel cr cr ." Type menu to run diagnostics" cr
Modified: cpu/x86/pc/olpc/copynand.fth ============================================================================== --- cpu/x86/pc/olpc/copynand.fth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/x86/pc/olpc/copynand.fth Wed Feb 15 01:29:24 2012 (r2865) @@ -431,7 +431,7 @@ ;
: examine-nand ( -- ) - 0 status-line 1- at-xy red-letters ." Arrows, fn Arrows to move, Esc to exit" black-letters cr + 0 status-line 1- at-xy red-letters ." Arrows, fn Arrows to move, Esc to exit" cancel cr #nand-pages nand-pages/block / to nand-block-limit 0 to current-block current-block highlight-block
Modified: cpu/x86/pc/olpc/fw.bth ============================================================================== --- cpu/x86/pc/olpc/fw.bth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/x86/pc/olpc/fw.bth Wed Feb 15 01:29:24 2012 (r2865) @@ -578,7 +578,7 @@ h# 1454 pl@ 2 and if red-letters ." Restarting due to botched resume" cr - black-letters + cancel bye then ; @@ -639,7 +639,7 @@ unfreeze visible ( no-banner? ) if banner then \ Reissue banner if it was suppressed
- blue-letters ." Type 'help' for more information." black-letters cancel + blue-letters ." Type 'help' for more information." cancel cr cr
quit
Modified: cpu/x86/pc/olpc/help.fth ============================================================================== --- cpu/x86/pc/olpc/help.fth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/x86/pc/olpc/help.fth Wed Feb 15 01:29:24 2012 (r2865) @@ -2,31 +2,31 @@
warning @ warning off : help ( -- ) - blue-letters ." UPDATES:" black-letters mcr + blue-letters ." UPDATES:" cancel mcr ." flash u:\q2c18.rom Rewrite the firmware from USB key" mcr ." flash nand:\q2c18.rom Rewrite the firmware from NAND file" mcr ." copy-nand u:\boot\nand290.img Rewrite the OS on NAND from USB key" mcr - blue-letters ." DIRECTORY LISTING:" black-letters mcr + blue-letters ." DIRECTORY LISTING:" cancel mcr ." dir u:\ List USB key root directory" mcr ." dir u:\boot\ List USB key /boot directory" mcr ." dir nand:\boot*.rom List .rom files in NAND FLASH /boot directory" mcr - blue-letters ." BOOTING:" black-letters mcr + blue-letters ." BOOTING:" cancel mcr ." boot Load the OS from list of default locations" mcr ." 'printenv boot-device' shows the list" mcr ." boot <cmdline> Load the OS, passing <cmdline> to kernel" mcr ." boot u:\boot\vmlinuz Load the OS from a specific location" mcr - blue-letters ." CONFIGURATION VARIABLES FOR BOOTING:" black-letters mcr + blue-letters ." CONFIGURATION VARIABLES FOR BOOTING:" cancel mcr ." boot-device Kernel or boot script path. Example: nand:\boot\olpc.fth" mcr ." boot-file Default cmdline. Example: console=ttyS0,115200" mcr ." ramdisk initrd pathname. Example: disk:\boot\initrd.imz" mcr - blue-letters ." MANAGING CONFIGURATION VARIABLES:" black-letters mcr + blue-letters ." MANAGING CONFIGURATION VARIABLES:" cancel mcr ." printenv [ <name> ] Show configuration variables" mcr ." setenv <name> <value> Set configuration variable" mcr ." editenv <name> Edit configuration variable" mcr - blue-letters ." DIAGNOSTICS:" black-letters mcr + blue-letters ." DIAGNOSTICS:" cancel mcr ." test <device-name> Test device. Example: test mouse" mcr ." test-all Test all devices that have test routines" mcr - blue-letters ." More information: " black-letters mcr - green-letters ." http://wiki.laptop.org/go/OFW_FAQ" black-letters cr + blue-letters ." More information: " cancel mcr + green-letters ." http://wiki.laptop.org/go/OFW_FAQ" cancel cr ; warning !
Modified: cpu/x86/pc/olpc/keyinsert.fth ============================================================================== --- cpu/x86/pc/olpc/keyinsert.fth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/x86/pc/olpc/keyinsert.fth Wed Feb 15 01:29:24 2012 (r2865) @@ -60,14 +60,14 @@ >r 2tuck r> swap move ( valu$ keyname$ ) green-letters ." Replaced " type cr ( value$ ) - black-letters + cancel else ( keyname$ value$ ) 2swap ( value$ keyname$ ) 2over 2over ( value$ keyname$ value$ keyname$ ) ($add-tag) ( value$ keyname$ ) green-letters ." Added " type cr ( value$ ) - black-letters + cancel then ( value$ ) free-mem ( ) else ( keyname$ ) @@ -87,7 +87,7 @@
: keyject-error ( msg$ -- ) cr - red-letters ." Not injecting because: " type cr black-letters + red-letters ." Not injecting because: " type cr cancel cr ;
@@ -136,7 +136,7 @@
: ?keyject ( -- ) visible - green-letters cr ." Security Key Injector" cr cr black-letters + green-letters cr ." Security Key Injector" cr cr cancel do-keyject? if wait-enough-power flash-write-enable
Modified: cpu/x86/pc/olpc/keyject.fth ============================================================================== --- cpu/x86/pc/olpc/keyject.fth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/x86/pc/olpc/keyject.fth Wed Feb 15 01:29:24 2012 (r2865) @@ -52,14 +52,14 @@ >r 2tuck r> swap move ( valu$ keyname$ ) green-letters ." Replaced " type cr ( value$ ) - black-letters + cancel else ( keyname$ value$ ) 2swap ( value$ keyname$ ) 2over 2over ( value$ keyname$ value$ keyname$ ) ($add-tag) ( value$ keyname$ ) green-letters ." Added " type cr ( value$ ) - black-letters + cancel then ( value$ ) free-mem ( ) else ( keyname$ ) @@ -79,7 +79,7 @@
: keyject-error ( msg$ -- ) cr - red-letters ." Not injecting because: " type cr black-letters + red-letters ." Not injecting because: " type cr cancel cr ." Will update firmware in 20 seconds" cr d# 20,000 ms @@ -180,7 +180,7 @@
: ?keyject ( -- ) visible - green-letters cr ." Security Key Injector" cr cr black-letters + green-letters cr ." Security Key Injector" cr cr cancel \ Get the new firmware first, so any security checks use the old keys get-new-firmware do-keyject? if
Modified: cpu/x86/pc/olpc/mfgdata.fth ============================================================================== --- cpu/x86/pc/olpc/mfgdata.fth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/x86/pc/olpc/mfgdata.fth Wed Feb 15 01:29:24 2012 (r2865) @@ -86,7 +86,7 @@ #out @ 3 + rmargin @ > if exit? ?leave then 3 .tab i c@ <# u# u# u#> type loop - black-letters + cancel r> d# 10 > if cr then r> tabstops ! r> rmargin ! r> lmargin ! ;
Modified: cpu/x86/pc/olpc/mfgkeyject.fth ============================================================================== --- cpu/x86/pc/olpc/mfgkeyject.fth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/x86/pc/olpc/mfgkeyject.fth Wed Feb 15 01:29:24 2012 (r2865) @@ -71,14 +71,14 @@ >r 2tuck r> swap move ( valu$ keyname$ ) green-letters ." Replaced " type cr ( value$ ) - black-letters + cancel else ( keyname$ value$ ) 2swap ( value$ keyname$ ) 2over 2over ( value$ keyname$ value$ keyname$ ) ($add-tag) ( value$ keyname$ ) green-letters ." Added " type cr ( value$ ) - black-letters + cancel then ( value$ ) free-mem ( ) else ( keyname$ ) @@ -98,7 +98,7 @@
: keyject-error ( msg$ -- ) cr - red-letters ." Not injecting because: " type cr black-letters + red-letters ." Not injecting because: " type cr cancel cr ;
@@ -116,7 +116,7 @@
: ?keyject ( -- ) visible - green-letters cr ." Security Key Injector" cr cr black-letters + green-letters cr ." Security Key Injector" cr cr cancel
do-keyject? if flash-write-enable
Modified: cpu/x86/pc/olpc/nandstat.fth ============================================================================== --- cpu/x86/pc/olpc/nandstat.fth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/x86/pc/olpc/nandstat.fth Wed Feb 15 01:29:24 2012 (r2865) @@ -225,7 +225,7 @@ ;
: examine-nand ( -- ) - 0 status-line 1- at-xy red-letters ." Arrows, fn Arrows to move, Esc to exit" black-letters cr + 0 status-line 1- at-xy red-letters ." Arrows, fn Arrows to move, Esc to exit" cancel cr 0 to current-block current-block highlight-block false to examine-done?
Modified: cpu/x86/pc/olpc/security.fth ============================================================================== --- cpu/x86/pc/olpc/security.fth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/x86/pc/olpc/security.fth Wed Feb 15 01:29:24 2012 (r2865) @@ -26,7 +26,7 @@ debug-security? if type cr else 2drop then ; : ?lease-error-cr ( msg$2 -- ) - debug-security? if red-letters type black-letters cr else 2drop then + debug-security? if red-letters type cancel cr else 2drop then ;
: fail-load ( -- ) @@ -54,7 +54,7 @@ ;
: .security-failure ( error$ -- ) - visible red-letters type black-letters cr + visible red-letters type cancel cr show-sad security-failure ; @@ -934,7 +934,7 @@ red-letters ." Bad EC firmware image file - " .error ." Continuing with old EC firmware" cr - black-letters + cancel exit then
@@ -945,7 +945,7 @@ red-letters ." Unsafe to update EC firmware now - " .error ." Continuing with old EC firmware" cr - black-letters + cancel exit then
@@ -983,7 +983,7 @@ red-letters ." Bad firmware image file - " .error ." Continuing with old firmware" cr - black-letters + cancel exit then
@@ -997,7 +997,7 @@ show-no-power ." Unsafe to update firmware now - " .error ." Continuing with old firmware" cr - black-letters + cancel exit then
@@ -1296,7 +1296,7 @@
date-bad? if \ This is not fatal, because we don't want a brick if the RTC battery fails - visible red-letters ." Invalid system date" black-letters cr show-sad + visible red-letters ." Invalid system date" cancel cr show-sad banner then
Modified: cpu/x86/pc/olpc/via/banner.fth ============================================================================== --- cpu/x86/pc/olpc/via/banner.fth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/x86/pc/olpc/via/banner.fth Wed Feb 15 01:29:24 2012 (r2865) @@ -86,14 +86,14 @@ internal-disk-size internal-partition-end d< if ( ) red-letters ." WARNING! OS image larger than internal storage device!" cr - black-letters + cancel exit then
internal-partition-end d# 1,000,000,000. d+ internal-disk-size d< if red-letters ." WARNING! OS image much smaller than internal storage device" cr - black-letters + cancel then ;
Modified: cpu/x86/pc/olpc/via/cstate.fth ============================================================================== --- cpu/x86/pc/olpc/via/cstate.fth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/x86/pc/olpc/via/cstate.fth Wed Feb 15 01:29:24 2012 (r2865) @@ -101,6 +101,7 @@ green-letters (cr show-temperature d# 1024 idle-ms black-letters (cr show-temperature d# 1024 idle-ms key? until + cancel cursor-on
sleep-time @ d# 1000 acpi-time@ start-time @ - */ ( %*10 )
Modified: cpu/x86/pc/olpc/via/factory.fth ============================================================================== --- cpu/x86/pc/olpc/via/factory.fth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/x86/pc/olpc/via/factory.fth Wed Feb 15 01:29:24 2012 (r2865) @@ -94,10 +94,10 @@ ;
: .instructions ( adr len -- ) - cr blue-letters type black-letters cr + cr blue-letters type cancel cr ; : .problem ( adr len -- ) - red-letters type black-letters cr + red-letters type cancel cr ;
: scanner? ( -- flag )
Modified: cpu/x86/pc/olpc/via/fsupdate.fth ============================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/x86/pc/olpc/via/fsupdate.fth Wed Feb 15 01:29:24 2012 (r2865) @@ -23,14 +23,14 @@ red-letters ." WARNING: The file said highest block " #image-eblocks .d ." but wrote only as high as block " max-eblock# .d cr - black-letters + cancel then min-eblock# 0 <> if cr red-letters ." WARNING: The file did not write a zero block, " ." but wrote only as low as block " min-eblock# .d cr - black-letters + cancel then ;
Modified: cpu/x86/pc/olpc/via/fw.bth ============================================================================== --- cpu/x86/pc/olpc/via/fw.bth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/x86/pc/olpc/via/fw.bth Wed Feb 15 01:29:24 2012 (r2865) @@ -717,7 +717,7 @@ unfreeze visible ( no-banner? ) if banner then \ Reissue banner if it was suppressed
- blue-letters ." Type 'help' for more information." black-letters cancel + blue-letters ." Type 'help' for more information." cancel cr cr
enable-user-aborts
Modified: cpu/x86/pc/olpc/via/help.fth ============================================================================== --- cpu/x86/pc/olpc/via/help.fth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/x86/pc/olpc/via/help.fth Wed Feb 15 01:29:24 2012 (r2865) @@ -2,32 +2,32 @@
warning @ warning off : help ( -- ) - blue-letters ." UPDATES:" black-letters mcr + blue-letters ." UPDATES:" cancel mcr \ ================================================================================ ." fs-update u:\os1.zd4 Rewrite the OS on internal SD from USB drive" mcr ." flash u:\q3a64.rom Rewrite the firmware from USB drive" mcr ." flash ext:\q3a64.rom Rewrite the firmware from external SD file" mcr - blue-letters ." DIRECTORY LISTING:" black-letters mcr + blue-letters ." DIRECTORY LISTING:" cancel mcr ." dir u:\ List USB drive root directory" mcr ." dir u:\boot\ List USB drive /boot directory" mcr ." dir int:\boot*.zip List .zip files in internal SD /boot directory" mcr - blue-letters ." BOOTING:" black-letters mcr + blue-letters ." BOOTING:" cancel mcr ." boot Start the OS from list of default locations" mcr ." printenv boot-device Show the list of default locations used by boot" mcr ." boot u:\test.fth Start the OS from a specific location" mcr - blue-letters ." CONFIGURATION VARIABLES FOR BOOTING:" black-letters mcr + blue-letters ." CONFIGURATION VARIABLES FOR BOOTING:" cancel mcr ." boot-device Kernel or boot script paths. Example: ext:\boot\olpc.fth" mcr ." boot-file Default kernel command line. Example: console=ttyS0,115200" mcr ." ramdisk Initial RAMDISK path. Example: int:\boot\initrd.img" mcr - blue-letters ." MANAGING CONFIGURATION VARIABLES:" black-letters mcr + blue-letters ." MANAGING CONFIGURATION VARIABLES:" cancel mcr ." printenv [ <name> ] Show configuration variables" mcr ." setenv <name> <value> Set configuration variable" mcr ." editenv <name> Edit configuration variable" mcr - blue-letters ." DIAGNOSTICS:" black-letters mcr + blue-letters ." DIAGNOSTICS:" cancel mcr ." test <device-name> Test device. Example: test mouse" mcr ." test-all Test all devices that have test routines" mcr ." menu Graphical interface to selftests" mcr - blue-letters ." More information: " black-letters mcr - green-letters ." http://wiki.laptop.org/go/OFW_FAQ" black-letters cr + blue-letters ." More information: " cancel mcr + green-letters ." http://wiki.laptop.org/go/OFW_FAQ" cancel cr ; warning !
Modified: cpu/x86/pc/olpc/via/keyject.fth ============================================================================== --- cpu/x86/pc/olpc/via/keyject.fth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/x86/pc/olpc/via/keyject.fth Wed Feb 15 01:29:24 2012 (r2865) @@ -52,14 +52,14 @@ >r 2tuck r> swap move ( valu$ keyname$ ) green-letters ." Replaced " type cr ( value$ ) - black-letters + cancel else ( keyname$ value$ ) 2swap ( value$ keyname$ ) 2over 2over ( value$ keyname$ value$ keyname$ ) ($add-tag) ( value$ keyname$ ) green-letters ." Added " type cr ( value$ ) - black-letters + cancel then ( value$ ) free-mem ( ) else ( keyname$ ) @@ -79,7 +79,7 @@
: keyject-error ( msg$ -- ) cr - red-letters ." Not injecting because: " type cr black-letters + red-letters ." Not injecting because: " type cr cancel cr ." Will update firmware in 20 seconds" cr d# 20,000 ms @@ -180,7 +180,7 @@
: ?keyject ( -- ) visible - green-letters cr ." Security Key Injector" cr cr black-letters + green-letters cr ." Security Key Injector" cr cr cancel \ Get the new firmware first, so any security checks use the old keys get-new-firmware do-keyject? if
Modified: cpu/x86/pc/olpc/via/mfgtest.fth ============================================================================== --- cpu/x86/pc/olpc/via/mfgtest.fth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/x86/pc/olpc/via/mfgtest.fth Wed Feb 15 01:29:24 2012 (r2865) @@ -59,7 +59,7 @@ else ( ) green-letters ??cr ." Okay" cr - black-letters + cancel mfg-color-green sq-border! true to pass? d# 2000 hold-message drop
Modified: cpu/x86/pc/olpc/via/temptest.fth ============================================================================== --- cpu/x86/pc/olpc/via/temptest.fth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/x86/pc/olpc/via/temptest.fth Wed Feb 15 01:29:24 2012 (r2865) @@ -20,7 +20,7 @@ else ( fail? ) green-letters ." OKAY" ( fail? ) then ( fail? ) - black-letters + cancel ; warning off : selftest ( -- error? )
Modified: cpu/x86/pc/olpc/via/testinstructions.fth ============================================================================== --- cpu/x86/pc/olpc/via/testinstructions.fth Wed Feb 15 01:27:00 2012 (r2864) +++ cpu/x86/pc/olpc/via/testinstructions.fth Wed Feb 15 01:29:24 2012 (r2865) @@ -396,7 +396,7 @@ idle ; : message-off ( -- ) d# 2 d# 27 at-xy kill-line ; -: message ( adr len -- ) cursor-off message-off red-letters type black-letters ; +: message ( adr len -- ) cursor-off message-off red-letters type cancel ;
: performed ( -- ) -1 to blink-state
Modified: dev/olpc/kb3700/ecio.fth ============================================================================== --- dev/olpc/kb3700/ecio.fth Wed Feb 15 01:27:00 2012 (r2864) +++ dev/olpc/kb3700/ecio.fth Wed Feb 15 01:29:24 2012 (r2865) @@ -311,7 +311,7 @@ ec-indexed-io-off? if cr red-letters ." Restarting to enable SPI FLASH writing. Try again after the system restarts." - black-letters cr + cancel cr d# 5000 ms ec-ixio-reboot then
Modified: dev/olpc/touchpad/touchpad.fth ============================================================================== --- dev/olpc/touchpad/touchpad.fth Wed Feb 15 01:27:00 2012 (r2864) +++ dev/olpc/touchpad/touchpad.fth Wed Feb 15 01:29:24 2012 (r2865) @@ -267,7 +267,7 @@ h# aa of 0 d# 26 at-xy red-screen white-letters ." Unexpected touchpad reset" - white-screen black-letters + white-screen cancel cr start gs-only false exit endof
Modified: ofw/core/ofwcore.fth ============================================================================== --- ofw/core/ofwcore.fth Wed Feb 15 01:27:00 2012 (r2864) +++ ofw/core/ofwcore.fth Wed Feb 15 01:29:24 2012 (r2865) @@ -3297,18 +3297,18 @@ ?dup if red-letters ??cr ." Selftest failed. Return code = " .d cr - black-letters + cancel d# 10000 ( delay-ms ) else green-letters ." Okay" cr - black-letters + cancel d# 2000 ( delay-ms ) then ( delay-ms ) else red-letters ." Selftest failed due to abort" cr - black-letters + cancel d# 10000 ( delay-ms ) then ( delay-ms ) hold-message ( exit? )