Move kernel stuff to under kernel/

(merged branch /zaptel/team/tzafrir/move )

Closes issue #7117.


git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@3793 5390a7c7-147a-4af0-8ec9-7488f05a26cb

190 files changed, 274 insertions, 105 deletions

diff --git a/Makefile b/Makefile
index 0f01537..f7fb84a 100644
--- a/Makefile
+++ b/Makefile
@@ -105,10 +105,10 @@ ifeq ($(findstring xpp,$(MENUSELECT_MODULES)),)
   BUILD_XPP:=yes
 endif
 
-SUBDIRS_UTILS_ALL:= xpp/utils ppp
+SUBDIRS_UTILS_ALL:= kernel/xpp/utils ppp
 SUBDIRS_UTILS	:=
 ifeq ($(BUILD_XPP),yes)
-  SUBDIRS_UTILS	+= xpp/utils
+  SUBDIRS_UTILS	+= kernel/xpp/utils
 endif
 #SUBDIRS_UTILS	+= ppp
 
@@ -122,6 +122,8 @@ BUILD_MODULES:=$(BUILD_TOPDIR_MODULES) $(BUILD_SUBDIR_MODULES)
 
 MOD_DESTDIR:=zaptel
 
+KERN_DIR:=kernel
+
 #NOTE NOTE NOTE
 #
 # all variables set before the include of Makefile.kernel26 are needed by the 2.6 kernel module build process
@@ -137,15 +139,15 @@ else
 KBUILD_OBJ_M=$(BUILD_TOPDIR_MODULES:%=%.o) $(BUILD_SUBDIR_MODULES:%=%/)
 
 ifeq ($(BUILDVER),linux24)
-  INSTALL_MODULES:=$(BUILD_TOPDIR_MODULES:%=%.o)
+  INSTALL_MODULES:=$(BUILD_TOPDIR_MODULES:%=$(KERN_DIR)/%.o)
   INSTALL_MODULES+=$(foreach mod,$(BUILD_SUBDIR_MODULES),$(mod)/$(mod).o)
-  ALL_MODULES:=$(TOPDIR_MODULES:%=%.o)
-  ALL_MODULES+=$(SUBDIR_MODULES:%=%/%.o)
+  ALL_MODULES:=$(TOPDIR_MODULES:%=$(KERN_DIR)/%.o)
+  ALL_MODULES+=$(SUBDIR_MODULES:%=$(KERN_DIR)/%/%.o)
 else
-  INSTALL_MODULES:=$(BUILD_TOPDIR_MODULES:%=%.ko)
-  INSTALL_MODULES+=$(foreach mod,$(filter-out xpp,$(BUILD_SUBDIR_MODULES)),$(mod)/$(mod).ko)
+  INSTALL_MODULES:=$(BUILD_TOPDIR_MODULES:%=$(KERN_DIR)/%.ko)
+  INSTALL_MODULES+=$(foreach mod,$(filter-out xpp,$(BUILD_SUBDIR_MODULES)),$(KERN_DIR)/$(mod)/$(mod).ko)
   ifneq ($(filter xpp,$(BUILD_SUBDIR_MODULES)),)
-  INSTALL_MODULES+=$(patsubst %,xpp/%.ko,xpp_usb xpd_fxo xpd_fxs xpp)
+  INSTALL_MODULES+=$(patsubst %,$(KERN_DIR)/xpp/%.ko,xpp_usb xpd_fxo xpd_fxs xpp)
   endif
 
   ALL_MODULES:=$(TOPDIR_MODULES:%=%.ko)
@@ -186,8 +188,13 @@ MODULE_ALIASES=wcfxs wctdm8xxp wct2xxp
 
 KFLAGS+=-DSTANDALONE_ZAPATA
 CFLAGS+=-DSTANDALONE_ZAPATA
-KMAKE  = $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) \
+ifeq ($(BUILDVER),linux24)
+KMAKE	= $(MAKE) -C kernel HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE) \
+  BUILD_TOPDIR_MODULES="$(BUILD_TOPDIR_MODULES)" BUILD_SUBDIR_MODULES="$(BUILD_SUBDIR_MODULES)"
+else
+KMAKE  = $(MAKE) -C $(KSRC) SUBDIRS=$(PWD)/kernel \
   HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE) KBUILD_OBJ_M="$(KBUILD_OBJ_M)"
+endif
 KMAKE_INST = $(KMAKE) \
   INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=misc modules_install
 
@@ -291,13 +298,13 @@ programs: libs utils
 
 utils: $(BINS) utils-subdirs
 
-modules: prereq
+modules: 
 	@if [ -z "$(KSRC)" -o ! -d "$(KSRC)" ]; then echo "You do not appear to have the sources for the $(KVERS) kernel installed."; exit 1 ; fi
-ifeq ($(BUILDVER),linux26)
+#ifeq ($(BUILDVER),linux26)
 	$(KMAKE) modules
-else
-modules: $(INSTALL_MODULES)
-endif
+#else
+#modules: $(INSTALL_MODULES)
+#endif
 
 ifeq ($(HPEC_PRESENT),yes)
 ifeq ($(ARCH),i386)
@@ -327,26 +334,17 @@ zonedata.lo: zonedata.c
 tonezone.lo: tonezone.c
 	$(CC) -c $(CFLAGS) -o $@ $^
 
-tor2fw.h: tormenta2.rbt makefw 
-	./makefw $< tor2fw > $@
-
-radfw.h: pciradio.rbt makefw
-	./makefw $< radfw > $@
-
-makefw: makefw.c
-	$(HOSTCC) -o $@ $^
-
 prereq: config.status tor2fw.h radfw.h version.h
 
-zttool.o: zaptel.h
+zttool.o: kernel/zaptel.h
 zttool.o: CFLAGS+=$(NEWT_INCLUDE)
 zttool: LDLIBS+=$(NEWT_LIB)
 
-ztscan.o: zaptel.h
+ztscan.o: kernel/zaptel.h
 
-ztprovision.o: zaptel.h
+ztprovision.o: kernel/zaptel.h
 
-ztmonitor.o: zaptel.h
+ztmonitor.o: kernel/zaptel.h
 
 ztspeed: CFLAGS=
 
@@ -359,7 +357,7 @@ $(LTZ_A): $(LTZ_A_OBJS)
 $(LTZ_SO): $(LTZ_SO_OBJS)
 	$(CC) $(CFLAGS) -shared -Wl,-soname,$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) -o $@ $^ $(LDFLAGS) $(LDLIBS) -lm
 
-ztcfg.o: ztcfg.h zaptel.h
+ztcfg.o: ztcfg.h kernel/zaptel.h
 ztcfg: ztcfg.o $(LTZ_A)
 ztcfg: LDLIBS+=-lm
 
@@ -516,7 +514,7 @@ install-utils-subdirs:
 	done
 
 install-include:
-	$(INSTALL) -D -m 644 zaptel.h $(DESTDIR)$(INC_DIR)/zaptel.h
+	$(INSTALL) -D -m 644 kernel/zaptel.h $(DESTDIR)$(INC_DIR)/zaptel.h
 
 devices:
 ifndef DYNFS
@@ -603,7 +601,7 @@ endif
 	@echo "optimal value for the variable MODULES ."
 	@echo ""
 	@echo "I think that the zaptel hardware you have on your system is:"
-	@xpp/utils/zaptel_hardware || true
+	@kernel/xpp/utils/zaptel_hardware || true
 
 
 update:
@@ -622,17 +620,11 @@ update:
 
 clean:
 	-@$(MAKE) -C menuselect clean
-	rm -f torisatool makefw tor2fw.h radfw.h
+	rm -f torisatool
 	rm -f $(BINS)
 	rm -f *.o ztcfg tzdriver sethdlc sethdlc-new
 	rm -f $(LTZ_SO) $(LTZ_A) *.lo
-ifeq ($(BUILDVER),linux26)
-  ifneq (,$(KSRC))
 	$(KMAKE) clean
-  endif
-else
-	$(MAKE) -C wct4xxp clean
-endif
 	@for dir in $(SUBDIRS_UTILS_ALL); do \
 		$(MAKE) -C $$dir clean; \
 	done
diff --git a/configure b/configure
index 5848d77..c28a322 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 3195 .
+# From configure.ac Revision: 3198 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -580,7 +580,7 @@ PACKAGE_STRING=
 PACKAGE_BUGREPORT=
 
 ac_unique_file="zaptel"
