wctdm24xxp,wcte12xp: Replace read/writechunk with eframe/sframe

Trival name change to increase readability in the transmitprep and
recieveprep functions. Now we clearly define if we are working with an
sframe or an eframe.

Signed-off-by: Russ Meyerriecks <rmeyerriecks@digium.com>
Acked-By: Shaun Ruffell <sruffell@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9768 a0bf4364-ded3-4de4-8d8a-66a801d63aff

2 files changed, 191 insertions, 221 deletions

diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c
index 8153a35..1dca8df 100644
--- a/drivers/dahdi/wctdm24xxp/base.c
+++ b/drivers/dahdi/wctdm24xxp/base.c
@@ -468,7 +468,7 @@ static inline bool is_good_frame(const u8 *sframe)
         return a != b;
 }
 
-static inline void cmd_dequeue_vpmadt032(struct wctdm *wc, u8 *writechunk)
+static inline void cmd_dequeue_vpmadt032(struct wctdm *wc, u8 *eframe)
 {
 	unsigned long flags;
 	struct vpmadt032_cmd *curcmd = NULL;
@@ -477,7 +477,7 @@ static inline void cmd_dequeue_vpmadt032(struct wctdm *wc, u8 *writechunk)
 	unsigned char leds = ~((wc->intcount / 1000) % 8) & 0x7;
 
 	/* Skip audio */
-	writechunk += 24;
+	eframe += 24;
 
 	if (test_bit(VPM150M_SPIRESET, &vpmadt032->control) || test_bit(VPM150M_HPIRESET, &vpmadt032->control)) {
 		if (debug & DEBUG_ECHOCAN)
@@ -486,13 +486,13 @@ static inline void cmd_dequeue_vpmadt032(struct wctdm *wc, u8 *writechunk)
 		for (x = 24; x < 28; x++) {
 			if (x == 24) {
 				if (test_and_clear_bit(VPM150M_SPIRESET, &vpmadt032->control))
-					writechunk[CMD_BYTE(x, 0, 0)] = 0x08;
+					eframe[CMD_BYTE(x, 0, 0)] = 0x08;
 				else if (test_and_clear_bit(VPM150M_HPIRESET, &vpmadt032->control))
-					writechunk[CMD_BYTE(x, 0, 0)] = 0x0b;
+					eframe[CMD_BYTE(x, 0, 0)] = 0x0b;
 			} else
-				writechunk[CMD_BYTE(x, 0, 0)] = 0x00 | leds;
-			writechunk[CMD_BYTE(x, 1, 0)] = 0;
-			writechunk[CMD_BYTE(x, 2, 0)] = 0x00;
+				eframe[CMD_BYTE(x, 0, 0)] = 0x00 | leds;
+			eframe[CMD_BYTE(x, 1, 0)] = 0;
+			eframe[CMD_BYTE(x, 2, 0)] = 0x00;
 		}
 		spin_unlock_irqrestore(&wc->reglock, flags);
 		return;
@@ -506,79 +506,79 @@ static inline void cmd_dequeue_vpmadt032(struct wctdm *wc, u8 *writechunk)
 #endif
 		if (curcmd->desc & __VPM150M_RWPAGE) {
 			/* Set CTRL access to page*/
-			writechunk[CMD_BYTE(24, 0, 0)] = (0x8 << 4);
-			writechunk[CMD_BYTE(24, 1, 0)] = 0;
-			writechunk[CMD_BYTE(24, 2, 0)] = 0x20;
+			eframe[CMD_BYTE(24, 0, 0)] = (0x8 << 4);
+			eframe[CMD_BYTE(24, 1, 0)] = 0;
+			eframe[CMD_BYTE(24, 2, 0)] = 0x20;
 
 			/* Do a page write */
 			if (curcmd->desc & __VPM150M_WR)
-				writechunk[CMD_BYTE(25, 0, 0)] = ((0x8 | 0x4) << 4);
+				eframe[CMD_BYTE(25, 0, 0)] = ((0x8 | 0x4) << 4);
 			else
-				writechunk[CMD_BYTE(25, 0, 0)] = ((0x8 | 0x4 | 0x1) << 4);
-			writechunk[CMD_BYTE(25, 1, 0)] = 0;
+				eframe[CMD_BYTE(25, 0, 0)] = ((0x8 | 0x4 | 0x1) << 4);
+			eframe[CMD_BYTE(25, 1, 0)] = 0;
 			if (curcmd->desc & __VPM150M_WR)
-				writechunk[CMD_BYTE(25, 2, 0)] = curcmd->data & 0xf;
+				eframe[CMD_BYTE(25, 2, 0)] = curcmd->data & 0xf;
 			else
-				writechunk[CMD_BYTE(25, 2, 0)] = 0;
+				eframe[CMD_BYTE(25, 2, 0)] = 0;
 
 			/* Clear XADD */
-			writechunk[CMD_BYTE(26, 0, 0)] = (0x8 << 4);
-			writechunk[CMD_BYTE(26, 1, 0)] = 0;
-			writechunk[CMD_BYTE(26, 2, 0)] = 0;
+			eframe[CMD_BYTE(26, 0, 0)] = (0x8 << 4);
+			eframe[CMD_BYTE(26, 1, 0)] = 0;
+			eframe[CMD_BYTE(26, 2, 0)] = 0;
 
 			/* Fill in to buffer to size */
-			writechunk[CMD_BYTE(27, 0, 0)] = 0;
-			writechunk[CMD_BYTE(27, 1, 0)] = 0;
-			writechunk[CMD_BYTE(27, 2, 0)] = 0;
+			eframe[CMD_BYTE(27, 0, 0)] = 0;
+			eframe[CMD_BYTE(27, 1, 0)] = 0;
+			eframe[CMD_BYTE(27, 2, 0)] = 0;
 
 		} else {
 			/* Set address */
-			writechunk[CMD_BYTE(24, 0, 0)] = ((0x8 | 0x4) << 4);
-			writechunk[CMD_BYTE(24, 1, 0)] = (curcmd->address >> 8) & 0xff;
-			writechunk[CMD_BYTE(24, 2, 0)] = curcmd->address & 0xff;
+			eframe[CMD_BYTE(24, 0, 0)] = ((0x8 | 0x4) << 4);
+			eframe[CMD_BYTE(24, 1, 0)] = (curcmd->address >> 8) & 0xff;
+			eframe[CMD_BYTE(24, 2, 0)] = curcmd->address & 0xff;
 
 			/* Send/Get our data */
-			writechunk[CMD_BYTE(25, 0, 0)] = (curcmd->desc & __VPM150M_WR) ?
+			eframe[CMD_BYTE(25, 0, 0)] = (curcmd->desc & __VPM150M_WR) ?
 				((0x8 | (0x3 << 1)) << 4) : ((0x8 | (0x3 << 1) | 0x1) << 4);
-			writechunk[CMD_BYTE(25, 1, 0)] = (curcmd->data >> 8) & 0xff;
-			writechunk[CMD_BYTE(25, 2, 0)] = curcmd->data & 0xff;
+			eframe[CMD_BYTE(25, 1, 0)] = (curcmd->data >> 8) & 0xff;
+			eframe[CMD_BYTE(25, 2, 0)] = curcmd->data & 0xff;
 			
-			writechunk[CMD_BYTE(26, 0, 0)] = 0;
-			writechunk[CMD_BYTE(26, 1, 0)] = 0;
-			writechunk[CMD_BYTE(26, 2, 0)] = 0;
+			eframe[CMD_BYTE(26, 0, 0)] = 0;
+			eframe[CMD_BYTE(26, 1, 0)] = 0;
+			eframe[CMD_BYTE(26, 2, 0)] = 0;
 
 			/* Fill in the rest */
-			writechunk[CMD_BYTE(27, 0, 0)] = 0;
-			writechunk[CMD_BYTE(27, 1, 0)] = 0;
-			writechunk[CMD_BYTE(27, 2, 0)] = 0;
+			eframe[CMD_BYTE(27, 0, 0)] = 0;
+			eframe[CMD_BYTE(27, 1, 0)] = 0;
+			eframe[CMD_BYTE(27, 2, 0)] = 0;
 		}
 	} else if (test_and_clear_bit(VPM150M_SWRESET, &vpmadt032->control)) {
 		for (x = 24; x < 28; x++) {
 			if (x == 24)
-				writechunk[CMD_BYTE(x, 0, 0)] = (0x8 << 4);
+				eframe[CMD_BYTE(x, 0, 0)] = (0x8 << 4);
 			else
-				writechunk[CMD_BYTE(x, 0, 0)] = 0x00;
-			writechunk[CMD_BYTE(x, 1, 0)] = 0;
+				eframe[CMD_BYTE(x, 0, 0)] = 0x00;
+			eframe[CMD_BYTE(x, 1, 0)] = 0;
 			if (x == 24)
-				writechunk[CMD_BYTE(x, 2, 0)] = 0x01;
+				eframe[CMD_BYTE(x, 2, 0)] = 0x01;
 			else
-				writechunk[CMD_BYTE(x, 2, 0)] = 0x00;
+				eframe[CMD_BYTE(x, 2, 0)] = 0x00;
 		}
 	} else {
 		for (x = 24; x < 28; x++) {
-			writechunk[CMD_BYTE(x, 0, 0)] = 0x00;
-			writechunk[CMD_BYTE(x, 1, 0)] = 0x00;
-			writechunk[CMD_BYTE(x, 2, 0)] = 0x00;
+			eframe[CMD_BYTE(x, 0, 0)] = 0x00;
+			eframe[CMD_BYTE(x, 1, 0)] = 0x00;
+			eframe[CMD_BYTE(x, 2, 0)] = 0x00;
 		}
 	}
 
 	/* Add our leds in */
 	for (x = 24; x < 28; x++) {
-		writechunk[CMD_BYTE(x, 0, 0)] |= leds;
+		eframe[CMD_BYTE(x, 0, 0)] |= leds;
 	}
 }
 
