[Pkg-voip-commits] r9243 - in /dahdi-linux/trunk/debian: changelog patches/dahdi_linux_extra patches/define_spinlock patches/series patches/wcb4xxp_bn4s0e
tzafrir at alioth.debian.org
tzafrir at alioth.debian.org
Mon Aug 8 10:37:50 UTC 2011
Author: tzafrir
Date: Mon Aug 8 10:37:49 2011
New Revision: 9243
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9243
Log:
* New upstream release: 2.5.0:
- Patch wcb4xxp_bn4s0e removed: merged upstream.
- Patch define_spinlock removed: merged upstream.
- Patch dahdi-linux-extra updated.
Removed:
dahdi-linux/trunk/debian/patches/define_spinlock
dahdi-linux/trunk/debian/patches/wcb4xxp_bn4s0e
Modified:
dahdi-linux/trunk/debian/changelog
dahdi-linux/trunk/debian/patches/dahdi_linux_extra
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=9243&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/changelog (original)
+++ dahdi-linux/trunk/debian/changelog Mon Aug 8 10:37:49 2011
@@ -1,6 +1,9 @@
-dahdi-linux (1:2.4.1.1+dfsg-1) UNRELEASED; urgency=low
-
- * New upstream minor release.
+dahdi-linux (1:2.5.0+dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ - Patch wcb4xxp_bn4s0e removed: merged upstream.
+ - Patch define_spinlock removed: merged upstream.
+ - Patch dahdi-linux-extra updated.
* Updated dahdi-linux-extra:
- "Upstream" is now a complete git mirror.
- Actually include ap400 in the list of modules to build.
Modified: dahdi-linux/trunk/debian/patches/dahdi_linux_extra
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/dahdi_linux_extra?rev=9243&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/dahdi_linux_extra (original)
+++ dahdi-linux/trunk/debian/patches/dahdi_linux_extra Mon Aug 8 10:37:49 2011
@@ -1,17 +1,17 @@
Subject: dahdi-extra: out-of-tree DAHDI drivers
Origin: http://gitorious.org/dahdi-extra/dahdi-linux-extra
Forwarded: No
-Last-Update: 2011-06-19
+Last-Update: 2011-08-08
This patch includes a number of out-of-tree DAHDI drivers from the
dahdi-extra repository. They are all out-of-tree and are highly likely
not to be included in DAHDI-linux in the forseeable future.
-Git-Commit: 9268744f9bc0c5aa29e16cb847fa058b2ff3f8ec
-Dahdi: tags/2.4.1.1
+Git-Commit: 1a5eb3aa8925626b7a7c333a5248c7dfe8ffe97b
+Dahdi: tags/2.5.0
---
diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild
-index 3fe2e28..bdc8144 100644
+index ec881dc..dcd6e3c 100644
--- a/drivers/dahdi/Kbuild
+++ b/drivers/dahdi/Kbuild
@@ -29,6 +29,14 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_STEVE2) += dahdi_echocan_sec2.o
@@ -257,10 +257,10 @@
+
diff --git a/drivers/dahdi/ap400/ap400_drv.c b/drivers/dahdi/ap400/ap400_drv.c
new file mode 100644
-index 0000000..5153af0
+index 0000000..f625f12
--- /dev/null
+++ b/drivers/dahdi/ap400/ap400_drv.c
-@@ -0,0 +1,2363 @@
+@@ -0,0 +1,2362 @@
+/*
+ * AP4XX PCI Card Driver
+ *
@@ -608,7 +608,7 @@
+
+
+static void __set_clear(struct ap4 *wc, int span);
-+static int ap4_startup(struct dahdi_span *span);
++static int ap4_startup(struct file *file, struct dahdi_span *span);
+static int ap4_shutdown(struct dahdi_span *span);
+static int ap4_rbsbits(struct dahdi_chan *chan, int bits);
+static int ap4_maint(struct dahdi_span *span, int cmd);
@@ -1043,10 +1043,6 @@
+ printk("XXX Turn on local loopback on E1 #%d instead of send loopdown code XXX\n", span->spanno);
+ *(wc->membase+AP_E1_CONFIG_REG) |= (AP_E1_LOOP_CONFIG<<((span->spanno-1)*8));
+ break;
-+ case DAHDI_MAINT_LOOPSTOP:
-+ printk("XXX Stop sending loop codes on E1 #%d XXX\n", span->spanno);
-+ *(wc->membase+AP_E1_CONFIG_REG) &= ~(AP_E1_LOOP_CONFIG<<((span->spanno-1)*8));
-+ break;
+ default:
+ printk("%s: Unknown E1 maint command: %d\n", wc->variety, cmd);
+ break;
@@ -1065,8 +1061,6 @@
+ case DAHDI_MAINT_LOOPUP:
+ break;
+ case DAHDI_MAINT_LOOPDOWN:
-+ break;
-+ case DAHDI_MAINT_LOOPSTOP:
+ break;
+ default:
+ printk("%s: Unknown T1 maint command: %d\n", wc->variety, cmd);
@@ -1199,7 +1193,8 @@
+ return 0;
+}
+
-+static int ap4_spanconfig(struct dahdi_span *span, struct dahdi_lineconfig *lc)
++static int ap4_spanconfig(struct file *file, struct dahdi_span *span,
++ struct dahdi_lineconfig *lc)
+{
+ int i;
+ struct ap4_span *ts = ap4_span_from_span(span);
@@ -1234,7 +1229,7 @@
+ wc->checktiming = 1;
+ /* If we're already running, then go ahead and apply the changes */
+ if (span->flags & DAHDI_FLAG_RUNNING)
-+ return ap4_startup(span);
++ return ap4_startup(file, span);
+
+ // Limpa contadores de slips, crc e bpv
+ val = (*(wc->membase + AP_CNT_SLIP_REG));
@@ -1253,7 +1248,8 @@
+ return 0;
+}
+
-+static int ap4_chanconfig(struct dahdi_chan *chan, int sigtype)
++static int ap4_chanconfig(struct file *file, struct dahdi_chan *chan,
++ int sigtype)
+{
+ int alreadyrunning;
+ unsigned long flags;
@@ -1334,7 +1330,6 @@
+ ts->span.offset = x;
+ ts->writechunk = (void *)(wc->writechunk + x * 32 * 2);
+ ts->readchunk = (void *)(wc->readchunk + x * 32 * 2);
-+ init_waitqueue_head(&ts->span.maintq);
+ for (y=0;y<wc->tspans[x]->span.channels;y++) {
+ struct dahdi_chan *mychans = ts->chans[y];
+ sprintf(mychans->name, "AP4%d%d/%d/%d/%d", 0, wc->numspans, wc->num, x + 1, y + 1);
@@ -1520,7 +1515,7 @@
+ wc->variety, unit + 1, framing, line, crc4);
+}
+
-+static int ap4_startup(struct dahdi_span *span)
++static int ap4_startup(struct file *file, struct dahdi_span *span)
+{
+ int i;
+ int tspan;
@@ -1822,8 +1817,12 @@
+
+ if (ts->span.lineconfig & DAHDI_CONFIG_NOTOPEN) {
+ for (x=0,j=0;x < ts->span.channels;x++)
-+ if ((ts->span.chans[x]->flags & DAHDI_FLAG_OPEN) ||
-+ (ts->span.chans[x]->flags & DAHDI_FLAG_NETDEV))
++ if ((ts->span.chans[x]->flags & DAHDI_FLAG_OPEN)
++#ifdef CONFIG_DAHDI_NET
++ ||
++ (ts->span.chans[x]->flags & DAHDI_FLAG_NETDEV)
++#endif
++ )
+ j++;
+ if (!j)
+ alarms |= DAHDI_ALARM_NOTOPEN;
@@ -3115,7 +3114,7 @@
+endif
diff --git a/drivers/dahdi/opvxa1200/base.c b/drivers/dahdi/opvxa1200/base.c
new file mode 100644
-index 0000000..2ea3cff
+index 0000000..32da0e0
--- /dev/null
+++ b/drivers/dahdi/opvxa1200/base.c
@@ -0,0 +1,3049 @@
@@ -5561,7 +5560,7 @@
+ wc->span.channels = wc->max_cards; /*MAX_NUM_CARDS;*/
+ wc->span.irq = wc->dev->irq;
+ wc->span.flags = DAHDI_FLAG_RBS;
-+ init_waitqueue_head(&wc->span.maintq);
++ wc->span.ops = &wctdm_span_ops;
+
+ if (dahdi_register(&wc->span, 0)) {
+ printk(KERN_NOTICE "Unable to register span with Dahdi\n");
@@ -6222,10 +6221,10 @@
+endif
diff --git a/drivers/dahdi/opvxd115/base.c b/drivers/dahdi/opvxd115/base.c
new file mode 100644
-index 0000000..a434c59
+index 0000000..123a2e0
--- /dev/null
+++ b/drivers/dahdi/opvxd115/base.c
-@@ -0,0 +1,4906 @@
+@@ -0,0 +1,4903 @@
+/*
+ * OpenVox D115P/D115E PCI/PCI-E Driver version 0.1 01/07/2011
+ *
@@ -6613,18 +6612,16 @@
+};
+
+static const struct dahdi_echocan_ops vpm400m_ec_ops = {
-+ .name = "VPM400M",
+ .echocan_free = echocan_free,
+};
+
+static const struct dahdi_echocan_ops vpm450m_ec_ops = {
-+ .name = "VPM450M",
+ .echocan_free = echocan_free,
+};
+#endif
+
+static void __set_clear(struct t4 *wc, int span);
-+static int t4_startup(struct dahdi_span *span);
++static int t4_startup(struct file *file, struct dahdi_span *span);
+static int t4_shutdown(struct dahdi_span *span);
+static int t4_rbsbits(struct dahdi_chan *chan, int bits);
+static int t4_maint(struct dahdi_span *span, int cmd);
@@ -7515,8 +7512,8 @@
+ }
+
+ if (ecp->param_count > 0) {
-+ dev_warn(&wc->dev->dev, "%s echo canceller does not support "
-+ "parameters; failing request\n", ops->name);
++ dev_warn(&wc->dev->dev, "echo canceller does not support "
++ "parameters; failing request\n");
+ return -EINVAL;
+ }
+
@@ -7754,7 +7751,6 @@
+#endif
+ case DAHDI_MAINT_LOOPUP:
+ case DAHDI_MAINT_LOOPDOWN:
-+ case DAHDI_MAINT_LOOPSTOP:
+ dev_info(&wc->dev->dev,
+ "Loopup & loopdown supported in E1 mode\n");
+ return -ENOSYS;
@@ -7829,11 +7825,6 @@
+ dev_info(&wc->dev->dev, "Transmitting loopdown code\n");
+ t4_clear_maint(span);
+ t4_framer_out(wc, span->offset, 0x21, 0x60);
-+ break;
-+ case DAHDI_MAINT_LOOPSTOP:
-+ dev_info(&wc->dev->dev, "Transmitting loopstop code\n");
-+ t4_clear_maint(span);
-+ t4_framer_out(wc, span->offset, 0x21, 0x40);
+ break;
+#if (defined(DAHDI_SPAN_OPS) || defined(DAHDI_SPAN_MODULE) )
+ case DAHDI_MAINT_FAS_DEFECT:
@@ -8090,7 +8081,8 @@
+ }
+}
+
-+static int t4_spanconfig(struct dahdi_span *span, struct dahdi_lineconfig *lc)
++static int t4_spanconfig(struct file *file, struct dahdi_span *span,
++ struct dahdi_lineconfig *lc)
+{
+ int i;
+ struct t4_span *ts = t4_from_span(span);
@@ -8132,14 +8124,15 @@
+
+ /* If we're already running, then go ahead and apply the changes */
+ if (span->flags & DAHDI_FLAG_RUNNING)
-+ return t4_startup(span);
++ return t4_startup(file, span);
+
+ if (debug)
+ dev_info(&wc->dev->dev, "Done with spanconfig!\n");
+ return 0;
+}
+
-+static int t4_chanconfig(struct dahdi_chan *chan, int sigtype)
++static int t4_chanconfig(struct file *file, struct dahdi_chan *chan,
++ int sigtype)
+{
+ int alreadyrunning;
+ unsigned long flags;
@@ -8379,7 +8372,6 @@
+ ts->span.offset = x;
+ ts->writechunk = (void *)(wc->writechunk + x * 32 * 2);
+ ts->readchunk = (void *)(wc->readchunk + x * 32 * 2);
-+ init_waitqueue_head(&ts->span.maintq);
+
+ for (y=0;y<wc->tspans[x]->span.channels;y++) {
+ struct dahdi_chan *mychans = ts->chans[y];
@@ -8882,7 +8874,7 @@
+ unit + 1, framing, line, crc4);
+}
+
-+static int t4_startup(struct dahdi_span *span)
++static int t4_startup(struct file *file, struct dahdi_span *span)
+{
+#ifdef SUPPORT_GEN1
+ int i;
@@ -9344,8 +9336,12 @@
+
+ if (ts->span.lineconfig & DAHDI_CONFIG_NOTOPEN) {
+ for (x=0,j=0;x < ts->span.channels;x++)
-+ if ((ts->span.chans[x]->flags & DAHDI_FLAG_OPEN) ||
-+ (ts->span.chans[x]->flags & DAHDI_FLAG_NETDEV))
++ if ((ts->span.chans[x]->flags & DAHDI_FLAG_OPEN)
++#ifdef CONFIG_DAHDI_NET
++ ||
++ (ts->span.chans[x]->flags & DAHDI_FLAG_NETDEV)
++#endif
++ )
+ j++;
+ if (!j)
+ alarms |= DAHDI_ALARM_NOTOPEN;
@@ -12339,10 +12335,10 @@
+#endif
diff --git a/drivers/dahdi/wcopenpci.c b/drivers/dahdi/wcopenpci.c
new file mode 100644
-index 0000000..e5567ca
+index 0000000..ef4d1f3
--- /dev/null
+++ b/drivers/dahdi/wcopenpci.c
-@@ -0,0 +1,1850 @@
+@@ -0,0 +1,1849 @@
+/*
+ * Voicetronix OpenPCI Interface Driver for Zapata Telephony interface
+ *
@@ -13672,7 +13668,6 @@
+ wc->span.channels = MAX_PORTS;
+ wc->span.flags = DAHDI_FLAG_RBS;
+ wc->span.ops = &openpci_span_ops;
-+ init_waitqueue_head(&wc->span.maintq);
+
+ if (dahdi_register(&wc->span, 0)) {
+ cardcrit(wc->boardnum, "Unable to register span with dahdi");
@@ -14211,7 +14206,7 @@
+
diff --git a/drivers/dahdi/zaphfc/base.c b/drivers/dahdi/zaphfc/base.c
new file mode 100644
-index 0000000..0996b51
+index 0000000..841454c
--- /dev/null
+++ b/drivers/dahdi/zaphfc/base.c
@@ -0,0 +1,1710 @@
@@ -14807,7 +14802,7 @@
+
+}
+
-+static int hfc_zap_startup(struct dahdi_span *span)
++static int hfc_zap_startup(struct file *file, struct dahdi_span *span)
+{
+ struct dahdi_hfc *zthfc = dahdi_hfc_from_span(span);
+ struct hfc_card *hfctmp = zthfc->card;
@@ -14838,7 +14833,8 @@
+ return 0;
+}
+
-+static int hfc_zap_chanconfig(struct dahdi_chan *d_chan, int sigtype)
++static int hfc_zap_chanconfig(struct file *file, struct dahdi_chan *d_chan,
++ int sigtype)
+{
+ struct hfc_chan_duplex *chan = d_chan->pvt;
+ struct hfc_card *card = chan->card;
@@ -14852,7 +14848,7 @@
+ return 0;
+}
+
-+static int hfc_zap_spanconfig(struct dahdi_span *span,
++static int hfc_zap_spanconfig(struct file *file, struct dahdi_span *span,
+ struct dahdi_lineconfig *lc)
+{
+ span->lineconfig = lc->lineconfig;
@@ -14902,7 +14898,6 @@
+ hfccard->span.deflaw = DAHDI_LAW_ALAW;
+ hfccard->span.linecompat = DAHDI_CONFIG_AMI | DAHDI_CONFIG_CCS;
+ hfccard->span.offset = 0;
-+ init_waitqueue_head(&hfccard->span.maintq);
+
+ for (i = 0; i < hfccard->span.channels; i++) {
+ memset(&hfccard->chans[i], 0x0, sizeof(struct dahdi_chan));
Modified: dahdi-linux/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/series?rev=9243&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/series (original)
+++ dahdi-linux/trunk/debian/patches/series Mon Aug 8 10:37:49 2011
@@ -3,5 +3,3 @@
dahdi_linux_extra
no_firmware_download
chanmute
-wcb4xxp_bn4s0e
-define_spinlock
More information about the Pkg-voip-commits
mailing list