diff -urN dahdi-tools.orig/dahdi.init dahdi-tools/dahdi.init
--- dahdi-tools.orig/dahdi.init	2014-05-20 22:19:05.713919056 +0700
+++ dahdi-tools/dahdi.init	2014-05-27 20:41:27.469174151 +0700
@@ -27,6 +27,9 @@
 DAHDI_CFG=/usr/sbin/dahdi_cfg
 DAHDI_CFG_CMD=${DAHDI_CFG_CMD:-"$DAHDI_CFG"} # e.g: for a custom system.conf location
 
+DAHDI_TDMOX=/usr/sbin/dahdi_tdmox
+DAHDI_TDMOX_CMD=${DAHDI_TDMOX_CMD:-"$DAHDI_TDMOX"} # e.g: for a custom system.conf location
+
 FXOTUNE=/usr/sbin/fxotune
 
 # The default syncer Astribank. Usually set automatically to a sane
@@ -231,6 +234,10 @@
        echo "dahdi_cfg not executable"
        exit 0
 fi
+if [ ! -x "$DAHDI_TDMOX_CMD" ]; then
+       echo "WARNING: no dahdi_tdmox or not executable"
+#       exit 0
+fi
 
 RETVAL=0
 
@@ -257,6 +264,7 @@
 	done
 
 	xpp_startup
+	[ -x $DAHDI_TDMOX_CMD ] && $DAHDI_TDMOX_CMD
 
 	# Assign all spans that weren't handled via udev + /etc/dahdi/assigned-spans.conf
 	/usr/share/dahdi/dahdi_auto_assign_compat
@@ -290,6 +298,7 @@
 	;;
   stop)
 	# Unload drivers
+	[ -x $DAHDI_TDMOX_CMD ] && $DAHDI_TDMOX_CMD -s
 	#shutdown_dynamic # FIXME: needs test from someone with dynamic spans
 	echo -n "Unloading DAHDI hardware modules: "
 	if unload_modules; then