-static inline void cmd_dequeue(struct wctdm *wc, unsigned char *writechunk, int card, int pos)
+static inline void cmd_dequeue(struct wctdm *wc, unsigned char *eframe, int card, int pos)
 {
 	unsigned long flags;
 	unsigned int curcmd=0;
@@ -594,7 +594,7 @@ static inline void cmd_dequeue(struct wctdm *wc, unsigned char *writechunk, int
 		subaddr = 0;
 
 	/* Skip audio */
-	writechunk += 24;
+	eframe += 24;
 	spin_lock_irqsave(&wc->reglock, flags);
 	/* Search for something waiting to transmit */
 	if (pos) {
@@ -621,75 +621,65 @@ static inline void cmd_dequeue(struct wctdm *wc, unsigned char *writechunk, int
 	}
 
 	if (wc->modtype[card] == MOD_TYPE_FXS) {
-		writechunk[CMD_BYTE(card, 0, wc->altcs[card])] = (1 << (subaddr));
+		eframe[CMD_BYTE(card, 0, wc->altcs[card])] = (1 << (subaddr));
 		if (curcmd & __CMD_WR)
-			writechunk[CMD_BYTE(card, 1, wc->altcs[card])] = (curcmd >> 8) & 0x7f;
+			eframe[CMD_BYTE(card, 1, wc->altcs[card])] = (curcmd >> 8) & 0x7f;
 		else
-			writechunk[CMD_BYTE(card, 1, wc->altcs[card])] = 0x80 | ((curcmd >> 8) & 0x7f);
-		writechunk[CMD_BYTE(card, 2, wc->altcs[card])] = curcmd & 0xff;
+			eframe[CMD_BYTE(card, 1, wc->altcs[card])] = 0x80 | ((curcmd >> 8) & 0x7f);
+		eframe[CMD_BYTE(card, 2, wc->altcs[card])] = curcmd & 0xff;
 
 	} else if (wc->modtype[card] == MOD_TYPE_FXO) {
 		static const int FXO_ADDRS[4] = { 0x00, 0x08, 0x04, 0x0c };
 		int idx = CMD_BYTE(card, 0, wc->altcs[card]);
 		if (curcmd & __CMD_WR)
-			writechunk[idx] = 0x20 | FXO_ADDRS[subaddr];
+			eframe[idx] = 0x20 | FXO_ADDRS[subaddr];
 		else
-			writechunk[idx] = 0x60 | FXO_ADDRS[subaddr];
-		writechunk[CMD_BYTE(card, 1, wc->altcs[card])] = (curcmd >> 8) & 0xff;
-		writechunk[CMD_BYTE(card, 2, wc->altcs[card])] = curcmd & 0xff;
+			eframe[idx] = 0x60 | FXO_ADDRS[subaddr];
+		eframe[CMD_BYTE(card, 1, wc->altcs[card])] = (curcmd >> 8) & 0xff;
+		eframe[CMD_BYTE(card, 2, wc->altcs[card])] = curcmd & 0xff;
 
 	} else if (wc->modtype[card] == MOD_TYPE_FXSINIT) {
 		/* Special case, we initialize the FXS's into the three-byte command mode then
 		   switch to the regular mode.  To send it into thee byte mode, treat the path as
 		   6 two-byte commands and in the last one we initialize register 0 to 0x80. All modules
 		   read this as the command to switch to daisy chain mode and we're done.  */
-		writechunk[CMD_BYTE(card, 0, wc->altcs[card])] = 0x00;
-		writechunk[CMD_BYTE(card, 1, wc->altcs[card])] = 0x00;
+		eframe[CMD_BYTE(card, 0, wc->altcs[card])] = 0x00;
+		eframe[CMD_BYTE(card, 1, wc->altcs[card])] = 0x00;
 		if ((card & 0x1) == 0x1) 
-			writechunk[CMD_BYTE(card, 2, wc->altcs[card])] = 0x80;
+			eframe[CMD_BYTE(card, 2, wc->altcs[card])] = 0x80;
 		else
-			writechunk[CMD_BYTE(card, 2, wc->altcs[card])] = 0x00;
+			eframe[CMD_BYTE(card, 2, wc->altcs[card])] = 0x00;
 
 	} else if (wc->modtype[card] == MOD_TYPE_BRI) {
 
 		if (unlikely((curcmd != 0x101010) && (curcmd & 0x1010) == 0x1010)) /* b400m CPLD */
-			writechunk[CMD_BYTE(card, 0, 0)] = 0x55;
+			eframe[CMD_BYTE(card, 0, 0)] = 0x55;
 		else /* xhfc */
-			writechunk[CMD_BYTE(card, 0, 0)] = 0x10;
-		writechunk[CMD_BYTE(card, 1, 0)] = (curcmd >> 8) & 0xff;
-		writechunk[CMD_BYTE(card, 2, 0)] = curcmd & 0xff;
-
+			eframe[CMD_BYTE(card, 0, 0)] = 0x10;
+		eframe[CMD_BYTE(card, 1, 0)] = (curcmd >> 8) & 0xff;
+		eframe[CMD_BYTE(card, 2, 0)] = curcmd & 0xff;
 	} else if (wc->modtype[card] == MOD_TYPE_QRV) {
  
-		writechunk[CMD_BYTE(card, 0, wc->altcs[card])] = 0x00;
+		eframe[CMD_BYTE(card, 0, wc->altcs[card])] = 0x00;
 		if (!curcmd) {
-			writechunk[CMD_BYTE(card, 1, wc->altcs[card])] = 0x00;
-			writechunk[CMD_BYTE(card, 2, wc->altcs[card])] = 0x00;
+			eframe[CMD_BYTE(card, 1, wc->altcs[card])] = 0x00;
+			eframe[CMD_BYTE(card, 2, wc->altcs[card])] = 0x00;
 		} else {
 			if (curcmd & __CMD_WR)
-				writechunk[CMD_BYTE(card, 1, wc->altcs[card])] = 0x40 | ((curcmd >> 8) & 0x3f);
+				eframe[CMD_BYTE(card, 1, wc->altcs[card])] = 0x40 | ((curcmd >> 8) & 0x3f);
 			else
-				writechunk[CMD_BYTE(card, 1, wc->altcs[card])] = 0xc0 | ((curcmd >> 8) & 0x3f);
-			writechunk[CMD_BYTE(card, 2, wc->altcs[card])] = curcmd & 0xff;
+				eframe[CMD_BYTE(card, 1, wc->altcs[card])] = 0xc0 | ((curcmd >> 8) & 0x3f);
+			eframe[CMD_BYTE(card, 2, wc->altcs[card])] = curcmd & 0xff;
 		}
 	} else if (wc->modtype[card] == MOD_TYPE_NONE) {
-		writechunk[CMD_BYTE(card, 0, wc->altcs[card])] = 0x10;
-		writechunk[CMD_BYTE(card, 1, wc->altcs[card])] = 0x10;
-		writechunk[CMD_BYTE(card, 2, wc->altcs[card])] = 0x10;
+		eframe[CMD_BYTE(card, 0, wc->altcs[card])] = 0x10;
+		eframe[CMD_BYTE(card, 1, wc->altcs[card])] = 0x10;
+		eframe[CMD_BYTE(card, 2, wc->altcs[card])] = 0x10;
 	}
-#if 0
-	/* XXX */
-	if (cmddesc < 40)
-		dev_info(&wc->vb.pdev->dev, "Pass %d, card = %d (modtype=%d), pos = %d, CMD_BYTES = %d,%d,%d, (%02x,%02x,%02x) curcmd = %08x\n", cmddesc, card, wc->modtype[card], pos, CMD_BYTE(card, 0), CMD_BYTE(card, 1), CMD_BYTE(card, 2), writechunk[CMD_BYTE(card, 0)], writechunk[CMD_BYTE(card, 1)], writechunk[CMD_BYTE(card, 2)], curcmd);
-#endif
 	spin_unlock_irqrestore(&wc->reglock, flags);
-#if 0
-	/* XXX */
-	cmddesc++;
-#endif
 }
 
-static inline void cmd_decipher_vpmadt032(struct wctdm *wc, const u8 *readchunk)
+static inline void cmd_decipher_vpmadt032(struct wctdm *wc, const u8 *eframe)
 {
 	unsigned long flags;
 	struct vpmadt032 *vpm = wc->vpmadt032;
@@ -717,11 +707,11 @@ static inline void cmd_decipher_vpmadt032(struct wctdm *wc, const u8 *readchunk)
 	}
 
 	/* Skip audio */
-	readchunk += 24;
+	eframe += 24;
 
 	/* Store result */
-	cmd->data = (0xff & readchunk[CMD_BYTE(25, 1, 0)]) << 8;
-	cmd->data |= readchunk[CMD_BYTE(25, 2, 0)];
+	cmd->data = (0xff & eframe[CMD_BYTE(25, 1, 0)]) << 8;
+	cmd->data |= eframe[CMD_BYTE(25, 2, 0)];
 	if (cmd->desc & __VPM150M_WR) {
 		kfree(cmd);
 	} else {
@@ -730,7 +720,7 @@ static inline void cmd_decipher_vpmadt032(struct wctdm *wc, const u8 *readchunk)
 	}
 }
 
-static inline void cmd_decipher(struct wctdm *wc, const u8 *readchunk, int card)
+static inline void cmd_decipher(struct wctdm *wc, const u8 *eframe, int card)
 {
 	unsigned long flags;
 	unsigned char ident;
@@ -742,7 +732,7 @@ static inline void cmd_decipher(struct wctdm *wc, const u8 *readchunk, int card)
 	}
 
 	/* Skip audio */
-	readchunk += 24;
+	eframe += 24;
 	spin_lock_irqsave(&wc->reglock, flags);
 
 	/* Search for any pending results */
@@ -753,13 +743,9 @@ static inline void cmd_decipher(struct wctdm *wc, const u8 *readchunk, int card)
 		   	ident = (wc->cmdq[card].cmds[x] >> 24) & 0xff;
 		   	if (ident == wc->rxident) {
 				/* Store result */
-				wc->cmdq[card].cmds[x] |= readchunk[CMD_BYTE(card, 2, wc->altcs[card])];
+				wc->cmdq[card].cmds[x] |= eframe[CMD_BYTE(card, 2, wc->altcs[card])];
 				wc->cmdq[card].cmds[x] |= __CMD_FIN;
-/*
-				if (card == 0 && wc->cmdq[card].cmds[x] & __CMD_RD) {
-					dev_info(&wc->vb.pdev->dev, "decifer: got response %02x\n", wc->cmdq[card].cmds[x] & 0xff);
-				}
-*/
+
 				if (wc->cmdq[card].cmds[x] & __CMD_WR) {
 					/* Go ahead and clear out writes since they need no acknowledgement */
 					wc->cmdq[card].cmds[x] = 0x00000000;
@@ -772,11 +758,6 @@ static inline void cmd_decipher(struct wctdm *wc, const u8 *readchunk, int card)
 			}
 		}
 	}
