[svn-commits] kpfleming: branch linux/kpfleming/modular_ec r4399 - /linux/team/kpfleming/mo...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Jun 18 17:43:36 CDT 2008
Author: kpfleming
Date: Wed Jun 18 17:43:35 2008
New Revision: 4399
URL: http://svn.digium.com/view/dahdi?view=rev&rev=4399
Log:
get rid of some more stuff that is no longer necessary
Modified:
linux/team/kpfleming/modular_ec/drivers/dahdi/Kbuild
linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi-base.c
linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_config.h
Modified: linux/team/kpfleming/modular_ec/drivers/dahdi/Kbuild
URL: http://svn.digium.com/view/dahdi/linux/team/kpfleming/modular_ec/drivers/dahdi/Kbuild?view=diff&rev=4399&r1=4398&r2=4399
==============================================================================
--- linux/team/kpfleming/modular_ec/drivers/dahdi/Kbuild (original)
+++ linux/team/kpfleming/modular_ec/drivers/dahdi/Kbuild Wed Jun 18 17:43:35 2008
@@ -1,7 +1,3 @@
-ifdef ECHO_CAN_NAME
- ECHO_CAN_CFLAGS := -DECHO_CAN_FROMENV -DECHO_CAN_$(ECHO_CAN_NAME)
-endif
-
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
@@ -31,7 +27,6 @@
obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_MG2) += dahdi_echocan_mg2.o
CFLAGS_MODULE += -I$(src)
-EXTRA_CFLAGS += $(ECHO_CAN_CFLAGS)
ifndef HOTPLUG_FIRMWARE
ifneq (,$(filter y m,$(CONFIG_FW_LOADER)))
Modified: linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi-base.c
URL: http://svn.digium.com/view/dahdi/linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi-base.c?view=diff&rev=4399&r1=4398&r2=4399
==============================================================================
--- linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi-base.c (original)
+++ linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi-base.c Wed Jun 18 17:43:35 2008
@@ -149,9 +149,6 @@
static struct proc_dir_entry *proc_entries[DAHDI_MAX_SPANS];
#endif
-/* udev necessary data structures. Yeah! */
-#ifdef CONFIG_DAHDI_UDEV
-
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
#define CLASS_DEV_CREATE(class, devt, device, name) \
class_device_create(class, NULL, devt, device, name)
@@ -169,8 +166,6 @@
#define class_device_create class_simple_device_add
#define class_device_destroy(a, b) class_simple_device_remove(b)
#endif
-
-#endif /* CONFIG_DAHDI_UDEV */
static int deftaps = 64;
@@ -5049,7 +5044,6 @@
proc_entries[span->spanno] = create_proc_read_entry(tempfile, 0444, NULL , dahdi_proc_read, (int *)(long)span->spanno);
#endif
-#ifdef CONFIG_DAHDI_UDEV
for (x = 0; x < span->channels; x++) {
char chan_name[50];
if (span->chans[x].channo < 250) {
@@ -5057,7 +5051,6 @@
CLASS_DEV_CREATE(dahdi_class, MKDEV(DAHDI_MAJOR, span->chans[x].channo), NULL, chan_name);
}
}
-#endif /* CONFIG_DAHDI_UDEV */
if (debug)
printk("Registered Span %d ('%s') with %d channels\n", span->spanno, span->name, span->channels);
@@ -5099,12 +5092,10 @@
remove_proc_entry(tempfile, NULL);
#endif /* CONFIG_PROC_FS */
-#ifdef CONFIG_DAHDI_UDEV
for (x = 0; x < span->channels; x++) {
if (span->chans[x].channo < 250)
class_device_destroy(dahdi_class, MKDEV(DAHDI_MAJOR, span->chans[x].channo));
}
-#endif /* CONFIG_DAHDI_UDEV */
spans[span->spanno] = NULL;
span->spanno = 0;
@@ -7472,22 +7463,18 @@
int dahdi_register_chardev(struct dahdi_chardev *dev)
{
-#ifdef CONFIG_DAHDI_UDEV
char udevname[strlen(dev->name) + 3];
strcpy(udevname, "dahdi");
strcat(udevname, dev->name);
CLASS_DEV_CREATE(dahdi_class, MKDEV(DAHDI_MAJOR, dev->minor), NULL, udevname);
-#endif /* CONFIG_DAHDI_UDEV */
return 0;
}
int dahdi_unregister_chardev(struct dahdi_chardev *dev)
{
-#ifdef CONFIG_DAHDI_UDEV
class_device_destroy(dahdi_class, MKDEV(DAHDI_MAJOR, dev->minor));
-#endif /* CONFIG_DAHDI_UDEV */
return 0;
}
@@ -7499,13 +7486,11 @@
proc_entries[0] = proc_mkdir("dahdi", NULL);
#endif
-#ifdef CONFIG_DAHDI_UDEV /* udev support functions */
dahdi_class = class_create(THIS_MODULE, "dahdi");
CLASS_DEV_CREATE(dahdi_class, MKDEV(DAHDI_MAJOR, 253), NULL, "dahditimer");
CLASS_DEV_CREATE(dahdi_class, MKDEV(DAHDI_MAJOR, 254), NULL, "dahdichannel");
CLASS_DEV_CREATE(dahdi_class, MKDEV(DAHDI_MAJOR, 255), NULL, "dahdipseudo");
CLASS_DEV_CREATE(dahdi_class, MKDEV(DAHDI_MAJOR, 0), NULL, "dahdictl");
-#endif /* CONFIG_DAHDI_UDEV */
if ((res = register_chrdev(DAHDI_MAJOR, "dahdi", &dahdi_fops))) {
printk(KERN_ERR "Unable to register DAHDI character device handler on %d\n", DAHDI_MAJOR);
@@ -7537,13 +7522,11 @@
kfree(tone_zones[x]);
}
-#ifdef CONFIG_DAHDI_UDEV
class_device_destroy(dahdi_class, MKDEV(DAHDI_MAJOR, 253)); /* timer */
class_device_destroy(dahdi_class, MKDEV(DAHDI_MAJOR, 254)); /* channel */
class_device_destroy(dahdi_class, MKDEV(DAHDI_MAJOR, 255)); /* pseudo */
class_device_destroy(dahdi_class, MKDEV(DAHDI_MAJOR, 0)); /* ctl */
class_destroy(dahdi_class);
-#endif /* CONFIG_DAHDI_UDEV */
unregister_chrdev(DAHDI_MAJOR, "dahdi");
Modified: linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_config.h
URL: http://svn.digium.com/view/dahdi/linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_config.h?view=diff&rev=4399&r1=4398&r2=4399
==============================================================================
--- linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_config.h (original)
+++ linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_config.h Wed Jun 18 17:43:35 2008
@@ -54,61 +54,22 @@
*/
/* #define CONFIG_DAHDI_MMX */
-/** If defined: the user must define exactly one ECHO_CAN_ var: */
-#ifndef ECHO_CAN_FROMENV
-
-/*
- * Pick your echo canceller: MARK2, MARK3, STEVE, or STEVE2 :)
- *
- */
-/* #define ECHO_CAN_STEVE */
-/* #define ECHO_CAN_STEVE2 */
-/* #define ECHO_CAN_KB1 */
-/* This is the new latest and greatest */
-#define ECHO_CAN_MG2
-
-/*
- * This is only technically an "echo canceller"...
- * It purposely drops 2 out of 3 samples and sounds horrible.
- * You really only want this for testing "echo cancelled" audio.
- */
-/* #define ECHO_CAN_JP1 */
-
-/*
- * Uncomment for aggressive residual echo suppression under
- * MARK2, KB1, and MG2 echo canceler
- */
-/* #define AGGRESSIVE_SUPPRESSOR */
-#endif /* ifndef ECHO_CAN_FROMENV */
/*
* Define to turn off the echo canceler disable tone detector,
- * which will cause dahdi to ignore the 2100 Hz echo cancel disable
+ * which will cause DAHDI to ignore the 2100 Hz echo cancel disable
* tone.
*/
/* #define NO_ECHOCAN_DISABLE */
-/* udev support */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,1)
-#define CONFIG_DAHDI_UDEV
-#endif
-
/* We now use the linux kernel config to detect which options to use */
/* You can still override them below */
#if defined(CONFIG_HDLC) || defined(CONFIG_HDLC_MODULE)
-/* #define CONFIG_DAHDI_NET */ /* NEVER implicitly turn on CONFIG_DAHDI_NET */
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,20)
-#define CONFIG_OLD_HDLC_API
-#else
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,23)
-/* Starting with 2.4.23 the kernel hdlc api changed again */
-/* Now we have to use hdlc_type_trans(skb, dev) instead of htons(ETH_P_HDLC) */
#define DAHDI_HDLC_TYPE_TRANS
-#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,3)
#define HDLC_MAINTAINERS_ARE_MORE_STUPID_THAN_I_THOUGHT
#endif
#endif
-#endif
+
#ifdef CONFIG_PPP
#define CONFIG_DAHDI_PPP
#endif
@@ -185,7 +146,7 @@
/*
* Enable sync_tick() calls. Allows low-level drivers to synchronize
- * their internal clocks to the dahdi master clock.
+ * their internal clocks to the DAHDI master clock.
*/
#define DAHDI_SYNC_TICK
More information about the svn-commits
mailing list