[Pkg-voip-commits] r7090 - in /dahdi-linux/trunk/debian: README.Debian changelog patches/bri_dchan patches/no_firmware_download patches/series

tzafrir-guest at alioth.debian.org tzafrir-guest at alioth.debian.org
Wed Apr 29 22:04:55 UTC 2009 

Author: tzafrir-guest
Date: Wed Apr 29 22:04:55 2009
New Revision: 7090

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7090
Log:
* New upstream RC: 2.2.0-rc2
* no_firmware_download: Disable downloading a binary kernel module at
  build time.

Added:
    dahdi-linux/trunk/debian/patches/no_firmware_download
Modified:
    dahdi-linux/trunk/debian/README.Debian
    dahdi-linux/trunk/debian/changelog
    dahdi-linux/trunk/debian/patches/bri_dchan
    dahdi-linux/trunk/debian/patches/series

Modified: dahdi-linux/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/README.Debian?rev=7090&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/README.Debian (original)
+++ dahdi-linux/trunk/debian/README.Debian Wed Apr 29 22:04:55 2009
@@ -26,6 +26,19 @@
 let us know that generating static file is actually needed.
 
 
+Removed VPMADT032 Support
+-------------------------
+VPMADT032 is a hardware echo canceller module. It is an optional addon
+in various Digium cards. Currently in those serviced by wcte12xp and
+wctdm24xxp. As of DAHDI 2.2 using it requires a binary-only object file
+to be linked with DAHDI at build time. This object file is downloaded at
+build time from downloads.digium.com . This is naturally not something we
+can support. And thus we disabled building it.
+
+Unlike the Digium firmwares, this is not something that can be reverted at
+run-time.
+
+
 Bristuff
 --------
 This version includes the bri_dchan patch as adapted from the bristuff 
@@ -36,9 +49,7 @@
 Right now the only Zaptel module of bristuff that has been adapted for 
 usage with DAHDI is zaphfc. 
 
