Author: wmb
Date: 2009-12-17 08:42:02 +0100 (Thu, 17 Dec 2009)
New Revision: 1629
Modified:
forth/lib/fileed.fth
Log:
OLPC trac 9909 - Page Fault on ESC h - (find-previous-word was backing
up before the beginning of the buffer.
Modified: forth/lib/fileed.fth
===================================================================
--- forth/lib/fileed.fth 2009-12-17 05:17:15 UTC (rev 1628)
+++ forth/lib/fileed.fth 2009-12-17 07:42:02 UTC (rev 1629)
@@ -228,6 +228,7 @@
\ Doesn't move the cursor or change the display. Internal.
: find-previous-word ( -- adr )
+ cursor-adr line-start-adr = if line-start-adr exit then
line-start-adr dup cursor-adr 1- ?do ( linestart )
i c@ bl <> if drop i leave then
-1 +loop
Author: wmb
Date: 2009-12-16 09:20:30 +0100 (Wed, 16 Dec 2009)
New Revision: 1625
Modified:
cpu/x86/pc/olpc/via/runin.fth
Log:
Via manufacturing scripts - extra messages after restarting a failed runin.
Modified: cpu/x86/pc/olpc/via/runin.fth
===================================================================
--- cpu/x86/pc/olpc/via/runin.fth 2009-12-16 08:16:08 UTC (rev 1624)
+++ cpu/x86/pc/olpc/via/runin.fth 2009-12-16 08:20:30 UTC (rev 1625)
@@ -328,15 +328,21 @@
key drop cr cr
list
." Type R to restart runin, any other key to power off "
- key dup emit upc [char] R = if rerunin then
+ key dup emit cr upc [char] R = if
+ ." Resetting state to restart runin." cr
+ ." The old failure log is in " fail-backup-file$ type cr
+ rerunin
+ else
+ power-off
+ then
else
autorun-mfg-tests
pass? if finish-final-test then
show-result-screen
- ." Type a key to power off"
- key cr
then
+ ." Type a key to power off"
+ key cr
power-off
;
Author: wmb
Date: 2009-12-16 09:16:08 +0100 (Wed, 16 Dec 2009)
New Revision: 1624
Modified:
cpu/x86/pc/olpc/via/runin.fth
Log:
Via manufacturing scripts - added option to restart a failed runin.
Modified: cpu/x86/pc/olpc/via/runin.fth
===================================================================
--- cpu/x86/pc/olpc/via/runin.fth 2009-12-16 08:05:00 UTC (rev 1623)
+++ cpu/x86/pc/olpc/via/runin.fth 2009-12-16 08:16:08 UTC (rev 1624)
@@ -243,7 +243,7 @@
exit
then ( data$ tag$ )
- 2swap ?-null 2swap
+ 2swap ?-null 2swap ( data$' tag$ )
put-key:value ( )
;
@@ -308,14 +308,16 @@
warning !
dend
-
+: fail-backup-file$ ( -- name$ )
+ time&date format-date " int:\runin\fail-%s.log" sprintf
+;
: fail-log-file$ ( -- name$ ) " int:\runin\fail.log" ;
\ The operator can type this to reset the state to run
\ the Linux-based runin tests again.
: rerunin ( -- )
" int:\runin\olpc.fth" $delete-all
- " int:\runin\fail.log" $delete-all
+ fail-log-file$ fail-backup-file$ $rename
;
: after-runin ( -- )
@@ -325,14 +327,16 @@
." Type a key to see the failure log"
key drop cr cr
list
+ ." Type R to restart runin, any other key to power off "
+ key dup emit upc [char] R = if rerunin then
else
autorun-mfg-tests
pass? if finish-final-test then
show-result-screen
+ ." Type a key to power off"
+ key cr
then
- ." Type a key to power off"
- key cr
power-off
;
Author: wmb
Date: 2009-12-16 09:05:00 +0100 (Wed, 16 Dec 2009)
New Revision: 1623
Modified:
cpu/x86/pc/olpc/via/assy.fth
Log:
Via manufacturing scripts - Added auto-firmware-update to the assy script.
Modified: cpu/x86/pc/olpc/via/assy.fth
===================================================================
--- cpu/x86/pc/olpc/via/assy.fth 2009-12-16 07:56:51 UTC (rev 1622)
+++ cpu/x86/pc/olpc/via/assy.fth 2009-12-16 08:05:00 UTC (rev 1623)
@@ -2,11 +2,41 @@
visible
+\ If the firmware file is on a CIFS share on the factory server, it
+\ should be read-only so multiple clients can read it simultaneously.
+
+false value update-firmware? \ Make this true to update firmware
+: wanted-fw$ ( -- $ ) " q3a25" ; \ Set this value to the firmware version
+
: swid$ ( -- adr len ) " OFW ASSY test $Revision$" ;
\ Location of the files containing KA tag data
: ka-dir$ ( -- adr len ) " http:\\10.1.0.1\ka\" ;
+: find-firmware-file ( -- name$ )
+ wanted-fw$ " u:\\boot\\%s.rom" sprintf ( name$ )
+ ." Trying " 2dup type cr ( name$ )
+ 2dup $file-exists? if exit then ( name$ )
+ 2drop ( )
+
+ wanted-fw$ factory-server$ " %s\\%s.rom" sprintf ( name$ )
+ ." Trying " 2dup type cr ( name$ )
+ 2dup $file-exists? if exit then ( name$ )
+ 2drop
+
+ true abort" Can't find new firmware file"
+;
+
+: ?update-firmware ( -- )
+ update-firmware? 0= if exit then
+ \ Exit if the existing firmware and the wanted firmware are the same
+ fw-version$ wanted-fw$ nocase-$= if exit then
+ ." Updating firmware to version " fw-version$ type cr
+ d# 2000 ms
+ ?enough-power
+ find-firmware-file $get-file reflash
+;
+
: put-ka-tag ( value$ key$ -- )
2over 8 min ka-dir$ " %s%s" sprintf ( value$ key$ filename$ )
$read-file if ( value$ key$ )
@@ -201,6 +231,8 @@
;
: start-assy-test ( -- )
+ ?update-firmware
+
wait-lan
get-info
Author: wmb
Date: 2009-12-16 08:56:51 +0100 (Wed, 16 Dec 2009)
New Revision: 1622
Modified:
dev/olpc/viacamera/camera.fth
Log:
Via diagnostics - don't fail the camera test if serial is preventing
it from running.
Modified: dev/olpc/viacamera/camera.fth
===================================================================
--- dev/olpc/viacamera/camera.fth 2009-12-16 07:24:34 UTC (rev 1621)
+++ dev/olpc/viacamera/camera.fth 2009-12-16 07:56:51 UTC (rev 1622)
@@ -507,7 +507,7 @@
: selftest ( -- error? )
serial-enabled? if
." The serial port is in use so the camera cannot be used" cr
- true exit
+ false exit
then
open 0= if true exit then
d# 300 ms
