X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Facx-mac80211%2FMakefile;h=3e8bb15c5b835ff232f2558c17dca76473d9b2d2;hb=b00403b9a6e05f97ed1ff79671e406b84eb3a750;hp=ab793d422859e6a035b025e5b2d9a4cba8970dc9;hpb=8ebdef0e75d716e0ab20e31272651676526fa8ee;p=openwrt.git

diff --git a/package/acx-mac80211/Makefile b/package/acx-mac80211/Makefile
index ab793d4228..3e8bb15c5b 100644
--- a/package/acx-mac80211/Makefile
+++ b/package/acx-mac80211/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2008 OpenWrt.org
+# Copyright (C) 2007-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=acx-mac80211
-PKG_REV:=11145e4b4895d0a8ead16cbe052baf3dde4627bd
-PKG_VERSION:=20110123
+PKG_REV:=v2012-09-23-WIP
+PKG_VERSION:=20121004
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -18,16 +18,18 @@ PKG_SOURCE_URL:=git://acx100.git.sourceforge.net/gitroot/acx100/acx-mac80211
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_MIRROR_MD5SUM:=8d6bc84239059fd938ff4d989579f622
 PKG_BUILD_DEPENDS:=mac80211
 
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/acx-mac80211
   SUBMENU:=Wireless Drivers
-  TITLE:=ACX111 Mac80211 driver
-  DEPENDS:=@PCI_SUPPORT||TARGET_ar7 +kmod-mac80211
+  TITLE:=ACX1xx mac80211 driver
+  DEPENDS:=@(PCI_SUPPORT||TARGET_ar7) @mipsel +kmod-mac80211
   FILES:=$(PKG_BUILD_DIR)/acx-mac80211.ko
   AUTOLOAD:=$(call AutoLoad,50,acx-mac80211)
+  MAINTAINER:=Florian Fainelli <florian@openwrt.org>
   MENU:=1
 endef
 
@@ -35,8 +37,34 @@ define KernelPackage/acx-mac80211/config
 	menu "Configuration"
 		depends on PACKAGE_kmod-acx-mac80211
 
+	config ACX_ID_0D
+		bool "ACX1xx Radio ID 0D firmware"
+		help
+		  Download and install firmware for:
+		    ACX1xx cards with Radio ID 0D into /lib/firmware.
+
+	config ACX_ID_11
+		bool "ACX1xx Radio ID 11 firmware"
+		help
+		  Download and install firmware for:
+		    ACX1xx cards with Radio ID 11 into /lib/firmware.
+
+	config ACX_ID_15
+		bool "ACX1xx Radio ID 15 firmware"
+		help
+		  Download and install firmware for:
+		    ACX1xx cards with Radio ID 15 into /lib/firmware.
+
+	config ACX_ID_16
+		bool "ACX1xx Radio ID 16 firmware"
+		default y
+		help
+		  Download and install firmware for:
+		    ACX1xx cards with Radio ID 16 into /lib/firmware.
+
 	choice
-		prompt "acx firmware version"
+		prompt "ACX111 firmware version"
+		depends on ACX_ID_16
 		default ACX_DEFAULT if !TARGET_adm5120
 		default ACX_1_2_1_34 if TARGET_adm5120
 		help
@@ -45,55 +73,98 @@ define KernelPackage/acx-mac80211/config
 	config ACX_DEFAULT
 		bool "Default"
 		help
-		  Default firmware for ACX devices.
+		  Default firmware for ACX111 devices.
 
 		  If unsure, select this.
 
 	config ACX_1_2_1_34
 		bool "1.2.1_34"
 		help
-		  1.2.1_34 firmware for ACX devices. Works with Zyxel P-334WT.
+		  1.2.1_34 firmware for ACX111 devices. Works with Zyxel P-334WT.
 
 		  If unsure, select the "default" firmware.
 
 	endchoice
 
