From c000f4a0957eec5d349dee3fd7072163627ed4ef Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Fri, 23 Sep 2011 20:18:21 +0000 Subject: wctdm24xxp, wcte12xp: Advertise VPMOCT032 presence in dahdi_span.devicetype. A "(VPMADT032)" string is appended to the devicetype (as shown by dahdi_scan) for the span if one is installed. Now append '(VPMOCT032)' if one is installed as well. Also, for the wcte12xp driver append the VPM name to the device type after initially probing as opposed to only after the span is configured. (Related to issue DAHDI-890) Signed-off-by: Shaun Ruffell git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10203 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/wcte12xp/base.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'drivers/dahdi/wcte12xp/base.c') diff --git a/drivers/dahdi/wcte12xp/base.c b/drivers/dahdi/wcte12xp/base.c index aa9d019..80835c1 100644 --- a/drivers/dahdi/wcte12xp/base.c +++ b/drivers/dahdi/wcte12xp/base.c @@ -1022,9 +1022,13 @@ static void set_span_devicetype(struct t1 *wc) sizeof(wc->span.devicetype) - 1); #if defined(VPM_SUPPORT) - if (wc->vpmadt032) + if (wc->vpmadt032) { strncat(wc->span.devicetype, " (VPMADT032)", sizeof(wc->span.devicetype) - 1); + } else if (wc->vpmoct) { + strncat(wc->span.devicetype, " (VPMOCT032)", + sizeof(wc->span.devicetype) - 1); + } #endif } @@ -1660,6 +1664,8 @@ static void check_and_load_vpm(struct t1 *wc) vpmoct_init(vpmoct, t1_vpm_load_complete); } + + set_span_devicetype(wc); } #else static inline void check_and_load_vpm(const struct t1 *wc) -- cgit v1.2.3