summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdahdi.init9
-rw-r--r--modules.sample32
2 files changed, 20 insertions, 21 deletions
diff --git a/dahdi.init b/dahdi.init
index 0f4b705..e0bb6a7 100755
--- a/dahdi.init
+++ b/dahdi.init
@@ -150,7 +150,7 @@ case "$1" in
start)
cat "/etc/dahdi/modules" | grep "^[^\#]" | {
foundone=false
- echo -ne $"Loading DAHDI hardware modules:\n"
+ echo "Loading DAHDI hardware modules:"
while read line; do
foundone=true
if [ $system = debian ]; then
@@ -164,7 +164,7 @@ case "$1" in
action " ${line}: " modprobe $line
fi
done
- echo -ne $"\n"
+ echo ""
if ! $foundone; then
echo "There aren't any DAHDI hardware modules specified to "
echo "load. Please update /etc/dahdi/modules in order to "
@@ -172,7 +172,9 @@ case "$1" in
exit 1
fi
}
+
TMOUT=$DAHDI_DEV_TIMEOUT # max secs to wait
+
while [ ! -d /dev/dahdi ] ; do
sleep 1
TMOUT=`expr $TMOUT - 1`
@@ -181,7 +183,6 @@ case "$1" in
exit 1
fi
done
- sleep 3 # TODO: remove it
xpp_startup
@@ -214,7 +215,7 @@ case "$1" in
# Unload drivers
#shutdown_dynamic # FIXME: needs test from someone with dynamic spans
if [ $system = debian ]; then
- echo -ne $"Unloading DAHDI hardware modules: "
+ echo -n "Unloading DAHDI hardware modules: "
if unload_module dahdi; then
echo -n "done"
else
diff --git a/modules.sample b/modules.sample
index 1f3b61a..379fe68 100644
--- a/modules.sample
+++ b/modules.sample
@@ -7,37 +7,35 @@
# Anything after a '#' is ignore, likewise trailing and leading
# whitespaces and empty lines.
-# TE405P - Quad Span T1/E1 Card (5v version)
-# TE410P - Quad Span T1/E1 Card (3.3v version)
+# Digium TE205P/TE207P/TE210P/TE212P: PCI dual-port T1/E1/J1
+# Digium TE405P/TE407P/TE410P/TE412P: PCI quad-port T1/E1/J1
+# Digium TE220: PCI-Express dual-port T1/E1/J1
+# Digium TE420: PCI-Express quad-port T1/E1/J1
wct4xxp
-# * TE120P - Single Span T1/E1 Card
+# Digium TE120P: PCI single-port T1/E1/J1
+# Digium TE121: PCI-Express single-port T1/E1/J1
+# Digium TE122: PCI single-port T1/E1/J1
wcte12xp
-# T100P - Single Span T1 Card
-# E100P - Single Span E1 Card
+# Digium T100P: PCI single-port T1
+# Digium E100P: PCI single-port E1
wct1xxp
-# TE110P - Single Span T1/E1 Card
+# Digium TE110P: PCI single-port T1/E1/J1
wcte11xp
-# TDM2400P - Modular FXS/FXO interface (1-24 ports)
-# TDM410P - Modular FXS/FXO interface (4 ports)
-# TDM800P - Modular FXS/FXO interface (8 ports)
+# Digium TDM2400P/AEX2400: up to 24 analog ports
+# Digium TDM800P/AEX800: up to 8 analog ports
+# Digium TDM410P/AEX410: up to 4 analog ports
wctdm24xxp
# X100P - Single port FXO interface
# X101P - Single port FXO interface
wcfxo
-# TDM400P - Modular FXS/FXO interface (1-4 ports)
+# Digium TDM400P: up to 4 analog ports
wctdm
-# DAHDI timing only interface. Disabled by default, as it will be loaded
-# by the init.d script in case no hardware is found.
-#
-# If you have no hardware, enable it and disable others.
-#dahdi_dummy
-
-# Xorcom Astribank Device
+# Xorcom Astribank Devices
xpp_usb