Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1402934
| From | Ian Abbott <abbotti@mev.co.uk> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v2 11/14] staging: comedi: daqboard2000: rename trigger control register macros |
| Date | 2016-05-18 14:40 +0200 |
| Message-ID | <rA8Vz-2a6-9@gated-at.bofh.it> (permalink) |
| References | <rzJXb-2UD-3@gated-at.bofh.it> <rA8Vz-2a6-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Rename the macros that define values for the trigger control register to
avoid CamelCase, and to make it clearer which register they are
associated with.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
---
v2: Shortened prefix from `DAQBOARD2000_` to `DB2K_`.
---
drivers/staging/comedi/drivers/daqboard2000.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
index 37aa3a4..9bf831b 100644
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -232,16 +232,16 @@ static const struct comedi_lrange range_daqboard2000_ai = {
#define DB2K_DAC_CONTROL_PATTERN_ENABLE 0x0061
/* Trigger Control */
-#define DAQBOARD2000_TrigAnalog 0x0000
-#define DAQBOARD2000_TrigTTL 0x0010
-#define DAQBOARD2000_TrigTransHiLo 0x0004
-#define DAQBOARD2000_TrigTransLoHi 0x0000
-#define DAQBOARD2000_TrigAbove 0x0000
-#define DAQBOARD2000_TrigBelow 0x0004
-#define DAQBOARD2000_TrigLevelSense 0x0002
-#define DAQBOARD2000_TrigEdgeSense 0x0000
-#define DAQBOARD2000_TrigEnable 0x0001
-#define DAQBOARD2000_TrigDisable 0x0000
+#define DB2K_TRIG_CONTROL_TYPE_ANALOG 0x0000
+#define DB2K_TRIG_CONTROL_TYPE_TTL 0x0010
+#define DB2K_TRIG_CONTROL_EDGE_HI_LO 0x0004
+#define DB2K_TRIG_CONTROL_EDGE_LO_HI 0x0000
+#define DB2K_TRIG_CONTROL_LEVEL_ABOVE 0x0000
+#define DB2K_TRIG_CONTROL_LEVEL_BELOW 0x0004
+#define DB2K_TRIG_CONTROL_SENSE_LEVEL 0x0002
+#define DB2K_TRIG_CONTROL_SENSE_EDGE 0x0000
+#define DB2K_TRIG_CONTROL_ENABLE 0x0001
+#define DB2K_TRIG_CONTROL_DISABLE 0x0000
/* Reference Dac Selection */
#define DAQBOARD2000_PosRefDacSelect 0x0100
@@ -543,10 +543,10 @@ static void daqboard2000_adcDisarm(struct comedi_device *dev)
{
/* Disable hardware triggers */
udelay(2);
- writew(DAQBOARD2000_TrigAnalog | DAQBOARD2000_TrigDisable,
+ writew(DB2K_TRIG_CONTROL_TYPE_ANALOG | DB2K_TRIG_CONTROL_DISABLE,
dev->mmio + DB2K_REG_TRIG_CONTROL);
udelay(2);
- writew(DAQBOARD2000_TrigTTL | DAQBOARD2000_TrigDisable,
+ writew(DB2K_TRIG_CONTROL_TYPE_TTL | DB2K_TRIG_CONTROL_DISABLE,
dev->mmio + DB2K_REG_TRIG_CONTROL);
/* Stop the scan list FIFO from loading the configuration pipe */
--
2.8.1
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/14] staging: comedi: daqboard2000: checkpatch clean-ups Ian Abbott <abbotti@mev.co.uk> - 2016-05-17 12:00 +0200
[PATCH 07/14] staging: comedi: daqboard2000: rename acquisition control register macros Ian Abbott <abbotti@mev.co.uk> - 2016-05-17 12:00 +0200
[PATCH 14/14] staging: comedi: daqboard2000: prefer usleep_range() Ian Abbott <abbotti@mev.co.uk> - 2016-05-17 12:00 +0200
RE: [PATCH 14/14] staging: comedi: daqboard2000: prefer usleep_range() Hartley Sweeten <HartleyS@visionengravers.com> - 2016-05-17 19:50 +0200
Re: [PATCH 14/14] staging: comedi: daqboard2000: prefer usleep_range() Ian Abbott <abbotti@mev.co.uk> - 2016-05-18 12:30 +0200
RE: [PATCH 00/14] staging: comedi: daqboard2000: checkpatch clean-ups Hartley Sweeten <HartleyS@visionengravers.com> - 2016-05-17 20:10 +0200
Re: [PATCH 00/14] staging: comedi: daqboard2000: checkpatch clean-ups Ian Abbott <abbotti@mev.co.uk> - 2016-05-18 14:10 +0200
[PATCH v2 10/14] staging: comedi: daqboard2000: redo DAC status macros and fix busy Ian Abbott <abbotti@mev.co.uk> - 2016-05-18 14:40 +0200
[PATCH v2 06/14] staging: comedi: daqboard2000: rename register offset macros Ian Abbott <abbotti@mev.co.uk> - 2016-05-18 14:40 +0200
RE: [PATCH v2 06/14] staging: comedi: daqboard2000: rename register offset macros Hartley Sweeten <HartleyS@visionengravers.com> - 2016-05-19 00:50 +0200
[PATCH v3 06/14] staging: comedi: daqboard2000: rename register offset macros Ian Abbott <abbotti@mev.co.uk> - 2016-05-19 12:00 +0200
RE: [PATCH v3 06/14] staging: comedi: daqboard2000: rename register offset macros Hartley Sweeten <HartleyS@visionengravers.com> - 2016-05-19 18:50 +0200
Re: [PATCH v3 06/14] staging: comedi: daqboard2000: rename register offset macros Ian Abbott <abbotti@mev.co.uk> - 2016-05-19 19:50 +0200
[PATCH v2 11/14] staging: comedi: daqboard2000: rename trigger control register macros Ian Abbott <abbotti@mev.co.uk> - 2016-05-18 14:40 +0200
[PATCH v2 08/14] staging: comedi: daqboard2000: rename acq status register macros Ian Abbott <abbotti@mev.co.uk> - 2016-05-18 14:40 +0200
[PATCH v2 07/14] staging: comedi: daqboard2000: rename acquisition control register macros Ian Abbott <abbotti@mev.co.uk> - 2016-05-18 14:40 +0200
[PATCH v2 09/14] staging: comedi: daqboard2000: redo DAC control register macros Ian Abbott <abbotti@mev.co.uk> - 2016-05-18 14:40 +0200
[PATCH v2 04/14] staging: comedi: daqboard2000: add blank line after struct declaration Ian Abbott <abbotti@mev.co.uk> - 2016-05-18 14:40 +0200
[PATCH v2 12/14] staging: comedi: daqboard2000: rename reference DACs register macros Ian Abbott <abbotti@mev.co.uk> - 2016-05-18 14:40 +0200
RE: [PATCH v2 12/14] staging: comedi: daqboard2000: rename reference DACs register macros Hartley Sweeten <HartleyS@visionengravers.com> - 2016-05-19 01:00 +0200
[PATCH v3 12/14] staging: comedi: daqboard2000: rename reference DACs register macros Ian Abbott <abbotti@mev.co.uk> - 2016-05-19 12:00 +0200
Re: [PATCH v3 12/14] staging: comedi: daqboard2000: rename reference DACs register macros Ian Abbott <abbotti@mev.co.uk> - 2016-05-19 12:10 +0200
[PATCH v4 12/14] staging: comedi: daqboard2000: rename reference DACs register macros Ian Abbott <abbotti@mev.co.uk> - 2016-05-19 12:20 +0200
[PATCH v2 02/14] staging: comedi: daqboard2000: use usual block comment style Ian Abbott <abbotti@mev.co.uk> - 2016-05-18 14:40 +0200
[PATCH v2 14/14] staging: comedi: daqboard2000: prefer usleep_range() Ian Abbott <abbotti@mev.co.uk> - 2016-05-18 14:40 +0200
[PATCH v2 13/14] staging: comedi: daqboard2000: rename CamelCase functions Ian Abbott <abbotti@mev.co.uk> - 2016-05-18 14:40 +0200
[PATCH v2 05/14] staging: comedi: daqboard2000: rename serial EEPROM register macros Ian Abbott <abbotti@mev.co.uk> - 2016-05-18 14:50 +0200
[PATCH v2 03/14] staging: comedi: daqboard2000: CHECK: spaces preferred around that '*' Ian Abbott <abbotti@mev.co.uk> - 2016-05-18 14:50 +0200
[PATCH v2 00/14] staging: comedi: daqboard2000: checkpatch clean-ups Ian Abbott <abbotti@mev.co.uk> - 2016-05-18 14:50 +0200
[PATCH v2 01/14] staging: comedi: daqboard2000: remove commented out code Ian Abbott <abbotti@mev.co.uk> - 2016-05-18 14:50 +0200
Re: [PATCH v2 00/14] staging: comedi: daqboard2000: checkpatch clean-ups Ian Abbott <abbotti@mev.co.uk> - 2016-05-19 12:10 +0200
Re: [PATCH v2 00/14] staging: comedi: daqboard2000: checkpatch clean-ups Ian Abbott <abbotti@mev.co.uk> - 2016-05-19 12:20 +0200
Re: [PATCH v2 00/14] staging: comedi: daqboard2000: checkpatch clean-ups Ian Abbott <abbotti@mev.co.uk> - 2016-05-19 20:10 +0200
[PATCH v4 00/14] staging: comedi: daqboard2000: checkpatch clean-ups Ian Abbott <abbotti@mev.co.uk> - 2016-05-19 20:20 +0200
[PATCH v4 11/14] staging: comedi: daqboard2000: rename trigger control register macros Ian Abbott <abbotti@mev.co.uk> - 2016-05-19 20:20 +0200
[PATCH v4 03/14] staging: comedi: daqboard2000: CHECK: spaces preferred around that '*' Ian Abbott <abbotti@mev.co.uk> - 2016-05-19 20:20 +0200
[PATCH v4 04/14] staging: comedi: daqboard2000: add blank line after struct declaration Ian Abbott <abbotti@mev.co.uk> - 2016-05-19 20:20 +0200
[PATCH v4 01/14] staging: comedi: daqboard2000: remove commented out code Ian Abbott <abbotti@mev.co.uk> - 2016-05-19 20:20 +0200
[PATCH v4 07/14] staging: comedi: daqboard2000: rename acquisition control register macros Ian Abbott <abbotti@mev.co.uk> - 2016-05-19 20:20 +0200
[PATCH v4 08/14] staging: comedi: daqboard2000: rename acq status register macros Ian Abbott <abbotti@mev.co.uk> - 2016-05-19 20:20 +0200
[PATCH v4 10/14] staging: comedi: daqboard2000: redo DAC status macros and fix busy Ian Abbott <abbotti@mev.co.uk> - 2016-05-19 20:20 +0200
[PATCH v4 14/14] staging: comedi: daqboard2000: prefer usleep_range() Ian Abbott <abbotti@mev.co.uk> - 2016-05-19 20:20 +0200
[PATCH v4 06/14] staging: comedi: daqboard2000: rename register offset macros Ian Abbott <abbotti@mev.co.uk> - 2016-05-19 20:20 +0200
[PATCH v4 12/14] staging: comedi: daqboard2000: rename reference DACs register macros Ian Abbott <abbotti@mev.co.uk> - 2016-05-19 20:20 +0200
[PATCH v4 13/14] staging: comedi: daqboard2000: rename CamelCase functions Ian Abbott <abbotti@mev.co.uk> - 2016-05-19 20:20 +0200
[PATCH v4 09/14] staging: comedi: daqboard2000: redo DAC control register macros Ian Abbott <abbotti@mev.co.uk> - 2016-05-19 20:20 +0200
[PATCH v4 02/14] staging: comedi: daqboard2000: use usual block comment style Ian Abbott <abbotti@mev.co.uk> - 2016-05-19 20:20 +0200
[PATCH v4 05/14] staging: comedi: daqboard2000: rename serial EEPROM register macros Ian Abbott <abbotti@mev.co.uk> - 2016-05-19 20:20 +0200
csiph-web