[zaptel-commits] kpfleming: branch 1.4 r3738 - /branches/1.4/wcte12xp/

[SVN commits to the Zaptel project]

Author: kpfleming
Date: Fri Jan 25 17:13:41 2008
New Revision: 3738

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3738
Log:
make wcte12xp build successfully on 2.4 kernels, although it won't have VPM support

(closes issue #11514)
Reported by: tzafrir

Modified:
    branches/1.4/wcte12xp/Makefile
    branches/1.4/wcte12xp/base.c
    branches/1.4/wcte12xp/wcte12xp.h

Modified: branches/1.4/wcte12xp/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/wcte12xp/Makefile?view=diff&rev=3738&r1=3737&r2=3738
==============================================================================
--- branches/1.4/wcte12xp/Makefile (original)
+++ branches/1.4/wcte12xp/Makefile Fri Jan 25 17:13:41 2008
@@ -6,19 +6,17 @@
 
 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
+base.o: ../zaptel.h
 
-vpmadt032.o: vpmadt032.h
-
-../firmware/zaptel-fw-vpmadt032.o: base.o
-	$(MAKE) -C ../firmware zaptel-fw-vpmadt032.o
-
-wcte12xp.o: base.o vpmadt032.o GpakApi.o ../firmware/zaptel-fw-vpmadt032.o
+wcte12xp.o: base.o
 	$(LD) -r -o $@ $^
 
 clean:

Modified: branches/1.4/wcte12xp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wcte12xp/base.c?view=diff&rev=3738&r1=3737&r2=3738
==============================================================================
--- branches/1.4/wcte12xp/base.c (original)
+++ branches/1.4/wcte12xp/base.c Fri Jan 25 17:13:41 2008
@@ -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;
 
@@ -1355,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);
 
@@ -2015,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)

Modified: branches/1.4/wcte12xp/wcte12xp.h
URL: http://svn.digium.com/view/zaptel/branches/1.4/wcte12xp/wcte12xp.h?view=diff&rev=3738&r1=3737&r2=3738
==============================================================================
--- branches/1.4/wcte12xp/wcte12xp.h (original)
+++ branches/1.4/wcte12xp/wcte12xp.h Fri Jan 25 17:13:41 2008
@@ -31,8 +31,10 @@
 #ifndef _WCTE12XP_H
 #define _WCTE12XP_H
 
+#ifdef LINUX26
 /* Comment to disable VPM support */
 #define VPM_SUPPORT 1
+#endif
 
 #define WC_MAX_IFACES 8