[openfirmware] r834 - cpu/x86/pc/olpc cpu/x86/pc/olpc/images dev/geode/display
svn at openfirmware.info
svn at openfirmware.info
Fri Jun 6 23:23:29 CEST 2008
Author: wmb
Date: 2008-06-06 23:23:28 +0200 (Fri, 06 Jun 2008)
New Revision: 834
Modified:
cpu/x86/pc/olpc/fw.bth
cpu/x86/pc/olpc/images/bigdot.565
cpu/x86/pc/olpc/images/bigdot.bmp
cpu/x86/pc/olpc/images/lock.565
cpu/x86/pc/olpc/images/lock.bmp
cpu/x86/pc/olpc/images/minus.565
cpu/x86/pc/olpc/images/minus.bmp
cpu/x86/pc/olpc/images/plus.565
cpu/x86/pc/olpc/images/plus.bmp
cpu/x86/pc/olpc/images/sad.565
cpu/x86/pc/olpc/images/sad.bmp
cpu/x86/pc/olpc/images/unlock.565
cpu/x86/pc/olpc/images/unlock.bmp
cpu/x86/pc/olpc/images/x.565
cpu/x86/pc/olpc/images/x.bmp
cpu/x86/pc/olpc/images/xogray.565
cpu/x86/pc/olpc/images/xogray.bmp
cpu/x86/pc/olpc/nandstat.fth
cpu/x86/pc/olpc/security.fth
dev/geode/display/gxfb.fth
Log:
OLPC trac 7180 - new boot animation frames (background is white not gray)
to match the new UI design.
Modified: cpu/x86/pc/olpc/fw.bth
===================================================================
--- cpu/x86/pc/olpc/fw.bth 2008-06-06 21:20:32 UTC (rev 833)
+++ cpu/x86/pc/olpc/fw.bth 2008-06-06 21:23:28 UTC (rev 834)
@@ -215,6 +215,8 @@
dend
[then]
+: background-rgb ( -- r g b ) h# ff h# ff h# ff ;
+
fload ${BP}/cpu/x86/pc/olpc/devices.fth
fload ${BP}/cpu/x86/pc/olpc/countdwn.fth \ Startup countdown
Modified: cpu/x86/pc/olpc/nandstat.fth
===================================================================
--- cpu/x86/pc/olpc/nandstat.fth 2008-06-06 21:20:32 UTC (rev 833)
+++ cpu/x86/pc/olpc/nandstat.fth 2008-06-06 21:23:28 UTC (rev 834)
@@ -197,7 +197,7 @@
3dup 0 1 xy+ 1 grid-h do-fill ( color x y )
1 grid-h xy+ grid-w 1 do-fill
;
-: lowlight ( block# -- ) h# c0 h# c0 h# c0 rgb>565 cell-border ;
+: lowlight ( block# -- ) background-rgb rgb>565 cell-border ;
: highlight ( block# -- ) 0 cell-border ;
: +block ( offset -- )
current-block + nand-block-limit mod ( new-block )
@@ -258,3 +258,27 @@
examine-nand
;
+
+\ LICENSE_BEGIN
+\ Copyright (c) 2007 FirmWorks
+\
+\ Permission is hereby granted, free of charge, to any person obtaining
+\ a copy of this software and associated documentation files (the
+\ "Software"), to deal in the Software without restriction, including
+\ without limitation the rights to use, copy, modify, merge, publish,
+\ distribute, sublicense, and/or sell copies of the Software, and to
+\ permit persons to whom the Software is furnished to do so, subject to
+\ the following conditions:
+\
+\ The above copyright notice and this permission notice shall be
+\ included in all copies or substantial portions of the Software.
+\
+\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+\
+\ LICENSE_END
Modified: cpu/x86/pc/olpc/security.fth
===================================================================
--- cpu/x86/pc/olpc/security.fth 2008-06-06 21:20:32 UTC (rev 833)
+++ cpu/x86/pc/olpc/security.fth 2008-06-06 21:23:28 UTC (rev 834)
@@ -53,10 +53,9 @@
: +icon-xy ( delta-x,y -- ) icon-xy d+ to icon-xy ;
-
: show-going ( -- )
- h# c0 h# c0 h# c0 rgb>565 progress-xy d# 500 d# 100 " fill-rectangle" $call-screen
- d# 585 d# 613 to icon-xy " bigdot" show-icon
+ background-rgb rgb>565 progress-xy d# 500 d# 100 " fill-rectangle" $call-screen
+ d# 588 d# 638 to icon-xy " bigdot" show-icon
dcon-unfreeze
;
: show-x ( -- ) " x" show-icon ;
@@ -75,7 +74,7 @@
: show-unlock ( -- ) " unlock" show-icon ;
: show-child ( -- )
" erase-screen" $call-screen
- d# 552 d# 383 to icon-xy " rom:xogray.565" $show-opaque
+ d# 552 d# 384 to icon-xy " rom:xogray.565" $show-opaque
progress-xy to icon-xy \ For boot progress reports
;
@@ -880,3 +879,27 @@
date-bad? if ." The RTC is not set correctly" cr exit then
time&date >iso8601$ " md" $add-tag
;
+
+\ LICENSE_BEGIN
+\ Copyright (c) 2007 FirmWorks
+\
+\ Permission is hereby granted, free of charge, to any person obtaining
+\ a copy of this software and associated documentation files (the
+\ "Software"), to deal in the Software without restriction, including
+\ without limitation the rights to use, copy, modify, merge, publish,
+\ distribute, sublicense, and/or sell copies of the Software, and to
+\ permit persons to whom the Software is furnished to do so, subject to
+\ the following conditions:
+\
+\ The above copyright notice and this permission notice shall be
+\ included in all copies or substantial portions of the Software.
+\
+\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+\
+\ LICENSE_END
Modified: dev/geode/display/gxfb.fth
===================================================================
--- dev/geode/display/gxfb.fth 2008-06-06 21:20:32 UTC (rev 833)
+++ dev/geode/display/gxfb.fth 2008-06-06 21:23:28 UTC (rev 834)
@@ -557,10 +557,10 @@
map-frame-buffer
bytes/pixel case
1 of frame-buffer-adr /fb h# 0f fill endof
- 2 of frame-buffer-adr /fb h# c0 dup dup rgb>565 wfill endof
+ 2 of frame-buffer-adr /fb background-rgb rgb>565 wfill endof
4 of frame-buffer-adr /fb h# ffff.ffff lfill endof
endcase
- 7 to background-color
+ h# f to background-color
frame-buffer-adr /fb + to graphmem
;
More information about the openfirmware
mailing list