OSDN Git Service

staging: comedi: addi_apci_3120: define the AI software trigger register
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 4 Nov 2014 17:55:13 +0000 (10:55 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 7 Nov 2014 17:34:04 +0000 (09:34 -0800)
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>
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
drivers/staging/comedi/drivers/addi_apci_3120.c

index 703e4f9..0c9a655 100644 (file)
@@ -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
index 322640e..ec2077c 100644 (file)
@@ -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)