merge vpm450m support

git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@1206 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 22 insertions, 16 deletions

diff --git a/Makefile b/Makefile
index df066b9..776bde5 100644
--- a/Makefile
+++ b/Makefile
@@ -5,9 +5,11 @@
 #
 #
 
-PWD:=$(shell pwd)
 
 HOSTCC=gcc
+ifeq ($(PWD),)
+PWD:=$(shell pwd)
+endif
 # If you want to build for a kernel other than the current kernel, set KVERS
 ifndef KVERS
 KVERS:=$(shell uname -r)
@@ -22,7 +24,7 @@ ifndef KSRC
 endif
 KINCLUDES:=$(KSRC)/include
 
-CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
+CFLAGS+=-I. -Iinclude -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
 CFLAGS_PPC:=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
 CFLAGS_X86-64:=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
 CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X86-64)
@@ -45,7 +47,6 @@ KFLAGS+=-DSTANDALONE_ZAPATA
 CFLAGS+=-DSTANDALONE_ZAPATA
 KMAKE:= $(MAKE) -C $(KSRC) SUBDIRS=$(PWD)
 KMAKE_INST:= $(KMAKE) INSTALL_MOD_PATH=$(INSTALL_PREFIX) INSTALL_MOD_DIR=misc modules_install
-EXTRA_CFLAGS:=-I$(src)
 
 ROOT_PREFIX=
 INSTALL_PREFIX:=$(DESTDIR)
@@ -110,7 +111,9 @@ MODULESKO:=$(MODULES:%=%.ko)
 
 MOD_DESTDIR:=zaptel
 
+EXTRA_CFLAGS:=-I$(PWD)/include  -I$(PWD)/include/oct6100api
 obj-m:=$(MODULESO)
+wct4xxp-objs:=wct4xxp_base.o vpm450m.o
 
 # Also build xpp in the subdirectory xpp/ . But only for >=2.6.10 and only 
 # for i386. On other archs the module will probably build but panic.
@@ -128,9 +131,9 @@ BINS=ztcfg torisatool makefw ztmonitor ztspeed $(ZTTOOL) zttest fxotune
 
 all: $(BUILDVER) $(LIBTONEZONE_SO)
 
-linux24: prereq $(MODULESO) $(BINS)
+linux24: prereq vpm450m_fw.h $(MODULESO) $(BINS)
 
-linux26: prereq $(BINS)
+linux26: prereq vpm450m_fw.h $(BINS)
 	@echo $(KSRC)
 	@if [ -z "$(KSRC)" -o ! -d "$(KSRC)" ]; then echo "You do not appear to have the sources for the $(KVERS) kernel installed."; exit 1 ; fi
 	$(KMAKE) modules
@@ -170,8 +173,14 @@ pciradio.o: radfw.h
 
 ztdummy.o: ztdummy.h
 
-$(MODULESO): %.o: %.c zaptel.h
-	$(HOSTCC) $(KFLAGS) -o $@ -c $<
+$(filter-out wct4xxp.o,$(MODULESO)) wct4xxp_base.o: %.o: %.c zaptel.h
+	$(CC) $(KFLAGS) -o $@ -c $<
+
+vpm450m.o: vpm450m.c zaptel.h
+	$(CC) $(KFLAGS) -I$(PWD)/include  -I$(PWD)/include/oct6100api -o $@ -c $<
+
+wct4xxp.o: wct4xxp_base.o vpm450m.o
+	$(LD) -r -o $@ wct4xxp_base.o vpm450m.o
 
 tor2ee.o: tor2-hw.h
 
@@ -199,6 +208,11 @@ radfw.h: makefw pciradio.rbt
 gendigits: gendigits.o
 	$(CC) -o $@ $^ -lm
 
+fw2h: CFLAGS=
+
+vpm450m_fw.h: OCT6114-128D.ima fw2h
+	./fw2h $< $@
+
 zaptel.c: tones.h 
 
 prereq: tones.h tor2fw.h radfw.h version.h
@@ -372,15 +386,6 @@ update:
 			grep ^C update.out | cut -b4- ; \
 		fi ; \
 		rm -f update.out; \
-	elif [ -d CVS ]; then \
-		echo "Updating from CVS..." ; \
-		cvs -q -z3 update -Pd | tee update.out; \
-		rm -f .version; \
-		if [ `grep -c ^C update.out` -gt 0 ]; then \
-			echo ; echo "The following files have conflicts:" ; \
-			grep ^C update.out | cut -d' ' -f2- ; \
-		fi ; \
-		rm -f update.out; \
 	else \
 		echo "Not under version control";  \
 	fi
@@ -400,5 +405,6 @@ endif
 	rm -f fxotune
 	rm -f core
 	rm -f ztcfg-shared fxstest
+	rm -f fw2h vpm450m_fw.h
 
 FORCE: