git://ftp.safe.ca / safe / jmp / linux-2.6 / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Staging: comedi: Remove DWORD and *PDWORD typedefs in addi-data
[safe/jmp/linux-2.6] / drivers / staging / comedi / drivers / addi-data / APCI1710_Dig_io.c
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c
index 87dba6a..819d46f 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c
@@ -61,8 +61,8 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
 
 /*
 +----------------------------------------------------------------------------+
-| Function Name     : INT i_APCI1710_InsnConfigDigitalIO(comedi_device *dev, |
-|                                              comedi_subdevice *s,comedi_insn *insn,unsigned int *data)|
+| Function Name     : int i_APCI1710_InsnConfigDigitalIO(struct comedi_device *dev, |
+|                                              struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)|
 +----------------------------------------------------------------------------+
 | Task              : Configure the digital I/O operating mode from selected |
 |                     module  (b_ModulNbr). You must calling this function be|
@@ -70,14 +70,14 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
 |                     I/O.                                                   |
 +----------------------------------------------------------------------------+
 | Input Parameters  :                                                                                                       |
-|                  BYTE_ b_ModulNbr      data[0]: Module number to               |
+|                  unsigned char_ b_ModulNbr      data[0]: Module number to               |
 |                                             configure (0 to 3)             |
-|                     BYTE_ b_ChannelAMode data[1]  : Channel A mode selection       |
+|                     unsigned char_ b_ChannelAMode data[1]  : Channel A mode selection       |
 |                                             0 : Channel used for digital   |
 |                                                 input                      |
 |                                             1 : Channel used for digital   |
 |                                                 output                     |
-|                     BYTE_ b_ChannelBMode data[2] : Channel B mode selection       |
+|                     unsigned char_ b_ChannelBMode data[2] : Channel B mode selection       |
 |                                             0 : Channel used for digital   |
 |                                                 input                      |
 |                                             1 : Channel used for digital   |
@@ -99,19 +99,19 @@ Activates and deactivates the digital output memory.
 +----------------------------------------------------------------------------+
 */
 
