projects / cascardo / linux.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Staging: comedi: fix "foo * bar" should be "foo *bar"
[cascardo/linux.git] / drivers / staging / comedi / drivers / addi-data / hwdrv_apci2032.c
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c
index 82e50d9..ad91b7b 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c
@@ -53,7 +53,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
 */
 
 #include "hwdrv_apci2032.h"
-UINT ui_InterruptData, ui_Type;
+unsigned int ui_InterruptData, ui_Type;
 /*
 +----------------------------------------------------------------------------+
 | Function   Name   : int i_APCI2032_ConfigDigitalOutput                     |
@@ -63,7 +63,7 @@ UINT ui_InterruptData, ui_Type;
 | Task              : Configures The Digital Output Subdevice.               |
 +----------------------------------------------------------------------------+
 | Input Parameters  : struct comedi_device *dev : Driver handle                     |
-|                     UINT *data         : Data Pointer contains             |
+|                     unsigned int *data         : Data Pointer contains             |
 |                                          configuration parameters as below |
 |                                                                            |
 |                                        data[1]            : 1 Enable  VCC  Interrupt  |
@@ -79,36 +79,36 @@ UINT ui_InterruptData, ui_Type;
 |                                                                               |
 +----------------------------------------------------------------------------+
 */
-int i_APCI2032_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data)
+int i_APCI2032_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
+       struct comedi_insn *insn, unsigned int *data)
 {
-       ULONG ul_Command = 0;
+       unsigned int ul_Command = 0;
        devpriv->tsk_Current = current;
 
        if ((data[0] != 0) && (data[0] != 1)) {
                comedi_error(dev,
                        "Not a valid Data !!! ,Data should be 1 or 0\n");
                return -EINVAL;
-       }                       //if  ( (data[0]!=0) && (data[0]!=1) )
+       }                       /* if  ( (data[0]!=0) && (data[0]!=1) ) */
        if (data[0]) {
                devpriv->b_OutputMemoryStatus = ADDIDATA_ENABLE;
-       }                       // if  (data[0])
+       }                       /*  if  (data[0]) */
        else {
                devpriv->b_OutputMemoryStatus = ADDIDATA_DISABLE;
-       }                       //else if  (data[0])
+       }                       /* else if  (data[0]) */
 
        if (data[1] == ADDIDATA_ENABLE) {
                ul_Command = ul_Command | 0x1;
-       }                       //if  (data[1] == ADDIDATA_ENABLE)
+       }                       /* if  (data[1] == ADDIDATA_ENABLE) */
        else {
                ul_Command = ul_Command & 0xFFFFFFFE;
-       }                       //elseif  (data[1] == ADDIDATA_ENABLE)
+       }                       /* elseif  (data[1] == ADDIDATA_ENABLE) */
        if (data[2] == ADDIDATA_ENABLE) {
                ul_Command = ul_Command | 0x2;
-       }                       //if  (data[2] == ADDIDATA_ENABLE)
+       }                       /* if  (data[2] == ADDIDATA_ENABLE) */
        else {
                ul_Command = ul_Command & 0xFFFFFFFD;
-       }                       //elseif  (data[2] == ADDIDATA_ENABLE)
+       }                       /* elseif  (data[2] == ADDIDATA_ENABLE) */
        outl(ul_Command, devpriv->iobase + APCI2032_DIGITAL_OP_INTERRUPT);
        ui_InterruptData = inl(devpriv->iobase + APCI2032_DIGITAL_OP_INTERRUPT);
        return insn->n;
@@ -123,8 +123,8 @@ int i_APCI2032_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_sub
 | Task              : Writes port value  To the selected port                |
 +----------------------------------------------------------------------------+
 | Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     UINT ui_NoOfChannels    : No Of Channels To Write      |
-|                     UINT *data              : Data Pointer to read status  |
+|                     unsigned int ui_NoOfChannels    : No Of Channels To Write      |
+|                     unsigned int *data              : Data Pointer to read status  |
 +----------------------------------------------------------------------------+
 | Output Parameters :  --                                                                                                       |
 +----------------------------------------------------------------------------+
