[Pkg-voip-commits] r3368 - in zaptel/trunk: cwain debian
debian/patches qozap zaphfc ztgsm
Tzafrir Cohen
tzafrir-guest at alioth.debian.org
Fri Apr 6 11:12:59 UTC 2007
Author: tzafrir-guest
Date: 2007-04-06 11:12:58 +0000 (Fri, 06 Apr 2007)
New Revision: 3368
Modified:
zaptel/trunk/cwain/cwain.c
zaptel/trunk/debian/changelog
zaptel/trunk/debian/patches/bristuff.dpatch
zaptel/trunk/qozap/qozap.c
zaptel/trunk/zaphfc/zaphfc.c
zaptel/trunk/ztgsm/ztgsm.c
Log:
Bristuff 0.3.0-PRE-1y-e .
Modified: zaptel/trunk/cwain/cwain.c
===================================================================
--- zaptel/trunk/cwain/cwain.c 2007-04-04 21:53:38 UTC (rev 3367)
+++ zaptel/trunk/cwain/cwain.c 2007-04-06 11:12:58 UTC (rev 3368)
@@ -1294,11 +1294,7 @@
return 0;
}
-#ifdef LINUX26
-static irqreturn_t cwain_dummy_interrupt(int irq, void *dev_id, struct pt_regs *regs) {
-#else
-static void cwain_dummy_interrupt(int irq, void *dev_id, struct pt_regs *regs) {
-#endif
+ZAP_IRQ_HANDLER(cwain_dummy_interrupt) {
struct zt_cwain_card *cwaintmp = dev_id;
if (!cwaintmp) {
#ifdef LINUX26
@@ -1315,11 +1311,7 @@
}
-#ifdef LINUX26
-static irqreturn_t cwain_interrupt(int irq, void *dev_id, struct pt_regs *regs) {
-#else
-static void cwain_interrupt(int irq, void *dev_id, struct pt_regs *regs) {
-#endif
+ZAP_IRQ_HANDLER(cwain_interrupt) {
struct zt_cwain_card *cwaintmp = dev_id;
unsigned char status, status2, status_tmp, irq_misc, irq_misc2 = 0;
unsigned long flags;
@@ -1842,11 +1834,17 @@
static int ztcwain_spanconfig(struct zt_span *span,struct zt_lineconfig *lc) {
struct zt_cwain_card *cwaincard = span->pvt;
- span->lineconfig = lc->lineconfig;
- span->syncsrc = lc->sync;
+ int alreadyrunning;
- cwaincard->syncs[span->offset] = lc->sync;
- cwaincard->syncsrc = -1;
+ alreadyrunning = span->flags & ZT_FLAG_RUNNING;
+
+ if (!alreadyrunning) {
+ span->lineconfig = lc->lineconfig;
+ span->syncsrc = lc->sync;
+
+ cwaincard->syncs[span->offset] = lc->sync;
+ cwaincard->syncsrc = -1;
+ }
// printk(KERN_INFO "span_config %d lineconfig=%d syncsrc=%d\n", span->spanno, lc->lineconfig, lc->sync);
// cwain_check_timing(cwaincard);
return 0;
Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog 2007-04-04 21:53:38 UTC (rev 3367)
+++ zaptel/trunk/debian/changelog 2007-04-06 11:12:58 UTC (rev 3368)
@@ -8,8 +8,9 @@
* zaptel_perl.dpatch: use vedorlib rather than an explicit path.
* Fix /etc/init.d/zaptel status .
* Support loading modules from /etc/init.d/zaptel start .
+ * Bristuff to 0.3.0-PRE-1y-e .
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com> Sat, 24 Mar 2007 20:02:03 +0200
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com> Fri, 06 Apr 2007 14:12:28 +0300
zaptel (1:1.2.16~dfsg-1) unstable; urgency=low
Modified: zaptel/trunk/debian/patches/bristuff.dpatch
===================================================================
--- zaptel/trunk/debian/patches/bristuff.dpatch 2007-04-04 21:53:38 UTC (rev 3367)
+++ zaptel/trunk/debian/patches/bristuff.dpatch 2007-04-06 11:12:58 UTC (rev 3368)
@@ -4,14 +4,14 @@
## All lines beginning with `## DP:' are a description of the patch.
## DP: This is the patch zaptel.patch from bristuff. Changes:
## DP: * Makefile removed.
-## DP: * zaptel.c renamed zaptel-base.c
-## DP: Version: bristuff-0.3.0-PRE-1y-b
+## DP: * Modules.symvers removed (generated file)
+## DP: Version: bristuff-0.3.0-PRE-1y-e
@DPATCH@
-diff -urN zaptel-1.2.10.orig/zaptel.c zaptel-1.2.10/zaptel.c
---- zaptel-1.2.10.orig/zaptel-base.c 2006-09-16 09:45:04.000000000 +0200
-+++ zaptel-1.2.10/zaptel-base.c 2007-02-09 12:55:06.610589726 +0100
-@@ -139,6 +139,7 @@
+diff -urN zaptel-1.2.16.orig/zaptel-base.c zaptel-1.2.16/zaptel-base.c
+--- zaptel-1.2.16.orig/zaptel-base.c 2007-02-21 05:25:21.000000000 +0100
++++ zaptel-1.2.16/zaptel-base.c 2007-03-26 10:59:54.002598219 +0200
+@@ -138,6 +138,7 @@
EXPORT_SYMBOL(zt_qevent_lock);
EXPORT_SYMBOL(zt_hooksig);
EXPORT_SYMBOL(zt_alarm_notify);
@@ -19,7 +19,7 @@
EXPORT_SYMBOL(zt_set_dynamic_ioctl);
EXPORT_SYMBOL(zt_ec_chunk);
EXPORT_SYMBOL(zt_ec_span);
-@@ -556,6 +557,10 @@
+@@ -582,6 +583,10 @@
len += sprintf(page + len, "\tIRQ misses: %d\n", spans[span]->irqmisses);
len += sprintf(page + len, "\n");
@@ -30,7 +30,7 @@
for (x=1;x<ZT_MAX_CHANNELS;x++) {
if (chans[x]) {
-@@ -2700,6 +2705,30 @@
+@@ -2762,6 +2767,30 @@
}
}
@@ -61,7 +61,7 @@
#define VALID_SPAN(j) do { \
if ((j >= ZT_MAX_SPANS) || (j < 1)) \
return -EINVAL; \
-@@ -4928,11 +4957,40 @@
+@@ -5009,11 +5038,40 @@
*(txb++) = fasthdlc_tx_run_nocheck(&ms->txhdlc);
}
bytes -= left;
@@ -102,7 +102,7 @@
}
/* Check buffer status */
if (ms->writeidx[ms->outwritebuf] >= ms->writen[ms->outwritebuf]) {
-@@ -4977,6 +5035,17 @@
+@@ -5058,6 +5116,17 @@
/* Transmit a flag if this is an HDLC channel */
if (ms->flags & ZT_FLAG_HDLC)
fasthdlc_tx_frame_nocheck(&ms->txhdlc);
@@ -120,7 +120,7 @@
#ifdef CONFIG_ZAPATA_NET
if (ms->flags & ZT_FLAG_NETDEV)
netif_wake_queue(ztchan_to_dev(ms));
-@@ -5033,6 +5102,12 @@
+@@ -5114,6 +5183,12 @@
memset(txb, 0xFF, bytes);
}
bytes = 0;
@@ -133,7 +133,7 @@
} else {
memset(txb, ZT_LIN2X(0, ms), bytes); /* Lastly we use silence on telephony channels */
bytes = 0;
-@@ -5758,6 +5833,13 @@
+@@ -5850,6 +5925,13 @@
int left, x;
int bytes = ZT_CHUNKSIZE;
@@ -147,7 +147,7 @@
while(bytes) {
#if defined(CONFIG_ZAPATA_NET) || defined(CONFIG_ZAPATA_PPP)
-@@ -5816,6 +5898,19 @@
+@@ -5908,6 +5990,19 @@
}
}
}
@@ -167,10 +167,10 @@
} else {
/* Not HDLC */
memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
-diff -urN zaptel-1.2.10.orig/zaptel.h zaptel-1.2.10/zaptel.h
---- zaptel-1.2.10.orig/zaptel.h 2005-12-17 03:04:05.000000000 +0100
-+++ zaptel-1.2.10/zaptel.h 2006-12-19 13:36:19.000000000 +0100
-@@ -994,6 +994,13 @@
+diff -urN zaptel-1.2.16.orig/zaptel.h zaptel-1.2.16/zaptel.h
+--- zaptel-1.2.16.orig/zaptel.h 2007-02-06 22:57:38.000000000 +0100
++++ zaptel-1.2.16/zaptel.h 2007-03-26 10:59:54.002598219 +0200
+@@ -1043,6 +1043,13 @@
int do_ppp_error;
struct sk_buff_head ppp_rq;
#endif
@@ -184,7 +184,16 @@
spinlock_t lock;
char name[40]; /* Name */
/* Specified by zaptel */
-@@ -1231,6 +1238,10 @@
+@@ -1117,7 +1124,7 @@
+ int txbufpolicy; /* Buffer policy */
+ int rxbufpolicy; /* Buffer policy */
+ int txdisable; /* Disable transmitter */
+- int rxdisable; /* Disable receiver */
++ int rxdisable; /* Disable receiver */
+
+
+ /* Tone zone stuff */
+@@ -1280,6 +1287,10 @@
#define ZT_FLAG_T1PPP (1 << 15)
#define ZT_FLAG_SIGFREEZE (1 << 16) /* Freeze signalling */
@@ -195,7 +204,7 @@
struct zt_span {
spinlock_t lock;
void *pvt; /* Private stuff */
-@@ -1331,6 +1342,10 @@
+@@ -1380,6 +1391,10 @@
int watchcounter;
int watchstate;
#endif
@@ -205,21 +214,21 @@
+#endif
};
- #define ZT_WATCHDOG_NOINTS (1 << 0)
-@@ -1404,6 +1419,9 @@
+ struct zt_transcoder_channel {
+@@ -1494,6 +1509,9 @@
/* Notify a change possible change in alarm status */
- extern void zt_alarm_notify(struct zt_span *span);
+ void zt_alarm_notify(struct zt_span *span);
+/* Notify a change possible change in alarm status, DONT change the zaptel master! */
+extern void zt_alarm_notify_no_master_change(struct zt_span *span);
+
/* Initialize a tone state */
- extern void zt_init_tone_state(struct zt_tone_state *ts, struct zt_tone *zt);
+ void zt_init_tone_state(struct zt_tone_state *ts, struct zt_tone *zt);
-diff -urN zaptel-1.2.10.orig/zconfig.h zaptel-1.2.10/zconfig.h
---- zaptel-1.2.10.orig/zconfig.h 2005-11-29 19:42:08.000000000 +0100
-+++ zaptel-1.2.10/zconfig.h 2006-10-19 11:16:47.000000000 +0200
-@@ -49,11 +49,11 @@
+diff -urN zaptel-1.2.16.orig/zconfig.h zaptel-1.2.16/zconfig.h
+--- zaptel-1.2.16.orig/zconfig.h 2007-02-01 01:55:41.000000000 +0100
++++ zaptel-1.2.16/zconfig.h 2007-03-26 10:59:54.002598219 +0200
+@@ -53,11 +53,11 @@
/* #define ECHO_CAN_MARK */
/* #define ECHO_CAN_MARK2 */
/* #define ECHO_CAN_MARK3 */
@@ -233,7 +242,7 @@
/*
* Uncomment for aggressive residual echo supression under
-@@ -152,4 +152,10 @@
+@@ -156,4 +156,10 @@
*/
/* #define FXSFLASH */
@@ -244,9 +253,9 @@
+#define CONFIG_ZAPATA_BRI_DCHANS
+
#endif
-diff -urN zaptel-1.2.10.orig/ztcfg.c zaptel-1.2.10/ztcfg.c
---- zaptel-1.2.10.orig/ztcfg.c 2006-02-01 03:33:54.000000000 +0100
-+++ zaptel-1.2.10/ztcfg.c 2006-12-05 12:37:31.000000000 +0100
+diff -urN zaptel-1.2.16.orig/ztcfg.c zaptel-1.2.16/ztcfg.c
+--- zaptel-1.2.16.orig/ztcfg.c 2007-01-31 20:01:33.000000000 +0100
++++ zaptel-1.2.16/ztcfg.c 2007-03-26 10:59:54.022602931 +0200
@@ -90,6 +90,10 @@
static int stopmode = 0;
@@ -327,7 +336,7 @@
for (x=0;x<spans;x++) {
if (ioctl(fd, ZT_SPANCONFIG, lc + x)) {
fprintf(stderr, "ZT_SPANCONFIG failed on span %d: %s (%d)\n", lc[x].span, strerror(errno), errno);
-@@ -1348,12 +1378,25 @@
+@@ -1358,12 +1388,25 @@
exit(1);
}
}
@@ -354,9 +363,9 @@
}
}
}
-diff -urN zaptel-1.2.10.orig/ztpty.c zaptel-1.2.10/ztpty.c
---- zaptel-1.2.10.orig/ztpty.c 1970-01-01 01:00:00.000000000 +0100
-+++ zaptel-1.2.10/ztpty.c 2006-10-19 11:16:47.000000000 +0200
+diff -urN zaptel-1.2.16.orig/ztpty.c zaptel-1.2.16/ztpty.c
+--- zaptel-1.2.16.orig/ztpty.c 1970-01-01 01:00:00.000000000 +0100
++++ zaptel-1.2.16/ztpty.c 2007-03-26 10:59:54.022602931 +0200
@@ -0,0 +1,112 @@
+#include <stdio.h>
+#include <stdlib.h>
Modified: zaptel/trunk/qozap/qozap.c
===================================================================
--- zaptel/trunk/qozap/qozap.c 2007-04-04 21:53:38 UTC (rev 3367)
+++ zaptel/trunk/qozap/qozap.c 2007-04-06 11:12:58 UTC (rev 3368)
@@ -299,6 +299,10 @@
qoz_outb(qoztmp,qoz_R_BRG_PCM_CFG,0x23);
} else if (qoztmp->type == 0xb556) {
qoz_outb(qoztmp,qoz_R_BRG_PCM_CFG,0x23);
+ } else if (qoztmp->type == 0xb557) {
+ qoz_outb(qoztmp,qoz_R_BRG_PCM_CFG,0x23);
+ } else if (qoztmp->type == 0xb558) {
+ qoz_outb(qoztmp,qoz_R_BRG_PCM_CFG,0x23);
} else if (qoztmp->type == 0xb520) {
qoz_outb(qoztmp,qoz_R_BRG_PCM_CFG,0x20);
} else {
@@ -326,6 +330,8 @@
qoztmp->stports = 8;
} else if (qoztmp->type == 0xb556) {
qoztmp->stports = 2;
+ } else if (qoztmp->type == 0xb557) {
+ qoztmp->stports = 2;
} else {
qoztmp->stports = 4;
}
@@ -826,11 +832,7 @@
}
}
-#ifdef LINUX26
-static irqreturn_t qoz_interrupt(int irq, void *dev_id, struct pt_regs *regs) {
-#else
-static void qoz_interrupt(int irq, void *dev_id, struct pt_regs *regs) {
-#endif
+ZAP_IRQ_HANDLER(qoz_interrupt) {
struct qoz_card *qoztmp = dev_id;
unsigned long flags;
unsigned char irq_misc,irq_sci,status,l1state,irq_foview,fi;
@@ -1579,7 +1581,7 @@
if (pcidid == PCI_DEVICE_ID_CCD_M) {
qoztmp->stports = 8;
} else {
- if (tmp->subsystem_device <= 0xb555) {
+ if ((tmp->subsystem_device <= 0xb555) || (tmp->subsystem_device == 0xb558)) {
qoztmp->stports = 4;
} else {
qoztmp->stports = 2;
@@ -1662,6 +1664,20 @@
qoztmp->irq, HZ, cid);
totalBRIs += 2;
break;
+ case 0xb557:
+ printk(KERN_INFO
+ "qozap: Junghanns.NET duoBRI miniPCI card configured at io port %#x IRQ %d HZ %d CardID %d\n",
+ (u_int) qoztmp->ioport,
+ qoztmp->irq, HZ, cid);
+ totalBRIs += 2;
+ break;
+ case 0xb558:
+ printk(KERN_INFO
+ "qozap: Junghanns.NET quadBRI miniPCI card configured at io port %#x IRQ %d HZ %d CardID %d\n",
+ (u_int) qoztmp->ioport,
+ qoztmp->irq, HZ, cid);
+ totalBRIs += 4;
+ break;
}
} else {
switch (tmp->subsystem_device) {
Modified: zaptel/trunk/zaphfc/zaphfc.c
===================================================================
--- zaptel/trunk/zaphfc/zaphfc.c 2007-04-04 21:53:38 UTC (rev 3367)
+++ zaptel/trunk/zaphfc/zaphfc.c 2007-04-06 11:12:58 UTC (rev 3368)
@@ -27,6 +27,10 @@
#include <zaptel.h>
#include "zaphfc.h"
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
+
#if CONFIG_PCI
#define CLKDEL_TE 0x0f /* CLKDEL in TE mode */
@@ -539,11 +543,7 @@
}
#ifndef RTAITIMING
-#ifdef LINUX26
-static irqreturn_t hfc_interrupt(int irq, void *dev_id, struct pt_regs *regs) {
-#else
-static void hfc_interrupt(int irq, void *dev_id, struct pt_regs *regs) {
-#endif
+ZAP_IRQ_HANDLER(hfc_interrupt) {
struct hfc_card *hfctmp = dev_id;
unsigned long flags = 0;
unsigned char stat;
Modified: zaptel/trunk/ztgsm/ztgsm.c
===================================================================
--- zaptel/trunk/ztgsm/ztgsm.c 2007-04-04 21:53:38 UTC (rev 3367)
+++ zaptel/trunk/ztgsm/ztgsm.c 2007-04-06 11:12:58 UTC (rev 3368)
@@ -720,11 +720,7 @@
-#ifdef LINUX26
-static irqreturn_t ztgsm_interrupt(int irq, void *dev_id, struct pt_regs *regs) {
-#else
-static void ztgsm_interrupt(int irq, void *dev_id, struct pt_regs *regs) {
-#endif
+ZAP_IRQ_HANDLER(ztgsm_interrupt) {
struct ztgsm_card *gsmtmp = dev_id;
unsigned int ser_status = 0;
unsigned char mods = 0;
More information about the Pkg-voip-commits
mailing list