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_apci1516.c
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
index 3d09025..bcc9b7a 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
@@ -81,14 +81,14 @@ int i_APCI1516_Read1DigitalInput(struct comedi_device * dev, struct comedi_subde
        ui_Channel = CR_CHAN(insn->chanspec);
        if (ui_Channel >= 0 && ui_Channel <= 7) {
                ui_TmpValue = (unsigned int) inw(devpriv->iobase + APCI1516_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.
+               /*   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 <=7)
+       }                       /* if(ui_Channel >= 0 && ui_Channel <=7) */
        else {
-               //comedi_error(dev," \n chan spec wrong\n");
-               return -EINVAL; // "sorry channel spec wrong "
-       }                       //else if(ui_Channel >= 0 && ui_Channel <=7)
+               /* comedi_error(dev," \n chan spec wrong\n"); */
+               return -EINVAL; /*  "sorry channel spec wrong " */
+       }                       /* else if(ui_Channel >= 0 && ui_Channel <=7) */
 
        return insn->n;
 }
@@ -139,9 +139,9 @@ int i_APCI1516_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_su
 
        default:
                printk("\nWrong parameters\n");
-               return -EINVAL; // "sorry channel spec wrong "
+               return -EINVAL; /*  "sorry channel spec wrong " */
                break;
-       }                       //switch(ui_NoOfChannels)
+       }                       /* switch(ui_NoOfChannels) */
 
        return insn->n;
 }
@@ -203,17 +203,17 @@ int i_APCI1516_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd
        struct comedi_insn * insn, unsigned int * data)
 {
        unsigned int ui_Temp, ui_Temp1;
-       unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec);  // get the channel
+       unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec);  /*  get the channel */
 
        printk("EL311003 : @=%x\n", devpriv->iobase + APCI1516_DIGITAL_OP);
 
        if (devpriv->b_OutputMemoryStatus) {
                ui_Temp = inw(devpriv->iobase + APCI1516_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;
@@ -222,7 +222,7 @@ int i_APCI1516_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd
                        printk("EL311003 : d=%d @=%x\n", data[0],
                                devpriv->iobase + APCI1516_DIGITAL_OP);
 
-               }               //if(data[1]==0)
+               }               /* if(data[1]==0) */
                else {
                        if (data[1] == 1) {
                                switch (ui_NoOfChannel) {
@@ -245,21 +245,21 @@ int i_APCI1516_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) */
 
                                outw(data[0],
                                        devpriv->iobase + APCI1516_DIGITAL_OP);
 
                                printk("EL311003 : d=%d @=%x\n", data[0],
                                        devpriv->iobase + APCI1516_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) {
@@ -275,7 +275,7 @@ int i_APCI1516_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd
                                printk("EL311003 : d=%d @=%x\n", data[0],
                                        devpriv->iobase + APCI1516_DIGITAL_OP);
 
-                       }       //if(data[1]==0)
+                       }       /* if(data[1]==0) */
                        else {
                                if (data[1] == 1) {
                                        switch (ui_NoOfChannel) {
@@ -312,9 +312,9 @@ int i_APCI1516_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) */
 
                                        outw(data[0],
                                                devpriv->iobase +
@@ -324,17 +324,17 @@ int i_APCI1516_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd
                                                data[0],
                                                devpriv->iobase +
                                                APCI1516_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);;
 }
 
@@ -364,12 +364,12 @@ int i_APCI1516_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subde
 {
 
        unsigned int ui_Temp;
-       unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec);  // get the channel
+       unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec);  /*  get the channel */
        ui_Temp = data[0];
        *data = inw(devpriv->iobase + APCI1516_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) {
@@ -387,14 +387,14 @@ int i_APCI1516_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==0)
+               }               /* elseif(ui_Temp==1) */
+       }                       /* elseif(ui_Temp==0) */
        return insn->n;
 }
 
@@ -423,11 +423,11 @@ int i_APCI1516_ConfigWatchdog(struct comedi_device * dev, struct comedi_subdevic
        struct comedi_insn * insn, unsigned int * data)
 {
        if (data[0] == 0) {
-               //Disable the watchdog
+               /* Disable the watchdog */
                outw(0x0,
                        devpriv->i_IobaseAddon +
                        APCI1516_WATCHDOG_ENABLEDISABLE);
-               //Loading the Reload value
+               /* Loading the Reload value */
                outw(data[1],
                        devpriv->i_IobaseAddon +
                        APCI1516_WATCHDOG_RELOAD_VALUE);
@@ -435,11 +435,11 @@ int i_APCI1516_ConfigWatchdog(struct comedi_device * dev, struct comedi_subdevic
                outw(data[1],
                        devpriv->i_IobaseAddon +
                        APCI1516_WATCHDOG_RELOAD_VALUE + 2);
-       }                       //if(data[0]==0)
+       }                       /* if(data[0]==0) */
        else {
                printk("\nThe input parameters are wrong\n");
                return -EINVAL;
-       }                       //elseif(data[0]==0)
+       }                       /* elseif(data[0]==0) */
 
        return insn->n;
 }
@@ -469,15 +469,15 @@ int i_APCI1516_StartStopWriteWatchdog(struct comedi_device * dev, struct comedi_
        struct comedi_insn * insn, unsigned int * data)
 {
        switch (data[0]) {
-       case 0:         //stop the watchdog
-               outw(0x0, devpriv->i_IobaseAddon + APCI1516_WATCHDOG_ENABLEDISABLE);    //disable the watchdog
+       case 0:         /* stop the watchdog */
+               outw(0x0, devpriv->i_IobaseAddon + APCI1516_WATCHDOG_ENABLEDISABLE);    /* disable the watchdog */
                break;
-       case 1:         //start the watchdog
+       case 1:         /* start the watchdog */
                outw(0x0001,
                        devpriv->i_IobaseAddon +
                        APCI1516_WATCHDOG_ENABLEDISABLE);
                break;
-       case 2:         //Software trigger
+       case 2:         /* Software trigger */
                outw(0x0201,
                        devpriv->i_IobaseAddon +
                        APCI1516_WATCHDOG_ENABLEDISABLE);
@@ -485,7 +485,7 @@ int i_APCI1516_StartStopWriteWatchdog(struct comedi_device * dev, struct comedi_
        default:
                printk("\nSpecified functionality does not exist\n");
                return -EINVAL;
-       }                       // switch(data[0])
+       }                       /*  switch(data[0]) */
        return insn->n;
 }
 
@@ -534,7 +534,7 @@ int i_APCI1516_ReadWatchdog(struct comedi_device * dev, struct comedi_subdevice
 
 int i_APCI1516_Reset(struct comedi_device * dev)
 {
-       outw(0x0, devpriv->iobase + APCI1516_DIGITAL_OP);       //RESETS THE DIGITAL OUTPUTS
+       outw(0x0, devpriv->iobase + APCI1516_DIGITAL_OP);       /* RESETS THE DIGITAL OUTPUTS */
        outw(0x0, devpriv->i_IobaseAddon + APCI1516_WATCHDOG_ENABLEDISABLE);
        outw(0x0, devpriv->i_IobaseAddon + APCI1516_WATCHDOG_RELOAD_VALUE);
        outw(0x0, devpriv->i_IobaseAddon + APCI1516_WATCHDOG_RELOAD_VALUE + 2);
Pandora Kernel Repository