add new broadcom system code and new wlan driver (old driver still used by default)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2395 3c298f89-4303-0410-b956-a3cf2f4a3e73

target/linux/Config.in

@@ -64,6 +64,15 @@ config BR2_PACKAGE_KMOD_BRCM_WL
 	help
 	  Proprietary driver for Broadcom Wireless chipsets
 
+config BR2_PACKAGE_KMOD_BRCM_WL2
+	prompt "kmod-brcm-wl2..................... Broadcom Wireless Network Driver (new)"
+	tristate
+	depends BR2_LINUX_2_4_BRCM
+	default m
+	help
+	  Proprietary driver for Broadcom Wireless chipsets
+	  New version with Multi-BSS capability
+
 config BR2_PACKAGE_KMOD_CPMAC
 	prompt "kmod-cpmac........................ AR7 CPMAC Network Driver"
 	tristate

target/linux/control/kmod-brcm-wl2.control

@@ -0,0 +1,7 @@
+Package: kmod-brcm-wl2
+Priority: optional
+Section: sys
+Maintainer: Felix Fietkau <nbd@openwrt.org>
+Source: buildroot internal
+Description: Proprietary driver for Broadcom Wireless chipsets
+  New version with multi-BSS support

target/linux/linux-2.4/broadcom.mk

@@ -6,11 +6,14 @@
 #############################################################
 
 # broadcom specific kmod packages
-
 $(eval $(call KMOD_template,BRCM_WL,brcm-wl,\
 	$(MODULES_DIR)/kernel/drivers/net/wl/wl.o \
 ,CONFIG_WL,,10,wl))
 
+$(eval $(call KMOD_template,BRCM_WL2,brcm-wl2,\
+	$(BUILD_DIR)/wl/wl2/wl.o \
+,CONFIG_WL,,10,wl))
+
 $(eval $(call KMOD_template,BRCM_ET,brcm-et,\
 	$(MODULES_DIR)/kernel/drivers/net/et/et.o \
 ,CONFIG_ET,,10,et))
@@ -24,10 +27,10 @@ $(eval $(call KMOD_template,LP,lp,\
 
 LINUX_BINARY_DRIVER_SITE=http://openwrt.org/downloads/sources
 # proprietary driver, extracted from Linksys GPL sourcetree WRT54GS 4.70.6
-LINUX_BINARY_WL_DRIVER=kernel-binary-wl-0.4.tar.gz
+LINUX_BINARY_WL_DRIVER=kernel-binary-wl-0.5.tar.gz
-LINUX_BINARY_WL_MD5SUM=0659fa8f1805be6ec03188ef8e1216cc
+LINUX_BINARY_WL_MD5SUM=78e839842bdc04022bb44469f92b1131
-LINUX_ET_DRIVER=kernel-source-et-0.11.tar.gz
+LINUX_ET_DRIVER=kernel-source-et-0.12.tar.gz
-LINUX_ET_MD5SUM=bdc23ab59440793e35cab039457f6358
+LINUX_ET_MD5SUM=14c6810cd3ee74b5f9f86b98fdaaeb18
 
 $(DL_DIR)/$(LINUX_BINARY_WL_DRIVER):
 	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_BINARY_WL_DRIVER) $(LINUX_BINARY_WL_MD5SUM) $(LINUX_BINARY_DRIVER_SITE) $(MAKE_TRACE)
@@ -38,6 +41,7 @@ $(DL_DIR)/$(LINUX_ET_DRIVER):
 $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_BINARY_WL_DRIVER) $(DL_DIR)/$(LINUX_ET_DRIVER)
 $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.drivers-unpacked
 $(LINUX_DIR)/.modules_done: $(LINUX_DIR)/.drivers-unpacked
+$(STAMP_DIR)/.linux-compile: $(LINUX_DIR)/.drivers-installed
 
 $(LINUX_DIR)/.drivers-unpacked: $(LINUX_DIR)/.unpacked
 	-mkdir -p $(BUILD_DIR)
@@ -52,6 +56,11 @@ $(LINUX_DIR)/.drivers-unpacked: $(LINUX_DIR)/.unpacked
 	cp -fpR $(BUILD_DIR)/et/*.h $(LINUX_DIR)/arch/mips/bcm947xx/include/
 	touch $@
 
+$(LINUX_DIR)/.drivers-installed: $(LINUX_DIR)/.modules_done
+	mkdir -p $(LINUX_BUILD_DIR)/modules/lib/modules/2.4.30/kernel/drivers/net/wl
+	@-[ -f $(LINUX_BUILD_DIR)/modules/lib/modules/2.4.30/kernel/drivers/net/wl/wl.o ] || cp $(LINUX_DIR)/drivers/net/wl/wl.o $(LINUX_BUILD_DIR)/modules/lib/modules/2.4.30/kernel/drivers/net/wl/
+	touch $@
+
 linux-dirclean: drivers-clean
 
 drivers-clean:

target/linux/package/diag/diag_led.c

@@ -36,6 +36,7 @@
 #include <linux/sysctl.h>
 #include <asm/io.h>
 #include <typedefs.h>
+#include <osl.h>
 #include <bcmdevs.h>
 #include <sbutils.h>
 
@@ -47,9 +48,9 @@ static void *sbh;
 #define DMZ_GPIO  (1<<7)
 
 static void set_gpio(uint32 mask, uint32 value) {
-	sb_gpiocontrol(sbh,mask,0);
+	sb_gpiocontrol(sbh,mask, 0, GPIO_DRV_PRIORITY);
-	sb_gpioouten(sbh,mask,mask);
+	sb_gpioouten(sbh,mask,mask,GPIO_DRV_PRIORITY);
-	sb_gpioout(sbh,mask,value);
+	sb_gpioout(sbh,mask,value,GPIO_DRV_PRIORITY);
 }
 
 static void v2_set_diag(u8 state) {
@@ -122,8 +123,8 @@ static int proc_reset(ctl_table *table, int write, struct file *filp,
 {
 
 	if (reset_gpio) {
-		sb_gpiocontrol(sbh,reset_gpio,reset_gpio);
+		sb_gpiocontrol(sbh,reset_gpio,reset_gpio,GPIO_DRV_PRIORITY);
-		sb_gpioouten(sbh,reset_gpio,0);
+		sb_gpioouten(sbh,reset_gpio,0,GPIO_DRV_PRIORITY);
 		reset=!(sb_gpioin(sbh)&reset_gpio);
 
 		if (reset_polarity) reset=!reset;
@@ -222,8 +223,8 @@ static int __init diag_init()
 	}
 
 	
-	sb_gpiocontrol(sbh,reset_gpio,reset_gpio);
+	sb_gpiocontrol(sbh,reset_gpio,reset_gpio,GPIO_DRV_PRIORITY);
-	sb_gpioouten(sbh,reset_gpio,0);
+	sb_gpioouten(sbh,reset_gpio,0,GPIO_DRV_PRIORITY);
 	reset_polarity=!(sb_gpioin(sbh)&reset_gpio);
 
 	diag_sysctl_header = register_sysctl_table(sys_diag, 0);