Changeset 2805

Timestamp:

Jan 10, 2012 2:45:52 AM (18 months ago)

Author:

quozl

Message:

OLPC XO-1.75 - retry EDI interface activation when using it for tag maintenance operations, change EDI byte in to reveal an inactive state, tested on C1 SKU201, fix for #11565.

Location:

cpu/arm/olpc

Files:

• ecflash.fth (modified) (1 diff)
• edi.fth (modified) (2 diffs)

cpu/arm/olpc/ecflash.fth

@@ -40 +40 @@
 : ?reflash-ec-flags  ( adr -- )
    use-edi-spi                          ( adr )
-   spi-start                            ( adr )  \ avoids holding EC in reset
+   edi-open-active                      ( adr )  \ avoids holding EC in reset
    load-base /flash-page ec-flags-offset edi-read-flash         ( adr )
    dup load-base /flash-page comp       ( adr different? )

cpu/arm/olpc/edi.fth

@@ -27 +27 @@
 [ifndef] edi-wait-b
 : edi-wait-b  ( -- b )  \ Wait for and receive EC response byte
-   d# 10000 0  do 
-      spi-in h# 50 =  if
-         spi-in           ( b )
-         spi-cs-off       ( b )
-         unloop exit
-      then
+   d# 100 0  do
+      spi-in              ( d )
+      dup h# 5f <>  if    ( d )
+         dup h# 50 =  if  ( d )
+            drop
+            spi-in        ( b )
+            spi-cs-off    ( b )
+            unloop exit
+         then             ( d )
+         spi-cs-off       ( d )
+         h# ff =  abort" EDI byte in inactive"
+         true abort" EDI byte in confused"
+      then                ( d )
+      drop
    loop
    spi-cs-off
@@ -228 +236 @@
    \ fast-edi-clock   \ Target speed up to 16 MHz
    \ reset
+;
+: edi-open-active  ( -- )
+   spi-start
+   ['] select-flash  catch  if  select-flash  then
 ;