diff options
author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-08-11 14:00:30 +0000 |
---|---|---|
committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-08-11 14:00:30 +0000 |
commit | 399e9527c164aea4ee0dffa88f7b2c0639ce2b4e (patch) | |
tree | c89d6222c300bc82b28d1a38cf50acadf8ad2e97 /kernel/xpp/card_bri.c | |
parent | abca98852c3abfa53aae5043383e25868087d9af (diff) |
* pcmtx_chan debugging parameter now refers to a zaptel channel number.
* Do initialize xsp. Closes issue #13276 .
* xbus_core_shutdown can't be __exit as it is used in initilization as
well.
Merged revisions 4473 via svnmerge from
http://svn.digium.com/svn/zaptel/branches/1.2
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4474 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'kernel/xpp/card_bri.c')
-rw-r--r-- | kernel/xpp/card_bri.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/xpp/card_bri.c b/kernel/xpp/card_bri.c index 086dbea..ea78ea6 100644 --- a/kernel/xpp/card_bri.c +++ b/kernel/xpp/card_bri.c @@ -1092,12 +1092,13 @@ static void BRI_card_pcm_fromspan(xbus_t *xbus, xpd_t *xpd, xpp_line_t wanted_li if(IS_SET(wanted_lines, i)) { if(SPAN_REGISTERED(tmp_xpd)) { #ifdef DEBUG_PCMTX - if(pcmtx >= 0 && pcmtx_chan == i) + int channo = tmp_xpd->span.chans[i].channo; + + if(pcmtx >= 0 && pcmtx_chan == channo) memset((u_char *)pcm, pcmtx, ZT_CHUNKSIZE); else #endif memcpy((u_char *)pcm, chans[i].writechunk, ZT_CHUNKSIZE); - // fill_beep((u_char *)pcm, tmp_xpd->addr.subunit, 2); } else memset((u_char *)pcm, 0x7F, ZT_CHUNKSIZE); pcm += ZT_CHUNKSIZE; @@ -1143,7 +1144,6 @@ static void BRI_card_pcm_tospan(xbus_t *xbus, xpd_t *xpd, xpacket_t *pack) if(IS_SET(tmp_mask, i)) { r = tmp_xpd->span.chans[i].readchunk; // memset((u_char *)r, 0x5A, ZT_CHUNKSIZE); // DEBUG - // fill_beep((u_char *)r, 1, 1); // DEBUG: BEEP memcpy((u_char *)r, pcm, ZT_CHUNKSIZE); pcm += ZT_CHUNKSIZE; } |