| @@ -0,0 +1,7047 @@
+diff -uNr zaptel-1.4.8/wcte12xp/base.c zaptel-1.4/wcte12xp/base.c
+--- zaptel-1.4.8/wcte12xp/base.c 2008-01-11 23:39:16.000000000 +0100
++++ zaptel-1.4/wcte12xp/base.c 2008-02-03 17:46:02.000000000 +0100
+@@ -47,8 +47,11 @@
+ #include "../wct4xxp/wct4xxp.h" /* For certain definitions */
+
+ #include "wcte12xp.h"
++
++#if defined(VPM_SUPPORT)
+ #include "vpmadt032.h"
+ #include "GpakApi.h"
++#endif
+
+ struct pci_driver te12xp_driver;
+
+@@ -92,6 +95,9 @@
+ int vpmsupport = 1;
+ int vpmdtmfsupport = 0;
+ int vpmtsisupport = 0;
++int vpmnlptype = 1;
++int vpmnlpthresh = 24;
++int vpmnlpmaxsupp = 0;
+ #endif
+
+ struct t1 *ifaces[WC_MAX_IFACES];
+@@ -1352,8 +1358,12 @@
+ snprintf(wc->span.desc, sizeof(wc->span.desc) - 1, "%s Card %d", wc->variety, wc->num);
+ wc->span.manufacturer = "Digium";
+ strncpy(wc->span.devicetype, wc->variety, sizeof(wc->span.devicetype) - 1);
++
++#if defined(VPM_SUPPORT)
+ if (wc->vpm150m)
+ strncat(wc->span.devicetype, " with VPMADT032", sizeof(wc->span.devicetype) - 1);
++#endif
++
+ snprintf(wc->span.location, sizeof(wc->span.location) - 1,
+ "PCI Bus %02d Slot %02d", wc->dev->bus->number, PCI_SLOT(wc->dev->devfn) + 1);
+
+@@ -2012,9 +2022,9 @@
+
+ static void __devexit te12xp_remove_one(struct pci_dev *pdev)
+ {
+- unsigned long flags;
+ struct t1 *wc = pci_get_drvdata(pdev);
+ #ifdef VPM_SUPPORT
++ unsigned long flags;
+ struct vpm150m *vpm150m = wc->vpm150m;
+ #endif
+ if (!wc)
+@@ -2115,6 +2125,9 @@
+ MODULE_PARM(vpmsupport, "i");
+ MODULE_PARM(vpmdtmfsupport, "i");
+ MODULE_PARM(vpmtsisupport, "i");
++MODULE_PARM(vpmnlptype, "i");
++MODULE_PARM(vpmnlpthresh, "i");
++MODULE_PARM(vpmnlpmaxsupp, "i");
+ #endif
+ #endif
+
+diff -uNr zaptel-1.4.8/wcte12xp/Kbuild zaptel-1.4/wcte12xp/Kbuild
+--- zaptel-1.4.8/wcte12xp/Kbuild 2007-12-11 09:43:22.000000000 +0100
++++ zaptel-1.4/wcte12xp/Kbuild 2008-02-03 17:46:02.000000000 +0100
+@@ -2,6 +2,10 @@
+
+ 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)
+diff -uNr zaptel-1.4.8/wcte12xp/Makefile zaptel-1.4/wcte12xp/Makefile
+--- zaptel-1.4.8/wcte12xp/Makefile 2007-12-11 09:43:22.000000000 +0100
++++ zaptel-1.4/wcte12xp/Makefile 2008-02-03 17:46:02.000000000 +0100
+@@ -1,24 +1,22 @@
+ ifneq ($(KBUILD_EXTMOD),)
+-# We only get here on kernels 2.6.0-2.6.8 .
++# 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
+
+ else
+
++# building for 2.4 kernels means no VPM support, so none of the VPM support
++# modules are included in the Makefile rules
++
+ all: wcte12xp.o
+
+ %.o: %.c
+ $(CC) $(KFLAGS) -o $@ -c $<
+
+-base.o: ../zaptel.h vpmadt032.h
+-
+-vpmadt032.o: vpmadt032.h
+-
+-../firmware/zaptel-fw-vpmadt032.o: base.o
+- $(MAKE) -C ../firmware zaptel-fw-vpmadt032.o
++base.o: ../zaptel.h
+
+-wcte12xp.o: base.o vpmadt032.o GpakApi.o ../firmware/zaptel-fw-vpmadt032.o
++wcte12xp.o: base.o
+ $(LD) -r -o $@ $^
+
+ clean:
+diff -uNr zaptel-1.4.8/wcte12xp/.svn/all-wcprops zaptel-1.4/wcte12xp/.svn/all-wcprops
+--- zaptel-1.4.8/wcte12xp/.svn/all-wcprops 1970-01-01 01:00:00.000000000 +0100
++++ zaptel-1.4/wcte12xp/.svn/all-wcprops 2008-02-03 17:46:02.000000000 +0100
+@@ -0,0 +1,71 @@
++K 25
++svn:wc:ra_dav:version-url
++V 47
++/svn/zaptel/!svn/ver/3748/branches/1.4/wcte12xp
++END
++vpmadt032.c
++K 25
++svn:wc:ra_dav:version-url
++V 59
++/svn/zaptel/!svn/ver/3731/branches/1.4/wcte12xp/vpmadt032.c
++END
++GpakApi.h
++K 25
++svn:wc:ra_dav:version-url
++V 57
++/svn/zaptel/!svn/ver/3371/branches/1.4/wcte12xp/GpakApi.h
++END
++wcte12xp.h
++K 25
++svn:wc:ra_dav:version-url
++V 58
++/svn/zaptel/!svn/ver/3738/branches/1.4/wcte12xp/wcte12xp.h
++END
++GpakErrs.h
++K 25
++svn:wc:ra_dav:version-url
++V 58
++/svn/zaptel/!svn/ver/3371/branches/1.4/wcte12xp/GpakErrs.h
++END
++vpmadt032.h
++K 25
++svn:wc:ra_dav:version-url
++V 59
++/svn/zaptel/!svn/ver/3649/branches/1.4/wcte12xp/vpmadt032.h
++END
++GpakHpi.h
++K 25
++svn:wc:ra_dav:version-url
++V 57
++/svn/zaptel/!svn/ver/3371/branches/1.4/wcte12xp/GpakHpi.h
++END
++Kbuild
++K 25
++svn:wc:ra_dav:version-url
++V 54
++/svn/zaptel/!svn/ver/3721/branches/1.4/wcte12xp/Kbuild
++END
++base.c
++K 25
++svn:wc:ra_dav:version-url
++V 54
++/svn/zaptel/!svn/ver/3738/branches/1.4/wcte12xp/base.c
++END
++GpakApi.c
++K 25
++svn:wc:ra_dav:version-url
++V 57
++/svn/zaptel/!svn/ver/3371/branches/1.4/wcte12xp/GpakApi.c
++END
++Makefile
++K 25
++svn:wc:ra_dav:version-url
++V 56
++/svn/zaptel/!svn/ver/3748/branches/1.4/wcte12xp/Makefile
++END
++gpakenum.h
++K 25
++svn:wc:ra_dav:version-url
++V 58
++/svn/zaptel/!svn/ver/3371/branches/1.4/wcte12xp/gpakenum.h
++END
+diff -uNr zaptel-1.4.8/wcte12xp/.svn/dir-prop-base zaptel-1.4/wcte12xp/.svn/dir-prop-base
+--- zaptel-1.4.8/wcte12xp/.svn/dir-prop-base 1970-01-01 01:00:00.000000000 +0100
++++ zaptel-1.4/wcte12xp/.svn/dir-prop-base 2008-02-03 17:46:02.000000000 +0100
+@@ -0,0 +1,8 @@
++K 10
++svn:ignore
++V 19
++*.mod.c
++*.cmd
++*.ko
++
++END
+diff -uNr zaptel-1.4.8/wcte12xp/.svn/entries zaptel-1.4/wcte12xp/.svn/entries
+--- zaptel-1.4.8/wcte12xp/.svn/entries 1970-01-01 01:00:00.000000000 +0100
++++ zaptel-1.4/wcte12xp/.svn/entries 2008-02-03 17:46:02.000000000 +0100
+@@ -0,0 +1,160 @@
++8
|
