summaryrefslogtreecommitdiffstats
path: root/package/ltq-vmmc
diff options
context:
space:
mode:
authorblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-03-11 08:21:21 +0000
committerblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-03-11 08:21:21 +0000
commit6fa27f11f3915b8d81f52ba409003e0fc8651e58 (patch)
treed6ecd75779514fa415443ec2769dc4a146d4eacb /package/ltq-vmmc
parent90f374771e2d0a49a6abfa073266cfcbfbab8667 (diff)
[lantiq]
* fixes dsl, ifxos, tapi and vmcc for .37 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26023 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/ltq-vmmc')
-rw-r--r--package/ltq-vmmc/Config.in5
-rw-r--r--package/ltq-vmmc/Makefile28
-rw-r--r--package/ltq-vmmc/patches/200-kernel-37.patch22
3 files changed, 24 insertions, 31 deletions
diff --git a/package/ltq-vmmc/Config.in b/package/ltq-vmmc/Config.in
index 151adc286..ed049c724 100644
--- a/package/ltq-vmmc/Config.in
+++ b/package/ltq-vmmc/Config.in
@@ -1,13 +1,10 @@
choice
prompt "device selection"
depends on PACKAGE_kmod-ltq-vmmc
- default VOICE_CPE_VMMC_WITH_DEVICE_DANUBE_extract
+ default VOICE_CPE_VMMC_WITH_DEVICE_DANUBE
help
Select the target device.
- config VOICE_CPE_VMMC_WITH_DEVICE_DANUBE_extract
- bool "Danube, Twinpass, Vinax - extract binaries"
-
config VOICE_CPE_VMMC_WITH_DEVICE_DANUBE
bool "Danube, Twinpass, Vinax"
diff --git a/package/ltq-vmmc/Makefile b/package/ltq-vmmc/Makefile
index 380fe6fde..51c00e99f 100644
--- a/package/ltq-vmmc/Makefile
+++ b/package/ltq-vmmc/Makefile
@@ -22,7 +22,7 @@ define KernelPackage/ltq-vmmc
SUBMENU:=Voice over IP
TITLE:=TAPI LL driver for Voice Macro
URL:=http://www.lantiq.com/
- DEPENDS:=+kmod-ltq-tapi @TARGET_lantiq
+ DEPENDS:=+kmod-ltq-tapi @TARGET_lantiq_xway
FILES:=$(PKG_BUILD_DIR)/src/drv_vmmc.ko
AUTOLOAD:=$(call AutoLoad,25,drv_vmmc)
MAINTAINER:=John Crispin <blogic@openwrt.org>
@@ -66,17 +66,6 @@ COEF_TARGET:=ifx_bbd_fxs.bin
COEF_FILE:=coef_voip_ifx.tar.gz
FW_DIR:=lib/firmware
-ifeq ($(CONFIG_VOICE_CPE_VMMC_WITH_DEVICE_DANUBE_extract),y)
- CONFIGURE_ARGS += --with-device=DANUBE
- FW_TARGET:=danube_firmware.bin
- FW_SOURCE:=danube_firmware.bin
- FW_URL:=http://www.arcor.de/hilfe/files/pdf/
- FW_FILE=arcor_A800_452CPW_FW_1.02.206(20081201).bin
- FW_MD5SUM:=19d9af4e369287a0f0abaed415cdac10
- COEF_TARGET:=danube_bbd_fxs.bin
- COEF_FILE:=arcor_A800_452CPW_FW_1.02.206(20081201).bin
- COEF_MD5SUM:=19d9af4e369287a0f0abaed415cdac10
-endif
ifeq ($(CONFIG_VOICE_CPE_VMMC_WITH_DEVICE_DANUBE),y)
CONFIGURE_ARGS += --with-device=DANUBE
@@ -99,15 +88,6 @@ ifeq ($(CONFIG_VOICE_CPE_VMMC_WITH_DEVICE_VR9),y)
# TODO: add fw/coef
endif
-ifeq ($(CONFIG_VOICE_CPE_VMMC_WITH_DEVICE_DANUBE_extract),y)
-define Download/decode
- FILE:=ifxmips_fw_decodev2.tar.bz2
- URL:=http://downloads.openwrt.org/sources/
- MD5SUM:=9f4ebfae5cb9d9e8fca46057a653ae27
-endef
-$(eval $(call Download,decode))
-endif
-
define Download/firmware
FILE:=$(FW_FILE)
URL:=$(FW_URL)
@@ -129,14 +109,8 @@ define Build/Configure
mkdir -p \
$(PKG_BUILD_DIR)/coef \
$(PKG_BUILD_DIR)/firmware
-ifeq ($(CONFIG_VOICE_CPE_VMMC_WITH_DEVICE_DANUBE_extract),y)
- $(PLATFORM_DIR)/extract.sh $(DL_DIR) '$(FW_FILE)'
- $(CP) $(DL_DIR)/voip.bin $(PKG_BUILD_DIR)/firmware/$(FW_TARGET)
- $(CP) $(DL_DIR)/voip_coef.bin $(PKG_BUILD_DIR)/coef/$(COEF_TARGET)
-else
$(TAR) -C $(PKG_BUILD_DIR)/firmware -xvzf $(DL_DIR)/$(FW_FILE)
$(TAR) -C $(PKG_BUILD_DIR)/coef -xvzf $(DL_DIR)/$(COEF_FILE)
-endif
(cd $(PKG_BUILD_DIR); aclocal && autoconf && automake)
$(call Build/Configure/Default)
endef
diff --git a/package/ltq-vmmc/patches/200-kernel-37.patch b/package/ltq-vmmc/patches/200-kernel-37.patch
new file mode 100644
index 000000000..b89da4691
--- /dev/null
+++ b/package/ltq-vmmc/patches/200-kernel-37.patch
@@ -0,0 +1,22 @@
+--- a/src/drv_vmmc_init.c
++++ b/src/drv_vmmc_init.c
+@@ -1594,7 +1594,7 @@
+ #ifdef VMMC_DRIVER_UNLOAD_HOOK
+ if (VDevices[0].nDevState & DS_GPIO_RESERVED)
+ {
+- IFX_int32_t ret;
++ IFX_int32_t ret = 0;
+ VMMC_DRIVER_UNLOAD_HOOK(ret);
+ if (!VMMC_SUCCESS(ret))
+ {
+--- a/src/mps/drv_mps_vmmc_linux.c
++++ b/src/mps/drv_mps_vmmc_linux.c
+@@ -173,7 +173,7 @@
+ static struct file_operations ifx_mps_fops = {
+ owner:THIS_MODULE,
+ poll:ifx_mps_poll,
+- ioctl:ifx_mps_ioctl,
++ unlocked_ioctl:ifx_mps_ioctl,
+ open:ifx_mps_open,
+ release:ifx_mps_close
+ };