From b1eab70d6a78f762c8801d6d048c32ef50ac347f Mon Sep 17 00:00:00 2001 From: Kévin Raymond Date: Fri, 23 Nov 2012 16:57:46 +0100 Subject: Adding the OSLEC echo canceller - fixing xivovp driver - adding the echo.ko OSLEC module - fixing some conf files for that --- README | 8 ++++++++ etc/dahdi/system.conf | 4 ++-- etc/init.d/xioh | 2 ++ modules/xioh/echo.ko | Bin 0 -> 6385 bytes modules/xioh/xivovp.ko | Bin 191874 -> 191874 bytes 5 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 modules/xioh/echo.ko diff --git a/README b/README index d33a039..506db82 100644 --- a/README +++ b/README @@ -26,6 +26,7 @@ # | `-- `uname -r` # | `-- xioh # | |-- e1000.ko +# | |-- echo.ko # | |-- gcu.ko # | |-- gpio.ko # | |-- hssvoice_driver.ko @@ -76,6 +77,7 @@ * 4.5 How do I use the fron pannel serial port? * 4.6 I don't have the Ethernet interfaces * 4.7 How to replace the Hard Drive, or the mother board? + * 4.8 Is there an echo canceller? * 5 Tips @@ -246,6 +248,12 @@ Please read the "I don't have the Ethernet interfaces" entry, as you'll probably hit this issue if you don't reinstall from scratch. + * Is there an echo canceller? + + Yes, we enable by default OSLEC, through the module "echo". + "dahdi_echocan_oslec" is its dahdi interface. + To desable it, remove the call in system.conf dahdi file. + == Tips == diff --git a/etc/dahdi/system.conf b/etc/dahdi/system.conf index b0d1d68..e21e09e 100644 --- a/etc/dahdi/system.conf +++ b/etc/dahdi/system.conf @@ -4,10 +4,10 @@ loadzone = fr defaultzone = fr fxoks=1 -#echocanceller=mg2,1 +echocanceller=oslec,1 fxsks=2 -#echocanceller=mg2,3 +echocanceller=oslec,2 span=3,0,0,ccs,ami,nt,term # T0 in TN mode #span=2,1,0,ccs,ami,te,term # T0 in TE mode diff --git a/etc/init.d/xioh b/etc/init.d/xioh index 1558078..117a0b0 100755 --- a/etc/init.d/xioh +++ b/etc/init.d/xioh @@ -12,6 +12,8 @@ case "$1" in start) + modprobe -f echo + modprobe -f dahdi_echocan_oslec modprobe -f xivovp modprobe -f xivoxhfc dahdi_cfg -vvv diff --git a/modules/xioh/echo.ko b/modules/xioh/echo.ko new file mode 100644 index 0000000..ca56ef0 Binary files /dev/null and b/modules/xioh/echo.ko differ diff --git a/modules/xioh/xivovp.ko b/modules/xioh/xivovp.ko index 5858dbc..b3b12d0 100755 Binary files a/modules/xioh/xivovp.ko and b/modules/xioh/xivovp.ko differ -- cgit v1.2.3 From a272b2ec9271209ad799aaa2236fd4ebd234ced4 Mon Sep 17 00:00:00 2001 From: Kévin Raymond Date: Tue, 11 Dec 2012 17:17:34 +0100 Subject: fix README BRI number --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 506db82..303e768 100644 --- a/README +++ b/README @@ -98,7 +98,7 @@ connectors from left to right : X X X X X X X X X X X - 2xUSB eth0 eth1 eth2 ttyS0 BRI3 BRI3 BRI1 BRI0 FXS FXO + 2xUSB eth0 eth1 eth2 ttyS0 BRI3 BRI2 BRI1 BRI0 FXS FXO Currently, the Ethernet ports could be labelled on the other way. -- cgit v1.2.3 From 88938740bc94e2a17e273857071142fc603194dc Mon Sep 17 00:00:00 2001 From: Kévin Raymond Date: Thu, 13 Dec 2012 15:55:40 +0100 Subject: More README - upgrade added --- README | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/README b/README index 303e768..2a99062 100644 --- a/README +++ b/README @@ -64,7 +64,7 @@ * 3 Usage * 3.1 Boot & reboot - * 3.2 + * 3.2 Upgrade XiVO * 4 Be aware that... @@ -182,15 +182,22 @@ == Usage == - To boot the board, plug the power cable. Depending on the firmware, you - will need to press the SW1 (power) switch (the one at the right) for few - seconds (10s at last). + === Boot & Reboot === - To reboot the board, you need actually to halt it, then press the reboot - switch (SW2, left of SW1). + To boot the board, plug the power cable. You need to press the Power switch + (SW1, right side) few seconds to boot. - To halt the board, starting at firmware rev d026353, you can enter "halt" - on the board and wait few seconds. All LEDs should power off. + There is no reboot actually. You need to halt the board. Either from + GNU/Linux or by pressing the switch SW1 few seconds. + + Please mind that "reboot" command halt the board. You'll need to press the + the switch SW1 to restart the board. + + === Upgrade XiVO === + + You can use the `xivo-upgrade' command, but you actually need to restart + the system in order to reload correctly the drivers. + Don't forget to restart! == Be aware that.. == -- cgit v1.2.3 From f50b1df20b18c653ad5d69732a943edae9d80f38 Mon Sep 17 00:00:00 2001 From: Kévin Raymond Date: Fri, 14 Dec 2012 14:57:50 +0100 Subject: adding span numbering note --- etc/dahdi/system.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/etc/dahdi/system.conf b/etc/dahdi/system.conf index e21e09e..a32c87a 100644 --- a/etc/dahdi/system.conf +++ b/etc/dahdi/system.conf @@ -1,4 +1,7 @@ # This is dahdi settings for the XiOH server. DAHDI_CONF_FILE should not be set. +# You should run dahdi_cfg after any edit. +# PLEASE don't change the line order, it's important to keep them that way +# actually to respect the span numbering. loadzone = fr defaultzone = fr -- cgit v1.2.3 From 91ec372a13dbf57b302ca7056c9dcd35d214e16b Mon Sep 17 00:00:00 2001 From: Noe Rubinstein Date: Fri, 14 Dec 2012 15:07:41 +0100 Subject: Correct doc and typos on system.conf --- etc/dahdi/system.conf | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/etc/dahdi/system.conf b/etc/dahdi/system.conf index a32c87a..60f0908 100644 --- a/etc/dahdi/system.conf +++ b/etc/dahdi/system.conf @@ -1,7 +1,8 @@ -# This is dahdi settings for the XiOH server. DAHDI_CONF_FILE should not be set. -# You should run dahdi_cfg after any edit. -# PLEASE don't change the line order, it's important to keep them that way -# actually to respect the span numbering. +# This defines the settings for DAHDI on XiOH. The setting are applied by +# running dahdi_cfg, which should therefore be ran after any edit. +# +# WARNING: Do not change the line order or remove the FXO/FXS lines, or the +# span numbering will be incorrect. loadzone = fr defaultzone = fr @@ -12,7 +13,7 @@ echocanceller=oslec,1 fxsks=2 echocanceller=oslec,2 -span=3,0,0,ccs,ami,nt,term # T0 in TN mode +span=2,0,0,ccs,ami,nt,term # T0 in TN mode #span=2,1,0,ccs,ami,te,term # T0 in TE mode bchan=3-4 hardhdlc=5 -- cgit v1.2.3 From 3fe47bd822cc58236bec1ca68c3dd8edb0822823 Mon Sep 17 00:00:00 2001 From: Noe Rubinstein Date: Fri, 21 Dec 2012 14:52:38 +0100 Subject: Add "Deactivate munin-cron" --- README | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README b/README index 2a99062..095ebe9 100644 --- a/README +++ b/README @@ -61,6 +61,7 @@ * 2.4 Configure the init * 2.5 Configure dahdi * 2.6 Set the network interfaces + * 2.7 Deactivate munin-cron * 3 Usage * 3.1 Boot & reboot @@ -180,6 +181,12 @@ If you installed XiVO on a secondary hardware, you'll need to remove the `/etc/udev/rules.d/70-persistent-net.rules` file. + === Deactivate munin-cron === + + Munin is a monitoring tool that collects data in an RRDtool database and + generates graphs. The graph generation slows down XIOH very heavily. To + deactivate it, comment every line in /etc/cron.d/munin*. + == Usage == === Boot & Reboot === -- cgit v1.2.3