diff -urN dahdi-tools.orig/dahdi_tdmox dahdi-tools/dahdi_tdmox
--- dahdi-tools.orig/dahdi_tdmox	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/dahdi_tdmox	2014-05-28 18:37:44.000000000 +0700
@@ -0,0 +1,184 @@
+#!/bin/bash
+
+set -e
+
+etc_path=/etc/dahdi/tdmox
+sys_path=/sys/bus/dahdi_tdmox/devices
+MAX_SPANS=100
+
+is_integer() {
+    [ "$1" -eq "$1" ] > /dev/null 2>&1
+    return $?
+}
+
+copy_file() {
+	if [ ! -r $1 ]
+	then
+		echo "Missed required file '$1'"
+		exit -1
+	fi
+
+  	cmd="grep -v \"#\" $1 | head -n 1 > $2"
+#	echo $cmd
+ 	eval "$cmd"
+}
+
+copy_file_noerr() {
+	[ ! -r $1 ] && return
+
+	copy_file $1 $2
+}
+
+copy_SPAN_file() {
+	span_id=$1
+	file=$2
+	etc_file=$etc_path/span-$span_id/$file
+	sys_file=$sys_path/span-$span_id/$file
+
+	copy_file $etc_file $sys_file
+}
+
+copy_SPAN_file_noerr() {
+	span_id=$1
+	file=$2
+	etc_file=$etc_path/span-$span_id/$file
+	sys_file=$sys_path/span-$span_id/$file
+
+	copy_file_noerr $etc_file $sys_file
+}
+
+configure_CHAN() {
+#	echo "Copying channel configuration $1 > $2"
+	copy_file_noerr "$1/name" "$2/name" 
+	copy_file_noerr "$1/sig" "$2/sig" 
+	copy_file_noerr "$1/sigcap" "$2/sigcap" 
+}
+
+configure_CHANS() {
+	span_id=$1
+	FILES=$etc_path/span-$span_id/chan-*
+	
+	for f in $FILES
+	do
+		# There is no need in awk/sed/tr here
+		array=${f//-/ }
+		array=(${array//\~/ })
+		FROM=${array[2]}
+		TO=${array[3]}
+		if [ -z ${array[3]} ]
+		then
+			TO=${array[2]}
+		fi
+
+		set +e
+		[[ $FROM =~ ^-?[0-9]+$ ]] || return
+		[[ $TO =~ ^-?[0-9]+$ ]] || return
+		set -e
+
+		for (( c=$FROM; c<=$TO; c++ ))
+		do
+			configure_CHAN "$f" "$sys_path/span-$span_id/chan-$c"
+		done
+	done
+# TODO: process chan-N:M first, then process chan-N (to overwrite some parameters)
+}
+
+configure_SPAN() {
+	span_id=$1
+	echo "TDMoX: Configuring span $span_id"
+	copy_SPAN_file		$span_id addr
+	copy_SPAN_file		$span_id channels
+	copy_SPAN_file_noerr $span_id deflaw
+	copy_SPAN_file_noerr $span_id desc
+	copy_SPAN_file_noerr $span_id devicetype
+	copy_SPAN_file		$span_id driver
+	copy_SPAN_file_noerr $span_id flags
+	copy_SPAN_file		$span_id linecompat
+	copy_SPAN_file_noerr $span_id location
+	copy_SPAN_file_noerr $span_id manufacturer
+	copy_SPAN_file_noerr $span_id name
+	copy_SPAN_file_noerr $span_id spantype
+	copy_SPAN_file		$span_id timing
+
+	configure_CHANS $span_id
+
+	echo 1 > $sys_path/span-$span_id/register
+}
+
+configure() {
+	if [ -d $etc_path/span-1 ] && [ ! -d $sys_path ]
+	then
+		echo "ERROR: Check if dahdi_tdmox loaded. 'lsmod | grep dahdi_tdmox.'"
+		return 1
+	fi
+
+	for i in `seq 1 $MAX_SPANS`;
+	do
+		if [ -d $etc_path/span-$i ]
+		then
+			configure_SPAN $i
+		else
+			return 0
+		fi
+	done
+
+	echo TDMoX configuration succeed.
+}
+
+shutdown() {
+	echo TDMoX: shutdown.
+
+	for span_id in `seq 1 $MAX_SPANS`;
+	do
+		if [ -d $sys_path/span-$span_id ]
+		then
+			echo 0 > $sys_path/span-$span_id/register
+		else
+			break
+		fi
+	done
+
+	echo TDMoX: shutdown succeed.
+}
+
+##########################################################################
+
+usage()
+{
+cat << EOF
+usage: $0 options
+
+This script start/registers TDMoX devices in DAHDI.
+Configuration should be done via dahdi_cfg.
+
+OPTIONS:
+   -h      Show this message
+   -s      Shutdown/unregister TDMoX devices
+   -v      Verbose
+EOF
+}
+
+SHUTDOWN=
+VERBOSE=
+while getopts “hsv” OPTION
+do
+     case $OPTION in
+         h)
+             usage
+             exit 1
+             ;;
+         s)
+             SHUTDOWN=1
+             ;;
+         v)
+             VERBOSE=1
+             ;;
+         ?)
+             usage
+             exit
+             ;;
+     esac
+done
+
+[ "x1" != "x$SHUTDOWN" ] && configure
+[ "x1" != "x$SHUTDOWN" ] || shutdown
diff -urN dahdi-tools.orig/Makefile dahdi-tools/Makefile
--- dahdi-tools.orig/Makefile	2014-05-20 22:19:05.705918872 +0700
+++ dahdi-tools/Makefile	2014-05-27 20:35:07.096372812 +0700
@@ -116,7 +116,7 @@
 	handle_device.d/20-span-assignments
 
 ASSIGNED_UTILS:=dahdi_span_assignments dahdi_span_types \
-	dahdi_waitfor_span_assignments
+	dahdi_waitfor_span_assignments dahdi_tdmox
 ASSIGNED_CONF:=assigned-spans.conf.sample span-types.conf.sample
 
 MAN_PAGES:= \
@@ -231,6 +231,10 @@
 
 install-programs: install-utils install-libs
 
