openfirmware

openfirmware@openfirmware.info

3007 discussions

[commit] r2873 - cpu/x86/pc/olpc/via
by repository service 23 Feb '12

23 Feb '12

Author: quozl Date: Thu Feb 23 04:20:16 2012 New Revision: 2873 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2873 Log: OLPC fs-verify - add fs-verify-quick for abort on first mismatch, report accidental use of zd file, and rethrow exception after cleanup to allow caller to see it. Modified: cpu/x86/pc/olpc/via/fsverify.fth Modified: cpu/x86/pc/olpc/via/fsverify.fth ============================================================================== --- cpu/x86/pc/olpc/via/fsverify.fth Thu Feb 23 02:39:46 2012 (r2872) +++ cpu/x86/pc/olpc/via/fsverify.fth Thu Feb 23 04:20:16 2012 (r2873) @@ -1,9 +1,12 @@ \ Boot script for post-audit testing [ifndef] fs-verify +false value fs-verify-quick? vocabulary fs-verify-commands also fs-verify-commands definitions +false value data? : zblocks: ( "eblock-size" "#eblocks" ... -- ) + data? 0= " Not a zsp file" ?nand-abort get-hex# to /nand-block get-hex# to #image-eblocks open-nand @@ -11,10 +14,12 @@ ; : zblocks-end: ( -- ) + false to data? ; \ This could be a no-op ... : data: ( "filename" -- ) + true to data? safe-parse-word fn-buf place " ${DN}${PN}\${CN}${FN}" expand$ image-name-buf place ; @@ -31,6 +36,11 @@ $= ( okay? ) ; +: ?mismatch + cr + fs-verify-quick? " One block mismatch, remainder not checked" ?nand-abort +; + : zblock: ( "eblock#" "comprlen" "hashname" "hash-of-128KiB" -- ) get-hex# ( eblock# ) @@ -44,7 +54,7 @@ " Malformed hash string" ?nand-abort ( eblock# hashname$ hash$ ) verify-hash ( eblock# okay? ) - swap .d if (cr else cr then + swap .d if (cr else ?mismatch then ; previous definitions @@ -61,16 +71,21 @@ t-hms( also fs-verify-commands - ['] include-file catch ?dup if ( x error ) - nip .error - then + ['] include-file catch ( 0 | x error# ) previous show-done close-nand-ihs )t-hms + throw ( ) +; + +: fs-verify ( "fs.zsp" -- ) \ test blocks + false to fs-verify-quick? + safe-parse-word $fs-verify ; -: fs-verify ( "devspec" -- ) +: fs-verify-quick ( "fs.zsp" -- ) \ test blocks until a mismatch + true to fs-verify-quick? safe-parse-word $fs-verify ;

1 0

[commit] r2872 - cpu/x86/pc/olpc/via
by repository service 23 Feb '12

23 Feb '12

