[svn-commits] tzafrir: linux/trunk r8053 - in /linux/trunk: drivers/dahdi/ include/dahdi/

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Mon Feb 22 03:05:54 2010
New Revision: 8053

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8053
Log:
replace dahdi_dummy with internal timing

* Enable the internal timing of DAHDI.
* Disable building dahdi_dummy.
* Have dahdi provide the alias 'dahdi_dummy', to allow 'modprobe
  dahdi_dummy' to still work.

The code of dahdi_dummy is still kept, as some people may need the extra
flexibility it provides. Those people are advised, though, to let us
know what features are missing from the core module.

Running 'modprobe dahdi_dummy' explicitly in a script or having
'dahdi_dummy' in /etc/dahdi/modules is thus also discourged.

This patch is intentionally small (stripped of documentation) to
simplify backporting. Documentation will follow.

Review: https://reviewboard.asterisk.org/r/518/

Modified:
    linux/trunk/drivers/dahdi/Kbuild
    linux/trunk/drivers/dahdi/dahdi-base.c
    linux/trunk/include/dahdi/dahdi_config.h

Modified: linux/trunk/drivers/dahdi/Kbuild
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/Kbuild?view=diff&rev=8053&r1=8052&r2=8053
==============================================================================
--- linux/trunk/drivers/dahdi/Kbuild (original)
+++ linux/trunk/drivers/dahdi/Kbuild Mon Feb 22 03:05:54 2010
@@ -1,5 +1,5 @@
 obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI)			+= dahdi.o
-obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DUMMY)		+= dahdi_dummy.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

Modified: linux/trunk/drivers/dahdi/dahdi-base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=8053&r1=8052&r2=8053
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Mon Feb 22 03:05:54 2010
@@ -8404,6 +8404,10 @@
 MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
 MODULE_DESCRIPTION("DAHDI Telephony Interface");
 MODULE_LICENSE("GPL v2");
+/* DAHDI now provides timing. If anybody wants dahdi_dummy it's probably
+ * for that. So make dahdi provide it for now. This alias may be removed
+ * in the future, and users are encoruged to to rely on it. */
+MODULE_ALIAS("dahdi_dummy");
 MODULE_VERSION(DAHDI_VERSION);
 
 module_param(debug, int, 0644);

Modified: linux/trunk/include/dahdi/dahdi_config.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/include/dahdi/dahdi_config.h?view=diff&rev=8053&r1=8052&r2=8053
==============================================================================
--- linux/trunk/include/dahdi/dahdi_config.h (original)
+++ linux/trunk/include/dahdi/dahdi_config.h Mon Feb 22 03:05:54 2010
@@ -117,7 +117,7 @@
  * Define CONFIG_DAHDI_CORE_TIMER if you would like dahdi to always provide a
  * timing source regardless of which spans / drivers are configured.
  */
-/* #define CONFIG_DAHDI_CORE_TIMER */
+#define CONFIG_DAHDI_CORE_TIMER
 
 /* 
  * Uncomment if you happen have an early TDM400P Rev H which