-#if 0
-	/* XXX */
-	if (!pos && (cmddesc < 256))
-		dev_info(&wc->vb.pdev->dev, "Card %d: Command '%08x' => %02x\n",card,  wc->cmdq[card].lasttx[pos], wc->cmdq[card].lastrd[pos]);
-#endif
 	spin_unlock_irqrestore(&wc->reglock, flags);
 }
 
@@ -865,10 +846,11 @@ static void insert_tdm_data(const struct wctdm *wc, u8 *sframe)
 	}
 }
 
-static inline void wctdm_transmitprep(struct wctdm *wc, unsigned char *writechunk)
+static inline void wctdm_transmitprep(struct wctdm *wc, unsigned char *sframe)
 {
 	int x,y;
 	struct dahdi_span *s;
+	unsigned char *eframe = sframe;
 
 	/* Calculate Transmission */
 	if (likely(wc->initialized)) {
@@ -878,7 +860,7 @@ static inline void wctdm_transmitprep(struct wctdm *wc, unsigned char *writechun
 				dahdi_transmit(s);
 			}
 		}
-		insert_tdm_data(wc, writechunk);
+		insert_tdm_data(wc, sframe);
 #ifdef CONFIG_VOICEBUS_ECREFERENCE
 		for (x = 0; x < wc->avchannels; ++x) {
 			__dahdi_fifo_put(wc->ec_reference[x],
@@ -901,23 +883,26 @@ static inline void wctdm_transmitprep(struct wctdm *wc, unsigned char *writechun
 			}
 
 			if (y < wc->mods_per_board)
-				cmd_dequeue(wc, writechunk, y, x);
+				cmd_dequeue(wc, eframe, y, x);
 		}
 
-		if (wc->vpmadt032)
-			cmd_dequeue_vpmadt032(wc, writechunk);
+		if (wc->vpmadt032) {
+			cmd_dequeue_vpmadt032(wc, eframe);
+		} else if (wc->vpmadt032) {
+			cmd_dequeue_vpmadt032(wc, eframe);
+		}
 
 		if (x < DAHDI_CHUNKSIZE - 1) {
-			writechunk[EFRAME_SIZE] = wc->ctlreg;
-			writechunk[EFRAME_SIZE + 1] = wc->txident++;
+			eframe[EFRAME_SIZE] = wc->ctlreg;
+			eframe[EFRAME_SIZE + 1] = wc->txident++;
 
 			if ((wc->desc->ports == 4) && ((wc->ctlreg & 0x10))) {
-				writechunk[EFRAME_SIZE + 2] = 0;
+				eframe[EFRAME_SIZE + 2] = 0;
 				for (y = 0; y < 4; y++)
-					writechunk[EFRAME_SIZE + 2] |= (1 << y);
+					eframe[EFRAME_SIZE + 2] |= (1 << y);
 			}
 		}
-		writechunk += (EFRAME_SIZE + EFRAME_GAP);
+		eframe += (EFRAME_SIZE + EFRAME_GAP);
 	}
 }
 
