[svn-commits] kpfleming: branch 1.2 r1359 - in /branches/1.2: ./
include/ wct4xxp/
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Sat Aug 26 19:02:43 MST 2006
Author: kpfleming
Date: Sat Aug 26 21:02:42 2006
New Revision: 1359
URL: http://svn.digium.com/view/zaptel?rev=1359&view=rev
Log:
merge in new, cleaner Octasic API integration
Added:
branches/1.2/wct4xxp/ (props changed)
- copied from r1358, team/group/new_octasic_build/wct4xxp/
branches/1.2/wct4xxp/Kbuild
- copied unchanged from r1358, team/group/new_octasic_build/wct4xxp/Kbuild
branches/1.2/wct4xxp/Makefile
- copied unchanged from r1358, team/group/new_octasic_build/wct4xxp/Makefile
branches/1.2/wct4xxp/OCT6114-128D.ima
- copied unchanged from r1358, team/group/new_octasic_build/wct4xxp/OCT6114-128D.ima
branches/1.2/wct4xxp/base.c
- copied unchanged from r1358, team/group/new_octasic_build/wct4xxp/base.c
branches/1.2/wct4xxp/fw2h.c
- copied unchanged from r1358, team/group/new_octasic_build/wct4xxp/fw2h.c
branches/1.2/wct4xxp/vpm450m.c
- copied unchanged from r1358, team/group/new_octasic_build/wct4xxp/vpm450m.c
branches/1.2/wct4xxp/vpm450m.h
- copied unchanged from r1358, team/group/new_octasic_build/wct4xxp/vpm450m.h
branches/1.2/wct4xxp/wct4xxp-diag.c
- copied unchanged from r1358, team/group/new_octasic_build/wct4xxp/wct4xxp-diag.c
branches/1.2/wct4xxp/wct4xxp.h
- copied unchanged from r1358, team/group/new_octasic_build/wct4xxp/wct4xxp.h
Removed:
branches/1.2/OCT6114-128D.ima
branches/1.2/fw2h.c
branches/1.2/include/
branches/1.2/octapi_bt0_private.h
branches/1.2/octapi_llman_private.h
branches/1.2/octvpm.h
branches/1.2/vpm450m.c
branches/1.2/vpm450m.h
branches/1.2/wct4xxp-diag.c
branches/1.2/wct4xxp.h
branches/1.2/wct4xxp_base.c
Modified:
branches/1.2/ (props changed)
branches/1.2/Makefile
branches/1.2/wcte11xp.c
Propchange: branches/1.2/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Sat Aug 26 21:02:42 2006
@@ -1,0 +1,1 @@
+oct612x http://svn.digium.com/svn/octasic_api/oct612x/tags/PR43-00/software
Propchange: branches/1.2/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Aug 26 21:02:42 2006
@@ -21,3 +21,4 @@
*.so
*.a
version.h
+Modules.symvers
Modified: branches/1.2/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/Makefile?rev=1359&r1=1358&r2=1359&view=diff
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Sat Aug 26 21:02:42 2006
@@ -23,7 +23,7 @@
endif
KINCLUDES:=$(KSRC)/include
-CFLAGS+=-I. -Iinclude -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
+CFLAGS+=-I. -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)
@@ -105,7 +105,7 @@
LIBTONEZONE_SO_MINOR_VER:=0
MODULES:=zaptel tor2 torisa wcusb wcfxo wctdm wctdm24xxp \
- ztdynamic ztd-eth wct1xxp wct4xxp wcte11xp pciradio \
+ ztdynamic ztd-eth wct1xxp wcte11xp pciradio \
ztd-loc # ztdummy
#MODULES+=wcfxsusb
# build ztdummy by default for 2.6 kernels
@@ -118,9 +118,8 @@
MOD_DESTDIR:=zaptel
-EXTRA_CFLAGS:=-I$(SUBDIRS)/include -I$(SUBDIRS)/include/oct6100api
obj-m:=$(MODULESO)
-wct4xxp-objs:=wct4xxp_base.o vpm450m.o
+obj-m+=wct4xxp/
# 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.
@@ -138,18 +137,12 @@
all: $(BUILDVER) $(LIBTONEZONE_SO)
-linux24: prereq vpm450m_fw.h $(MODULESO) $(BINS)
-
-linux26: prereq vpm450m_fw.h $(BINS)
+linux24: prereq $(MODULESO) wct4xxp/wct4xxp.o $(BINS)
+
+linux26: prereq $(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
-
-obj-m += $(MODULESO)
-
-#ifneq ($(TOPDIR),)
-#include $(TOPDIR)/Rules.make
-#endif
+ $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) modules
version.h: FORCE
ZAPTELVERSION="${ZAPTELVERSION}" build_tools/make_version_h > $@.tmp
@@ -158,6 +151,9 @@
fi
rm -f $@.tmp
+wct4xxp/wct4xxp.o:
+ $(MAKE) -C wct4xxp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
+
devel: tor2ee
tests: patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
@@ -180,14 +176,8 @@
ztdummy.o: ztdummy.h
-$(filter-out wct4xxp.o,$(MODULESO)) wct4xxp_base.o: %.o: %.c zaptel.h
+$(MODULESO): %.o: %.c zaptel.h
$(CC) $(KFLAGS) -o $@ -c $<
-
-vpm450m.o: vpm450m.c zaptel.h
- $(CC) $(KFLAGS) -I$(PWD)/include -I$(PWD)/include/oct6100api -I$(SUBDIRS)/include -I$(SUBDIRS)/include/oct6100api -o $@ -c $<
-
-wct4xxp.o: wct4xxp_base.o vpm450m.o
- $(LD) -r -o $@ wct4xxp_base.o vpm450m.o
tor2ee.o: tor2-hw.h
@@ -214,11 +204,6 @@
gendigits: gendigits.o
$(CC) -o $@ $^ -lm
-
-fw2h: CFLAGS=
-
-vpm450m_fw.h: OCT6114-128D.ima fw2h
- ./fw2h $< $@
zaptel.c: tones.h
@@ -424,7 +409,9 @@
rm -f *.o ztcfg tzdriver sethdlc sethdlc-new
rm -f $(TZOBJS) $(LIBTONEZONE_SO) *.lo
ifeq ($(BUILDVER),linux26)
- $(KMAKE) clean
+ $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) clean
+else
+ $(MAKE) -C wct4xxp clean
endif
rm -rf .tmp_versions
rm -f gendigits tones.h
@@ -433,6 +420,5 @@
rm -f fxotune
rm -f core
rm -f ztcfg-shared fxstest
- rm -f fw2h vpm450m_fw.h
FORCE:
Propchange: branches/1.2/wct4xxp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 26 21:02:42 2006
@@ -1,0 +1,5 @@
+*.mod.c
+*.cmd
+*.ko
+vpm450m_fw.h
+fw2h
Modified: branches/1.2/wcte11xp.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wcte11xp.c?rev=1359&r1=1358&r2=1359&view=diff
==============================================================================
--- branches/1.2/wcte11xp.c (original)
+++ branches/1.2/wcte11xp.c Sat Aug 26 21:02:42 2006
@@ -43,7 +43,8 @@
#include <linux/moduleparam.h>
#endif
-#include "wct4xxp.h" /* For certain definitions */
+/* XXX: fix this */
+#include "wct4xxp/wct4xxp.h" /* For certain definitions */
#define WC_MAX_CARDS 32
More information about the svn-commits
mailing list