[zaptel-commits] mspiceland: branch 1.2 r3358 - in /branches/1.2: ./ wcte12xp/

[SVN commits to the Zaptel project]

Author: mspiceland
Date: Fri Dec  7 20:42:44 2007
New Revision: 3358

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3358
Log:
Moving wcte12xp driver into a subdirectory and adding support for the Digium TE121 and TE122 cards.  These cards support the Digium VPMADT032 module.

Added:
    branches/1.2/wcte12xp/
      - copied from r3357, betas/zaptel-1.2-te12x-vpm/wcte12xp/
    branches/1.2/wcte12xp/GpakApi.c
      - copied unchanged from r3357, betas/zaptel-1.2-te12x-vpm/wcte12xp/GpakApi.c
    branches/1.2/wcte12xp/GpakApi.h
      - copied unchanged from r3357, betas/zaptel-1.2-te12x-vpm/wcte12xp/GpakApi.h
    branches/1.2/wcte12xp/GpakErrs.h
      - copied unchanged from r3357, betas/zaptel-1.2-te12x-vpm/wcte12xp/GpakErrs.h
    branches/1.2/wcte12xp/GpakHpi.h
      - copied unchanged from r3357, betas/zaptel-1.2-te12x-vpm/wcte12xp/GpakHpi.h
    branches/1.2/wcte12xp/Makefile
      - copied unchanged from r3357, betas/zaptel-1.2-te12x-vpm/wcte12xp/Makefile
    branches/1.2/wcte12xp/Makefile.kernel26
      - copied unchanged from r3357, betas/zaptel-1.2-te12x-vpm/wcte12xp/Makefile.kernel26
    branches/1.2/wcte12xp/base.c
      - copied unchanged from r3357, betas/zaptel-1.2-te12x-vpm/wcte12xp/base.c
    branches/1.2/wcte12xp/gpakenum.h
      - copied unchanged from r3357, betas/zaptel-1.2-te12x-vpm/wcte12xp/gpakenum.h
    branches/1.2/wcte12xp/vpmadt032.c
      - copied unchanged from r3357, betas/zaptel-1.2-te12x-vpm/wcte12xp/vpmadt032.c
    branches/1.2/wcte12xp/vpmadt032.h
      - copied unchanged from r3357, betas/zaptel-1.2-te12x-vpm/wcte12xp/vpmadt032.h
    branches/1.2/wcte12xp/wcte12xp.h
      - copied unchanged from r3357, betas/zaptel-1.2-te12x-vpm/wcte12xp/wcte12xp.h
Removed:
    branches/1.2/wcte12xp.c
Modified:
    branches/1.2/Makefile
    branches/1.2/Makefile.kernel26
    branches/1.2/zaptel-base.c

Modified: branches/1.2/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/Makefile?view=diff&rev=3358&r1=3357&r2=3358
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Fri Dec  7 20:42:44 2007
@@ -56,7 +56,7 @@
 
 MODULES:=zaptel tor2 torisa wcusb wcfxo wctdm \
 	 ztdynamic ztd-eth wct1xxp wcte11xp pciradio \
-         ztd-loc wcte12xp # ztdummy
+         ztd-loc # ztdummy
 #MODULES+=wcfxsusb
 ifeq ($(BUILDVER),linux26)
 MODULES+=ztdummy zttranscode
@@ -78,7 +78,7 @@
 endif
 
 # add this later, so it doesn't become part of MODULESO/MODULESKO
-MODULES+=wct4xxp wctc4xxp wctdm24xxp
+MODULES+=wct4xxp wctc4xxp wcte12xp wctdm24xxp
 
 ifeq ($(ARCH),i386)
 ifneq ($(wildcard $(PWD)/hpec/hpec_x86_32.o_shipped),)
@@ -221,7 +221,7 @@
 libs: $(LIBTONEZONE_SO)
 
 ifeq ($(BUILDVER),linux24)
-modules: prereq $(MODULESO) wct4xxp/wct4xxp.o wctdm24xxp/wctdm24xxp.o
+modules: prereq $(MODULESO) wct4xxp/wct4xxp.o wctdm24xxp/wctdm24xxp.o wcte12xp/wcte12xp.o
 else
 modules: prereq
 ifeq (,$(wildcard $(KSRC)/.config))
@@ -252,6 +252,9 @@
 
 wct4xxp/wct4xxp.o:
 	$(MAKE) -C wct4xxp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
+
+wcte12xp/wcte12xp.o:
+	$(MAKE) -C wcte12xp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
 
 wctdm24xxp/wctdm24xxp.o:
 	$(MAKE) -C wctdm24xxp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
@@ -546,6 +549,7 @@
 	$(MAKE) -C $(KSRC) SUBDIRS=$(PWD) clean
 	$(MAKE) -C wct4xxp clean
 	$(MAKE) -C wctc4xxp clean
+	$(MAKE) -C wcte12xp clean
 	$(MAKE) -C wctdm24xxp clean
 	rm -rf .tmp_versions
 	rm -f gendigits tones.h

Modified: branches/1.2/Makefile.kernel26
URL: http://svn.digium.com/view/zaptel/branches/1.2/Makefile.kernel26?view=diff&rev=3358&r1=3357&r2=3358
==============================================================================
--- branches/1.2/Makefile.kernel26 (original)
+++ branches/1.2/Makefile.kernel26 Fri Dec  7 20:42:44 2007
@@ -1,5 +1,5 @@
 obj-m := $(MODULESO)
-obj-m += wct4xxp/ wctc4xxp/ wctdm24xxp/
+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 

Modified: branches/1.2/zaptel-base.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/zaptel-base.c?view=diff&rev=3358&r1=3357&r2=3358
==============================================================================
--- branches/1.2/zaptel-base.c (original)
+++ branches/1.2/zaptel-base.c Fri Dec  7 20:42:44 2007
@@ -46,6 +46,7 @@
 #include <linux/init.h>
 #include <linux/version.h>
 #include <linux/kmod.h>
+#include <linux/delay.h>
 #ifdef CONFIG_DEVFS_FS
 #include <linux/devfs_fs_kernel.h>
 #endif /* CONFIG_DEVFS_FS */