@@ -1096,35 +1081,39 @@ static void extract_tdm_data(struct wctdm *wc, const u8 *sframe)
 	}
 }
 
-static inline void wctdm_receiveprep(struct wctdm *wc, const u8 *readchunk)
+static inline void wctdm_receiveprep(struct wctdm *wc, const u8 *sframe)
 {
 	int x,y;
 	bool irqmiss = 0;
 	unsigned char expected;
+	const u8 *eframe = sframe;
 
-	if (unlikely(!is_good_frame(readchunk)))
+	if (unlikely(!is_good_frame(sframe)))
 		return;
 
 	if (likely(wc->initialized))
-		extract_tdm_data(wc, readchunk);
+		extract_tdm_data(wc, sframe);
 
 	for (x = 0; x < DAHDI_CHUNKSIZE; x++) {
 		if (x < DAHDI_CHUNKSIZE - 1) {
 			expected = wc->rxident+1;
-			wc->rxident = readchunk[EFRAME_SIZE + 1];
+			wc->rxident = eframe[EFRAME_SIZE + 1];
 			if (wc->rxident != expected) {
 				irqmiss = 1;
 				cmd_retransmit(wc);
 			}
 		}
 		for (y = 0; y < wc->avchannels; y++) {
-			cmd_decipher(wc, readchunk, y);
+			cmd_decipher(wc, eframe, y);
 		}
 
-		if (wc->vpmadt032)
-			cmd_decipher_vpmadt032(wc, readchunk);
+		if (wc->vpmadt032) {
+			cmd_decipher_vpmadt032(wc, eframe);
+		} else if (wc->vpmadt032) {
+			cmd_decipher_vpmadt032(wc, eframe);
+		}
 
-		readchunk += (EFRAME_SIZE + EFRAME_GAP);
+		eframe += (EFRAME_SIZE + EFRAME_GAP);
 	}
 
 	/* XXX We're wasting 8 taps.  We should get closer :( */
diff --git a/drivers/dahdi/wcte12xp/base.c b/drivers/dahdi/wcte12xp/base.c
index 3dd4bbc..94fbd8e 100644
--- a/drivers/dahdi/wcte12xp/base.c
+++ b/drivers/dahdi/wcte12xp/base.c
@@ -155,7 +155,7 @@ static void resend_cmds(struct t1 *wc)
 	spin_unlock_irqrestore(&wc->reglock, flags);
 }
 