-ac_unique_file="zaptel-base.c"
+ac_unique_file="kernel/zaptel-base.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
diff --git a/configure.ac b/configure.ac
index 5ef2cbd..bda6cd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ m4_define([ZAP_VERSION],
 AC_INIT(zaptel, ZAP_VERSION, www.asterisk.org)
 
 # check existence of the package
-AC_CONFIG_SRCDIR([zaptel-base.c])
+AC_CONFIG_SRCDIR([kernel/zaptel-base.c])
 
 AC_COPYRIGHT("Zaptel")
 AC_REVISION($Revision$)
diff --git a/fxotune.c b/fxotune.c
index ea4467e..bf8b6af 100644
--- a/fxotune.c
+++ b/fxotune.c
@@ -24,11 +24,11 @@
 #include <sys/time.h>
 
 #ifdef STANDALONE_ZAPATA
-#include "zaptel.h"
+#include "kernel/zaptel.h"
 #else
 #include <zaptel/zaptel.h>
 #endif
-#include "wctdm.h"
+#include "kernel/wctdm.h"
 #include "fxotune.h"
 
 #define TEST_DURATION 2000
diff --git a/fxotune.h b/fxotune.h
index 1fc2ef9..093f03e 100644
--- a/fxotune.h
+++ b/fxotune.h
@@ -13,8 +13,6 @@
  * (C) 2005 Digium, Inc.
  */
 
-#include "wctdm.h"
-
 struct wctdm_echo_coefs echo_trys [] =
 {
 	/* 600 ohm echo settings */
diff --git a/fxstest.c b/fxstest.c
index 922a1a9..4fe7c32 100644
--- a/fxstest.c
+++ b/fxstest.c
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
-#include "zaptel.h"
+#include "kernel/zaptel.h"
 #include "tonezone.h"
 #include "wctdm.h"
 
diff --git a/hdlcgen.c b/hdlcgen.c
index 15dc45c..417004b 100644
--- a/hdlcgen.c
+++ b/hdlcgen.c
@@ -1,5 +1,5 @@
 #define FAST_HDLC_NEED_TABLES
-#include "fasthdlc.h"
+#include "kernel/fasthdlc.h"
 #include <stdio.h>
 #include <fcntl.h>
 #include <string.h>
diff --git a/hdlcstress.c b/hdlcstress.c
index b27e7dc..6aa82ed 100644
--- a/hdlcstress.c
+++ b/hdlcstress.c
@@ -2,7 +2,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
-#include "zaptel.h"
+#include "kernel/zaptel.h"
 #include <stdio.h>
 #include <linux/types.h>
 #include <linux/ppp_defs.h> 
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include "bittest.h"
 #define FAST_HDLC_NEED_TABLES
-#include "fasthdlc.h"
+#include "kernel/fasthdlc.h"
 
 /* #define BLOCK_SIZE 2048 */
 #define BLOCK_SIZE 2041
diff --git a/hdlctest.c b/hdlctest.c
index abebbe6..a95c9ef 100644
--- a/hdlctest.c
+++ b/hdlctest.c
@@ -2,7 +2,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
-#include "zaptel.h"
+#include "kernel/zaptel.h"
 #include <stdio.h>
 #include <linux/types.h>
 #include <linux/ppp_defs.h> 
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include "bittest.h"
 #define FAST_HDLC_NEED_TABLES
-#include "fasthdlc.h"
+#include "kernel/fasthdlc.h"
 
 #define BLOCK_SIZE 2039
 
diff --git a/hdlcverify.c b/hdlcverify.c
index 1937876..8212b2a 100644
--- a/hdlcverify.c
+++ b/hdlcverify.c
@@ -1,5 +1,5 @@
 #define FAST_HDLC_NEED_TABLES
-#include "fasthdlc.h"
+#include "kernel/fasthdlc.h"
 #include <stdio.h>
 #include <fcntl.h>
 #include <string.h>
diff --git a/kernel/GNUmakefile b/kernel/GNUmakefile
new file mode 100644
index 0000000..3ec8aa6
--- /dev/null
+++ b/kernel/GNUmakefile
@@ -0,0 +1,160 @@
+#
+# Zaptel kernel 2.4 makefile
+#
+# Copyright (C) 2008 Digium, Inc.
+#
+
+CFLAGS+=-DSTANDALONE_ZAPATA
+
+ifeq ($(MAKELEVEL),0)
+PWD:=$(shell pwd)
+endif
+
+KINCLUDES:=$(KSRC)/include
+
+BUILDVER:=linux24
+
+HOTPLUG_FIRMWARE:=no
+
+ifeq ($(HOTPLUG_FIRMWARE),yes)
+  CFLAGS+=-DHOTPLUG_FIRMWARE
+endif
+
+ifeq ($(ARCH),i386)
+ifneq ($(wildcard $(PWD)/hpec/hpec_x86_32.o_shipped),)
+HPEC_PRESENT=yes
+endif
+endif
+
+ifeq ($(ARCH),x86_64)
+ifneq ($(wildcard $(PWD)/hpec/hpec_x86_64.o_shipped),)
+HPEC_PRESENT=yes
+endif
+endif
+
+BUILD_MODULES:=$(BUILD_TOPDIR_MODULES) $(BUILD_SUBDIR_MODULES)
+ALL_MODULES	:= $(BUILD_TOPDIR_MODULES:%=%.o) \
+	$(join $(BUILD_SUBDIR_MODULES:%=%/), $(BUILD_SUBDIR_MODULES:%=%.o))
+
+OPTFLAG=-O2
+CFLAGS+=-I. $(OPTFLAGS) -g -fPIC -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
+ifneq (,$(findstring ppc,$(UNAME_M)))
+CFLAGS_PPC:=-fsigned-char
+endif
+ifneq (,$(findstring x86_64,$(UNAME_M)))
+CFLAGS_x86_64:=-m64
+endif
+CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_x86_64)
+KFLAGS=-I$(KINCLUDES) -O6
+KFLAGS+=-DMODULE -D__KERNEL__ -DEXPORT_SYMTAB -I$(KSRC)/drivers/net \
+	-Wall -I. -Wstrict-prototypes -fomit-frame-pointer -I$(KSRC)/drivers/net/wan -I$(KINCLUDES)/net
+ifneq (,$(wildcard $(KINCLUDES)/linux/modversions.h))
+  KFLAGS+=-DMODVERSIONS -include $(KINCLUDES)/linux/modversions.h
+endif
+ifneq (,$(findstring ppc,$(UNAME_M)))
+KFLAGS_PPC:=-msoft-float -fsigned-char
+endif
+KFLAGS+=$(KFLAGS_PPC)
+  ifneq (,$(findstring x86_64,$(UNAME_M)))
+    KFLAGS+=-mcmodel=kernel
+  endif
+
+#
+# Features are now configured in zconfig.h
+#
+
+MODULE_ALIASES=wcfxs wctdm8xxp wct2xxp
+
+KFLAGS+=-DSTANDALONE_ZAPATA
+
+MOD_DIR:=$(DESTDIR)/lib/modules/$(KVERS)/misc
+
+all: modules
+
+ifeq ($(HPEC_PRESENT),yes)
+ifeq ($(ARCH),i386)
+ZAPTEL_HPEC:=hpec/hpec_x86_32.o_shipped
+endif
+
+ifeq ($(ARCH),x86_64)
+ZAPTEL_HPEC:=hpec/hpec_x86_64.o_shipped
+endif
+
+KFLAGS+=-DECHO_CAN_HPEC -I$(PWD)/hpec
+zaptel-base.o: hpec/hpec_zaptel.h hpec/hpec_user.h
+endif
+
+prereq: tor2fw.h radfw.h version.h
+
+tor2fw.h: tormenta2.rbt makefw 
+	./makefw $< tor2fw > $@
+
+radfw.h: pciradio.rbt makefw
+	./makefw $< radfw > $@
+
+makefw: makefw.c
+	$(HOSTCC) -o $@ $^
+			
+
+modules: $(ALL_MODULES)
+
+wct4xxp/wct4xxp.o:
+	$(MAKE) -C wct4xxp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
+
+tor2.o: tor2-hw.h tor2fw.h
+
+zaptel-base.o: digits.h arith.h sec.h sec-2.h kb1ec.h mg2ec.h zconfig.h
+
+wcusb.o: wcusb.h
+
+wctdm.o: wctdm.h
+
+wctdm24xxp/wctdm24xxp.o:
+	$(MAKE) -C wctdm24xxp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
+
+wcte12xp/wcte12xp.o:
+	$(MAKE) -C wcte12xp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
+
+pciradio.o: radfw.h
+
+ztdummy.o: ztdummy.h
+
+zaptel.o: zaptel-base.o $(ZAPTEL_HPEC)
+	$(LD) -r -o $@ $< $(ZAPTEL_HPEC)
+
+$(filter-out zaptel.o,$(BUILD_TOPDIR_MODULES:%=%.o)) zaptel-base.o: %.o: %.c zaptel.h
+	$(CC) $(KFLAGS) -o $@ -c $<
+
+install: all devices install-modules install-programs install-firmware
+	@echo "###################################################"
+	@echo "###"
+	@echo "### Zaptel installed successfully."
+	@echo "### If you have not done so before, install init scripts with:"
+	@echo "###"
+	@echo "###   make config"
+	@echo "###"
+	@echo "###################################################"
+
+BASENAMES=$(sort $(shell for x in $(ALL_MODULES); do basename $x; done))
+uninstall-modules:
+
+BASENAMES=$(sort $(shell for mod in $(ALL_MODULES); do basename $$mod; done))
+
+install-modules: $(INSTALL_MODULES) uninstall-modules
+	$(INSTALL) -d $(DESTDIR)$(MOD_DIR)
+	$(INSTALL) -m 644 $(INSTALL_MODULES) $(DESTDIR)$(MOD_DIR)
+	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
+
+clean:
+	rm -f makefw tor2fw.h radfw.h
+	rm -f *.o 
+	$(MAKE) -C wct4xxp clean
+	rm -rf .tmp_versions
+	rm -f core
+
+distclean: dist-clean
+
+dist-clean: clean
+
+.PHONY: menuselect distclean dist-clean clean all _all install modules config install-modules uninstall-modules
+
diff --git a/Kbuild b/kernel/Kbuild
index fdd8d39..7454c90 100644
--- a/Kbuild
+++ b/kernel/Kbuild
@@ -28,6 +28,20 @@ endif
 EXTRA_CFLAGS += -DECHO_CAN_HPEC -I$(src)/hpec
 endif
 
+$(obj)/pciradio.o: $(obj)/radfw.h
+$(obj)/tor2.o: $(obj)/tor2fw.h
+
+hostprogs-y := $(obj)/makefw
+
+$(obj)/tor2fw.h: $(src)/tormenta2.rbt $(obj)/makefw 
+	$(obj)/makefw $< tor2fw > $@
+
+$(obj)/radfw.h: $(src)/pciradio.rbt $(obj)/makefw
+	$(obj)/makefw $< radfw > $@
+
+$(obj)/makefw: $(src)/makefw.c
+	$(HOSTCC) -o $@ $^
+
 
 # set CONFIG_ZAPTEL_MMX for a number of CPU types.
 # Right now this part is not enabled, unless you build with
diff --git a/kernel/Makefile b/kernel/Makefile
new file mode 100644
index 0000000..56453cb
--- /dev/null
+++ b/kernel/Makefile
@@ -0,0 +1,6 @@
+ifneq ($(KBUILD_EXTMOD),)
+# We only get here on kernels 2.6.0-2.6.9 .
+# For newer kernels, Kbuild will be included directly by the kernel
+# build system.
+include $(src)/Kbuild
+endif
diff --git a/adt_lec.c b/kernel/adt_lec.c
index d191e2b..d191e2b 100644
--- a/adt_lec.c
+++ b/kernel/adt_lec.c
diff --git a/adt_lec.h b/kernel/adt_lec.h
index c91020d..c91020d 100644
--- a/adt_lec.h
+++ b/kernel/adt_lec.h
diff --git a/arith.h b/kernel/arith.h
index 3059db5..3059db5 100644
--- a/arith.h
+++ b/kernel/arith.h
diff --git a/biquad.h b/kernel/biquad.h
index 58458a9..58458a9 100644
--- a/biquad.h
+++ b/kernel/biquad.h
diff --git a/datamods/Makefile b/kernel/datamods/Makefile
index 310073e..310073e 100644
--- a/datamods/Makefile
+++ b/kernel/datamods/Makefile
diff --git a/datamods/hdlc_cisco.c b/kernel/datamods/hdlc_cisco.c
index 1fd0466..1fd0466 100644
--- a/datamods/hdlc_cisco.c
+++ b/kernel/datamods/hdlc_cisco.c
diff --git a/datamods/hdlc_fr.c b/kernel/datamods/hdlc_fr.c
index 523afe1..523afe1 100644
--- a/datamods/hdlc_fr.c
+++ b/kernel/datamods/hdlc_fr.c
diff --git a/datamods/hdlc_generic.c b/kernel/datamods/hdlc_generic.c
index 46cef8f..46cef8f 100644
--- a/datamods/hdlc_generic.c
+++ b/kernel/datamods/hdlc_generic.c
diff --git a/datamods/hdlc_ppp.c b/kernel/datamods/hdlc_ppp.c
index b81263e..b81263e 100644
--- a/datamods/hdlc_ppp.c
+++ b/kernel/datamods/hdlc_ppp.c
diff --git a/datamods/hdlc_raw.c b/kernel/datamods/hdlc_raw.c
index 9456d31..9456d31 100644
--- a/datamods/hdlc_raw.c
+++ b/kernel/datamods/hdlc_raw.c
diff --git a/datamods/hdlc_raw_eth.c b/kernel/datamods/hdlc_raw_eth.c
index b1285cc..b1285cc 100644
--- a/datamods/hdlc_raw_eth.c
+++ b/kernel/datamods/hdlc_raw_eth.c
diff --git a/datamods/syncppp.c b/kernel/datamods/syncppp.c
index 5ca283a..5ca283a 100644
--- a/datamods/syncppp.c
+++ b/kernel/datamods/syncppp.c
diff --git a/digits.h b/kernel/digits.h
index eba09dd..eba09dd 100644
--- a/digits.h
+++ b/kernel/digits.h
diff --git a/ecdis.h b/kernel/ecdis.h
index 4d3801b..4d3801b 100644
--- a/ecdis.h
+++ b/kernel/ecdis.h
diff --git a/fasthdlc.h b/kernel/fasthdlc.h
index adb5597..adb5597 100644
--- a/fasthdlc.h
+++ b/kernel/fasthdlc.h
diff --git a/fir.h b/kernel/fir.h
index 1722285..1722285 100644
--- a/fir.h
+++ b/kernel/fir.h
diff --git a/hpec/hpec.h b/kernel/hpec/hpec.h
index 7e90f12..7e90f12 100644
--- a/hpec/hpec.h
+++ b/kernel/hpec/hpec.h
diff --git a/hpec/hpec_user.h b/kernel/hpec/hpec_user.h
index bf006eb..bf006eb 100644
--- a/hpec/hpec_user.h
+++ b/kernel/hpec/hpec_user.h
diff --git a/hpec/hpec_zaptel.h b/kernel/hpec/hpec_zaptel.h
index 2fb5a14..2fb5a14 100644
--- a/hpec/hpec_zaptel.h
+++ b/kernel/hpec/hpec_zaptel.h
diff --git a/jpah.h b/kernel/jpah.h
index f72c5fa..f72c5fa 100644
--- a/jpah.h
+++ b/kernel/jpah.h
diff --git a/kb1ec.h b/kernel/kb1ec.h
index 33236b7..33236b7 100644
--- a/kb1ec.h
+++ b/kernel/kb1ec.h
diff --git a/kb1ec_const.h b/kernel/kb1ec_const.h
index 0849b14..0849b14 100644
--- a/kb1ec_const.h
+++ b/kernel/kb1ec_const.h
diff --git a/makefw.c b/kernel/makefw.c
index 6a5b0d9..6a5b0d9 100644
--- a/makefw.c
+++ b/kernel/makefw.c
diff --git a/mg2ec.h b/kernel/mg2ec.h
index 2dc3597..2dc3597 100644
--- a/mg2ec.h
+++ b/kernel/mg2ec.h
diff --git a/mg2ec_const.h b/kernel/mg2ec_const.h
index 08fd897..08fd897 100644
--- a/mg2ec_const.h
+++ b/kernel/mg2ec_const.h
diff --git a/pciradio.c b/kernel/pciradio.c
index 55270c1..55270c1 100644
--- a/pciradio.c
+++ b/kernel/pciradio.c
diff --git a/pciradio.rbt b/kernel/pciradio.rbt
index 3cd2517..3cd2517 100644
--- a/pciradio.rbt
+++ b/kernel/pciradio.rbt
diff --git a/proslic.h b/kernel/proslic.h
index 933bd34..933bd34 100644
--- a/proslic.h
+++ b/kernel/proslic.h
diff --git a/sec-2.h b/kernel/sec-2.h
index 49342ea..49342ea 100644
--- a/sec-2.h
+++ b/kernel/sec-2.h
diff --git a/sec.h b/kernel/sec.h
index 6c4b7c0..6c4b7c0 100644
--- a/sec.h
+++ b/kernel/sec.h
diff --git a/tor2-hw.h b/kernel/tor2-hw.h
index 8da5c52..8da5c52 100644
--- a/tor2-hw.h
+++ b/kernel/tor2-hw.h
diff --git a/tor2.c b/kernel/tor2.c
index ef2cf05..ef2cf05 100644
--- a/tor2.c
+++ b/kernel/tor2.c
diff --git a/torisa.c b/kernel/torisa.c
index a8fb9d3..a8fb9d3 100644
--- a/torisa.c
+++ b/kernel/torisa.c
diff --git a/tormenta2.rbt b/kernel/tormenta2.rbt
index 9238b8a..9238b8a 100644
--- a/tormenta2.rbt
+++ b/kernel/tormenta2.rbt
diff --git a/wcfxo.c b/kernel/wcfxo.c
index 5f48051..5f48051 100644
--- a/wcfxo.c
+++ b/kernel/wcfxo.c
diff --git a/wct1xxp.c b/kernel/wct1xxp.c
index bcfed97..bcfed97 100644
--- a/wct1xxp.c
+++ b/kernel/wct1xxp.c
diff --git a/wct4xxp/Kbuild b/kernel/wct4xxp/Kbuild
index e75a8ef..96909f4 100644
--- a/wct4xxp/Kbuild
+++ b/kernel/wct4xxp/Kbuild
@@ -1,5 +1,7 @@
 obj-m += wct4xxp.o
 
+FIRM_DIR	:= ../../firmware
+
 EXTRA_CFLAGS := -I$(src)/.. $(shell $(src)/../oct612x/octasic-helper cflags $(src)/../oct612x) -Wno-undef
 
 ifeq ($(HOTPLUG_FIRMWARE),yes)
@@ -9,14 +11,14 @@ endif
 wct4xxp-objs := base.o vpm450m.o $(shell $(src)/../oct612x/octasic-helper objects ../oct612x)
 
 ifneq ($(HOTPLUG_FIRMWARE),yes)
-wct4xxp-objs += ../firmware/zaptel-fw-oct6114-064.o ../firmware/zaptel-fw-oct6114-128.o
+wct4xxp-objs += $(FIRM_DIR)/zaptel-fw-oct6114-064.o $(FIRM_DIR)/zaptel-fw-oct6114-128.o
 endif
 
-$(obj)/../firmware/zaptel-fw-oct6114-064.o: $(obj)/base.o
-	$(MAKE) -C $(obj)/../firmware zaptel-fw-oct6114-064.o
+$(obj)/$(FIRM_DIR)/zaptel-fw-oct6114-064.o: $(obj)/base.o
+	$(MAKE) -C $(obj)/$(FIRM_DIR) zaptel-fw-oct6114-064.o
 
-$(obj)/../firmware/zaptel-fw-oct6114-128.o: $(obj)/base.o
-	$(MAKE) -C $(obj)/../firmware zaptel-fw-oct6114-128.o
+$(obj)/$(FIRM_DIR)/zaptel-fw-oct6114-128.o: $(obj)/base.o
+	$(MAKE) -C $(obj)/$(FIRM_DIR) zaptel-fw-oct6114-128.o
 
 $(obj)/base.o: $(src)/vpm450m.h $(src)/wct4xxp.h
 $(obj)/base.o: $(src)/../zaptel.h
diff --git a/wct4xxp/Makefile b/kernel/wct4xxp/Makefile
index e1a2b83..4f0961e 100644
--- a/wct4xxp/Makefile
+++ b/kernel/wct4xxp/Makefile
@@ -6,6 +6,8 @@ include $(src)/Kbuild
 
 else
 
+FIRM_DIR	:= ../../firmware
+
 OCTASIC_OBJS:=$(shell ../oct612x/octasic-helper objects ../oct612x)
 OCTASIC_CFLAGS:=$(shell ../oct612x/octasic-helper cflags ../oct612x) -Wno-undef
 
@@ -18,13 +20,13 @@ base.o: ../zaptel.h vpm450m.h wct4xxp.h
 
 vpm450m.o: vpm450m.h ../oct612x/include/oct6100api/oct6100_api.h
 
-../firmware/zaptel-fw-oct6114-064.o: base.o
-	$(MAKE) -C ../firmware zaptel-fw-oct6114-064.o
+$(FIRM_DIR)/zaptel-fw-oct6114-064.o: base.o
+	$(MAKE) -C $(FIRM_DIR) zaptel-fw-oct6114-064.o
 
-../firmware/zaptel-fw-oct6114-128.o: base.o
-	$(MAKE) -C ../firmware zaptel-fw-oct6114-128.o
+$(FIRM_DIR)/zaptel-fw-oct6114-128.o: base.o
+	$(MAKE) -C $(FIRM_DIR) zaptel-fw-oct6114-128.o
 
-wct4xxp.o: base.o vpm450m.o $(OCTASIC_OBJS) ../firmware/zaptel-fw-oct6114-064.o ../firmware/zaptel-fw-oct6114-128.o
+wct4xxp.o: base.o vpm450m.o $(OCTASIC_OBJS) $(FIRM_DIR)/zaptel-fw-oct6114-064.o $(FIRM_DIR)/zaptel-fw-oct6114-128.o
 	$(LD) -r -o $@ $^
 
 clean:
diff --git a/wct4xxp/base.c b/kernel/wct4xxp/base.c
index 0b4a2d9..0b4a2d9 100644
--- a/wct4xxp/base.c
+++ b/kernel/wct4xxp/base.c
diff --git a/wct4xxp/vpm450m.c b/kernel/wct4xxp/vpm450m.c
index 674dd49..674dd49 100644
--- a/wct4xxp/vpm450m.c
+++ b/kernel/wct4xxp/vpm450m.c
diff --git a/wct4xxp/vpm450m.h b/kernel/wct4xxp/vpm450m.h
index 41d7c60..41d7c60 100644
--- a/wct4xxp/vpm450m.h
+++ b/kernel/wct4xxp/vpm450m.h
diff --git a/wct4xxp/wct4xxp-diag.c b/kernel/wct4xxp/wct4xxp-diag.c
index 50a328d..50a328d 100644
--- a/wct4xxp/wct4xxp-diag.c
+++ b/kernel/wct4xxp/wct4xxp-diag.c
diff --git a/wct4xxp/wct4xxp.h b/kernel/wct4xxp/wct4xxp.h
index 42dc2bd..42dc2bd 100644
--- a/wct4xxp/wct4xxp.h
+++ b/kernel/wct4xxp/wct4xxp.h
diff --git a/wctc4xxp/Kbuild b/kernel/wctc4xxp/Kbuild
index 3ffe8bf..214aae1 100644
--- a/wctc4xxp/Kbuild
+++ b/kernel/wctc4xxp/Kbuild
@@ -1,5 +1,7 @@
 obj-m += wctc4xxp.o
 
+FIRM_DIR	:= ../../firmware
+
 EXTRA_CFLAGS := -I$(src)/.. -Wno-undef -DSTANDALONE_ZAPATA
 
 ifeq ($(HOTPLUG_FIRMWARE),yes)
@@ -9,10 +11,10 @@ endif
 wctc4xxp-objs := base.o 
 
 ifneq ($(HOTPLUG_FIRMWARE),yes)
-wctc4xxp-objs += ../firmware/zaptel-fw-tc400m.o
+wctc4xxp-objs += $(FIRM_DIR)/zaptel-fw-tc400m.o
 endif
 
 $(obj)/base.o: $(src)/../zaptel.h
 
-$(obj)/../firmware/zaptel-fw-tc400m.o: $(obj)/base.o
-	$(MAKE) -C $(obj)/../firmware zaptel-fw-tc400m.o
+$(obj)/$(FIRM_DIR)/zaptel-fw-tc400m.o: $(obj)/base.o
+	$(MAKE) -C $(obj)/$(FIRM_DIR) zaptel-fw-tc400m.o
diff --git a/wctc4xxp/Makefile b/kernel/wctc4xxp/Makefile
index 725abc4..725abc4 100644
--- a/wctc4xxp/Makefile
+++ b/kernel/wctc4xxp/Makefile
diff --git a/wctc4xxp/base.c b/kernel/wctc4xxp/base.c
index 3dcb1f4..3dcb1f4 100644
--- a/wctc4xxp/base.c
+++ b/kernel/wctc4xxp/base.c
diff --git a/wctc4xxp/codec_test.c b/kernel/wctc4xxp/codec_test.c
index 287979d..287979d 100644
--- a/wctc4xxp/codec_test.c
+++ b/kernel/wctc4xxp/codec_test.c
diff --git a/wctdm.c b/kernel/wctdm.c
index 68a21e7..68a21e7 100644
--- a/wctdm.c
+++ b/kernel/wctdm.c
diff --git a/wctdm.h b/kernel/wctdm.h
index 73703aa..73703aa 100644
--- a/wctdm.h
+++ b/kernel/wctdm.h
diff --git a/wctdm24xxp/GpakApi.c b/kernel/wctdm24xxp/GpakApi.c
index abdb09f..abdb09f 100644
--- a/wctdm24xxp/GpakApi.c
+++ b/kernel/wctdm24xxp/GpakApi.c
diff --git a/wctdm24xxp/GpakApi.h b/kernel/wctdm24xxp/GpakApi.h
index df57c09..df57c09 100644
--- a/wctdm24xxp/GpakApi.h
+++ b/kernel/wctdm24xxp/GpakApi.h
diff --git a/wctdm24xxp/GpakCust.c b/kernel/wctdm24xxp/GpakCust.c
index 23f2096..23f2096 100644
--- a/wctdm24xxp/GpakCust.c
+++ b/kernel/wctdm24xxp/GpakCust.c
diff --git a/wctdm24xxp/GpakCust.h b/kernel/wctdm24xxp/GpakCust.h
index 418d6a7..418d6a7 100644
--- a/wctdm24xxp/GpakCust.h
+++ b/kernel/wctdm24xxp/GpakCust.h
diff --git a/wctdm24xxp/GpakHpi.h b/kernel/wctdm24xxp/GpakHpi.h
index 49e4ef9..49e4ef9 100644
--- a/wctdm24xxp/GpakHpi.h
+++ b/kernel/wctdm24xxp/GpakHpi.h
diff --git a/wctdm24xxp/Kbuild b/kernel/wctdm24xxp/Kbuild
index 69fe21b..3bdbe19 100644
--- a/wctdm24xxp/Kbuild
+++ b/kernel/wctdm24xxp/Kbuild
@@ -1,5 +1,7 @@
 obj-m += wctdm24xxp.o
 
+FIRM_DIR	:= ../../firmware
+
 EXTRA_CFLAGS := -I$(src)/.. -Wno-undef
 
 ifeq ($(HOTPLUG_FIRMWARE),yes)
@@ -9,11 +11,11 @@ endif
 wctdm24xxp-objs := base.o GpakCust.o GpakApi.o
 
 ifneq ($(HOTPLUG_FIRMWARE),yes)
-wctdm24xxp-objs += ../firmware/zaptel-fw-vpmadt032.o
+wctdm24xxp-objs += $(FIRM_DIR)/zaptel-fw-vpmadt032.o
 endif
 
-$(obj)/../firmware/zaptel-fw-vpmadt032.o: $(obj)/base.o
-	$(MAKE) -C $(obj)/../firmware zaptel-fw-vpmadt032.o
+$(obj)/$(FIRM_DIR)/zaptel-fw-vpmadt032.o: $(obj)/base.o
+	$(MAKE) -C $(obj)/$(FIRM_DIR) zaptel-fw-vpmadt032.o
 
 $(obj)/base.o: $(src)/GpakCust.h $(src)/wctdm24xxp.h
 $(obj)/base.o: $(src)/../zaptel.h
diff --git a/wctdm24xxp/Makefile b/kernel/wctdm24xxp/Makefile
index 9c4cd51..9c4cd51 100644
--- a/wctdm24xxp/Makefile
+++ b/kernel/wctdm24xxp/Makefile
diff --git a/wctdm24xxp/base.c b/kernel/wctdm24xxp/base.c
index 58afbb9..886bdab 100644
--- a/wctdm24xxp/base.c
+++ b/kernel/wctdm24xxp/base.c
@@ -3511,7 +3511,6 @@ static void vpm150m_bh(struct work_struct *data)
 				if (debug & DEBUG_ECHOCAN)
 					printk("Echocan enable took %d ms\n", wc->intcount - start);
 			} else {
-				res = gpakAlgControl(vpm150m->dspid, i, BypassEcanA, &pstatus);
 				if (debug & DEBUG_ECHOCAN)
 					printk("Echocan disable took %d ms\n", wc->intcount - start);
 			}