@@ -134,23 +134,23 @@ int i_APCI2032_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_sub
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI2032_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data)
+int i_APCI2032_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
+       struct comedi_insn *insn, unsigned int *data)
 {
-       UINT ui_Temp, ui_Temp1;
-       UINT ui_NoOfChannel = CR_CHAN(insn->chanspec);  // get the channel
+       unsigned int ui_Temp, ui_Temp1;
+       unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec);  /*  get the channel */
        if (devpriv->b_OutputMemoryStatus) {
                ui_Temp = inl(devpriv->iobase + APCI2032_DIGITAL_OP);
 
-       }                       //if(devpriv->b_OutputMemoryStatus )
+       }                       /* if(devpriv->b_OutputMemoryStatus ) */
        else {
                ui_Temp = 0;
-       }                       //if(devpriv->b_OutputMemoryStatus )
+       }                       /* if(devpriv->b_OutputMemoryStatus ) */
        if (data[3] == 0) {
                if (data[1] == 0) {
                        data[0] = (data[0] << ui_NoOfChannel) | ui_Temp;
                        outl(data[0], devpriv->iobase + APCI2032_DIGITAL_OP);
-               }               //if(data[1]==0)
+               }               /* if(data[1]==0) */
                else {
                        if (data[1] == 1) {
                                switch (ui_NoOfChannel) {
@@ -184,18 +184,18 @@ int i_APCI2032_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd
 
                                default:
                                        comedi_error(dev, " chan spec wrong");
-                                       return -EINVAL; // "sorry channel spec wrong "
+                                       return -EINVAL; /*  "sorry channel spec wrong " */
 
-                               }       //switch(ui_NoOfChannels)
+                               }       /* switch(ui_NoOfChannels) */
 
                                outl(data[0],
                                        devpriv->iobase + APCI2032_DIGITAL_OP);
-                       }       // if(data[1]==1)
+                       }       /*  if(data[1]==1) */
                        else {
                                printk("\nSpecified channel not supported\n");
-                       }       //else if(data[1]==1)
-               }               //elseif(data[1]==0)
-       }                       //if(data[3]==0)
+                       }       /* else if(data[1]==1) */
+               }               /* elseif(data[1]==0) */
+       }                       /* if(data[3]==0) */
        else {
                if (data[3] == 1) {
                        if (data[1] == 0) {
@@ -209,7 +209,7 @@ int i_APCI2032_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd
                                data[0] = data[0] & ui_Temp;
                                outl(data[0],
                                        devpriv->iobase + APCI2032_DIGITAL_OP);
-                       }       //if(data[1]==0)
+                       }       /* if(data[1]==0) */
                        else {
                                if (data[1] == 1) {
                                        switch (ui_NoOfChannel) {
@@ -272,24 +272,24 @@ int i_APCI2032_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd
                                        default:
                                                comedi_error(dev,
                                                        " chan spec wrong");
-                                               return -EINVAL; // "sorry channel spec wrong "
+                                               return -EINVAL; /*  "sorry channel spec wrong " */
 
-                                       }       //switch(ui_NoOfChannels)
+                                       }       /* switch(ui_NoOfChannels) */
 
                                        outl(data[0],
                                                devpriv->iobase +
                                                APCI2032_DIGITAL_OP);
-                               }       // if(data[1]==1)
+                               }       /*  if(data[1]==1) */
                                else {
                                        printk("\nSpecified channel not supported\n");
-                               }       //else if(data[1]==1)
-                       }       //elseif(data[1]==0)
-               }               //if(data[3]==1);
+                               }       /* else if(data[1]==1) */
+                       }       /* elseif(data[1]==0) */
+               }               /* if(data[3]==1); */
                else {
                        printk("\nSpecified functionality does not exist\n");
                        return -EINVAL;
-               }               //if else data[3]==1)
-       }                       //if else data[3]==0)
+               }               /* if else data[3]==1) */
+       }                       /* if else data[3]==0) */
        return (insn->n);;
 }
 
@@ -302,8 +302,8 @@ int i_APCI2032_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd
 | Task              : Read  value  of the selected channel or port           |
 +----------------------------------------------------------------------------+
 | Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     UINT ui_NoOfChannels    : No Of Channels To read       |
-|                     UINT *data              : Data Pointer to read status  |
+|                     unsigned int ui_NoOfChannels    : No Of Channels To read       |
+|                     unsigned int *data              : Data Pointer to read status  |
 +----------------------------------------------------------------------------+
 | Output Parameters :  --                                                                                                       |
 +----------------------------------------------------------------------------+
@@ -313,17 +313,17 @@ int i_APCI2032_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI2032_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data)
+int i_APCI2032_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
+       struct comedi_insn *insn, unsigned int *data)
 {
-       UINT ui_Temp;
-       UINT ui_NoOfChannel;
+       unsigned int ui_Temp;
+       unsigned int ui_NoOfChannel;
        ui_NoOfChannel = CR_CHAN(insn->chanspec);
        ui_Temp = data[0];
        *data = inl(devpriv->iobase + APCI2032_DIGITAL_OP_RW);
        if (ui_Temp == 0) {
                *data = (*data >> ui_NoOfChannel) & 0x1;
-       }                       //if  (ui_Temp==0)
+       }                       /* if  (ui_Temp==0) */
        else {
                if (ui_Temp == 1) {
                        switch (ui_NoOfChannel) {
@@ -349,13 +349,13 @@ int i_APCI2032_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subde
 
                        default:
                                comedi_error(dev, " chan spec wrong");
-                               return -EINVAL; // "sorry channel spec wrong "
+                               return -EINVAL; /*  "sorry channel spec wrong " */
 
-                       }       //switch(ui_NoOfChannels)
-               }               //if  (ui_Temp==1)
+                       }       /* switch(ui_NoOfChannels) */
+               }               /* if  (ui_Temp==1) */
                else {
                        printk("\nSpecified channel not supported \n");
-               }               //elseif  (ui_Temp==1)
+               }               /* elseif  (ui_Temp==1) */
        }
        return insn->n;
 }
@@ -380,15 +380,15 @@ int i_APCI2032_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subde
 |                                                                               |
 +----------------------------------------------------------------------------+
 */
-int i_APCI2032_ConfigWatchdog(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data)
+int i_APCI2032_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
+       struct comedi_insn *insn, unsigned int *data)
 {
        if (data[0] == 0) {
-               //Disable the watchdog
+               /* Disable the watchdog */
                outl(0x0,
                        devpriv->iobase + APCI2032_DIGITAL_OP_WATCHDOG +
                        APCI2032_TCW_PROG);
-               //Loading the Reload value
+               /* Loading the Reload value */
                outl(data[1],
                        devpriv->iobase + APCI2032_DIGITAL_OP_WATCHDOG +
                        APCI2032_TCW_RELOAD_VALUE);
@@ -421,19 +421,19 @@ int i_APCI2032_ConfigWatchdog(struct comedi_device * dev, struct comedi_subdevic
     +----------------------------------------------------------------------------+
   */
 
-int i_APCI2032_StartStopWriteWatchdog(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data)
+int i_APCI2032_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
+       struct comedi_insn *insn, unsigned int *data)
 {
        switch (data[0]) {
-       case 0:         //stop the watchdog
-               outl(0x0, devpriv->iobase + APCI2032_DIGITAL_OP_WATCHDOG + APCI2032_TCW_PROG);  //disable the watchdog
+       case 0:         /* stop the watchdog */
+               outl(0x0, devpriv->iobase + APCI2032_DIGITAL_OP_WATCHDOG + APCI2032_TCW_PROG);  /* disable the watchdog */
                break;
-       case 1:         //start the watchdog
+       case 1:         /* start the watchdog */
                outl(0x0001,
                        devpriv->iobase + APCI2032_DIGITAL_OP_WATCHDOG +
                        APCI2032_TCW_PROG);
                break;
-       case 2:         //Software trigger
+       case 2:         /* Software trigger */
                outl(0x0201,
                        devpriv->iobase + APCI2032_DIGITAL_OP_WATCHDOG +
                        APCI2032_TCW_PROG);
@@ -466,8 +466,8 @@ int i_APCI2032_StartStopWriteWatchdog(struct comedi_device * dev, struct comedi_
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI2032_ReadWatchdog(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data)
+int i_APCI2032_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
+       struct comedi_insn *insn, unsigned int *data)
 {
 
        data[0] =
@@ -498,13 +498,13 @@ void v_APCI2032_Interrupt(int irq, void *d)
        struct comedi_device *dev = d;
        unsigned int ui_DO;
 
-       ui_DO = inl(devpriv->iobase + APCI2032_DIGITAL_OP_IRQ) & 0x1;   //Check if VCC OR CC interrupt has occured.
+       ui_DO = inl(devpriv->iobase + APCI2032_DIGITAL_OP_IRQ) & 0x1;   /* Check if VCC OR CC interrupt has occured. */
 
        if (ui_DO == 0) {
                printk("\nInterrupt from unKnown source\n");
-       }                       // if(ui_DO==0)
+       }                       /*  if(ui_DO==0) */
        if (ui_DO) {
-               // Check for Digital Output interrupt Type - 1: Vcc interrupt 2: CC interrupt.
+               /*  Check for Digital Output interrupt Type - 1: Vcc interrupt 2: CC interrupt. */
                ui_Type =
                        inl(devpriv->iobase +
                        APCI2032_DIGITAL_OP_INTERRUPT_STATUS) & 0x3;
@@ -512,16 +512,16 @@ void v_APCI2032_Interrupt(int irq, void *d)
                        devpriv->iobase + APCI2032_DIGITAL_OP +
                        APCI2032_DIGITAL_OP_INTERRUPT);
                if (ui_Type == 1) {
-                       //Sends signal to user space
+                       /* Sends signal to user space */
                        send_sig(SIGIO, devpriv->tsk_Current, 0);
-               }               // if (ui_Type==1)
+               }               /*  if (ui_Type==1) */
                else {
                        if (ui_Type == 2) {
-                               // Sends signal to user space
+                               /*  Sends signal to user space */
                                send_sig(SIGIO, devpriv->tsk_Current, 0);
-                       }       //if (ui_Type==2)
-               }               //else if (ui_Type==1)
-       }                       //if(ui_DO)
+                       }       /* if (ui_Type==2) */
+               }               /* else if (ui_Type==1) */
+       }                       /* if(ui_DO) */
 
        return;
 
