Skip to contentSkip to conversation

Staging: comedi: apci_1564: Fix long CamelCase function names

PATCH Superseded Fred Akers 4 participants 13 messages Mar 9, 2014 – Mar 12, 2014 Staging

lore
Share & tools
lore

Fred Akers

author
#0 lore raw

PATCH 1/1 Staging: comedi: apci_1564: Fix long CamelCase function names

This patch fixes a few function names that are very long and are not in the correct naming style

---
 .../comedi/drivers/addi-data/hwdrv_apci1564.c      | 62 ++++++++++------------
 drivers/staging/comedi/drivers/addi_apci_1564.c    | 16 +++---
 2 files changed, 36 insertions(+), 42 deletions(-)
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c +28 -34
index a31e115..cb426e7 100644
@@ -116,7 +116,7 @@ static unsigned int ui_InterruptData, ui_Type;
 
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1564_ConfigDigitalInput                      |
+| Function   Name   : int i_apci1564_di_config                      |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -141,10 +141,9 @@ static unsigned int ui_InterruptData, ui_Type;
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI1564_ConfigDigitalInput(struct comedi_device *dev,
-					 struct comedi_subdevice *s,
-					 struct comedi_insn *insn,
-					 unsigned int *data)
+static int i_apci1564_di_config(struct comedi_device *dev,
+				struct comedi_subdevice *s,
+				struct comedi_insn *insn, unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 
@@ -184,7 +183,7 @@ static int apci1564_di_insn_bits(struct comedi_device *dev,
 
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1564_ConfigDigitalOutput                     |
+| Function   Name   : int i_apci1564_do_config                     |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -207,10 +206,9 @@ static int apci1564_di_insn_bits(struct comedi_device *dev,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI1564_ConfigDigitalOutput(struct comedi_device *dev,
-					  struct comedi_subdevice *s,
-					  struct comedi_insn *insn,
-					  unsigned int *data)
+static int i_apci1564_do_config(struct comedi_device *dev,
+				struct comedi_subdevice *s,
+				struct comedi_insn *insn, unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	unsigned int ul_Command = 0;
@@ -261,7 +259,7 @@ static int apci1564_do_insn_bits(struct comedi_device *dev,
 
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1564_ConfigTimerCounterWatchdog              |
+| Function   Name   : int i_apci1564_timer_config              |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -289,10 +287,9 @@ static int apci1564_do_insn_bits(struct comedi_device *dev,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI1564_ConfigTimerCounterWatchdog(struct comedi_device *dev,
-						 struct comedi_subdevice *s,
-						 struct comedi_insn *insn,
-						 unsigned int *data)
+static int i_apci1564_timer_config(struct comedi_device *dev,
+				   struct comedi_subdevice *s,
+				   struct comedi_insn *insn, unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	unsigned int ul_Command1 = 0;
@@ -384,7 +381,7 @@ static int i_APCI1564_ConfigTimerCounterWatchdog(struct comedi_device *dev,
 
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1564_StartStopWriteTimerCounterWatchdog      |
+| Function   Name   : int i_apci1564_timer_write      |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -408,10 +405,9 @@ static int i_APCI1564_ConfigTimerCounterWatchdog(struct comedi_device *dev,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI1564_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev,
-							 struct comedi_subdevice *s,
-							 struct comedi_insn *insn,
-							 unsigned int *data)
+static int i_apci1564_timer_write(struct comedi_device *dev,
+				  struct comedi_subdevice *s,
+				  struct comedi_insn *insn, unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	unsigned int ul_Command1 = 0;
@@ -472,7 +468,7 @@ static int i_APCI1564_StartStopWriteTimerCounterWatchdog(struct comedi_device *d
 
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1564_ReadTimerCounterWatchdog                |
+| Function   Name   : int i_apci1564_timer_read                |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -491,10 +487,9 @@ static int i_APCI1564_StartStopWriteTimerCounterWatchdog(struct comedi_device *d
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device *dev,
-					       struct comedi_subdevice *s,
-					       struct comedi_insn *insn,
-					       unsigned int *data)
+static int i_apci1564_timer_read(struct comedi_device *dev,
+				 struct comedi_subdevice *s,
+				 struct comedi_insn *insn, unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	unsigned int ul_Command1 = 0;
@@ -539,7 +534,7 @@ static int i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device *dev,
 
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   :  int i_APCI1564_ReadInterruptStatus                    |
+| Function   Name   :  int i_apci1564_do_read                    |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -554,10 +549,9 @@ static int i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device *dev,
 +----------------------------------------------------------------------------+
 */
 
-static int i_APCI1564_ReadInterruptStatus(struct comedi_device *dev,
-					  struct comedi_subdevice *s,
-					  struct comedi_insn *insn,
-					  unsigned int *data)
+static int i_apci1564_do_read(struct comedi_device *dev,
+			      struct comedi_subdevice *s,
+			      struct comedi_insn *insn, unsigned int *data)
 {
 	*data = ui_Type;
 	return insn->n;
@@ -565,7 +559,7 @@ static int i_APCI1564_ReadInterruptStatus(struct comedi_device *dev,
 
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : static void v_APCI1564_Interrupt					     |
+| Function   Name   : static void v_apci1564_interrupt					     |
 |					  (int irq , void *d)      |
 +----------------------------------------------------------------------------+
 | Task              : Interrupt handler for the interruptible digital inputs |
@@ -580,7 +574,7 @@ static int i_APCI1564_ReadInterruptStatus(struct comedi_device *dev,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static void v_APCI1564_Interrupt(int irq, void *d)
+static void v_apci1564_interrupt(int irq, void *d)
 {
 	struct comedi_device *dev = d;
 	struct addi_private *devpriv = dev->private;
@@ -724,7 +718,7 @@ static void v_APCI1564_Interrupt(int irq, void *d)
 
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1564_Reset(struct comedi_device *dev)               |                                                       |
+| Function   Name   : int i_apci1564_reset(struct comedi_device *dev)               |                                                       |
 +----------------------------------------------------------------------------+
 | Task              :resets all the registers                                |
 +----------------------------------------------------------------------------+
@@ -737,7 +731,7 @@ static void v_APCI1564_Interrupt(int irq, void *d)
 +----------------------------------------------------------------------------+
 */
 
-static int i_APCI1564_Reset(struct comedi_device *dev)
+static int i_apci1564_reset(struct comedi_device *dev)
 {
 	struct addi_private *devpriv = dev->private;
 
drivers/staging/comedi/drivers/addi_apci_1564.c +8 -8
index 6248284..801e852 100644
@@ -21,16 +21,16 @@ static const struct addi_board apci1564_boardtypes[] = {
 		.i_NbrDoChannel		= 32,
 		.i_DoMaxdata		= 0xffffffff,
 		.i_Timer		= 1,
-		.interrupt		= v_APCI1564_Interrupt,
-		.reset			= i_APCI1564_Reset,
-		.di_config		= i_APCI1564_ConfigDigitalInput,
+		.interrupt		= v_apci1564_interrupt,
+		.reset			= i_apci1564_reset,
+		.di_config		= i_apci1564_di_config,
 		.di_bits		= apci1564_di_insn_bits,
-		.do_config		= i_APCI1564_ConfigDigitalOutput,
+		.do_config		= i_apci1564_do_config,
 		.do_bits		= apci1564_do_insn_bits,
-		.do_read		= i_APCI1564_ReadInterruptStatus,
-		.timer_config		= i_APCI1564_ConfigTimerCounterWatchdog,
-		.timer_write		= i_APCI1564_StartStopWriteTimerCounterWatchdog,
-		.timer_read		= i_APCI1564_ReadTimerCounterWatchdog,
+		.do_read		= i_apci1564_do_read,
+		.timer_config		= i_apci1564_timer_config,
+		.timer_write		= i_apci1564_timer_write,
+		.timer_read		= i_apci1564_timer_read,
 	},
 };
 
Signature · 1 line
1.8.5.3
#1 lore raw
Quoted 14 lines · Fred Akers

This patch fixes a few function names that are very long and are not in the correct naming style

---
  .../comedi/drivers/addi-data/hwdrv_apci1564.c      | 62 ++++++++++------------
  drivers/staging/comedi/drivers/addi_apci_1564.c    | 16 +++---
  2 files changed, 36 insertions(+), 42 deletions(-)
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c +0 -0
index a31e115..cb426e7 100644

drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c static unsigned int ui_InterruptData, ui_Type; · line 119

Quoted 5 lines
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c +1 -1
@@ -116,7 +116,7 @@ static unsigned int ui_InterruptData, ui_Type;
 
  /*
  +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1564_ConfigDigitalInput                      |
+| Function   Name   : int i_apci1564_di_config                      |

It would be nice to get rid of the silly i_, v_ prefixes as well!

Signature · 2 lines
-=( Ian Abbott @ MEV Ltd.    E-mail: <[email protected]>        )=-
-=( Tel: +44 (0)161 477 1898   FAX: +44 (0)161 718 3587         )=-
author
#2 lore raw
Quoted 19 lines · Ian Abbott
Quoted 18 lines · Fred Akers

This patch fixes a few function names that are very long and are not in the correct naming style

---

  .../comedi/drivers/addi-data/hwdrv_apci1564.c      | 62
  ++++++++++------------ drivers/staging/comedi/drivers/addi_apci_1564.c 
    | 16 +++---
  2 files changed, 36 insertions(+), 42 deletions(-)
(quoted diff) +0 -0

b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c index a31e115..cb426e7 100644

drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c +0 -0
@@ -116,7 +116,7 @@ static unsigned int ui_InterruptData, ui_Type;
 
Quoted 7 lines
Quoted 6 lines
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c +0 -1
  /*
  +-----------------------------------------------------------------------
  -----+> 
-| Function   Name   : int i_APCI1564_ConfigDigitalInput                  
   | +| Function   Name   : int i_apci1564_di_config                     

|

It would be nice to get rid of the silly i_, v_ prefixes as well!

I'll submit a V2 removing those prefixes. I'm working on doing similar renames on functions for the other files under the addi-data directory as well. I'll include those in the V2 patch.

author
#3 lore raw

PATCH v2 1/1 Staging: comedi: addi-data: Fix long CamelCase function names

In reply to Fred Akers

This patch fixes a few function names that are very long and are not in the correct naming style

---
This is v2 of "[PATCH] Staging: comedi: apci_1564: Fix long CamelCase function names" Changed subject because it no longer applies to only that file exclusively.

---
 .../comedi/drivers/addi-data/hwdrv_apci035.c       |  53 +++++------
 .../comedi/drivers/addi-data/hwdrv_apci1500.c      |  96 +++++++++-----------
 .../comedi/drivers/addi-data/hwdrv_apci1564.c      |  62 ++++++-------
 .../comedi/drivers/addi-data/hwdrv_apci3120.c      | 100 ++++++++++-----------
 .../comedi/drivers/addi-data/hwdrv_apci3200.c      |  68 +++++++-------
 .../comedi/drivers/addi-data/hwdrv_apci3501.c      |  24 ++---
 drivers/staging/comedi/drivers/addi_apci_035.c     |  14 +--
 drivers/staging/comedi/drivers/addi_apci_1500.c    |  24 ++---
 drivers/staging/comedi/drivers/addi_apci_1564.c    |  16 ++--
 drivers/staging/comedi/drivers/addi_apci_3120.c    |  26 +++---
 drivers/staging/comedi/drivers/addi_apci_3200.c    |  36 ++++----
 drivers/staging/comedi/drivers/addi_apci_3501.c    |   6 +-
 12 files changed, 248 insertions(+), 277 deletions(-)
drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c +24 -29
index 80cca95..b22a8ea 100644
@@ -111,7 +111,7 @@ static int i_Temp;
 static int i_Flag = 1;
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI035_ConfigTimerWatchdog                      |
+| Function   Name   : int apci035_timer_config                      |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -163,10 +163,9 @@ static int i_Flag = 1;
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI035_ConfigTimerWatchdog(struct comedi_device *dev,
-					 struct comedi_subdevice *s,
-					 struct comedi_insn *insn,
-					 unsigned int *data)
+static int apci035_timer_config(struct comedi_device *dev,
+				struct comedi_subdevice *s,
+				struct comedi_insn *insn, unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	unsigned int ui_Status;
@@ -287,7 +286,7 @@ static int i_APCI035_ConfigTimerWatchdog(struct comedi_device *dev,
 
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI035_StartStopWriteTimerWatchdog              |
+| Function   Name   : int apci035_timer_write              |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -312,10 +311,9 @@ static int i_APCI035_ConfigTimerWatchdog(struct comedi_device *dev,
 |					                                                 |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device *dev,
-						 struct comedi_subdevice *s,
-						 struct comedi_insn *insn,
-						 unsigned int *data)
+static int apci035_timer_write(struct comedi_device *dev,
+			       struct comedi_subdevice *s,
+			       struct comedi_insn *insn, unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	unsigned int ui_Command;
@@ -402,7 +400,7 @@ static int i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device *dev,
 
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI035_ReadTimerWatchdog                        |
+| Function   Name   : int apci035_timer_read                        |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -427,10 +425,9 @@ static int i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device *dev,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI035_ReadTimerWatchdog(struct comedi_device *dev,
-				       struct comedi_subdevice *s,
-				       struct comedi_insn *insn,
-				       unsigned int *data)
+static int apci035_timer_read(struct comedi_device *dev,
+			      struct comedi_subdevice *s,
+			      struct comedi_insn *insn, unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	unsigned int ui_Status;	/*  Status register */
@@ -459,7 +456,7 @@ static int i_APCI035_ReadTimerWatchdog(struct comedi_device *dev,
 
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI035_ConfigAnalogInput                        |
+| Function   Name   : int apci035_ai_config                        |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -480,10 +477,9 @@ static int i_APCI035_ReadTimerWatchdog(struct comedi_device *dev,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI035_ConfigAnalogInput(struct comedi_device *dev,
-				       struct comedi_subdevice *s,
-				       struct comedi_insn *insn,
-				       unsigned int *data)
+static int apci035_ai_config(struct comedi_device *dev,
+			     struct comedi_subdevice *s,
+			     struct comedi_insn *insn, unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 
@@ -501,7 +497,7 @@ static int i_APCI035_ConfigAnalogInput(struct comedi_device *dev,
 
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI035_ReadAnalogInput                          |
+| Function   Name   : int apci035_ai_read                          |
 |			          (struct comedi_device *dev,struct comedi_subdevice *s,       |
 |                     struct comedi_insn *insn,unsigned int *data)                      |
 +----------------------------------------------------------------------------+
@@ -520,10 +516,9 @@ static int i_APCI035_ConfigAnalogInput(struct comedi_device *dev,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI035_ReadAnalogInput(struct comedi_device *dev,
-				     struct comedi_subdevice *s,
-				     struct comedi_insn *insn,
-				     unsigned int *data)
+static int apci035_ai_read(struct comedi_device *dev,
+			   struct comedi_subdevice *s,
+			   struct comedi_insn *insn, unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	unsigned int ui_CommandRegister;
@@ -541,7 +536,7 @@ static int i_APCI035_ReadAnalogInput(struct comedi_device *dev,
 
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   :  int i_APCI035_Reset(struct comedi_device *dev)			     |
+| Function   Name   :  int apci035_reset(struct comedi_device *dev)
 |					                                                         |
 +----------------------------------------------------------------------------+
 | Task              :Resets the registers of the card                        |
@@ -554,7 +549,7 @@ static int i_APCI035_ReadAnalogInput(struct comedi_device *dev,
 |			                                                                 |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI035_Reset(struct comedi_device *dev)
+static int apci035_reset(struct comedi_device *dev)
 {
 	struct addi_private *devpriv = dev->private;
 	int i_Count;
@@ -572,7 +567,7 @@ static int i_APCI035_Reset(struct comedi_device *dev)
 
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : static void v_APCI035_Interrupt					     |
+| Function   Name   : static void apci035_interrupt
 |					  (int irq , void *d)      |
 +----------------------------------------------------------------------------+
 | Task              : Interrupt processing Routine                           |
@@ -587,7 +582,7 @@ static int i_APCI035_Reset(struct comedi_device *dev)
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static void v_APCI035_Interrupt(int irq, void *d)
+static void apci035_interrupt(int irq, void *d)
 {
 	struct comedi_device *dev = d;
 	struct addi_private *devpriv = dev->private;
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c +44 -52

240 lines not on this page · raw message

drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c +28 -34

158 lines not on this page · raw message

drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c +47 -53

283 lines not on this page · raw message

drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c +32 -36

178 lines not on this page · raw message

drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c +12 -12
index ebc1534..20e89b0 100644
@@ -16,10 +16,10 @@
  *	data[2] : Time Unit
  *	data[3] : Reload Value
  */
-static int i_APCI3501_ConfigTimerCounterWatchdog(struct comedi_device *dev,
-						 struct comedi_subdevice *s,
-						 struct comedi_insn *insn,
-						 unsigned int *data)
+static int apci3501_config_insn_timer(struct comedi_device *dev,
+				      struct comedi_subdevice *s,
+				      struct comedi_insn *insn,
+				      unsigned int *data)
 {
 	struct apci3501_private *devpriv = dev->private;
 	unsigned int ul_Command1 = 0;
@@ -86,10 +86,10 @@ static int i_APCI3501_ConfigTimerCounterWatchdog(struct comedi_device *dev,
  *		  0 Stop
  *		  2 Trigger
  */
-static int i_APCI3501_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev,
-							 struct comedi_subdevice *s,
-							 struct comedi_insn *insn,
-							 unsigned int *data)
+static int apci3501_write_insn_timer(struct comedi_device *dev,
+				     struct comedi_subdevice *s,
+				     struct comedi_insn *insn,
+				     unsigned int *data)
 {
 	struct apci3501_private *devpriv = dev->private;
 	unsigned int ul_Command1 = 0;
@@ -153,10 +153,10 @@ static int i_APCI3501_StartStopWriteTimerCounterWatchdog(struct comedi_device *d
  *		  2 Watchdog
  *	data[1] : Timer Counter Watchdog Number
  */
-static int i_APCI3501_ReadTimerCounterWatchdog(struct comedi_device *dev,
-					       struct comedi_subdevice *s,
-					       struct comedi_insn *insn,
-					       unsigned int *data)
+static int apci3501_read_insn_timer(struct comedi_device *dev,
+				    struct comedi_subdevice *s,
+				    struct comedi_insn *insn,
+				    unsigned int *data)
 {
 	struct apci3501_private *devpriv = dev->private;
 
drivers/staging/comedi/drivers/addi_apci_035.c +7 -7
index ccd4921..4da9db3 100644
@@ -27,13 +27,13 @@ static const struct addi_board apci035_boardtypes[] = {
 		.i_Timer		= 1,
 		.ui_MinAcquisitiontimeNs = 10000,
 		.ui_MinDelaytimeNs	= 100000,
-		.interrupt		= v_APCI035_Interrupt,
-		.reset			= i_APCI035_Reset,
-		.ai_config		= i_APCI035_ConfigAnalogInput,
-		.ai_read		= i_APCI035_ReadAnalogInput,
-		.timer_config		= i_APCI035_ConfigTimerWatchdog,
-		.timer_write		= i_APCI035_StartStopWriteTimerWatchdog,
-		.timer_read		= i_APCI035_ReadTimerWatchdog,
+		.interrupt		= apci035_interrupt,
+		.reset			= apci035_reset,
+		.ai_config		= apci035_ai_config,
+		.ai_read		= apci035_ai_read,
+		.timer_config		= apci035_timer_config,
+		.timer_write		= apci035_timer_write,
+		.timer_read		= apci035_timer_read,
 	},
 };
 
drivers/staging/comedi/drivers/addi_apci_1500.c +12 -12
index afa7d6e..bd8e08c 100644
@@ -20,19 +20,19 @@ static const struct addi_board apci1500_boardtypes[] = {
 		.i_NbrDoChannel		= 16,
 		.i_DoMaxdata		= 0xffff,
 		.i_Timer		= 1,
-		.interrupt		= v_APCI1500_Interrupt,
-		.reset			= i_APCI1500_Reset,
-		.di_config		= i_APCI1500_ConfigDigitalInputEvent,
-		.di_read		= i_APCI1500_Initialisation,
-		.di_write		= i_APCI1500_StartStopInputEvent,
+		.interrupt		= apci1500_interrupt,
+		.reset			= apci1500_reset,
+		.di_config		= apci1500_di_config,
+		.di_read		= apci1500_di_read,
+		.di_write		= apci1500_di_write,
 		.di_bits		= apci1500_di_insn_bits,
-		.do_config		= i_acpi1500_config_output,
-		.do_write		= i_APCI1500_WriteDigitalOutput,
-		.do_bits		= i_APCI1500_ConfigureInterrupt,
-		.timer_config		= i_APCI1500_ConfigCounterTimerWatchdog,
-		.timer_write		= i_apci1500_timer_watchdog,
-		.timer_read		= i_APCI1500_ReadInterruptMask,
-		.timer_bits		= i_APCI1500_ReadCounterTimerWatchdog,
+		.do_config		= apci1500_do_config,
+		.do_write		= apci1500_do_write,
+		.do_bits		= apci1500_do_bits,
+		.timer_config		= apci1500_timer_config,
+		.timer_write		= apci1500_timer_write,
+		.timer_read		= apci1500_timer_read,
+		.timer_bits		= apci1500_timer_bits,
 	},
 };
 
drivers/staging/comedi/drivers/addi_apci_1564.c +8 -8
index 6248284..27aa9ae 100644
@@ -21,16 +21,16 @@ static const struct addi_board apci1564_boardtypes[] = {
 		.i_NbrDoChannel		= 32,
 		.i_DoMaxdata		= 0xffffffff,
 		.i_Timer		= 1,
-		.interrupt		= v_APCI1564_Interrupt,
-		.reset			= i_APCI1564_Reset,
-		.di_config		= i_APCI1564_ConfigDigitalInput,
+		.interrupt		= apci1564_interrupt,
+		.reset			= apci1564_reset,
+		.di_config		= apci1564_di_config,
 		.di_bits		= apci1564_di_insn_bits,
-		.do_config		= i_APCI1564_ConfigDigitalOutput,
+		.do_config		= apci1564_do_config,
 		.do_bits		= apci1564_do_insn_bits,
-		.do_read		= i_APCI1564_ReadInterruptStatus,
-		.timer_config		= i_APCI1564_ConfigTimerCounterWatchdog,
-		.timer_write		= i_APCI1564_StartStopWriteTimerCounterWatchdog,
-		.timer_read		= i_APCI1564_ReadTimerCounterWatchdog,
+		.do_read		= apci1564_do_read,
+		.timer_config		= apci1564_timer_config,
+		.timer_write		= apci1564_timer_write,
+		.timer_read		= apci1564_timer_read,
 	},
 };
 
drivers/staging/comedi/drivers/addi_apci_3120.c +13 -13
index 1e6fa56..57ee6e5 100644
@@ -26,7 +26,7 @@ static const struct addi_board apci3120_boardtypes[] = {
 		.i_NbrDiChannel		= 4,
 		.i_NbrDoChannel		= 4,
 		.i_DoMaxdata		= 0x0f,
-		.interrupt		= v_APCI3120_Interrupt,
+		.interrupt		= apci3120_interrupt,
 	},
 	[BOARD_APCI3001] = {
 		.pc_DriverName		= "apci3001",
@@ -37,7 +37,7 @@ static const struct addi_board apci3120_boardtypes[] = {
 		.i_NbrDiChannel		= 4,
 		.i_NbrDoChannel		= 4,
 		.i_DoMaxdata		= 0x0f,
-		.interrupt		= v_APCI3120_Interrupt,
+		.interrupt		= apci3120_interrupt,
 	},
 };
 
@@ -136,11 +136,11 @@ static int apci3120_auto_attach(struct comedi_device *dev,
 	s->len_chanlist = this_board->i_AiChannelList;
 	s->range_table = &range_apci3120_ai;
 
-	s->insn_config = i_APCI3120_InsnConfigAnalogInput;
-	s->insn_read = i_APCI3120_InsnReadAnalogInput;
-	s->do_cmdtest = i_APCI3120_CommandTestAnalogInput;
-	s->do_cmd = i_APCI3120_CommandAnalogInput;
-	s->cancel = i_APCI3120_StopCyclicAcquisition;
+	s->insn_config = apci3120_ai_insn_config;
+	s->insn_read = apci3120_ai_insn_read;
+	s->do_cmdtest = apci3120_ai_cmdtest;
+	s->do_cmd = apci3120_ai_cmd;
+	s->cancel = apci3120_cancel;
 
 	/*  Allocate and Initialise AO Subdevice Structures */
 	s = &dev->subdevices[1];
@@ -151,7 +151,7 @@ static int apci3120_auto_attach(struct comedi_device *dev,
 		s->maxdata = this_board->i_AoMaxdata;
 		s->len_chanlist = this_board->i_NbrAoChannel;
 		s->range_table = &range_apci3120_ao;
-		s->insn_write = i_APCI3120_InsnWriteAnalogOutput;
+		s->insn_write = apci3120_ao_insn_write;
 	} else {
 		s->type = COMEDI_SUBD_UNUSED;
 	}
@@ -186,11 +186,11 @@ static int apci3120_auto_attach(struct comedi_device *dev,
 	s->len_chanlist = 1;
 	s->range_table = &range_digital;
 
-	s->insn_write = i_APCI3120_InsnWriteTimer;
-	s->insn_read = i_APCI3120_InsnReadTimer;
-	s->insn_config = i_APCI3120_InsnConfigTimer;
+	s->insn_write = apci3120_write_insn_timer;
+	s->insn_read = apci3120_read_insn_timer;
+	s->insn_config = apci3120_config_insn_timer;
 
-	i_APCI3120_Reset(dev);
+	apci3120_reset(dev);
 	return 0;
 }
 
@@ -200,7 +200,7 @@ static void apci3120_detach(struct comedi_device *dev)
 
 	if (devpriv) {
 		if (dev->iobase)
-			i_APCI3120_Reset(dev);
+			apci3120_reset(dev);
 		if (dev->irq)
 			free_irq(dev->irq, dev);
 		if (devpriv->ul_DmaBufferVirtual[0]) {
drivers/staging/comedi/drivers/addi_apci_3200.c +18 -18
index 9868a53..f0f891a 100644
@@ -43,15 +43,15 @@ static const struct addi_board apci3200_boardtypes[] = {
 		.i_NbrDoChannel		= 4,
 		.ui_MinAcquisitiontimeNs = 10000,
 		.ui_MinDelaytimeNs	= 100000,
-		.interrupt		= v_APCI3200_Interrupt,
-		.reset			= i_APCI3200_Reset,
-		.ai_config		= i_APCI3200_ConfigAnalogInput,
-		.ai_read		= i_APCI3200_ReadAnalogInput,
-		.ai_write		= i_APCI3200_InsnWriteReleaseAnalogInput,
-		.ai_bits		= i_APCI3200_InsnBits_AnalogInput_Test,
-		.ai_cmdtest		= i_APCI3200_CommandTestAnalogInput,
-		.ai_cmd			= i_APCI3200_CommandAnalogInput,
-		.ai_cancel		= i_APCI3200_StopCyclicAcquisition,
+		.interrupt		= apci3200_interrupt,
+		.reset			= apci3200_reset,
+		.ai_config		= apci3200_ai_config,
+		.ai_read		= apci3200_ai_read,
+		.ai_write		= apci3200_ai_write,
+		.ai_bits		= apci3200_ai_bits_test,
+		.ai_cmdtest		= apci3200_ai_cmdtest,
+		.ai_cmd			= apci3200_ai_cmd,
+		.ai_cancel		= apci3200_cancel,
 		.di_bits		= apci3200_di_insn_bits,
 		.do_bits		= apci3200_do_insn_bits,
 	},
@@ -68,15 +68,15 @@ static const struct addi_board apci3200_boardtypes[] = {
 		.i_NbrDoChannel		= 4,
 		.ui_MinAcquisitiontimeNs = 10000,
 		.ui_MinDelaytimeNs	= 100000,
-		.interrupt		= v_APCI3200_Interrupt,
-		.reset			= i_APCI3200_Reset,
-		.ai_config		= i_APCI3200_ConfigAnalogInput,
-		.ai_read		= i_APCI3200_ReadAnalogInput,
-		.ai_write		= i_APCI3200_InsnWriteReleaseAnalogInput,
-		.ai_bits		= i_APCI3200_InsnBits_AnalogInput_Test,
-		.ai_cmdtest		= i_APCI3200_CommandTestAnalogInput,
-		.ai_cmd			= i_APCI3200_CommandAnalogInput,
-		.ai_cancel		= i_APCI3200_StopCyclicAcquisition,
+		.interrupt		= apci3200_interrupt,
+		.reset			= apci3200_reset,
+		.ai_config		= apci3200_ai_config,
+		.ai_read		= apci3200_ai_read,
+		.ai_write		= apci3200_ai_write,
+		.ai_bits		= apci3200_ai_bits_test,
+		.ai_cmdtest		= apci3200_ai_cmdtest,
+		.ai_cmd			= apci3200_ai_cmd,
+		.ai_cancel		= apci3200_cancel,
 		.di_bits		= apci3200_di_insn_bits,
 		.do_bits		= apci3200_do_insn_bits,
 	},
drivers/staging/comedi/drivers/addi_apci_3501.c +3 -3
index 4cb69ec..49bf1fb 100644
@@ -390,9 +390,9 @@ static int apci3501_auto_attach(struct comedi_device *dev,
 	s->maxdata = 0;
 	s->len_chanlist = 1;
 	s->range_table = &range_digital;
-	s->insn_write = i_APCI3501_StartStopWriteTimerCounterWatchdog;
-	s->insn_read = i_APCI3501_ReadTimerCounterWatchdog;
-	s->insn_config = i_APCI3501_ConfigTimerCounterWatchdog;
+	s->insn_write = apci3501_write_insn_timer;
+	s->insn_read = apci3501_read_insn_timer;
+	s->insn_config = apci3501_config_insn_timer;
 
 	/* Initialize the eeprom subdevice */
 	s = &dev->subdevices[4];
Signature · 1 line
1.8.5.3
#4 lore raw

RE: [PATCH v2] Staging: comedi: addi-data: Fix long CamelCase function names

Quoted 27 lines · Fred Akers

This patch fixes a few function names that are very long and are not in the correct naming style

---
This is v2 of "[PATCH] Staging: comedi: apci_1564: Fix long CamelCase function names" Changed subject because it no longer applies to only that file exclusively.

---
 .../comedi/drivers/addi-data/hwdrv_apci035.c       |  53 +++++------
 .../comedi/drivers/addi-data/hwdrv_apci1500.c      |  96 +++++++++-----------
 .../comedi/drivers/addi-data/hwdrv_apci1564.c      |  62 ++++++-------
 .../comedi/drivers/addi-data/hwdrv_apci3120.c      | 100 ++++++++++-----------
 .../comedi/drivers/addi-data/hwdrv_apci3200.c      |  68 +++++++-------
 .../comedi/drivers/addi-data/hwdrv_apci3501.c      |  24 ++---
 drivers/staging/comedi/drivers/addi_apci_035.c     |  14 +--
 drivers/staging/comedi/drivers/addi_apci_1500.c    |  24 ++---
 drivers/staging/comedi/drivers/addi_apci_1564.c    |  16 ++--
 drivers/staging/comedi/drivers/addi_apci_3120.c    |  26 +++---
 drivers/staging/comedi/drivers/addi_apci_3200.c    |  36 ++++----
 drivers/staging/comedi/drivers/addi_apci_3501.c    |   6 +-
 12 files changed, 248 insertions(+), 277 deletions(-)
drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c +0 -0
index 80cca95..b22a8ea 100644

drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c static int i_Temp; · line 117

Quoted 8 lines
drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c +1 -1
@@ -111,7 +111,7 @@ static int i_Temp;
 static int i_Flag = 1;
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI035_ConfigTimerWatchdog                      |
+| Function   Name   : int apci035_timer_config                      |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+

Nitpick... These obvious function comment blocks should be removed. That should be a separate patch. Maybe a patch 1/2 before this one so you don't have to update the comments.

drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c static int i_Flag = 1; · line 168

Quoted 11 lines
drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c +3 -4
@@ -163,10 +163,9 @@ static int i_Flag = 1;
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI035_ConfigTimerWatchdog(struct comedi_device *dev,
-					 struct comedi_subdevice *s,
-					 struct comedi_insn *insn,
-					 unsigned int *data)
+static int apci035_timer_config(struct comedi_device *dev,
+				struct comedi_subdevice *s,
+				struct comedi_insn *insn, unsigned int *data)

Please leave each parameter on a separate line.

Regards,
Hartley

#5 lore raw

Re: [PATCH v2] Staging: comedi: addi-data: Fix long CamelCase function names

Quoted 3 lines · Hartley Sweeten
Quoted 2 lines · Fred Akers

This patch fixes a few function names that are very long and are not in the correct naming style

[]

Quoted 1 line

drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c

Quoted 1 line
drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c +0 -0

[]

Quoted 5 lines
Quoted 5 lines
drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c +0 -1
@@ -111,7 +111,7 @@ static int i_Temp;
 static int i_Flag = 1;
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI035_ConfigTimerWatchdog                      |
Quoted 8 lines

drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c static int i_Temp; · line 117

Quoted 4 lines
drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c +1 -0
+| Function   Name   : int apci035_timer_config                      |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+

Nitpick... These obvious function comment blocks should be removed. That should be a separate patch. Maybe a patch 1/2 before this one so you don't have to update the comments.

Maybe convert them to kernel-doc style?

/**
* foobar() - short function description of foobar
* @arg1: Describe the first argument to foobar.
* @arg2: Describe the second argument to foobar.
* One can provide multiple line descriptions
* for arguments.

#6 lore raw

RE: [PATCH v2] Staging: comedi: addi-data: Fix long CamelCase function names

Quoted 21 lines · Joe Perches
Quoted 3 lines · Hartley Sweeten
Quoted 2 lines · Fred Akers

This patch fixes a few function names that are very long and are not in the correct naming style

[]

Quoted 1 line

drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c

Quoted 1 line
drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c +0 -0

[]

Quoted 5 lines
Quoted 5 lines
drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c +0 -1
@@ -111,7 +111,7 @@ static int i_Temp;
 static int i_Flag = 1;
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI035_ConfigTimerWatchdog                      |
Quoted 8 lines

drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c static int i_Temp; · line 117

Quoted 4 lines
drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c +1 -0
+| Function   Name   : int apci035_timer_config                      |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+

Nitpick... These obvious function comment blocks should be removed. That should be a separate patch. Maybe a patch 1/2 before this one so you don't have to update the comments.

Quoted 8 lines

Maybe convert them to kernel-doc style?

/**
* foobar() - short function description of foobar
* @arg1: Describe the first argument to foobar.
* @arg2: Describe the second argument to foobar.
* One can provide multiple line descriptions
* for arguments.

For exported functions I agree, but the (dev, s, insn, data) is athe standard parameter list for most of the comedi subdevice callbacks. I don't think these need any comments.

Regards,
Hartley

author
#7 lore raw

PATCH v3 1/2 Staging: comedi: addi-data: Fix long CamelCase function names

In reply to Fred Akers

This patch fixes a few function names that are very long and are not in the correct naming style

---
 .../comedi/drivers/addi-data/hwdrv_apci035.c       |  58 +++++------
 .../comedi/drivers/addi-data/hwdrv_apci1500.c      | 106 +++++++++++----------
 .../comedi/drivers/addi-data/hwdrv_apci1564.c      |  68 ++++++-------
 .../comedi/drivers/addi-data/hwdrv_apci3120.c      | 104 ++++++++++----------
 .../comedi/drivers/addi-data/hwdrv_apci3200.c      |  72 +++++++-------
 .../comedi/drivers/addi-data/hwdrv_apci3501.c      |  24 ++---
 drivers/staging/comedi/drivers/addi_apci_035.c     |  14 +--
 drivers/staging/comedi/drivers/addi_apci_1500.c    |  24 ++---
 drivers/staging/comedi/drivers/addi_apci_1564.c    |  16 ++--
 drivers/staging/comedi/drivers/addi_apci_3120.c    |  26 ++---
 drivers/staging/comedi/drivers/addi_apci_3200.c    |  36 +++----
 drivers/staging/comedi/drivers/addi_apci_3501.c    |   6 +-
 12 files changed, 277 insertions(+), 277 deletions(-)
drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c +29 -29
index 80cca95..2c9fe1f 100644
@@ -111,7 +111,7 @@ static int i_Temp;
 static int i_Flag = 1;
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI035_ConfigTimerWatchdog                      |
+| Function   Name   : int apci035_timer_config                      |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -163,10 +163,10 @@ static int i_Flag = 1;
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI035_ConfigTimerWatchdog(struct comedi_device *dev,
-					 struct comedi_subdevice *s,
-					 struct comedi_insn *insn,
-					 unsigned int *data)
+static int apci035_timer_config(struct comedi_device *dev,
+				struct comedi_subdevice *s,
+				struct comedi_insn *insn,
+				unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	unsigned int ui_Status;
@@ -287,7 +287,7 @@ static int i_APCI035_ConfigTimerWatchdog(struct comedi_device *dev,
 
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI035_StartStopWriteTimerWatchdog              |
+| Function   Name   : int apci035_timer_write              |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -312,10 +312,10 @@ static int i_APCI035_ConfigTimerWatchdog(struct comedi_device *dev,
 |					                                                 |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device *dev,
-						 struct comedi_subdevice *s,
-						 struct comedi_insn *insn,
-						 unsigned int *data)
+static int apci035_timer_write(struct comedi_device *dev,
+			       struct comedi_subdevice *s,
+			       struct comedi_insn *insn,
+			       unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	unsigned int ui_Command;
@@ -402,7 +402,7 @@ static int i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device *dev,
 
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI035_ReadTimerWatchdog                        |
+| Function   Name   : int apci035_timer_read                        |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -427,10 +427,10 @@ static int i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device *dev,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI035_ReadTimerWatchdog(struct comedi_device *dev,
-				       struct comedi_subdevice *s,
-				       struct comedi_insn *insn,
-				       unsigned int *data)
+static int apci035_timer_read(struct comedi_device *dev,
+			      struct comedi_subdevice *s,
+			      struct comedi_insn *insn,
+			      unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	unsigned int ui_Status;	/*  Status register */
@@ -459,7 +459,7 @@ static int i_APCI035_ReadTimerWatchdog(struct comedi_device *dev,
 
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI035_ConfigAnalogInput                        |
+| Function   Name   : int apci035_ai_config                        |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -480,10 +480,10 @@ static int i_APCI035_ReadTimerWatchdog(struct comedi_device *dev,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI035_ConfigAnalogInput(struct comedi_device *dev,
-				       struct comedi_subdevice *s,
-				       struct comedi_insn *insn,
-				       unsigned int *data)
+static int apci035_ai_config(struct comedi_device *dev,
+			     struct comedi_subdevice *s,
+			     struct comedi_insn *insn,
+			     unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 
@@ -501,7 +501,7 @@ static int i_APCI035_ConfigAnalogInput(struct comedi_device *dev,
 
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI035_ReadAnalogInput                          |
+| Function   Name   : int apci035_ai_read                          |
 |			          (struct comedi_device *dev,struct comedi_subdevice *s,       |
 |                     struct comedi_insn *insn,unsigned int *data)                      |
 +----------------------------------------------------------------------------+
@@ -520,10 +520,10 @@ static int i_APCI035_ConfigAnalogInput(struct comedi_device *dev,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI035_ReadAnalogInput(struct comedi_device *dev,
-				     struct comedi_subdevice *s,
-				     struct comedi_insn *insn,
-				     unsigned int *data)
+static int apci035_ai_read(struct comedi_device *dev,
+			   struct comedi_subdevice *s,
+			   struct comedi_insn *insn,
+			   unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	unsigned int ui_CommandRegister;
@@ -541,7 +541,7 @@ static int i_APCI035_ReadAnalogInput(struct comedi_device *dev,
 
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   :  int i_APCI035_Reset(struct comedi_device *dev)			     |
+| Function   Name   :  int apci035_reset(struct comedi_device *dev)
 |					                                                         |
 +----------------------------------------------------------------------------+
 | Task              :Resets the registers of the card                        |
@@ -554,7 +554,7 @@ static int i_APCI035_ReadAnalogInput(struct comedi_device *dev,
 |			                                                                 |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI035_Reset(struct comedi_device *dev)
+static int apci035_reset(struct comedi_device *dev)
 {
 	struct addi_private *devpriv = dev->private;
 	int i_Count;
@@ -572,7 +572,7 @@ static int i_APCI035_Reset(struct comedi_device *dev)
 
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : static void v_APCI035_Interrupt					     |
+| Function   Name   : static void apci035_interrupt
 |					  (int irq , void *d)      |
 +----------------------------------------------------------------------------+
 | Task              : Interrupt processing Routine                           |
@@ -587,7 +587,7 @@ static int i_APCI035_Reset(struct comedi_device *dev)
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static void v_APCI035_Interrupt(int irq, void *d)
+static void apci035_interrupt(int irq, void *d)
 {
 	struct comedi_device *dev = d;
 	struct addi_private *devpriv = dev->private;
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c +54 -52

250 lines not on this page · raw message

drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c +34 -34

164 lines not on this page · raw message

drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c +51 -53

287 lines not on this page · raw message

drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c +36 -36

182 lines not on this page · raw message

drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c +12 -12
index ebc1534..20e89b0 100644
@@ -16,10 +16,10 @@
  *	data[2] : Time Unit
  *	data[3] : Reload Value
  */
-static int i_APCI3501_ConfigTimerCounterWatchdog(struct comedi_device *dev,
-						 struct comedi_subdevice *s,
-						 struct comedi_insn *insn,
-						 unsigned int *data)
+static int apci3501_config_insn_timer(struct comedi_device *dev,
+				      struct comedi_subdevice *s,
+				      struct comedi_insn *insn,
+				      unsigned int *data)
 {
 	struct apci3501_private *devpriv = dev->private;
 	unsigned int ul_Command1 = 0;
@@ -86,10 +86,10 @@ static int i_APCI3501_ConfigTimerCounterWatchdog(struct comedi_device *dev,
  *		  0 Stop
  *		  2 Trigger
  */
-static int i_APCI3501_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev,
-							 struct comedi_subdevice *s,
-							 struct comedi_insn *insn,
-							 unsigned int *data)
+static int apci3501_write_insn_timer(struct comedi_device *dev,
+				     struct comedi_subdevice *s,
+				     struct comedi_insn *insn,
+				     unsigned int *data)
 {
 	struct apci3501_private *devpriv = dev->private;
 	unsigned int ul_Command1 = 0;
@@ -153,10 +153,10 @@ static int i_APCI3501_StartStopWriteTimerCounterWatchdog(struct comedi_device *d
  *		  2 Watchdog
  *	data[1] : Timer Counter Watchdog Number
  */
-static int i_APCI3501_ReadTimerCounterWatchdog(struct comedi_device *dev,
-					       struct comedi_subdevice *s,
-					       struct comedi_insn *insn,
-					       unsigned int *data)
+static int apci3501_read_insn_timer(struct comedi_device *dev,
+				    struct comedi_subdevice *s,
+				    struct comedi_insn *insn,
+				    unsigned int *data)
 {
 	struct apci3501_private *devpriv = dev->private;
 
drivers/staging/comedi/drivers/addi_apci_035.c +7 -7
index ccd4921..4da9db3 100644
@@ -27,13 +27,13 @@ static const struct addi_board apci035_boardtypes[] = {
 		.i_Timer		= 1,
 		.ui_MinAcquisitiontimeNs = 10000,
 		.ui_MinDelaytimeNs	= 100000,
-		.interrupt		= v_APCI035_Interrupt,
-		.reset			= i_APCI035_Reset,
-		.ai_config		= i_APCI035_ConfigAnalogInput,
-		.ai_read		= i_APCI035_ReadAnalogInput,
-		.timer_config		= i_APCI035_ConfigTimerWatchdog,
-		.timer_write		= i_APCI035_StartStopWriteTimerWatchdog,
-		.timer_read		= i_APCI035_ReadTimerWatchdog,
+		.interrupt		= apci035_interrupt,
+		.reset			= apci035_reset,
+		.ai_config		= apci035_ai_config,
+		.ai_read		= apci035_ai_read,
+		.timer_config		= apci035_timer_config,
+		.timer_write		= apci035_timer_write,
+		.timer_read		= apci035_timer_read,
 	},
 };
 
drivers/staging/comedi/drivers/addi_apci_1500.c +12 -12
index afa7d6e..bd8e08c 100644
@@ -20,19 +20,19 @@ static const struct addi_board apci1500_boardtypes[] = {
 		.i_NbrDoChannel		= 16,
 		.i_DoMaxdata		= 0xffff,
 		.i_Timer		= 1,
-		.interrupt		= v_APCI1500_Interrupt,
-		.reset			= i_APCI1500_Reset,
-		.di_config		= i_APCI1500_ConfigDigitalInputEvent,
-		.di_read		= i_APCI1500_Initialisation,
-		.di_write		= i_APCI1500_StartStopInputEvent,
+		.interrupt		= apci1500_interrupt,
+		.reset			= apci1500_reset,
+		.di_config		= apci1500_di_config,
+		.di_read		= apci1500_di_read,
+		.di_write		= apci1500_di_write,
 		.di_bits		= apci1500_di_insn_bits,
-		.do_config		= i_acpi1500_config_output,
-		.do_write		= i_APCI1500_WriteDigitalOutput,
-		.do_bits		= i_APCI1500_ConfigureInterrupt,
-		.timer_config		= i_APCI1500_ConfigCounterTimerWatchdog,
-		.timer_write		= i_apci1500_timer_watchdog,
-		.timer_read		= i_APCI1500_ReadInterruptMask,
-		.timer_bits		= i_APCI1500_ReadCounterTimerWatchdog,
+		.do_config		= apci1500_do_config,
+		.do_write		= apci1500_do_write,
+		.do_bits		= apci1500_do_bits,
+		.timer_config		= apci1500_timer_config,
+		.timer_write		= apci1500_timer_write,
+		.timer_read		= apci1500_timer_read,
+		.timer_bits		= apci1500_timer_bits,
 	},
 };
 
drivers/staging/comedi/drivers/addi_apci_1564.c +8 -8
index 6248284..27aa9ae 100644
@@ -21,16 +21,16 @@ static const struct addi_board apci1564_boardtypes[] = {
 		.i_NbrDoChannel		= 32,
 		.i_DoMaxdata		= 0xffffffff,
 		.i_Timer		= 1,
-		.interrupt		= v_APCI1564_Interrupt,
-		.reset			= i_APCI1564_Reset,
-		.di_config		= i_APCI1564_ConfigDigitalInput,
+		.interrupt		= apci1564_interrupt,
+		.reset			= apci1564_reset,
+		.di_config		= apci1564_di_config,
 		.di_bits		= apci1564_di_insn_bits,
-		.do_config		= i_APCI1564_ConfigDigitalOutput,
+		.do_config		= apci1564_do_config,
 		.do_bits		= apci1564_do_insn_bits,
-		.do_read		= i_APCI1564_ReadInterruptStatus,
-		.timer_config		= i_APCI1564_ConfigTimerCounterWatchdog,
-		.timer_write		= i_APCI1564_StartStopWriteTimerCounterWatchdog,
-		.timer_read		= i_APCI1564_ReadTimerCounterWatchdog,
+		.do_read		= apci1564_do_read,
+		.timer_config		= apci1564_timer_config,
+		.timer_write		= apci1564_timer_write,
+		.timer_read		= apci1564_timer_read,
 	},
 };
 
drivers/staging/comedi/drivers/addi_apci_3120.c +13 -13
index 1e6fa56..57ee6e5 100644
@@ -26,7 +26,7 @@ static const struct addi_board apci3120_boardtypes[] = {
 		.i_NbrDiChannel		= 4,
 		.i_NbrDoChannel		= 4,
 		.i_DoMaxdata		= 0x0f,
-		.interrupt		= v_APCI3120_Interrupt,
+		.interrupt		= apci3120_interrupt,
 	},
 	[BOARD_APCI3001] = {
 		.pc_DriverName		= "apci3001",
@@ -37,7 +37,7 @@ static const struct addi_board apci3120_boardtypes[] = {
 		.i_NbrDiChannel		= 4,
 		.i_NbrDoChannel		= 4,
 		.i_DoMaxdata		= 0x0f,
-		.interrupt		= v_APCI3120_Interrupt,
+		.interrupt		= apci3120_interrupt,
 	},
 };
 
@@ -136,11 +136,11 @@ static int apci3120_auto_attach(struct comedi_device *dev,
 	s->len_chanlist = this_board->i_AiChannelList;
 	s->range_table = &range_apci3120_ai;
 
-	s->insn_config = i_APCI3120_InsnConfigAnalogInput;
-	s->insn_read = i_APCI3120_InsnReadAnalogInput;
-	s->do_cmdtest = i_APCI3120_CommandTestAnalogInput;
-	s->do_cmd = i_APCI3120_CommandAnalogInput;
-	s->cancel = i_APCI3120_StopCyclicAcquisition;
+	s->insn_config = apci3120_ai_insn_config;
+	s->insn_read = apci3120_ai_insn_read;
+	s->do_cmdtest = apci3120_ai_cmdtest;
+	s->do_cmd = apci3120_ai_cmd;
+	s->cancel = apci3120_cancel;
 
 	/*  Allocate and Initialise AO Subdevice Structures */
 	s = &dev->subdevices[1];
@@ -151,7 +151,7 @@ static int apci3120_auto_attach(struct comedi_device *dev,
 		s->maxdata = this_board->i_AoMaxdata;
 		s->len_chanlist = this_board->i_NbrAoChannel;
 		s->range_table = &range_apci3120_ao;
-		s->insn_write = i_APCI3120_InsnWriteAnalogOutput;
+		s->insn_write = apci3120_ao_insn_write;
 	} else {
 		s->type = COMEDI_SUBD_UNUSED;
 	}
@@ -186,11 +186,11 @@ static int apci3120_auto_attach(struct comedi_device *dev,
 	s->len_chanlist = 1;
 	s->range_table = &range_digital;
 
-	s->insn_write = i_APCI3120_InsnWriteTimer;
-	s->insn_read = i_APCI3120_InsnReadTimer;
-	s->insn_config = i_APCI3120_InsnConfigTimer;
+	s->insn_write = apci3120_write_insn_timer;
+	s->insn_read = apci3120_read_insn_timer;
+	s->insn_config = apci3120_config_insn_timer;
 
-	i_APCI3120_Reset(dev);
+	apci3120_reset(dev);
 	return 0;
 }
 
@@ -200,7 +200,7 @@ static void apci3120_detach(struct comedi_device *dev)
 
 	if (devpriv) {
 		if (dev->iobase)
-			i_APCI3120_Reset(dev);
+			apci3120_reset(dev);
 		if (dev->irq)
 			free_irq(dev->irq, dev);
 		if (devpriv->ul_DmaBufferVirtual[0]) {
drivers/staging/comedi/drivers/addi_apci_3200.c +18 -18
index 9868a53..f0f891a 100644
@@ -43,15 +43,15 @@ static const struct addi_board apci3200_boardtypes[] = {
 		.i_NbrDoChannel		= 4,
 		.ui_MinAcquisitiontimeNs = 10000,
 		.ui_MinDelaytimeNs	= 100000,
-		.interrupt		= v_APCI3200_Interrupt,
-		.reset			= i_APCI3200_Reset,
-		.ai_config		= i_APCI3200_ConfigAnalogInput,
-		.ai_read		= i_APCI3200_ReadAnalogInput,
-		.ai_write		= i_APCI3200_InsnWriteReleaseAnalogInput,
-		.ai_bits		= i_APCI3200_InsnBits_AnalogInput_Test,
-		.ai_cmdtest		= i_APCI3200_CommandTestAnalogInput,
-		.ai_cmd			= i_APCI3200_CommandAnalogInput,
-		.ai_cancel		= i_APCI3200_StopCyclicAcquisition,
+		.interrupt		= apci3200_interrupt,
+		.reset			= apci3200_reset,
+		.ai_config		= apci3200_ai_config,
+		.ai_read		= apci3200_ai_read,
+		.ai_write		= apci3200_ai_write,
+		.ai_bits		= apci3200_ai_bits_test,
+		.ai_cmdtest		= apci3200_ai_cmdtest,
+		.ai_cmd			= apci3200_ai_cmd,
+		.ai_cancel		= apci3200_cancel,
 		.di_bits		= apci3200_di_insn_bits,
 		.do_bits		= apci3200_do_insn_bits,
 	},
@@ -68,15 +68,15 @@ static const struct addi_board apci3200_boardtypes[] = {
 		.i_NbrDoChannel		= 4,
 		.ui_MinAcquisitiontimeNs = 10000,
 		.ui_MinDelaytimeNs	= 100000,
-		.interrupt		= v_APCI3200_Interrupt,
-		.reset			= i_APCI3200_Reset,
-		.ai_config		= i_APCI3200_ConfigAnalogInput,
-		.ai_read		= i_APCI3200_ReadAnalogInput,
-		.ai_write		= i_APCI3200_InsnWriteReleaseAnalogInput,
-		.ai_bits		= i_APCI3200_InsnBits_AnalogInput_Test,
-		.ai_cmdtest		= i_APCI3200_CommandTestAnalogInput,
-		.ai_cmd			= i_APCI3200_CommandAnalogInput,
-		.ai_cancel		= i_APCI3200_StopCyclicAcquisition,
+		.interrupt		= apci3200_interrupt,
+		.reset			= apci3200_reset,
+		.ai_config		= apci3200_ai_config,
+		.ai_read		= apci3200_ai_read,
+		.ai_write		= apci3200_ai_write,
+		.ai_bits		= apci3200_ai_bits_test,
+		.ai_cmdtest		= apci3200_ai_cmdtest,
+		.ai_cmd			= apci3200_ai_cmd,
+		.ai_cancel		= apci3200_cancel,
 		.di_bits		= apci3200_di_insn_bits,
 		.do_bits		= apci3200_do_insn_bits,
 	},
drivers/staging/comedi/drivers/addi_apci_3501.c +3 -3
index 4cb69ec..49bf1fb 100644
@@ -390,9 +390,9 @@ static int apci3501_auto_attach(struct comedi_device *dev,
 	s->maxdata = 0;
 	s->len_chanlist = 1;
 	s->range_table = &range_digital;
-	s->insn_write = i_APCI3501_StartStopWriteTimerCounterWatchdog;
-	s->insn_read = i_APCI3501_ReadTimerCounterWatchdog;
-	s->insn_config = i_APCI3501_ConfigTimerCounterWatchdog;
+	s->insn_write = apci3501_write_insn_timer;
+	s->insn_read = apci3501_read_insn_timer;
+	s->insn_config = apci3501_config_insn_timer;
 
 	/* Initialize the eeprom subdevice */
 	s = &dev->subdevices[4];
Signature · 1 line
1.8.5.3
Reviewed-by H Hartley Sweeten on v3 1/2
#8 lore raw

RE: [PATCH v3 1/2] Staging: comedi: addi-data: Fix long CamelCase function names

Quoted 4 lines · Fred Akers

This patch fixes a few function names that are very long and are not in the correct naming style

Quoted 14 lines
---
 .../comedi/drivers/addi-data/hwdrv_apci035.c       |  58 +++++------
 .../comedi/drivers/addi-data/hwdrv_apci1500.c      | 106 +++++++++++----------
 .../comedi/drivers/addi-data/hwdrv_apci1564.c      |  68 ++++++-------
 .../comedi/drivers/addi-data/hwdrv_apci3120.c      | 104 ++++++++++----------
 .../comedi/drivers/addi-data/hwdrv_apci3200.c      |  72 +++++++-------
 .../comedi/drivers/addi-data/hwdrv_apci3501.c      |  24 ++---
 drivers/staging/comedi/drivers/addi_apci_035.c     |  14 +--
 drivers/staging/comedi/drivers/addi_apci_1500.c    |  24 ++---
 drivers/staging/comedi/drivers/addi_apci_1564.c    |  16 ++--
 drivers/staging/comedi/drivers/addi_apci_3120.c    |  26 ++---
 drivers/staging/comedi/drivers/addi_apci_3200.c    |  36 +++----
 drivers/staging/comedi/drivers/addi_apci_3501.c    |   6 +-
 12 files changed, 277 insertions(+), 277 deletions(-)

This looks fine but I cannot get this or patch 2/2 to apply...

Assuming it applies cleanly to Greg's tree and you compile tested it, for both patches:

#9 lore raw

RE: [PATCH v3 1/2] Staging: comedi: addi-data: Fix long CamelCase function names

In reply to Fred Akers
Quoted 4 lines · Fred Akers

This patch fixes a few function names that are very long and are not in the correct naming style

Fred,

I pulled Greg's staging tree to see if your patches apply.

Patch 1/2 is ok but patch 2/2 does not apply:

Applying: Staging: Comedi: addi-data: Clean up function comments
error: patch failed: drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c:1
error: drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c: patch does not apply
error: patch failed: drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c:1
error: drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c: patch does not apply
error: patch failed: drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c:1
error: drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c: patch does not apply Patch failed at 0001 Staging: Comedi: addi-data: Clean up function comments

Maybe Greg will have better luck.

Regards,
Hartley

author
#10 lore raw

Re: [PATCH v3 1/2] Staging: comedi: addi-data: Fix long CamelCase function names

Quoted 25 lines · Hartley Sweeten
Quoted 4 lines · Fred Akers

This patch fixes a few function names that are very long and are not in the correct naming style

Fred,

I pulled Greg's staging tree to see if your patches apply.

Patch 1/2 is ok but patch 2/2 does not apply:

Applying: Staging: Comedi: addi-data: Clean up function comments
error: patch failed:
drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c:1 error:
drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c: patch does not apply error: patch failed:
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c:1 error:
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c: patch does not apply error: patch failed:
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c:1 error:
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c: patch does not apply Patch failed at 0001 Staging: Comedi: addi-data: Clean up function comments

Quoted 4 lines

Maybe Greg will have better luck.

Regards,
Hartley

I think maybe the character encoding may have upset something? I'll wait and see if Greg has any luck.

#11 lore raw

Re: [PATCH v3 1/2] Staging: comedi: addi-data: Fix long CamelCase function names

In reply to Hartley Sweeten
Quoted 21 lines · Hartley Sweeten
Quoted 4 lines · Fred Akers

This patch fixes a few function names that are very long and are not in the correct naming style

Fred,

I pulled Greg's staging tree to see if your patches apply.

Patch 1/2 is ok but patch 2/2 does not apply:

Applying: Staging: Comedi: addi-data: Clean up function comments
error: patch failed: drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c:1
error: drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c: patch does not apply
error: patch failed: drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c:1
error: drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c: patch does not apply
error: patch failed: drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c:1
error: drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c: patch does not apply Patch failed at 0001 Staging: Comedi: addi-data: Clean up function comments

Quoted 5 lines

Maybe Greg will have better luck.

Regards,
Hartley

FWIW, I managed to apply them, but mainly because our internal MS Exchange server (which often messes up patches) is down, so I'm having to deliver the mail to a "proper" mail server. :)

(Also, the patches in the driverdev-devel archive don't apply as-is, partly because it replaces '@' with ' at ', and partly because it replaces the ezsett character in 'Dieselstraße' with a question mark '?'.)

Signature · 2 lines
-=( Ian Abbott @ MEV Ltd.    E-mail: <[email protected]>        )=-
-=( Tel: +44 (0)161 477 1898   FAX: +44 (0)161 718 3587         )=-
author
#12 lore raw

PATCH v3 2/2 Staging: Comedi: addi-data: Clean up function comments

In reply to Fred Akers

These comments look terrible and are full of redundant information. Also reformat the license at the head of the file to wrap at 80 char.

---
Sorry, I was not able to reorder thess commits :-(

---
 .../comedi/drivers/addi-data/hwdrv_apci035.c       | 292 ++++---------
 .../comedi/drivers/addi-data/hwdrv_apci1500.c      | 463 ++++-----------------
 .../comedi/drivers/addi-data/hwdrv_apci1564.c      | 269 +++---------
 3 files changed, 213 insertions(+), 811 deletions(-)
drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c +71 -221
index 2c9fe1f..28450f6 100644
@@ -1,46 +1,24 @@
-/**
-@verbatim
-
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
-
-	ADDI-DATA GmbH
-	Dieselstrasse 3
-	D-77833 Ottersweier
-	Tel: +19(0)7223/9493-0
-	Fax: +49(0)7223/9493-92
-	http://www.addi-data.com
-	[email protected]
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-@endverbatim
-*/
 /*
-
-  +-----------------------------------------------------------------------+
-  | (C) ADDI-DATA GmbH          Dieselstraße 3       D-77833 Ottersweier  |
-  +-----------------------------------------------------------------------+
-  | Tel : +49 (0) 7223/9493-0     | email    : [email protected]         |
-  | Fax : +49 (0) 7223/9493-92    | Internet : http://www.addi-data.com   |
-  +-------------------------------+---------------------------------------+
-  | Project     : APCI-035        | Compiler   : GCC                      |
-  | Module name : hwdrv_apci035.c | Version    : 2.96                     |
-  +-------------------------------+---------------------------------------+
-  | Project manager: Eric Stolz   | Date       :  02/12/2002              |
-  +-------------------------------+---------------------------------------+
-  | Description :   Hardware Layer Access For APCI-035                    |
-  +-----------------------------------------------------------------------+
-  |                             UPDATES                                   |
-  +----------+-----------+------------------------------------------------+
-  |   Date   |   Author  |          Description of updates                |
-  +----------+-----------+------------------------------------------------+
-  |          |           |                                                |
-  |          |           |                                                |
-  |          |           |                                                |
-  +----------+-----------+------------------------------------------------+
-*/
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *
+ *	ADDI-DATA GmbH
+ *	Dieselstrasse 3
+ *	D-77833 Ottersweier
+ *	Tel: +19(0)7223/9493-0
+ *	Fax: +49(0)7223/9493-92
+ *	http://www.addi-data.com
+ *	[email protected]
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ */
 
 /* Card Specific information */
 #define APCI035_ADDRESS_RANGE		255
@@ -109,60 +87,32 @@ static struct comedi_lrange range_apci035_ai = {
 static int i_WatchdogNbr;
 static int i_Temp;
 static int i_Flag = 1;
+
 /*
-+----------------------------------------------------------------------------+
-| Function   Name   : int apci035_timer_config                      |
-|			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              : Configures The Timer , Counter or Watchdog             |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev : Driver handle                     |
-|                     unsigned int *data         : Data Pointer contains             |
-|                                          configuration parameters as below |
-|                                                                            |
-|					  data[0]            : 0 Configure As Timer      |
-|										   1 Configure As Watchdog   |
-|                                         data[1]            : Watchdog number
-|					  data[2]            : Time base Unit            |
-|					  data[3]			 : Reload Value			     |
-|                                         data[4]            : External Trigger          |
-|                                                              1:Enable
-|                                                           0:Disable
-|                              data[5]            :External Trigger Level
-|                                                  00 Trigger Disabled
-|                                                  01 Trigger Enabled (Low level)
-|                                                  10 Trigger Enabled (High Level)
-|                                                  11 Trigger Enabled (High/Low level)
-|                              data[6]            : External Gate            |
-|                                                   1:Enable
-|                                                   0:Disable
-|                              data[7]            : External Gate level
-|                                                  00 Gate Disabled
-|                                                  01 Gate Enabled (Low level)
-|                                                  10 Gate Enabled (High Level)
-|                              data[8]            :Warning Relay
-|                                                  1: ENABLE
-|                                                  0: DISABLE
-|                              data[9]            :Warning Delay available
-|                              data[10]           :Warning Relay Time unit
-|                              data[11]           :Warning Relay Time Reload value
-|                              data[12]           :Reset Relay
-|                                                  1 : ENABLE
-|                                                  0 : DISABLE
-|                              data[13]           :Interrupt
-|                                                  1 : ENABLE
-|                                                  0 : DISABLE
-|
-|
-+----------------------------------------------------------------------------+
-| Output Parameters :	--													 |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|		            : FALSE : Error occur. Return the error          |
-|			                                                         |
-+----------------------------------------------------------------------------+
-*/
+ * Configures The Timer , Counter or Watchdog
+ *
+ * data[0] 0 = Configure As Timer, 1 = Configure As Watchdog
+ * data[1] Watchdog number
+ * data[2] Time base Unit
+ * data[3] Reload Value
+ * data[4] External Trigger, 1 = Enable, 0 = Disable
+ * data[5] External Trigger Level
+ *	00 = Trigger Disabled
+ *	01 = Trigger Enabled (Low level)
+ *	10 = Trigger Enabled (High Level)
+ *	11 = Trigger Enabled (High/Low level)
+ * data[6] External Gate, 1 = Enable, 0 = Disable
+ * data[7] External Gate level
+ *	00 = Gate Disabled
+ *	01 = Gate Enabled (Low level)
+ *	10 = Gate Enabled (High Level)
+ * data[8] Warning Relay, 1 = Enable, 0 = Disable
+ * data[9] Warning Delay available
+ * data[10] Warning Relay Time unit
+ * data[11] Warning Relay Time Reload value
+ * data[12] Reset Relay, 1 = Enable, 0 = Disable
+ * data[13] Interrupt, 1 = Enable, 0 = Disable
+ */
 static int apci035_timer_config(struct comedi_device *dev,
 				struct comedi_subdevice *s,
 				struct comedi_insn *insn,
@@ -286,32 +236,16 @@ static int apci035_timer_config(struct comedi_device *dev,
 }
 
 /*
-+----------------------------------------------------------------------------+
-| Function   Name   : int apci035_timer_write              |
-|			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              : Start / Stop The Selected Timer , or Watchdog  |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev : Driver handle                     |
-|                     unsigned int *data         : Data Pointer contains             |
-|                                          configuration parameters as below |
-|					                                                 |
-|					  data[0] : 0 - Stop Selected Timer/Watchdog     |
-|					            1 - Start Selected Timer/Watchdog    |
-|					            2 - Trigger Selected Timer/Watchdog  |
-|					            3 - Stop All Timer/Watchdog          |
-|					            4 - Start All Timer/Watchdog         |
-|					            5 - Trigger All Timer/Watchdog       |
-|					                                                 |
-+----------------------------------------------------------------------------+
-| Output Parameters :	--													 |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|		            : FALSE : Error occur. Return the error			 |
-|					                                                 |
-+----------------------------------------------------------------------------+
-*/
+ * Start / Stop The Selected Timer , or Watchdog
+ *
+ * data[0]
+ *	0 - Stop Selected Timer/Watchdog
+ *	1 - Start Selected Timer/Watch*dog
+ *	2 - Trigger Selected Timer/Watchdog
+ *	3 - Stop All Timer/Watchdog
+ *	4 - Start All Timer/Watchdog
+ *	5 - Trigger All Timer/Watchdog
+ */
 static int apci035_timer_write(struct comedi_device *dev,
 			       struct comedi_subdevice *s,
 			       struct comedi_insn *insn,
@@ -401,32 +335,14 @@ static int apci035_timer_write(struct comedi_device *dev,
 }
 
 /*
-+----------------------------------------------------------------------------+
-| Function   Name   : int apci035_timer_read                        |
-|			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              : Read The Selected Timer , Counter or Watchdog          |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev : Driver handle                     |
-|                     unsigned int *data         : Data Pointer contains             |
-|                                          configuration parameters as below |
-|                                                                            |
-|     																	 |
-+----------------------------------------------------------------------------+
-| Output Parameters :	data[0]            : software trigger status
-|                       data[1]            : hardware trigger status
-|     	  	        data[2]            : Software clear status
-|                       data[3]            : Overflow status
-|                       data[4]            : Timer actual value
-|
-
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|		            : FALSE : Error occur. Return the error          |
-|			                                                         |
-+----------------------------------------------------------------------------+
-*/
+ * Read The Selected Timer , Counter or Watchdog
+ *
+ * data[0] software trigger status
+ * data[1] hardware trigger status
+ * data[2] Software clear status
+ * data[3] Overflow status
+ * data[4] Timer actual value
+ */
 static int apci035_timer_read(struct comedi_device *dev,
 			      struct comedi_subdevice *s,
 			      struct comedi_insn *insn,
@@ -458,28 +374,10 @@ static int apci035_timer_read(struct comedi_device *dev,
 }
 
 /*
-+----------------------------------------------------------------------------+
-| Function   Name   : int apci035_ai_config                        |
-|			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              : Configures The Analog Input Subdevice                  |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     struct comedi_subdevice *s     : Subdevice Pointer            |
-|                     struct comedi_insn *insn       : Insn Structure Pointer       |
-|                     unsigned int *data          : Data Pointer contains        |
-|                                          configuration parameters as below |
-|                     data[0]                  : Warning delay value
-|                                                                            |
-+----------------------------------------------------------------------------+
-| Output Parameters :	--													 |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|		            : FALSE : Error occur. Return the error          |
-|			                                                         |
-+----------------------------------------------------------------------------+
-*/
+ * Configures The Analog Input Subdevice
+ *
+ * data[0] Warning delay value
+ */
 static int apci035_ai_config(struct comedi_device *dev,
 			     struct comedi_subdevice *s,
 			     struct comedi_insn *insn,
@@ -500,26 +398,10 @@ static int apci035_ai_config(struct comedi_device *dev,
 }
 
 /*
-+----------------------------------------------------------------------------+
-| Function   Name   : int apci035_ai_read                          |
-|			          (struct comedi_device *dev,struct comedi_subdevice *s,       |
-|                     struct comedi_insn *insn,unsigned int *data)                      |
-+----------------------------------------------------------------------------+
-| Task              : Read  value  of the selected channel			         |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     unsigned int ui_NoOfChannels    : No Of Channels To read       |
-|                     unsigned int *data              : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :	--													 |
-|			          data[0]  : Digital Value Of Input              |
-|			                                                         |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|		            : FALSE : Error occur. Return the error          |
-|			                                                         |
-+----------------------------------------------------------------------------+
-*/
+ * Read value of the selected channel
+ *
+ * data[0] Digital Value Of Input
+ */
 static int apci035_ai_read(struct comedi_device *dev,
 			   struct comedi_subdevice *s,
 			   struct comedi_insn *insn,
@@ -539,21 +421,6 @@ static int apci035_ai_read(struct comedi_device *dev,
 	return insn->n;
 }
 
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   :  int apci035_reset(struct comedi_device *dev)
-|					                                                         |
-+----------------------------------------------------------------------------+
-| Task              :Resets the registers of the card                        |
-+----------------------------------------------------------------------------+
-| Input Parameters  :                                                        |
-+----------------------------------------------------------------------------+
-| Output Parameters :	--													 |
-+----------------------------------------------------------------------------+
-| Return Value      :                                                        |
-|			                                                                 |
-+----------------------------------------------------------------------------+
-*/
 static int apci035_reset(struct comedi_device *dev)
 {
 	struct addi_private *devpriv = dev->private;
@@ -570,23 +437,6 @@ static int apci035_reset(struct comedi_device *dev)
 	return 0;
 }
 
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : static void apci035_interrupt
-|					  (int irq , void *d)      |
-+----------------------------------------------------------------------------+
-| Task              : Interrupt processing Routine                           |
-+----------------------------------------------------------------------------+
-| Input Parameters  : int irq                 : irq number                   |
-|                     void *d                 : void pointer                 |
-+----------------------------------------------------------------------------+
-| Output Parameters :	--													 |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|		            : FALSE : Error occur. Return the error          |
-|			                                                         |
-+----------------------------------------------------------------------------+
-*/
 static void apci035_interrupt(int irq, void *d)
 {
 	struct comedi_device *dev = d;
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c +88 -375

539 lines not on this page · raw message

drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c +54 -215

321 lines not on this page · raw message

Signature · 1 line
1.8.5.3