diff --git a/wctdm24xxp/gpakErrs.h b/kernel/wctdm24xxp/gpakErrs.h
index 3413f97..3413f97 100644
--- a/wctdm24xxp/gpakErrs.h
+++ b/kernel/wctdm24xxp/gpakErrs.h
diff --git a/wctdm24xxp/gpakenum.h b/kernel/wctdm24xxp/gpakenum.h
index 91e4311..91e4311 100644
--- a/wctdm24xxp/gpakenum.h
+++ b/kernel/wctdm24xxp/gpakenum.h
diff --git a/wctdm24xxp/wctdm24xxp.h b/kernel/wctdm24xxp/wctdm24xxp.h
index fd7f39b..fd7f39b 100644
--- a/wctdm24xxp/wctdm24xxp.h
+++ b/kernel/wctdm24xxp/wctdm24xxp.h
diff --git a/wcte11xp.c b/kernel/wcte11xp.c
index 68cc827..68cc827 100644
--- a/wcte11xp.c
+++ b/kernel/wcte11xp.c
diff --git a/wcte12xp/GpakApi.c b/kernel/wcte12xp/GpakApi.c
index 43b844a..43b844a 100644
--- a/wcte12xp/GpakApi.c
+++ b/kernel/wcte12xp/GpakApi.c
diff --git a/wcte12xp/GpakApi.h b/kernel/wcte12xp/GpakApi.h
index e676b32..e676b32 100644
--- a/wcte12xp/GpakApi.h
+++ b/kernel/wcte12xp/GpakApi.h
diff --git a/wcte12xp/GpakErrs.h b/kernel/wcte12xp/GpakErrs.h
index 3413f97..3413f97 100644
--- a/wcte12xp/GpakErrs.h
+++ b/kernel/wcte12xp/GpakErrs.h
diff --git a/wcte12xp/GpakHpi.h b/kernel/wcte12xp/GpakHpi.h
index 790bb3c..790bb3c 100644
--- a/wcte12xp/GpakHpi.h
+++ b/kernel/wcte12xp/GpakHpi.h
diff --git a/wcte12xp/Kbuild b/kernel/wcte12xp/Kbuild
index 14d7494..b145e6a 100644
--- a/wcte12xp/Kbuild
+++ b/kernel/wcte12xp/Kbuild
@@ -1,5 +1,7 @@
 obj-m += wcte12xp.o
 
