linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ian Abbott <abbotti@mev.co.uk>
To: devel@driverdev.osuosl.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Ian Abbott <abbotti@mev.co.uk>,
	H Hartley Sweeten <hsweeten@visionengravers.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH v4 12/14] staging: comedi: daqboard2000: rename reference DACs register macros
Date: Thu, 19 May 2016 11:11:46 +0100	[thread overview]
Message-ID: <1463652706-8692-1-git-send-email-abbotti@mev.co.uk> (raw)
In-Reply-To: <1463651889-7297-1-git-send-email-abbotti@mev.co.uk>

Rename the macros that define values for the reference DACs register to
avoid CamelCase, and to make it clearer which register they are
associated with.  Add a macro `DB2K_REG_DACS_SET` for the value `0x0080`
that triggers setting one of the references.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
---
v2: Shortened prefix from `DAQBOARD2000_` to `DB2K_`.
v3: Corrected typo in commit:  0x80 --> 0x0080.
v4: Corrected typo in commit: DAQBOARD2000_REF_DACS_SET -->
    DB2K_REG_DACS_SET
---
 drivers/staging/comedi/drivers/daqboard2000.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
index e9efdbc..15f2b8a5 100644
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -244,8 +244,9 @@ static const struct comedi_lrange range_daqboard2000_ai = {
 #define DB2K_TRIG_CONTROL_DISABLE			0x0000
 
 /* Reference Dac Selection */
-#define DAQBOARD2000_PosRefDacSelect             0x0100
-#define DAQBOARD2000_NegRefDacSelect             0x0000
+#define DB2K_REF_DACS_SET				0x0080
+#define DB2K_REF_DACS_SELECT_POS_REF			0x0100
+#define DB2K_REF_DACS_SELECT_NEG_REF			0x0000
 
 struct daq200_boardtype {
 	const char *name;
@@ -569,7 +570,7 @@ static void daqboard2000_activateReferenceDacs(struct comedi_device *dev)
 	int timeout;
 
 	/*  Set the + reference dac value in the FPGA */
-	writew(0x80 | DAQBOARD2000_PosRefDacSelect,
+	writew(DB2K_REF_DACS_SET | DB2K_REF_DACS_SELECT_POS_REF,
 	       dev->mmio + DB2K_REG_REF_DACS);
 	for (timeout = 0; timeout < 20; timeout++) {
 		val = readw(dev->mmio + DB2K_REG_DAC_STATUS);
@@ -579,7 +580,7 @@ static void daqboard2000_activateReferenceDacs(struct comedi_device *dev)
 	}
 
 	/*  Set the - reference dac value in the FPGA */
-	writew(0x80 | DAQBOARD2000_NegRefDacSelect,
+	writew(DB2K_REF_DACS_SET | DB2K_REF_DACS_SELECT_NEG_REF,
 	       dev->mmio + DB2K_REG_REF_DACS);
 	for (timeout = 0; timeout < 20; timeout++) {
 		val = readw(dev->mmio + DB2K_REG_DAC_STATUS);
-- 
2.8.1

  parent reply	other threads:[~2016-05-19 10:12 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-17  9:52 [PATCH 00/14] staging: comedi: daqboard2000: checkpatch clean-ups Ian Abbott
2016-05-17  9:52 ` [PATCH 01/14] staging: comedi: daqboard2000: remove commented out code Ian Abbott
2016-05-17 17:14   ` Hartley Sweeten
2016-05-18 10:21     ` Ian Abbott
2016-05-17  9:52 ` [PATCH 02/14] staging: comedi: daqboard2000: use usual block comment style Ian Abbott
2016-05-17  9:52 ` [PATCH 03/14] staging: comedi: daqboard2000: CHECK: spaces preferred around that '*' Ian Abbott
2016-05-17  9:52 ` [PATCH 04/14] staging: comedi: daqboard2000: add blank line after struct declaration Ian Abbott
2016-05-17  9:52 ` [PATCH 05/14] staging: comedi: daqboard2000: rename serial EEPROM register macros Ian Abbott
2016-05-17 17:22   ` Hartley Sweeten
2016-05-18 10:25     ` Ian Abbott
2016-05-17  9:52 ` [PATCH 06/14] staging: comedi: daqboard2000: rename register offset macros Ian Abbott
2016-05-17 17:27   ` Hartley Sweeten
2016-05-18 10:27     ` Ian Abbott
2016-05-17  9:52 ` [PATCH 07/14] staging: comedi: daqboard2000: rename acquisition control register macros Ian Abbott
2016-05-17  9:52 ` [PATCH 08/14] staging: comedi: daqboard2000: rename acq status " Ian Abbott
2016-05-17  9:52 ` [PATCH 09/14] staging: comedi: daqboard2000: redo DAC control " Ian Abbott
2016-05-17  9:52 ` [PATCH 10/14] staging: comedi: daqboard2000: redo DAC status macros and fix busy Ian Abbott
2016-05-17  9:52 ` [PATCH 11/14] staging: comedi: daqboard2000: rename trigger control register macros Ian Abbott
2016-05-17  9:52 ` [PATCH 12/14] staging: comedi: daqboard2000: rename reference DACs " Ian Abbott
2016-05-17  9:52 ` [PATCH 13/14] staging: comedi: daqboard2000: rename CamelCase functions Ian Abbott
2016-05-17  9:52 ` [PATCH 14/14] staging: comedi: daqboard2000: prefer usleep_range() Ian Abbott
2016-05-17 17:42   ` Hartley Sweeten
2016-05-18 10:28     ` Ian Abbott
2016-05-17 17:46 ` [PATCH 00/14] staging: comedi: daqboard2000: checkpatch clean-ups Hartley Sweeten
2016-05-18 12:00   ` Ian Abbott
2016-05-18 12:36 ` [PATCH v2 " Ian Abbott
2016-05-18 12:36   ` [PATCH v2 01/14] staging: comedi: daqboard2000: remove commented out code Ian Abbott
2016-05-18 12:36   ` [PATCH v2 02/14] staging: comedi: daqboard2000: use usual block comment style Ian Abbott
2016-05-18 12:36   ` [PATCH v2 03/14] staging: comedi: daqboard2000: CHECK: spaces preferred around that '*' Ian Abbott
2016-05-18 12:36   ` [PATCH v2 04/14] staging: comedi: daqboard2000: add blank line after struct declaration Ian Abbott
2016-05-18 12:37   ` [PATCH v2 05/14] staging: comedi: daqboard2000: rename serial EEPROM register macros Ian Abbott
2016-05-18 12:37   ` [PATCH v2 06/14] staging: comedi: daqboard2000: rename register offset macros Ian Abbott
2016-05-18 22:45     ` Hartley Sweeten
2016-05-19  9:55     ` [PATCH v3 " Ian Abbott
2016-05-19 16:49       ` Hartley Sweeten
2016-05-19 17:42         ` Ian Abbott
2016-05-18 12:37   ` [PATCH v2 07/14] staging: comedi: daqboard2000: rename acquisition control register macros Ian Abbott
2016-05-18 12:37   ` [PATCH v2 08/14] staging: comedi: daqboard2000: rename acq status " Ian Abbott
2016-05-18 12:37   ` [PATCH v2 09/14] staging: comedi: daqboard2000: redo DAC control " Ian Abbott
2016-05-18 12:37   ` [PATCH v2 10/14] staging: comedi: daqboard2000: redo DAC status macros and fix busy Ian Abbott
2016-05-18 12:37   ` [PATCH v2 11/14] staging: comedi: daqboard2000: rename trigger control register macros Ian Abbott
2016-05-18 12:37   ` [PATCH v2 12/14] staging: comedi: daqboard2000: rename reference DACs " Ian Abbott
2016-05-18 22:35     ` Hartley Sweeten
2016-05-19  9:58     ` [PATCH v3 " Ian Abbott
2016-05-19 10:07       ` Ian Abbott
2016-05-19 10:11       ` Ian Abbott [this message]
2016-05-18 12:37   ` [PATCH v2 13/14] staging: comedi: daqboard2000: rename CamelCase functions Ian Abbott
2016-05-18 12:37   ` [PATCH v2 14/14] staging: comedi: daqboard2000: prefer usleep_range() Ian Abbott
2016-05-19 10:02   ` [PATCH v2 00/14] staging: comedi: daqboard2000: checkpatch clean-ups Ian Abbott
2016-05-19 10:16     ` Ian Abbott
2016-05-19 18:04       ` Ian Abbott
2016-05-19 18:15 ` [PATCH v4 " Ian Abbott
2016-05-19 18:15   ` [PATCH v4 01/14] staging: comedi: daqboard2000: remove commented out code Ian Abbott
2016-05-19 18:15   ` [PATCH v4 02/14] staging: comedi: daqboard2000: use usual block comment style Ian Abbott
2016-05-19 18:15   ` [PATCH v4 03/14] staging: comedi: daqboard2000: CHECK: spaces preferred around that '*' Ian Abbott
2016-05-19 18:15   ` [PATCH v4 04/14] staging: comedi: daqboard2000: add blank line after struct declaration Ian Abbott
2016-05-19 18:15   ` [PATCH v4 05/14] staging: comedi: daqboard2000: rename serial EEPROM register macros Ian Abbott
2016-05-19 18:15   ` [PATCH v4 06/14] staging: comedi: daqboard2000: rename register offset macros Ian Abbott
2016-05-19 18:15   ` [PATCH v4 07/14] staging: comedi: daqboard2000: rename acquisition control register macros Ian Abbott
2016-05-19 18:15   ` [PATCH v4 08/14] staging: comedi: daqboard2000: rename acq status " Ian Abbott
2016-05-19 18:15   ` [PATCH v4 09/14] staging: comedi: daqboard2000: redo DAC control " Ian Abbott
2016-05-19 18:15   ` [PATCH v4 10/14] staging: comedi: daqboard2000: redo DAC status macros and fix busy Ian Abbott
2016-05-19 18:15   ` [PATCH v4 11/14] staging: comedi: daqboard2000: rename trigger control register macros Ian Abbott
2016-05-19 18:15   ` [PATCH v4 12/14] staging: comedi: daqboard2000: rename reference DACs " Ian Abbott
2016-05-19 18:15   ` [PATCH v4 13/14] staging: comedi: daqboard2000: rename CamelCase functions Ian Abbott
2016-05-19 18:15   ` [PATCH v4 14/14] staging: comedi: daqboard2000: prefer usleep_range() Ian Abbott

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1463652706-8692-1-git-send-email-abbotti@mev.co.uk \
    --to=abbotti@mev.co.uk \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=hsweeten@visionengravers.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).