[openfirmware] r1030 - cpu/x86/pc/olpc
svn at openfirmware.info
svn at openfirmware.info
Thu Dec 11 23:46:49 CET 2008
Author: wmb
Date: 2008-12-11 23:46:49 +0100 (Thu, 11 Dec 2008)
New Revision: 1030
Modified:
cpu/x86/pc/olpc/nandcastui.fth
cpu/x86/pc/olpc/wifichannel.fth
Log:
OLPC NANDblaster - fixed some UI problems found in early testing.
Modified: cpu/x86/pc/olpc/nandcastui.fth
===================================================================
--- cpu/x86/pc/olpc/nandcastui.fth 2008-12-11 20:00:00 UTC (rev 1029)
+++ cpu/x86/pc/olpc/nandcastui.fth 2008-12-11 22:46:49 UTC (rev 1030)
@@ -62,20 +62,23 @@
" rom:nb_tx ether:%d %s %d 131072 %d %d %d %d" sprintf boot-load go
;
-: nb-clone1 ( -- ) 1 #nb-clone ;
-: nb-clone6 ( -- ) 6 #nb-clone ;
+: #nb-update-def ( channel# -- ) >r " u:\fs.plc" " u:\fs.img" r> #nb-update ;
+: #nb-secure-def ( channel# -- ) >r " u:\fs.zip" " u:\fs.img" r> #nb-secure ;
+
+: nb-clone1 ( -- ) 1 #nb-clone ;
+: nb-clone6 ( -- ) 6 #nb-clone ;
: nb-clone11 ( -- ) d# 11 #nb-clone ;
-: nb-update1 ( -- ) 1 #nb-update ;
-: nb-update6 ( -- ) 6 #nb-update ;
-: nb-update11 ( -- ) d# 11 #nb-update ;
+: nb-update1 ( -- ) 1 #nb-update-def ;
+: nb-update6 ( -- ) 6 #nb-update-def ;
+: nb-update11 ( -- ) d# 11 #nb-update-def ;
-: nb-secure1 ( -- ) 1 #nb-secure ;
-: nb-secure6 ( -- ) 6 #nb-secure ;
-: nb-secure11 ( -- ) d# 11 #nb-secure ;
+: nb-secure1 ( -- ) 1 #nb-secure-def ;
+: nb-secure6 ( -- ) 6 #nb-secure-def ;
+: nb-secure11 ( -- ) d# 11 #nb-secure-def ;
-: nb1 ( -- ) 1 #nb ;
-: nb6 ( -- ) 6 #nb ;
+: nb1 ( -- ) 1 #nb ;
+: nb6 ( -- ) 6 #nb ;
: nb11 ( -- ) d# 11 #nb ;
: mesh-clone
Modified: cpu/x86/pc/olpc/wifichannel.fth
===================================================================
--- cpu/x86/pc/olpc/wifichannel.fth 2008-12-11 20:00:00 UTC (rev 1029)
+++ cpu/x86/pc/olpc/wifichannel.fth 2008-12-11 22:46:49 UTC (rev 1030)
@@ -116,11 +116,14 @@
d# 10 constant rssi-threshold
: nb-auto-channel ( -- chan# )
- quietest-mesh-channel ( rssi chan# )
- swap rssi-threshold > abort" No quiet channels" ( chan# )
+ quietest-mesh-channel ( rssi chan# )
+ swap rssi-threshold > if ( chan# )
+ ." No wireless channels are quiet. The quietest is channel " dup .d cr ( chan# )
+ " Do you want to use that channel" confirmedn? ( chan# proceed? )
+ 0= abort" Stopping."
+ then ( chan# )
;
-: nb-clone ( -- ) nb-auto-channel #nb-clone ;
-
-: nb-update " u:\fs.plc" " u:\fs.img" nb-auto-channel #nb-update ;
-: nb-secure " u:\fs.zip" " u:\fs.img" nb-auto-channel #nb-secure ;
+: nb-clone ( -- ) nb-auto-channel #nb-clone ;
+: nb-secure ( -- ) nb-auto-channel #nb-secure-def ;
+: nb-update ( -- ) nb-auto-channel #nb-update-def ;
More information about the openfirmware
mailing list