git.openpandora.org / pandora-kernel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Staging: comedi: Remove C99 comments
[pandora-kernel.git] / drivers / staging / comedi / drivers / addi-data / hwdrv_apci1032.c
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
index 32796ce..0966ad6 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
@@ -53,8 +53,8 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
 */
 #include "hwdrv_apci1032.h"
 #include <linux/delay.h>
-//Global variables
-UINT ui_InterruptStatus = 0;
+/* Global variables */
+unsigned int ui_InterruptStatus = 0;
 
 /*
 +----------------------------------------------------------------------------+
@@ -84,13 +84,13 @@ UINT ui_InterruptStatus = 0;
 +----------------------------------------------------------------------------+
 */
 
-INT i_APCI1032_ConfigDigitalInput(struct comedi_device * dev, struct comedi_subdevice * s,
+int i_APCI1032_ConfigDigitalInput(struct comedi_device * dev, struct comedi_subdevice * s,
        struct comedi_insn * insn, unsigned int * data)
 {
-       UINT ui_TmpValue;
+       unsigned int ui_TmpValue;
 
-       ULONG ul_Command1 = 0;
-       ULONG ul_Command2 = 0;
+       unsigned int ul_Command1 = 0;
+       unsigned int ul_Command2 = 0;
        devpriv->tsk_Current = current;
 
   /*******************************/
@@ -107,11 +107,11 @@ INT i_APCI1032_ConfigDigitalInput(struct comedi_device * dev, struct comedi_subd
                        outl(0x4, devpriv->iobase + APCI1032_DIGITAL_IP_IRQ);
                        ui_TmpValue =
                                inl(devpriv->iobase + APCI1032_DIGITAL_IP_IRQ);
-               }               //if (data[1] == ADDIDATA_OR)
+               }               /* if (data[1] == ADDIDATA_OR) */
                else {
                        outl(0x6, devpriv->iobase + APCI1032_DIGITAL_IP_IRQ);
-               }               //else if(data[1] == ADDIDATA_OR)
-       }                       // if( data[0] == ADDIDATA_ENABLE)
+               }               /* else if(data[1] == ADDIDATA_OR) */
+       }                       /*  if( data[0] == ADDIDATA_ENABLE) */
        else {
                ul_Command1 = ul_Command1 & 0xFFFF0000;
                ul_Command2 = ul_Command2 & 0xFFFF0000;
@@ -120,7 +120,7 @@ INT i_APCI1032_ConfigDigitalInput(struct comedi_device * dev, struct comedi_subd
                outl(ul_Command2,
                        devpriv->iobase + APCI1032_DIGITAL_IP_INTERRUPT_MODE2);
                outl(0x0, devpriv->iobase + APCI1032_DIGITAL_IP_IRQ);
-       }                       //else if  ( data[0] == ADDIDATA_ENABLE)
+       }                       /* else if  ( data[0] == ADDIDATA_ENABLE) */
 
        return insn->n;
 }
