From: David-John Willis <John.Willis@Distant-earth.com>
Date: Tue, 13 Oct 2009 08:56:05 +0000 (+0100)
Subject: wl1251: Update to build the latest snapshot.
X-Git-Tag: Release-2010-05/1~191
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=commitdiff_plain;h=82a78284ea99d49c9fe35f924295b605d92efea4

wl1251: Update to build the latest snapshot.
---

diff --git a/recipes/pandora-system/wl1251-modules.bb b/recipes/pandora-system/wl1251-modules.bb
index b3f652b..8d2c1bf 100755
--- a/recipes/pandora-system/wl1251-modules.bb
+++ b/recipes/pandora-system/wl1251-modules.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Kernel drivers for the TI WL1251 WiFi chip found on the Pandora -
 LICENSE = "GPLv2"
 
 SRC_URI += " \
-	http://djwillis.openpandora.org/pandora/wifi/wl12xx-wireless-2009-06-22.zip \
+	http://djwillis.openpandora.org/pandora/wifi/wl1251-wireless-2009-10-08-rev2.zip \
 	file://rc.wl1251 \
 "
 
@@ -11,7 +11,7 @@ inherit update-rc.d
 INITSCRIPT_NAME = "wl1251-init"
 INITSCRIPT_PARAMS = "start 30 5 2 . stop 40 0 1 6 ."
 
-S = "${WORKDIR}/compat-wireless-2009-06-11"
+S = "${WORKDIR}/compat-wireless-2009-08-30"
 
 inherit module
 
@@ -35,7 +35,8 @@ do_install() {
           mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/kernel/net/rfkill
           cp ${S}/net/rfkill/*.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/net/rfkill
           mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless/wl12xx      
-          cp ${S}/drivers/net/wireless/wl12xx/*.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless/wl12xx
+          cp ${S}/drivers/net/wireless/wl12xx/wl1251.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless/wl12xx
+          cp ${S}/drivers/net/wireless/wl12xx/wl1251_sdio.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless/wl12xx
           install -d ${D}${sysconfdir}/init.d/
           cp -pP ${WORKDIR}/rc.wl1251 ${D}${sysconfdir}/init.d/wl1251-init
 }
diff --git a/recipes/pandora-system/wl1251-modules/rc.wl1251 b/recipes/pandora-system/wl1251-modules/rc.wl1251
index abd91da..9e1783e 100755
--- a/recipes/pandora-system/wl1251-modules/rc.wl1251
+++ b/recipes/pandora-system/wl1251-modules/rc.wl1251
@@ -4,9 +4,10 @@ DESC="WL1251 MAC80211 Wireless LAN driver"
 NAME="wl1251"
 
 d_stop() {
-	if `grep -q wl12xx /proc/modules` ; then
-		rmmod wl12xx_sdio
-		rmmod wl12xx
+	if `grep -q wl1251 /proc/modules` ; then
+		rmmod wl1251_sdio
+		rmmod wl1251
+		rmmod board-omap3pandora-wifi
 	fi
 	if `grep -q mac80211 /proc/modules` ; then
 		rmmod mac80211
@@ -20,6 +21,7 @@ d_stop() {
 }
 
 d_start() {
+	insmod $(busybox find /lib/modules/$(uname -r) -name "board-omap3pandora-wifi.ko")
 	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) -name "pcbc.ko")
@@ -30,8 +32,8 @@ d_start() {
 	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 "wl1251.ko")
+	insmod $(busybox find /lib/modules/$(uname -r) -name "wl1251_sdio.ko")
 }
 
 case "$1" in