-INT i_APCI1710_InsnConfigDigitalIO(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+int i_APCI1710_InsnConfigDigitalIO(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
-       BYTE b_ModulNbr, b_ChannelAMode, b_ChannelBMode;
-       BYTE b_MemoryOnOff, b_ConfigType;
-       INT i_ReturnValue = 0;
-       DWORD dw_WriteConfig = 0;
-
-       b_ModulNbr = (BYTE) CR_AREF(insn->chanspec);
-       b_ConfigType = (BYTE) data[0];  // Memory or  Init
-       b_ChannelAMode = (BYTE) data[1];
-       b_ChannelBMode = (BYTE) data[2];
-       b_MemoryOnOff = (BYTE) data[1]; // if memory operation
+       unsigned char b_ModulNbr, b_ChannelAMode, b_ChannelBMode;
+       unsigned char b_MemoryOnOff, b_ConfigType;
+       int i_ReturnValue = 0;
+       unsigned int dw_WriteConfig = 0;
+
+       b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);
+       b_ConfigType = (unsigned char) data[0]; // Memory or  Init
+       b_ChannelAMode = (unsigned char) data[1];
+       b_ChannelBMode = (unsigned char) data[2];
+       b_MemoryOnOff = (unsigned char) data[1];        // if memory operation
        i_ReturnValue = insn->n;
 
                /**************************/
@@ -197,7 +197,7 @@ INT i_APCI1710_InsnConfigDigitalIO(comedi_device * dev, comedi_subdevice * s,
        /*****************************************/
 
                                        dw_WriteConfig =
-                                               (DWORD) (b_ChannelAMode |
+                                               (unsigned int) (b_ChannelAMode |
                                                (b_ChannelBMode * 2));
 
        /***************************/
@@ -247,8 +247,8 @@ INT i_APCI1710_InsnConfigDigitalIO(comedi_device * dev, comedi_subdevice * s,
 /*
 +----------------------------------------------------------------------------+
 
-|INT i_APCI1710_InsnReadDigitalIOChlValue(comedi_device *dev,comedi_subdevice
-*s,    comedi_insn *insn,unsigned int *data)
+|INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device *dev,comedi_subdevice
+*s,    struct comedi_insn *insn,unsigned int *data)
 
 +----------------------------------------------------------------------------+
 | Task              : Read the status from selected digital I/O digital input|
@@ -257,9 +257,9 @@ INT i_APCI1710_InsnConfigDigitalIO(comedi_device * dev, comedi_subdevice * s,
 
 
 |
-|  BYTE_ b_ModulNbr  CR_AREF(chanspec)          : Selected module number   |
+|  unsigned char_ b_ModulNbr  CR_AREF(chanspec)          : Selected module number   |
 |                                                   (0 to 3)                 |
-|  BYTE_ b_InputChannel CR_CHAN(chanspec)        : Selection from digital   |
+|  unsigned char_ b_InputChannel CR_CHAN(chanspec)        : Selection from digital   |
 |                                                   input ( 0 to 6)          |
 |                                                      0 : Channel C         |
 |                                                      1 : Channel D         |
@@ -288,22 +288,22 @@ INT i_APCI1710_InsnConfigDigitalIO(comedi_device * dev, comedi_subdevice * s,
 +----------------------------------------------------------------------------+
 */
 
-//_INT_   i_APCI1710_ReadDigitalIOChlValue      (BYTE_    b_BoardHandle,
-//                                             BYTE_    b_ModulNbr,
-//                                             BYTE_    b_InputChannel,
+//_INT_   i_APCI1710_ReadDigitalIOChlValue      (unsigned char_    b_BoardHandle,
+//                                             unsigned char_    b_ModulNbr,
+//                                             unsigned char_    b_InputChannel,
 //
-//                                             PBYTE_  pb_ChannelStatus)
-INT i_APCI1710_InsnReadDigitalIOChlValue(comedi_device * dev,
-       comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
+//                                             unsigned char *_  pb_ChannelStatus)
+int i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device * dev,
+       struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data)
 {
-       INT i_ReturnValue = 0;
-       DWORD dw_StatusReg;
-       BYTE b_ModulNbr, b_InputChannel;
-       PBYTE pb_ChannelStatus;
-       b_ModulNbr = (BYTE) CR_AREF(insn->chanspec);
-       b_InputChannel = (BYTE) CR_CHAN(insn->chanspec);
+       int i_ReturnValue = 0;
+       unsigned int dw_StatusReg;
+       unsigned char b_ModulNbr, b_InputChannel;
+       unsigned char * pb_ChannelStatus;
+       b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);
+       b_InputChannel = (unsigned char) CR_CHAN(insn->chanspec);
        data[0] = 0;
-       pb_ChannelStatus = (PBYTE) & data[0];
+       pb_ChannelStatus = (unsigned char *) & data[0];
        i_ReturnValue = insn->n;
 
        /**************************/
@@ -400,7 +400,7 @@ INT i_APCI1710_InsnReadDigitalIOChlValue(comedi_device * dev,
                                                        (64 * b_ModulNbr));
 
                                                *pb_ChannelStatus =
-                                                       (BYTE) ((dw_StatusReg ^
+                                                       (unsigned char) ((dw_StatusReg ^
                                                                0x1C) >>
                                                        b_InputChannel) & 1;
 
@@ -445,17 +445,17 @@ INT i_APCI1710_InsnReadDigitalIOChlValue(comedi_device * dev,
 
 /*
 +----------------------------------------------------------------------------+
-| Function Name     : INT i_APCI1710_InsnWriteDigitalIOChlOnOff(comedi_device
-|*dev,comedi_subdevice *s,comedi_insn *insn,unsigned int *data)
+| Function Name     : int i_APCI1710_InsnWriteDigitalIOChlOnOff(comedi_device
+|*dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)
 
 +----------------------------------------------------------------------------+
 | Task              : Sets or resets the output witch has been passed with the         |
 |                     parameter b_Channel. Setting an output means setting   |
 |                     an ouput high.                                         |
 +----------------------------------------------------------------------------+
-| Input Parameters  : BYTE_ b_BoardHandle   : Handle of board APCI-1710      |
-|                     BYTE_ b_ModulNbr (aref )    : Selected module number (0 to 3)|
-|                     BYTE_ b_OutputChannel (CR_CHAN) : Selection from digital output  |
+| Input Parameters  : unsigned char_ b_BoardHandle   : Handle of board APCI-1710      |
+|                     unsigned char_ b_ModulNbr (aref )    : Selected module number (0 to 3)|
+|                     unsigned char_ b_OutputChannel (CR_CHAN) : Selection from digital output  |
 |                                             channel (0 to 2)               |
 |                                                0 : Channel H               |
 |                                                1 : Channel A               |
@@ -478,15 +478,15 @@ INT i_APCI1710_InsnReadDigitalIOChlValue(comedi_device * dev,
 +----------------------------------------------------------------------------+
 */
 
-//_INT_   i_APCI1710_SetDigitalIOChlOn    (BYTE_ b_BoardHandle,
-//                                       BYTE_ b_ModulNbr,
-//                                       BYTE_ b_OutputChannel)
-INT i_APCI1710_InsnWriteDigitalIOChlOnOff(comedi_device * dev,
-       comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
+//_INT_   i_APCI1710_SetDigitalIOChlOn    (unsigned char_ b_BoardHandle,
+//                                       unsigned char_ b_ModulNbr,
+//                                       unsigned char_ b_OutputChannel)
+int i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device * dev,
+       struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data)
 {
-       INT i_ReturnValue = 0;
-       DWORD dw_WriteValue = 0;
-       BYTE b_ModulNbr, b_OutputChannel;
+       int i_ReturnValue = 0;
+       unsigned int dw_WriteValue = 0;
+       unsigned char b_ModulNbr, b_OutputChannel;
        i_ReturnValue = insn->n;
        b_ModulNbr = CR_AREF(insn->chanspec);
        b_OutputChannel = CR_CHAN(insn->chanspec);
@@ -676,8 +676,8 @@ INT i_APCI1710_InsnWriteDigitalIOChlOnOff(comedi_device * dev,
 /*
 +----------------------------------------------------------------------------+
 
-|INT i_APCI1710_InsnBitsDigitalIOPortOnOff(comedi_device *dev,comedi_subdevice
-       *s,     comedi_insn *insn,unsigned int *data)
+|INT i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device *dev,comedi_subdevice
+       *s,     struct comedi_insn *insn,unsigned int *data)
 +----------------------------------------------------------------------------+
 | Task              : write:
                                          Sets or resets one or several outputs from port.                 |
@@ -690,9 +690,9 @@ INT i_APCI1710_InsnWriteDigitalIOChlOnOff(comedi_device * dev,
 |                     from selected digital I/O module (b_ModulNbr)
 +----------------------------------------------------------------------------+
 | Input Parameters  :
-       BYTE_ b_BoardHandle   : Handle of board APCI-1710      |
-|   BYTE_ b_ModulNbr  CR_AREF(aref)    : Selected module number (0 to 3)|
-|   BYTE_ b_PortValue CR_CHAN(chanspec) : Output Value ( 0 To 7 )
+       unsigned char_ b_BoardHandle   : Handle of board APCI-1710      |
+|   unsigned char_ b_ModulNbr  CR_AREF(aref)    : Selected module number (0 to 3)|
+|   unsigned char_ b_PortValue CR_CHAN(chanspec) : Output Value ( 0 To 7 )
 |                       data[0]           read or write port
                         data[1]            if write then indicate ON or OFF
 
@@ -725,26 +725,26 @@ INT i_APCI1710_InsnWriteDigitalIOChlOnOff(comedi_device * dev,
 +----------------------------------------------------------------------------+
 */
 
-//_INT_   i_APCI1710_SetDigitalIOPortOn   (BYTE_ b_BoardHandle,
-//                                       BYTE_ b_ModulNbr,
-//                                       BYTE_ b_PortValue)
-INT i_APCI1710_InsnBitsDigitalIOPortOnOff(comedi_device * dev,
-       comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
+//_INT_   i_APCI1710_SetDigitalIOPortOn   (unsigned char_ b_BoardHandle,
+//                                       unsigned char_ b_ModulNbr,
+//                                       unsigned char_ b_PortValue)
+int i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device * dev,
+       struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data)
 {
-       INT i_ReturnValue = 0;
-       DWORD dw_WriteValue = 0;
-       DWORD dw_StatusReg;
-       BYTE b_ModulNbr, b_PortValue;
-       BYTE b_PortOperation, b_PortOnOFF;
-
-       PBYTE pb_PortValue;
-
-       b_ModulNbr = (BYTE) CR_AREF(insn->chanspec);
-       b_PortOperation = (BYTE) data[0];       // Input or output
-       b_PortOnOFF = (BYTE) data[1];   // if output then On or Off
-       b_PortValue = (BYTE) data[2];   // if out put then Value
+       int i_ReturnValue = 0;
+       unsigned int dw_WriteValue = 0;
+       unsigned int dw_StatusReg;
+       unsigned char b_ModulNbr, b_PortValue;
+       unsigned char b_PortOperation, b_PortOnOFF;
+
+       unsigned char * pb_PortValue;
+
+       b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);
+       b_PortOperation = (unsigned char) data[0];      // Input or output
+       b_PortOnOFF = (unsigned char) data[1];  // if output then On or Off
+       b_PortValue = (unsigned char) data[2];  // if out put then Value
        i_ReturnValue = insn->n;
-       pb_PortValue = (PBYTE) & data[0];
+       pb_PortValue = (unsigned char *) & data[0];
 // if input then read value
 
        switch (b_PortOperation) {
@@ -781,7 +781,7 @@ INT i_APCI1710_InsnBitsDigitalIOPortOnOff(comedi_device * dev,
                                                inl(devpriv->s_BoardInfos.
                                                ui_Address + (64 * b_ModulNbr));
                                        *pb_PortValue =
-                                               (BYTE) (dw_StatusReg ^ 0x1C);
+                                               (unsigned char) (dw_StatusReg ^ 0x1C);
 
                                } else {
                 /*******************************/
Full containers within linux kernel