X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=blobdiff_plain;f=recipes%2Fpandora-system%2Fwl1251-modules%2Frc.wl1251;h=5018c6b0081ebbdcfb6b995584b1df4ad49e86cb;hp=abd91da716c7be2a4acb7ef5f4d7a73e8d609e7c;hb=c1cc4459899791fa75055af9e9a1b05bd56f9473;hpb=e7bb44debc7d24f6e93b6fecd9b6b2ec3ff97af7

diff --git a/recipes/pandora-system/wl1251-modules/rc.wl1251 b/recipes/pandora-system/wl1251-modules/rc.wl1251
index abd91da..5018c6b 100755
--- a/recipes/pandora-system/wl1251-modules/rc.wl1251
+++ b/recipes/pandora-system/wl1251-modules/rc.wl1251
@@ -1,43 +1,48 @@
 #!/bin/sh
-
 DESC="WL1251 MAC80211 Wireless LAN driver"
 NAME="wl1251"
 
 d_stop() {
-	if `grep -q wl12xx /proc/modules` ; then
-		rmmod wl12xx_sdio
-		rmmod wl12xx
-	fi
-	if `grep -q mac80211 /proc/modules` ; then
-		rmmod mac80211
-		rmmod cfg80211
-		rmmod rfkill_backport
-		rmmod lib80211_crypt_ccmp
-		rmmod lib80211_crypt_wep
-		rmmod lib80211_crypt_tkip
-		rmmod lib80211
+	if `grep -q wl1251 /proc/modules` ; then
+		rmmod wl1251_sdio
+		rmmod wl1251
+		rmmod board-omap3pandora-wifi
 	fi
 }
 
 d_start() {
-	insmod $(busybox find /lib/modules/$(uname -r) -name "arc4.ko")
-	insmod $(busybox find /lib/modules/$(uname -r) -name "ecb.ko")
+	insmod $(busybox find /lib/modules/$(uname -r)/updates -name "rfkill_backport.ko")
+        insmod $(busybox find /lib/modules/$(uname -r)/updates -name "compat.ko")
+        insmod $(busybox find /lib/modules/$(uname -r)/updates -name "cfg80211.ko")
+	insmod $(busybox find /lib/modules/$(uname -r)/updates -name "mac80211.ko")
+        insmod $(busybox find /lib/modules/$(uname -r)/updates -name "compat_firmware_class.ko")
+        insmod $(busybox find /lib/modules/$(uname -r) -name "ecb.ko")
 	insmod $(busybox find /lib/modules/$(uname -r) -name "pcbc.ko")
-	insmod $(busybox find /lib/modules/$(uname -r) -name "rfkill_backport.ko")
-	insmod $(busybox find /lib/modules/$(uname -r) -name "cfg80211.ko")
-	insmod $(busybox find /lib/modules/$(uname -r) -name "mac80211.ko")
-	insmod $(busybox find /lib/modules/$(uname -r) -name "lib80211.ko")
-	insmod $(busybox find /lib/modules/$(uname -r) -name "lib80211_crypt_tkip.ko")
-	insmod $(busybox find /lib/modules/$(uname -r) -name "lib80211_crypt_wep.ko")
-	insmod $(busybox find /lib/modules/$(uname -r) -name "lib80211_crypt_ccmp.ko")
-	insmod $(busybox find /lib/modules/$(uname -r) -name "wl12xx.ko")
-	insmod $(busybox find /lib/modules/$(uname -r) -name "wl12xx_sdio.ko")
+        insmod $(busybox find /lib/modules/$(uname -r) -name "arc4.ko")
+	insmod $(busybox find /lib/modules/$(uname -r)/updates -name "lib80211.ko")
+	insmod $(busybox find /lib/modules/$(uname -r)/updates -name "lib80211_crypt_tkip.ko")
+	insmod $(busybox find /lib/modules/$(uname -r)/updates -name "lib80211_crypt_wep.ko")
+	insmod $(busybox find /lib/modules/$(uname -r)/updates -name "lib80211_crypt_ccmp.ko")
+	insmod $(busybox find /lib/modules/$(uname -r)/updates -name "wl1251.ko")
+	insmod $(busybox find /lib/modules/$(uname -r)/updates -name "wl1251_sdio.ko")
+	insmod $(busybox find /lib/modules/$(uname -r) -name "board-omap3pandora-wifi.ko")
+
+	# restore phyX related LED triggers (they come from mac80211.ko)
+	sleep 0.5
+	if [ -e /sys/class/leds/ ] ; then
+		for led in /sys/class/leds/* ; do
+			trigger=$(grep "$(basename $led)" /etc/default/leds | grep "phy" | awk '{print $2}')
+			if [ "x$trigger" != "x" ] ; then
+				echo "$trigger" > "$led/trigger"
+			fi
+		done
+	fi
 }
 
 case "$1" in
   start)
 	echo -n "Starting $DESC: $NAME"
-	d_start
+	d_start &
 	echo "."
 	;;
   stop)