summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Knispel <gknispel@avencall.com>2013-02-07 11:43:23 +0100
committerGuillaume Knispel <gknispel@avencall.com>2013-02-07 11:43:23 +0100
commit8bbfed631189b7d405c13683e9d63efabae6f056 (patch)
tree7abddecc3ca70f265a6b5a205871d57956e457e3
parent6d61f182b3b83b14efd1e96d46b3187ef9d6800b (diff)
parent3fe47bd822cc58236bec1ca68c3dd8edb0822823 (diff)
Merge branch 'master' of git.xivo.fr:official/xioh/install
-rw-r--r--README40
-rw-r--r--etc/dahdi/system.conf12
-rwxr-xr-xetc/init.d/xioh2
-rw-r--r--modules/xioh/echo.kobin0 -> 6385 bytes
-rwxr-xr-xmodules/xioh/xivovp.kobin191874 -> 191874 bytes
5 files changed, 41 insertions, 13 deletions
diff --git a/README b/README
index a684291..fd9d728 100644
--- a/README
+++ b/README
@@ -26,6 +26,7 @@
# | `-- `uname -r`
# | `-- xioh
# | |-- e1000.ko
+# | |-- echo.ko
# | |-- gcu.ko
# | |-- gpio.ko
# | |-- hssvoice_driver.ko
@@ -60,10 +61,11 @@
* 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
- * 3.2
+ * 3.2 Upgrade XiVO
* 4 Be aware that...
@@ -76,6 +78,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
@@ -96,7 +99,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.
@@ -180,17 +183,30 @@
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 ==
- 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 boot the board, plug the power cable. You need to press the Power switch
+ (SW1, right side) few seconds to boot.
+
+ There is no reboot actually. You need to halt the board. Either from
+ GNU/Linux or by pressing the switch SW1 few seconds.
- To reboot the board, you need actually to halt it, then press the reboot
- switch (SW2, left of SW1).
+ Please mind that "reboot" command halt the board. You'll need to press the
+ the switch SW1 to restart the board.
- 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.
+ === 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.. ==
@@ -248,6 +264,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..60f0908 100644
--- a/etc/dahdi/system.conf
+++ b/etc/dahdi/system.conf
@@ -1,15 +1,19 @@
-# This is dahdi settings for the XiOH server. DAHDI_CONF_FILE should not be set.
+# 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
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,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
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
--- /dev/null
+++ b/modules/xioh/echo.ko
Binary files differ
diff --git a/modules/xioh/xivovp.ko b/modules/xioh/xivovp.ko
index 5858dbc..b3b12d0 100755
--- a/modules/xioh/xivovp.ko
+++ b/modules/xioh/xivovp.ko
Binary files differ