* 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.


git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@4473 5390a7c7-147a-4af0-8ec9-7488f05a26cb

5 files changed, 14 insertions, 14 deletions

diff --git a/xpp/Makefile b/xpp/Makefile
index bbd4abe..00fc5ee 100644
--- a/xpp/Makefile
+++ b/xpp/Makefile
@@ -1,4 +1,4 @@
-# We only get here on kernels 2.6.0-2.6.8 .
+# We only get here on kernels 2.6.0-2.6.9 .
 # For newer kernels, Kbuild will be included directly by the kernel
 # build system.
 -include $(src)/Kbuild
diff --git a/xpp/card_bri.c b/xpp/card_bri.c
index 086dbea..ea78ea6 100644
--- a/xpp/card_bri.c
+++ b/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;
 			}
diff --git a/xpp/card_pri.c b/xpp/card_pri.c
index 6b2f487..ed438cf 100644
--- a/xpp/card_pri.c
+++ b/xpp/card_pri.c
@@ -743,7 +743,7 @@ static int pri_lineconfig(xpd_t *xpd, int lineconfig)
 	byte			fmr3 = 0;	/* write only for CRC4 */
 	byte			fmr4 = 0;
 	byte			imr0 = 0;
-	byte			xsp;
+	byte			xsp = 0;
 	unsigned int		bad_bits;
 	int			i;
 
@@ -1359,6 +1359,14 @@ static void PRI_card_pcm_fromspan(xbus_t *xbus, xpd_t *xpd, xpp_line_t lines, xp
 		if(IS_SET(lines, i)) {
 			physical_mask |= BIT(physical_chan);
 			if(SPAN_REGISTERED(xpd)) {
+#ifdef	DEBUG_PCMTX
+				int	channo = 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);
 				if(i == PRI_DCHAN_IDX(priv)) {
 					if(priv->dchan_tx_sample != chans[i].writechunk[0]) {
 						priv->dchan_tx_sample = chans[i].writechunk[0];
@@ -1368,12 +1376,6 @@ static void PRI_card_pcm_fromspan(xbus_t *xbus, xpd_t *xpd, xpp_line_t lines, xp
 					else
 						chans[i].writechunk[0] = 0xFF;	/* Clobber for next tick */
 				}
-#ifdef	DEBUG_PCMTX
-				if(pcmtx >= 0 && pcmtx_chan == i)
-					memset((u_char *)pcm, pcmtx, ZT_CHUNKSIZE);
-				else
-#endif
-					memcpy((u_char *)pcm, chans[i].writechunk, ZT_CHUNKSIZE);
 			} else
 				memset((u_char *)pcm, ZT_XLAW(0, (&chans[i])), ZT_CHUNKSIZE);
 			pcm += ZT_CHUNKSIZE;
diff --git a/xpp/xbus-core.c b/xpp/xbus-core.c
index 83afd05..f458896 100644
--- a/xpp/xbus-core.c
+++ b/xpp/xbus-core.c
@@ -1669,7 +1669,7 @@ err:
 }
 
 
-void __exit xbus_core_shutdown(void)
+void xbus_core_shutdown(void)
 {
 	int		i;
 
diff --git a/xpp/xbus-pcm.c b/xpp/xbus-pcm.c
index 72a6588..a5c186c 100644
--- a/xpp/xbus-pcm.c
+++ b/xpp/xbus-pcm.c
@@ -846,7 +846,6 @@ void generic_card_pcm_fromspan(xbus_t *xbus, xpd_t *xpd, xpp_line_t lines, xpack
 				else
 #endif
 					memcpy((u_char *)pcm, chans[i].writechunk, ZT_CHUNKSIZE);
-				// fill_beep((u_char *)pcm, xpd->addr.subunit, 2);
 			} else
 				memset((u_char *)pcm, 0x7F, ZT_CHUNKSIZE);
 			pcm += ZT_CHUNKSIZE;
@@ -881,7 +880,6 @@ void generic_card_pcm_tospan(xbus_t *xbus, xpd_t *xpd, xpacket_t *pack)
 		if(got_data && !IS_SET(pcm_mute, i)) {
 			/* We have and want real data */
 			// memset((u_char *)r, 0x5A, ZT_CHUNKSIZE);	// DEBUG
-			// fill_beep((u_char *)r, 1, 1);	// DEBUG: BEEP
 			memcpy((u_char *)r, pcm, ZT_CHUNKSIZE);
 		} else if(IS_SET(xpd->wanted_pcm_mask | xpd->silence_pcm, i)) {
 			/* Inject SILENCE */