[Pkg-voip-commits] r6309 - in /dahdi-linux/trunk: debian/rules drivers/dahdi/qozap.c drivers/dahdi/qozap.h
tzafrir-guest at alioth.debian.org
tzafrir-guest at alioth.debian.org
Sun Oct 12 20:50:16 UTC 2008
Author: tzafrir-guest
Date: Sun Oct 12 20:50:16 2008
New Revision: 6309
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6309
Log:
A dahdi version of qozap . builds, loads and unloads.
Added:
dahdi-linux/trunk/drivers/dahdi/qozap.c (contents, props changed)
- copied, changed from r6283, dahdi-linux/trunk/drivers/dahdi/qozap/qozap.c
dahdi-linux/trunk/drivers/dahdi/qozap.h (contents, props changed)
- copied, changed from r6283, dahdi-linux/trunk/drivers/dahdi/qozap/qozap.h
Modified:
dahdi-linux/trunk/debian/rules
Modified: dahdi-linux/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/rules?rev=6309&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/rules (original)
+++ dahdi-linux/trunk/debian/rules Sun Oct 12 20:50:16 2008
@@ -45,7 +45,7 @@
#EXTRA_MODS=ds1x1f opvxa1200
-EXTRA_MODS=zaphfc
+EXTRA_MODS=zaphfc qozap
ifneq (,$(filter-out powerpc m68k armeb mips,$(shell dpkg-architecture -qDEB_HOST_ARCH)))
EXTRA_MODS += wcopenpci
endif
Copied: dahdi-linux/trunk/drivers/dahdi/qozap.c (from r6283, dahdi-linux/trunk/drivers/dahdi/qozap/qozap.c)
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/drivers/dahdi/qozap.c?rev=6309&op=diff
==============================================================================
--- dahdi-linux/trunk/drivers/dahdi/qozap/qozap.c (original)
+++ dahdi-linux/trunk/drivers/dahdi/qozap.c Sun Oct 12 20:50:16 2008
@@ -15,12 +15,10 @@
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/interrupt.h>
-#include <zaptel.h>
+#include <dahdi/kernel.h>
#include "qozap.h"
-#ifdef LINUX26
#include <linux/moduleparam.h>
-#endif
#if CONFIG_PCI
@@ -37,7 +35,7 @@
static spinlock_t registerlock = SPIN_LOCK_UNLOCKED;
static int sort=1;
-static int ztqoz_shutdown(struct zt_span *span);
+static int ztqoz_shutdown(struct dahdi_span *span);
int qoz_waitbusy(struct qoz_card *qoztmp) {
int x=1000;
@@ -78,10 +76,12 @@
stports = qoztmp->stports;
for (s=0; s < stports; s++) {
- if(qoztmp->spans[s].flags & ZT_FLAG_REGISTERED) {
- zt_unregister(&(qoztmp->spans[s]));
+ if(qoztmp->spans[s].flags & DAHDI_FLAG_REGISTERED) {
+ dahdi_unregister(&(qoztmp->spans[s]));
if (debug > 2)
printk(KERN_INFO "qozap: unregistered card %d span %d.\n",qoztmp->cardno,s+1);
+ if (qoztmp->spans[s].chans)
+ kfree(qoztmp->spans[s].chans);
}
}
@@ -575,7 +575,7 @@
printk(KERN_INFO "qozap: CRC error for HDLC frame on card %d (cardID %d) S/T port %d\n",qoztmp->cardno, qoztmp->cardID, stport+1);
qoztmp->chans[stport][2].bytes2receive = 0;
qoztmp->chans[stport][2].eofrx = 0;
-// zt_qevent_nolock(&qoztmp->chans[stport][2], ZT_EVENT_BADFCS);
+// dahdi_qevent_nolock(&qoztmp->chans[stport][2], DAHDI_EVENT_BADFCS);
}
qoz_outb(qoztmp,qoz_R_INC_RES_FIFO,0x1);
qoz_waitbusy(qoztmp);
@@ -618,9 +618,9 @@
if (len < 0) {
len += qoz_FIFO_SIZE;
}
- if (len > 2 * ZT_CHUNKSIZE) {
- mumbojumbo = len - (2 * ZT_CHUNKSIZE);
- len = ZT_CHUNKSIZE;
+ if (len > 2 * DAHDI_CHUNKSIZE) {
+ mumbojumbo = len - (2 * DAHDI_CHUNKSIZE);
+ len = DAHDI_CHUNKSIZE;
for (i=0;i<mumbojumbo;i++) {
data = qoz_inb(qoztmp,qoz_A_FIFO_DATA0);
}
@@ -632,7 +632,7 @@
}
- if (len < ZT_CHUNKSIZE) {
+ if (len < DAHDI_CHUNKSIZE) {
// printk(KERN_INFO "qozap: not enough to receive (%d bytes)\n",len);
spin_unlock_irqrestore(&qoztmp->lock,flags);
return 0;
@@ -648,7 +648,7 @@
spin_unlock_irqrestore(&qoztmp->lock,flags);
if (bloop == 0)
- zt_ec_chunk(&qoztmp->spans[stport].chans[chan], qoztmp->spans[stport].chans[chan].readchunk, qoztmp->spans[stport].chans[chan].writechunk);
+ dahdi_ec_chunk(qoztmp->spans[stport].chans[chan], qoztmp->spans[stport].chans[chan]->readchunk, qoztmp->spans[stport].chans[chan]->writechunk);
// printk(KERN_INFO "s/t port %d, channel %d, dbufi=%d, f1=%d, f2=%d, z1=%d, z2=%d => len = %d stat=%#x, hdlc=%d\n",stport,chan,qoztmp->st[stport].dbufi,f1,f2,z1,z2,len,stat,hdlc);
return 0;
@@ -721,7 +721,7 @@
}
-static int ztqoz_dacs(struct zt_chan *dst, struct zt_chan *src)
+static int ztqoz_dacs(struct dahdi_chan *dst, struct dahdi_chan *src)
{
struct qoz_card *qoztmp = NULL;
int use_pcm_bus = 0;
@@ -808,9 +808,9 @@
for (s=0;s<qoztmp->stports;s++) {
if (!bloop) {
- if (qoztmp->spans[s].flags & ZT_FLAG_RUNNING) {
- /* oh zaptel! tell us what to transmit... */
- zt_transmit(&qoztmp->spans[s]);
+ if (qoztmp->spans[s].flags & DAHDI_FLAG_RUNNING) {
+ /* oh DAHDI! tell us what to transmit... */
+ dahdi_transmit(&qoztmp->spans[s]);
/* B1 xmit */
qoz_fifo_tx(qoztmp, s * 2);
/* B2 xmit */
@@ -830,15 +830,17 @@
}
/* D xmit */
- if (qoztmp->spans[s].alarms != ZT_ALARM_RED) {
+ if (qoztmp->spans[s].alarms != DAHDI_ALARM_RED) {
qoz_dfifo_tx(qoztmp, s);
} else {
if ((qoztmp->st[s].t3 == -1) && (qoztmp->st[s].t4 == -1) && (qoztmp->st[s].layer1state == 3) && (qoztmp->st[s].nt_mode != 1)) {
/* clear alarms */
if (debug > 2)
printk(KERN_INFO "qozap: clearing alarms on span %d\n",s);
- qoztmp->spans[s].alarms = ZT_ALARM_NONE;
- zt_alarm_notify_no_master_change(&qoztmp->spans[s]);
+ qoztmp->spans[s].alarms = DAHDI_ALARM_NONE;
+/* FIXME: Sort out the need for this patch. */
+#define dahdi_alarm_notify_no_master_change dahdi_alarm_notify
+ dahdi_alarm_notify_no_master_change(&qoztmp->spans[s]);
}
}
@@ -859,9 +861,9 @@
printk(KERN_CRIT "qozap: card %d st[%d].drx = %d\n", qoztmp->cardno, s, qoztmp->st[s].drx);
qoz_dfifo_rx(qoztmp, s);
}
- if (qoztmp->spans[s].flags & ZT_FLAG_RUNNING) {
- /* oh zaptel! thou shall receive! */
- zt_receive(&(qoztmp->spans[s]));
+ if (qoztmp->spans[s].flags & DAHDI_FLAG_RUNNING) {
+ /* oh DAHDI! thou shall receive! */
+ dahdi_receive(&(qoztmp->spans[s]));
}
} else {
// loop
@@ -875,13 +877,13 @@
printk(KERN_CRIT "qozap: card %d st[%d].drx = %d\n", qoztmp->cardno, s, qoztmp->st[s].drx);
qoz_dfifo_rx(qoztmp, s);
}
- if (qoztmp->spans[s].flags & ZT_FLAG_RUNNING) {
- zt_receive(&(qoztmp->spans[s]));
+ if (qoztmp->spans[s].flags & DAHDI_FLAG_RUNNING) {
+ dahdi_receive(&(qoztmp->spans[s]));
}
*/
- if (qoztmp->spans[s].flags & ZT_FLAG_RUNNING) {
- /* oh zaptel! tell us what to transmit... */
- // zt_transmit(&qoztmp->spans[s]);
+ if (qoztmp->spans[s].flags & DAHDI_FLAG_RUNNING) {
+ /* oh DAHDI! tell us what to transmit... */
+ // dahdi_transmit(&qoztmp->spans[s]);
/* B1 xmit */
qoz_fifo_tx(qoztmp, s * 2);
/* B2 xmit */
@@ -899,7 +901,7 @@
}
}
-ZAP_IRQ_HANDLER(qoz_interrupt) {
+DAHDI_IRQ_HANDLER(qoz_interrupt) {
struct qoz_card *qoztmp = dev_id;
unsigned long flags;
unsigned char irq_misc,irq_sci,status,l1state,irq_foview,fi;
@@ -907,27 +909,15 @@
int j=0;
if (!qoztmp) {
-#ifdef LINUX26
return IRQ_NONE;
-#else
- return;
-#endif
}
if ((!qoztmp->pci_io) || (!qoztmp->ioport)) {
printk(KERN_CRIT "qozap: no pci mem/io\n");
-#ifdef LINUX26
return IRQ_NONE;
-#else
- return;
-#endif
}
if (qoztmp->dead) {
-#ifdef LINUX26
return IRQ_RETVAL(1);
-#else
- return;
-#endif
}
@@ -939,11 +929,7 @@
if (!(status & 0x80) && !(status & 0x40) && (irq_sci == 0)) {
// printk(KERN_CRIT "qozap: status %#x\n", status);
// it's not us!
-#ifdef LINUX26
return IRQ_NONE;
-#else
- return;
-#endif
}
/* state machine irq */
if (irq_sci != 0) {
@@ -1001,7 +987,7 @@
qoztmp->st[st].l1up = 0;
if (qoztmp->st[st].t3 > -1) {
/* keep layer1 up, if the span is started. */
- if (qoztmp->spans[st].flags & ZT_FLAG_RUNNING) {
+ if (qoztmp->spans[st].flags & DAHDI_FLAG_RUNNING) {
if (debug > 2)
printk("qozap: re-activating layer1 span %d\n", st);
qoz_outb(qoztmp,qoz_A_ST_WR_STA,0x60);
@@ -1011,8 +997,8 @@
printk("qozap: not re-activating layer1 span %d\n", st);
qoz_outb(qoztmp,qoz_A_ST_WR_STA,0x40);
/* if we tried to activate layer 1 and it failed make this an alarm */
-// qoztmp->spans[st].alarms = ZT_ALARM_RED;
-// zt_alarm_notify(&qoztmp->spans[st]);
+// qoztmp->spans[st].alarms = DAHDI_ALARM_RED;
+// dahdi_alarm_notify(&qoztmp->spans[st]);
/* if the network shuts us down in idle mode dont make this an alarm */
}
qoztmp->leds[st] = 0;
@@ -1032,8 +1018,8 @@
qoz_waitbusy(qoztmp);
/* activation complete, stop timer t3 */
qoztmp->st[st].t3 = -1;
- qoztmp->spans[st].alarms = ZT_ALARM_NONE;
- zt_alarm_notify(&qoztmp->spans[st]);
+ qoztmp->spans[st].alarms = DAHDI_ALARM_NONE;
+ dahdi_alarm_notify(&qoztmp->spans[st]);
qoztmp->leds[st] = 1;
if (qoztmp->stports == 8) {
sprintf(qoztmp->spans[st].desc,"octoBRI PCI ISDN Card %d Span %d [TE] Layer 1 ACTIVATED (F%d)",qoztmp->cardno ,st + 1, l1state);
@@ -1100,9 +1086,9 @@
qoz_outb(qoztmp,qoz_A_ST_WR_STA, 0x40 );
qoz_waitbusy(qoztmp);
qoztmp->st[j].t3 = -1;
- qoztmp->spans[j].alarms = ZT_ALARM_RED;
+ qoztmp->spans[j].alarms = DAHDI_ALARM_RED;
spin_unlock_irqrestore(&(qoztmp->lock), flags);
- zt_alarm_notify_no_master_change(&qoztmp->spans[j]);
+ dahdi_alarm_notify_no_master_change(&qoztmp->spans[j]);
}
}
/* t4 */
@@ -1119,10 +1105,10 @@
qoz_outb(qoztmp,qoz_A_ST_WR_STA, 0x40 );
qoztmp->st[j].t4 = -1;
qoztmp->st[st].l1up = 0;
- qoztmp->spans[j].alarms = ZT_ALARM_RED;
+ qoztmp->spans[j].alarms = DAHDI_ALARM_RED;
qoz_waitbusy(qoztmp);
spin_unlock_irqrestore(&(qoztmp->lock), flags);
- zt_alarm_notify_no_master_change(&qoztmp->spans[j]);
+ dahdi_alarm_notify_no_master_change(&qoztmp->spans[j]);
}
}
}
@@ -1193,36 +1179,26 @@
spin_unlock_irqrestore(&(qoztmp->lock), flags);
}
-#ifdef LINUX26
return IRQ_RETVAL(1);
-#endif
-}
-
-static int ztqoz_open(struct zt_chan *chan) {
+}
+
+static int ztqoz_open(struct dahdi_chan *chan) {
// printk(KERN_INFO "qozap: channel %d opened.\n",chan->channo);
-#ifndef LINUX26
- MOD_INC_USE_COUNT;
-#else
try_module_get(THIS_MODULE);
-#endif
return 0;
}
-static int ztqoz_close(struct zt_chan *chan) {
+static int ztqoz_close(struct dahdi_chan *chan) {
// printk(KERN_INFO "qozap: channel %d closed.\n",chan->channo);
-#ifndef LINUX26
- MOD_DEC_USE_COUNT;
-#else
module_put(THIS_MODULE);
-#endif
return 0;
}
-static int ztqoz_rbsbits(struct zt_chan *chan, int bits) {
+static int ztqoz_rbsbits(struct dahdi_chan *chan, int bits) {
return 0;
}
-static int ztqoz_ioctl(struct zt_chan *chan, unsigned int cmd, unsigned long data) {
+static int ztqoz_ioctl(struct dahdi_chan *chan, unsigned int cmd, unsigned long data) {
switch(cmd) {
default:
return -ENOTTY;
@@ -1230,7 +1206,7 @@
return 0;
}
-static int ztqoz_startup(struct zt_span *span) {
+static int ztqoz_startup(struct dahdi_span *span) {
struct qoz_card *qoztmp = span->pvt;
unsigned long flags;
int alreadyrunning;
@@ -1241,29 +1217,29 @@
printk(KERN_INFO "qozap: no card for span at startup!\n");
}
- alreadyrunning = span->flags & ZT_FLAG_RUNNING;
+ alreadyrunning = span->flags & DAHDI_FLAG_RUNNING;
// printk(KERN_CRIT "already running %d flags %d\n", alreadyrunning, span->flags);
if (!alreadyrunning) {
- span->chans[2].flags &= ~ZT_FLAG_HDLC;
- span->chans[2].flags |= ZT_FLAG_BRIDCHAN;
+ span->chans[2]->flags &= ~DAHDI_FLAG_HDLC;
+ span->chans[2]->flags |= DAHDI_FLAG_BRIDCHAN;
/* setup B channel buffers (8 bytes each) */
for (i=0; i<2 ; i++) {
memset(qoztmp->rxbuf[span->offset][i],0x0,sizeof(qoztmp->rxbuf[span->offset][i]));
- span->chans[i].readchunk = qoztmp->rxbuf[span->offset][i];
+ span->chans[i]->readchunk = qoztmp->rxbuf[span->offset][i];
memset(qoztmp->txbuf[span->offset][i],0x0,sizeof(qoztmp->txbuf[span->offset][i]));
- span->chans[i].writechunk = qoztmp->txbuf[span->offset][i];
+ span->chans[i]->writechunk = qoztmp->txbuf[span->offset][i];
}
/* setup D channel buffer */
memset(qoztmp->dtxbuf[span->offset],0x0,sizeof(qoztmp->dtxbuf[span->offset]));
- span->chans[2].writechunk = qoztmp->dtxbuf[span->offset];
+ span->chans[2]->writechunk = qoztmp->dtxbuf[span->offset];
qoztmp->chans[span->offset][2].maxbytes2transmit = sizeof(qoztmp->dtxbuf[span->offset]);
memset(qoztmp->drxbuf[span->offset],0x0,sizeof(qoztmp->drxbuf[span->offset]));
- span->chans[2].readchunk = qoztmp->drxbuf[span->offset];
-
- span->flags |= ZT_FLAG_RUNNING;
+ span->chans[2]->readchunk = qoztmp->drxbuf[span->offset];
+
+ span->flags |= DAHDI_FLAG_RUNNING;
} else {
// printk(KERN_CRIT "already running\n");
return 0;
@@ -1395,7 +1371,7 @@
return 0;
}
-static int ztqoz_shutdown(struct zt_span *span) {
+static int ztqoz_shutdown(struct dahdi_span *span) {
unsigned long flags;
struct qoz_card *qoztmp = span->pvt;
int alreadyrunning;
@@ -1407,7 +1383,7 @@
}
- alreadyrunning = span->flags & ZT_FLAG_RUNNING;
+ alreadyrunning = span->flags & DAHDI_FLAG_RUNNING;
if (!alreadyrunning) {
return 0;
@@ -1461,7 +1437,7 @@
qoz_outb(qoztmp,qoz_A_CON_HDLC,0x2);
qoz_outb(qoztmp,qoz_A_IRQ_MSK,0x0);
- span->flags &= ~ZT_FLAG_RUNNING;
+ span->flags &= ~DAHDI_FLAG_RUNNING;
/* Deactivate Layer 1 */
qoz_outb(qoztmp,qoz_R_ST_SEL,span->offset);
@@ -1477,16 +1453,16 @@
return 0;
}
-static int ztqoz_maint(struct zt_span *span, int cmd) {
+static int ztqoz_maint(struct dahdi_span *span, int cmd) {
return 0;
}
-static int ztqoz_chanconfig(struct zt_chan *chan,int sigtype) {
+static int ztqoz_chanconfig(struct dahdi_chan *chan,int sigtype) {
// printk(KERN_INFO "chan_config sigtype=%d\n",sigtype);
return 0;
}
-static int ztqoz_spanconfig(struct zt_span *span,struct zt_lineconfig *lc) {
+static int ztqoz_spanconfig(struct dahdi_span *span,struct dahdi_lineconfig *lc) {
struct qoz_card *qoztmp = span->pvt;
span->lineconfig = lc->lineconfig;
qoztmp->st_sync[span->offset] = lc->sync;
@@ -1498,7 +1474,7 @@
int i=0,s=0;
for (s=0; s < qoztmp->stports; s++) {
- memset(&qoztmp->spans[s],0,sizeof(struct zt_span));
+ memset(&qoztmp->spans[s],0,sizeof(struct dahdi_span));
sprintf(qoztmp->spans[s].name,"ztqoz/%d/%d",qoztmp->cardno ,s + 1);
if (qoztmp->stports == 8) {
if (qoztmp->st[s].nt_mode == 1){
@@ -1539,27 +1515,35 @@
qoztmp->spans[s].ioctl = ztqoz_ioctl;
qoztmp->spans[s].dacs = ztqoz_dacs;
- qoztmp->spans[s].chans = qoztmp->chans[s];
qoztmp->spans[s].channels = 3;
- qoztmp->spans[s].deflaw = ZT_LAW_ALAW;
- qoztmp->spans[s].linecompat = ZT_CONFIG_AMI | ZT_CONFIG_CCS;
+ qoztmp->spans[s].chans = kmalloc(
+ sizeof(void*) * qoztmp->spans[s].channels, GFP_KERNEL);
+ if(!qoztmp->spans[s].chans) {
+ printk(KERN_ERR "%s: Failed to get memory for chans, s=%d.\n",
+ __FUNCTION__, s);
+ return -1;
+ }
+
+ qoztmp->spans[s].deflaw = DAHDI_LAW_ALAW;
+ qoztmp->spans[s].linecompat = DAHDI_CONFIG_AMI | DAHDI_CONFIG_CCS;
init_waitqueue_head(&qoztmp->spans[s].maintq);
qoztmp->spans[s].pvt = qoztmp;
qoztmp->spans[s].offset = s;
for (i=0; i < qoztmp->spans[s].channels; i++) {
- memset(&(qoztmp->chans[s][i]),0x0,sizeof(struct zt_chan));
+ memset(&(qoztmp->chans[s][i]),0x0,sizeof(struct dahdi_chan));
sprintf(qoztmp->chans[s][i].name,"ztqoz%d/%d/%d",qoztmp->cardno,s + 1,i + 1);
qoztmp->chans[s][i].pvt = qoztmp;
- qoztmp->chans[s][i].sigcap = ZT_SIG_CLEAR | ZT_SIG_DACS;
+ qoztmp->chans[s][i].sigcap = DAHDI_SIG_CLEAR | DAHDI_SIG_DACS;
qoztmp->chans[s][i].chanpos = i + 1;
- }
-
- if (zt_register(&qoztmp->spans[s],0)) {
- printk(KERN_INFO "qozap: unable to register zaptel span %d!\n",s+1);
+ qoztmp->spans[s].chans[i] = &(qoztmp->chans[s][i]);
+ }
+
+ if (dahdi_register(&qoztmp->spans[s],0)) {
+ printk(KERN_INFO "qozap: unable to register DAHDI span %d!\n",s+1);
return -1;
}
-// printk(KERN_INFO "qozap: registered zaptel span %d.\n",s+1);
+// printk(KERN_INFO "qozap: registered DAHDI span %d.\n",s+1);
}
return 0;
@@ -1630,7 +1614,7 @@
return -EIO;
}
- if (request_irq(qoztmp->irq, qoz_interrupt, ZAP_IRQ_SHARED, "qozap", qoztmp)) {
+ if (request_irq(qoztmp->irq, qoz_interrupt, DAHDI_IRQ_SHARED, "qozap", qoztmp)) {
printk(KERN_WARNING "qozap: unable to register irq\n");
kfree(qoztmp);
pci_disable_device(tmp);
@@ -2018,7 +2002,6 @@
}
#endif
-#ifdef LINUX26
module_param(doubleclock, int, 0600);
module_param(ports, int, 0600);
module_param(pcmslave, int, 0600);
@@ -2026,18 +2009,9 @@
module_param(debug, int, 0600);
module_param(dacs, int, 0600);
module_param(sort, int, 0600);
-#else
-MODULE_PARM(doubleclock,"i");
-MODULE_PARM(ports,"i");
-MODULE_PARM(pcmslave,"i");
-MODULE_PARM(bloop,"i");
-MODULE_PARM(debug,"i");
-MODULE_PARM(dacs,"i");
-MODULE_PARM(sort,"i");
-#endif
-
-
-MODULE_DESCRIPTION("quad/octo BRI zaptel driver");
+
+
+MODULE_DESCRIPTION("quad/octo BRI DAHDI driver");
MODULE_AUTHOR("Klaus-Peter Junghanns <kpj at junghanns.net>");
#ifdef MODULE_LICENSE
MODULE_LICENSE("GPL");
Propchange: dahdi-linux/trunk/drivers/dahdi/qozap.c
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: dahdi-linux/trunk/drivers/dahdi/qozap.h (from r6283, dahdi-linux/trunk/drivers/dahdi/qozap/qozap.h)
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/drivers/dahdi/qozap.h?rev=6309&op=diff
==============================================================================
--- dahdi-linux/trunk/drivers/dahdi/qozap/qozap.h (original)
+++ dahdi-linux/trunk/drivers/dahdi/qozap.h Sun Oct 12 20:50:16 2008
@@ -44,10 +44,10 @@
unsigned int pcibus;
unsigned int pcidevfn;
struct pci_dev *pcidev;
- struct zt_span spans[qoz_SPANS];
- struct zt_chan chans[qoz_SPANS][3];
- unsigned char rxbuf[qoz_SPANS][2][ZT_CHUNKSIZE];
- unsigned char txbuf[qoz_SPANS][2][ZT_CHUNKSIZE];
+ struct dahdi_span spans[qoz_SPANS];
+ struct dahdi_chan chans[qoz_SPANS][3];
+ unsigned char rxbuf[qoz_SPANS][2][DAHDI_CHUNKSIZE];
+ unsigned char txbuf[qoz_SPANS][2][DAHDI_CHUNKSIZE];
unsigned char drxbuf[qoz_SPANS][qoz_DFIFO_SIZE4];
unsigned char dtxbuf[qoz_SPANS][qoz_DFIFO_SIZE4];
unsigned char stports;
Propchange: dahdi-linux/trunk/drivers/dahdi/qozap.h
------------------------------------------------------------------------------
svn:mergeinfo =
More information about the Pkg-voip-commits
mailing list