-static void cmd_dequeue(struct t1 *wc, unsigned char *writechunk, int eframe, int slot)
+static void cmd_dequeue(struct t1 *wc, unsigned char *eframe, int frame_num, int slot)
 {
 	struct command *curcmd=NULL;
 	u16 address;
@@ -163,9 +163,9 @@ static void cmd_dequeue(struct t1 *wc, unsigned char *writechunk, int eframe, in
 	u32 flags;
 
 	/* Skip audio */
-	writechunk += 66;
+	eframe += 66;
 	/* Search for something waiting to transmit */
-	if ((slot < 6) && (eframe) && (eframe < DAHDI_CHUNKSIZE - 1)) { 
+	if ((slot < 6) && (frame_num) && (frame_num < DAHDI_CHUNKSIZE - 1)) {
 		/* only 6 useable cs slots per */
 
 		/* framer */
@@ -185,27 +185,27 @@ static void cmd_dequeue(struct t1 *wc, unsigned char *writechunk, int eframe, in
 		}
 
 		if (flags & __CMD_WR)
-			writechunk[CMD_BYTE(slot, 0, 0)] = 0x0c; /* 0c write command */
+			eframe[CMD_BYTE(slot, 0, 0)] = 0x0c; /* 0c write command */
 		else if (flags & __CMD_LEDS)
-			writechunk[CMD_BYTE(slot, 0, 0)] = 0x10 | ((address) & 0x0E); /* led set command */
+			eframe[CMD_BYTE(slot, 0, 0)] = 0x10 | ((address) & 0x0E); /* led set command */
 		else if (flags & __CMD_PINS)
-			writechunk[CMD_BYTE(slot, 0, 0)] = 0x30; /* CPLD2 pin state */
+			eframe[CMD_BYTE(slot, 0, 0)] = 0x30; /* CPLD2 pin state */
 		else
-			writechunk[CMD_BYTE(slot, 0, 0)] = 0x0a; /* read command */
-		writechunk[CMD_BYTE(slot, 1, 0)] = address;
-		writechunk[CMD_BYTE(slot, 2, 0)] = data;
+			eframe[CMD_BYTE(slot, 0, 0)] = 0x0a; /* read command */
+		eframe[CMD_BYTE(slot, 1, 0)] = address;
+		eframe[CMD_BYTE(slot, 2, 0)] = data;
 	}
 
 }
 
-static inline void cmd_decipher(struct t1 *wc, const u8 *readchunk)
+static inline void cmd_decipher(struct t1 *wc, const u8 *eframe)
 {
 	struct command *cmd = NULL;
 	unsigned long flags;
 	const int IS_VPM = 0;
 
 	/* Skip audio */
-	readchunk += 66;
+	eframe += 66;
 	spin_lock_irqsave(&wc->cmd_list_lock, flags);
 	while (!list_empty(&wc->active_cmds)) {
 		cmd = list_entry(wc->active_cmds.next, struct command, node);
@@ -218,7 +218,7 @@ static inline void cmd_decipher(struct t1 *wc, const u8 *readchunk)
 			list_del_init(&cmd->node);
 			free_cmd(wc, cmd);
 		} else {
-			cmd->data |= readchunk[CMD_BYTE(cmd->cs_slot, 2, IS_VPM)];
+			cmd->data |= eframe[CMD_BYTE(cmd->cs_slot, 2, IS_VPM)];
 			list_del_init(&cmd->node);
 			complete(&cmd->complete);
 		}
@@ -226,7 +226,7 @@ static inline void cmd_decipher(struct t1 *wc, const u8 *readchunk)
 	spin_unlock_irqrestore(&wc->cmd_list_lock, flags);
 }
 
-inline void cmd_decipher_vpmadt032(struct t1 *wc, const u8 *readchunk)
+inline void cmd_decipher_vpmadt032(struct t1 *wc, const u8 *eframe)
 {
 	unsigned long flags;
 	struct vpmadt032 *vpm = wc->vpmadt032;
@@ -254,11 +254,11 @@ inline void cmd_decipher_vpmadt032(struct t1 *wc, const u8 *readchunk)
 	}
 
 	/* Skip audio */
-	readchunk += 66;
+	eframe += 66;
 
 	/* Store result */
-	cmd->data  = (0xff & readchunk[CMD_BYTE(2, 1, 1)]) << 8;
-	cmd->data |= readchunk[CMD_BYTE(2, 2, 1)];
+	cmd->data  = (0xff & eframe[CMD_BYTE(2, 1, 1)]) << 8;
+	cmd->data |= eframe[CMD_BYTE(2, 2, 1)];
 	if (cmd->desc & __VPM150M_WR) {
 		kfree(cmd);
 	} else {
@@ -395,7 +395,7 @@ static int config_vpmadt032(struct vpmadt032 *vpm, struct t1 *wc)
 #define debug_printk(wc, lvl, fmt, args...) if (debug >= (lvl)) do { \
 	t1_info((wc), fmt , ## args); } while (0)
 
-static void cmd_dequeue_vpmadt032(struct t1 *wc, unsigned char *writechunk)
+static void cmd_dequeue_vpmadt032(struct t1 *wc, unsigned char *eframe)
 {
 	struct vpmadt032_cmd *cmd;
 	struct vpmadt032 *vpm = wc->vpmadt032;
@@ -403,20 +403,20 @@ static void cmd_dequeue_vpmadt032(struct t1 *wc, unsigned char *writechunk)
 	unsigned char leds = ~((atomic_read(&wc->txints) / 1000) % 8) & 0x7;
 
 	/* Skip audio */
-	writechunk += 66;
+	eframe += 66;
 
 	if (test_bit(VPM150M_SPIRESET, &vpm->control) || test_bit(VPM150M_HPIRESET, &vpm->control)) {
 		debug_printk(wc, 1, "HW Resetting VPMADT032 ...\n");
 		for (x = 0; x < 4; x++) {
 			if (!x) {
 				if (test_and_clear_bit(VPM150M_SPIRESET, &vpm->control))
-					writechunk[CMD_BYTE(x, 0, 1)] = 0x08;
+					eframe[CMD_BYTE(x, 0, 1)] = 0x08;
 				else if (test_and_clear_bit(VPM150M_HPIRESET, &vpm->control))
-					writechunk[CMD_BYTE(x, 0, 1)] = 0x0b;
+					eframe[CMD_BYTE(x, 0, 1)] = 0x0b;
 			} else
-				writechunk[CMD_BYTE(x, 0, 1)] = 0x00 | leds;
-			writechunk[CMD_BYTE(x, 1, 1)] = 0;
-			writechunk[CMD_BYTE(x, 2, 1)] = 0x00;
+				eframe[CMD_BYTE(x, 0, 1)] = 0x00 | leds;
+			eframe[CMD_BYTE(x, 1, 1)] = 0;
+			eframe[CMD_BYTE(x, 2, 1)] = 0x00;
 		}
 		return;
 	}
@@ -428,126 +428,107 @@ static void cmd_dequeue_vpmadt032(struct t1 *wc, unsigned char *writechunk)
 #endif
 		if (cmd->desc & __VPM150M_RWPAGE) {
 			/* Set CTRL access to page*/
-			writechunk[CMD_BYTE(0, 0, 1)] = (0x8 << 4);
-			writechunk[CMD_BYTE(0, 1, 1)] = 0;
-			writechunk[CMD_BYTE(0, 2, 1)] = 0x20;
+			eframe[CMD_BYTE(0, 0, 1)] = (0x8 << 4);
+			eframe[CMD_BYTE(0, 1, 1)] = 0;
+			eframe[CMD_BYTE(0, 2, 1)] = 0x20;
 
 			/* Do a page write */
 			if (cmd->desc & __VPM150M_WR) {
-				writechunk[CMD_BYTE(1, 0, 1)] = ((0x8 | 0x4) << 4);
+				eframe[CMD_BYTE(1, 0, 1)] = ((0x8 | 0x4) << 4);
 			} else {
-				writechunk[CMD_BYTE(1, 0, 1)] = ((0x8 | 0x4 | 0x1) << 4);
+				eframe[CMD_BYTE(1, 0, 1)] = ((0x8 | 0x4 | 0x1) << 4);
 			}
-			writechunk[CMD_BYTE(1, 1, 1)] = 0;
+			eframe[CMD_BYTE(1, 1, 1)] = 0;
 			if (cmd->desc & __VPM150M_WR) {
-				writechunk[CMD_BYTE(1, 2, 1)] = cmd->data & 0xf;
+				eframe[CMD_BYTE(1, 2, 1)] = cmd->data & 0xf;
 			} else {
-				writechunk[CMD_BYTE(1, 2, 1)] = 0;
+				eframe[CMD_BYTE(1, 2, 1)] = 0;
 			}
 
 			if (cmd->desc & __VPM150M_WR) {
 				/* Fill in buffer to size */
-				writechunk[CMD_BYTE(2, 0, 1)] = 0;
-				writechunk[CMD_BYTE(2, 1, 1)] = 0;
-				writechunk[CMD_BYTE(2, 2, 1)] = 0;
+				eframe[CMD_BYTE(2, 0, 1)] = 0;
+				eframe[CMD_BYTE(2, 1, 1)] = 0;
+				eframe[CMD_BYTE(2, 2, 1)] = 0;
 			} else {
 				/* Do reads twice b/c of vpmadt032 bug */
-				writechunk[CMD_BYTE(2, 0, 1)] = ((0x8 | 0x4 | 0x1) << 4);
-				writechunk[CMD_BYTE(2, 1, 1)] = 0;
-				writechunk[CMD_BYTE(2, 2, 1)] = 0;
+				eframe[CMD_BYTE(2, 0, 1)] = ((0x8 | 0x4 | 0x1) << 4);
+				eframe[CMD_BYTE(2, 1, 1)] = 0;
+				eframe[CMD_BYTE(2, 2, 1)] = 0;
 			}
 
 			/* Clear XADD */
-			writechunk[CMD_BYTE(3, 0, 1)] = (0x8 << 4);
-			writechunk[CMD_BYTE(3, 1, 1)] = 0;
-			writechunk[CMD_BYTE(3, 2, 1)] = 0;
+			eframe[CMD_BYTE(3, 0, 1)] = (0x8 << 4);
+			eframe[CMD_BYTE(3, 1, 1)] = 0;
+			eframe[CMD_BYTE(3, 2, 1)] = 0;
 
 			/* Fill in buffer to size */
-			writechunk[CMD_BYTE(4, 0, 1)] = 0;
-			writechunk[CMD_BYTE(4, 1, 1)] = 0;
-			writechunk[CMD_BYTE(4, 2, 1)] = 0;
+			eframe[CMD_BYTE(4, 0, 1)] = 0;
+			eframe[CMD_BYTE(4, 1, 1)] = 0;
+			eframe[CMD_BYTE(4, 2, 1)] = 0;
 
 		} else {
 			/* Set address */
-			writechunk[CMD_BYTE(0, 0, 1)] = ((0x8 | 0x4) << 4);
-			writechunk[CMD_BYTE(0, 1, 1)] = (cmd->address >> 8) & 0xff;
-			writechunk[CMD_BYTE(0, 2, 1)] = cmd->address & 0xff;
+			eframe[CMD_BYTE(0, 0, 1)] = ((0x8 | 0x4) << 4);
+			eframe[CMD_BYTE(0, 1, 1)] = (cmd->address >> 8) & 0xff;
+			eframe[CMD_BYTE(0, 2, 1)] = cmd->address & 0xff;
 
 			/* Send/Get our data */
 			if (cmd->desc & __VPM150M_WR) {
-				writechunk[CMD_BYTE(1, 0, 1)] = ((0x8 | (0x3 << 1)) << 4);
+				eframe[CMD_BYTE(1, 0, 1)] = ((0x8 | (0x3 << 1)) << 4);
 			} else {
-				writechunk[CMD_BYTE(1, 0, 1)] = ((0x8 | (0x3 << 1) | 0x1) << 4);
+				eframe[CMD_BYTE(1, 0, 1)] = ((0x8 | (0x3 << 1) | 0x1) << 4);
 			}
-			writechunk[CMD_BYTE(1, 1, 1)] = (cmd->data >> 8) & 0xff;
-			writechunk[CMD_BYTE(1, 2, 1)] = cmd->data & 0xff;
+			eframe[CMD_BYTE(1, 1, 1)] = (cmd->data >> 8) & 0xff;
+			eframe[CMD_BYTE(1, 2, 1)] = cmd->data & 0xff;
 
 			if (cmd->desc & __VPM150M_WR) {
 				/* Fill in */
-				writechunk[CMD_BYTE(2, 0, 1)] = 0;
-				writechunk[CMD_BYTE(2, 1, 1)] = 0;
-				writechunk[CMD_BYTE(2, 2, 1)] = 0;
+				eframe[CMD_BYTE(2, 0, 1)] = 0;
+				eframe[CMD_BYTE(2, 1, 1)] = 0;
+				eframe[CMD_BYTE(2, 2, 1)] = 0;
 			} else {
 				/* Do this again for reads b/c of the bug in vpmadt032 */
-				writechunk[CMD_BYTE(2, 0, 1)] = ((0x8 | (0x3 << 1) | 0x1) << 4);
-				writechunk[CMD_BYTE(2, 1, 1)] = (cmd->data >> 8) & 0xff;
-				writechunk[CMD_BYTE(2, 2, 1)] = cmd->data & 0xff;
+				eframe[CMD_BYTE(2, 0, 1)] = ((0x8 | (0x3 << 1) | 0x1) << 4);
+				eframe[CMD_BYTE(2, 1, 1)] = (cmd->data >> 8) & 0xff;
+				eframe[CMD_BYTE(2, 2, 1)] = cmd->data & 0xff;
 			}
 
 			/* Fill in the rest */
-			writechunk[CMD_BYTE(3, 0, 1)] = 0;
-			writechunk[CMD_BYTE(3, 1, 1)] = 0;
-			writechunk[CMD_BYTE(3, 2, 1)] = 0;
+			eframe[CMD_BYTE(3, 0, 1)] = 0;
+			eframe[CMD_BYTE(3, 1, 1)] = 0;
+			eframe[CMD_BYTE(3, 2, 1)] = 0;
 
 			/* Fill in the rest */
-			writechunk[CMD_BYTE(4, 0, 1)] = 0;
-			writechunk[CMD_BYTE(4, 1, 1)] = 0;
-			writechunk[CMD_BYTE(4, 2, 1)] = 0;
+			eframe[CMD_BYTE(4, 0, 1)] = 0;
+			eframe[CMD_BYTE(4, 1, 1)] = 0;
+			eframe[CMD_BYTE(4, 2, 1)] = 0;
 		}
 	} else if (test_and_clear_bit(VPM150M_SWRESET, &vpm->control)) {
 		for (x = 0; x < 7; x++) {
 			if (0 == x)  {
-				writechunk[CMD_BYTE(x, 0, 1)] = (0x8 << 4);
+				eframe[CMD_BYTE(x, 0, 1)] = (0x8 << 4);
 			} else {
-				writechunk[CMD_BYTE(x, 0, 1)] = 0x00;
+				eframe[CMD_BYTE(x, 0, 1)] = 0x00;
 			}
-			writechunk[CMD_BYTE(x, 1, 1)] = 0;
+			eframe[CMD_BYTE(x, 1, 1)] = 0;
 			if (0 == x) {
-				writechunk[CMD_BYTE(x, 2, 1)] = 0x01;
+				eframe[CMD_BYTE(x, 2, 1)] = 0x01;
 			} else {
-				writechunk[CMD_BYTE(x, 2, 1)] = 0x00;
+				eframe[CMD_BYTE(x, 2, 1)] = 0x00;
 			}
 		}
 	} else {
 		for (x = 0; x < 7; x++) {
-			writechunk[CMD_BYTE(x, 0, 1)] = 0x00;
-			writechunk[CMD_BYTE(x, 1, 1)] = 0x00;
-			writechunk[CMD_BYTE(x, 2, 1)] = 0x00;
+			eframe[CMD_BYTE(x, 0, 1)] = 0x00;
+			eframe[CMD_BYTE(x, 1, 1)] = 0x00;
+			eframe[CMD_BYTE(x, 2, 1)] = 0x00;
 		}
 	}
 
 	/* Add our leds in */
 	for (x = 0; x < 7; x++)
-		writechunk[CMD_BYTE(x, 0, 1)] |= leds;
-
-#if 0
-	int y;
-	for (x = 0; x < 7; x++) {
-		for (y = 0; y < 3; y++) {
-			if (writechunk[CMD_BYTE(x, y, 1)] & 0x2) {
-				t1_info(wc,
-					"the test bit is high for byte %d\n",
-					y);
-			}
-		}
-	}
-#endif
-
-#if 0
-	/* This may be needed sometime in the future to troubleshoot ADT related issues. */
-	if (test_bit(VPM150M_ACTIVE, &vpm->control) && !whichframe && !(atomic_read(&wc->txints) % 10000))
-		queue_work(vpm->wq, &vpm->work_debug);
-#endif
+		eframe[CMD_BYTE(x, 0, 1)] |= leds;
 }
 
 static inline int t1_setreg(struct t1 *wc, int addr, int val)
@@ -1876,12 +1857,13 @@ static void t1_do_counters(struct t1 *wc)
 	}
 }
 
-static inline void t1_transmitprep(struct t1 *wc, u8 *writechunk)
+static inline void t1_transmitprep(struct t1 *wc, u8 *sframe)
 {
 	int x;
 	int y;
 	int chan;
 	unsigned long flags;
+	u8 *eframe = sframe;
 
 	/* Calculate Transmission */
 	if (likely(test_bit(INITIALIZED, &wc->bit_flags))) {
@@ -1898,28 +1880,26 @@ static inline void t1_transmitprep(struct t1 *wc, u8 *writechunk)
 	for (x = 0; x < DAHDI_CHUNKSIZE; x++) {
 		if (likely(test_bit(INITIALIZED, &wc->bit_flags))) {
 			for (chan = 0; chan < wc->span.channels; chan++)
-				writechunk[(chan+1)*2] = wc->chans[chan]->writechunk[x];	
+				eframe[(chan+1)*2] = wc->chans[chan]->writechunk[x];
 		}
 
 		/* process the command queue */
 		for (y = 0; y < 7; y++)
-			cmd_dequeue(wc, writechunk, x, y);
+			cmd_dequeue(wc, eframe, x, y);
 
 #ifdef VPM_SUPPORT
 		spin_lock_irqsave(&wc->reglock, flags);
 		if (wc->vpmadt032)
-			cmd_dequeue_vpmadt032(wc, writechunk);
+			cmd_dequeue_vpmadt032(wc, eframe);
 		spin_unlock_irqrestore(&wc->reglock, flags);
 #endif
 
 		if (x < DAHDI_CHUNKSIZE - 1) {
-			writechunk[EFRAME_SIZE] = wc->ctlreg;
-			writechunk[EFRAME_SIZE + 1] = wc->txident++;
+			eframe[EFRAME_SIZE] = wc->ctlreg;
+			eframe[EFRAME_SIZE + 1] = wc->txident++;
 		}
-		writechunk += (EFRAME_SIZE + EFRAME_GAP);
+		eframe += (EFRAME_SIZE + EFRAME_GAP);
 	}
-
-
 }
 
 /**
@@ -1933,25 +1913,26 @@ static inline bool is_good_frame(const u8 *sframe)
         return a != b;
 }
 
-static inline void t1_receiveprep(struct t1 *wc, const u8* readchunk)
+static inline void t1_receiveprep(struct t1 *wc, const u8* sframe)
 {
 	int x,chan;
 	unsigned long flags;
 	unsigned char expected;
+	const u8 *eframe = sframe;
 
-	if (!is_good_frame(readchunk))
+	if (!is_good_frame(sframe))
 		return;
 
 	for (x = 0; x < DAHDI_CHUNKSIZE; x++) {
 		if (likely(test_bit(INITIALIZED, &wc->bit_flags))) {
 			for (chan = 0; chan < wc->span.channels; chan++) {
-				wc->chans[chan]->readchunk[x]= readchunk[(chan+1)*2];
+				wc->chans[chan]->readchunk[x] = eframe[(chan+1)*2];
 			}
 		}
 		if (x < DAHDI_CHUNKSIZE - 1) {
 			expected = wc->rxident+1;
-			wc->rxident = readchunk[EFRAME_SIZE + 1];
-			wc->statreg = readchunk[EFRAME_SIZE + 2];
+			wc->rxident = eframe[EFRAME_SIZE + 1];
+			wc->statreg = eframe[EFRAME_SIZE + 2];
 			if (wc->rxident != expected) {
 				wc->span.irqmisses++;
 				resend_cmds(wc);
@@ -1962,14 +1943,14 @@ static inline void t1_receiveprep(struct t1 *wc, const u8* readchunk)
 				}
 			}
 		}
-		cmd_decipher(wc, readchunk);
+		cmd_decipher(wc, eframe);
 #ifdef VPM_SUPPORT
 		spin_lock_irqsave(&wc->reglock, flags);
 		if (wc->vpmadt032)
-			cmd_decipher_vpmadt032(wc, readchunk);
+			cmd_decipher_vpmadt032(wc, eframe);
 		spin_unlock_irqrestore(&wc->reglock, flags);
 #endif
-		readchunk += (EFRAME_SIZE + EFRAME_GAP);
+		eframe += (EFRAME_SIZE + EFRAME_GAP);
 	}
 	
 	/* echo cancel */