[zaptel-commits] trunk r950 - in /trunk: ./ xpp/
zaptel-commits at lists.digium.com
zaptel-commits at lists.digium.com
Tue Feb 14 19:26:17 MST 2006
Author: kpfleming
Date: Tue Feb 14 20:26:14 2006
New Revision: 950
URL: http://svn.digium.com/view/zaptel?rev=950&view=rev
Log:
Merged revisions 949 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r949 | kpfleming | 2006-02-14 20:24:18 -0600 (Tue, 14 Feb 2006) | 2 lines
initial import of Xorcom Astribank driver (issue #6452, with minor mods)
........
Added:
trunk/README.Astribank
- copied unchanged from r949, branches/1.2/README.Astribank
trunk/xpp/
- copied from r949, branches/1.2/xpp/
trunk/xpp/FPGA_XPD.hex
- copied unchanged from r949, branches/1.2/xpp/FPGA_XPD.hex
trunk/xpp/Makefile
- copied unchanged from r949, branches/1.2/xpp/Makefile
trunk/xpp/card_fxs.c
- copied unchanged from r949, branches/1.2/xpp/card_fxs.c
trunk/xpp/card_fxs.h
- copied unchanged from r949, branches/1.2/xpp/card_fxs.h
trunk/xpp/card_global.c
- copied unchanged from r949, branches/1.2/xpp/card_global.c
trunk/xpp/card_global.h
- copied unchanged from r949, branches/1.2/xpp/card_global.h
trunk/xpp/cards.c
- copied unchanged from r949, branches/1.2/xpp/cards.c
trunk/xpp/cards.h
- copied unchanged from r949, branches/1.2/xpp/cards.h
trunk/xpp/gen_slic_init
- copied unchanged from r949, branches/1.2/xpp/gen_slic_init
trunk/xpp/slic.c
- copied unchanged from r949, branches/1.2/xpp/slic.c
trunk/xpp/slic.h
- copied unchanged from r949, branches/1.2/xpp/slic.h
trunk/xpp/slic_init.inc
- copied unchanged from r949, branches/1.2/xpp/slic_init.inc
trunk/xpp/sync.sh
- copied unchanged from r949, branches/1.2/xpp/sync.sh
trunk/xpp/xdefs.h
- copied unchanged from r949, branches/1.2/xpp/xdefs.h
trunk/xpp/xpd.h
- copied unchanged from r949, branches/1.2/xpp/xpd.h
trunk/xpp/xpp_fxloader
- copied unchanged from r949, branches/1.2/xpp/xpp_fxloader
trunk/xpp/xpp_fxloader.usermap
- copied unchanged from r949, branches/1.2/xpp/xpp_fxloader.usermap
trunk/xpp/xpp_modprobe
- copied unchanged from r949, branches/1.2/xpp/xpp_modprobe
trunk/xpp/xpp_proto.c
- copied unchanged from r949, branches/1.2/xpp/xpp_proto.c
trunk/xpp/xpp_proto.h
- copied unchanged from r949, branches/1.2/xpp/xpp_proto.h
trunk/xpp/xpp_usb.c
- copied unchanged from r949, branches/1.2/xpp/xpp_usb.c
trunk/xpp/xpp_zap.c
- copied unchanged from r949, branches/1.2/xpp/xpp_zap.c
trunk/xpp/xpp_zap.h
- copied unchanged from r949, branches/1.2/xpp/xpp_zap.h
trunk/xpp/xproto.c
- copied unchanged from r949, branches/1.2/xpp/xproto.c
trunk/xpp/xproto.h
- copied unchanged from r949, branches/1.2/xpp/xproto.h
trunk/xpp/zap_debug.c
- copied unchanged from r949, branches/1.2/xpp/zap_debug.c
trunk/xpp/zap_debug.h
- copied unchanged from r949, branches/1.2/xpp/zap_debug.h
Modified:
trunk/ (props changed)
trunk/Makefile
Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Tue Feb 14 20:26:14 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-916,918-936,938-947
+/branches/1.2:1-916,918-936,938-949
Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=950&r1=949&r2=950&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Tue Feb 14 20:26:14 2006
@@ -1,7 +1,7 @@
#
# Makefile for Zaptel driver modules and utilities
#
-# Copyright (C) 2001-2005 Digium, Inc.
+# Copyright (C) 2001-2006 Digium, Inc.
#
#
BASEADDR=0xd0000
@@ -138,6 +138,7 @@
LIBTONEZONE_SO:=libtonezone.so
LIBTONEZONE_SO_MAJOR_VER:=1
LIBTONEZONE_SO_MINOR_VER:=0
+
MODULES:=zaptel tor2 torisa wcusb wcfxo wctdm wctdm24xxp \
ztdynamic ztd-eth wct1xxp wct4xxp wcte11xp pciradio \
ztd-loc # ztdummy
@@ -146,6 +147,7 @@
ifeq (${BUILDVER},linux26)
MODULES+=ztdummy
endif
+
MODULESO:=$(MODULES:%=%.o)
MODULESKO:=$(MODULES:%=%.ko)
ifeq ($(BUILDVER),linux26)
@@ -159,6 +161,14 @@
INC_DIR:=$(INSTALL_PREFIX)/usr/include
MOD_DIR:=$(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc
+MOD_DESTDIR:=zaptel
+
+obj-m:=$(MODULESO) ${XPPMOD}
+
+ifneq ($(filter xpp,${MAKECMDGOALS}),)
+XPPMOD=xpp/
+endif
+
ifneq (,$(wildcard /usr/include/newt.h))
ZTTOOL:=zttool
endif
@@ -183,15 +193,13 @@
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)
+ $(KMAKE) XPPMOD=$(XPPMOD) modules
+
+xpp: linux26
#ifneq ($(TOPDIR),)
#include $(TOPDIR)/Rules.make
#endif
-
-MOD_DESTDIR:=zaptel
version.h: FORCE
ZAPTELVERSION="${ZAPTELVERSION}" build_tools/make_version_h > $@.tmp
@@ -211,15 +219,15 @@
torisa.o: torisa.h
wcusb.o: wcusb.h
-
+
wcfxsusb.o: wcfxsusb.h
-
+
wctdm.o: wctdm.h
-
+
wctdm24xxp.o: wctdm.h
-
+
pciradio.o: radfw.h
-
+
ztdummy.o: ztdummy.h
$(MODULESO): %.o: %.c zaptel.h
@@ -489,6 +497,8 @@
ifeq (${BUILDVER},linux26)
$(KMAKE) clean
endif
+ rm -f xpp/*.ko xpp/*.mod.c xpp/.*o.cmd
+ rm -f xpp/*.o xpp/*.mod.o
rm -rf .tmp_versions
rm -f gendigits tones.h
rm -f libtonezone*
More information about the zaptel-commits
mailing list