+	config ACX_ID_17
+		bool "ACX1xx Radio ID 17 firmware"
+		help
+		  Download and install firmware for:
+		    ACX1xx cards with Radio ID 17 into /lib/firmware.
+
+	config ACX_ID_19
+		bool "ACX1xx Radio ID 19 firmware"
+		default y
+		help
+		  Download and install firmware for:
+		    ACX1xx cards with Radio ID 19 into /lib/firmware.
+
+	config ACX_ID_1B
+		bool "ACX1xx Radio ID 1B firmware"
+		help
+		  Download and install firmware for:
+		    ACX1xx cards with Radio ID 1b into /lib/firmware.
+
 	endmenu
 endef
 
 define KernelPackage/acx-mac80211/description
-	Driver for acx111 cards (Mac80211 version)
+	Driver for acx111 cards (mac80211 version)
 endef
 
+define Download/tiacx100
+	FILE:=tiacx100
+	URL:=http://acx100.erley.org/fw/acx100_1.9.8.b/
+	MD5SUM:=24a54fd30f7658fcbffc825b0dd7aa5b
+endef
 
-C16_FW:=tiacx111c16
-C19_FW:=tiacx111c19
+define Download/tiacx100r0d
+	FILE:=tiacx100r0D
+	URL:=http://acx100.erley.org/fw/acx100_1.9.8.b/
+	MD5SUM:=1c7413e7b0be4ef7d1e424a132e17fab
+endef
 
-ifeq ($(CONFIG_ACX_DEFAULT),y)
-  define Download/tiacx111c16
-	FILE:=$(C16_FW)
-	URL:=http://teknoraver.net/software/acx-mac80211/
-	MD5SUM:=7026826460376f6b174f9225bd7781b9
-  endef
-  $(eval $(call Download,tiacx111c16))
+define Download/tiacx100r11
+	FILE:=tiacx100r11
+	URL:=http://acx100.erley.org/fw/acx100_1.9.8.b/
+	MD5SUM:=a150750ad33c512edc4afee5270b37cb
+endef
 
-  define Download/tiacx111c19
-	FILE:=$(C19_FW)
-	URL:=http://ipkg.k1k2.de/files/
-	MD5SUM:=a1fa9681e297b4e36e257090fc12265a
-  endef
-  $(eval $(call Download,tiacx111c19))
-endif
+define Download/tiacx100r15
+	FILE:=tiacx100r15
+	URL:=http://acx100.erley.org/fw/acx100_1.9.8.b/
+	MD5SUM:=c99d01d4fcf0d6cc00441aff60690be4
+endef
+
+define Download/tiacx111c16
+	FILE:=tiacx111c16
+	URL:=http://acx100.erley.org/fw/acx111_2.3.1.31/
+	MD5SUM:=7026826460376f6b174f9225bd7781b9
+endef
 
-ifeq ($(CONFIG_ACX_1_2_1_34),y)
-  define Download/tiacx111c16
-	FILE:=$(C16_FW)_1.2.1_34
-#	URL:=http://acx100.erley.org/fw/acx111_1.2.1.34/
+define Download/tiacx111c16_1
+	FILE:=tiacx111c16_1.2.1_34
 	URL:=http://sites.google.com/site/atorkhov/files/
 	MD5SUM:=fcd07de4b25e1d2aaf3b78b27c5b7ee9
-  endef
-  $(eval $(call Download,tiacx111c16))
-endif
+endef
+
+define Download/tiacx111c17
+	FILE:=tiacx111c17
+	URL:=http://acx100.erley.org/fw/acx111_2.3.1.31/
+	MD5SUM:=95552544ca6d2b4e8c6aeb80b8ae7fdf
+endef
+
+define Download/tiacx111c19
+	FILE:=tiacx111c19
+	URL:=http://acx100.erley.org/fw/acx111_2.3.1.31/
+	MD5SUM:=a1fa9681e297b4e36e257090fc12265a
+endef
+
+define Download/tiacx111usbc1b
+	FILE:=tiacx111usbc1B
+	URL:=http://acx100.erley.org/fw/acx111_2.4.0.70-USB/
+	MD5SUM:=c4edecd912b2417779d0b65e3a7dc86d
+endef
 
 PKG_EXTRA_KCONFIG:= \
 	CONFIG_ACX_MAC80211=m \
@@ -103,11 +174,7 @@ PKG_EXTRA_CFLAGS:= \
 	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \
 	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(PKG_EXTRA_KCONFIG)))) \
 