Author: quozl Date: Thu Feb 23 02:39:46 2012 New Revision: 2872 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2872 Log: OLPC fs-update - rethrow exception after cleanup to allow caller to see it, and avoid changing the vocabulary for definitions Modified: cpu/x86/pc/olpc/via/fsupdate.fth Modified: cpu/x86/pc/olpc/via/fsupdate.fth ============================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth Thu Feb 23 01:58:13 2012 (r2871) +++ cpu/x86/pc/olpc/via/fsupdate.fth Thu Feb 23 02:39:46 2012 (r2872) @@ -229,15 +229,14 @@ t-hms( ( fd ) also nand-commands ( fd ) - ['] include-file catch ?dup if ( x error ) - nip .error - then ( ) - previous definitions + ['] include-file catch ( 0 | x error# ) + previous show-done ?all-written close-nand-ihs )t-hms + throw ( ) ; : fs-update ( "devspec" -- )

1 0

[commit] r2871 - forth/kernel
by repository service 23 Feb '12

23 Feb '12

Author: quozl Date: Thu Feb 23 01:58:13 2012 New Revision: 2871 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2871 Log: kernel - fix trivial typos Modified: forth/kernel/kernel.fth Modified: forth/kernel/kernel.fth ============================================================================== --- forth/kernel/kernel.fth Tue Feb 21 01:52:45 2012 (r2870) +++ forth/kernel/kernel.fth Thu Feb 23 01:58:13 2012 (r2871) @@ -2184,9 +2184,9 @@ >bufaddr bftop @ umin bfcurrent ! ; -\ Buffer boundaries are transparant +\ Buffer boundaries are transparent \ end-of-file conditions work correctly -\ The actual delimiter encountered in stored in delimiter. +\ The actual delimiter encountered is stored in delimiter. headers \ input-file contains the file descriptor which defines the input stream.

1 0

[commit] r2870 - in cpu: arm/olpc x86/pc/olpc/via
by repository service 21 Feb '12

21 Feb '12

Author: quozl Date: Tue Feb 21 01:52:45 2012 New Revision: 2870 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2870 Log: OLPC - null-fsdisk was causing abort "Image size is larger than output device", so set the null device to 32GB size. Modified: cpu/arm/olpc/build-fw.fth cpu/x86/pc/olpc/via/fw.bth Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Mon Feb 20 08:21:56 2012 (r2869) +++ cpu/arm/olpc/build-fw.fth Tue Feb 21 01:52:45 2012 (r2870) @@ -1060,7 +1060,7 @@ : erom " flash! ext:\new.rom" eval ; : no-usb-delay " dev /usb false to delay? dend" evaluate ; : null-fsdisk - " dev /null : write-blocks-start 3drop false ; : write-blocks-finish false ; dend" evaluate + " dev /null : size 0 8 ; : write-blocks-start 3drop false ; : write-blocks-finish false ; dend" evaluate " devalias fsdisk //null" evaluate ; Modified: cpu/x86/pc/olpc/via/fw.bth ============================================================================== --- cpu/x86/pc/olpc/via/fw.bth Mon Feb 20 08:21:56 2012 (r2869) +++ cpu/x86/pc/olpc/via/fw.bth Tue Feb 21 01:52:45 2012 (r2870) @@ -747,7 +747,7 @@ ; : no-usb-delay " dev /usb false to delay? dend" evaluate ; : null-fsdisk - " dev /null : write-blocks-start 3drop false ; : write-blocks-finish false ; dend" evaluate + " dev /null : size 0 8 ; : write-blocks-start 3drop false ; : write-blocks-finish false ; dend" evaluate " devalias fsdisk //null" evaluate ;

1 0

[commit] r2869 - cpu/x86/pc/olpc/via
by repository service 20 Feb '12

20 Feb '12

Author: quozl Date: Mon Feb 20 08:21:56 2012 New Revision: 2869 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2869 Log: OLPC fs-verify - split for use by factory scripts, trim some comments Modified: cpu/x86/pc/olpc/via/fsverify.fth Modified: cpu/x86/pc/olpc/via/fsverify.fth ============================================================================== --- cpu/x86/pc/olpc/via/fsverify.fth Mon Feb 20 07:51:21 2012 (r2868) +++ cpu/x86/pc/olpc/via/fsverify.fth Mon Feb 20 08:21:56 2012 (r2869) @@ -7,12 +7,10 @@ get-hex# to /nand-block get-hex# to #image-eblocks open-nand - \ #image-eblocks show-init /nand-block /nand-page / to nand-pages/block ; : zblocks-end: ( -- ) - \ XXX could check that everything else is erased ... ; \ This could be a no-op ... @@ -22,12 +20,8 @@ ; : erase-all ( -- ) - \ XXX probably should set a flag saying that unspecified blocks are expected to be ff ; -\ We simultaneously DMA one data buffer onto NAND while unpacking the -\ next block of data into another. The buffers exchange roles after -\ each block. load-base value data-buffer : verify-hash ( hashname$ hash$ -- okay? ) @@ -48,28 +42,26 @@ safe-parse-word ( eblock# hashname$ ) safe-parse-word hex-decode ( eblock# hashname$ [ hash$ ] err? ) " Malformed hash string" ?nand-abort ( eblock# hashname$ hash$ ) - + verify-hash ( eblock# okay? ) -\ if show-written else show-bad then ( ) swap .d if (cr else cr then ; previous definitions -: fs-verify ( "devspec" -- ) - load-crypto abort" Can't load hash routines" +: $fs-verify ( file$ -- ) + load-crypto abort" Can't load hash routines" ( file$ ) - false to secure-fsupdate? - safe-parse-word r/o open-file ( fd ) - abort" Can't open file" ( fd ) - - file @ ( fd fd' ) - over file ! linefeed line-delimiter c! ( fd fd' ) - file ! ( fd ) + false to secure-fsupdate? ( file$ ) + r/o open-file abort" Can't open file" ( fd ) + + file @ ( fd fd' ) + over file ! linefeed line-delimiter c! ( fd fd' ) + file ! ( fd ) t-hms( - also fs-verify-commands - ['] include-file catch ?dup if ( x error ) + also fs-verify-commands + ['] include-file catch ?dup if ( x error ) nip .error then previous @@ -77,6 +69,11 @@ close-nand-ihs )t-hms ; + +: fs-verify ( "devspec" -- ) + safe-parse-word $fs-verify +; + [then] \ dev screen d# 5000 to burnin-time dend

1 0

[commit] r2868 - cpu/x86/pc/olpc/via
by repository service 20 Feb '12

20 Feb '12

Author: quozl Date: Mon Feb 20 07:51:21 2012 New Revision: 2868 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2868 Log: OLPC fs-update - split for use by factory scripts Modified: cpu/x86/pc/olpc/via/fsupdate.fth Modified: cpu/x86/pc/olpc/via/fsupdate.fth ============================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth Wed Feb 15 09:11:51 2012 (r2867) +++ cpu/x86/pc/olpc/via/fsupdate.fth Mon Feb 20 07:51:21 2012 (r2868) @@ -216,13 +216,13 @@ previous definitions -: fs-update ( "devspec" -- ) +: $fs-update ( file$ -- ) load-crypto abort" Can't load hash routines" - open-nand ( ) + open-nand ( file$ ) - false to secure-fsupdate? ( ) - safe-parse-word r/o open-file ( fd error? ) + false to secure-fsupdate? ( file$ ) + r/o open-file ( fd error? ) " Can't open file" ?nand-abort ( fd ) linefeed over force-line-delimiter ( fd ) @@ -240,6 +240,10 @@ )t-hms ; +: fs-update ( "devspec" -- ) + safe-parse-word $fs-update +; + : do-fs-update ( img$ -- ) tuck load-base h# c00000 + swap move ( len ) load-base h# c00000 + swap ( adr len )

1 0

[commit] r2867 - cpu/x86/pc/olpc
by repository service 15 Feb '12

15 Feb '12

Author: quozl Date: Wed Feb 15 09:11:51 2012 New Revision: 2867 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2867 Log: OLPC XO-1 - update help for current usage Modified: cpu/x86/pc/olpc/help.fth Modified: cpu/x86/pc/olpc/help.fth ============================================================================== --- cpu/x86/pc/olpc/help.fth Wed Feb 15 09:04:02 2012 (r2866) +++ cpu/x86/pc/olpc/help.fth Wed Feb 15 09:11:51 2012 (r2867) @@ -3,29 +3,27 @@ warning @ warning off : help ( -- ) 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 + \ ================================================================================ + ." update-nand u:\os.img Rewrite OS on NAND from USB drive" mcr + ." flash u:\q2f07.rom Rewrite firmware from USB drive" 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 + ." dir u:\ List USB drive root directory" mcr + ." dir u:\boot\ List USB drive /boot directory" mcr + ." dir nand:\boot\*.rom List .rom files in NAND /boot directory" 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 + ." boot Start the OS" mcr + ." boot u:\vmlinuz Start the OS from a specific location" 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:" cancel mcr - ." printenv [ <name> ] Show configuration variables" mcr - ." setenv <name> <value> Set configuration variable" mcr - ." editenv <name> Edit configuration variable" mcr + ." printenv [ <name> ] Show configuration variables" mcr + ." setenv <name> <value> Set configuration variable" mcr + ." editenv <name> Edit configuration variable" 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 + ." test <device-name> Test device. Example: test mouse" mcr + ." test-all Test all devices that have test routines" mcr blue-letters ." More information: " cancel mcr green-letters ." http://wiki.laptop.org/go/OFW_FAQ" cancel cr ;

1 0

[commit] r2866 - cpu/x86/pc/olpc
by repository service 15 Feb '12

15 Feb '12

Author: quozl Date: Wed Feb 15 09:04:02 2012 New Revision: 2866 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2866 Log: OLPC XO-1 - add diagnostics menu, #11622 Added: cpu/x86/pc/olpc/testicons.bth cpu/x86/pc/olpc/testitems.fth Modified: cpu/x86/pc/olpc/devices.fth cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/loaddropins.fth cpu/x86/pc/olpc/olpc.bth Modified: cpu/x86/pc/olpc/devices.fth ============================================================================== --- cpu/x86/pc/olpc/devices.fth Wed Feb 15 01:29:24 2012 (r2865) +++ cpu/x86/pc/olpc/devices.fth Wed Feb 15 09:04:02 2012 (r2866) @@ -100,7 +100,7 @@ 0 0 " 10000" " /flash" begin-package " dropins" device-name - h# c0000 constant /device + h# f0000 constant /device fload ${BP}/dev/subrange.fth end-package Modified: cpu/x86/pc/olpc/fw.bth ============================================================================== --- cpu/x86/pc/olpc/fw.bth Wed Feb 15 01:29:24 2012 (r2865) +++ cpu/x86/pc/olpc/fw.bth Wed Feb 15 09:04:02 2012 (r2866) @@ -304,9 +304,12 @@ : .clock ( -- ) time&date .date space .time ." UTC" cr ; -fload ${BP}/cpu/x86/pc/olpc/banner.fth +fload ${BP}/cpu/x86/pc/olpc/banner.fth fload ${BP}/ofw/gui/loadmenu.fth +fload ${BP}/cpu/x86/pc/olpc/via/mfgtest.fth +fload ${BP}/cpu/x86/pc/olpc/testitems.fth + false value smt-test? false value final-test? fload ${BP}/cpu/x86/pc/olpc/disptest.fth \ fload ${BP}/ofw/gui/insticon.fth @@ -559,7 +562,7 @@ : ?diags ( -- ) rocker-left game-key? if protect-fw - text-on " test-all" ['] eval guarded + text-on ['] gamekey-auto-menu guarded ." Tests complete - powering off" cr d# 5000 ms power-off then ; @@ -656,11 +659,6 @@ fload ${BP}/cpu/x86/pc/olpc/diskspeed.fth \ Mass storage speed test -\ #10778 disable menu -warning @ warning off -: menu ; -warning ! - \ This helps with TeraTerm, which sends ESC-O as the arrow key prefix also hidden also keys-forth definitions warning @ warning off Modified: cpu/x86/pc/olpc/loaddropins.fth ============================================================================== --- cpu/x86/pc/olpc/loaddropins.fth Wed Feb 15 01:29:24 2012 (r2865) +++ cpu/x86/pc/olpc/loaddropins.fth Wed Feb 15 09:04:02 2012 (r2866) @@ -49,7 +49,6 @@ " ${BP}/cpu/x86/pc/olpc/images/wireless.565" " wlan.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/xo.565" " xo.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/sd.565" " ext.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/spi.565" " spi.565" $add-deflated-dropin " ${BP}/ofw/termemu/15x30pc.psf" " font" $add-deflated-dropin [ifdef] use-ega Modified: cpu/x86/pc/olpc/olpc.bth ============================================================================== --- cpu/x86/pc/olpc/olpc.bth Wed Feb 15 01:29:24 2012 (r2865) +++ cpu/x86/pc/olpc/olpc.bth Wed Feb 15 09:04:02 2012 (r2866) @@ -30,6 +30,7 @@ in: ${BP}/dev/pci/build/pcibridg.fc in: ${BP}/cpu/x86/pc/olpc/build/dsdt.aml in: ${BP}/cpu/x86/pc/olpc/build/mcastnand.bin +in: testicons.bin build-now @@ -54,6 +55,10 @@ ?do h# ff ofd @ fputc loop ; +\ Tell the dropin manager to skip the area reserved for manufacturing data +h# e0000 to reserved-start +h# f0000 to reserved-end + .( --- Saving as ) " ${FW_VERSION}.rom" expand$ 2dup lower ( adr len ) 2dup type cr ( adr len ) @@ -81,6 +86,22 @@ \ " ${BP}/cpu/x86/pc/olpc/build/multicast-nand/mcastnand.elf" " mcastnand" $add-deflated-dropin \ " ${BP}/cpu/x86/pc/olpc/build/blaster.bin" " blaster" $add-deflated-dropin \ " ${BP}/cpu/x86/pc/olpc/build/cloner.bin" " cloner" $add-deflated-dropin + " testicons/play.565" " play.565" $add-deflated-dropin + " testicons/quit.565" " quit.565" $add-deflated-dropin + " testicons/cpu.565" " cpu.565" $add-deflated-dropin + " testicons/spi.565" " spi.565" $add-deflated-dropin + " testicons/ram.565" " ram.565" $add-deflated-dropin + " testicons/sdcard.565" " sdcard.565" $add-deflated-dropin + " testicons/keyboard.565" " keyboard.565" $add-deflated-dropin + " testicons/display.565" " display.565" $add-deflated-dropin + " testicons/touchpad.565" " touchpad.565" $add-deflated-dropin + " testicons/audio.565" " audio.565" $add-deflated-dropin + " testicons/usb.565" " usb.565" $add-deflated-dropin + " testicons/battery.565" " battery.565" $add-deflated-dropin + " testicons/camera.565" " camera.565" $add-deflated-dropin + " testicons/wifi.565" " wifi.565" $add-deflated-dropin + " testicons/clock.565" " clock.565" $add-deflated-dropin + " testicons/timer.565" " timer.565" $add-deflated-dropin /rom h# 400 - pad-file \ rmstart image must start 0x400 from end " rmstart.img" $add-file Added: cpu/x86/pc/olpc/testicons.bth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/x86/pc/olpc/testicons.bth Wed Feb 15 09:04:02 2012 (r2866) @@ -0,0 +1,11 @@ +purpose: Expand the test icons + +command: &builder &this +build-now + +" tar xfz ../via/testicons.tgz" expand$ $sh + +\ This forces the creation of a .log file, so we don't re-fetch +writing testicons.version +" 1" ofd @ fputs +ofd @ fclose Added: cpu/x86/pc/olpc/testitems.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/x86/pc/olpc/testitems.fth Wed Feb 15 09:04:02 2012 (r2866) @@ -0,0 +1,83 @@ +purpose: Platform-specific layout of diagnostic GUI menu items + +d# 5 to #mfgcols +d# 4 to #mfgrows + +icon: cpu.icon rom:cpu.565 +icon: spi.icon rom:spi.565 +icon: ram.icon rom:ram.565 +icon: sdcard.icon rom:sdcard.565 +icon: usb.icon rom:usb.565 +icon: battery.icon rom:battery.565 +icon: camera.icon rom:camera.565 +icon: wifi.icon rom:wifi.565 +icon: audio.icon rom:audio.565 +icon: touchpad.icon rom:touchpad.565 +icon: display.icon rom:display.565 +icon: keyboard.icon rom:keyboard.565 +icon: timer.icon rom:timer.565 +icon: clock.icon rom:clock.565 + +: cpu-item ( -- ) " /cpu" mfg-test-dev ; +: battery-item ( -- ) " /battery" mfg-test-dev ; +: spiflash-item ( -- ) " /flash" mfg-test-dev ; +: memory-item ( -- ) " /memory" mfg-test-dev ; +: usb-item ( -- ) " /usb" mfg-test-dev ; +: ext-sd-item ( -- ) " ext:0" mfg-test-dev ; +: rtc-item ( -- ) " /rtc" mfg-test-dev ; +: display-item ( -- ) " /display" mfg-test-dev ; +: audio-item ( -- ) " /audio" mfg-test-dev ; +: camera-item ( -- ) " /camera" mfg-test-dev ; +: wlan-item ( -- ) " /wlan" mfg-test-dev ; +: timer-item ( -- ) " /timer" mfg-test-dev ; +: touchpad-item ( -- ) " /8042/mouse" mfg-test-dev ; +: keyboard-item ( -- ) " /8042/keyboard" mfg-test-dev ; + +: olpc-test-menu-items ( -- ) + 0 to #mfgtests + 1 0 set-row-col + + " CPU" + ['] cpu-item cpu.icon add-icon + + " SPI Flash: Contains EC code, firmware, manufacturing data." + ['] spiflash-item spi.icon add-icon + + " RAM chips" + ['] memory-item ram.icon add-icon + + " Plug-in SD card" + ['] ext-sd-item sdcard.icon add-icon + + " Wireless LAN" + ['] wlan-item wifi.icon add-icon + + " Display" + ['] display-item display.icon add-icon + + " Camera" + ['] camera-item camera.icon add-icon + + " Audio: Speaker and microphone" + ['] audio-item audio.icon add-icon + + " Battery" + ['] battery-item battery.icon add-icon + + " RTC (Real-Time Clock)" + ['] rtc-item clock.icon add-icon + + " USB ports" + ['] usb-item usb.icon add-icon + + \ These are last because they require user participation. + \ The earlier tests are all included in automatic batch-mode. + + " Keyboard" + ['] keyboard-item keyboard.icon add-icon + + " Touchpad" + ['] touchpad-item touchpad.icon add-icon + +; +' olpc-test-menu-items to test-menu-items

1 0

[commit] r2865 - cpu/arm/olpc cpu/arm/olpc/1.75 cpu/arm/olpc/3.0 cpu/x86/pc cpu/x86/pc/alex cpu/x86/pc/biosload cpu/x86/pc/lxdevel cpu/x86/pc/neptune cpu/x86/pc/newton cpu/x86/pc/olpc cpu/x86/pc/ol...
by repository service 15 Feb '12

15 Feb '12

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? )

