[Pkg-voip-commits] r3328 - in zaptel/branches/experimental/debian:
. patches
Tzafrir Cohen
tzafrir-guest at alioth.debian.org
Sat Mar 24 20:13:19 CET 2007
Author: tzafrir-guest
Date: 2007-03-24 19:13:19 +0000 (Sat, 24 Mar 2007)
New Revision: 3328
Modified:
zaptel/branches/experimental/debian/changelog
zaptel/branches/experimental/debian/patches/ztdiag.dpatch
Log:
Better shape for ztdiag.dpatch. Don't forget to free.
Modified: zaptel/branches/experimental/debian/changelog
===================================================================
--- zaptel/branches/experimental/debian/changelog 2007-03-24 18:31:57 UTC (rev 3327)
+++ zaptel/branches/experimental/debian/changelog 2007-03-24 19:13:19 UTC (rev 3328)
@@ -1,8 +1,9 @@
zaptel (1:1.4.1~dfsg-3) UNRELEASED; urgency=low
* NOT RELEASED YET
+ * Better shape for ztdiag.dpatch. Don't forget to free.
- -- Mark Purcell <msp at debian.org> Sat, 24 Mar 2007 14:20:03 +0000
+ -- TzafrirCohen <tzafrir.cohen at xorcom.com> Sat, 24 Mar 2007 20:20:03 +0000
zaptel (1:1.4.1~dfsg-2) experimental; urgency=low
Modified: zaptel/branches/experimental/debian/patches/ztdiag.dpatch
===================================================================
--- zaptel/branches/experimental/debian/patches/ztdiag.dpatch 2007-03-24 18:31:57 UTC (rev 3327)
+++ zaptel/branches/experimental/debian/patches/ztdiag.dpatch 2007-03-24 19:13:19 UTC (rev 3328)
@@ -10,15 +10,14 @@
diff -urNad zaptel-1.4.1~dfsg~/zaptel-base.c zaptel-1.4.1~dfsg/zaptel-base.c
--- zaptel-1.4.1~dfsg~/zaptel-base.c 2007-03-24 10:20:58.000000000 +0200
+++ zaptel-1.4.1~dfsg/zaptel-base.c 2007-03-24 10:46:38.000000000 +0200
-@@ -2934,10 +2934,8 @@
+@@ -2934,10 +2934,6 @@
struct zt_chan *chan;
unsigned long flags;
unsigned char *txgain, *rxgain;
-#ifdef ALLOW_CHAN_DIAG
- /* This structure is huge and will bork a 4k stack */
+- /* This structure is huge and will bork a 4k stack */
- struct zt_chan mychan;
-#endif
-+ struct zt_chan *mychan;
int i,j;
int return_master = 0;
@@ -30,13 +29,13 @@
case ZT_CHANDIAG:
get_user(j, (int *)data); /* get channel number from user */
/* make sure its a valid channel number */
-@@ -3155,49 +3152,53 @@
+@@ -3155,49 +3152,54 @@
return -EINVAL;
/* if channel not mapped, not there */
if (!chans[j]) return -EINVAL;
- /* lock irq state */
-+ mychan = kmalloc(sizeof(struct zt_chan), GFP_KERNEL);
-+ if (!mychan)
++ chan = kmalloc(sizeof(struct zt_chan), GFP_KERNEL);
++ if (!chan)
+ return -ENOMEM;
+
+ /* lock channel */
@@ -44,62 +43,63 @@
/* make static copy of channel */
- memcpy(&mychan,chans[j],sizeof(struct zt_chan));
- /* let irq's go */
-+ memcpy(mychan,chans[j],sizeof(struct zt_chan));
++ memcpy(chan,chans[j],sizeof(struct zt_chan));
+ /* release it. */
spin_unlock_irqrestore(&chans[j]->lock, flags);
+
printk("Dump of Zaptel Channel %d (%s,%d,%d):\n\n",j,
- mychan.name,mychan.channo,mychan.chanpos);
-+ mychan->name,mychan->channo,mychan->chanpos);
++ chan->name,chan->channo,chan->chanpos);
printk("flags: %x hex, writechunk: %08lx, readchunk: %08lx\n",
- mychan.flags, (long) mychan.writechunk, (long) mychan.readchunk);
-+ mychan->flags, (long) mychan->writechunk, (long) mychan->readchunk);
++ chan->flags, (long) chan->writechunk, (long) chan->readchunk);
printk("rxgain: %08lx, txgain: %08lx, gainalloc: %d\n",
- (long) mychan.rxgain, (long)mychan.txgain, mychan.gainalloc);
-+ (long) mychan->rxgain, (long)mychan->txgain, mychan->gainalloc);
++ (long) chan->rxgain, (long)chan->txgain, chan->gainalloc);
printk("span: %08lx, sig: %x hex, sigcap: %x hex\n",
- (long)mychan.span, mychan.sig, mychan.sigcap);
-+ (long)mychan->span, mychan->sig, mychan->sigcap);
++ (long)chan->span, chan->sig, chan->sigcap);
printk("inreadbuf: %d, outreadbuf: %d, inwritebuf: %d, outwritebuf: %d\n",
- mychan.inreadbuf, mychan.outreadbuf, mychan.inwritebuf, mychan.outwritebuf);
-+ mychan->inreadbuf, mychan->outreadbuf, mychan->inwritebuf, mychan->outwritebuf);
++ chan->inreadbuf, chan->outreadbuf, chan->inwritebuf, chan->outwritebuf);
printk("blocksize: %d, numbufs: %d, txbufpolicy: %d, txbufpolicy: %d\n",
- mychan.blocksize, mychan.numbufs, mychan.txbufpolicy, mychan.rxbufpolicy);
-+ mychan->blocksize, mychan->numbufs, mychan->txbufpolicy, mychan->rxbufpolicy);
++ chan->blocksize, chan->numbufs, chan->txbufpolicy, chan->rxbufpolicy);
printk("txdisable: %d, rxdisable: %d, iomask: %d\n",
- mychan.txdisable, mychan.rxdisable, mychan.iomask);
-+ mychan->txdisable, mychan->rxdisable, mychan->iomask);
++ chan->txdisable, chan->rxdisable, chan->iomask);
printk("curzone: %08lx, tonezone: %d, curtone: %08lx, tonep: %d\n",
- (long) mychan.curzone, mychan.tonezone, (long) mychan.curtone, mychan.tonep);
-+ (long) mychan->curzone, mychan->tonezone, (long) mychan->curtone, mychan->tonep);
++ (long) chan->curzone, chan->tonezone, (long) chan->curtone, chan->tonep);
printk("digitmode: %d, txdialbuf: %s, dialing: %d, aftdialtimer: %d, cadpos. %d\n",
- mychan.digitmode, mychan.txdialbuf, mychan.dialing,
- mychan.afterdialingtimer, mychan.cadencepos);
-+ mychan->digitmode, mychan->txdialbuf, mychan->dialing,
-+ mychan->afterdialingtimer, mychan->cadencepos);
++ chan->digitmode, chan->txdialbuf, chan->dialing,
++ chan->afterdialingtimer, chan->cadencepos);
printk("confna: %d, confn: %d, confmode: %d, confmute: %d\n",
- mychan.confna, mychan._confn, mychan.confmode, mychan.confmute);
-+ mychan->confna, mychan->_confn, mychan->confmode, mychan->confmute);
++ chan->confna, chan->_confn, chan->confmode, chan->confmute);
printk("ec: %08lx, echocancel: %d, deflaw: %d, xlaw: %08lx\n",
- (long) mychan.ec, mychan.echocancel, mychan.deflaw, (long) mychan.xlaw);
-+ (long) mychan->ec, mychan->echocancel, mychan->deflaw, (long) mychan->xlaw);
++ (long) chan->ec, chan->echocancel, chan->deflaw, (long) chan->xlaw);
printk("echostate: %02x, echotimer: %d, echolastupdate: %d\n",
- (int) mychan.echostate, mychan.echotimer, mychan.echolastupdate);
-+ (int) mychan->echostate, mychan->echotimer, mychan->echolastupdate);
++ (int) chan->echostate, chan->echotimer, chan->echolastupdate);
printk("itimer: %d, otimer: %d, ringdebtimer: %d\n\n",
- mychan.itimer,mychan.otimer,mychan.ringdebtimer);
-+ mychan->itimer,mychan->otimer,mychan->ringdebtimer);
++ chan->itimer,chan->otimer,chan->ringdebtimer);
#if 0
- if (mychan.ec) {
-+ if (mychan->ec) {
++ if (chan->ec) {
int x;
/* Dump the echo canceller parameters */
- for (x=0;x<mychan.ec->taps;x++) {
- printk("tap %d: %d\n", x, mychan.ec->fir_taps[x]);
-+ for (x=0;x<mychan->ec->taps;x++) {
-+ printk("tap %d: %d\n", x, mychan->ec->fir_taps[x]);
++ for (x=0;x<chan->ec->taps;x++) {
++ printk("tap %d: %d\n", x, chan->ec->fir_taps[x]);
}
}
++ kfree(chan)
#endif
-#endif /* ALLOW_CHAN_DIAG */
break;
More information about the Pkg-voip-commits
mailing list