summaryrefslogtreecommitdiff
path: root/drivers/dahdi/wct4xxp
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2009-08-19 16:40:13 +0000
committerKevin P. Fleming <kpfleming@digium.com>2009-08-19 16:40:13 +0000
commitc942256302465c8fc80a014bab9eb4fa9aa7274c (patch)
treed53f3ccb48ad7c7cb858377ac2c55a91352b746e /drivers/dahdi/wct4xxp
parent5da287cb2dbeac2fdcd6e3a3e408f3f32ca710ca (diff)
Ensure that dahdi_scan correctly reports VPM presence.
The wct4xxp driver (for the dual/quad span T1/E1 cards) and the wcte12xp driver (for the single span VoiceBus-based T1/E1 cards) did not properly update the 'devicetype' field reported by dahdi_scan when a VPM was found during the card startup process. As a result, dahdi_scan did not show that a VPM was present on the card, even if it was. git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@7038 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/wct4xxp')
-rw-r--r--drivers/dahdi/wct4xxp/base.c29
1 files changed, 21 insertions, 8 deletions
diff --git a/drivers/dahdi/wct4xxp/base.c b/drivers/dahdi/wct4xxp/base.c
index 59c7fc0..bbfdda9 100644
--- a/drivers/dahdi/wct4xxp/base.c
+++ b/drivers/dahdi/wct4xxp/base.c
@@ -1581,6 +1581,24 @@ static int t4_close(struct dahdi_chan *chan)
return 0;
}
+static void set_span_devicetype(struct t4 *wc)
+{
+ int x;
+ struct t4_span *ts;
+
+ for (x = 0; x < wc->numspans; x++) {
+ ts = wc->tspans[x];
+ dahdi_copy_string(ts->span.devicetype, wc->variety, sizeof(ts->span.devicetype));
+ if (wc->vpm == T4_VPM_PRESENT) {
+ if (!wc->vpm450m)
+ strncat(ts->span.devicetype, " (VPM400M)", sizeof(ts->span.devicetype) - 1);
+ else
+ strncat(ts->span.devicetype, (wc->numspans > 2) ? " (VPMOCT128)" : " (VPMOCT064)",
+ sizeof(ts->span.devicetype) - 1);
+ }
+ }
+}
+
/* The number of cards we have seen with each
possible 'order' switch setting.
*/
@@ -1602,14 +1620,6 @@ static void init_spans(struct t4 *wc)
snprintf(ts->span.desc, sizeof(ts->span.desc) - 1,
"T%dXXP (PCI) Card %d Span %d", wc->numspans, wc->num, x+1);
ts->span.manufacturer = "Digium";
- dahdi_copy_string(ts->span.devicetype, wc->variety, sizeof(ts->span.devicetype));
- if (wc->vpm == T4_VPM_PRESENT) {
- if (!wc->vpm450m)
- strncat(ts->span.devicetype, " with VPM400M", sizeof(ts->span.devicetype) - 1);
- else
- strncat(ts->span.devicetype, (wc->numspans > 2) ? " with VPMOCT128" : " with VPMOCT064",
- sizeof(ts->span.devicetype) - 1);
- }
if (order_index[wc->order] == 1)
snprintf(ts->span.location, sizeof(ts->span.location) - 1, "Board ID Switch %d", wc->order);
else
@@ -1682,6 +1692,7 @@ static void init_spans(struct t4 *wc)
}
}
}
+ set_span_devicetype(wc);
}
static void t4_serial_setup(struct t4 *wc, int unit)
@@ -2150,6 +2161,8 @@ static int t4_startup(struct dahdi_span *span)
t4_vpm450_init(wc);
wc->dmactrl |= wc->vpm;
t4_pci_out(wc, WC_DMACTRL, wc->dmactrl);
+ if (wc->vpm)
+ set_span_devicetype(wc);
}
#endif
printk(KERN_INFO "Completed startup!\n");