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_dummy.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_dummy.c')
| -rw-r--r-- | drivers/dahdi/dahdi_dummy.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/dahdi/dahdi_dummy.c b/drivers/dahdi/dahdi_dummy.c index 8263633..8b094b9 100644 --- a/drivers/dahdi/dahdi_dummy.c +++ b/drivers/dahdi/dahdi_dummy.c @@ -93,7 +93,8 @@ struct ztdummy { struct dahdi_span span; - struct dahdi_chan chan; + struct dahdi_chan _chan; + struct dahdi_chan *chan; unsigned int counter; #ifdef USE_RTC spinlock_t rtclock; @@ -223,17 +224,18 @@ static void ztdummy_timer(unsigned long param) static int ztdummy_initialize(struct ztdummy *ztd) { /* DAHDI stuff */ + ztd->chan = &ztd->_chan; sprintf(ztd->span.name, "DAHDI_DUMMY/1"); snprintf(ztd->span.desc, sizeof(ztd->span.desc) - 1, "%s (source: " CLOCK_SRC ") %d", ztd->span.name, 1); - sprintf(ztd->chan.name, "DAHDI_DUMMY/%d/%d", 1, 0); + sprintf(ztd->chan->name, "DAHDI_DUMMY/%d/%d", 1, 0); dahdi_copy_string(ztd->span.devicetype, "DAHDI Dummy Timing Driver", sizeof(ztd->span.devicetype)); - ztd->chan.chanpos = 1; + ztd->chan->chanpos = 1; ztd->span.chans = &ztd->chan; ztd->span.channels = 0; /* no channels on our span */ ztd->span.deflaw = DAHDI_LAW_MULAW; init_waitqueue_head(&ztd->span.maintq); ztd->span.pvt = ztd; - ztd->chan.pvt = ztd; + ztd->chan->pvt = ztd; if (dahdi_register(&ztd->span, 0)) { return -1; } |