[openfirmware] [commit] r3441 - in cpu: arm/olpc x86/pc/olpc
repository service
svn at openfirmware.info
Sat Nov 17 05:20:26 CET 2012
Author: quozl
Date: Sat Nov 17 05:20:25 2012
New Revision: 3441
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3441
Log:
OLPC - use additional graphical indicators for different reflash operations, yellow dots for EC, and plus signs for touchscreen
Modified:
cpu/arm/olpc/build-fw.fth
cpu/x86/pc/olpc/gui.fth
Modified: cpu/arm/olpc/build-fw.fth
==============================================================================
--- cpu/arm/olpc/build-fw.fth Sat Nov 17 04:10:07 2012 (r3440)
+++ cpu/arm/olpc/build-fw.fth Sat Nov 17 05:20:25 2012 (r3441)
@@ -861,13 +861,13 @@
update-ec-flash? if
['] ?enough-power catch ?dup if ( error )
- show-no-power
- .error
- ." Skipping EC reflash, not enough power" cr
- d# 1000 ms
+ show-no-power
+ .error
+ ." Skipping EC reflash, not enough power" cr
+ d# 1000 ms
else
- jots ['] jot to edi-progress
- update-ec-flash
+ jots-ec ['] jot to edi-progress
+ update-ec-flash
then
then
[ifdef] update-nn-flash?
@@ -881,7 +881,7 @@
." Skipping NN reflash, not enough power" cr
d# 1000 ms
else
- jots ['] jot to bsl-progress
+ jots-nn ['] jot to bsl-progress
update-nn-flash
then
then
Modified: cpu/x86/pc/olpc/gui.fth
==============================================================================
--- cpu/x86/pc/olpc/gui.fth Sat Nov 17 04:10:07 2012 (r3440)
+++ cpu/x86/pc/olpc/gui.fth Sat Nov 17 05:20:25 2012 (r3441)
@@ -404,14 +404,6 @@
prep-565 4drop to dot-adr ( )
;
-: jots ( -- ) \ bottom left corner, chip and progress dots
- d# 25 d# 772 set-icon-xy " spi" show-icon
- bar-x-last bar-y set-icon-xy " yellowdot" show-icon
- read-dot
- -1 to last-dot#
- bar-x-last bar-x - #dots / to dot-spacing
-;
-
: jot ( offset size -- )
dot-adr 0= if 2drop exit then ( offset size )
#dots swap */ ( dot# )
@@ -426,6 +418,29 @@
then
;
+: jots-init
+ d# 25 d# 772 set-icon-xy " spi" show-icon
+ -1 to last-dot#
+ bar-x-last bar-x - #dots / to dot-spacing
+;
+
+: jots-bracket ( icon$ -- )
+ d# 20 d# 800 set-icon-xy 2dup show-icon \ left and above
+ d# 20 d# 857 set-icon-xy 2dup show-icon \ left and below
+ d# 120 d# 857 set-icon-xy 2dup show-icon \ right and below
+ d# 120 d# 800 set-icon-xy show-icon \ right and above
+;
+
+: jots-prep ( -- )
+ bar-x-last bar-y set-icon-xy " yellowdot" show-icon
+ read-dot
+;
+
+\ bottom left corner, chip and progress dots
+: jots jots-init jots-prep ;
+: jots-nn jots-init " plus" jots-bracket jots-prep ;
+: jots-ec jots-init " yellowdot" jots-bracket jots-prep ;
+
0 [if]
: test-jots-flash \ XO-4 B1 13ms
page jots t( /flash 0 do i /flash jot /flash-page +loop )t
More information about the openfirmware
mailing list