Author: wmb Date: 2007-10-02 05:22:33 +0200 (Tue, 02 Oct 2007) New Revision: 657
Added: cpu/x86/pc/olpc/images/warnings.565 cpu/x86/pc/olpc/images/warnings.bmp.gz Modified: cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/loaddropins.fth cpu/x86/pc/olpc/security.fth ofw/fs/jffs2/jffs2.fth Log: Added UL warning screen (behind rotate button) and cleaned up some problems with pretty boot sequencing.
Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-10-01 23:10:06 UTC (rev 656) +++ cpu/x86/pc/olpc/fw.bth 2007-10-02 03:22:33 UTC (rev 657) @@ -491,12 +491,6 @@ then ;
-: ?sound ( -- ) - button-rotate game-key? 0= if sound then -; -: ?freeze ( -- ) - button-rotate game-key? 0= if freeze then -; : ?games ( -- ) rocker-right game-key? if time&date 5drop 1 and if pong else life-demo then @@ -513,50 +507,19 @@
console-start read-game-keys -[ifdef] notdef - fast-boot? if -( D) stdout off \ banner - probe-pci - ?sound - open-keyboard -( D) \ ?games - ?freeze -\ ['] false to interrupt-auto-boot? - probe-usb -\ " nand" $dev-update-flash - interpreter-init - secure-startup -( D) screen-ih stdout ! \ -( D) ?usb-keyboard \ - else -( D) banner \ stdout off - probe-pci - ?sound - open-keyboard -( D) ?games \ - ?freeze - probe-usb -( D) ?usb-keyboard \ - interpreter-init - secure-startup - then -[else] - stdout off \ - probe-pci - ?sound - open-keyboard - ?games - ?freeze - ['] false to interrupt-auto-boot? - probe-usb -\ " nand" $dev-update-flash - interpreter-init - secure-startup - ['] (interrupt-auto-boot?) to interrupt-auto-boot? - screen-ih stdout ! - banner - ?usb-keyboard -[then] + stdout off \ + probe-pci + sound + open-keyboard + ?games + ['] false to interrupt-auto-boot? + probe-usb + interpreter-init + secure-startup + ['] (interrupt-auto-boot?) to interrupt-auto-boot? + screen-ih stdout ! + banner + ?usb-keyboard auto-boot
blue-letters ." Type 'help' for more information." black-letters
Added: cpu/x86/pc/olpc/images/warnings.565 =================================================================== (Binary files differ)
Property changes on: cpu/x86/pc/olpc/images/warnings.565 ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream
Added: cpu/x86/pc/olpc/images/warnings.bmp.gz =================================================================== (Binary files differ)
Property changes on: cpu/x86/pc/olpc/images/warnings.bmp.gz ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream
Modified: cpu/x86/pc/olpc/loaddropins.fth =================================================================== --- cpu/x86/pc/olpc/loaddropins.fth 2007-10-01 23:10:06 UTC (rev 656) +++ cpu/x86/pc/olpc/loaddropins.fth 2007-10-02 03:22:33 UTC (rev 657) @@ -28,6 +28,7 @@
" ${BP}/ofw/inet/telnetd.fth" " telnetd" $add-deflated-dropin
+ " ${BP}/cpu/x86/pc/olpc/images/warnings.565" " warnings.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/lightdot.565" " lightdot.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/yellowdot.565" " yellowdot.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/darkdot.565" " darkdot.565" $add-deflated-dropin
Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-01 23:10:06 UTC (rev 656) +++ cpu/x86/pc/olpc/security.fth 2007-10-02 03:22:33 UTC (rev 657) @@ -478,7 +478,10 @@ d# 410 d# 540 2constant progress-xy
: ?unfreeze ( -- ) - game-key@ button-check and if dcon-unfreeze then + game-key@ button-check and if + dcon-unfreeze + unfreeze + then ;
: security-failure ( -- ) @@ -508,8 +511,17 @@ : show-sad ( -- ) " sad" show-icon ; : show-lock ( -- ) " lock" show-icon ; : show-unlock ( -- ) " unlock" show-icon ; +: show-child ( -- ) + " erase-screen" $call-screen + d# 552 d# 383 to icon-xy " rom:xogray.565" $show-opaque + progress-xy to icon-xy \ For boot progress reports +; +: show-warnings ( -- ) + " erase-screen" $call-screen + d# 48 d# 32 to icon-xy " rom:warnings.565" $show-opaque + dcon-freeze +;
- \ secure-load-ramdisk is called during the process of preparing an \ OS image for execution. It looks for an initrd bundle file on \ the same device where the OS image was found, in a file named @@ -709,7 +721,6 @@
0 0 2value next-xy : load-from-list ( list$ -- devkey? ) - button-check game-key? 0= if dcon-freeze then " dev /jffs2-file-system ' ?unfreeze to scan-callout dend" eval
begin dup while ( list$ ) @@ -751,6 +762,7 @@
: all-devices$ ( -- list$ ) " disk sd fastnand nand" ;
+ d# 410 d# 540 2constant progress-xy : secure-startup ( -- ) ['] noop to ?show-device @@ -759,10 +771,15 @@
set-alternate
- d# 552 d# 383 to icon-xy " rom:xogray.565" $show-opaque - progress-xy to icon-xy \ For boot progress reports + button-rotate game-key? if show-warnings then + show-child
- button-check game-key? if text-on then + button-check game-key? if + unfreeze text-on + else + freeze dcon-freeze + then + ?toggle-secure
secure? 0= if exit then
Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2007-10-01 23:10:06 UTC (rev 656) +++ ofw/fs/jffs2/jffs2.fth 2007-10-02 03:22:33 UTC (rev 657) @@ -729,7 +729,7 @@ inodes 'next-inode ! pages/chip 0 do i page>eblock to the-eblock# - i h# ff and 0= if scan-callout then + i h# 3fff and 0= if scan-callout then i no-summary? if i possible-nodes? if i scan-raw-nodes then then