+FIRM_DIR	:= ../../firmware
+
 EXTRA_CFLAGS := -I$(src)/.. -Wno-undef
 
 ifeq ($(HOTPLUG_FIRMWARE),yes)
@@ -9,11 +11,11 @@ endif
 wcte12xp-objs := base.o vpmadt032.o GpakApi.o
 
 ifneq ($(HOTPLUG_FIRMWARE),yes)
-wcte12xp-objs += ../firmware/zaptel-fw-vpmadt032.o
+wcte12xp-objs += $(FIRM_DIR)/zaptel-fw-vpmadt032.o
 endif
 
-$(obj)/../firmware/zaptel-fw-vpmadt032.o: $(obj)/base.o
-	$(MAKE) -C $(obj)/../firmware zaptel-fw-vpmadt032.o
+$(obj)/$(FIRM_DIR)/zaptel-fw-vpmadt032.o: $(obj)/base.o
+	$(MAKE) -C $(obj)/$(FIRM_DIR) zaptel-fw-vpmadt032.o
 
 $(obj)/base.o: $(src)/vpmadt032.h $(src)/wcte12xp.h
 $(obj)/base.o: $(src)/../zaptel.h
diff --git a/wcte12xp/Makefile b/kernel/wcte12xp/Makefile
index fb0fbc5..fb0fbc5 100644
--- a/wcte12xp/Makefile
+++ b/kernel/wcte12xp/Makefile
diff --git a/wcte12xp/base.c b/kernel/wcte12xp/base.c
index 5dd83db..5dd83db 100644
--- a/wcte12xp/base.c
+++ b/kernel/wcte12xp/base.c
diff --git a/wcte12xp/gpakenum.h b/kernel/wcte12xp/gpakenum.h
index ed14a1a..ed14a1a 100644
--- a/wcte12xp/gpakenum.h
+++ b/kernel/wcte12xp/gpakenum.h
diff --git a/wcte12xp/vpmadt032.c b/kernel/wcte12xp/vpmadt032.c
index 89fd372..89fd372 100644
--- a/wcte12xp/vpmadt032.c
+++ b/kernel/wcte12xp/vpmadt032.c
diff --git a/wcte12xp/vpmadt032.h b/kernel/wcte12xp/vpmadt032.h
index e103e05..e103e05 100644
--- a/wcte12xp/vpmadt032.h
+++ b/kernel/wcte12xp/vpmadt032.h
diff --git a/wcte12xp/wcte12xp.h b/kernel/wcte12xp/wcte12xp.h
index 20e0558..20e0558 100644
--- a/wcte12xp/wcte12xp.h
+++ b/kernel/wcte12xp/wcte12xp.h
diff --git a/wcusb.c b/kernel/wcusb.c
index 615d4c0..615d4c0 100644
--- a/wcusb.c
+++ b/kernel/wcusb.c
diff --git a/wcusb.h b/kernel/wcusb.h
index f22d0ac..f22d0ac 100644
--- a/wcusb.h
+++ b/kernel/wcusb.h
diff --git a/xpp/.version b/kernel/xpp/.version
index d658f52..d658f52 100644
--- a/xpp/.version
+++ b/kernel/xpp/.version
diff --git a/xpp/Changelog_xpp b/kernel/xpp/Changelog_xpp
index 31684e0..31684e0 100644
--- a/xpp/Changelog_xpp
+++ b/kernel/xpp/Changelog_xpp
diff --git a/xpp/Kbuild b/kernel/xpp/Kbuild
index 9ec225f..9ec225f 100644
--- a/xpp/Kbuild
+++ b/kernel/xpp/Kbuild
diff --git a/xpp/Makefile b/kernel/xpp/Makefile
index 00fc5ee..00fc5ee 100644
--- a/xpp/Makefile
+++ b/kernel/xpp/Makefile
diff --git a/xpp/README.Astribank b/kernel/xpp/README.Astribank
index 342c6a9..342c6a9 100644
--- a/xpp/README.Astribank
+++ b/kernel/xpp/README.Astribank
diff --git a/xpp/calibrate_slics b/kernel/xpp/calibrate_slics
index c1e6064..c1e6064 100755
--- a/xpp/calibrate_slics
+++ b/kernel/xpp/calibrate_slics
diff --git a/xpp/card_bri.c b/kernel/xpp/card_bri.c
index 998d22a..998d22a 100644
--- a/xpp/card_bri.c
+++ b/kernel/xpp/card_bri.c
diff --git a/xpp/card_bri.h b/kernel/xpp/card_bri.h
index a7b69de..a7b69de 100644
--- a/xpp/card_bri.h
+++ b/kernel/xpp/card_bri.h
diff --git a/xpp/card_fxo.c b/kernel/xpp/card_fxo.c
index cbe953b..cbe953b 100644
--- a/xpp/card_fxo.c
+++ b/kernel/xpp/card_fxo.c
diff --git a/xpp/card_fxo.h b/kernel/xpp/card_fxo.h
index 4d0bd25..4d0bd25 100644
--- a/xpp/card_fxo.h
+++ b/kernel/xpp/card_fxo.h
diff --git a/xpp/card_fxs.c b/kernel/xpp/card_fxs.c
index f2251e0..f2251e0 100644
--- a/xpp/card_fxs.c
+++ b/kernel/xpp/card_fxs.c
diff --git a/xpp/card_fxs.h b/kernel/xpp/card_fxs.h
index 6a89228..6a89228 100644
--- a/xpp/card_fxs.h
+++ b/kernel/xpp/card_fxs.h
diff --git a/xpp/card_global.c b/kernel/xpp/card_global.c
index 05f4008..05f4008 100644
--- a/xpp/card_global.c
+++ b/kernel/xpp/card_global.c
diff --git a/xpp/card_global.h b/kernel/xpp/card_global.h
index 250f4f4..250f4f4 100644
--- a/xpp/card_global.h
+++ b/kernel/xpp/card_global.h
diff --git a/xpp/card_pri.c b/kernel/xpp/card_pri.c
index e055953..e055953 100644
--- a/xpp/card_pri.c
+++ b/kernel/xpp/card_pri.c
diff --git a/xpp/card_pri.h b/kernel/xpp/card_pri.h
index dbe83c0..dbe83c0 100644
--- a/xpp/card_pri.h
+++ b/kernel/xpp/card_pri.h
diff --git a/xpp/firmwares/FPGA_1141.hex b/kernel/xpp/firmwares/FPGA_1141.hex
index 512df60..512df60 100644
--- a/xpp/firmwares/FPGA_1141.hex
+++ b/kernel/xpp/firmwares/FPGA_1141.hex
diff --git a/xpp/firmwares/FPGA_1151.hex b/kernel/xpp/firmwares/FPGA_1151.hex
index 5ecab69..5ecab69 100644
--- a/xpp/firmwares/FPGA_1151.hex
+++ b/kernel/xpp/firmwares/FPGA_1151.hex
diff --git a/xpp/firmwares/FPGA_FXS.hex b/kernel/xpp/firmwares/FPGA_FXS.hex
index 1321a53..1321a53 100644
--- a/xpp/firmwares/FPGA_FXS.hex
+++ b/kernel/xpp/firmwares/FPGA_FXS.hex
diff --git a/xpp/firmwares/LICENSE.firmware b/kernel/xpp/firmwares/LICENSE.firmware
index b9bb89f..b9bb89f 100644
--- a/xpp/firmwares/LICENSE.firmware
+++ b/kernel/xpp/firmwares/LICENSE.firmware
diff --git a/xpp/firmwares/README b/kernel/xpp/firmwares/README
index e423aa6..e423aa6 100644
--- a/xpp/firmwares/README
+++ b/kernel/xpp/firmwares/README
diff --git a/xpp/firmwares/USB_FW.hex b/kernel/xpp/firmwares/USB_FW.hex
index 01f7ce9..01f7ce9 100644
--- a/xpp/firmwares/USB_FW.hex
+++ b/kernel/xpp/firmwares/USB_FW.hex
diff --git a/xpp/init_card_3_29 b/kernel/xpp/init_card_3_29
index 43dbb54..43dbb54 100755
--- a/xpp/init_card_3_29
+++ b/kernel/xpp/init_card_3_29
diff --git a/xpp/init_card_4_29 b/kernel/xpp/init_card_4_29
index 5dda0b2..5dda0b2 100755
--- a/xpp/init_card_4_29
+++ b/kernel/xpp/init_card_4_29
diff --git a/xpp/init_card_6_29 b/kernel/xpp/init_card_6_29
index 0da1f61..0da1f61 100755
--- a/xpp/init_card_6_29
+++ b/kernel/xpp/init_card_6_29
diff --git a/xpp/init_card_7_29 b/kernel/xpp/init_card_7_29
index 255d50e..255d50e 100755
--- a/xpp/init_card_7_29
+++ b/kernel/xpp/init_card_7_29
diff --git a/xpp/init_card_9_29 b/kernel/xpp/init_card_9_29
index dd3b0a5..dd3b0a5 100755
--- a/xpp/init_card_9_29
+++ b/kernel/xpp/init_card_9_29
diff --git a/xpp/param_doc b/kernel/xpp/param_doc
index 5848728..5848728 100755
--- a/xpp/param_doc
+++ b/kernel/xpp/param_doc
diff --git a/xpp/parport_debug.c b/kernel/xpp/parport_debug.c
index 93049ef..93049ef 100644
--- a/xpp/parport_debug.c
+++ b/kernel/xpp/parport_debug.c
diff --git a/xpp/parport_debug.h b/kernel/xpp/parport_debug.h
index 138af99..138af99 100644
--- a/xpp/parport_debug.h
+++ b/kernel/xpp/parport_debug.h
diff --git a/xpp/utils/Makefile b/kernel/xpp/utils/Makefile
index 437b359..437b359 100644
--- a/xpp/utils/Makefile
+++ b/kernel/xpp/utils/Makefile
diff --git a/xpp/utils/astribank_hook b/kernel/xpp/utils/astribank_hook
index 351cd93..351cd93 100755
--- a/xpp/utils/astribank_hook
+++ b/kernel/xpp/utils/astribank_hook
diff --git a/xpp/utils/example_default_zaptel b/kernel/xpp/utils/example_default_zaptel
index f60b651..f60b651 100644
--- a/xpp/utils/example_default_zaptel
+++ b/kernel/xpp/utils/example_default_zaptel
diff --git a/xpp/utils/fpga_load.8 b/kernel/xpp/utils/fpga_load.8
index 412a839..412a839 100644
--- a/xpp/utils/fpga_load.8
+++ b/kernel/xpp/utils/fpga_load.8
diff --git a/xpp/utils/fpga_load.c b/kernel/xpp/utils/fpga_load.c
index 3d6bdbe..3d6bdbe 100644
--- a/xpp/utils/fpga_load.c
+++ b/kernel/xpp/utils/fpga_load.c
diff --git a/xpp/utils/genzaptelconf b/kernel/xpp/utils/genzaptelconf
index 1435e9f..1435e9f 100755
--- a/xpp/utils/genzaptelconf
+++ b/kernel/xpp/utils/genzaptelconf
diff --git a/xpp/utils/genzaptelconf.8 b/kernel/xpp/utils/genzaptelconf.8
index c3f6f73..c3f6f73 100644
--- a/xpp/utils/genzaptelconf.8
+++ b/kernel/xpp/utils/genzaptelconf.8
diff --git a/xpp/utils/hexfile.c b/kernel/xpp/utils/hexfile.c
index 2a01b3f..2a01b3f 100644
--- a/xpp/utils/hexfile.c
+++ b/kernel/xpp/utils/hexfile.c
diff --git a/xpp/utils/hexfile.h b/kernel/xpp/utils/hexfile.h
index f8bf6a9..f8bf6a9 100644
--- a/xpp/utils/hexfile.h
+++ b/kernel/xpp/utils/hexfile.h
diff --git a/xpp/utils/lszaptel b/kernel/xpp/utils/lszaptel
index a836d98..a836d98 100755
--- a/xpp/utils/lszaptel
+++ b/kernel/xpp/utils/lszaptel
diff --git a/xpp/utils/print_modes.c b/kernel/xpp/utils/print_modes.c
index 6312bd1..6312bd1 100644
--- a/xpp/utils/print_modes.c
+++ b/kernel/xpp/utils/print_modes.c
diff --git a/xpp/utils/test_parse.c b/kernel/xpp/utils/test_parse.c
index 8ac2023..8ac2023 100644
--- a/xpp/utils/test_parse.c
+++ b/kernel/xpp/utils/test_parse.c
diff --git a/xpp/utils/xpp.rules b/kernel/xpp/utils/xpp.rules
index 794a9f0..794a9f0 100644
--- a/xpp/utils/xpp.rules
+++ b/kernel/xpp/utils/xpp.rules
diff --git a/xpp/utils/xpp_blink b/kernel/xpp/utils/xpp_blink
index 8a96502..8a96502 100755
--- a/xpp/utils/xpp_blink
+++ b/kernel/xpp/utils/xpp_blink
diff --git a/xpp/utils/xpp_fxloader b/kernel/xpp/utils/xpp_fxloader
index dbe5b98..dbe5b98 100644
--- a/xpp/utils/xpp_fxloader
+++ b/kernel/xpp/utils/xpp_fxloader
diff --git a/xpp/utils/xpp_fxloader.usermap b/kernel/xpp/utils/xpp_fxloader.usermap
index 8c14b72..8c14b72 100644
--- a/xpp/utils/xpp_fxloader.usermap
+++ b/kernel/xpp/utils/xpp_fxloader.usermap
diff --git a/xpp/utils/xpp_modprobe b/kernel/xpp/utils/xpp_modprobe
index 76c1f7d..76c1f7d 100644
--- a/xpp/utils/xpp_modprobe
+++ b/kernel/xpp/utils/xpp_modprobe
diff --git a/xpp/utils/xpp_sync b/kernel/xpp/utils/xpp_sync
index 1438f50..1438f50 100755
--- a/xpp/utils/xpp_sync
+++ b/kernel/xpp/utils/xpp_sync
diff --git a/xpp/utils/zapconf b/kernel/xpp/utils/zapconf
index dd6ab1f..dd6ab1f 100755
--- a/xpp/utils/zapconf
+++ b/kernel/xpp/utils/zapconf
diff --git a/xpp/utils/zaptel-helper b/kernel/xpp/utils/zaptel-helper
index 1b2ca45..1b2ca45 100644
--- a/xpp/utils/zaptel-helper
+++ b/kernel/xpp/utils/zaptel-helper
diff --git a/xpp/utils/zaptel_drivers b/kernel/xpp/utils/zaptel_drivers
index d7904c0..d7904c0 100755
--- a/xpp/utils/zaptel_drivers
+++ b/kernel/xpp/utils/zaptel_drivers
diff --git a/xpp/utils/zaptel_hardware b/kernel/xpp/utils/zaptel_hardware
index 004a44b..004a44b 100755
--- a/xpp/utils/zaptel_hardware
+++ b/kernel/xpp/utils/zaptel_hardware
diff --git a/xpp/utils/zconf/Zaptel.pm b/kernel/xpp/utils/zconf/Zaptel.pm
index a7e7d6c..a7e7d6c 100644
--- a/xpp/utils/zconf/Zaptel.pm
+++ b/kernel/xpp/utils/zconf/Zaptel.pm
diff --git a/xpp/utils/zconf/Zaptel/Chans.pm b/kernel/xpp/utils/zconf/Zaptel/Chans.pm
index b02bf24..b02bf24 100644
--- a/xpp/utils/zconf/Zaptel/Chans.pm
+++ b/kernel/xpp/utils/zconf/Zaptel/Chans.pm
diff --git a/xpp/utils/zconf/Zaptel/Config/Defaults.pm b/kernel/xpp/utils/zconf/Zaptel/Config/Defaults.pm
index 360ca0a..1d11403 100644
--- a/xpp/utils/zconf/Zaptel/Config/Defaults.pm
+++ b/kernel/xpp/utils/zconf/Zaptel/Config/Defaults.pm
@@ -46,9 +46,7 @@ sub source_vars {
 			}
 		}
 	}
