summaryrefslogtreecommitdiff
path: root/wct4xxp/vpm450m.c
diff options
context:
space:
mode:
authorkpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2006-09-08 16:13:13 +0000
committerkpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2006-09-08 16:13:13 +0000
commit7714951569543658b31c0ed23f80296fa848c82d (patch)
treef63198eb3b67718c69763e215391f7f42148f623 /wct4xxp/vpm450m.c
parent49b8bd978bf1fb6f12a123681fbb6027878db615 (diff)
Merged revisions 1436-1438 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2 ........ r1436 | kpfleming | 2006-09-08 11:02:43 -0500 (Fri, 08 Sep 2006) | 3 lines fix problem with VPM450M/VPMOCT when T1 and E1 are both used on the card make hardware DTMF detection default based on whether the module is a VPM400M or a VPM450M/VPMOCT ........ r1437 | kpfleming | 2006-09-08 11:06:21 -0500 (Fri, 08 Sep 2006) | 2 lines fix spacing in log message ........ r1438 | kpfleming | 2006-09-08 11:11:38 -0500 (Fri, 08 Sep 2006) | 2 lines gotta pay closer attention before i commit this stuff... ........ git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1439 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wct4xxp/vpm450m.c')
-rw-r--r--wct4xxp/vpm450m.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/wct4xxp/vpm450m.c b/wct4xxp/vpm450m.c
index d423c12..5e52b79 100644
--- a/wct4xxp/vpm450m.c
+++ b/wct4xxp/vpm450m.c
@@ -442,7 +442,10 @@ struct vpm450m *init_vpm450m(void *wc, int *isalaw)
return NULL;
}
for (x=0;x<128;x++) {
- if (isalaw[x >> 5])
+ /* span timeslots are interleaved 12341234...
+ * therefore, the lower 2 bits tell us which span this timeslot/channel
+ */
+ if (isalaw[x & 0x03])
law = cOCT6100_PCM_A_LAW;
else
law = cOCT6100_PCM_U_LAW;