-ifneq ($(CONFIG_LINUX_2_6_30)$(CONFIG_LINUX_2_6_31)$(CONFIG_LINUX_2_6_32),)
-  LINUX_AUTOCONF_FILE:= linux/autoconf.h
-else
-  LINUX_AUTOCONF_FILE:= generated/autoconf.h
-endif
+LINUX_AUTOCONF_FILE:= generated/autoconf.h
 
 define Build/Compile
 	$(MAKE) -C "$(LINUX_DIR)" \
@@ -115,7 +182,7 @@ define Build/Compile
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		SUBDIRS="$(PKG_BUILD_DIR)" \
 		$(PKG_EXTRA_KCONFIG) \
-		EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS) -DCONFIG_ACX_MAC80211_VERSION=\"KERNEL_VERSION(2,6,37)\"" \
+		EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS) -DCONFIG_ACX_MAC80211_VERSION=\"KERNEL_VERSION(3,7,0)\"" \
 		LINUXINCLUDE="-I$(STAGING_DIR)/usr/include/mac80211 -I$(LINUX_DIR)/include \
 			-Iarch/$(LINUX_KARCH)/include \
 			-include $(LINUX_AUTOCONF_FILE) \
@@ -129,13 +196,52 @@ endef
 
 define KernelPackage/acx-mac80211/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-ifeq ($(CONFIG_ACX_DEFAULT),y)
-	$(INSTALL_DATA) $(DL_DIR)/$(C16_FW) $(1)/lib/firmware/
-	$(INSTALL_DATA) $(DL_DIR)/$(C19_FW) $(1)/lib/firmware/
+
+ifneq ($(CONFIG_ACX_ID_0D)$(CONFIG_ACX_ID_11)$(CONFIG_ACX_ID_15),)
+	$(INSTALL_DATA) $(DL_DIR)/tiacx100 $(1)/lib/firmware/
+endif
+
+ifneq ($(CONFIG_ACX_ID_0D),)
+	$(INSTALL_DATA) $(DL_DIR)/tiacx100r0D $(1)/lib/firmware/
 endif
-ifeq ($(CONFIG_ACX_1_2_1_34),y)
-	$(INSTALL_DATA) $(DL_DIR)/$(C16_FW)_1.2.1_34 $(1)/lib/firmware/$(C16_FW)
+
+ifneq ($(CONFIG_ACX_ID_11),)
+	$(INSTALL_DATA) $(DL_DIR)/tiacx100r11 $(1)/lib/firmware/
 endif
+
+ifneq ($(CONFIG_ACX_ID_15),)
+	$(INSTALL_DATA) $(DL_DIR)/tiacx100r15 $(1)/lib/firmware/
+endif
+
+ifneq ($(CONFIG_ACX_DEFAULT),)
+	$(INSTALL_DATA) $(DL_DIR)/tiacx111c16 $(1)/lib/firmware/
+endif
+
+ifneq ($(CONFIG_ACX_1_2_1_34),)
+	$(INSTALL_DATA)	$(DL_DIR)/tiacx111c16_1.2.1_34 $(1)/lib/firmware/tiacx111c16
+endif
+
+ifneq ($(CONFIG_ACX_ID_17),)
+	$(INSTALL_DATA) $(DL_DIR)/tiacx111c17 $(1)/lib/firmware/
+endif
+
+ifneq ($(CONFIG_ACX_ID_19),)
+	$(INSTALL_DATA) $(DL_DIR)/tiacx111c19 $(1)/lib/firmware/
+endif
+
+ifneq ($(CONFIG_ACX_ID_1B),)
+	$(INSTALL_DATA) $(DL_DIR)/tiacx111usbc1B $(1)/lib/firmware/
+endif
+
 endef
 
 $(eval $(call KernelPackage,acx-mac80211))
+$(eval $(call Download,tiacx100))
+$(eval $(call Download,tiacx100r0d))
+$(eval $(call Download,tiacx100r11))
+$(eval $(call Download,tiacx100r15))
+$(eval $(call Download,tiacx111c16))
+$(eval $(call Download,tiacx111c16_1))
+$(eval $(call Download,tiacx111c17))
+$(eval $(call Download,tiacx111c19))
+$(eval $(call Download,tiacx111usbc1b))