summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2008-08-07 12:04:54 +0000
committertzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2008-08-07 12:04:54 +0000
commit1ee2c6eb63c073628199f9f930325feff3b5e474 (patch)
tree9e9093f9b0a9e4bca8270cb72901bead0a6156b7
parent5f4e1031d84dfd65dad599e4c00f7d198ede9c8e (diff)
xpp: debuggging parameter pcmtx_chan now refers to a zap channel number.
Also fix a typo in card_fxs. (From r4461 in branches/1.4) git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@4465 5390a7c7-147a-4af0-8ec9-7488f05a26cb
-rw-r--r--xpp/card_fxs.c2
-rw-r--r--xpp/xbus-pcm.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/xpp/card_fxs.c b/xpp/card_fxs.c
index b45db4a..89293ea 100644
--- a/xpp/card_fxs.c
+++ b/xpp/card_fxs.c
@@ -1134,7 +1134,7 @@ static void process_hookstate(xpd_t *xpd, xpp_line_t offhook, xpp_line_t change_
update_line_status(xpd, i, 0);
}
/*
- * Must witch to low power. In high power, an ONHOOK
+ * Must switch to low power. In high power, an ONHOOK
* won't be detected.
*/
do_chan_power(xbus, xpd, i, 0);
diff --git a/xpp/xbus-pcm.c b/xpp/xbus-pcm.c
index ff4bee1..72a6588 100644
--- a/xpp/xbus-pcm.c
+++ b/xpp/xbus-pcm.c
@@ -839,7 +839,9 @@ void generic_card_pcm_fromspan(xbus_t *xbus, xpd_t *xpd, xpp_line_t lines, xpack
if(IS_SET(lines, i)) {
if(SPAN_REGISTERED(xpd)) {
#ifdef DEBUG_PCMTX
- if(pcmtx >= 0 && pcmtx_chan == i)
+ int channo = xpd->span.chans[i].channo;
+
+ if(pcmtx >= 0 && pcmtx_chan == channo)
memset((u_char *)pcm, pcmtx, ZT_CHUNKSIZE);
else
#endif