@@ -134,7 +134,7 @@ INT i_APCI1032_ConfigDigitalInput(struct comedi_device * dev, struct comedi_subd
 | Task              : Return the status of the digital input                 |
 +----------------------------------------------------------------------------+
 | Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                            UINT ui_Channel : Channel number to read       |
+|                            unsigned int ui_Channel : Channel number to read       |
 |                     unsigned int *data          : Data Pointer to read status  |
 +----------------------------------------------------------------------------+
 | Output Parameters :  --                                                                                                       |
@@ -144,22 +144,24 @@ INT i_APCI1032_ConfigDigitalInput(struct comedi_device * dev, struct comedi_subd
 |                                                                               |
 +----------------------------------------------------------------------------+
 */
-INT i_APCI1032_Read1DigitalInput(struct comedi_device * dev, struct comedi_subdevice * s,
+int i_APCI1032_Read1DigitalInput(struct comedi_device * dev, struct comedi_subdevice * s,
        struct comedi_insn * insn, unsigned int * data)
 {
-       UINT ui_TmpValue = 0;
-       UINT ui_Channel;
+       unsigned int ui_TmpValue = 0;
+       unsigned int ui_Channel;
        ui_Channel = CR_CHAN(insn->chanspec);
        if (ui_Channel >= 0 && ui_Channel <= 31) {
-               ui_TmpValue = (UINT) inl(devpriv->iobase + APCI1032_DIGITAL_IP);
-               //  since only 1 channel reqd  to bring it to last bit it is rotated
-               //  8 +(chan - 1) times then ANDed with 1 for last bit.
+               ui_TmpValue = (unsigned int) inl(devpriv->iobase + APCI1032_DIGITAL_IP);
+/*
+* since only 1 channel reqd to bring it to last bit it is rotated 8
+* +(chan - 1) times then ANDed with 1 for last bit.
+*/
                *data = (ui_TmpValue >> ui_Channel) & 0x1;
-       }                       //if(ui_Channel >= 0 && ui_Channel <=31)
+       }                       /* if(ui_Channel >= 0 && ui_Channel <=31) */
        else {
-               //comedi_error(dev," \n chan spec wrong\n");
-               return -EINVAL; // "sorry channel spec wrong "
-       }                       //else if(ui_Channel >= 0 && ui_Channel <=31)
+               /* comedi_error(dev," \n chan spec wrong\n"); */
+               return -EINVAL; /*  "sorry channel spec wrong " */
+       }                       /* else if(ui_Channel >= 0 && ui_Channel <=31) */
        return insn->n;
 }
 
@@ -172,8 +174,8 @@ INT i_APCI1032_Read1DigitalInput(struct comedi_device * dev, struct comedi_subde
 | Task              : Return the status of the Requested digital inputs      |
 +----------------------------------------------------------------------------+
 | Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     UINT ui_NoOfChannels    : No Of Channels To be Read    |
-|                      UINT *data             : Data Pointer to read status  |
+|                     unsigned int ui_NoOfChannels    : No Of Channels To be Read    |
+|                      unsigned int *data             : Data Pointer to read status  |
 +----------------------------------------------------------------------------+
 | Output Parameters :  --                                                                                                       |
 +----------------------------------------------------------------------------+
@@ -183,16 +185,16 @@ INT i_APCI1032_Read1DigitalInput(struct comedi_device * dev, struct comedi_subde
 +----------------------------------------------------------------------------+
 */
 
-INT i_APCI1032_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_subdevice * s,
+int i_APCI1032_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_subdevice * s,
        struct comedi_insn * insn, unsigned int * data)
 {
-       UINT ui_PortValue = data[0];
-       UINT ui_Mask = 0;
-       UINT ui_NoOfChannels;
+       unsigned int ui_PortValue = data[0];
+       unsigned int ui_Mask = 0;
+       unsigned int ui_NoOfChannels;
 
        ui_NoOfChannels = CR_CHAN(insn->chanspec);
        if (data[1] == 0) {
-               *data = (UINT) inl(devpriv->iobase + APCI1032_DIGITAL_IP);
+               *data = (unsigned int) inl(devpriv->iobase + APCI1032_DIGITAL_IP);
                switch (ui_NoOfChannels) {
                case 2:
                        ui_Mask = 3;
@@ -213,16 +215,16 @@ INT i_APCI1032_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_su
                case 31:
                        break;
                default:
-                       //comedi_error(dev," \nchan spec wrong\n");
-                       return -EINVAL; // "sorry channel spec wrong "
+                       /* comedi_error(dev," \nchan spec wrong\n"); */
+                       return -EINVAL; /*  "sorry channel spec wrong " */
                        break;
-               }               //switch(ui_NoOfChannels)
-       }                       //if(data[1]==0)
+               }               /* switch(ui_NoOfChannels) */
+       }                       /* if(data[1]==0) */
        else {
                if (data[1] == 1) {
                        *data = ui_InterruptStatus;
-               }               //if(data[1]==1)
-       }                       //else if(data[1]==0)
+               }               /* if(data[1]==1) */
+       }                       /* else if(data[1]==0) */
        return insn->n;
 }
 
@@ -247,16 +249,16 @@ static void v_APCI1032_Interrupt(int irq, void *d)
 {
        struct comedi_device *dev = d;
 
-       UINT ui_Temp;
-       //disable the interrupt
+       unsigned int ui_Temp;
+       /* disable the interrupt */
        ui_Temp = inl(devpriv->iobase + APCI1032_DIGITAL_IP_IRQ);
        outl(ui_Temp & APCI1032_DIGITAL_IP_INTERRUPT_DISABLE,
                devpriv->iobase + APCI1032_DIGITAL_IP_IRQ);
        ui_InterruptStatus =
                inl(devpriv->iobase + APCI1032_DIGITAL_IP_INTERRUPT_STATUS);
        ui_InterruptStatus = ui_InterruptStatus & 0X0000FFFF;
-       send_sig(SIGIO, devpriv->tsk_Current, 0);       // send signal to the sample
-       outl(ui_Temp, devpriv->iobase + APCI1032_DIGITAL_IP_IRQ);       //enable the interrupt
+       send_sig(SIGIO, devpriv->tsk_Current, 0);       /*  send signal to the sample */
+       outl(ui_Temp, devpriv->iobase + APCI1032_DIGITAL_IP_IRQ);       /* enable the interrupt */
        return;
 }
 
@@ -275,11 +277,11 @@ static void v_APCI1032_Interrupt(int irq, void *d)
 +----------------------------------------------------------------------------+
 */
 
-INT i_APCI1032_Reset(struct comedi_device * dev)
+int i_APCI1032_Reset(struct comedi_device * dev)
 {
-       outl(0x0, devpriv->iobase + APCI1032_DIGITAL_IP_IRQ);   //disable the interrupts
-       inl(devpriv->iobase + APCI1032_DIGITAL_IP_INTERRUPT_STATUS);    //Reset the interrupt status register
-       outl(0x0, devpriv->iobase + APCI1032_DIGITAL_IP_INTERRUPT_MODE1);       //Disable the and/or interrupt
+       outl(0x0, devpriv->iobase + APCI1032_DIGITAL_IP_IRQ);   /* disable the interrupts */
+       inl(devpriv->iobase + APCI1032_DIGITAL_IP_INTERRUPT_STATUS);    /* Reset the interrupt status register */
+       outl(0x0, devpriv->iobase + APCI1032_DIGITAL_IP_INTERRUPT_MODE1);       /* Disable the and/or interrupt */
        outl(0x0, devpriv->iobase + APCI1032_DIGITAL_IP_INTERRUPT_MODE2);
        return 0;
 }
Pandora Kernel Repository