Changeset 3364

Timestamp:

Oct 12, 2012 8:28:22 AM (7 months ago)

Author:

quozl

Message:

OLPC - rewrite SPI and EC flash animation scale calculation following review

Files:

• cpu/arm/olpc/build-fw.fth (modified) (1 diff)
• cpu/arm/olpc/edi.fth (modified) (3 diffs)
• cpu/x86/pc/olpc/gui.fth (modified) (3 diffs)
• cpu/x86/pc/olpc/security.fth (modified) (2 diffs)
• dev/olpc/spiflash/spiui.fth (modified) (4 diffs)

cpu/arm/olpc/build-fw.fth

@@ -854 +854 @@
          d# 1000 ms
       else
-         show-reflash
-         ['] show-reflash-dot to edi-progress
+         jots  ['] jot to edi-progress
          update-ec-flash
       then

cpu/arm/olpc/edi.fth

@@ -51 +51 @@
 
 d# 128 constant /flash-page
-defer edi-progress  ' drop to edi-progress  ( n -- )
+defer edi-progress  ' 2drop to edi-progress  ( offset size -- )
 
 : edi-cmd,adr  ( offset cmd -- )   \ Send command plus 3 address bytes
@@ -196 +196 @@
 ;
 
-: .edi-progress  ( n -- )
-   /ec-flash h# 8000 >  if  1  else  0  then  rshift    ( dot# )
-   edi-progress                                         ( )
-;
-
 : edi-program-flash  ( adr len offset -- )
    cr                                          ( adr len offset )
@@ -209 +204 @@
          over i +  over i +  edi-program-page  ( adr offset )
       then                                     ( adr offset )
-      i .edi-progress                          ( adr offset )
+      i /ec-flash  edi-progress                ( adr offset )
    /flash-page +loop                           ( adr offset )
    2drop                                       ( )

cpu/x86/pc/olpc/gui.fth

@@ -391 +391 @@
 ;
 
-d# 834 value bar-y
+d# 32 value #dots
+d# 820 value bar-y
 d# 150 value bar-x
+d# 1200 d# 26 - value bar-x-last
 0 value dot-adr
+0 value dot-spacing
+0 value last-dot#
 
 : read-dot  ( -- )  \ rom: is unavailable during reflash
@@ -401 +405 @@
 ;
 
-: show-reflash  ( -- )  \ bottom left corner, chip and progress dots
+: jots  ( -- )  \ bottom left corner, chip and progress dots
    d# 25 d# 772 set-icon-xy " spi" show-icon
-   d# 992 bar-x + bar-y set-icon-xy " yellowdot" show-icon
+   bar-x-last bar-y set-icon-xy " yellowdot" show-icon
    read-dot
-;
-
-: show-reflash-dot  ( n -- )  \ n to vary h# 0 to h# 8000
-   dup h# 400 mod 0=  if                   ( n )
-      dot-adr 0=  if  drop exit  then      ( n )
-      dot-adr swap h# 20 /  bar-x + bar-y  ( adr x y )
-      image-width image-height             ( adr x y w h )
-      " draw-transparent-rectangle" $call-screen
+   -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# )
+   dup last-dot# <>  if                                 ( dot# )
+      dup to last-dot#                                  ( dot# )
+      dot-adr swap                                      ( adr dot# )
+      dot-spacing *  bar-x + bar-y                      ( adr x y )
+      image-width image-height                          ( adr x y w h )
+      " draw-transparent-rectangle" $call-screen        ( )
    else
       drop
@@ -419 +428 @@
 
 0 [if]
-: test-reflash-dot
-   page show-reflash  t( h# 8000 0 do  i show-reflash-dot  h# 80 +loop )t
+: test-jots-flash  \ XO-4 B1 13ms
+   page jots t( /flash 0 do  i /flash jot /flash-page +loop )t
+;
+: test-jots-ec  \ XO-4 B1 3ms
+   page jots t( /ec-flash 0 do  i /ec-flash jot /flash-page +loop )t
 ;
 [then]

cpu/x86/pc/olpc/security.fth

@@ -1007 +1007 @@
    ec-indexed-io-off?  if
       visible
-      show-reflash
+      jots
       ." Restarting to enable SPI FLASH writing."  cr
       d# 3000 ms
@@ -1017 +1017 @@
    alternate?  if  [char] A h# 82 cmos!  then
 
-   show-reflash
-   ['] show-reflash-dot to spi-progress
+   jots  ['] jot to spi-progress
    reflash      \ Should power-off and reboot
    show-x

dev/olpc/spiflash/spiui.fth

@@ -9 +9 @@
 h# 4000 constant /chunk   \ Convenient sized piece for progress reports
 
-defer spi-progress  ' drop to spi-progress  ( n -- )
-
-: .progress  ( offset -- )
-   /flash h# 10.0000 >  if  6  else  5  then  rshift    ( dot# )
-   dup spi-progress  h# 400 + spi-progress              ( )
-;
+defer spi-progress  ' 2drop to spi-progress  ( offset size -- )
 
 : write-flash-range  ( adr end-offset start-offset -- )
@@ -32 +27 @@
          dup  /flash-block  i  flash-write  ( adr )
       then
-      i .progress                           ( adr )
+      i /flash  spi-progress                ( adr )
       /flash-block +                        ( adr' )
    /flash-block +loop                       ( adr )
@@ -197 +192 @@
 
    \ Don't write the block containing the manufacturing data
-   mfg-data-offset .progress
+   mfg-data-offset /flash  spi-progress
 
    flash-buf mfg-data-end-offset +   /flash  mfg-data-end-offset  write-flash-range  \ Write last part
@@ -222 +217 @@
          verify-firmware
       then
-      /flash .progress
+      /flash dup  spi-progress
       flash-write-disable
    else