Change the DAHDI_VMWI ioctl call to pass data via structure.

Changed wctdm and wctdm24xxp to handle these calls. 
(issue #14104)
Reported by: alecdavis
Patches:
      mwiioctl_structure_dahdi.diff2.txt uploaded by dbailey (license )
Tested by: alecdavis, dbailey



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

2 files changed, 14 insertions, 22 deletions

diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c
index 37591eb..847b9f4 100644
--- a/drivers/dahdi/wctdm24xxp/base.c
+++ b/drivers/dahdi/wctdm24xxp/base.c
@@ -87,7 +87,7 @@ static int loopcurrent = 20;
  * 	polarity reversal for the port,
  * 	and the state of the line reversal MWI indicator
  */
-#define POLARITY_XOR(card) ( (reversepolarity != 0) ^ (wc->mods[(card)].fxs.reversepolarity != 0) ^ (wc->mods[(card)].fxs.vmwilinereverse != 0) )
+#define POLARITY_XOR(card) ( (reversepolarity != 0) ^ (wc->mods[(card)].fxs.reversepolarity != 0) ^ (wc->mods[(card)].fxs.linereverse_mwi != 0) )
 static int reversepolarity = 0;
 
 static alpha  indirect_regs[] =
@@ -2052,9 +2052,8 @@ static int wctdm_init_proslic(struct wctdm *wc, int card, int fast, int manual,
 		return -2;
 
 	/* Initialize VMWI settings */
-	wc->mods[card].fxs.mwisendtype  = 0;	
-	wc->mods[card].fxs.vmwimessages = 0;
-	wc->mods[card].fxs.vmwilinereverse    = 0;
+	memset(&(wc->mods[card].fxs.vmwisetting), 0, sizeof(wc->mods[card].fxs.vmwisetting));
+	wc->mods[card].fxs.linereverse_mwi = 0;
 
 	/* By default, don't send on hook */
 	if (!reversepolarity != !wc->mods[card].fxs.reversepolarity) {
@@ -2446,20 +2445,15 @@ static int wctdm_ioctl(struct dahdi_chan *chan, unsigned int cmd, unsigned long
 		}
 		break;
 	case DAHDI_VMWI:
-		/* value:	bits 15-8 VMWI TYPE */
-		/* 		bits 7-0 VMWI number of messages */
-		if (get_user(x, (__user int *) data))
-			return -EFAULT;
 		if (wc->modtype[chan->chanpos - 1] != MOD_TYPE_FXS)
 			return -EINVAL;
-
-		wc->mods[chan->chanpos - 1].fxs.vmwimessages = (x & DAHDI_VMWI_NUMBER_MASK);
-		wc->mods[chan->chanpos - 1].fxs.mwisendtype = (x & ~DAHDI_VMWI_NUMBER_MASK);
-		if (wc->mods[chan->chanpos - 1].fxs.vmwimessages){
-			x = wc->mods[chan->chanpos - 1].fxs.mwisendtype;
-			wc->mods[chan->chanpos - 1].fxs.vmwilinereverse= (x & DAHDI_VMWI_LREV)?1:0;
+		if (copy_from_user(&(wc->mods[chan->chanpos - 1].fxs.vmwisetting), (__user void *) data, sizeof(wc->mods[chan->chanpos - 1].fxs.vmwisetting)))
+			return -EFAULT;
+		
+		if (wc->mods[chan->chanpos - 1].fxs.vmwisetting.messages && wc->mods[chan->chanpos - 1].fxs.vmwisetting.linereverse){
+			wc->mods[chan->chanpos - 1].fxs.linereverse_mwi = 1; 
 		} else {
-			wc->mods[chan->chanpos - 1].fxs.vmwilinereverse= 0;
+			wc->mods[chan->chanpos - 1].fxs.linereverse_mwi = 0; 
 		}
 		/* Set line polarity for new VMWI state */
 		if (POLARITY_XOR(chan->chanpos -1)) {
@@ -2484,11 +2478,10 @@ static int wctdm_ioctl(struct dahdi_chan *chan, unsigned int cmd, unsigned long
 		}
 
 		if (debug) {
-			printk(KERN_DEBUG "Setting VMWI on channel %d, type=0x%X, messages=%d, lrev=%d\n",
+			printk(KERN_DEBUG "Setting VMWI on channel %d, messages=%d, lrev=%d\n",
 				chan->chanpos-1,
-				wc->mods[chan->chanpos - 1].fxs.mwisendtype,
-				wc->mods[chan->chanpos - 1].fxs.vmwimessages,
-				wc->mods[chan->chanpos - 1].fxs.vmwilinereverse
+				wc->mods[chan->chanpos - 1].fxs.vmwisetting.messages,
+				wc->mods[chan->chanpos - 1].fxs.linereverse_mwi
 			);
 		}
 		break;
diff --git a/drivers/dahdi/wctdm24xxp/wctdm24xxp.h b/drivers/dahdi/wctdm24xxp/wctdm24xxp.h
index 1e970e4..86a9f95 100644
--- a/drivers/dahdi/wctdm24xxp/wctdm24xxp.h
+++ b/drivers/dahdi/wctdm24xxp/wctdm24xxp.h
@@ -248,9 +248,8 @@ struct wctdm {
 			int idletxhookstate;	/* IDLE changing hook state */
 			int lasttxhook;		/* Bits 0-3 are written to proslic reg 64, Bit 4 indicates if the last write is pending */
 			int palarms;
-			int mwisendtype;
-			int vmwimessages;	/* 0=none 1-255=number of messages */
-			int vmwilinereverse;	/* MWI Line Reversal*/
+			struct dahdi_vmwi_info vmwisetting;
+			int linereverse_mwi;
 			int reversepolarity;	/* polarity reversal */
 			struct calregs calregs;
 		} fxs;