diff --git a/.git_info b/.git_info index 0b91d3f..f4f04b4 100644 --- a/.git_info +++ b/.git_info @@ -1,2 +1,2 @@ wanpipe_linux: git ver fbc92f5 -wanpipe_common: git ver 1d075e4 +wanpipe_common: git ver 04edaa1 diff --git a/.router_version b/.router_version index acf6456..65b45e4 100644 --- a/.router_version +++ b/.router_version @@ -1 +1 @@ -wanpipe-7.0.12 +wanpipe-7.0.14 diff --git a/ChangeLog b/ChangeLog index 2a4d28e..44a87d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,11 +3,21 @@ WANPIPE TDM VOICE - IP/WAN Package ------------------------------------------------------------------------------ Author: Nenad Corbic -Copyright (c) 1995-2014 Sangoma Technologies Inc. +Copyright (c) 1995-2015 Sangoma Technologies Inc. For more info visit: http://wiki.sangoma.com ------------------------------------------------------------------------------ +* Mon Apr 20 2015 Nenad Corbic - 7.0.14 +================================================================== + +- Updated PCIe PLX configuraiton + Fixes the PCIe retry errors on some newer servers +- Bug fix for B601 card + Clock set incorrecty causing the card not to start. +- Wanpipe DADHI config + Added extra /etc/wanpipe/global.conf options + * Sat Sep 27 2014 Nenad Corbic - 7.0.12 ================================================================== diff --git a/Setup b/Setup index 716da8d..c6dfcf2 100755 --- a/Setup +++ b/Setup @@ -7387,7 +7387,7 @@ KERNEL_UNAME=`uname -r` PKG_NAME=wanpipe DISTR_NAME="WANPIPE" PROD=wanrouter -PROD_VER=7.0.12 +PROD_VER=7.0.14 PROD_HOME=`pwd` META_CONF=$PROD_HOME/$PROD.rc WAN_INTR_DIR=$PROD_HOME/interfaces diff --git a/deb_control/wanpipe.deb b/deb_control/wanpipe.deb index 7490a80..cefa1b0 100644 --- a/deb_control/wanpipe.deb +++ b/deb_control/wanpipe.deb @@ -1,5 +1,5 @@ Package: wanpipe -Version: 7.0.12-0 +Version: 7.0.14-0 Section: networking Priority: optional Architecture: all diff --git a/patches/kdrivers/include/wanpipe_version.h b/patches/kdrivers/include/wanpipe_version.h index afa35c5..3774b70 100644 --- a/patches/kdrivers/include/wanpipe_version.h +++ b/patches/kdrivers/include/wanpipe_version.h @@ -10,14 +10,14 @@ #define WANPIPE_COMPANY "Sangoma Technologies Inc" /********** LINUX **********/ -#define WANPIPE_VERSION "7.0.12" +#define WANPIPE_VERSION "7.0.14" #define WANPIPE_SUB_VERSION "0" #define WANPIPE_LITE_VERSION "1.1.1" #if defined(__LINUX__) #define WANPIPE_VERSION_MAJOR 7 #define WANPIPE_VERSION_MINOR 0 -#define WANPIPE_VERSION_MINOR1 12 +#define WANPIPE_VERSION_MINOR1 14 #define WANPIPE_VERSION_MINOR2 0 #endif diff --git a/patches/kdrivers/src/net/aft_a104.c b/patches/kdrivers/src/net/aft_a104.c index 5a7f23a..2691ab6 100644 --- a/patches/kdrivers/src/net/aft_a104.c +++ b/patches/kdrivers/src/net/aft_a104.c @@ -1046,7 +1046,7 @@ int a104_set_digital_fe_clock(sdla_t * card) wan_spin_lock_irq(&card->wandev.lock,&flags); if (IS_B601_CARD(card)) { - aft_ds_set_clock_ref(card, ® , 0); + aft_ds_set_clock_ref_b601(card,®,WAN_FE_LINENO(&card->fe)); } else { /* For A108 the refclock indicates NORMAL mode. * For backward compatilbity we make the user @@ -1084,7 +1084,11 @@ int a104_set_digital_fe_clock(sdla_t * card) card->hw_iface.bus_read_4(card->hw, AFT_PORT_REG(card,AFT_LINE_CFG_REG),®); - aft_ds_set_clock_ref(card,®,WAN_FE_LINENO(&card->fe)); + if (IS_B601_CARD(card)) { + aft_ds_set_clock_ref_b601(card,®,WAN_FE_LINENO(&card->fe)); + } else { + aft_ds_set_clock_ref(card,®,WAN_FE_LINENO(&card->fe)); + } card->hw_iface.bus_write_4(card->hw, AFT_PORT_REG(card,AFT_LINE_CFG_REG),reg); diff --git a/patches/kdrivers/src/net/sdladrv.c b/patches/kdrivers/src/net/sdladrv.c index d703044..86b053f 100644 --- a/patches/kdrivers/src/net/sdladrv.c +++ b/patches/kdrivers/src/net/sdladrv.c @@ -2277,8 +2277,12 @@ static int sdla_pcibridge_info(sdlahw_t* hw) hwcard->u_pci.pci_bridge_dev = NULL; hwcard->u_pci.pci_bridge_bus = 0; hwcard->u_pci.pci_bridge_slot = 0; + } else { + /* Reload PLX EEPROM in order apply the EEPROM values */ + sdla_pci_bridge_write_config_dword(hw, 0x84, 0x1004); + sdla_pci_bridge_write_config_dword(hw, 0x88, 0x80000000); + WP_DELAY(10); } - #else sdla_plxctrl_read8(hw, 0x00, &val8); /* For now, all PLX with blank EEPROM is our new diff --git a/rpmspec/wanpipe-mod.rpmspec b/rpmspec/wanpipe-mod.rpmspec index adc3db8..5da7722 100644 --- a/rpmspec/wanpipe-mod.rpmspec +++ b/rpmspec/wanpipe-mod.rpmspec @@ -1,6 +1,6 @@ %define WANPIPE_VER wanpipe-modules %define name %{WANPIPE_VER} -%define version 7.0.12 +%define version 7.0.14 %define release 0 %define serial 1 %define MODULES_DIR /lib/modules @@ -59,6 +59,16 @@ fi %changelog +* Mon Apr 20 2015 Nenad Corbic - 7.0.14 +================================================================== + +- Updated PCIe PLX configuraiton + Fixes the PCIe retry errors on some newer servers +- Bug fix for B601 card + Clock set incorrecty causing the card not to start. +- Wanpipe DADHI config + Added extra /etc/wanpipe/global.conf options + * Sat Sep 27 2014 Nenad Corbic - 7.0.12 ================================================================== diff --git a/rpmspec/wanpipe-util.rpmspec b/rpmspec/wanpipe-util.rpmspec index 611625f..49c40db 100644 --- a/rpmspec/wanpipe-util.rpmspec +++ b/rpmspec/wanpipe-util.rpmspec @@ -1,6 +1,6 @@ %define WANPIPE_VER wanpipe-util %define name %{WANPIPE_VER} -%define version 7.0.12 +%define version 7.0.14 %define release 0 %define serial 1 %define UTILS_DIR /usr/sbin @@ -229,6 +229,16 @@ chmod 755 /usr/local/sbin/setup-sangoma %changelog +* Mon Apr 20 2015 Nenad Corbic - 7.0.14 +================================================================== + +- Updated PCIe PLX configuraiton + Fixes the PCIe retry errors on some newer servers +- Bug fix for B601 card + Clock set incorrecty causing the card not to start. +- Wanpipe DADHI config + Added extra /etc/wanpipe/global.conf options + * Sat Sep 27 2014 Nenad Corbic - 7.0.12 ================================================================== diff --git a/rpmspec/wanpipe.rpmspec b/rpmspec/wanpipe.rpmspec index 0a193d4..8406ccb 100644 --- a/rpmspec/wanpipe.rpmspec +++ b/rpmspec/wanpipe.rpmspec @@ -1,7 +1,7 @@ %define KERNEL_VERSION %{?kern_ver} %define WANPIPE_VER wanpipe %define name %{WANPIPE_VER} -%define version 7.0.12 +%define version 7.0.14 %define release 0 %define serial 1 %define UTILS_DIR /usr/sbin @@ -246,6 +246,16 @@ chmod 755 /usr/local/sbin/setup-sangoma %changelog +* Mon Apr 20 2015 Nenad Corbic - 7.0.14 +================================================================== + +- Updated PCIe PLX configuraiton + Fixes the PCIe retry errors on some newer servers +- Bug fix for B601 card + Clock set incorrecty causing the card not to start. +- Wanpipe DADHI config + Added extra /etc/wanpipe/global.conf options + * Sat Sep 27 2014 Nenad Corbic - 7.0.12 ================================================================== diff --git a/samples/wanrouter b/samples/wanrouter index 440f73e..ead5063 100644 --- a/samples/wanrouter +++ b/samples/wanrouter @@ -2231,7 +2231,7 @@ init_global_params() { if [ $OSYSTEM = "Linux" ]; then - ROUTER_VERSION=7.0.12 + ROUTER_VERSION=7.0.14 IFCONFIG_LIST=ifconfig MODULE_STAT=lsmod WAN_DRIVERS="wanpipe" @@ -2601,11 +2601,31 @@ case "$1" in WANPIPE_GLOBAL_FE_MEDIA=T1 fi eval "rm -f $WAN_PROG_LOCK 2> /dev/null > /dev/null" - eval "wancfg_dahdi --no-dahdi --no-chan-dahdi --silent --fe_media=$WANPIPE_GLOBAL_FE_MEDIA" - if [ "$WANPIPE_WITH_DIGIUM" = "TRUE" ]; then - eval "cp $WAN_CONF_DIR/wancfg_zaptel/templates/dahdi_cfg_script_with_digium $WAN_CONF_DIR/scripts/start" - fi + WANCFG_HW_DTMF_OPTION= + if [ "$WANPIPE_GLOBAL_HW_DTMF" != "" ]; then + WANCFG_EXTRA_OPTION="$WANCFG_EXTRA_OPTION --hw_dtmf=$WANPIPE_GLOBAL_HW_DTMF" + fi + WANPIPE_FE_CLOCK= + if [ "$WANPIPE_GLOBAL_FE_CLOCK" != "" ]; then + WANCFG_EXTRA_OPTION="$WANCFG_EXTRA_OPTION --fe_clock=$WANPIPE_GLOBAL_FE_CLOCK" + fi + if [ "$WANPIPE_GLOBAL_FE_TE_SIG" != "" ]; then + WANCFG_EXTRA_OPTION="$WANCFG_EXTRA_OPTION --fe_te_sig=$WANPIPE_GLOBAL_FE_TE_SIG" + fi + if [ "$WANPIPE_GLOBAL_FE_LCODE" != "" ]; then + WANCFG_EXTRA_OPTION="$WANCFG_EXTRA_OPTION ----fe_lcode=$WANPIPE_GLOBAL_FE_LCODE" + fi + if [ "$WANPIPE_GLOBAL_FE_FRAME" != "" ]; then + WANCFG_EXTRA_OPTION="$WANCFG_EXTRA_OPTION ----fe_frame=$WANPIPE_GLOBAL_FE_FRAME" + fi + + eval "wancfg_dahdi --no-dahdi --no-chan-dahdi --silent --fe_media=$WANPIPE_GLOBAL_FE_MEDIA $WANCFG_EXTRA_OPTION" + #echo "wancfg_dahdi --no-dahdi --no-chan-dahdi --silent --fe_media=$WANPIPE_GLOBAL_FE_MEDIA $WANCFG_EXTRA_OPTION" + + if [ "$WANPIPE_WITH_DIGIUM" = "TRUE" ]; then + eval "cp $WAN_CONF_DIR/wancfg_zaptel/templates/dahdi_cfg_script_with_digium $WAN_CONF_DIR/scripts/start" + fi fi check_config || cleanup 1 diff --git a/util/wan_aftup/A116dm_0160_V03.BIN b/util/wan_aftup/A116dm_0160_V03.BIN new file mode 100644 index 0000000..5daebd4 Binary files /dev/null and b/util/wan_aftup/A116dm_0160_V03.BIN differ diff --git a/util/wan_aftup/A140_0100_V05.BIN b/util/wan_aftup/A140_0100_V05.BIN new file mode 100644 index 0000000..3dfad79 Binary files /dev/null and b/util/wan_aftup/A140_0100_V05.BIN differ diff --git a/util/wan_aftup/B600_0025_V04.BIN b/util/wan_aftup/B600_0025_V04.BIN new file mode 100644 index 0000000..a38a891 Binary files /dev/null and b/util/wan_aftup/B600_0025_V04.BIN differ diff --git a/util/wan_aftup/B601_0025_V05.BIN b/util/wan_aftup/B601_0025_V05.BIN new file mode 100644 index 0000000..01df631 Binary files /dev/null and b/util/wan_aftup/B601_0025_V05.BIN differ diff --git a/util/wan_aftup/B800_0040_V10.BIN b/util/wan_aftup/B800_0040_V10.BIN new file mode 100644 index 0000000..1c60891 Binary files /dev/null and b/util/wan_aftup/B800_0040_V10.BIN differ diff --git a/util/wancfg_zaptel/wancfg_zaptel.pl b/util/wancfg_zaptel/wancfg_zaptel.pl index f9ad3e3..e3a5b97 100755 --- a/util/wancfg_zaptel/wancfg_zaptel.pl +++ b/util/wancfg_zaptel/wancfg_zaptel.pl @@ -260,7 +260,7 @@ my @silent_first_chans; my @silent_last_chans; -my $silent_hwdtmf; +my $silent_hwdtmf="YES"; my $silent_femedia="T1"; my $silent_feframe="ESF"; #my $silent_feframe_e1="CRC4"; diff --git a/wanpipe.spec b/wanpipe.spec index a88a04a..9285fae 100644 --- a/wanpipe.spec +++ b/wanpipe.spec @@ -25,7 +25,7 @@ # %define NAME wanpipe -%define VERSION 7.0.12 +%define VERSION 7.0.14 %define RELEASE 0 %define KVERSION %{?kernel} %define KSRC %{?ksrc} @@ -260,6 +260,16 @@ fi %changelog +* Mon Apr 20 2015 Nenad Corbic - 7.0.14 +================================================================== + +- Updated PCIe PLX configuraiton + Fixes the PCIe retry errors on some newer servers +- Bug fix for B601 card + Clock set incorrecty causing the card not to start. +- Wanpipe DADHI config + Added extra /etc/wanpipe/global.conf options + * Sat Sep 27 2014 Nenad Corbic - 7.0.12 ==================================================================