Changeset 3487

Timestamp:

Dec 13, 2012 1:19:45 AM (5 months ago)

Author:

wmb

Message:

Marvell WLAN driver - moved the host interrupt mask setting code earlier in the startup sequence to make newer 8787 firmware happy. Also fixed a name collision that was causing (harmless) compilation warnings.

Location:

dev/mmc/sdhci/mv8686

Files:

• fw8686.fth (modified) (1 diff)
• sdio.fth (modified) (2 diffs)

dev/mmc/sdhci/mv8686/fw8686.fth

@@ -73 +73 @@
    fw-download-ok? 0=  if  true exit  then
 
-   3 host-int-mask-reg 1 sdio-reg!      \ Enable upload (1) and download (2)
    mv8787?  if
       2 config-reg 1 sdio-reg!             \ Host power up

dev/mmc/sdhci/mv8686/sdio.fth

@@ -22 +22 @@
 
 \ FCode doesn't have 2value so we do it this way
-0 value fw-adr
-0 value fw-len
-: default-fw$  ( -- adr len )  fw-adr fw-len  ;
-: set-default-fw$  ( adr len -- )  to fw-len  to fw-adr  ;
+0 value fw-name-adr
+0 value fw-name-len
+: default-fw$  ( -- adr len )  fw-name-adr fw-name-len  ;
+: set-default-fw$  ( adr len -- )  to fw-name-len  to fw-name-adr  ;
 
 0 value ioport
@@ -227 +227 @@
       host-int-rsr-reg 1 sdio-reg@  h# 3f or  host-int-rsr-reg 1 sdio-reg!
 
-\     3  host-int-mask-reg 1 sdio-reg!  \ Enable upload (1) and download (2)
-
       \ Set Dnld/upld to "auto reset"
       card-misc-cfg-reg 1 sdio-reg@   h# 10 or  card-misc-cfg-reg 1 sdio-reg!
    then
+   \ Newer revisions of the 8787 firmware empirically require that this
+   \ be enabled early, before firmware download.  Older versions, and
+   \ 8686 firmware, appear to be content with it either here or after
+   \ firmware startup.
+   3  host-int-mask-reg 1 sdio-reg!  \ Enable upload (1) and download (2)
 ;