[Pkg-voip-commits] r8089 - in /dahdi-linux/trunk/debian: changelog patches/no_dummy patches/series

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Thu Feb 18 10:13:02 2010
New Revision: 8089

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8089
Log:
Patch no_dummy: use dahdi internal timing instead of dahdi_dummy. 

Added:
    dahdi-linux/trunk/debian/patches/no_dummy
Modified:
    dahdi-linux/trunk/debian/changelog
    dahdi-linux/trunk/debian/patches/series

Modified: dahdi-linux/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/changelog?rev=8089&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/changelog (original)
+++ dahdi-linux/trunk/debian/changelog Thu Feb 18 10:13:02 2010
@@ -16,8 +16,9 @@
   * Also copy the .version file, to make sure modules have versions. 
   * Move xpp udev rules under /lib. Name still kept for the sake of
     simplicity (thanks, Lintian).
-
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Mon, 15 Feb 2010 13:43:51 +0200
+  * Patch no_dummy: use dahdi internal timing instead of dahdi_dummy. 
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Thu, 18 Feb 2010 12:12:33 +0200
 
 dahdi-linux (1:2.2.0.2~dfsg-1) unstable; urgency=low
 

Added: dahdi-linux/trunk/debian/patches/no_dummy
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/no_dummy?rev=8089&op=file
==============================================================================
--- dahdi-linux/trunk/debian/patches/no_dummy (added)
+++ dahdi-linux/trunk/debian/patches/no_dummy Thu Feb 18 10:13:02 2010
@@ -1,0 +1,34 @@
+Subject: Get rid of dahdi_dummy: use dahdi itself
+Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+
+DAHDI recently aquired the (optional) ability to provide timing from the
+DAHDI core. This patch enables this optional support, and also sets
+"dahdi_dummy" as an alias to the core module to disable the automatic
+loading of dahdi_dummy in the dahdi init script (thus avoidng extra
+dummy span that messes configurations).
+
+Should be forwarded upstream pending testing.
+
+--- a/drivers/dahdi/dahdi-base.c
++++ b/drivers/dahdi/dahdi-base.c
+@@ -8180,6 +8180,9 @@ int dahdi_receive(struct dahdi_span *spa
+ MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
+ MODULE_DESCRIPTION("DAHDI Telephony Interface");
+ MODULE_LICENSE("GPL v2");
++#ifdef CONFIG_DAHDI_CORE_TIMER
++MODULE_ALIAS("dahdi_dummy");
++#endif
+ MODULE_VERSION(DAHDI_VERSION);
+ 
+ module_param(debug, int, 0644);
+--- a/include/dahdi/dahdi_config.h
++++ b/include/dahdi/dahdi_config.h
+@@ -119,7 +119,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 

Modified: dahdi-linux/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/series?rev=8089&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/series (original)
+++ dahdi-linux/trunk/debian/patches/series Thu Feb 18 10:13:02 2010
@@ -3,4 +3,4 @@
 no_firmware_download
 mmx_auto
 uk_rotary
-xpp_udev_rules_2632
+no_dummy