aboutsummaryrefslogtreecommitdiffstats
path: root/package/network
diff options
context:
space:
mode:
Diffstat (limited to 'package/network')
-rw-r--r--package/network/config/ltq-vdsl-app/Makefile13
-rw-r--r--package/network/config/ltq-vdsl-app/files/dsl_control106
-rw-r--r--package/network/config/ltq-vdsl-app/patches/100-compat.patch34
3 files changed, 22 insertions, 131 deletions
diff --git a/package/network/config/ltq-vdsl-app/Makefile b/package/network/config/ltq-vdsl-app/Makefile
index be86275dee..061a966bf7 100644
--- a/package/network/config/ltq-vdsl-app/Makefile
+++ b/package/network/config/ltq-vdsl-app/Makefile
@@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=ltq-vdsl-app
-PKG_VERSION:=4.11.4
+PKG_VERSION:=4.16.2.4
PKG_RELEASE:=1
PKG_BASE_NAME:=dsl_cpe_control_vrx
PKG_SOURCE:=$(PKG_BASE_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
-PKG_MD5SUM:=e9152ced26a91fbeefa4f34badb97484
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/dsl_cpe_control-$(PKG_VERSION)
+PKG_SOURCE_URL:=https://github.com/xdarklight/$(PKG_BASE_NAME)/archive/v$(PKG_VERSION)
+PKG_MD5SUM:=487925ef5327ea38c544035b388de8bb
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_BASE_NAME)-$(PKG_VERSION)
PKG_LICENSE:=BSD-2-Clause
PKG_BUILD_DEPENDS:=kmod-ltq-vdsl-vr9
@@ -25,7 +25,7 @@ define Package/ltq-vdsl-app
CATEGORY:=Network
TITLE:=Lantiq VDSL userland tool
URL:=http://www.lantiq.com/
- DEPENDS:=@TARGET_lantiq_xrx200 +libpthread
+ DEPENDS:=@TARGET_lantiq_xrx200 +libpthread +librt
endef
define Package/ltq-vdsl-app/description
@@ -43,7 +43,7 @@ CONFIGURE_ARGS += \
--enable-ifxos \
--enable-ifxos-include="-I$(STAGING_DIR)/usr/include/ifxos" \
--enable-ifxos-library="-I$(STAGING_DIR)/usr/lib" \
- --enable-dsl-ceoc \
+ --disable-dsl-ceoc \
--enable-dsl-pm-total \
--enable-dsl-pm-showtime \
--enable-dsl-pm-line-counters \
@@ -53,6 +53,7 @@ CONFIGURE_ARGS += \
--enable-deprecated \
--disable-soap-support \
--enable-dsl-bonding=no \
+ --enable-debug-prints=err \
--disable-dti
ifeq ($(CONFIG_IFX_CLI),y)
diff --git a/package/network/config/ltq-vdsl-app/files/dsl_control b/package/network/config/ltq-vdsl-app/files/dsl_control
index bededb2612..394e1c0859 100644
--- a/package/network/config/ltq-vdsl-app/files/dsl_control
+++ b/package/network/config/ltq-vdsl-app/files/dsl_control
@@ -12,7 +12,6 @@ SERVICE_DAEMONIZE=1
SERVICE_WRITE_PID=1
[ -f /lib/functions/lantiq_dsl.sh ] && . /lib/functions/lantiq_dsl.sh
-XDSL_CTRL=vdsl_cpe_control
# G.992.1 Annex A
# G.992.2 Annex A
@@ -38,105 +37,14 @@ xtse_adsl_j="10 00 10 40 00 04 01 00"
xtse_vdsl="00 00 00 00 00 00 00 07"
-xdsl_scr() {
- val=`echo $2 | sed "s/ / 0x/g"`
- echo "[WaitForConfiguration]={
-#G997XTUSEC_g997xtusecs 0x$val
-}
-
-[WaitForLinkActivate]={
-}
-
-[WaitForRestart]={
-}
-
-[Common]={
-}" > /tmp/$1.scr
-}
-
-# A43
-tone_adsl_a="0x142"
-tone_vdsl_a="0x142"
-
-# A43 + V43
-tone_adsl_av="0x142"
-tone_vdsl_av="0x146"
-
-# B43
-tone_adsl_b="0x1"
-tone_vdsl_b="0x1"
-
-# B43 + V43
-tone_adsl_bv="0x1"
-tone_vdsl_bv="0x5"
-
-lowlevel_cfg() {
- echo "# VRX Low Level Configuration File
-#
-# Parameters must be separated by tabs or spaces.
-# Empty lines and comments will be ignored.
-#
-
-# nFilter
-#
-# NA = -1
-# OFF = 0
-# ISDN = 1
-# POTS = 2
-# POTS_2 = 3
-# POTS_3 = 4
-#
-# (dec)
- -1
-
-# nHsToneGroupMode nHsToneGroup_A nHsToneGroup_V nHsToneGroup_AV
-#
-# NA = -1 NA = -1 see see
-# AUTO = 0 VDSL2_B43 = 0x0001 nHsToneGroup_A nHsToneGroup_A
-# MANUAL = 1 VDSL2_A43 = 0x0002
-# VDSL2_V43 = 0x0004
-# VDSL1_V43P = 0x0008
-# VDSL1_V43I = 0x0010
-# ADSL1_C43 = 0x0020
-# ADSL2_J43 = 0x0040
-# ADSL2_B43C = 0x0080
-# ADSL2_A43C = 0x0100
-#
-# (dec) (hex) (hex) (hex)
- 1 $1 $2 0x0
-
-# nBaseAddr nIrqNum
-#
-# (hex) (dec)
- 0x1e116000 63
-
-# nUtopiaPhyAdr nUtopiaBusWidth nPosPhyParity
-# default(16b) = 0 NA = -1
-# 8-bit = 1 ODD = 0
-# 16-bit = 2
-#
-#
-# (hex) (dec) (dec)
- 0xFF 0 0
-
-# bNtrEnable
-#
-# (dec)
- 0" > /tmp/lowlevel.cfg
-}
-
start() {
local annex
local firmware
- local tone
- local tone_adsl
- local tone_vdsl
local xtse
local xtse_adsl
local mode
config_load network
- config_get tone dsl tone
config_get annex dsl annex
config_get firmware dsl firmware
config_get xfer_mode dsl xfer_mode
@@ -158,33 +66,19 @@ start() {
if [ "${xtse_adsl}" ]; then
xtse=$xtse_adsl
else
- xtse_adsl=$xtse_adsl_a
xtse=$xtse_vdsl
fi
- eval "tone_adsl=\"\${tone_adsl_$tone}\""
- [ -z "${tone_adsl}" ] && tone_adsl=$tone_adsl_av
-
- eval "tone_vdsl=\"\${tone_vdsl_$tone}\""
- [ -z "${tone_vdsl}" ] && tone_vdsl=$tone_vdsl_av
-
[ -z "${firmware}" ] && firmware=/lib/firmware/vdsl.bin
[ -f "${firmware}" ] || {
echo failed to find $firmware
return 1
}
- xdsl_scr adsl "${xtse_adsl}"
- xdsl_scr vdsl "${xtse_vdsl}"
- lowlevel_cfg "${tone_adsl}" "${tone_vdsl}"
-
service_start /sbin/vdsl_cpe_control \
-i `echo $xtse | sed "s/ /_/g"` \
-n /sbin/dsl_notify.sh \
-f ${firmware} \
- -a /tmp/adsl.scr \
- -A /tmp/vdsl.scr \
- -l /tmp/lowlevel.cfg \
-M ${mode}
}
diff --git a/package/network/config/ltq-vdsl-app/patches/100-compat.patch b/package/network/config/ltq-vdsl-app/patches/100-compat.patch
index da56232437..eeedc54a88 100644
--- a/package/network/config/ltq-vdsl-app/patches/100-compat.patch
+++ b/package/network/config/ltq-vdsl-app/patches/100-compat.patch
@@ -1,26 +1,22 @@
-Index: dsl_cpe_control-4.11.4/src/dsl_cpe_init_cfg.c
-===================================================================
---- dsl_cpe_control-4.11.4.orig/src/dsl_cpe_init_cfg.c 2011-10-26 00:35:26.000000000 +0200
-+++ dsl_cpe_control-4.11.4/src/dsl_cpe_init_cfg.c 2012-11-28 15:53:10.857692092 +0100
-@@ -43,7 +43,7 @@
- {
- DSL_CPE_LL_CFG_SET(-1, -1, DSL_DEV_HS_TONE_GROUP_VDSL2_B43, \
- DSL_DEV_HS_TONE_GROUP_VDSL2_B43, DSL_DEV_HS_TONE_GROUP_VDSL2_B43, \
+--- a/src/dsl_cpe_init_cfg.c
++++ b/src/dsl_cpe_init_cfg.c
+@@ -38,7 +38,7 @@ DSL_InitData_t gInitCfgData =
+ DSL_DEV_HS_TONE_GROUP_CLEANED, \
+ DSL_DEV_HS_TONE_GROUP_CLEANED, \
+ DSL_DEV_HS_TONE_GROUP_CLEANED, \
- 0x1E116000, 0x37, -1),
+ 0x1E116000, 0x3f, -1),
- #endif
-
- #if defined(INCLUDE_DSL_CPE_API_VINAX)
-Index: dsl_cpe_control-4.11.4/src/dsl_cpe_control.c
-===================================================================
---- dsl_cpe_control-4.11.4.orig/src/dsl_cpe_control.c 2012-01-13 15:15:34.000000000 +0100
-+++ dsl_cpe_control-4.11.4/src/dsl_cpe_control.c 2012-11-28 15:53:23.465692408 +0100
-@@ -6432,7 +6432,7 @@
- for (nDevice = 0; nDevice < DSL_CPE_MAX_DEVICE_NUMBER; nDevice++)
+ DSL_CPE_SIC_SET(DSL_TC_ATM, DSL_EMF_TC_CLEANED, DSL_EMF_TC_CLEANED, DSL_SYSTEMIF_MII, \
+ DSL_TC_EFM, DSL_EMF_TC_CLEANED, DSL_EMF_TC_CLEANED, DSL_SYSTEMIF_MII),
+ }
+--- a/src/dsl_cpe_control.c
++++ b/src/dsl_cpe_control.c
+@@ -6856,7 +6856,7 @@ DSL_int_t dsl_cpe_daemon (
+ for (nDevice = 0; nDevice < DSL_CPE_MAX_DSL_ENTITIES; nDevice++)
{
- #if defined(INCLUDE_DSL_CPE_API_VINAX) || defined(INCLUDE_DSL_CPE_API_VRX)
+ #if defined(INCLUDE_DSL_CPE_API_VRX)
- sprintf (device, "%s/%d", DSL_CPE_DEVICE_NAME, nDevice);
+ sprintf (device, "%s%d", DSL_CPE_DEVICE_NAME, nDevice);
#else
sprintf (device, "%s", DSL_CPE_DEVICE_NAME);
- #endif /* defined(INCLUDE_DSL_CPE_API_VINAX) || defined(INCLUDE_DSL_CPE_API_VRX)*/
+ #endif /* defined(INCLUDE_DSL_CPE_API_VRX)*/