John Crispin
12 years ago
parent
977bb0c843
commit
23c3aa997b
@ -0,0 +1,75 @@ |
||||
# Copyright (C) 2010 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
|
||||
include $(TOPDIR)/rules.mk |
||||
include $(INCLUDE_DIR)/kernel.mk |
||||
|
||||
PKG_NAME:=ltq-vdsl-app
|
||||
PKG_VERSION:=4.11.4
|
||||
PKG_RELEASE:=1
|
||||
PKG_BASE_NAME:=dsl_cpe_control_vrx
|
||||
PKG_SOURCE:=$(PKG_BASE_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/dsl_cpe_control-$(PKG_VERSION)
|
||||
|
||||
PKG_BUILD_DEPENDS:=kmod-ltq-vdsl-vr9
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk |
||||
|
||||
define Package/ltq-vdsl-app |
||||
SECTION:=net
|
||||
CATEGORY:=Network
|
||||
TITLE:=Lantiq VDSL userland tool
|
||||
URL:=http://www.lantiq.com/
|
||||
DEPENDS:=@TARGET_lantiq_xway +libpthread
|
||||
endef |
||||
|
||||
define Package/ltq-vdsl-app/description |
||||
Userland tool needed to control Lantiq VDSL CPE
|
||||
endef |
||||
|
||||
CONFIGURE_ARGS += \
|
||||
--with-max-device="1" \
|
||||
--with-lines-per-device="1" \
|
||||
--with-channels-per-line="1" \
|
||||
--enable-vrx \
|
||||
--enable-driver-include="-I$(STAGING_DIR)/usr/include/drv_vdsl_cpe_api" \
|
||||
--enable-device-driver-include="-I$(STAGING_DIR)/usr/include/vdsl/" \
|
||||
--enable-add-appl-cflags="-DMAX_CLI_PIPES=2" \
|
||||
--enable-ifxos \
|
||||
--enable-ifxos-include="-I$(STAGING_DIR)/usr/include/ifxos" \
|
||||
--enable-ifxos-library="-I$(STAGING_DIR)/usr/lib" \
|
||||
--enable-dsl-ceoc \
|
||||
--enable-dsl-pm-total \
|
||||
--enable-dsl-pm-showtime \
|
||||
--enable-dsl-pm-line-counters \
|
||||
--enable-dsl-pm-line-failure-counters \
|
||||
--enable-dsl-pm-datapath-counters \
|
||||
--enable-dsl-pm-datapath-failure-counters \
|
||||
--enable-deprecated \
|
||||
--disable-soap-support \
|
||||
--enable-dsl-bonding=no \
|
||||
--disable-dti
|
||||
|
||||
ifeq ($(CONFIG_IFX_CLI),y) |
||||
CONFIGURE_ARGS += \
|
||||
--enable-cli-support
|
||||
endif |
||||
|
||||
CONFIGURE_ARGS += --enable-model=full
|
||||
#CONFIGURE_ARGS += --enable-model=lite
|
||||
#CONFIGURE_ARGS += --enable-model=footprint
|
||||
#CONFIGURE_ARGS += --enable-model=typical
|
||||
#CONFIGURE_ARGS += --enable-model=debug
|
||||
|
||||
define Package/ltq-vdsl-app/install |
||||
$(INSTALL_DIR) $(1)/etc/init.d
|
||||
$(INSTALL_BIN) ./files/dsl_control $(1)/etc/init.d/
|
||||
|
||||
$(INSTALL_DIR) $(1)/sbin
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dsl_cpe_control $(1)/sbin/vdsl_cpe_control
|
||||
$(INSTALL_BIN) ./files/dsl_notify.sh $(1)/sbin
|
||||
endef |
||||
|
||||
$(eval $(call BuildPackage,ltq-vdsl-app)) |
||||
@ -0,0 +1,311 @@ |
||||
#!/bin/sh /etc/rc.common |
||||
# Copyright (C) 2012 OpenWrt.org |
||||
|
||||
START=99 |
||||
|
||||
EXTRA_COMMANDS="status lucistat" |
||||
EXTRA_HELP=" status Get DSL status information |
||||
lucistat Get status information if lua friendly format" |
||||
|
||||
SERVICE_DAEMONIZE=1 |
||||
SERVICE_WRITE_PID=1 |
||||
|
||||
# |
||||
# Basic functions to send CLI commands to the vdsl_cpe_control daemon |
||||
# |
||||
dsl_cmd() { |
||||
killall -0 vdsl_cpe_control && ( |
||||
echo "$@" > /tmp/pipe/dsl_cpe0_cmd |
||||
cat /tmp/pipe/dsl_cpe0_ack |
||||
) |
||||
} |
||||
dsl_val() { |
||||
echo $(expr "$1" : '.*'$2'=\([-\.[:alnum:]]*\).*') |
||||
} |
||||
|
||||
# |
||||
# Simple divide by 10 routine to cope with one decimal place |
||||
# |
||||
dbt() { |
||||
local a=$(expr $1 / 10) |
||||
local b=$(expr $1 % 10) |
||||
echo "${a}.${b}" |
||||
} |
||||
# |
||||
# Take a number and convert to k or meg |
||||
# |
||||
scale() { |
||||
local val=$1 |
||||
local a |
||||
local b |
||||
|
||||
if [ "$val" -gt 1000000 ]; then |
||||
a=$(expr $val / 1000) |
||||
b=$(expr $a % 1000) |
||||
a=$(expr $a / 1000) |
||||
printf "%d.%03d Mb" ${a} ${b} |
||||
elif [ "$val" -gt 1000 ]; then |
||||
a=$(expr $val / 1000) |
||||
printf "%d Kb" ${a} |
||||
else |
||||
echo "${val} b" |
||||
fi |
||||
} |
||||
|
||||
# |
||||
# Read the data rates for both directions |
||||
# |
||||
data_rates() { |
||||
local csg |
||||
local dru |
||||
local drd |
||||
local sdru |
||||
local sdrd |
||||
|
||||
csg=$(dsl_cmd g997csg 0 1) |
||||
drd=$(dsl_val "$csg" ActualDataRate) |
||||
|
||||
csg=$(dsl_cmd g997csg 0 0) |
||||
dru=$(dsl_val "$csg" ActualDataRate) |
||||
|
||||
[ -z "$drd" ] && drd=0 |
||||
[ -z "$dru" ] && dru=0 |
||||
|
||||
sdrd=$(scale $drd) |
||||
sdru=$(scale $dru) |
||||
|
||||
if [ "$action" = "lucistat" ]; then |
||||
echo "dsl.data_rate_down=$drd" |
||||
echo "dsl.data_rate_up=$dru" |
||||
echo "dsl.data_rate_down_s=\"$sdrd\"" |
||||
echo "dsl.data_rate_up_s=\"$sdru\"" |
||||
else |
||||
echo "Data Rate: ${sdrd}/s / ${sdru}/s" |
||||
fi |
||||
} |
||||
|
||||
# |
||||
# Chipset |
||||
# |
||||
chipset() { |
||||
local vig |
||||
local cs |
||||
local csv |
||||
|
||||
vig=$(dsl_cmd vig) |
||||
cs=$(dsl_val "$vig" DSL_ChipSetType) |
||||
csv=$(dsl_val "$vig" DSL_ChipSetHWVersion) |
||||
|
||||
if [ "$action" = "lucistat" ]; then |
||||
echo "dsl.chipset=\"${cs} ${csv}\"" |
||||
else |
||||
echo "Chipset: ${cs} ${csv}" |
||||
fi |
||||
} |
||||
|
||||
# |
||||
# Work out how long the line has been up |
||||
# |
||||
line_uptime() { |
||||
local ccsg |
||||
local et |
||||
local etr |
||||
local d |
||||
local h |
||||
local m |
||||
local s |
||||
local rc="" |
||||
|
||||
ccsg=$(dsl_cmd pmccsg 0 0 0) |
||||
et=$(dsl_val "$ccsg" nElapsedTime) |
||||
|
||||
[ -z "$et" ] && et=0 |
||||
|
||||
if [ "$action" = "lucistat" ]; then |
||||
echo "dsl.line_uptime=${et}" |
||||
return |
||||
fi |
||||
|
||||
d=$(expr $et / 86400) |
||||
etr=$(expr $et % 86400) |
||||
h=$(expr $etr / 3600) |
||||
etr=$(expr $etr % 3600) |
||||
m=$(expr $etr / 60) |
||||
s=$(expr $etr % 60) |
||||
|
||||
|
||||
[ "${d}${h}${m}${s}" -ne 0 ] && rc="${s}s" |
||||
[ "${d}${h}${m}" -ne 0 ] && rc="${m}m ${rc}" |
||||
[ "${d}${h}" -ne 0 ] && rc="${h}h ${rc}" |
||||
[ "${d}" -ne 0 ] && rc="${d}d ${rc}" |
||||
|
||||
[ -z "$rc" ] && rc="down" |
||||
echo "Line Uptime: ${rc}" |
||||
} |
||||
|
||||
# |
||||
# Get noise and attenuation figures |
||||
# |
||||
line_data() { |
||||
local lsg |
||||
local latnu |
||||
local latnd |
||||
local snru |
||||
local snrd |
||||
|
||||
lsg=$(dsl_cmd g997lsg 1 1) |
||||
latnd=$(dsl_val "$lsg" LATN) |
||||
snrd=$(dsl_val "$lsg" SNR) |
||||
|
||||
lsg=$(dsl_cmd g997lsg 0 1) |
||||
latnu=$(dsl_val "$lsg" LATN) |
||||
snru=$(dsl_val "$lsg" SNR) |
||||
|
||||
[ -z "$latnd" ] && latnd=0 |
||||
[ -z "$latnu" ] && latnu=0 |
||||
[ -z "$snrd" ] && snrd=0 |
||||
[ -z "$snru" ] && snru=0 |
||||
|
||||
latnd=$(dbt $latnd) |
||||
latnu=$(dbt $latnu) |
||||
snrd=$(dbt $snrd) |
||||
snru=$(dbt $snru) |
||||
|
||||
if [ "$action" = "lucistat" ]; then |
||||
echo "dsl.line_attenuation_down=$latnd" |
||||
echo "dsl.line_attenuation_up=$latnu" |
||||
echo "dsl.noise_margin_down=$snrd" |
||||
echo "dsl.noise_margin_up=$snru" |
||||
else |
||||
echo "Line Attenuation: ${latnd}dB / ${latnu}dB" |
||||
echo "Noise Margin: ${snrd}dB / ${snru}dB" |
||||
fi |
||||
} |
||||
|
||||
# |
||||
# Is the line up? Or what state is it in? |
||||
# |
||||
line_state() { |
||||
local lsg=$(dsl_cmd lsg) |
||||
local ls=$(dsl_val "$lsg" nLineState); |
||||
local s; |
||||
|
||||
case "$ls" in |
||||
"0x0") s="not initialized" ;; |
||||
"0x1") s="exception" ;; |
||||
"0x10") s="not updated" ;; |
||||
"0xff") s="idle request" ;; |
||||
"0x100") s="idle" ;; |
||||
"0x1ff") s="silent request" ;; |
||||
"0x200") s="silent" ;; |
||||
"0x300") s="handshake" ;; |
||||
"0x380") s="full_init" ;; |
||||
"0x400") s="discovery" ;; |
||||
"0x500") s="training" ;; |
||||
"0x600") s="analysis" ;; |
||||
"0x700") s="exchange" ;; |
||||
"0x800") s="showtime_no_sync" ;; |
||||
"0x801") s="showtime_tc_sync" ;; |
||||
"0x900") s="fastretrain" ;; |
||||
"0xa00") s="lowpower_l2" ;; |
||||
"0xb00") s="loopdiagnostic active" ;; |
||||
"0xb10") s="loopdiagnostic data exchange" ;; |
||||
"0xb20") s="loopdiagnostic data request" ;; |
||||
"0xc00") s="loopdiagnostic complete" ;; |
||||
"0x1000000") s="test" ;; |
||||
"0xd00") s="resync" ;; |
||||
"0x3c0") s="short init entry" ;; |
||||
"") s="not running daemon"; ls="0xfff" ;; |
||||
*) s="unknown" ;; |
||||
esac |
||||
|
||||
if [ $action = "lucistat" ]; then |
||||
echo "dsl.line_state_num=$ls" |
||||
echo "dsl.line_state_detail=\"$s\"" |
||||
if [ "$ls" = "0x801" ]; then |
||||
echo "dsl.line_state=\"UP\"" |
||||
else |
||||
echo "dsl.line_state=\"DOWN\"" |
||||
fi |
||||
else |
||||
if [ "$ls" = "0x801" ]; then |
||||
echo "Line State: UP [$ls: $s]" |
||||
else |
||||
echo "Line State: DOWN [$ls: $s]" |
||||
fi |
||||
fi |
||||
} |
||||
|
||||
# |
||||
# Main status routine |
||||
# |
||||
status() { |
||||
chipset |
||||
line_state |
||||
data_rates |
||||
line_data |
||||
line_uptime |
||||
} |
||||
|
||||
# |
||||
# Luci (lua) compatible version that's easy to parse |
||||
# |
||||
lucistat() { |
||||
echo "local dsl={}" |
||||
status |
||||
echo "return dsl" |
||||
} |
||||
|
||||
|
||||
annex_b=10_00_10_00_00_04_00_00 |
||||
annex_bdmt=10_00_00_00_00_00_00_00 |
||||
annex_b2=00_00_10_00_00_00_00_00 |
||||
annex_b2p=00_00_00_00_00_04_00_00 |
||||
annex_a=04_01_04_00_00_01_00_00 |
||||
annex_at1=01_00_00_00_00_00_00_00 |
||||
annex_alite=00_01_00_00_00_00_00_00 |
||||
annex_admt=04_00_00_00_00_00_00_00 |
||||
annex_a2=00_00_04_00_00_00_00_00 |
||||
annex_a2p=00_00_00_00_00_01_00_00 |
||||
annex_l=00_00_00_00_04_00_00_00 |
||||
annex_m=00_00_00_00_40_00_04_00 |
||||
annex_m2=00_00_00_00_40_00_00_00 |
||||
annex_m2p=00_00_00_00_00_00_04_00 |
||||
|
||||
# |
||||
# Simple start routine |
||||
# |
||||
start() { |
||||
local annex |
||||
local firmware |
||||
local xtu |
||||
config_load network |
||||
config_get annex wan annex |
||||
config_get firmware wan firmware |
||||
|
||||
# get xtu |
||||
eval "xtu=\"\${annex_$annex}\"" |
||||
|
||||
# check for firmware |
||||
[ -z "${firmware}" ] && |
||||
firmware=vdsl.bin |
||||
|
||||
# start CPE dsl daemon in the background |
||||
service_start /sbin/vdsl_cpe_control -i${xtu} \ |
||||
-n /sbin/dsl_notify.sh \ |
||||
-f /lib/firmware/${firmware} |
||||
} |
||||
|
||||
# |
||||
# For stop we want to simulate the notification call for when |
||||
# the line goes down, so that we can stop the ppp link before |
||||
# we die. |
||||
# |
||||
stop() { |
||||
DSL_NOTIFICATION_TYPE="DSL_INTERFACE_STATUS" \ |
||||
DSL_INTERFACE_STATUS="DOWN" \ |
||||
/sbin/dsl_notify.sh |
||||
|
||||
service_stop /sbin/vdsl_cpe_control |
||||
} |
||||
|
||||
@ -0,0 +1,44 @@ |
||||
#!/bin/sh |
||||
# |
||||
# This script is called by dsl_cpe_control whenever there is a DSL event, |
||||
# we only actually care about the DSL_INTERFACE_STATUS events as these |
||||
# tell us the line has either come up or gone down. |
||||
# |
||||
# The rest of the code is basically the same at the atm hotplug code |
||||
# |
||||
|
||||
[ "$DSL_NOTIFICATION_TYPE" = "DSL_INTERFACE_STATUS" ] || exit 0 |
||||
|
||||
. /lib/functions.sh |
||||
|
||||
include /lib/network |
||||
scan_interfaces |
||||
|
||||
local found=0 |
||||
local ifc |
||||
for ifc in $interfaces; do |
||||
local up |
||||
config_get_bool up "$ifc" up 0 |
||||
|
||||
local auto |
||||
config_get_bool auto "$ifc" auto 1 |
||||
|
||||
local proto |
||||
config_get proto "$ifc" proto |
||||
|
||||
if [ "$DSL_INTERFACE_STATUS" = "UP" ]; then |
||||
if [ "$proto" = "pppoa" ] && [ "$up" != 1 ] && [ "$auto" = 1 ]; then |
||||
found=1 |
||||
( sleep 1; ifup "$ifc" ) & |
||||
fi |
||||
else |
||||
if [ "$proto" = "pppoa" ] && [ "$up" = 1 ] && [ "$auto" = 1 ]; then |
||||
found=1 |
||||
( sleep 1; ifdown "$ifc" ) & |
||||
fi |
||||
fi |
||||
done |
||||
|
||||
if [ "$found" != 1 ]; then |
||||
logger "Found no matching interface for DSL notification ($DSL_INTERFACE_STATUS)" |
||||
fi |
||||
@ -0,0 +1,26 @@ |
||||
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, \
|
||||
- 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++)
|
||||
{
|
||||
#if defined(INCLUDE_DSL_CPE_API_VINAX) || 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)*/
|
||||
Loading…
Reference in new issue