[zaptel-commits] kpfleming: branch 1.2 r3741 - in /branches/1.2: ./ wct4xxp/ wctc4xxp/ wctdm24...
SVN commits to the Zaptel project
zaptel-commits at lists.digium.com
Fri Jan 25 17:59:37 CST 2008
Author: kpfleming
Date: Fri Jan 25 17:59:37 2008
New Revision: 3741
URL: http://svn.digium.com/view/zaptel?view=rev&rev=3741
Log:
get this branch to build against 2.6.24 kernel build system (similar to r3706 from tzafrir for branch-1.4)
Added:
branches/1.2/Kbuild
- copied unchanged from r3740, branches/1.2/Makefile.kernel26
branches/1.2/wct4xxp/Kbuild
- copied, changed from r3740, branches/1.2/wct4xxp/Makefile.kernel26
branches/1.2/wctc4xxp/Kbuild
- copied, changed from r3740, branches/1.2/wctc4xxp/Makefile.kernel26
branches/1.2/wctdm24xxp/Kbuild
- copied, changed from r3740, branches/1.2/wctdm24xxp/Makefile.kernel26
branches/1.2/wcte12xp/Kbuild
- copied, changed from r3740, branches/1.2/wcte12xp/Makefile.kernel26
Removed:
branches/1.2/Makefile.kernel26
branches/1.2/wct4xxp/Makefile.kernel26
branches/1.2/wctc4xxp/Makefile.kernel26
branches/1.2/wctdm24xxp/Makefile.kernel26
branches/1.2/wcte12xp/Makefile.kernel26
Modified:
branches/1.2/Makefile
branches/1.2/pciradio.c
branches/1.2/tor2.c
branches/1.2/torisa.c
branches/1.2/wcfxo.c
branches/1.2/wct1xxp.c
branches/1.2/wct4xxp/Makefile
branches/1.2/wct4xxp/base.c
branches/1.2/wct4xxp/vpm450m.h
branches/1.2/wctc4xxp/Makefile
branches/1.2/wctc4xxp/base.c
branches/1.2/wctdm.c
branches/1.2/wctdm24xxp/Makefile
branches/1.2/wcte11xp.c
branches/1.2/wcte12xp/Makefile
branches/1.2/wcusb.c
branches/1.2/zaptel-base.c
branches/1.2/ztd-eth.c
branches/1.2/ztd-loc.c
branches/1.2/ztdummy.c
branches/1.2/ztdynamic.c
branches/1.2/zttranscode.c
Modified: branches/1.2/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/Makefile?view=diff&rev=3741&r1=3740&r2=3741
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Fri Jan 25 17:59:37 2008
@@ -78,7 +78,10 @@
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 @@
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 @@
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
Modified: branches/1.2/pciradio.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/pciradio.c?view=diff&rev=3741&r1=3740&r2=3741
==============================================================================
--- branches/1.2/pciradio.c (original)
+++ branches/1.2/pciradio.c Fri Jan 25 17:59:37 2008
@@ -52,16 +52,11 @@
#include <linux/interrupt.h>
#include <asm/io.h>
#include <asm/delay.h>
-
-#ifdef STANDALONE_ZAPATA
-#include "zaptel.h"
-#else
-#include <linux/zaptel.h>
-#endif
-
#ifdef LINUX26
#include <linux/moduleparam.h>
#endif
+
+#include "zaptel.h"
#define RAD_MAX_IFACES 128
Modified: branches/1.2/tor2.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/tor2.c?view=diff&rev=3741&r1=3740&r2=3741
==============================================================================
--- branches/1.2/tor2.c (original)
+++ branches/1.2/tor2.c Fri Jan 25 17:59:37 2008
@@ -32,15 +32,11 @@
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
-#ifdef STANDALONE_ZAPATA
-#include "zaptel.h"
-#else
-#include <linux/zaptel.h>
-#endif
#ifdef LINUX26
#include <linux/moduleparam.h>
#endif
#define NEED_PCI_IDS
+#include "zaptel.h"
#include "tor2-hw.h"
#include "tor2fw.h"
Modified: branches/1.2/torisa.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/torisa.c?view=diff&rev=3741&r1=3740&r2=3741
==============================================================================
--- branches/1.2/torisa.c (original)
+++ branches/1.2/torisa.c Fri Jan 25 17:59:37 2008
@@ -31,16 +31,12 @@
#include <linux/interrupt.h>
#include <linux/ioport.h>
#include <asm/io.h>
-#ifdef STANDALONE_ZAPATA
-#include "zaptel.h"
-#include "torisa.h"
-#else
-#include <linux/zaptel.h>
-#include <linux/torisa.h>
-#endif
#ifdef LINUX26
#include <linux/moduleparam.h>
#endif
+
+#include "zaptel.h"
+#include "torisa.h"
/* Board address offsets (specified in word (not byte) offsets) */
#define DDATA 0 /* Data I/O Register */
Modified: branches/1.2/wcfxo.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wcfxo.c?view=diff&rev=3741&r1=3740&r2=3741
==============================================================================
--- branches/1.2/wcfxo.c (original)
+++ branches/1.2/wcfxo.c Fri Jan 25 17:59:37 2008
@@ -32,14 +32,11 @@
#include <linux/errno.h>
#include <linux/pci.h>
#include <asm/io.h>
-#ifdef STANDALONE_ZAPATA
-#include "zaptel.h"
-#else
-#include <linux/zaptel.h>
-#endif
#ifdef LINUX26
#include <linux/moduleparam.h>
#endif
+
+#include "zaptel.h"
/* Uncomment to enable tasklet handling in the FXO driver. Not recommended
in general, but may improve interactive performance */
Modified: branches/1.2/wct1xxp.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wct1xxp.c?view=diff&rev=3741&r1=3740&r2=3741
==============================================================================
--- branches/1.2/wct1xxp.c (original)
+++ branches/1.2/wct1xxp.c Fri Jan 25 17:59:37 2008
@@ -32,14 +32,11 @@
#include <linux/errno.h>
#include <linux/pci.h>
#include <linux/spinlock.h>
-#ifdef STANDALONE_ZAPATA
-#include "zaptel.h"
-#else
-#include <linux/zaptel.h>
-#endif
#ifdef LINUX26
#include <linux/moduleparam.h>
#endif
+
+#include "zaptel.h"
#define WC_MAX_CARDS 32
Copied: branches/1.2/wct4xxp/Kbuild (from r3740, branches/1.2/wct4xxp/Makefile.kernel26)
URL: http://svn.digium.com/view/zaptel/branches/1.2/wct4xxp/Kbuild?view=diff&rev=3741&p1=branches/1.2/wct4xxp/Makefile.kernel26&r1=3740&p2=branches/1.2/wct4xxp/Kbuild&r2=3741
==============================================================================
--- branches/1.2/wct4xxp/Makefile.kernel26 (original)
+++ branches/1.2/wct4xxp/Kbuild Fri Jan 25 17:59:37 2008
@@ -1,6 +1,10 @@
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)
Modified: branches/1.2/wct4xxp/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/wct4xxp/Makefile?view=diff&rev=3741&r1=3740&r2=3741
==============================================================================
--- branches/1.2/wct4xxp/Makefile (original)
+++ branches/1.2/wct4xxp/Makefile Fri Jan 25 17:59:37 2008
@@ -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
Modified: branches/1.2/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wct4xxp/base.c?view=diff&rev=3741&r1=3740&r2=3741
==============================================================================
--- branches/1.2/wct4xxp/base.c (original)
+++ branches/1.2/wct4xxp/base.c Fri Jan 25 17:59:37 2008
@@ -33,14 +33,11 @@
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
-#ifdef STANDALONE_ZAPATA
-#include "zaptel.h"
-#else
-#include <linux/zaptel.h>
-#endif
#ifdef LINUX26
#include <linux/moduleparam.h>
#endif
+
+#include "zaptel.h"
#include "wct4xxp.h"
#include "vpm450m.h"
Modified: branches/1.2/wct4xxp/vpm450m.h
URL: http://svn.digium.com/view/zaptel/branches/1.2/wct4xxp/vpm450m.h?view=diff&rev=3741&r1=3740&r2=3741
==============================================================================
--- branches/1.2/wct4xxp/vpm450m.h (original)
+++ branches/1.2/wct4xxp/vpm450m.h Fri Jan 25 17:59:37 2008
@@ -24,14 +24,7 @@
#ifndef _VPM450M_H
#define _VPM450M_H
-#ifdef LINUX26
#include <linux/firmware.h>
-#else
-struct firmware {
- size_t size;
- u8 *data;
-};
-#endif
struct vpm450m;
Copied: branches/1.2/wctc4xxp/Kbuild (from r3740, branches/1.2/wctc4xxp/Makefile.kernel26)
URL: http://svn.digium.com/view/zaptel/branches/1.2/wctc4xxp/Kbuild?view=diff&rev=3741&p1=branches/1.2/wctc4xxp/Makefile.kernel26&r1=3740&p2=branches/1.2/wctc4xxp/Kbuild&r2=3741
==============================================================================
--- branches/1.2/wctc4xxp/Makefile.kernel26 (original)
+++ branches/1.2/wctc4xxp/Kbuild Fri Jan 25 17:59:37 2008
@@ -1,6 +1,10 @@
obj-m += wctc4xxp.o
EXTRA_CFLAGS := -I$(src)/.. -Wno-undef
+
+ifeq ($(HOTPLUG_FIRMWARE),yes)
+ EXTRA_CFLAGS += -DHOTPLUG_FIRMWARE
+endif
wctc4xxp-objs := base.o
Modified: branches/1.2/wctc4xxp/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/wctc4xxp/Makefile?view=diff&rev=3741&r1=3740&r2=3741
==============================================================================
--- branches/1.2/wctc4xxp/Makefile (original)
+++ branches/1.2/wctc4xxp/Makefile Fri Jan 25 17:59:37 2008
@@ -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
Modified: branches/1.2/wctc4xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wctc4xxp/base.c?view=diff&rev=3741&r1=3740&r2=3741
==============================================================================
--- branches/1.2/wctc4xxp/base.c (original)
+++ branches/1.2/wctc4xxp/base.c Fri Jan 25 17:59:37 2008
@@ -46,12 +46,8 @@
#ifdef CONFIG_DEVFS_FS
#include <linux/devfs_fs_kernel.h>
#endif
-#ifdef STANDALONE_ZAPATA
+
#include "zaptel.h"
-#else
-#include <linux/zaptel.h>
-#endif
-
/* #define USE_TEST_HW */
#define USE_TDM_CONFIG
Modified: branches/1.2/wctdm.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wctdm.c?view=diff&rev=3741&r1=3740&r2=3741
==============================================================================
--- branches/1.2/wctdm.c (original)
+++ branches/1.2/wctdm.c Fri Jan 25 17:59:37 2008
@@ -201,11 +201,7 @@
{ "YEMEN", 0, 0, 0, 0, 0, 0x3, 0, 0, },
};
-#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
-#else
-#include <linux/zaptel.h>
-#endif
#ifdef LINUX26
#include <linux/moduleparam.h>
Copied: branches/1.2/wctdm24xxp/Kbuild (from r3740, branches/1.2/wctdm24xxp/Makefile.kernel26)
URL: http://svn.digium.com/view/zaptel/branches/1.2/wctdm24xxp/Kbuild?view=diff&rev=3741&p1=branches/1.2/wctdm24xxp/Makefile.kernel26&r1=3740&p2=branches/1.2/wctdm24xxp/Kbuild&r2=3741
==============================================================================
--- branches/1.2/wctdm24xxp/Makefile.kernel26 (original)
+++ branches/1.2/wctdm24xxp/Kbuild Fri Jan 25 17:59:37 2008
@@ -1,6 +1,10 @@
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
Modified: branches/1.2/wctdm24xxp/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/wctdm24xxp/Makefile?view=diff&rev=3741&r1=3740&r2=3741
==============================================================================
--- branches/1.2/wctdm24xxp/Makefile (original)
+++ branches/1.2/wctdm24xxp/Makefile Fri Jan 25 17:59:37 2008
@@ -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
Modified: branches/1.2/wcte11xp.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wcte11xp.c?view=diff&rev=3741&r1=3740&r2=3741
==============================================================================
--- branches/1.2/wcte11xp.c (original)
+++ branches/1.2/wcte11xp.c Fri Jan 25 17:59:37 2008
@@ -34,14 +34,11 @@
#include <linux/errno.h>
#include <linux/pci.h>
#include <linux/spinlock.h>
-#ifdef STANDALONE_ZAPATA
-#include "zaptel.h"
-#else
-#include <linux/zaptel.h>
-#endif
#ifdef LINUX26
#include <linux/moduleparam.h>
#endif
+
+#include "zaptel.h"
/* XXX: fix this */
#include "wct4xxp/wct4xxp.h" /* For certain definitions */
Copied: branches/1.2/wcte12xp/Kbuild (from r3740, branches/1.2/wcte12xp/Makefile.kernel26)
URL: http://svn.digium.com/view/zaptel/branches/1.2/wcte12xp/Kbuild?view=diff&rev=3741&p1=branches/1.2/wcte12xp/Makefile.kernel26&r1=3740&p2=branches/1.2/wcte12xp/Kbuild&r2=3741
==============================================================================
--- branches/1.2/wcte12xp/Makefile.kernel26 (original)
+++ branches/1.2/wcte12xp/Kbuild Fri Jan 25 17:59:37 2008
@@ -1,6 +1,10 @@
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
Modified: branches/1.2/wcte12xp/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/wcte12xp/Makefile?view=diff&rev=3741&r1=3740&r2=3741
==============================================================================
--- branches/1.2/wcte12xp/Makefile (original)
+++ branches/1.2/wcte12xp/Makefile Fri Jan 25 17:59:37 2008
@@ -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
Modified: branches/1.2/wcusb.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wcusb.c?view=diff&rev=3741&r1=3740&r2=3741
==============================================================================
--- branches/1.2/wcusb.c (original)
+++ branches/1.2/wcusb.c Fri Jan 25 17:59:37 2008
@@ -44,12 +44,7 @@
#define USB2420
#endif
-#ifdef STANDALONE_ZAPATA
-
#include "zaptel.h"
-#else
-#include <linux/zaptel.h>
-#endif /* STANDALONE_ZAPATA */
#include "wcusb.h"
#include "proslic.h"
Modified: branches/1.2/zaptel-base.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/zaptel-base.c?view=diff&rev=3741&r1=3740&r2=3741
==============================================================================
--- branches/1.2/zaptel-base.c (original)
+++ branches/1.2/zaptel-base.c Fri Jan 25 17:59:37 2008
@@ -78,11 +78,7 @@
#define FAST_HDLC_NEED_TABLES
#include "fasthdlc.h"
-#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
-#else
-#include <linux/zaptel.h>
-#endif
#ifdef LINUX26
#include <linux/moduleparam.h>
Modified: branches/1.2/ztd-eth.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/ztd-eth.c?view=diff&rev=3741&r1=3740&r2=3741
==============================================================================
--- branches/1.2/ztd-eth.c (original)
+++ branches/1.2/ztd-eth.c Fri Jan 25 17:59:37 2008
@@ -36,11 +36,8 @@
#ifdef CONFIG_DEVFS_FS
#include <linux/devfs_fs_kernel.h>
#endif
-#ifdef STANDALONE_ZAPATA
+
#include "zaptel.h"
-#else
-#include <linux/zaptel.h>
-#endif
#define ETH_P_ZTDETH 0xd00d
Modified: branches/1.2/ztd-loc.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/ztd-loc.c?view=diff&rev=3741&r1=3740&r2=3741
==============================================================================
--- branches/1.2/ztd-loc.c (original)
+++ branches/1.2/ztd-loc.c Fri Jan 25 17:59:37 2008
@@ -60,11 +60,8 @@
#ifdef CONFIG_DEVFS_FS
#include <linux/devfs_fs_kernel.h>
#endif
-#ifdef STANDALONE_ZAPATA
+
#include "zaptel.h"
-#else
-#include <linux/zaptel.h>
-#endif
#ifdef DEFINE_SPINLOCK
static DEFINE_SPINLOCK(zlock);
Modified: branches/1.2/ztdummy.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/ztdummy.c?view=diff&rev=3741&r1=3740&r2=3741
==============================================================================
--- branches/1.2/ztdummy.c (original)
+++ branches/1.2/ztdummy.c Fri Jan 25 17:59:37 2008
@@ -74,11 +74,7 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/errno.h>
-#ifdef STANDALONE_ZAPATA
-#include "zaptel.h"
-#else
-#include <linux/zaptel.h>
-#endif
+
#ifndef LINUX26
#include <linux/usb.h>
#include <linux/pci.h>
@@ -93,6 +89,8 @@
#endif
#include <linux/moduleparam.h>
#endif
+
+#include "zaptel.h"
#include "ztdummy.h"
Modified: branches/1.2/ztdynamic.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/ztdynamic.c?view=diff&rev=3741&r1=3740&r2=3741
==============================================================================
--- branches/1.2/ztdynamic.c (original)
+++ branches/1.2/ztdynamic.c Fri Jan 25 17:59:37 2008
@@ -36,14 +36,11 @@
#ifdef CONFIG_DEVFS_FS
#include <linux/devfs_fs_kernel.h>
#endif
-#ifdef STANDALONE_ZAPATA
-#include "zaptel.h"
-#else
-#include <linux/zaptel.h>
-#endif
#ifdef LINUX26
#include <linux/moduleparam.h>
#endif
+
+#include "zaptel.h"
/*
* Tasklets provide better system interactive response at the cost of the
Modified: branches/1.2/zttranscode.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/zttranscode.c?view=diff&rev=3741&r1=3740&r2=3741
==============================================================================
--- branches/1.2/zttranscode.c (original)
+++ branches/1.2/zttranscode.c Fri Jan 25 17:59:37 2008
@@ -39,14 +39,11 @@
#ifdef CONFIG_DEVFS_FS
#include <linux/devfs_fs_kernel.h>
#endif
-#ifdef STANDALONE_ZAPATA
-#include "zaptel.h"
-#else
-#include <linux/zaptel.h>
-#endif
#ifdef LINUX26
#include <linux/moduleparam.h>
#endif
+
+#include "zaptel.h"
static int debug = 0;
static struct zt_transcoder *trans;
More information about the zaptel-commits
mailing list