diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2008-07-02 14:05:57 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2008-07-02 14:05:57 +0000 |
| commit | 5f3915802fea238dd74c5b7885d7e9d276e1406d (patch) | |
| tree | cc3b9b5a61f229bc887f4e0db9dfc0eed45a140c /drivers/dahdi/dahdi_dynamic.c | |
| parent | 1340abc2e710509a9bbe8ca720c91eff896c3d33 (diff) | |
fix remaining drivers broken by pointer type change in 'struct dahdi_span'... wctdm24xxp still broken, will fix in a couple of hours
(related to issue #12657)
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4514 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/dahdi_dynamic.c')
| -rw-r--r-- | drivers/dahdi/dahdi_dynamic.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/dahdi/dahdi_dynamic.c b/drivers/dahdi/dahdi_dynamic.c index 00e0a66..c0b50b1 100644 --- a/drivers/dahdi/dahdi_dynamic.c +++ b/drivers/dahdi/dahdi_dynamic.c @@ -104,7 +104,7 @@ static struct dahdi_dynamic { unsigned short txcnt; unsigned short rxcnt; struct dahdi_span span; - struct dahdi_chan *chans; + struct dahdi_chan **chans; struct dahdi_dynamic *next; struct dahdi_dynamic_driver *driver; void *pvt; @@ -196,7 +196,7 @@ static void ztd_sendmessage(struct dahdi_dynamic *z) offset = 0; for (x=0;x<z->span.channels;x++) { offset = x % 4; - bits |= (z->chans[x].txsig & 0xf) << (offset << 2); + bits |= (z->chans[x]->txsig & 0xf) << (offset << 2); if (offset == 3) { /* Write the bits when we have four channels */ *((unsigned short *)buf) = htons(bits); @@ -214,7 +214,7 @@ static void ztd_sendmessage(struct dahdi_dynamic *z) } for (x=0;x<z->span.channels;x++) { - memcpy(buf, z->chans[x].writechunk, DAHDI_CHUNKSIZE); + memcpy(buf, z->chans[x]->writechunk, DAHDI_CHUNKSIZE); buf += DAHDI_CHUNKSIZE; msglen += DAHDI_CHUNKSIZE; } @@ -611,13 +611,13 @@ static int create_dynamic(DAHDI_DYNAMIC_SPAN *zds) z->span.close = ztd_close; z->span.chanconfig = ztd_chanconfig; for (x=0;x<zds->numchans;x++) { - sprintf(z->chans[x].name, "ZTD/%s/%s/%d", zds->driver, zds->addr, x+1); - z->chans[x].sigcap = DAHDI_SIG_EM | DAHDI_SIG_CLEAR | DAHDI_SIG_FXSLS | - DAHDI_SIG_FXSKS | DAHDI_SIG_FXSGS | DAHDI_SIG_FXOLS | - DAHDI_SIG_FXOKS | DAHDI_SIG_FXOGS | DAHDI_SIG_SF | - DAHDI_SIG_DACS_RBS | DAHDI_SIG_CAS; - z->chans[x].chanpos = x + 1; - z->chans[x].pvt = z; + sprintf(z->chans[x]->name, "ZTD/%s/%s/%d", zds->driver, zds->addr, x+1); + z->chans[x]->sigcap = DAHDI_SIG_EM | DAHDI_SIG_CLEAR | DAHDI_SIG_FXSLS | + DAHDI_SIG_FXSKS | DAHDI_SIG_FXSGS | DAHDI_SIG_FXOLS | + DAHDI_SIG_FXOKS | DAHDI_SIG_FXOGS | DAHDI_SIG_SF | + DAHDI_SIG_DACS_RBS | DAHDI_SIG_CAS; + z->chans[x]->chanpos = x + 1; + z->chans[x]->pvt = z; } spin_lock_irqsave(&dlock, flags); |