1 0

[commit] r2864 - ofw/termemu
by repository service 15 Feb '12

15 Feb '12

Author: quozl Date: Wed Feb 15 01:27:00 2012 New Revision: 2864 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2864 Log: Terminal Emulator - reset colour on <ESC>[m, adopt ECMA-48 SGR semantics, as used by VT100, Linux console, xterm, and other emulators. Modified: ofw/termemu/fwritstr.fth Modified: ofw/termemu/fwritstr.fth ============================================================================== --- ofw/termemu/fwritstr.fth Wed Feb 15 01:23:33 2012 (r2863) +++ ofw/termemu/fwritstr.fth Wed Feb 15 01:27:00 2012 (r2864) @@ -255,29 +255,6 @@ headerless -\ Boldness applies retroactively only to the foreground color; the -\ current background color is unaffected. However, setting the -\ background color applies the current boldness state of the foreground -\ color to the background color. This gives a client program complete -\ and independent control over the boldness of both the foreground and -\ background colors (by judiciously sequencing the setting of colors -\ and boldness), and preserves as much as practical the semi-IBM-PC -\ semantics that ARC clients assume. The semantics are not exactly the -\ same as the PC, because the PC (actually ANSI.SYS) zaps the colors -\ to dim white on black in response to CSI 0 m, and to black on dim -\ white in response to CSI 7 m, while some ARC clients (in particular -\ ARCINST.EXE) assume that CSI 0 m preserves the fundamental color scheme -\ that is currently in effect. Convoluted? You bet! -\ -\ The fact that this implementation of CSI 7 m and CSI 0 m do not force -\ the colors back to black and white is also advantageous for programs -\ that use these sequences for "standout-start ... standout-end", for -\ which it is nice not to wantonly change the current color scheme. It -\ is also important that CSI 0 m does not immediately alter the boldness -\ of the background color, because in the common case of a bright white -\ background, that prevents CSI 7 m ... CSI 0 m from changing the background -\ to dim white. - : bold ( -- mask ) foreground-color 8 and ; : bold-on ( -- ) foreground-color 8 or to foreground-color @@ -285,7 +262,7 @@ : bold-off ( -- ) foreground-color 8 invert and to foreground-color ; -: default-attributes ( -- ) false to inverse? bold-off ; +: default-attributes ( -- ) false to inverse? 0 to foreground-color ; : >color# ( ansi-color-code -- palette# ) 10 mod " "(00 04 02 06 01 05 03 07)" drop + c@ ;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware