[svn-commits] kpfleming: linux/trunk r4377 - in /linux/trunk: ./ drivers/dahdi/ drivers/dah...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue Jun 17 15:22:36 CDT 2008
Author: kpfleming
Date: Tue Jun 17 15:22:36 2008
New Revision: 4377
URL: http://svn.digium.com/view/dahdi?view=rev&rev=4377
Log:
commit a bunch of stuff, primarily basic support for allowing drivers/dahdi and include/dahdi to be 'dropped in' to a Linux kernel tree and be part of the buildsystem
also includes a bunch of minor Makefile improvements, and relocating the firmware directory to the directory where the modules live, since that is the only place it is needed
still left to do: handle version.h creation when in native-kernel-tree mode, fix up lots of problems left with firmware file handling
Added:
linux/trunk/Kbuild (with props)
linux/trunk/drivers/dahdi/Kconfig (with props)
linux/trunk/drivers/dahdi/firmware/
- copied from r4368, linux/trunk/firmware/
linux/trunk/drivers/dahdi/firmware/Makefile
- copied unchanged from r4376, linux/trunk/firmware/Makefile
linux/trunk/drivers/dahdi/xpp/Kconfig (with props)
linux/trunk/include/dahdi/Kbuild (with props)
Removed:
linux/trunk/firmware/
Modified:
linux/trunk/ (props changed)
linux/trunk/Makefile
linux/trunk/drivers/dahdi/Kbuild
linux/trunk/drivers/dahdi/Makefile
linux/trunk/drivers/dahdi/dahdi-base.c
linux/trunk/drivers/dahdi/wct4xxp/Kbuild
linux/trunk/drivers/dahdi/wct4xxp/Makefile
linux/trunk/drivers/dahdi/wctc4xxp/Kbuild
linux/trunk/drivers/dahdi/wctc4xxp/Makefile
linux/trunk/drivers/dahdi/wctdm24xxp/Kbuild
linux/trunk/drivers/dahdi/wctdm24xxp/Makefile
linux/trunk/drivers/dahdi/wcte12xp/Kbuild
linux/trunk/drivers/dahdi/wcte12xp/Makefile
linux/trunk/drivers/dahdi/xpp/Kbuild
linux/trunk/include/dahdi/ (props changed)
Propchange: linux/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jun 17 15:22:36 2008
@@ -1,1 +1,2 @@
-version.h
+.tmp_versions
+Module.symvers
Added: linux/trunk/Kbuild
URL: http://svn.digium.com/view/dahdi/linux/trunk/Kbuild?view=auto&rev=4377
==============================================================================
--- linux/trunk/Kbuild (added)
+++ linux/trunk/Kbuild Tue Jun 17 15:22:36 2008
@@ -1,0 +1,6 @@
+obj-m += drivers/dahdi/
+header-y += include/dahdi/
+
+# ensure that our local include files can be found by all modules
+
+CFLAGS_MODULE += -I$(DAHDI_INCLUDE)
Propchange: linux/trunk/Kbuild
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: linux/trunk/Kbuild
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: linux/trunk/Kbuild
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: linux/trunk/Makefile
URL: http://svn.digium.com/view/dahdi/linux/trunk/Makefile?view=diff&rev=4377&r1=4376&r2=4377
==============================================================================
--- linux/trunk/Makefile (original)
+++ linux/trunk/Makefile Tue Jun 17 15:22:36 2008
@@ -1,17 +1,31 @@
#
-# Makefile for DAHDI driver modules
+# Makefile for DAHDI Linux kernel modules
#
# Copyright (C) 2001-2008 Digium, Inc.
#
#
+# This Makefile is used both by the kernel build system (to set
+# a number of variables before descending into the real module
+# build directory) and by the top-level 'make' process. We can
+# determine which mode is needed by checking the KBUILD_EXTMOD
+# variable, although on reasonably new kernels the kernel build
+# system won't even use this file, it will just use the Kbuild
+# file directly.
+
+ifdef KBUILD_EXTMOD
+
+include $(src)/Kbuild
+
+else
+
PWD:=$(shell pwd)
-ifeq ($(ARCH),)
+ifndef ARCH
ARCH:=$(shell uname -m | sed -e s/i.86/i386/)
endif
-ifeq ($(DEB_HOST_GNU_TYPE),)
+ifndef DEB_HOST_GNU_TYPE
UNAME_M:=$(shell uname -m)
else
UNAME_M:=$(DEB_HOST_GNU_TYPE)
@@ -55,8 +69,7 @@
MODULE_ALIASES=wcfxs wctdm8xxp wct2xxp
-KMAKE = $(MAKE) -C $(KSRC) ARCH=$(ARCH) SUBDIRS=$(PWD)/drivers/dahdi DAHDI_INCLUDE=$(PWD)/include HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE)
-KMAKE_INST = $(KMAKE) INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=dahdi modules_install
+KMAKE = $(MAKE) -C $(KSRC) ARCH=$(ARCH) SUBDIRS=$(PWD) DAHDI_INCLUDE=$(PWD)/include HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE)
ifneq (,$(wildcard $(DESTDIR)/etc/udev/rules.d))
DYNFS=yes
@@ -66,25 +79,25 @@
CHKCONFIG := $(wildcard /sbin/chkconfig)
UPDATE_RCD := $(wildcard /usr/sbin/update-rc.d)
-ifeq (,$(DESTDIR))
- ifneq (,$(CHKCONFIG))
+ifndef DESTDIR
+ ifdef CHKCONFIG
ADD_INITD := $(CHKCONFIG) --add dahdi
else
- ifndef (,$(UPDATE_RCD))
+ ifdef UPDATE_RCD
ADD_INITD := $(UPDATE_RCD) dahdi defaults 15 30
endif
endif
endif
INITRD_DIR := $(firstword $(wildcard /etc/rc.d/init.d /etc/init.d))
-ifneq (,$(INITRD_DIR))
+ifdef INITRD_DIR
INIT_TARGET := $(DESTDIR)$(INITRD_DIR)/dahdi
COPY_INITD := install -D dahdi.init $(INIT_TARGET)
endif
RCCONF_DIR := $(firstword $(wildcard /etc/sysconfig /etc/default))
NETSCR_DIR := $(firstword $(wildcard /etc/sysconfig/network-scripts ))
-ifneq (,$(NETSCR_DIR))
+ifdef NETSCR_DIR
NETSCR_TARGET := $(DESTDIR)$(NETSCR_DIR)/ifup-hdlc
COPY_NETSCR := install -D ifup-hdlc $(NETSCR_TARGET)
endif
@@ -104,16 +117,16 @@
echo "You do not appear to have the sources for the $(KVERS) kernel installed."
exit 1
endif
- $(KMAKE) modules
-
-version.h:
+ $(KMAKE) modules DAHDI_BUILD_ALL=m
+
+include/dahdi/version.h:
@DAHDIVERSION="${DAHDIVERSION}" build_tools/make_version_h > $@.tmp
@if cmp -s $@.tmp $@ ; then :; else \
mv $@.tmp $@ ; \
fi
@rm -f $@.tmp
-prereq: version.h
+prereq: include/dahdi/version.h
stackcheck: checkstack modules
./checkstack kernel/*.ko kernel/*/*.ko
@@ -136,7 +149,7 @@
install-firmware:
ifeq ($(HOTPLUG_FIRMWARE),yes)
- $(MAKE) -C firmware hotplug-install DESTDIR=$(DESTDIR) HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE)
+ $(MAKE) -C drivers/dahdi/firmware hotplug-install DESTDIR=$(DESTDIR) HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE)
endif
install-include:
@@ -176,28 +189,28 @@
install-udev: devices
uninstall-hotplug:
- $(MAKE) -C firmware hotplug-uninstall DESTDIR=$(DESTDIR)
+ $(MAKE) -C drivers/dahdi/firmware hotplug-uninstall DESTDIR=$(DESTDIR)
uninstall-modules:
@./build_tools/uninstall-modules $(DESTDIR)/lib/modules/$(KVERS) $(ALL_MODULES)
install-modules: # uninstall-modules
- $(KMAKE_INST)
+ $(KMAKE) INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=dahdi modules_install
[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
config:
-ifneq (,$(COPY_INITD))
+ifdef COPY_INITD
$(COPY_INITD)
endif
-ifneq (,$(RCCONF_DIR))
+ifdef RCCONF_DIR
ifeq (,$(wildcard $(DESTDIR)$(RCCONF_DIR)/dahdi))
$(INSTALL) -D -m 644 dahdi.sysconfig $(DESTDIR)$(RCCONF_DIR)/dahdi
endif
endif
-ifneq (,$(COPY_NETSCR))
+ifdef COPY_NETSCR
$(COPY_NETSCR)
endif
-ifneq (,$(ADD_INITD))
+ifdef ADD_INITD
$(ADD_INITD)
endif
@echo "DAHDI has been configured."
@@ -225,11 +238,14 @@
clean:
$(KMAKE) clean
- $(MAKE) -C firmware clean
+ $(MAKE) -C drivers/dahdi/firmware clean
distclean: dist-clean
dist-clean: clean
- @$(MAKE) -C firmware dist-clean
+ @rm -f include/dahdi/version.h
+ @$(MAKE) -C drivers/dahdi/firmware dist-clean
.PHONY: distclean dist-clean clean version.h all install devices modules stackcheck install-udev config update install-modules install-include uninstall-modules
+
+endif # ifdef KBUILD_EXTMOD
Modified: linux/trunk/drivers/dahdi/Kbuild
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/Kbuild?view=diff&rev=4377&r1=4376&r2=4377
==============================================================================
--- linux/trunk/drivers/dahdi/Kbuild (original)
+++ linux/trunk/drivers/dahdi/Kbuild Tue Jun 17 15:22:36 2008
@@ -2,13 +2,37 @@
ECHO_CAN_CFLAGS := -DECHO_CAN_FROMENV -DECHO_CAN_$(ECHO_CAN_NAME)
endif
-obj-m := pciradio.o tor2.o wcfxo.o wct1xxp.o wctdm.o wcte11xp.o dahdi.o dahdi_dummy.o dahdi_dynamic.o dahdi_dynamic_eth.o dahdi_dynamic_loc.o dahdi_transcode.o
-obj-m += wct4xxp/ wctc4xxp/ wctdm24xxp/ wcte12xp/ xpp/
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI) += dahdi.o
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DUMMY) += dahdi_dummy.o
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DYNAMIC) += dahdi_dynamic.o
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DYNAMIC_LOC) += dahdi_dynamic_loc.o
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DYNAMIC_ETH) += dahdi_dynamic_eth.o
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_TRANSCODE) += dahdi_transcode.o
-CFLAGS_MODULE += -I$(DAHDI_INCLUDE)
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCT4XXP) += wct4xxp/
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTC4XXP) += wctc4xxp/
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTDM24XXP) += wctdm24xxp/
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTE12XP) += wcte12xp/
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTDM) += wctdm.o
-EXTRA_CFLAGS += -I$(src)
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCT1XXP) += wct1xxp.o
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTE11XP) += wcte11xp.o
+
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCFXO) += wcfxo.o
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_TOR2) += tor2.o
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_PCIRADIO) += pciradio.o
+
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_XPP) += xpp/
+
+CFLAGS_MODULE += -I$(src)
EXTRA_CFLAGS += $(ECHO_CAN_CFLAGS)
+
+ifndef HOTPLUG_FIRMWARE
+ifneq (,$(filter y m,$(CONFIG_FW_LOADER)))
+HOTPLUG_FIRMWARE := yes
+export HOTPLUG_FIRMWARE
+endif
+endif
# fix typo present in CentOS and RHEL 2.6.9 kernels
BAD_KERNELS_VERS := 22 34 34.0.1 34.0.2
@@ -65,8 +89,8 @@
# expand them:
DAHDIMMX_CONFIG_VALS := $(strip $(foreach var,$(DAHDIMMX_CONFIG_VARS),$(var)) )
-ifneq (,$(DAHDI_MMX_AUTO))
- ifneq (,$(DAHDIMMX_CONFIG_VALS))
+ifdef DAHDI_MMX_AUTO
+ ifdef DAHDIMMX_CONFIG_VALS
# TODO: make that
CFLAGS_dahdi-base.o += -DCONFIG_DAHDI_MMX
endif
Added: linux/trunk/drivers/dahdi/Kconfig
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/Kconfig?view=auto&rev=4377
==============================================================================
--- linux/trunk/drivers/dahdi/Kconfig (added)
+++ linux/trunk/drivers/dahdi/Kconfig Tue Jun 17 15:22:36 2008
@@ -1,0 +1,213 @@
+#
+# DAHDI configuration
+#
+
+menuconfig DAHDI
+ tristate "DAHDI support"
+ default m
+ ---help---
+ DAHDI basic infrastructure.
+
+ To compile this driver as a module, choose M here: the
+ module will be called dahdi.
+
+ If unsure, say Y.
+
+if DAHDI
+
+config DAHDI_WCTDM
+ tristate "Digium Wildcard TDM400P Support"
+ depends on DAHDI && PCI
+ default DAHDI
+ ---help---
+ This driver provides support for the Digium Wildcard TDM400P.
+
+ To compile this driver as a module, choose M here: the
+ module will be called wctdm.
+
+ If unsure, say Y.
+
+config DAHDI_WCT4XXP
+ tristate "Digium Wildcard dual- and quad-T1/E1/J1 Support"
+ depends on DAHDI && PCI
+ default DAHDI
+ ---help---
+ This driver provides support for the following Digium
+ Wildcard products:
+
+ * TE205/206/207/210/211/212P (PCI/PCI-X)
+ * TE220 (PCI-E)
+ * TE405/406/407/410/411/412P (PCI/PCI-X)
+ * TE420 (PCI-E)
+
+ To compile this driver as a module, choose M here: the
+ module will be called wct4xxp.
+
+ If unsure, say Y.
+
+config DAHDI_TRANSCODE
+ tristate "DAHDI transcoding support"
+ default DAHDI
+ ---help---
+ DAHDI transcoding infrastructure.
+
+ To compile this driver as a module, choose M here: the
+ module will be called dahdi_transcode.
+
+ If unsure, say Y.
+
+config DAHDI_WCTC4XXP
+ tristate "Digium Wildcard TC400B Support"
+ depends on DAHDI && DAHDI_TRANSCODE && PCI
+ default DAHDI
+ ---help---
+ This driver provides support for the Digium Wildcard TC400B.
+
+ To compile this driver as a module, choose M here: the
+ module will be called wctc4xxp.
+
+ If unsure, say Y.
+
+config DAHDI_WCTDM24XXP
+ tristate "Digium Wildcard VoiceBus analog card Support"
+ depends on DAHDI && PCI
+ default DAHDI
+ ---help---
+ This driver provides support for the following Digium
+ Wildcard products:
+
+ * TDM410P (PCI/PCI-X)
+ * AEX410 (PCI-E)
+ * TDM800P (PCI/PCI-X)
+ * AEX800 (PCI-E)
+ * TDM2400P (PCI/PCI-X)
+ * AEX2400 (PCI-E)
+
+ To compile this driver as a module, choose M here: the
+ module will be called wctdm24xxp.
+
+ If unsure, say Y.
+
+config DAHDI_WCTE12XP
+ tristate "Digium Wildcard VoiceBus digital card Support"
+ depends on DAHDI && PCI
+ default DAHDI
+ ---help---
+ This driver provides support for the following Digium
+ Wildcard products:
+
+ * TE120P (PCI/PCI-X)
+ * TE121 (PCI/PCI-X)
+ * TE122 (PCI-E)
+
+ To compile this driver as a module, choose M here: the
+ module will be called wcte12xp.
+
+ If unsure, say Y.
+
+config DAHDI_PCIRADIO
+ tristate "PCI Radio Support"
+ depends on DAHDI && PCI
+ default DAHDI
+ ---help---
+ To compile this driver as a module, choose M here: the
+ module will be called pciradio.
+
+ If unsure, say Y.
+
+config DAHDI_DUMMY
+ tristate "Dummy (no hardware) Timing Support"
+ depends on DAHDI
+ default DAHDI
+ ---help---
+ This module provides timing support for applications that
+ use DAHDI conference mixing services, pseudo channels or
+ for other purposes.
+
+ To compile this driver as a module, choose M here: the
+ module will be called dahdi_dummy.
+
+ If unsure, say Y.
+
+config DAHDI_DYNAMIC
+ tristate "Dynamic (virtual) Span Support"
+ depends on DAHDI
+ default DAHDI
+ ---help---
+ This module provides support for virtual spans, which are
+ emulated or provided using various technologies.
+
+ To compile this driver as a module, choose M here: the
+ module will be called dahdi_dynamic.
+
+ If unsure, say Y.
+
+config DAHDI_DYNAMIC_ETH
+ tristate "Ethernet (TDMoE) Span Support"
+ depends on DAHDI && DAHDI_DYNAMIC
+ default DAHDI
+ ---help---
+ This module provides support for spans over Ethernet,
+ using the TDMoE protocol.
+
+ To compile this driver as a module, choose M here: the
+ module will be called dahdi_dynamic_eth.
+
+ If unsure, say Y.
+
+config DAHDI_DYNAMIC_LOC
+ tristate "Local (loopback) Span Support"
+ depends on DAHDI && DAHDI_DYNAMIC
+ default DAHDI
+ ---help---
+ This module provides support for spans in the local system,
+ primarily used for looping and monitoring other spans.
+
+ To compile this driver as a module, choose M here: the
+ module will be called dahdi_dynamic_loc.
+
+ If unsure, say Y.
+
+config DAHDI_TOR2
+ tristate "Tormenta2 quad-port T1/E1 Support"
+ depends on DAHDI && PCI
+ default DAHDI
+ ---help---
+ To compile this driver as a module, choose M here: the
+ module will be called tor2.
+
+ If unsure, say Y.
+
+config DAHDI_WCFXO
+ tristate "Digium Wildcard X100P Support"
+ depends on DAHDI && PCI
+ default DAHDI
+ ---help---
+ To compile this driver as a module, choose M here: the
+ module will be called wcfxo.
+
+ If unsure, say Y.
+
+config DAHDI_WCT1XXP
+ tristate "Digium Wildcard T100P Support"
+ depends on DAHDI && PCI
+ default DAHDI
+ ---help---
+ To compile this driver as a module, choose M here: the
+ module will be called wct1xxp.
+
+ If unsure, say Y.
+
+config DAHDI_WCTE11XP
+ tristate "Digium Wildcard TE110P Support"
+ depends on DAHDI && PCI
+ default DAHDI
+ ---help---
+ To compile this driver as a module, choose M here: the
+ module will be called wcte11xp.
+
+ If unsure, say Y.
+
+source "drivers/dahdi/xpp/Kconfig"
+
+endif # DAHDI
Propchange: linux/trunk/drivers/dahdi/Kconfig
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: linux/trunk/drivers/dahdi/Kconfig
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: linux/trunk/drivers/dahdi/Kconfig
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: linux/trunk/drivers/dahdi/Makefile
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/Makefile?view=diff&rev=4377&r1=4376&r2=4377
==============================================================================
--- linux/trunk/drivers/dahdi/Makefile (original)
+++ linux/trunk/drivers/dahdi/Makefile Tue Jun 17 15:22:36 2008
@@ -1,4 +1,4 @@
-ifneq ($(KBUILD_EXTMOD),)
+ifdef KBUILD_EXTMOD
# We only get here on kernels 2.6.0-2.6.9 .
# For newer kernels, Kbuild will be included directly by the kernel
# build system.
Modified: linux/trunk/drivers/dahdi/dahdi-base.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=4377&r1=4376&r2=4377
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Tue Jun 17 15:22:36 2008
@@ -36,7 +36,6 @@
#include "dahdi_config.h"
-#include "../version.h"
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -80,6 +79,7 @@
#define FAST_HDLC_NEED_TABLES
#include "fasthdlc.h"
+#include <dahdi/version.h>
#include <dahdi/kernel.h>
#include <dahdi/user.h>
Modified: linux/trunk/drivers/dahdi/wct4xxp/Kbuild
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/wct4xxp/Kbuild?view=diff&rev=4377&r1=4376&r2=4377
==============================================================================
--- linux/trunk/drivers/dahdi/wct4xxp/Kbuild (original)
+++ linux/trunk/drivers/dahdi/wct4xxp/Kbuild Tue Jun 17 15:22:36 2008
@@ -1,6 +1,6 @@
-obj-m += wct4xxp.o
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCT4XXP) += wct4xxp.o
-FIRM_DIR := ../../firmware
+FIRM_DIR := ../firmware
EXTRA_CFLAGS := -I$(src)/.. $(shell $(src)/../oct612x/octasic-helper cflags $(src)/../oct612x) -Wno-undef
Modified: linux/trunk/drivers/dahdi/wct4xxp/Makefile
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/wct4xxp/Makefile?view=diff&rev=4377&r1=4376&r2=4377
==============================================================================
--- linux/trunk/drivers/dahdi/wct4xxp/Makefile (original)
+++ linux/trunk/drivers/dahdi/wct4xxp/Makefile Tue Jun 17 15:22:36 2008
@@ -1,4 +1,4 @@
-ifneq ($(KBUILD_EXTMOD),)
+ifdef KBUILD_EXTMOD
# We only get here on kernels 2.6.0-2.6.9 .
# For newer kernels, Kbuild will be included directly by the kernel
# build system.
Modified: linux/trunk/drivers/dahdi/wctc4xxp/Kbuild
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/wctc4xxp/Kbuild?view=diff&rev=4377&r1=4376&r2=4377
==============================================================================
--- linux/trunk/drivers/dahdi/wctc4xxp/Kbuild (original)
+++ linux/trunk/drivers/dahdi/wctc4xxp/Kbuild Tue Jun 17 15:22:36 2008
@@ -1,4 +1,4 @@
-obj-m += wctc4xxp.o
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTC4XXP) += wctc4xxp.o
FIRM_DIR := ../../firmware
Modified: linux/trunk/drivers/dahdi/wctc4xxp/Makefile
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/wctc4xxp/Makefile?view=diff&rev=4377&r1=4376&r2=4377
==============================================================================
--- linux/trunk/drivers/dahdi/wctc4xxp/Makefile (original)
+++ linux/trunk/drivers/dahdi/wctc4xxp/Makefile Tue Jun 17 15:22:36 2008
@@ -1,4 +1,4 @@
-ifneq ($(KBUILD_EXTMOD),)
+ifdef KBUILD_EXTMOD
# We only get here on kernels 2.6.0-2.6.9 .
# For newer kernels, Kbuild will be included directly by the kernel
# build system.
Modified: linux/trunk/drivers/dahdi/wctdm24xxp/Kbuild
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/wctdm24xxp/Kbuild?view=diff&rev=4377&r1=4376&r2=4377
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/Kbuild (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/Kbuild Tue Jun 17 15:22:36 2008
@@ -1,4 +1,4 @@
-obj-m += wctdm24xxp.o
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTDM24XXP) += wctdm24xxp.o
FIRM_DIR := ../../firmware
Modified: linux/trunk/drivers/dahdi/wctdm24xxp/Makefile
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/wctdm24xxp/Makefile?view=diff&rev=4377&r1=4376&r2=4377
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/Makefile (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/Makefile Tue Jun 17 15:22:36 2008
@@ -1,4 +1,4 @@
-ifneq ($(KBUILD_EXTMOD),)
+ifdef KBUILD_EXTMOD
# We only get here on kernels 2.6.0-2.6.9 .
# For newer kernels, Kbuild will be included directly by the kernel
# build system.
Modified: linux/trunk/drivers/dahdi/wcte12xp/Kbuild
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/wcte12xp/Kbuild?view=diff&rev=4377&r1=4376&r2=4377
==============================================================================
--- linux/trunk/drivers/dahdi/wcte12xp/Kbuild (original)
+++ linux/trunk/drivers/dahdi/wcte12xp/Kbuild Tue Jun 17 15:22:36 2008
@@ -1,4 +1,4 @@
-obj-m += wcte12xp.o
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTE12XP) += wcte12xp.o
FIRM_DIR := ../../firmware
Modified: linux/trunk/drivers/dahdi/wcte12xp/Makefile
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/wcte12xp/Makefile?view=diff&rev=4377&r1=4376&r2=4377
==============================================================================
--- linux/trunk/drivers/dahdi/wcte12xp/Makefile (original)
+++ linux/trunk/drivers/dahdi/wcte12xp/Makefile Tue Jun 17 15:22:36 2008
@@ -1,4 +1,4 @@
-ifneq ($(KBUILD_EXTMOD),)
+ifdef KBUILD_EXTMOD
# We only get here on kernels 2.6.0-2.6.9 .
# For newer kernels, Kbuild will be included directly by the kernel
# build system.
Modified: linux/trunk/drivers/dahdi/xpp/Kbuild
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/xpp/Kbuild?view=diff&rev=4377&r1=4376&r2=4377
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/Kbuild (original)
+++ linux/trunk/drivers/dahdi/xpp/Kbuild Tue Jun 17 15:22:36 2008
@@ -5,7 +5,6 @@
endif
EXTRA_CFLAGS = $(XPP_LOCAL_CFLAGS) \
- -I$(ZAP_KERNEL) \
-DDEBUG \
-DPOLL_DIGITAL_INPUTS \
-DWITH_ECHO_SUPPRESSION \
@@ -14,7 +13,11 @@
-g
#
-obj-m += xpp.o xpd_fxs.o xpd_fxo.o xpd_pri.o
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_XPP) += xpp.o
+obj-$(CONFIG_DAHDI_XPP_USB) += xpp_usb.o
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_XPD_FXS) += xpd_fxs.o
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_XPD_FXO) += xpd_fxo.o
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_XPD_PRI) += xpd_pri.o
HAS_BRISTUFF := $(shell grep '^[[:space:]]*\#[[:space:]]*define[[:space:]]\+CONFIG_ZAPATA_BRI_DCHANS\>' $(ZAP_KERNEL)/dahdi_config.h)
@@ -26,11 +29,11 @@
obj-m += xpd_bri.o
endif
-xpp-y += xbus-core.o xbus-sysfs.o xbus-pcm.o xframe_queue.o xpp_zap.o xproto.o card_global.o zap_debug.o
-xpd_fxs-y += card_fxs.o
-xpd_fxo-y += card_fxo.o
-xpd_bri-y += card_bri.o
-xpd_pri-y += card_pri.o
+xpp-objs += xbus-core.o xbus-sysfs.o xbus-pcm.o xframe_queue.o xpp_zap.o xproto.o card_global.o zap_debug.o
+xpd_fxs-objs += card_fxs.o
+xpd_fxo-objs += card_fxo.o
+xpd_bri-objs += card_bri.o
+xpd_pri-objs += card_pri.o
ifeq (y,$(PARPORT_DEBUG))
EXTRA_CFLAGS += -DDEBUG_SYNC_PARPORT
Added: linux/trunk/drivers/dahdi/xpp/Kconfig
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/xpp/Kconfig?view=auto&rev=4377
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/Kconfig (added)
+++ linux/trunk/drivers/dahdi/xpp/Kconfig Tue Jun 17 15:22:36 2008
@@ -1,0 +1,54 @@
+#
+# XPP configuration
+#
+
+menuconfig DAHDI_XPP
+ tristate "Xorcom Astribank Support"
+ depends on DAHDI && USB
+ default DAHDI
+ ---help---
+ Infrastructure support for Xorcom Astribank products.
+
+ To compile this driver as a module, choose M here: the
+ module will be called xpp.
+
+ If unsure, say Y.
+
+if DAHDI_XPP
+
+config DAHDI_XPP_USB
+ tristate
+ depends on DAHDI_XPP
+ default DAHDI_XPP
+
+config DAHDI_XPD_FXS
+ tristate "FXS port Support"
+ depends on DAHDI_XPP
+ default DAHDI_XPP
+ ---help---
+ To compile this driver as a module, choose M here: the
+ module will be called xpd_fxs.
+
+ If unsure, say Y.
+
+config DAHDI_XPD_FXO
+ tristate "FXO port Support"
+ depends on DAHDI_XPP
+ default DAHDI_XPP
+ ---help---
+ To compile this driver as a module, choose M here: the
+ module will be called xpd_fxo.
+
+ If unsure, say Y.
+
+config DAHDI_XPD_PRI
+ tristate "PRI port Support"
+ depends on DAHDI_XPP
+ default DAHDI_XPP
+ ---help---
+ To compile this driver as a module, choose M here: the
+ module will be called xpd_pri.
+
+ If unsure, say Y.
+
+endif # DAHDI_XPP
Propchange: linux/trunk/drivers/dahdi/xpp/Kconfig
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: linux/trunk/drivers/dahdi/xpp/Kconfig
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: linux/trunk/drivers/dahdi/xpp/Kconfig
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: linux/trunk/include/dahdi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jun 17 15:22:36 2008
@@ -1,0 +1,1 @@
+version.h
Added: linux/trunk/include/dahdi/Kbuild
URL: http://svn.digium.com/view/dahdi/linux/trunk/include/dahdi/Kbuild?view=auto&rev=4377
==============================================================================
--- linux/trunk/include/dahdi/Kbuild (added)
+++ linux/trunk/include/dahdi/Kbuild Tue Jun 17 15:22:36 2008
@@ -1,0 +1,4 @@
+header-y += kernel.h
+header-y += user.h
+header-y += wctdm_user.h
+header-y += version.h
Propchange: linux/trunk/include/dahdi/Kbuild
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: linux/trunk/include/dahdi/Kbuild
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: linux/trunk/include/dahdi/Kbuild
------------------------------------------------------------------------------
svn:mime-type = text/plain
More information about the svn-commits
mailing list