staging: comedi: addi_apci_3120: define the AI software trigger register

Define the offset for the analog input software trigger register.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
index 703e4f9b1ba8a19a41d7d8fc82db8d7a15e4f22c..0c9a6550f6443ab48b4fc4e01c61c2b82223bb9c 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -43,9 +43,6 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 #define APCI3120_START                 1
 #define APCI3120_STOP                  0
 
-/* software trigger dummy register */
-#define APCI3120_START_CONVERSION      0x02
-
 /* TIMER DEFINE */
 #define APCI3120_QUARTZ_A              70
 #define APCI3120_QUARTZ_B              50

diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index 322640ee91b5dd16692f727a09ac49c7f3bf01d7..ec2077cb68f0aac6acf3d4b47b5fc85f3daa6c7b 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -22,6 +22,7 @@
 #define APCI3120_CTRL_GATE(x)                  (1 << (12 + (x)))
 #define APCI3120_CTRL_PR(x)                    (((x) & 0xf) << 8)
 #define APCI3120_CTRL_PA(x)                    (((x) & 0xf) << 0)
+#define APCI3120_AI_SOFTTRIG_REG               0x02
 #define APCI3120_STATUS_REG                    0x02
 #define APCI3120_STATUS_EOC_INT                        (1 << 15)
 #define APCI3120_STATUS_AMCC_INT               (1 << 14)