-	if (! $default_file) {
-		return ("", ());
-	}
+	die "No default_file" unless $default_file;
 	my %vars = Zaptel::Config::Defaults::do_source($default_file, @vars);
 	return ($default_file, %vars);
 }
diff --git a/xpp/utils/zconf/Zaptel/Hardware.pm b/kernel/xpp/utils/zconf/Zaptel/Hardware.pm
index 5af22f7..5af22f7 100644
--- a/xpp/utils/zconf/Zaptel/Hardware.pm
+++ b/kernel/xpp/utils/zconf/Zaptel/Hardware.pm
diff --git a/xpp/utils/zconf/Zaptel/Hardware/PCI.pm b/kernel/xpp/utils/zconf/Zaptel/Hardware/PCI.pm
index 45173d4..45173d4 100644
--- a/xpp/utils/zconf/Zaptel/Hardware/PCI.pm
+++ b/kernel/xpp/utils/zconf/Zaptel/Hardware/PCI.pm
diff --git a/xpp/utils/zconf/Zaptel/Hardware/USB.pm b/kernel/xpp/utils/zconf/Zaptel/Hardware/USB.pm
index a2dc08f..a2dc08f 100644
--- a/xpp/utils/zconf/Zaptel/Hardware/USB.pm
+++ b/kernel/xpp/utils/zconf/Zaptel/Hardware/USB.pm
diff --git a/xpp/utils/zconf/Zaptel/Span.pm b/kernel/xpp/utils/zconf/Zaptel/Span.pm
index 380dc7f..380dc7f 100644
--- a/xpp/utils/zconf/Zaptel/Span.pm
+++ b/kernel/xpp/utils/zconf/Zaptel/Span.pm
diff --git a/xpp/utils/zconf/Zaptel/Utils.pm b/kernel/xpp/utils/zconf/Zaptel/Utils.pm
index 8d13ad7..8d13ad7 100644
--- a/xpp/utils/zconf/Zaptel/Utils.pm
+++ b/kernel/xpp/utils/zconf/Zaptel/Utils.pm
diff --git a/xpp/utils/zconf/Zaptel/Xpp.pm b/kernel/xpp/utils/zconf/Zaptel/Xpp.pm
index 8a2a6eb..8a2a6eb 100644
--- a/xpp/utils/zconf/Zaptel/Xpp.pm
+++ b/kernel/xpp/utils/zconf/Zaptel/Xpp.pm
diff --git a/xpp/utils/zconf/Zaptel/Xpp/Line.pm b/kernel/xpp/utils/zconf/Zaptel/Xpp/Line.pm
index e3e04f0..e3e04f0 100644
--- a/xpp/utils/zconf/Zaptel/Xpp/Line.pm
+++ b/kernel/xpp/utils/zconf/Zaptel/Xpp/Line.pm
diff --git a/xpp/utils/zconf/Zaptel/Xpp/Xbus.pm b/kernel/xpp/utils/zconf/Zaptel/Xpp/Xbus.pm
index a5fcf1e..a5fcf1e 100644
--- a/xpp/utils/zconf/Zaptel/Xpp/Xbus.pm
+++ b/kernel/xpp/utils/zconf/Zaptel/Xpp/Xbus.pm
diff --git a/xpp/utils/zconf/Zaptel/Xpp/Xpd.pm b/kernel/xpp/utils/zconf/Zaptel/Xpp/Xpd.pm
index 326aafd..326aafd 100644
--- a/xpp/utils/zconf/Zaptel/Xpp/Xpd.pm
+++ b/kernel/xpp/utils/zconf/Zaptel/Xpp/Xpd.pm
diff --git a/xpp/utils/zt_registration b/kernel/xpp/utils/zt_registration
index 3bdc642..3bdc642 100755
--- a/xpp/utils/zt_registration
+++ b/kernel/xpp/utils/zt_registration
diff --git a/xpp/xbus-core.c b/kernel/xpp/xbus-core.c
index 790c12a..790c12a 100644
--- a/xpp/xbus-core.c
+++ b/kernel/xpp/xbus-core.c
diff --git a/xpp/xbus-core.h b/kernel/xpp/xbus-core.h
index de6e859..de6e859 100644
--- a/xpp/xbus-core.h
+++ b/kernel/xpp/xbus-core.h
diff --git a/xpp/xbus-pcm.c b/kernel/xpp/xbus-pcm.c
index 0b1e5d1..0b1e5d1 100644
--- a/xpp/xbus-pcm.c
+++ b/kernel/xpp/xbus-pcm.c
diff --git a/xpp/xbus-pcm.h b/kernel/xpp/xbus-pcm.h
index 79d0078..79d0078 100644
--- a/xpp/xbus-pcm.h
+++ b/kernel/xpp/xbus-pcm.h
diff --git a/xpp/xbus-sysfs.c b/kernel/xpp/xbus-sysfs.c
index d45058e..d45058e 100644
--- a/xpp/xbus-sysfs.c
+++ b/kernel/xpp/xbus-sysfs.c
diff --git a/xpp/xdefs.h b/kernel/xpp/xdefs.h
index 2aec497..2aec497 100644
--- a/xpp/xdefs.h
+++ b/kernel/xpp/xdefs.h
diff --git a/xpp/xframe_queue.c b/kernel/xpp/xframe_queue.c
index 23dee0e..23dee0e 100644
--- a/xpp/xframe_queue.c
+++ b/kernel/xpp/xframe_queue.c
diff --git a/xpp/xframe_queue.h b/kernel/xpp/xframe_queue.h
index 5612d65..5612d65 100644
--- a/xpp/xframe_queue.h
+++ b/kernel/xpp/xframe_queue.h
diff --git a/xpp/xpd.h b/kernel/xpp/xpd.h
index 3187227..3187227 100644
--- a/xpp/xpd.h
+++ b/kernel/xpp/xpd.h
diff --git a/xpp/xpp_log.h b/kernel/xpp/xpp_log.h
index 322b7f0..322b7f0 100644
--- a/xpp/xpp_log.h
+++ b/kernel/xpp/xpp_log.h
diff --git a/xpp/xpp_usb.c b/kernel/xpp/xpp_usb.c
index 785e713..785e713 100644
--- a/xpp/xpp_usb.c
+++ b/kernel/xpp/xpp_usb.c
diff --git a/xpp/xpp_zap.c b/kernel/xpp/xpp_zap.c
index edaedf9..edaedf9 100644
--- a/xpp/xpp_zap.c
+++ b/kernel/xpp/xpp_zap.c
diff --git a/xpp/xpp_zap.h b/kernel/xpp/xpp_zap.h
index fee20c5..fee20c5 100644
--- a/xpp/xpp_zap.h
+++ b/kernel/xpp/xpp_zap.h
diff --git a/xpp/xproto.c b/kernel/xpp/xproto.c
index d55949e..d55949e 100644
--- a/xpp/xproto.c
+++ b/kernel/xpp/xproto.c
diff --git a/xpp/xproto.h b/kernel/xpp/xproto.h
index f68fedf..f68fedf 100644
--- a/xpp/xproto.h
+++ b/kernel/xpp/xproto.h
diff --git a/xpp/zap_debug.c b/kernel/xpp/zap_debug.c
index bf54e62..bf54e62 100644
--- a/xpp/zap_debug.c
+++ b/kernel/xpp/zap_debug.c
diff --git a/xpp/zap_debug.h b/kernel/xpp/zap_debug.h
index fb1ecc3..fb1ecc3 100644
--- a/xpp/zap_debug.h
+++ b/kernel/xpp/zap_debug.h
diff --git a/zaptel-base.c b/kernel/zaptel-base.c
index 45b08f2..7203645 100644
--- a/zaptel-base.c
+++ b/kernel/zaptel-base.c
@@ -36,7 +36,7 @@
 
 
 #include "zconfig.h"
