r1686 - cpu/x86/pc/olpc/via dev dev/mmc/sdhci/mv8686 dev/usb2/device/wlan

Author: wmb
Date: 2010-01-23 05:44:27 +0100 (Sat, 23 Jan 2010)
New Revision: 1686

Modified:
   cpu/x86/pc/olpc/via/suspend.fth
   dev/libertas.fth
   dev/mmc/sdhci/mv8686/mv8686.fth
   dev/usb2/device/wlan/usb8388.fth
Log:
OLPC XO-1.5 wlan driver - reset the driver upon resume from S3 so
the device can be used or tested after suspending.

Modified: cpu/x86/pc/olpc/via/suspend.fth
===================================================================
--- cpu/x86/pc/olpc/via/suspend.fth	2010-01-23 04:42:37 UTC (rev 1685)
+++ cpu/x86/pc/olpc/via/suspend.fth	2010-01-23 04:44:27 UTC (rev 1686)
@@ -54,6 +54,7 @@
 : s3-suspend
    suspend-usb
    s3-no-usb
+   " /wlan"  " reset-wlan" execute-device-method drop
    resume-usb
 ;
 alias s s3-suspend

Modified: dev/libertas.fth
===================================================================
--- dev/libertas.fth	2010-01-23 04:42:37 UTC (rev 1685)
+++ dev/libertas.fth	2010-01-23 04:44:27 UTC (rev 1686)
@@ -558,7 +558,11 @@
 \ Reset
 \ =========================================================================

-: reset-wlan  ( -- )  " wlan-reset" evaluate  ds-not-ready set-driver-state  ;
+: reset-wlan  ( -- )
+   " wlan-reset" evaluate
+   ds-not-ready to driver-state
+   reset-host-bus
+;

: marvel-get-hw-spec  ( -- true | adr false )
    d# 38 h# 03 ( CMD_GET_HW_SPEC ) prepare-cmd

Modified: dev/mmc/sdhci/mv8686/mv8686.fth
===================================================================
--- dev/mmc/sdhci/mv8686/mv8686.fth	2010-01-23 04:42:37 UTC (rev 1685)
+++ dev/mmc/sdhci/mv8686/mv8686.fth	2010-01-23 04:44:27 UTC (rev 1686)
@@ -89,6 +89,8 @@
    false
 ;

+: reset-host-bus  ( -- )  false to card-attached?  ;
+
 \ LICENSE_BEGIN
 \ Copyright (c) 2009 FirmWorks
 \

Modified: dev/usb2/device/wlan/usb8388.fth
===================================================================
--- dev/usb2/device/wlan/usb8388.fth	2010-01-23 04:42:37 UTC (rev 1685)
+++ dev/usb2/device/wlan/usb8388.fth	2010-01-23 04:44:27 UTC (rev 1686)
@@ -68,6 +68,7 @@

: release-bus-resources  ( -- )  end-bulk-in end-out-ring  ;

+: reset-host-bus  ( -- )  ;

0 value vid
 0 value pid