+TDMOX_DIRS	:= $(shell cd tdmox.sample; find * -name '*' -type d| xargs)
+TDMOX_MODS_PAT	:= * $(TDMOX_DIRS:%=%/*)
+TDMOX_MODS	:= $(shell cd tdmox.sample; echo $(TDMOX_MODS_PAT))
+
 install-utils: utils install-utils-subdirs
 ifneq (,$(BINS))
 	install -d $(DESTDIR)$(BIN_DIR)
@@ -242,6 +246,10 @@
 	$(INSTALL) -d $(DESTDIR)$(CONFIG_DIR)
 	$(INSTALL) -m 644 system.conf.sample $(DESTDIR)$(CONFIG_FILE)
 endif
+	for i in $(TDMOX_MODS); \
+	do \
+		$(INSTALL) -D -m 644 "tdmox.sample/$$i" "$(DESTDIR)/etc/dahdi/tdmox.sample/$$i"; \
+	done
 	install -d $(DESTDIR)$(DATA_DIR)
 	tar cf - -C hotplug $(ASSIGNED_DATA_SCRIPTS) | tar xf - -C $(DESTDIR)$(DATA_DIR)/
 	install $(ASSIGNED_UTILS) $(DESTDIR)/$(BIN_DIR)/
diff -urN dahdi-tools.orig/modules.sample dahdi-tools/modules.sample
--- dahdi-tools.orig/modules.sample	2014-05-20 22:19:05.733919516 +0700
+++ dahdi-tools/modules.sample	2014-05-27 19:59:48.450639079 +0700
@@ -59,3 +59,6 @@
 # Xorcom Astribank Devices
 xpp_usb
 
+# Alternative TDMoX/TDMoE drivers
+dahdi_tdmox
+dahdi_tdmox_eth
diff -urN dahdi-tools.orig/tdmox.sample/notes.txt dahdi-tools/tdmox.sample/notes.txt
--- dahdi-tools.orig/tdmox.sample/notes.txt	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/notes.txt	2014-05-28 15:06:37.000000000 +0700
@@ -0,0 +1,13 @@
+Sample configurations.
+
+== span-1 ==
+Device with mac "00:55:55:55:55:20", subaddress "0", connected to "eth0".
+"E1" device, A-law by default, "HDB3 CCS CRC4", used as a timing source for TDMoX module.
+
+== span-2 ==
+Device with mac "00:55:55:55:55:21", subaddress "0", connected to "eth0".
+"ANALOG_MIXED" device, A-law by default, not timing source (device must sync to TDMoE packets).
+channel 1-7  -  FXS lines with FXOLS signalling.
+channel 8-15 -  FXO lines with FXOLS signalling.
+channel 16-22 - FXS lines with FXOLS signalling.
+channel 23-30 - FXS lines with FXOLS signalling.
diff -urN dahdi-tools.orig/tdmox.sample/span-1/addr dahdi-tools/tdmox.sample/span-1/addr
--- dahdi-tools.orig/tdmox.sample/span-1/addr	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-1/addr	2014-05-28 15:06:37.000000000 +0700
@@ -0,0 +1,3 @@
+eth0/00:55:55:55:55:20/0
+#TDMoX address.
+#for TDMoE: dev/addr/subaddr
diff -urN dahdi-tools.orig/tdmox.sample/span-1/channels dahdi-tools/tdmox.sample/span-1/channels
--- dahdi-tools.orig/tdmox.sample/span-1/channels	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-1/channels	2014-05-14 21:03:39.000000000 +0700
@@ -0,0 +1,2 @@
+31
+#Number of the channels
diff -urN dahdi-tools.orig/tdmox.sample/span-1/deflaw dahdi-tools/tdmox.sample/span-1/deflaw
--- dahdi-tools.orig/tdmox.sample/span-1/deflaw	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-1/deflaw	2014-05-14 21:03:40.000000000 +0700
@@ -0,0 +1,2 @@
+ALAW
+# ALAW MULAW
diff -urN dahdi-tools.orig/tdmox.sample/span-1/desc dahdi-tools/tdmox.sample/span-1/desc
--- dahdi-tools.orig/tdmox.sample/span-1/desc	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-1/desc	2014-05-28 15:06:38.000000000 +0700
@@ -0,0 +1 @@
+#SPAN description. Will override description generated by the driver.
diff -urN dahdi-tools.orig/tdmox.sample/span-1/devicetype dahdi-tools/tdmox.sample/span-1/devicetype
--- dahdi-tools.orig/tdmox.sample/span-1/devicetype	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-1/devicetype	2014-05-28 15:06:38.000000000 +0700
@@ -0,0 +1 @@
+#SPAN devicetype. Will override devicetype generated by the driver.
diff -urN dahdi-tools.orig/tdmox.sample/span-1/driver dahdi-tools/tdmox.sample/span-1/driver
--- dahdi-tools.orig/tdmox.sample/span-1/driver	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-1/driver	2014-05-14 21:03:39.000000000 +0700
@@ -0,0 +1,2 @@
+eth
+#channel driver. eth for TDMoE (TDM over Ethernet)
diff -urN dahdi-tools.orig/tdmox.sample/span-1/flags dahdi-tools/tdmox.sample/span-1/flags
--- dahdi-tools.orig/tdmox.sample/span-1/flags	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-1/flags	2014-05-14 21:03:39.000000000 +0700
@@ -0,0 +1,2 @@
+#RBS
+#RBS or not RBS for now.
diff -urN dahdi-tools.orig/tdmox.sample/span-1/linecompat dahdi-tools/tdmox.sample/span-1/linecompat
--- dahdi-tools.orig/tdmox.sample/span-1/linecompat	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-1/linecompat	2014-05-14 21:03:39.000000000 +0700
@@ -0,0 +1,2 @@
+HDB3 CCS CRC4
+#D4 ESF AMI B8ZS CCS HDB3 CRC4 NTTE NOTOPEN
diff -urN dahdi-tools.orig/tdmox.sample/span-1/location dahdi-tools/tdmox.sample/span-1/location
--- dahdi-tools.orig/tdmox.sample/span-1/location	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-1/location	2014-05-28 15:06:39.000000000 +0700
@@ -0,0 +1 @@
+#SPAN location. Will override location generated by the driver.
diff -urN dahdi-tools.orig/tdmox.sample/span-1/manufacturer dahdi-tools/tdmox.sample/span-1/manufacturer
--- dahdi-tools.orig/tdmox.sample/span-1/manufacturer	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-1/manufacturer	2014-05-28 15:06:37.000000000 +0700
@@ -0,0 +1 @@
+#SPAN manufacturer. Will override manufacturer generated by the driver.
diff -urN dahdi-tools.orig/tdmox.sample/span-1/name dahdi-tools/tdmox.sample/span-1/name
--- dahdi-tools.orig/tdmox.sample/span-1/name	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-1/name	2014-05-28 15:06:38.000000000 +0700
@@ -0,0 +1 @@
+#SPAN name. Will override name generated by the driver.
diff -urN dahdi-tools.orig/tdmox.sample/span-1/spantype dahdi-tools/tdmox.sample/span-1/spantype
--- dahdi-tools.orig/tdmox.sample/span-1/spantype	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-1/spantype	2014-05-28 15:23:40.084971840 +0700
@@ -0,0 +1 @@
+#FXS FXO ANALOG_MIXED E1 T1 J1 BRI_NT BRI_TE BRI_SOFT
diff -urN dahdi-tools.orig/tdmox.sample/span-1/timing dahdi-tools/tdmox.sample/span-1/timing
--- dahdi-tools.orig/tdmox.sample/span-1/timing	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-1/timing	2014-05-28 15:06:38.000000000 +0700
@@ -0,0 +1,4 @@
+1
+# timing priority, like for a normal span.
+# use "0" to not use this as a timing source, or prioritize them as
+# primary, secondard, etc.
diff -urN dahdi-tools.orig/tdmox.sample/span-2/addr dahdi-tools/tdmox.sample/span-2/addr
--- dahdi-tools.orig/tdmox.sample/span-2/addr	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-2/addr	2014-05-28 15:06:42.000000000 +0700
@@ -0,0 +1,3 @@
+eth0/00:55:55:55:55:21/0
+#TDMoX address.
+#for TDMoE: dev/addr/subaddr
diff -urN dahdi-tools.orig/tdmox.sample/span-2/chan-16~22/sig dahdi-tools/tdmox.sample/span-2/chan-16~22/sig
--- dahdi-tools.orig/tdmox.sample/span-2/chan-16~22/sig	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-2/chan-16~22/sig	2014-05-28 15:06:48.000000000 +0700
@@ -0,0 +1,2 @@
+FXOLS
+#Channel signalling (Optional). One of sigcap.
diff -urN dahdi-tools.orig/tdmox.sample/span-2/chan-16~22/sigcap dahdi-tools/tdmox.sample/span-2/chan-16~22/sigcap
--- dahdi-tools.orig/tdmox.sample/span-2/chan-16~22/sigcap	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-2/chan-16~22/sigcap	2014-05-28 15:06:49.000000000 +0700
@@ -0,0 +1,3 @@
+FXOLS
+#Capability for signalling. Can specify multiple, devided by space.
+#FXSLS FXSKS FXSGS FXOLS FXOKS FXOGS E&M E&M-E1 Clear HDLCRAW HDLCFCS HDLCNET MTP2 Slave CAS DACS DACS+RBS
diff -urN dahdi-tools.orig/tdmox.sample/span-2/chan-1~7/sig dahdi-tools/tdmox.sample/span-2/chan-1~7/sig
--- dahdi-tools.orig/tdmox.sample/span-2/chan-1~7/sig	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-2/chan-1~7/sig	2014-05-28 15:06:47.000000000 +0700
@@ -0,0 +1,2 @@
+FXOLS
+#Channel signalling (Optional). One of sigcap.
diff -urN dahdi-tools.orig/tdmox.sample/span-2/chan-1~7/sigcap dahdi-tools/tdmox.sample/span-2/chan-1~7/sigcap
--- dahdi-tools.orig/tdmox.sample/span-2/chan-1~7/sigcap	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-2/chan-1~7/sigcap	2014-05-28 15:06:47.000000000 +0700
@@ -0,0 +1,3 @@
+FXOLS
+#Capability for signalling. Can specify multiple, devided by space.
+#FXSLS FXSKS FXSGS FXOLS FXOKS FXOGS E&M E&M-E1 Clear HDLCRAW HDLCFCS HDLCNET MTP2 Slave CAS DACS DACS+RBS
diff -urN dahdi-tools.orig/tdmox.sample/span-2/chan-23~30/sig dahdi-tools/tdmox.sample/span-2/chan-23~30/sig
--- dahdi-tools.orig/tdmox.sample/span-2/chan-23~30/sig	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-2/chan-23~30/sig	2014-05-28 15:06:46.000000000 +0700
@@ -0,0 +1,2 @@
+FXOLS
+#Channel signalling (Optional). One of sigcap.
diff -urN dahdi-tools.orig/tdmox.sample/span-2/chan-23~30/sigcap dahdi-tools/tdmox.sample/span-2/chan-23~30/sigcap
--- dahdi-tools.orig/tdmox.sample/span-2/chan-23~30/sigcap	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-2/chan-23~30/sigcap	2014-05-28 15:06:46.000000000 +0700
@@ -0,0 +1,3 @@
+FXOLS
+#Capability for signalling. Can specify multiple, devided by space.
+#FXSLS FXSKS FXSGS FXOLS FXOKS FXOGS E&M E&M-E1 Clear HDLCRAW HDLCFCS HDLCNET MTP2 Slave CAS DACS DACS+RBS
diff -urN dahdi-tools.orig/tdmox.sample/span-2/chan-8~15/sig dahdi-tools/tdmox.sample/span-2/chan-8~15/sig
--- dahdi-tools.orig/tdmox.sample/span-2/chan-8~15/sig	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-2/chan-8~15/sig	2014-05-28 15:06:42.000000000 +0700
@@ -0,0 +1,2 @@
+FXSLS
+#Channel signalling (Optional). One of sigcap.
diff -urN dahdi-tools.orig/tdmox.sample/span-2/chan-8~15/sigcap dahdi-tools/tdmox.sample/span-2/chan-8~15/sigcap
--- dahdi-tools.orig/tdmox.sample/span-2/chan-8~15/sigcap	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-2/chan-8~15/sigcap	2014-05-28 15:06:43.000000000 +0700
@@ -0,0 +1,3 @@
+FXSLS
+#Capability for signalling. Can specify multiple, devided by space.
+#FXSLS FXSKS FXSGS FXOLS FXOKS FXOGS E&M E&M-E1 Clear HDLCRAW HDLCFCS HDLCNET MTP2 Slave CAS DACS DACS+RBS
diff -urN dahdi-tools.orig/tdmox.sample/span-2/channels dahdi-tools/tdmox.sample/span-2/channels
--- dahdi-tools.orig/tdmox.sample/span-2/channels	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-2/channels	2014-05-14 21:03:47.000000000 +0700
@@ -0,0 +1,2 @@
+30
+#Number of the channels
diff -urN dahdi-tools.orig/tdmox.sample/span-2/deflaw dahdi-tools/tdmox.sample/span-2/deflaw
--- dahdi-tools.orig/tdmox.sample/span-2/deflaw	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-2/deflaw	2014-05-19 19:09:27.000000000 +0700
@@ -0,0 +1,2 @@
+ALAW
+# ALAW MULAW
diff -urN dahdi-tools.orig/tdmox.sample/span-2/desc dahdi-tools/tdmox.sample/span-2/desc
--- dahdi-tools.orig/tdmox.sample/span-2/desc	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-2/desc	2014-05-28 15:06:42.000000000 +0700
@@ -0,0 +1 @@
+#SPAN description. Will override description generated by the driver.
diff -urN dahdi-tools.orig/tdmox.sample/span-2/devicetype dahdi-tools/tdmox.sample/span-2/devicetype
--- dahdi-tools.orig/tdmox.sample/span-2/devicetype	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-2/devicetype	2014-05-28 15:06:49.000000000 +0700
@@ -0,0 +1 @@
+#SPAN devicetype. Will override devicetype generated by the driver.
diff -urN dahdi-tools.orig/tdmox.sample/span-2/driver dahdi-tools/tdmox.sample/span-2/driver
--- dahdi-tools.orig/tdmox.sample/span-2/driver	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-2/driver	2014-05-14 21:03:47.000000000 +0700
@@ -0,0 +1,2 @@
+eth
+#channel driver. eth for TDMoE (TDM over Ethernet)
diff -urN dahdi-tools.orig/tdmox.sample/span-2/flags dahdi-tools/tdmox.sample/span-2/flags
--- dahdi-tools.orig/tdmox.sample/span-2/flags	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-2/flags	2014-05-14 21:03:47.000000000 +0700
@@ -0,0 +1,2 @@
+RBS
+#RBS or not RBS for now.
diff -urN dahdi-tools.orig/tdmox.sample/span-2/linecompat dahdi-tools/tdmox.sample/span-2/linecompat
--- dahdi-tools.orig/tdmox.sample/span-2/linecompat	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-2/linecompat	2014-05-28 15:06:45.000000000 +0700
@@ -0,0 +1 @@
+#D4 ESF AMI B8ZS CCS HDB3 CRC4 NTTE NOTOPEN
diff -urN dahdi-tools.orig/tdmox.sample/span-2/location dahdi-tools/tdmox.sample/span-2/location
--- dahdi-tools.orig/tdmox.sample/span-2/location	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-2/location	2014-05-28 15:06:42.000000000 +0700
@@ -0,0 +1 @@
+#SPAN location. Will override location generated by the driver.
diff -urN dahdi-tools.orig/tdmox.sample/span-2/manufacturer dahdi-tools/tdmox.sample/span-2/manufacturer
--- dahdi-tools.orig/tdmox.sample/span-2/manufacturer	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-2/manufacturer	2014-05-28 15:06:47.000000000 +0700
@@ -0,0 +1 @@
+#SPAN manufacturer. Will override manufacturer generated by the driver.
diff -urN dahdi-tools.orig/tdmox.sample/span-2/name dahdi-tools/tdmox.sample/span-2/name
--- dahdi-tools.orig/tdmox.sample/span-2/name	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-2/name	2014-05-28 15:06:42.000000000 +0700
@@ -0,0 +1 @@
+#SPAN name. Will override name generated by the driver.
diff -urN dahdi-tools.orig/tdmox.sample/span-2/spantype dahdi-tools/tdmox.sample/span-2/spantype
--- dahdi-tools.orig/tdmox.sample/span-2/spantype	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-2/spantype	2014-05-28 15:06:50.000000000 +0700
@@ -0,0 +1,2 @@
+#FXS FXO ANALOG_MIXED E1 T1 J1 BRI_NT BRI_TE BRI_SOFT
+
diff -urN dahdi-tools.orig/tdmox.sample/span-2/timing dahdi-tools/tdmox.sample/span-2/timing
--- dahdi-tools.orig/tdmox.sample/span-2/timing	1970-01-01 07:00:00.000000000 +0700
+++ dahdi-tools/tdmox.sample/span-2/timing	2014-05-28 15:06:45.000000000 +0700
@@ -0,0 +1,4 @@
+0
+# timing priority, like for a normal span.
+# use "0" to not use this as a timing source, or prioritize them as
+# primary, secondard, etc.
diff -urN dahdi-tools.orig/xpp/perl_modules/Dahdi/Chans.pm dahdi-tools/xpp/perl_modules/Dahdi/Chans.pm
--- dahdi-tools.orig/xpp/perl_modules/Dahdi/Chans.pm	2014-05-20 22:19:05.821921538 +0700
+++ dahdi-tools/xpp/perl_modules/Dahdi/Chans.pm	2014-05-27 20:44:31.265426961 +0700
@@ -166,6 +166,15 @@
 	} elsif ($fqn =~ m{\bztgsm/.*}) {
 		# Junghanns GSM card
 		$type = "GSM";
+	} elsif ($fqn =~ m{\b(TDM_D)/.*}) {
+		# TDMoX digital SPAN
+		$type = "PRI";
+	} elsif ($fqn =~ m{\b(TDM_AS)/.*}) {
+		# TDMoX FXS channel
+		$type = "FXS";
+	} elsif ($fqn =~ m{\b(TDM_AO)/.*}) {
+		# TDMoX FXO channel
+		$type = "FXO";
 	} elsif($signalling ne '') {
 		$type = 'FXO' if $signalling =~ /^FXS/;
 		$type = 'FXS' if $signalling =~ /^FXO/;
diff -urN dahdi-tools.orig/xpp/perl_modules/Dahdi/Config/Gen/Modules.pm dahdi-tools/xpp/perl_modules/Dahdi/Config/Gen/Modules.pm
--- dahdi-tools.orig/xpp/perl_modules/Dahdi/Config/Gen/Modules.pm	2014-05-20 22:19:05.821921538 +0700
+++ dahdi-tools/xpp/perl_modules/Dahdi/Config/Gen/Modules.pm	2014-05-27 20:45:07.682269600 +0700
@@ -34,6 +34,10 @@
 	print  "# your manual changes will be LOST.\n";
 	my @drivers = Dahdi::Hardware->drivers;
 	print join("\n", @drivers),"\n";
+	if (-e "/etc/dahdi/tdmox") {
+	    print ("dahdi_tdmox\n");
+	    print ("dahdi_tdmox_eth\n");
+	}
 	close F;
 	select $old;
 }
diff -urN dahdi-tools.orig/xpp/perl_modules/Dahdi/Span.pm dahdi-tools/xpp/perl_modules/Dahdi/Span.pm
--- dahdi-tools.orig/xpp/perl_modules/Dahdi/Span.pm	2014-05-20 22:19:05.821921538 +0700
+++ dahdi-tools/xpp/perl_modules/Dahdi/Span.pm	2014-05-27 20:43:00.295322031 +0700
@@ -153,6 +153,7 @@
 		'Rhino R1T1 (E1)/PRA Card',        # r1t1
 		'Rhino R1T1 (T1)/PRI Card',        # r1t1
 		'WP(E1|T1)/.* "wanpipe',           # Sangoma E1/T1
+		'TDM_D',                           # TDMoX digital device
 		);
 
 my @soft_term_type_strings = (