X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Facx-mac80211%2FMakefile;h=0c19540cbf5967539260420d9bc8fd79d6a87b28;hb=5815a1790429d406b94a3de0af2ab36719ae4259;hp=7bc37ee84cf02def12f55363bfce106876ad2204;hpb=6fadc72b1db0aea3328f7156fb086c2b2b68dc31;p=openwrt.git

diff --git a/package/acx-mac80211/Makefile b/package/acx-mac80211/Makefile
index 7bc37ee84c..0c19540cbf 100644
--- a/package/acx-mac80211/Makefile
+++ b/package/acx-mac80211/Makefile
@@ -1,80 +1,141 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=acx-mac80211
-PKG_VERSION:=20070718
+PKG_REV:=0da6e533679c177c1f5efffd22e345304d273e49
+PKG_VERSION:=20110821
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://teknoraver.campuslife.it/software/acx-mac80211/
-PKG_MD5SUM:=c6f339384c8ad17181a9f867a227ddae
-
-PKG_FW_NAME:=tiacx111c16
-PKG_FW_URL:=http://teknoraver.campuslife.it/software/acx-mac80211/
-PKG_FW_MD5SUM:=7026826460376f6b174f9225bd7781b9
+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_BUILD_DEPENDS:=mac80211
 
 include $(INCLUDE_DIR)/package.mk
-ifeq ($(DUMP),)
-  include $(LINUX_DIR)/.config
-endif
 
 define KernelPackage/acx-mac80211
   SUBMENU:=Wireless Drivers
   TITLE:=ACX111 Mac80211 driver
-  DESCRIPTION:=Driver for acx111 cards (Mac80211 version)
-  DEPENDS:=@LINUX_2_6 +kmod-mac80211
-# KCONFIG:=CONFIG_MAC80211
-  FILES:=$(PKG_BUILD_DIR)/acx-mac80211.$(LINUX_KMOD_SUFFIX)
+  DEPENDS:=@PCI_SUPPORT||TARGET_ar7 +kmod-mac80211
+  FILES:=$(PKG_BUILD_DIR)/acx-mac80211.ko
   AUTOLOAD:=$(call AutoLoad,50,acx-mac80211)
+  MENU:=1
 endef
 
-$(STAMP_BUILT): $(DL_DIR)/$(PKG_FW_NAME)
+define KernelPackage/acx-mac80211/config
+	menu "Configuration"
+		depends on PACKAGE_kmod-acx-mac80211
+
+	choice
+		prompt "acx firmware version"
+		default ACX_DEFAULT if !TARGET_adm5120
+		default ACX_1_2_1_34 if TARGET_adm5120
+		help
+		  This option allows you to select the version of the acx firmware.
+
+	config ACX_DEFAULT
+		bool "Default"
+		help
+		  Default firmware for ACX devices.
 
-$(DL_DIR)/$(PKG_FW_NAME):
-	$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_FW_NAME)" "$(PKG_FW_MD5SUM)" $(PKG_FW_URL)
+		  If unsure, select this.
 
-ifneq ($(CONFIG_MAC80211),)
+	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.
+
+		  If unsure, select the "default" firmware.
+
+	endchoice
+
+	endmenu
+endef
 
-  PKG_EXTRA_KCONFIG:= \
+define KernelPackage/acx-mac80211/description
+	Driver for acx111 cards (Mac80211 version)
+endef
+
+
+C16_FW:=tiacx111c16
+C19_FW:=tiacx111c19
+
+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/tiacx111c19
+	FILE:=$(C19_FW)
+	URL:=http://ipkg.k1k2.de/files/
+	MD5SUM:=a1fa9681e297b4e36e257090fc12265a
+  endef
+  $(eval $(call Download,tiacx111c19))
+endif
+
+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/
+	URL:=http://sites.google.com/site/atorkhov/files/
+	MD5SUM:=fcd07de4b25e1d2aaf3b78b27c5b7ee9
+  endef
+  $(eval $(call Download,tiacx111c16))
+endif
+
+PKG_EXTRA_KCONFIG:= \
 	CONFIG_ACX_MAC80211=m \
 	CONFIG_ACX_MAC80211_PCI=m \
 
-  PKG_EXTRA_CFLAGS:= \
-	-I$(STAGING_DIR)/usr/include/mac80211 \
+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)))) \
 
-  define Build/Compile/it
+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
+
+define Build/Compile
 	$(MAKE) -C "$(LINUX_DIR)" \
 		ARCH="$(LINUX_KARCH)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		SUBDIRS="$(PKG_BUILD_DIR)" \
 		$(PKG_EXTRA_KCONFIG) \
-		EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS)" \
+		EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS) -DCONFIG_ACX_MAC80211_VERSION=\"KERNEL_VERSION(2,6,37)\"" \
+		LINUXINCLUDE="-I$(STAGING_DIR)/usr/include/mac80211 -I$(LINUX_DIR)/include \
+			-Iarch/$(LINUX_KARCH)/include \
+			-include $(LINUX_AUTOCONF_FILE) \
+			-include linux/compat-2.6.h" \
 		V="$(V)" \
 		modules
-  endef
-
-endif
-
-define Build/Configure
 endef
 
-define Build/Compile
-$(call Build/Compile/it)
+define Build/Configure
 endef
 
 define KernelPackage/acx-mac80211/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(DL_DIR)/$(PKG_FW_NAME) $(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/
+endif
+ifeq ($(CONFIG_ACX_1_2_1_34),y)
+	$(INSTALL_DATA) $(DL_DIR)/$(C16_FW)_1.2.1_34 $(1)/lib/firmware/$(C16_FW)
+endif
 endef
 
 $(eval $(call KernelPackage,acx-mac80211))