Merge the giant mess that is the Octasic API

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

1 files changed, 15 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index b13b1dc..6dd8397 100644
--- a/Makefile
+++ b/Makefile
@@ -7,9 +7,10 @@
 
 .EXPORT_ALL_VARIABLES:
 
-PWD:=$(shell pwd)
-
 HOSTCC=gcc
+ifeq ($(PWD),)
+PWD=$(shell pwd)
+endif
 ifeq ($(DEB_HOST_GNU_TYPE),)
 UNAME_M:=$(shell uname -m)
 else
@@ -30,7 +31,7 @@ endif
 KVERS_MAJ:=$(shell echo $(KVERS) | cut -d. -f1-2)
 KINCLUDES:=$(KSRC)/include
 
-CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
+CFLAGS+=-I. -Iinclude -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
 ifneq (,$(findstring ppc,$(UNAME_M)))
 CFLAGS_PPC:=-fsigned-char
 endif
@@ -137,7 +138,9 @@ MOD_DIR:=$(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc
 
 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.
@@ -156,7 +159,7 @@ UTILS:=tor2ee ztspeed zttool ztmonitor sethdlc-new \
   usbfxstest fxstest fxotune fxsdump ztdiag
 UTILSO:=$(UTILS:%=%.o)
 
-all: modules $(LIBTONEZONE_SO)
+all: vpm450m_fw.h modules $(LIBTONEZONE_SO)
 
 programs: $(BINS)
 
@@ -186,6 +189,8 @@ devel: tor2ee
 
 tests: patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
 
+wct4xxp.o: wct4xxp_base.o vpm450m.c vpm450m_fw.h
+
 tor2.o: tor2-hw.h tor2fw.h
 
 zaptel.o: digits.h arith.h sec.h mec.h sec-2.h mec2.h mec3.h zconfig.h
@@ -226,6 +231,9 @@ tones.h: gendigits
 tor2fw.h: makefw tormenta2.rbt
 	./makefw tormenta2.rbt tor2fw > tor2fw.h
 
+vpm450m_fw.h: fw2h OCT6114-128D.ima
+	./fw2h OCT6114-128D.ima vpm450m_fw.h
+
 radfw.h: makefw pciradio.rbt
 	./makefw pciradio.rbt radfw > radfw.h
 
@@ -417,15 +425,15 @@ install-programs: $(BINS) $(LIBTONEZONE) libtonezone.a
 	install -m 644 zaptel.h torisa.h $(INC_DIR)/linux
 
 install-modules: install-$(BUILDVER)
-install-linux24: $(MODULES_BUILD)
+install-linux24: vpm450m_fw.h.o$(MODULES_BUILD)
 	install -d $(MOD_DIR)
 	install -m 644 $(MODULES_BUILD) $(MOD_DIR)
 
-install-linux26: $(MODULESKO)
+install-linux26: vpm450m_fw.h $(MODULESKO)
 	$(KMAKE_INST)
 
 clean:
-	rm -f torisatool makefw tor2fw.h radfw.h
+	rm -f torisatool makefw tor2fw.h radfw.h fw2h
 	rm -f $(BINS)
 	rm -f *.o ztcfg tzdriver sethdlc sethdlc-new
 	rm -f $(TZOBJS) $(LIBTONEZONE_SO) *.lo