[zaptel-commits] kpfleming: branch 1.4 r3609 - in /branches/1.4: ./ wctdm24xxp/

[SVN commits to the Zaptel project]

Author: kpfleming
Date: Fri Jan  4 10:26:00 2008
New Revision: 3609

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3609
Log:
various minor cleanups

Modified:
    branches/1.4/wctdm.c
    branches/1.4/wctdm24xxp/base.c
    branches/1.4/zaptel.h

Modified: branches/1.4/wctdm.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wctdm.c?view=diff&rev=3609&r1=3608&r2=3609
==============================================================================
--- branches/1.4/wctdm.c (original)
+++ branches/1.4/wctdm.c Fri Jan  4 10:26:00 2008
@@ -1441,7 +1441,7 @@
  * tx = (0 for rx; 1 for tx)
  *
  *******************************************************************/
-static int wctdm_set_hwgain(struct wctdm *wc, int card, int gain, int tx)
+static int wctdm_set_hwgain(struct wctdm *wc, int card, __s32 gain, __u32 tx)
 {
 	if (!(wc->modtype[card] == MOD_TYPE_FXO)) {
 		printk("Cannot adjust gain.  Unsupported module type!\n");
@@ -1924,7 +1924,7 @@
 		}
 		break;
 	case ZT_SET_HWGAIN:
-		if (copy_from_user(&hwgain, (struct zt_hwgain*)data, sizeof(hwgain)))
+		if (copy_from_user(&hwgain, (struct zt_hwgain*) data, sizeof(hwgain)))
 			return -EFAULT;
 
 		wctdm_set_hwgain(wc, chan->chanpos-1, hwgain.newgain, hwgain.tx);

Modified: branches/1.4/wctdm24xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wctdm24xxp/base.c?view=diff&rev=3609&r1=3608&r2=3609
==============================================================================
--- branches/1.4/wctdm24xxp/base.c (original)
+++ branches/1.4/wctdm24xxp/base.c Fri Jan  4 10:26:00 2008
@@ -2020,7 +2020,7 @@
  * tx = (0 for rx; 1 for tx)
  *
  *******************************************************************/
-static int wctdm_set_hwgain(struct wctdm *wc, int card, int gain, int tx)
+static int wctdm_set_hwgain(struct wctdm *wc, int card, __s32 gain, __u32 tx)
 {
 	if (!(wc->modtype[card] == MOD_TYPE_FXO)) {
 		printk("Cannot adjust gain.  Unsupported module type!\n");
@@ -2648,7 +2648,7 @@
 		}
 		break;
 	case ZT_SET_HWGAIN:
-		if (copy_from_user(&hwgain, (struct zt_hwgain*)data, sizeof(hwgain)))
+		if (copy_from_user(&hwgain, (struct zt_hwgain*) data, sizeof(hwgain)))
 			return -EFAULT;
 
 		wctdm_set_hwgain(wc, chan->chanpos-1, hwgain.newgain, hwgain.tx);

Modified: branches/1.4/zaptel.h
URL: http://svn.digium.com/view/zaptel/branches/1.4/zaptel.h?view=diff&rev=3609&r1=3608&r2=3609
==============================================================================
--- branches/1.4/zaptel.h (original)
+++ branches/1.4/zaptel.h Fri Jan  4 10:26:00 2008
@@ -725,13 +725,12 @@
 /*
  * Set the HW gain for a device
  */
-#define ZT_SET_HWGAIN   _IOW (ZT_CODE, 86, struct zt_hwgain)
+#define ZT_SET_HWGAIN		_IOW (ZT_CODE, 86, struct zt_hwgain)
 
 /*
  * Enable tone detection -- implemented by low level driver
  */
-#define ZT_TONEDETECT _IOW (ZT_CODE, 91, int)
-
+#define ZT_TONEDETECT		_IOW (ZT_CODE, 91, int)
 
 /*
  * Set polarity -- implemented by individual driver.  0 = forward, 1 = reverse