@@ -544,8 +544,8 @@ void v_APCI2032_Interrupt(int irq, void *d)
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI2032_ReadInterruptStatus(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data)
+int i_APCI2032_ReadInterruptStatus(struct comedi_device *dev, struct comedi_subdevice *s,
+       struct comedi_insn *insn, unsigned int *data)
 {
        *data = ui_Type;
        return insn->n;
@@ -567,13 +567,13 @@ int i_APCI2032_ReadInterruptStatus(struct comedi_device * dev, struct comedi_sub
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI2032_Reset(struct comedi_device * dev)
+int i_APCI2032_Reset(struct comedi_device *dev)
 {
        devpriv->b_DigitalOutputRegister = 0;
        ui_Type = 0;
-       outl(0x0, devpriv->iobase + APCI2032_DIGITAL_OP);       //Resets the output channels
-       outl(0x0, devpriv->iobase + APCI2032_DIGITAL_OP_INTERRUPT);     //Disables the interrupt.
-       outl(0x0, devpriv->iobase + APCI2032_DIGITAL_OP_WATCHDOG + APCI2032_TCW_PROG);  //disable the watchdog
-       outl(0x0, devpriv->iobase + APCI2032_DIGITAL_OP_WATCHDOG + APCI2032_TCW_RELOAD_VALUE);  //reload=0
+       outl(0x0, devpriv->iobase + APCI2032_DIGITAL_OP);       /* Resets the output channels */
+       outl(0x0, devpriv->iobase + APCI2032_DIGITAL_OP_INTERRUPT);     /* Disables the interrupt. */
+       outl(0x0, devpriv->iobase + APCI2032_DIGITAL_OP_WATCHDOG + APCI2032_TCW_PROG);  /* disable the watchdog */
+       outl(0x0, devpriv->iobase + APCI2032_DIGITAL_OP_WATCHDOG + APCI2032_TCW_RELOAD_VALUE);  /* reload=0 */
        return 0;
 }
Unnamed repository; edit this file 'description' to name the repository.