---

yaml --- r: 337854 b: refs/heads/master c: 393cc22 h: refs/heads/master v: v3
git-mirror · Nov 13, 2012 · 898445c · 898445c
1 parent 4efd4c6
commit 898445c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f57f797a6cc1d5ad101f90244b936480079c6dab
+refs/heads/master: 393cc220bda3f16d497d9a5192a52fc08db18a89
diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c b/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
@@ -64,6 +64,8 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 #define APCI1516_WDOG_RELOAD_LSB_REG		0x04
 #define APCI1516_WDOG_RELOAD_MSB_REG		0x06
 #define APCI1516_WDOG_CTRL_REG			0x0c
+#define APCI1516_WDOG_CTRL_ENABLE		(1 << 0)
+#define APCI1516_WDOG_CTRL_SOFT_TRIG		(1 << 9)
 #define APCI1516_WDOG_STATUS_REG		0x10
 
 #define ADDIDATA_WATCHDOG			2
@@ -182,10 +184,12 @@ static int i_APCI1516_StartStopWriteWatchdog(struct comedi_device *dev,
 		outw(0x0, devpriv->i_IobaseAddon + APCI1516_WDOG_CTRL_REG);
 		break;
 	case 1:		/* start the watchdog */
-		outw(0x0001, devpriv->i_IobaseAddon + APCI1516_WDOG_CTRL_REG);
+		outw(APCI1516_WDOG_CTRL_ENABLE,
+		     devpriv->i_IobaseAddon + APCI1516_WDOG_CTRL_REG);
 		break;
 	case 2:		/* Software trigger */
-		outw(0x0201, devpriv->i_IobaseAddon + APCI1516_WDOG_CTRL_REG);
+		outw(APCI1516_WDOG_CTRL_ENABLE | APCI1516_WDOG_CTRL_SOFT_TRIG,
+		     devpriv->i_IobaseAddon + APCI1516_WDOG_CTRL_REG);
 		break;
 	default:
 		printk("\nSpecified functionality does not exist\n");