[Pkg-voip-commits] r8124 - in /dahdi-linux/trunk/debian: README.Debian patches/no_dummy

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Mon Feb 22 11:02:24 2010
New Revision: 8124

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8124
Log:
Patch no_dummy was accepted upstream.

Modified:
    dahdi-linux/trunk/debian/README.Debian
    dahdi-linux/trunk/debian/patches/no_dummy

Modified: dahdi-linux/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/README.Debian?rev=8124&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/README.Debian (original)
+++ dahdi-linux/trunk/debian/README.Debian Mon Feb 22 11:02:24 2010
@@ -108,3 +108,13 @@
 The script should also run ls for the module packages built. You should 
 chack that all packages were indeed built and that their size looks sane
 (no driver was left unbuilt).
+
+
+DAHDI-dummy
+-----------
+The core DAHDI module (dahdi) will now provide timing if there's no other
+module to provide timing. This means there's no more need for a separate
+dahdi_dummy module. For the sake of backward compatibility, the module
+dahdi itself also has an alias 'dahdi_dummy', which means that
+'modprobe dahdi_dummy' will still work.
+

Modified: dahdi-linux/trunk/debian/patches/no_dummy
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/no_dummy?rev=8124&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/no_dummy (original)
+++ dahdi-linux/trunk/debian/patches/no_dummy Mon Feb 22 11:02:24 2010
@@ -1,24 +1,44 @@
-Subject: Get rid of dahdi_dummy: use dahdi itself
+Subject: replace dahdi_dummy with internal timing
 Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Origin: http://svn.digium.com/svn/dahdi/linux/trunk@8053
 
-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).
+* 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.
 
-Should be forwarded upstream pending testing. Also note it conflicts
-with the dahdi_extra patch (in the Kbuild file).
+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. Also slightly modified to adapt to the dahdi_extra patch.
+
+Patch included in upstream trunk, and will be part of DAHDI-linux 2.3 .
+
+--- a/drivers/dahdi/Kbuild
++++ b/drivers/dahdi/Kbuild
+@@ -1,6 +1,6 @@
+ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI)			+= dahdi.o
+ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_OPVXA1200)		+= opvxa1200.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_WCOPENPCI)		+= wcopenpci.o
+ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DYNAMIC)		+= dahdi_dynamic.o
+ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ZAPHFC)		+= zaphfc/
 --- a/drivers/dahdi/dahdi-base.c
 +++ b/drivers/dahdi/dahdi-base.c
-@@ -8180,6 +8180,9 @@ int dahdi_receive(struct dahdi_span *spa
+@@ -8180,6 +8180,10 @@ 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
++/* 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");
-+#endif
  MODULE_VERSION(DAHDI_VERSION);
  
  module_param(debug, int, 0644);
@@ -33,13 +53,3 @@
  
  /* 
   * Uncomment if you happen have an early TDM400P Rev H which 
---- a/drivers/dahdi/Kbuild
-+++ b/drivers/dahdi/Kbuild
-@@ -1,6 +1,6 @@
- obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI)			+= dahdi.o
- obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_OPVXA1200)		+= opvxa1200.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_WCOPENPCI)		+= wcopenpci.o
- obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DYNAMIC)		+= dahdi_dynamic.o
- obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ZAPHFC)		+= zaphfc/