From 860c46060672ec32918b3ea305c2d3a795bb6ae7 Mon Sep 17 00:00:00 2001 From: kpfleming Date: Fri, 25 Jan 2008 23:59:37 +0000 Subject: get this branch to build against 2.6.24 kernel build system (similar to r3706 from tzafrir for branch-1.4) git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@3741 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- Kbuild | 42 ++++++++++++++++++++++++++++++++++++++++++ Makefile | 8 +++++--- Makefile.kernel26 | 42 ------------------------------------------ pciradio.c | 9 ++------- tor2.c | 6 +----- torisa.c | 10 +++------- wcfxo.c | 7 ++----- wct1xxp.c | 7 ++----- wct4xxp/Kbuild | 27 +++++++++++++++++++++++++++ wct4xxp/Makefile | 5 ++++- wct4xxp/Makefile.kernel26 | 23 ----------------------- wct4xxp/base.c | 7 ++----- wct4xxp/vpm450m.h | 7 ------- wctc4xxp/Kbuild | 19 +++++++++++++++++++ wctc4xxp/Makefile | 9 ++++----- wctc4xxp/Makefile.kernel26 | 15 --------------- wctc4xxp/base.c | 6 +----- wctdm.c | 4 ---- wctdm24xxp/Kbuild | 24 ++++++++++++++++++++++++ wctdm24xxp/Makefile | 26 ++++---------------------- wctdm24xxp/Makefile.kernel26 | 20 -------------------- wcte11xp.c | 7 ++----- wcte12xp/Kbuild | 23 +++++++++++++++++++++++ wcte12xp/Makefile | 26 ++++---------------------- wcte12xp/Makefile.kernel26 | 19 ------------------- wcusb.c | 5 ----- zaptel-base.c | 4 ---- ztd-eth.c | 5 +---- ztd-loc.c | 5 +---- ztdummy.c | 8 +++----- ztdynamic.c | 7 ++----- zttranscode.c | 7 ++----- 32 files changed, 180 insertions(+), 259 deletions(-) create mode 100644 Kbuild delete mode 100644 Makefile.kernel26 create mode 100644 wct4xxp/Kbuild delete mode 100644 wct4xxp/Makefile.kernel26 create mode 100644 wctc4xxp/Kbuild delete mode 100644 wctc4xxp/Makefile.kernel26 create mode 100644 wctdm24xxp/Kbuild delete mode 100644 wctdm24xxp/Makefile.kernel26 create mode 100644 wcte12xp/Kbuild delete mode 100644 wcte12xp/Makefile.kernel26 diff --git a/Kbuild b/Kbuild new file mode 100644 index 0000000..c00cba7 --- /dev/null +++ b/Kbuild @@ -0,0 +1,42 @@ +obj-m := $(MODULESO) +obj-m += wct4xxp/ wctc4xxp/ wcte12xp/ wctdm24xxp/ + +# Also build xpp in the subdirectory xpp/ . But only for >=2.6.8 and only +# for i386 or x86_64. On other platforms it has still not been tested well +# enough. +ifneq (,$(shell [ 0$(SUBLEVEL) -ge 8 ] && echo 1)) +ifeq ($(ARCH),i386) +obj-m+=xpp/ +endif +ifeq ($(ARCH),x86_64) +obj-m+=xpp/ +endif +endif + +ifdef ECHO_CAN_NAME + ECHO_CAN_CFLAGS := -DECHO_CAN_FROMENV -DECHO_CAN_$(ECHO_CAN_NAME) +endif + +EXTRA_CFLAGS := -I$(src) +EXTRA_CFLAGS += $(ECHO_CAN_CFLAGS) + +# fix typo present in CentOS and RHEL 2.6.9 kernels +BAD_KERNELS_VERS := 22 34 34.0.1 34.0.2 +BAD_KERNELS := $(foreach ver,$(BAD_KERNELS_VERS),2.6.9-$(ver).EL 2.6.9-$(ver).ELsmp) +ifneq (,$(filter $(KVERS),$(BAD_KERNELS))) +EXTRA_CFLAGS+=-Drw_lock_t=rwlock_t +endif + +zaptel-objs := zaptel-base.o + +ifeq ($(HPEC_PRESENT),yes) +ifeq ($(ARCH),i386) +zaptel-objs += hpec/hpec_x86_32.o +endif + +ifeq ($(ARCH),x86_64) +zaptel-objs += hpec/hpec_x86_64.o +endif + +EXTRA_CFLAGS += -DECHO_CAN_HPEC -I$(src)/hpec +endif diff --git a/Makefile b/Makefile index e93caf5..2ef3c2c 100644 --- a/Makefile +++ b/Makefile @@ -78,7 +78,10 @@ MODULESO+=$(SUBDIRS_EXTRA:%=%/) endif # add this later, so it doesn't become part of MODULESO/MODULESKO -MODULES+=wct4xxp wctc4xxp wcte12xp wctdm24xxp +MODULES+=wct4xxp +ifeq ($(BUILDVER),linux26) +MODULES+=wctc4xxp wcte12xp wctdm24xxp +endif ifeq ($(ARCH),i386) ifneq ($(wildcard $(PWD)/hpec/hpec_x86_32.o_shipped),) @@ -221,7 +224,7 @@ utils: $(BINS) libs: $(LIBTONEZONE_SO) ifeq ($(BUILDVER),linux24) -modules: prereq $(MODULESO) wct4xxp/wct4xxp.o wctdm24xxp/wctdm24xxp.o wcte12xp/wcte12xp.o +modules: prereq $(MODULESO) wct4xxp/wct4xxp.o else modules: prereq ifeq (,$(wildcard $(KSRC)/.config)) @@ -458,7 +461,6 @@ ifeq ($(BUILDVER),linux26) else install -d $(DESTDIR)$(MODS_DIR) install -m 644 $(MODULESO) wct4xxp/wct4xxp.o $(DESTDIR)$(MODS_DIR) - install -m 644 $(MODULESO) wctdm24xxp/wctdm24xxp.o $(DESTDIR)$(MODS_DIR) endif ifeq (,$(wildcard wcfxsusb.o)) rm -f $(DESTDIR)$(MODS_DIR)/wcfxsusb.o diff --git a/Makefile.kernel26 b/Makefile.kernel26 deleted file mode 100644 index c00cba7..0000000 --- a/Makefile.kernel26 +++ /dev/null @@ -1,42 +0,0 @@ -obj-m := $(MODULESO) -obj-m += wct4xxp/ wctc4xxp/ wcte12xp/ wctdm24xxp/ - -# Also build xpp in the subdirectory xpp/ . But only for >=2.6.8 and only -# for i386 or x86_64. On other platforms it has still not been tested well -# enough. -ifneq (,$(shell [ 0$(SUBLEVEL) -ge 8 ] && echo 1)) -ifeq ($(ARCH),i386) -obj-m+=xpp/ -endif -ifeq ($(ARCH),x86_64) -obj-m+=xpp/ -endif -endif - -ifdef ECHO_CAN_NAME - ECHO_CAN_CFLAGS := -DECHO_CAN_FROMENV -DECHO_CAN_$(ECHO_CAN_NAME) -endif - -EXTRA_CFLAGS := -I$(src) -EXTRA_CFLAGS += $(ECHO_CAN_CFLAGS) - -# fix typo present in CentOS and RHEL 2.6.9 kernels -BAD_KERNELS_VERS := 22 34 34.0.1 34.0.2 -BAD_KERNELS := $(foreach ver,$(BAD_KERNELS_VERS),2.6.9-$(ver).EL 2.6.9-$(ver).ELsmp) -ifneq (,$(filter $(KVERS),$(BAD_KERNELS))) -EXTRA_CFLAGS+=-Drw_lock_t=rwlock_t -endif - -zaptel-objs := zaptel-base.o - -ifeq ($(HPEC_PRESENT),yes) -ifeq ($(ARCH),i386) -zaptel-objs += hpec/hpec_x86_32.o -endif - -ifeq ($(ARCH),x86_64) -zaptel-objs += hpec/hpec_x86_64.o -endif - -EXTRA_CFLAGS += -DECHO_CAN_HPEC -I$(src)/hpec -endif diff --git a/pciradio.c b/pciradio.c index ad425b1..2a41b1a 100644 --- a/pciradio.c +++ b/pciradio.c @@ -52,17 +52,12 @@ With driver: 303826 (1.5 %) #include #include #include - -#ifdef STANDALONE_ZAPATA -#include "zaptel.h" -#else -#include -#endif - #ifdef LINUX26 #include #endif +#include "zaptel.h" + #define RAD_MAX_IFACES 128 #define NUM_CODES 15 diff --git a/tor2.c b/tor2.c index f8b8fa0..799a1f6 100644 --- a/tor2.c +++ b/tor2.c @@ -32,15 +32,11 @@ #include #include #include -#ifdef STANDALONE_ZAPATA -#include "zaptel.h" -#else -#include -#endif #ifdef LINUX26 #include #endif #define NEED_PCI_IDS +#include "zaptel.h" #include "tor2-hw.h" #include "tor2fw.h" diff --git a/torisa.c b/torisa.c index 7027407..755d6de 100644 --- a/torisa.c +++ b/torisa.c @@ -31,17 +31,13 @@ #include #include #include -#ifdef STANDALONE_ZAPATA -#include "zaptel.h" -#include "torisa.h" -#else -#include -#include -#endif #ifdef LINUX26 #include #endif +#include "zaptel.h" +#include "torisa.h" + /* Board address offsets (specified in word (not byte) offsets) */ #define DDATA 0 /* Data I/O Register */ #define DADDR 0x100 /* Dallas Card Address Reg., 0x200 in byte offset higher */ diff --git a/wcfxo.c b/wcfxo.c index 0d8f15e..3d03e75 100644 --- a/wcfxo.c +++ b/wcfxo.c @@ -32,15 +32,12 @@ #include #include #include -#ifdef STANDALONE_ZAPATA -#include "zaptel.h" -#else -#include -#endif #ifdef LINUX26 #include #endif +#include "zaptel.h" + /* Uncomment to enable tasklet handling in the FXO driver. Not recommended in general, but may improve interactive performance */ diff --git a/wct1xxp.c b/wct1xxp.c index d383cd2..db39bf3 100644 --- a/wct1xxp.c +++ b/wct1xxp.c @@ -32,15 +32,12 @@ #include #include #include -#ifdef STANDALONE_ZAPATA -#include "zaptel.h" -#else -#include -#endif #ifdef LINUX26 #include #endif +#include "zaptel.h" + #define WC_MAX_CARDS 32 /* diff --git a/wct4xxp/Kbuild b/wct4xxp/Kbuild new file mode 100644 index 0000000..da4ed97 --- /dev/null +++ b/wct4xxp/Kbuild @@ -0,0 +1,27 @@ +obj-m += wct4xxp.o + +EXTRA_CFLAGS := -I$(src)/.. $(shell $(src)/../oct612x/octasic-helper cflags $(src)/../oct612x) -Wno-undef + +ifeq ($(HOTPLUG_FIRMWARE),yes) + EXTRA_CFLAGS += -DHOTPLUG_FIRMWARE +endif + +wct4xxp-objs := base.o vpm450m.o $(shell $(src)/../oct612x/octasic-helper objects ../oct612x) + +ifneq ($(HOTPLUG_FIRMWARE),yes) +wct4xxp-objs += firmware_oct6114-64d.o firmware_oct6114-128d.o +endif + +$(obj)/base.o: $(src)/vpm450m.h $(src)/wct4xxp.h +$(obj)/base.o: $(src)/../zaptel.h + +$(obj)/vpm450m.o: $(src)/vpm450m.h +$(obj)/vpm450m.o: $(src)/../oct612x/include/oct6100api/oct6100_api.h + +$(obj)/firmware_oct6114-64d.o: $(src)/OCT6114-64D.ima $(obj)/base.o + @echo Making firmware object file for $(notdir $<) + @cd $(src) && ../build_tools/make_firmware_object $(notdir $<) $@ $(obj)/base.o + +$(obj)/firmware_oct6114-128d.o: $(src)/OCT6114-128D.ima $(obj)/base.o + @echo Making firmware object file for $(notdir $<) + @cd $(src) && ../build_tools/make_firmware_object $(notdir $<) $@ $(obj)/base.o diff --git a/wct4xxp/Makefile b/wct4xxp/Makefile index a5faf45..6d7faf0 100644 --- a/wct4xxp/Makefile +++ b/wct4xxp/Makefile @@ -1,6 +1,9 @@ ifneq ($(KBUILD_EXTMOD),) -include $(src)/Makefile.kernel26 +# We only get here on kernels 2.6.0-2.6.8 . +# For newer kernels, Kbuild will be included directly by the kernel +# build system. +-include $(src)/Kbuild else diff --git a/wct4xxp/Makefile.kernel26 b/wct4xxp/Makefile.kernel26 deleted file mode 100644 index ea6148b..0000000 --- a/wct4xxp/Makefile.kernel26 +++ /dev/null @@ -1,23 +0,0 @@ -obj-m += wct4xxp.o - -EXTRA_CFLAGS := -I$(src)/.. $(shell $(src)/../oct612x/octasic-helper cflags $(src)/../oct612x) -Wno-undef - -wct4xxp-objs := base.o vpm450m.o $(shell $(src)/../oct612x/octasic-helper objects ../oct612x) - -ifneq ($(HOTPLUG_FIRMWARE),yes) -wct4xxp-objs += firmware_oct6114-64d.o firmware_oct6114-128d.o -endif - -$(obj)/base.o: $(src)/vpm450m.h $(src)/wct4xxp.h -$(obj)/base.o: $(src)/../zaptel.h - -$(obj)/vpm450m.o: $(src)/vpm450m.h -$(obj)/vpm450m.o: $(src)/../oct612x/include/oct6100api/oct6100_api.h - -$(obj)/firmware_oct6114-64d.o: $(src)/OCT6114-64D.ima $(obj)/base.o - @echo Making firmware object file for $(notdir $<) - @cd $(src) && ../build_tools/make_firmware_object $(notdir $<) $@ $(obj)/base.o - -$(obj)/firmware_oct6114-128d.o: $(src)/OCT6114-128D.ima $(obj)/base.o - @echo Making firmware object file for $(notdir $<) - @cd $(src) && ../build_tools/make_firmware_object $(notdir $<) $@ $(obj)/base.o diff --git a/wct4xxp/base.c b/wct4xxp/base.c index f48bc6e..4f8decc 100644 --- a/wct4xxp/base.c +++ b/wct4xxp/base.c @@ -33,15 +33,12 @@ #include #include #include -#ifdef STANDALONE_ZAPATA -#include "zaptel.h" -#else -#include -#endif #ifdef LINUX26 #include #endif +#include "zaptel.h" + #include "wct4xxp.h" #include "vpm450m.h" diff --git a/wct4xxp/vpm450m.h b/wct4xxp/vpm450m.h index bce3a93..41d7c60 100644 --- a/wct4xxp/vpm450m.h +++ b/wct4xxp/vpm450m.h @@ -24,14 +24,7 @@ #ifndef _VPM450M_H #define _VPM450M_H -#ifdef LINUX26 #include -#else -struct firmware { - size_t size; - u8 *data; -}; -#endif struct vpm450m; diff --git a/wctc4xxp/Kbuild b/wctc4xxp/Kbuild new file mode 100644 index 0000000..f7dd663 --- /dev/null +++ b/wctc4xxp/Kbuild @@ -0,0 +1,19 @@ +obj-m += wctc4xxp.o + +EXTRA_CFLAGS := -I$(src)/.. -Wno-undef + +ifeq ($(HOTPLUG_FIRMWARE),yes) + EXTRA_CFLAGS += -DHOTPLUG_FIRMWARE +endif + +wctc4xxp-objs := base.o + +ifneq ($(HOTPLUG_FIRMWARE),yes) +wctc4xxp-objs += firmware_tc400m.o +endif + +$(obj)/base.o: $(src)/../zaptel.h + +$(obj)/firmware_tc400m.o: $(src)/tc400m-firmware.bin $(obj)/base.o + @echo Making firmware object file for $(notdir $<) + @cd $(src) && ../build_tools/make_firmware_object $(notdir $<) $@ $(obj)/base.o diff --git a/wctc4xxp/Makefile b/wctc4xxp/Makefile index cad6216..da06c03 100644 --- a/wctc4xxp/Makefile +++ b/wctc4xxp/Makefile @@ -1,8 +1,7 @@ -ifneq ($(KBUILD_EXTMOD),) - -include $(obj)/Makefile.kernel26 - -endif +# We only get here on kernels 2.6.0-2.6.8 . +# For newer kernels, Kbuild will be included directly by the kernel +# build system. +-include $(src)/Kbuild tests: codec_test diff --git a/wctc4xxp/Makefile.kernel26 b/wctc4xxp/Makefile.kernel26 deleted file mode 100644 index b034819..0000000 --- a/wctc4xxp/Makefile.kernel26 +++ /dev/null @@ -1,15 +0,0 @@ -obj-m += wctc4xxp.o - -EXTRA_CFLAGS := -I$(src)/.. -Wno-undef - -wctc4xxp-objs := base.o - -ifneq ($(HOTPLUG_FIRMWARE),yes) -wctc4xxp-objs += firmware_tc400m.o -endif - -$(obj)/base.o: $(src)/../zaptel.h - -$(obj)/firmware_tc400m.o: $(src)/tc400m-firmware.bin $(obj)/base.o - @echo Making firmware object file for $(notdir $<) - @cd $(src) && ../build_tools/make_firmware_object $(notdir $<) $@ $(obj)/base.o diff --git a/wctc4xxp/base.c b/wctc4xxp/base.c index dc5be8a..7765df5 100644 --- a/wctc4xxp/base.c +++ b/wctc4xxp/base.c @@ -46,12 +46,8 @@ #ifdef CONFIG_DEVFS_FS #include #endif -#ifdef STANDALONE_ZAPATA -#include "zaptel.h" -#else -#include -#endif +#include "zaptel.h" /* #define USE_TEST_HW */ #define USE_TDM_CONFIG diff --git a/wctdm.c b/wctdm.c index 8eaa512..af41e7c 100644 --- a/wctdm.c +++ b/wctdm.c @@ -201,11 +201,7 @@ static struct fxo_mode { { "YEMEN", 0, 0, 0, 0, 0, 0x3, 0, 0, }, }; -#ifdef STANDALONE_ZAPATA #include "zaptel.h" -#else -#include -#endif #ifdef LINUX26 #include diff --git a/wctdm24xxp/Kbuild b/wctdm24xxp/Kbuild new file mode 100644 index 0000000..24658b9 --- /dev/null +++ b/wctdm24xxp/Kbuild @@ -0,0 +1,24 @@ +obj-m += wctdm24xxp.o + +EXTRA_CFLAGS := -I$(src)/.. -Wno-undef + +ifeq ($(HOTPLUG_FIRMWARE),yes) + EXTRA_CFLAGS += -DHOTPLUG_FIRMWARE +endif + +wctdm24xxp-objs := base.o GpakCust.o GpakApi.o + +ifneq ($(HOTPLUG_FIRMWARE),yes) +wctdm24xxp-objs += firmware_vpmadt032.o +endif + +$(obj)/base.o: $(src)/GpakCust.h $(src)/wctdm24xxp.h +$(obj)/base.o: $(src)/../zaptel.h + +$(obj)/GpakCust.o: $(src)/GpakCust.h + +$(obj)/GpakApi.o: $(src)/GpakApi.h + +$(obj)/firmware_vpmadt032.o: $(src)/VPMADT032.bin $(obj)/base.o + @echo Making firmware object file for $(notdir $<) + @cd $(src) && ../build_tools/make_firmware_object $(notdir $<) $@ $(obj)/base.o diff --git a/wctdm24xxp/Makefile b/wctdm24xxp/Makefile index 9927928..442555a 100644 --- a/wctdm24xxp/Makefile +++ b/wctdm24xxp/Makefile @@ -1,22 +1,4 @@ -ifneq ($(KBUILD_EXTMOD),) - -include $(src)/Makefile.kernel26 - -else - -all: wctdm24xxp.o - -%.o: %.c - $(CC) $(KFLAGS) -o $@ -c $< - -base.o: ../zaptel.h GpakCust.h ../wctdm.h - -GpakCust.o: GpakCust.h - -wctdm24xxp.o: base.o GpakCust.o GpakApi.o - $(LD) -r -o $@ $^ - -clean: - rm -f *.o - -endif +# We only get here on kernels 2.6.0-2.6.8 . +# For newer kernels, Kbuild will be included directly by the kernel +# build system. +-include $(src)/Kbuild diff --git a/wctdm24xxp/Makefile.kernel26 b/wctdm24xxp/Makefile.kernel26 deleted file mode 100644 index 43b641c..0000000 --- a/wctdm24xxp/Makefile.kernel26 +++ /dev/null @@ -1,20 +0,0 @@ -obj-m += wctdm24xxp.o - -EXTRA_CFLAGS := -I$(src)/.. -Wno-undef - -wctdm24xxp-objs := base.o GpakCust.o GpakApi.o - -ifneq ($(HOTPLUG_FIRMWARE),yes) -wctdm24xxp-objs += firmware_vpmadt032.o -endif - -$(obj)/base.o: $(src)/GpakCust.h $(src)/wctdm24xxp.h -$(obj)/base.o: $(src)/../zaptel.h - -$(obj)/GpakCust.o: $(src)/GpakCust.h - -$(obj)/GpakApi.o: $(src)/GpakApi.h - -$(obj)/firmware_vpmadt032.o: $(src)/VPMADT032.bin $(obj)/base.o - @echo Making firmware object file for $(notdir $<) - @cd $(src) && ../build_tools/make_firmware_object $(notdir $<) $@ $(obj)/base.o diff --git a/wcte11xp.c b/wcte11xp.c index 8765caf..ebe668a 100644 --- a/wcte11xp.c +++ b/wcte11xp.c @@ -34,15 +34,12 @@ #include #include #include -#ifdef STANDALONE_ZAPATA -#include "zaptel.h" -#else -#include -#endif #ifdef LINUX26 #include #endif +#include "zaptel.h" + /* XXX: fix this */ #include "wct4xxp/wct4xxp.h" /* For certain definitions */ diff --git a/wcte12xp/Kbuild b/wcte12xp/Kbuild new file mode 100644 index 0000000..15530ce --- /dev/null +++ b/wcte12xp/Kbuild @@ -0,0 +1,23 @@ +obj-m += wcte12xp.o + +EXTRA_CFLAGS := -I$(src)/.. -Wno-undef + +ifeq ($(HOTPLUG_FIRMWARE),yes) + EXTRA_CFLAGS += -DHOTPLUG_FIRMWARE +endif + +wcte12xp-objs := base.o vpmadt032.o GpakApi.o + +ifneq ($(HOTPLUG_FIRMWARE),yes) +wcte12xp-objs += firmware_vpmadt032.o +endif + +$(obj)/base.o: $(src)/../zaptel.h + +$(obj)/vpmadt032.o: $(src)/vpmadt032.h + +$(obj)/GpakApi.o: $(src)/GpakApi.h + +$(obj)/firmware_vpmadt032.o: $(src)/VPMADT032.bin $(obj)/base.o + @echo Making firmware object file for $(notdir $<) + @cd $(src) && ../build_tools/make_firmware_object $(notdir $<) $@ $(obj)/base.o diff --git a/wcte12xp/Makefile b/wcte12xp/Makefile index 026252d..442555a 100644 --- a/wcte12xp/Makefile +++ b/wcte12xp/Makefile @@ -1,22 +1,4 @@ -ifneq ($(KBUILD_EXTMOD),) - -include $(obj)/Makefile.kernel26 - -else - -all: wcte12xp.o - -%.o: %.c - $(CC) $(KFLAGS) -o $@ -c $< - -base.o: ../zaptel.h ../wct4xxp/wct4xxp.h vpmadt032.h - -vpmadt032.o: vpmadt032.h - -wcte12xp.o: base.o vpmadt032.o GpakApi.o - $(LD) -r -o $@ $^ - -clean: - rm -rf *.o - -endif +# We only get here on kernels 2.6.0-2.6.8 . +# For newer kernels, Kbuild will be included directly by the kernel +# build system. +-include $(src)/Kbuild diff --git a/wcte12xp/Makefile.kernel26 b/wcte12xp/Makefile.kernel26 deleted file mode 100644 index c41e8f1..0000000 --- a/wcte12xp/Makefile.kernel26 +++ /dev/null @@ -1,19 +0,0 @@ -obj-m += wcte12xp.o - -EXTRA_CFLAGS := -I$(src)/.. -Wno-undef - -wcte12xp-objs := base.o vpmadt032.o GpakApi.o - -ifneq ($(HOTPLUG_FIRMWARE),yes) -wcte12xp-objs += firmware_vpmadt032.o -endif - -$(obj)/base.o: $(src)/../zaptel.h - -$(obj)/vpmadt032.o: $(src)/vpmadt032.h - -$(obj)/GpakApi.o: $(src)/GpakApi.h - -$(obj)/firmware_vpmadt032.o: $(src)/VPMADT032.bin $(obj)/base.o - @echo Making firmware object file for $(notdir $<) - @cd $(src) && ../build_tools/make_firmware_object $(notdir $<) $@ $(obj)/base.o diff --git a/wcusb.c b/wcusb.c index 00b43dc..c0e08d8 100644 --- a/wcusb.c +++ b/wcusb.c @@ -44,12 +44,7 @@ #define USB2420 #endif -#ifdef STANDALONE_ZAPATA - #include "zaptel.h" -#else -#include -#endif /* STANDALONE_ZAPATA */ #include "wcusb.h" #include "proslic.h" diff --git a/zaptel-base.c b/zaptel-base.c index 90d27da..94843b9 100644 --- a/zaptel-base.c +++ b/zaptel-base.c @@ -78,11 +78,7 @@ #define FAST_HDLC_NEED_TABLES #include "fasthdlc.h" -#ifdef STANDALONE_ZAPATA #include "zaptel.h" -#else -#include -#endif #ifdef LINUX26 #include diff --git a/ztd-eth.c b/ztd-eth.c index 14a9fe5..a5d8f83 100644 --- a/ztd-eth.c +++ b/ztd-eth.c @@ -36,11 +36,8 @@ #ifdef CONFIG_DEVFS_FS #include #endif -#ifdef STANDALONE_ZAPATA + #include "zaptel.h" -#else -#include -#endif #define ETH_P_ZTDETH 0xd00d diff --git a/ztd-loc.c b/ztd-loc.c index 100bd9f..aec5953 100644 --- a/ztd-loc.c +++ b/ztd-loc.c @@ -60,11 +60,8 @@ #ifdef CONFIG_DEVFS_FS #include #endif -#ifdef STANDALONE_ZAPATA + #include "zaptel.h" -#else -#include -#endif #ifdef DEFINE_SPINLOCK static DEFINE_SPINLOCK(zlock); diff --git a/ztdummy.c b/ztdummy.c index e37c310..e1f7916 100644 --- a/ztdummy.c +++ b/ztdummy.c @@ -74,11 +74,7 @@ #include #include #include -#ifdef STANDALONE_ZAPATA -#include "zaptel.h" -#else -#include -#endif + #ifndef LINUX26 #include #include @@ -93,6 +89,8 @@ #endif #include #endif + +#include "zaptel.h" #include "ztdummy.h" diff --git a/ztdynamic.c b/ztdynamic.c index 5147cf0..41b8382 100644 --- a/ztdynamic.c +++ b/ztdynamic.c @@ -36,15 +36,12 @@ #ifdef CONFIG_DEVFS_FS #include #endif -#ifdef STANDALONE_ZAPATA -#include "zaptel.h" -#else -#include -#endif #ifdef LINUX26 #include #endif +#include "zaptel.h" + /* * Tasklets provide better system interactive response at the cost of the * possibility of losing a frame of data at very infrequent intervals. If diff --git a/zttranscode.c b/zttranscode.c index cf99b8a..ea3ac30 100644 --- a/zttranscode.c +++ b/zttranscode.c @@ -39,15 +39,12 @@ #ifdef CONFIG_DEVFS_FS #include #endif -#ifdef STANDALONE_ZAPATA -#include "zaptel.h" -#else -#include -#endif #ifdef LINUX26 #include #endif +#include "zaptel.h" + static int debug = 0; static struct zt_transcoder *trans; static spinlock_t translock = SPIN_LOCK_UNLOCKED; -- cgit v1.2.3