-qozap is not enabled, however there is some work in progress to support
-those devices using the new wcb4xxp driver (of the Digium B410P BRI card).
-See http://bugs.digium.com/view.php?id=13897 . Note that this driver uses 
+qozap is not included. Please use wcb4xxp .  Note that this driver uses 
 'hardhdlc' rather than 'dchan' in system.conf for the D-channel.
 
 All of those modules should work with either bristuffed Asterisk (if it 

Modified: dahdi-linux/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/changelog?rev=7090&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/changelog (original)
+++ dahdi-linux/trunk/debian/changelog Wed Apr 29 22:04:55 2009
@@ -1,11 +1,14 @@
-dahdi-linux (1:2.1.0.4~dfsg-2) UNRELEASED; urgency=low
+dahdi-linux (1:2.2.0~dfsg~rc2-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * New upstream RC.
   * Actually build OpenVox drivers.
   * opvxa1200.c: rev. 1.4.12.4 (battery fixes and such)
   * Fix '${match}' in udev rules file (hardwire).
-
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Thu, 16 Apr 2009 10:12:35 +0300
+  * no_firmware_download: Disable downloading a binary kernel module at 
+    build time.
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Thu, 30 Apr 2009 01:02:58 +0300
 
 dahdi-linux (1:2.1.0.4~dfsg-1) experimental; urgency=low
 

Modified: dahdi-linux/trunk/debian/patches/bri_dchan
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/bri_dchan?rev=7090&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/bri_dchan (original)
+++ dahdi-linux/trunk/debian/patches/bri_dchan Wed Apr 29 22:04:55 2009
@@ -5,9 +5,9 @@
 
 --- a/include/dahdi/kernel.h
 +++ b/include/dahdi/kernel.h
-@@ -132,6 +132,13 @@ struct dahdi_chan {
- 	int do_ppp_error;
- 	struct sk_buff_head ppp_rq;
+@@ -389,6 +389,13 @@ struct dahdi_chan {
+ 	int statcount;
+ 	int lastnumbufs;
  #endif
 +#ifdef CONFIG_DAHDI_BRI_DCHANS
 +	int bytes2receive;
@@ -19,7 +19,7 @@
  	spinlock_t lock;
  	char name[40];
  	/* Specified by DAHDI */
-@@ -462,6 +469,9 @@ enum {
+@@ -693,6 +700,9 @@ enum {
  	DAHDI_FLAGBIT_LOOPED	= 18,	/*!< Loopback the receive data from the channel to the transmit */
  	DAHDI_FLAGBIT_MTP2	= 19,	/*!< Repeats last message in buffer and also discards repeating messages sent to us */
  	DAHDI_FLAGBIT_HDLC56	= 20,	/*!< Sets the given channel (if in HDLC mode) to use 56K HDLC instead of 64K  */
@@ -29,7 +29,7 @@
  };
  
  /* map flagbits to flag masks */
-@@ -500,6 +510,7 @@ enum {
+@@ -731,6 +741,7 @@ enum {
  #define DAHDI_FLAG_LOOPED	DAHDI_FLAG(LOOPED)
  #define DAHDI_FLAG_MTP2		DAHDI_FLAG(MTP2)
  #define DAHDI_FLAG_HDLC56	DAHDI_FLAG(HDLC56)
@@ -37,9 +37,9 @@
  
  struct dahdi_span {
  	spinlock_t lock;
---- a/drivers/dahdi/dahdi_config.h
-+++ b/drivers/dahdi/dahdi_config.h
-@@ -174,4 +174,10 @@
+--- a/include/dahdi/dahdi_config.h
++++ b/include/dahdi/dahdi_config.h
+@@ -167,4 +167,10 @@
   */
  /* #define	OPTIMIZE_CHANMUTE */
  
@@ -52,7 +52,7 @@
  #endif
 --- a/drivers/dahdi/dahdi-base.c
 +++ b/drivers/dahdi/dahdi-base.c
-@@ -5907,11 +5907,40 @@ static inline void __dahdi_getbuf_chunk(
+@@ -6014,11 +6014,40 @@ static inline void __dahdi_getbuf_chunk(
  					*(txb++) = fasthdlc_tx_run_nocheck(&ms->txhdlc);
  				}
  				bytes -= left;
@@ -87,17 +87,17 @@
  				ms->writeidx[ms->outwritebuf]+=left;
  				txb += left;
  				bytes -= left;
-+#if defined(CONFIG_DAHDI_BRI_DCHANS)	
++#if defined(CONFIG_DAHDI_BRI_DCHANS)
 +				ms->bytes2transmit=DAHDI_CHUNKSIZE;
 +#endif
  			}
  			/* Check buffer status */
  			if (ms->writeidx[ms->outwritebuf] >= ms->writen[ms->outwritebuf]) {
-@@ -5968,6 +5997,17 @@ out in the later versions, and is put ba
+@@ -6077,6 +6106,17 @@ out in the later versions, and is put ba
  				/* Transmit a flag if this is an HDLC channel */
  				if (ms->flags & DAHDI_FLAG_HDLC)
  					fasthdlc_tx_frame_nocheck(&ms->txhdlc);
-+#if defined(CONFIG_DAHDI_BRI_DCHANS)	
++#if defined(CONFIG_DAHDI_BRI_DCHANS)
 +				if (test_bit(DAHDI_FLAGBIT_BRIDCHAN, &ms->flags)) {
 +			//	    if (ms->bytes2transmit > 0) {
 +					// txb += 2;
@@ -111,11 +111,11 @@
  #ifdef CONFIG_DAHDI_NET
  				if (ms->flags & DAHDI_FLAG_NETDEV)
  					netif_wake_queue(ztchan_to_dev(ms));
-@@ -6028,6 +6068,12 @@ out in the later versions, and is put ba
+@@ -6137,6 +6177,12 @@ out in the later versions, and is put ba
  				memset(txb, 0xFF, bytes);
  			}
  			bytes = 0;
-+#if defined(CONFIG_DAHDI_BRI_DCHANS)	
++#if defined(CONFIG_DAHDI_BRI_DCHANS)
 +		} else if (test_bit(DAHDI_FLAGBIT_BRIDCHAN, &ms->flags)) {
 +		    ms->bytes2transmit = 0;
 +		    ms->eoftx = 0;
@@ -124,11 +124,11 @@
  		} else {
  			memset(txb, DAHDI_LIN2X(0, ms), bytes);	/* Lastly we use silence on telephony channels */
  			bytes = 0;
-@@ -6840,6 +6886,14 @@ static inline void __putbuf_chunk(struct
+@@ -6993,6 +7039,14 @@ static inline void __putbuf_chunk(struct
  	int res;
  	int left, x;
  
-+#if defined(CONFIG_DAHDI_BRI_DCHANS)	
++#if defined(CONFIG_DAHDI_BRI_DCHANS)
 +	if (test_bit(DAHDI_FLAGBIT_BRIDCHAN, &ms->flags)) {
 +	    bytes = ms->bytes2receive;
 +	    if (bytes < 1) return;
@@ -139,7 +139,7 @@
  	while(bytes) {
  #if defined(CONFIG_DAHDI_NET)  || defined(CONFIG_DAHDI_PPP)
  		skb = NULL;
-@@ -6897,6 +6951,19 @@ static inline void __putbuf_chunk(struct
+@@ -7050,6 +7104,19 @@ static inline void __putbuf_chunk(struct
  						}
  					}
  				}

Added: dahdi-linux/trunk/debian/patches/no_firmware_download
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/no_firmware_download?rev=7090&op=file
==============================================================================
--- dahdi-linux/trunk/debian/patches/no_firmware_download (added)
+++ dahdi-linux/trunk/debian/patches/no_firmware_download Wed Apr 29 22:04:55 2009
@@ -1,0 +1,21 @@
+The firmware downloaders are extra kernel objects that are now required for
+the Hardware echo canceller support in some Digium cards (wctdm24xxp,
+wcte12xp). They are downloaded at build time. The makefile will build 
+with support for them if they were indeed downloaded.
+
+This patch removes this downloading and thus keeps those modules 
+DFSG-compliant. Unlike the Digium firmwares, this is a compile-time 
+decision and hence cannot be reverted once a dahdi-modules package is
+built.
+
+--- a/Makefile
++++ b/Makefile
+@@ -98,7 +98,7 @@ include/dahdi/version.h: FORCE
+ 	fi
+ 	@rm -f $@.tmp
+ 
+-prereq: include/dahdi/version.h firmware-loaders
++prereq: include/dahdi/version.h
+ 
+ stackcheck: checkstack modules
+ 	./checkstack kernel/*.ko kernel/*/*.ko

Modified: dahdi-linux/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/series?rev=7090&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/series (original)
+++ dahdi-linux/trunk/debian/patches/series Wed Apr 29 22:04:55 2009
@@ -9,3 +9,4 @@
 oslec_kernelorg
 
 oslec_kbuild
+no_firmware_download

More information about the Pkg-voip-commits mailing list