Author: wmb Date: 2009-05-13 22:15:07 +0200 (Wed, 13 May 2009) New Revision: 1185
Modified: dev/libertas.fth dev/mmc/sdhci/mv8686/fw8686.fth Log: Marvell wireless driver - a couple of fixes from Lilian for bugs I introduced in yesterday's USB/SD Libertas merge.
Modified: dev/libertas.fth =================================================================== --- dev/libertas.fth 2009-05-13 00:29:32 UTC (rev 1184) +++ dev/libertas.fth 2009-05-13 20:15:07 UTC (rev 1185) @@ -1628,7 +1628,6 @@
false to got-data? ( adr len buf actual ) process-rx ( adr len ) - recycle-packet ( adr len )
got-data? if ( adr len ) /data min tuck data -rot move ( actual ) @@ -1636,6 +1635,7 @@ 2drop -2 \ No data then ( actual )
+ recycle-packet ( actual ) ;
\ Normal read and write methods.
Modified: dev/mmc/sdhci/mv8686/fw8686.fth =================================================================== --- dev/mmc/sdhci/mv8686/fw8686.fth 2009-05-13 00:29:32 UTC (rev 1184) +++ dev/mmc/sdhci/mv8686/fw8686.fth 2009-05-13 20:15:07 UTC (rev 1185) @@ -48,8 +48,8 @@ outbuf over sdio-fw! <> if 4 3 1 sdio-reg! \ FN1 CFG = write iomem fail then - sdio-poll-dl-ready 0= if true exit then - fw-dn-blksz ?dup 0= if true exit then + sdio-poll-dl-ready 0= if ." Download fw died" cr true exit then + fw-dn-blksz ?dup 0= if false exit then dup 1 and if dn-retry 1+ dup to dn-retry 2 > if ." Retry fail" cr true exit then