-#include "version.h"
+#include "../version.h"
 
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -153,7 +153,6 @@ static struct proc_dir_entry *proc_entries[ZT_MAX_SPANS];
 
 /* Here are a couple important little additions for devfs */
 #ifdef CONFIG_DEVFS_FS
-#define ZT_DEVFS_MODE (S_IFCHR|S_IRUGO|S_IWUGO)
 static devfs_handle_t zaptel_devfs_dir;
 static devfs_handle_t channel;
 static devfs_handle_t pseudo;
@@ -4364,17 +4363,8 @@ static int ioctl_echocancel(struct zt_chan *chan, struct zt_echocanparams *ecp,
 		chan->echolastupdate = 0;
 		chan->echotimer = 0;
 		spin_unlock_irqrestore(&chan->lock, flags);
-
-		/* Make sure this is zero if we're disabling echo can */
-		ecp->param_count = 0;
-
-		if (chan->span) {
-			if (chan->span->echocan_with_params)
-				chan->span->echocan_with_params(chan, ecp, NULL);
-			else if (chan->span->echocan)
-				chan->span->echocan(chan, 0);
-		}
-		
+		if (chan->span && chan->span->echocan)
+			chan->span->echocan(chan, 0);
 		if (tec)
 			echo_can_free(tec);
 
@@ -7346,7 +7336,7 @@ int zt_register_chardev(struct zt_chardev *dev)
 #endif /* CONFIG_ZAP_UDEV */
 	
 #ifdef CONFIG_DEVFS_FS
-	dev->devfs_handle = devfs_register(zaptel_devfs_dir, dev->name, DEVFS_FL_DEFAULT, ZT_MAJOR, dev->minor, ZT_DEVFS_MODE, &zt_fops, NULL);
+	dev->devfs_handle = devfs_register(zaptel_devfs_dir, dev->name, DEVFS_FL_DEFAULT, ZT_MAJOR, dev->minor, mode, &zt_fops, NULL);
 #endif /* CONFIG_DEVFS_FS */
 
 	return 0;
@@ -7382,13 +7372,15 @@ static int __init zt_init(void) {
 
 #ifdef CONFIG_DEVFS_FS
 	{
+		umode_t mode = S_IFCHR|S_IRUGO|S_IWUGO;
+
 		devfs_register_chrdev(ZT_MAJOR, "zaptel", &zt_fops);
 		if (!(zaptel_devfs_dir = devfs_mk_dir(NULL, "zap", NULL)))
 			return -EBUSY; /* This would be bad */
-		timer = devfs_register(zaptel_devfs_dir, "timer", DEVFS_FL_DEFAULT, ZT_MAJOR, 253, ZT_DEVFS_MODE, &zt_fops, NULL);
-		channel = devfs_register(zaptel_devfs_dir, "channel", DEVFS_FL_DEFAULT, ZT_MAJOR, 254, ZT_DEVFS_MODE, &zt_fops, NULL);
-		pseudo = devfs_register(zaptel_devfs_dir, "pseudo", DEVFS_FL_DEFAULT, ZT_MAJOR, 255, ZT_DEVFS_MODE, &zt_fops, NULL);
-		ctl = devfs_register(zaptel_devfs_dir, "ctl", DEVFS_FL_DEFAULT, ZT_MAJOR, 0, ZT_DEVFS_MODE, &zt_fops, NULL);
+		timer = devfs_register(zaptel_devfs_dir, "timer", DEVFS_FL_DEFAULT, ZT_MAJOR, 253, mode, &zt_fops, NULL);
+		channel = devfs_register(zaptel_devfs_dir, "channel", DEVFS_FL_DEFAULT, ZT_MAJOR, 254, mode, &zt_fops, NULL);
+		pseudo = devfs_register(zaptel_devfs_dir, "pseudo", DEVFS_FL_DEFAULT, ZT_MAJOR, 255, mode, &zt_fops, NULL);
+		ctl = devfs_register(zaptel_devfs_dir, "ctl", DEVFS_FL_DEFAULT, ZT_MAJOR, 0, mode, &zt_fops, NULL);
 	}
 #else
 	if ((res = register_chrdev(ZT_MAJOR, "zaptel", &zt_fops))) {
diff --git a/zaptel.h b/kernel/zaptel.h
index f1d9b0c..53bebf3 100644
--- a/zaptel.h
+++ b/kernel/zaptel.h
@@ -1203,7 +1203,7 @@ struct zt_chardev {
 	const char *name;
 	__u8 minor;
 #ifdef CONFIG_DEVFS_FS
-	devfs_handle_t devfs_handle;
+	static devfs_handle_t devfs_handle;
 #endif
 };
 
diff --git a/zconfig.h b/kernel/zconfig.h
index 35056e3..35056e3 100644
--- a/zconfig.h
+++ b/kernel/zconfig.h
diff --git a/ztd-eth.c b/kernel/ztd-eth.c
index 97d3492..97d3492 100644
--- a/ztd-eth.c
+++ b/kernel/ztd-eth.c
diff --git a/ztd-loc.c b/kernel/ztd-loc.c
index 6486a2a..6486a2a 100644
--- a/ztd-loc.c
+++ b/kernel/ztd-loc.c
diff --git a/ztdummy.c b/kernel/ztdummy.c
index 5cedaa3..5cedaa3 100644
--- a/ztdummy.c
+++ b/kernel/ztdummy.c
diff --git a/ztdummy.h b/kernel/ztdummy.h
index 25e37c9..25e37c9 100644
--- a/ztdummy.h
+++ b/kernel/ztdummy.h
diff --git a/ztdynamic.c b/kernel/ztdynamic.c
index 01b22e2..01b22e2 100644
--- a/ztdynamic.c
+++ b/kernel/ztdynamic.c
diff --git a/zttranscode.c b/kernel/zttranscode.c
index ca2cdd8..ca2cdd8 100644
--- a/zttranscode.c
+++ b/kernel/zttranscode.c
diff --git a/patgen.c b/patgen.c
index a740f39..34f455a 100644
--- a/patgen.c
+++ b/patgen.c
@@ -11,7 +11,7 @@
 #include "bittest.h"
 
 #ifdef STANDALONE_ZAPATA
-#include "zaptel.h"
+#include "kernel/zaptel.h"
 #else
 #include <zaptel/zaptel.h>
 #endif
diff --git a/patlooptest.c b/patlooptest.c
index d848ccf..738da63 100644
--- a/patlooptest.c
+++ b/patlooptest.c
@@ -9,7 +9,7 @@
 #include <time.h>
 
 #ifdef STANDALONE_ZAPATA
-#include "zaptel.h"
+#include "kernel/zaptel.h"
 #else
 #include <zaptel/zaptel.h>
 #endif
diff --git a/pattest.c b/pattest.c
index d7b6fca..69c3b6e 100644
--- a/pattest.c
+++ b/pattest.c
@@ -11,7 +11,7 @@
 #include "bittest.h"
 
 #ifdef STANDALONE_ZAPATA
-#include "zaptel.h"
+#include "kernel/zaptel.h"
 #else
 #include <zaptel/zaptel.h>
 #endif
diff --git a/timertest.c b/timertest.c
index 10d9d66..3a0c2e4 100644
--- a/timertest.c
+++ b/timertest.c
@@ -9,7 +9,7 @@
 #include <errno.h>
 
 #ifdef STANDALONE_ZAPATA
-#include "zaptel.h"
+#include "kernel/zaptel.h"
 #else
 #include <zaptel/zaptel.h>
 #endif
diff --git a/tonezone.h b/tonezone.h
index fba3e91..f59940e 100644
--- a/tonezone.h
+++ b/tonezone.h
@@ -25,7 +25,7 @@
 #define _TONEZONE_H
 
 #ifdef STANDALONE_ZAPATA
-#include "zaptel.h"
+#include "kernel/zaptel.h"
 #else
 #include <zaptel/zaptel.h>
 #endif
diff --git a/torisatool.c b/torisatool.c
index 5334289..d8ab428 100644
--- a/torisatool.c
+++ b/torisatool.c
@@ -28,7 +28,7 @@
 #include <sys/ioctl.h>
 #include <string.h>
 #include <errno.h>
-#include "zaptel.h"
+#include "kernel/zaptel.h"
 
 static void usage(void)
 {
diff --git a/ztcfg-dude.c b/ztcfg-dude.c
index f1027f4..8f655ee 100644
--- a/ztcfg-dude.c
+++ b/ztcfg-dude.c
@@ -39,7 +39,7 @@
 #include <errno.h>
 #include <math.h>
 #ifdef STANDALONE_ZAPATA
-#include "zaptel.h"
+#include "kernel/zaptel.h"
 #include "tonezone.h"
 #else
 #include <zaptel/zaptel.h>
diff --git a/ztcfg.c b/ztcfg.c
index 2d94be3..99c4df3 100644
--- a/ztcfg.c
+++ b/ztcfg.c
@@ -38,7 +38,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #ifdef STANDALONE_ZAPATA
-#include "zaptel.h"
+#include "kernel/zaptel.h"
 #include "tonezone.h"
 #else
 #include <zaptel/zaptel.h>
diff --git a/ztdiag.c b/ztdiag.c
index 1472760..50900a8 100644
--- a/ztdiag.c
+++ b/ztdiag.c
@@ -5,7 +5,7 @@
 #include <unistd.h>
 
 #ifdef STANDALONE_ZAPATA
-#include "zaptel.h"
+#include "kernel/zaptel.h"
 #else
 #include <zaptel/zaptel.h>
 #endif
diff --git a/ztmonitor.c b/ztmonitor.c
index 707a705..13f355d 100644
--- a/ztmonitor.c
+++ b/ztmonitor.c
@@ -39,7 +39,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #ifdef STANDALONE_ZAPATA
-#include "zaptel.h"
+#include "kernel/zaptel.h"
 #include "tonezone.h"
 #else
 #include <zaptel/zaptel.h>
diff --git a/ztscan.c b/ztscan.c
index 05bd012..87be973 100644
--- a/ztscan.c
+++ b/ztscan.c
@@ -35,7 +35,7 @@
 #include <errno.h>
 
 #ifdef STANDALONE_ZAPATA
-#include "zaptel.h"
+#include "kernel/zaptel.h"
 #else
 #include <zaptel/zaptel.h>
 #endif
diff --git a/zttool.c b/zttool.c
index 2428883..c1e97bc 100644
--- a/zttool.c
+++ b/zttool.c
@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <newt.h>
 #ifdef STANDALONE_ZAPATA
-#include "zaptel.h"
+#include "kernel/zaptel.h"
 #include "tonezone.h"
 #else
 #include <zaptel/zaptel.h>