Staging: comedi: Fix if/else style in hwdrv_apci1500.c
PATCH 1/2 Staging: comedi: Fix if/else style in hwdrv_apci1500.c
Also kill some useless comments while I was there, e.g.:
if (foo) {
...} /* if (foo) */
With vim:
:%s/}\t\t*\/\*\s\s*\(if\|else\|for\|while\|switch\).*$/}/
--- .../comedi/drivers/addi-data/hwdrv_apci1500.c | 368 ++++++++------------- 1 file changed, 143 insertions(+), 225 deletions(-)
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c +143 -225
@@ -232,66 +232,65 @@ static int i_TimerCounter1Enabled, i_TimerCounter2Enabled,*/ static int i_APCI1500_ConfigDigitalInputEvent (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) {struct addi_private *devpriv = dev->private;int i_PatternPolarity =0 , i_PatternTransition =0 , i_PatternMask =0 ;int i_MaxChannel =0 , i_Count =0 , i_EventMask =0 ;int i_PatternTransitionCount =0 , i_RegValue;int i;/* Selects the master interrupt control register */ outb (APCI1500_RW_MASTER_INTERRUPT_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Disables the main interrupt on the board */ outb (0x00 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );if (data[0 ] ==1 ) { i_MaxChannel =8 ; - }/* if (data[0] == 1) */ -else { + }else {if (data[0 ] ==2 ) { i_MaxChannel =6 ; - }/* if(data[0]==2) */ -else { + }else {dev_warn (dev->hw_dev,"The specified port event does not exist\n" );return -EINVAL ; - }/* else if(data[0]==2) */ - }/* else if (data[0] == 1) */ + } + } +switch (data[1 ]) {case 0 : data[1 ] =APCI1500_AND ;break ;case 1 : data[1 ] =APCI1500_OR ;break ;case 2 : data[1 ] =APCI1500_OR_PRIORITY ;break ;default :dev_warn (dev->hw_dev,"The specified interrupt logic does not exist\n" );return -EINVAL ; - }/* switch(data[1]); */ + } i_Logic = data[1 ];for (i_Count = i_MaxChannel, i =0 ; i_Count >0 ; i_Count--, i++) { i_EventMask = data[2 + i];switch (i_EventMask) {case 0 : i_PatternMask = i_PatternMask | (1 << (i_MaxChannel - i_Count));break ;case 1 : i_PatternMask = i_PatternMask | (1 << (i_MaxChannel - i_Count)); i_PatternPolarity = i_PatternPolarity | (1 << (i_MaxChannel - i_Count));break ;case 2 : i_PatternMask = i_PatternMask | (1 << (i_MaxChannel - i_Count)); i_PatternTransition =
@@ -302,77 +301,77 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev, i_PatternMask = i_PatternMask | (1 << (i_MaxChannel - i_Count)); i_PatternPolarity = i_PatternPolarity | (1 << (i_MaxChannel - i_Count)); i_PatternTransition = i_PatternTransition | (1 << (i_MaxChannel - i_Count));break ;case 4 : i_PatternTransition = i_PatternTransition | (1 << (i_MaxChannel - i_Count));break ;case 5 :break ;default :dev_warn (dev->hw_dev,"The option indicated in the event mask does not exist\n" );return -EINVAL ; - }/* switch(i_EventMask) */ - }/* for (i_Count = i_MaxChannel; i_Count >0;i_Count --) */ + } + }if (data[0 ] ==1 ) {/* Test the interrupt logic */ if (data[1 ] ==APCI1500_AND || data[1 ] ==APCI1500_OR || data[1 ] ==APCI1500_OR_PRIORITY ) {/* Tests if a transition was declared */ /* for a OR PRIORITY logic */ if (data[1 ] ==APCI1500_OR_PRIORITY && i_PatternTransition !=0 ) {dev_warn (dev->hw_dev,"Transition error on an OR PRIORITY logic\n" );return -EINVAL ; - }/* if (data[1]== APCI1500_OR_PRIORITY && i_PatternTransition != 0) */ + }/* Tests if more than one transition */ /* was declared for an AND logic */ if (data[1 ] ==APCI1500_AND ) {for (i_Count =0 ; i_Count <8 ; i_Count++) { i_PatternTransitionCount = i_PatternTransitionCount + ((i_PatternTransition >> i_Count) &0x1 ); - }/* for (i_Count = 0; i_Count < 8; i_Count++) */ + }if (i_PatternTransitionCount >1 ) {dev_warn (dev->hw_dev,"Transition error on an AND logic\n" );return -EINVAL ; - }/* if (i_PatternTransitionCount > 1) */ - }/* if (data[1]== APCI1500_AND) */ + } + }/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Disable Port A */ outb (0xF0 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Selects the polarity register of port 1 */ outb (APCI1500_RW_PORT_A_PATTERN_POLARITY , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );outb (i_PatternPolarity, devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Selects the pattern mask register of */ /* port 1 */ outb(APCI1500_RW_PORT_A_PATTERN_MASK,
@@ -407,47 +406,46 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,/* Port A new mode */ i_RegValue = (i_RegValue &0xF9 ) | data[1 ] |0x9 ;outb (i_RegValue, devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); i_Event1Status =1 ;/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Enable Port A */ outb (0xF4 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); - }/* if(data[1]==APCI1500_AND||data[1]==APCI1500_OR||data[1]==APCI1500_OR_PRIORITY) */ -else { + }else {dev_warn (dev->hw_dev,"The choice for interrupt logic does not exist\n" );return -EINVAL ; - }/* else }// if(data[1]==APCI1500_AND||data[1]==APCI1500_OR||data[1]==APCI1500_OR_PRIORITY) */ - }/* if (data[0]== 1) */ + } + }/* Test if event setting for port 2 */ if (data[0 ] ==2 ) {/* Test the event logic */ if (data[1 ] ==APCI1500_OR ) {/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Disable Port B */ outb (0x74 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Selects the mode specification mask */ /* register of port B */ outb (APCI1500_RW_PORT_B_SPECIFICATION , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );
@@ -508,47 +506,46 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,/* register of port 2 */ outb (APCI1500_RW_PORT_B_SPECIFICATION , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); i_RegValue = (i_RegValue &0xF9 ) |4 ;outb (i_RegValue, devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); i_Event2Status =1 ;/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Enable Port B */ outb (0xF4 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); - }/* if (data[1] == APCI1500_OR) */ -else { + }else {dev_warn (dev->hw_dev,"The choice for interrupt logic does not exist\n" );return -EINVAL ; - }/* elseif (data[1] == APCI1500_OR) */ - }/* if(data[0]==2) */ + } + }return insn->n; }/* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_StartStopInputEvent | | (struct comedi_device *dev,struct comedi_subdevice *s, | | struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Allows or disallows a port event | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | unsigned int ui_Channel : Channel number to read | | unsigned int *data : Data Pointer to read status | | data[0] :0 Start input event | 1 Stop input event | data[1] :No of port (1 or 2) +----------------------------------------------------------------------------+ | Output Parameters : -- |
@@ -594,172 +591,166 @@ static int i_APCI1500_StartStopInputEvent(struct comedi_device *dev,outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Enable Port A */ outb (0xF4 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); i_Event1InterruptStatus =1 ;outb (APCI1500_RW_PORT_A_SPECIFICATION , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); i_RegValue =inb (devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Selects the master interrupt control register */ outb (APCI1500_RW_MASTER_INTERRUPT_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Authorizes the main interrupt on the board */ outb (0xD0 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); - }/* if(i_Event1Status==1) */ -else { + }else {dev_warn (dev->hw_dev,"Event 1 not initialised\n" );return -EINVAL ; - }/* else if(i_Event1Status==1) */ - }/* if (data[1]==1) */ + } + }if (data[1 ] ==2 ) {if (i_Event2Status ==1 ) {/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Disable Port B */ outb (0x74 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Selects the command and status register of */ /* port 2 */ outb (APCI1500_RW_PORT_B_COMMAND_AND_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Allows the pattern interrupt */ outb (0xC0 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Enable Port B */ outb (0xF4 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Selects the master interrupt control register */ outb (APCI1500_RW_MASTER_INTERRUPT_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Authorizes the main interrupt on the board */ outb (0xD0 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); i_Event2InterruptStatus =1 ; - }/* if(i_Event2Status==1) */ -else { + }else {dev_warn (dev->hw_dev,"Event 2 not initialised\n" );return -EINVAL ; - }/* else if(i_Event2Status==1) */ - }/* if(data[1]==2) */ - }/* if (data[1] == 1 || data[0] == 2) */ -else { + } + } + }else {dev_warn (dev->hw_dev,"The port parameter is in error\n" );return -EINVAL ; - }/* else if (data[1] == 1 || data[0] == 2) */ + }break ;case STOP :/* Tests the port number */ if (data[1 ] ==1 || data[1 ] ==2 ) {/* Test if port 1 selected */ if (data[1 ] ==1 ) {/* Test if event initialised */ if (i_Event1Status ==1 ) {/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Disable Port A */ outb (0xF0 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Selects the command and status register of */ /* port 1 */ outb (APCI1500_RW_PORT_A_COMMAND_AND_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Inhibits the pattern interrupt */ outb (0xE0 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Enable Port A */ outb (0xF4 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); i_Event1InterruptStatus =0 ; - }/* if(i_Event1Status==1) */ -else { + }else {dev_warn (dev->hw_dev,"Event 1 not initialised\n" );return -EINVAL ; - }/* else if(i_Event1Status==1) */ - }/* if (data[1]==1) */ + } + }if (data[1 ] ==2 ) {/* Test if event initialised */ if (i_Event2Status ==1 ) {/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Disable Port B */ outb (0x74 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Selects the command and status register of */ /* port 2 */ outb (APCI1500_RW_PORT_B_COMMAND_AND_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Inhibits the pattern interrupt */ outb (0xE0 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Enable Port B */ outb (0xF4 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); i_Event2InterruptStatus =0 ; - }/* if(i_Event2Status==1) */ -else { + }else {dev_warn (dev->hw_dev,"Event 2 not initialised\n" );return -EINVAL ; - }/* else if(i_Event2Status==1) */ - }/* if(data[1]==2) */ + } + } - }/* if (data[1] == 1 || data[1] == 2) */ -else { + }else {dev_warn (dev->hw_dev,"The port parameter is in error\n" );return -EINVAL ; - }/* else if (data[1] == 1 || data[1] == 2) */ + }break ;default :dev_warn (dev->hw_dev,"The option of START/STOP logic does not exist\n" );return -EINVAL ; - }/* switch(data[0]) */ + }return insn->n; }/* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_Initialisation | | (struct comedi_device *dev,struct comedi_subdevice *s, | | struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Return the status of the digital input | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | unsigned int ui_Channel : Channel number to read | | unsigned int *data : Data Pointer to read status | +----------------------------------------------------------------------------+ | Output Parameters : -- | +----------------------------------------------------------------------------+ | Return Value : TRUE : No error occur | | : FALSE : Error occur. Return the error |
@@ -964,194 +955,176 @@ static int i_acpi1500_config_output(struct comedi_device *dev,| unsigned int ui_NoOfChannels : No Of Channels To Write | | unsigned int *data : Data Pointer to read status | +----------------------------------------------------------------------------+ | Output Parameters : -- | +----------------------------------------------------------------------------+ | Return Value : TRUE : No error occur | | : FALSE : Error occur. Return the error | | | +----------------------------------------------------------------------------+ */ static int i_APCI1500_WriteDigitalOutput (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) {struct addi_private *devpriv = dev->private;static unsigned int ui_Temp;unsigned int ui_Temp1;unsigned int ui_NoOfChannel =CR_CHAN (insn->chanspec);/* get the channel */ -if (!devpriv->b_OutputMemoryStatus) { +if (!devpriv->b_OutputMemoryStatus) ui_Temp =0 ; - }/* if(!devpriv->b_OutputMemoryStatus ) */ if (data[3 ] ==0 ) {if (data[1 ] ==0 ) { data[0 ] = (data[0 ] << ui_NoOfChannel) | ui_Temp;outw (data[0 ], devpriv->i_IobaseAddon +APCI1500_DIGITAL_OP ); - }/* if(data[1]==0) */ -else { + }else {if (data[1 ] ==1 ) {switch (ui_NoOfChannel) { -case 2 : data[0 ] = (data[0 ] << (2 * data[2 ])) | ui_Temp;break ; -case 4 : data[0 ] = (data[0 ] << (4 * data[2 ])) | ui_Temp;break ; -case 8 : data[0 ] = (data[0 ] << (8 * data[2 ])) | ui_Temp;break ; -case 15 : data[0 ] = data[0 ] | ui_Temp;break ; -default : -comedi_error (dev," chan spec wrong" ); -return -EINVAL ;/* "sorry channel spec wrong " */ - - }/* switch(ui_NoOfChannels) */ +comedi_error (dev,"chan spec wrong" ); +return -EINVAL ; + }outw (data[0 ], devpriv->i_IobaseAddon +APCI1500_DIGITAL_OP ); - }/* if(data[1]==1) */ -else { + }else {dev_warn (dev->hw_dev,"Specified channel not supported\n" );return -EINVAL ; - }/* else if(data[1]==1) */ - }/* elseif(data[1]==0) */ - }/* if(data[3]==0) */ -else { + } + } + }else {if (data[3 ] ==1 ) {if (data[1 ] ==0 ) { data[0 ] = ~data[0 ] &0x1 ; ui_Temp1 =1 ; ui_Temp1 = ui_Temp1 << ui_NoOfChannel; ui_Temp = ui_Temp | ui_Temp1; data[0 ] = (data[0 ] << ui_NoOfChannel) ^0xffffffff ; data[0 ] = data[0 ] & ui_Temp;outw (data[0 ], devpriv->i_IobaseAddon +APCI1500_DIGITAL_OP ); - }/* if(data[1]==0) */ -else { + }else {if (data[1 ] ==1 ) {switch (ui_NoOfChannel) { -case 2 : data[0 ] = ~data[0 ] &0x3 ; ui_Temp1 =3 ; ui_Temp1 = ui_Temp1 <<2 * data[2 ]; ui_Temp = ui_Temp | ui_Temp1; data[0 ] = ((data[0 ] << (2 * data [2 ])) ^0xffffffff ) & ui_Temp;break ; -case 4 : data[0 ] = ~data[0 ] &0xf ; ui_Temp1 =15 ; ui_Temp1 = ui_Temp1 <<4 * data[2 ]; ui_Temp = ui_Temp | ui_Temp1; data[0 ] = ((data[0 ] << (4 * data [2 ])) ^0xffffffff ) & ui_Temp;break ; -case 8 : data[0 ] = ~data[0 ] &0xff ; ui_Temp1 =255 ; ui_Temp1 = ui_Temp1 <<8 * data[2 ]; ui_Temp = ui_Temp | ui_Temp1; data[0 ] = ((data[0 ] << (8 * data [2 ])) ^0xffffffff ) & ui_Temp;break ; -case 15 :break ; -default :comedi_error (dev, -" chan spec wrong" ); -return -EINVAL ;/* "sorry channel spec wrong " */ - - }/* switch(ui_NoOfChannels) */ +"chan spec wrong" ); +return -EINVAL ; + }outw (data[0 ], devpriv->i_IobaseAddon +APCI1500_DIGITAL_OP ); - }/* if(data[1]==1) */ -else { + }else {dev_warn (dev->hw_dev,"Specified channel not supported\n" );return -EINVAL ; - }/* else if(data[1]==1) */ - }/* elseif(data[1]==0) */ - }/* if(data[3]==1); */ -else { + } + } + }else {dev_warn (dev->hw_dev,"Specified functionality does not exist\n" );return -EINVAL ; - }/* if else data[3]==1) */ - }/* if else data[3]==0) */ + } + } ui_Temp = data[0 ];return insn->n; }/* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_ConfigCounterTimerWatchdog(comedi_device | *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)| | | +----------------------------------------------------------------------------+ | Task : Configures The Watchdog | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure | struct comedi_insn *insn :pointer to insn structure | -| unsigned int *data : Data Pointer to read status data[0] : 2 APCI1500_1_8_KHZ +| unsigned int *data : Data Pointer to read status +| data[0] : 2 APCI1500_1_8_KHZ | 1 APCI1500_3_6_KHZ | | 0 APCI1500_115_KHZ | data[1] : 0 Counter1/Timer1 | 1 Counter2/Timer2 | 2 Counter3/Watchdog | data[2] : 0 Counter | 1 Timer/Watchdog | data[3] : This parameter has | | two meanings. | | - If the counter/timer | | is used as a counter | | the limit value of | | the counter is given | | | | - If the counter/timer | | is used as a timer, | | the divider factor | | for the output is | | given. | data[4] : 0 APCI1500_CONTINUOUS
@@ -1164,81 +1137,81 @@ static int i_APCI1500_WriteDigitalOutput(struct comedi_device *dev,| data[7] :0 Interrupt Disable | 1 Interrupt Enable +----------------------------------------------------------------------------+ | Output Parameters : -- | +----------------------------------------------------------------------------+ | Return Value : TRUE : No error occur | | : FALSE : Error occur. Return the error | | | +----------------------------------------------------------------------------+ */ static int i_APCI1500_ConfigCounterTimerWatchdog (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) {struct addi_private *devpriv = dev->private;int i_TimerCounterMode, i_MasterConfiguration; devpriv->tsk_Current = current; -/* Selection of the input clock */ +/* Selection of the input clock */ if (data[0 ] ==0 || data[0 ] ==1 || data[0 ] ==2 ) {outw (data[0 ], devpriv->i_IobaseAddon +APCI1500_CLK_SELECT ); - }/* if(data[0]==0||data[0]==1||data[0]==2) */ -else { + }else {if (data[0 ] !=3 ) {dev_warn (dev->hw_dev,"The option for input clock selection does not exist\n" );return -EINVAL ; - }/* if(data[0]!=3) */ - }/* elseif(data[0]==0||data[0]==1||data[0]==2) */ + } + } +/* Select the counter/timer */ switch (data[1 ]) {case COUNTER1 :/* selecting counter or timer */ switch (data[2 ]) {case 0 : data[2 ] =APCI1500_COUNTER ;break ;case 1 : data[2 ] =APCI1500_TIMER ;break ;default :dev_warn (dev->hw_dev,"This choice is not a timer nor a counter\n" );return -EINVAL ; - }/* switch(data[2]) */ + }/* Selecting single or continuous mode */ switch (data[4 ]) {case 0 : data[4 ] =APCI1500_CONTINUOUS ;break ;case 1 : data[4 ] =APCI1500_SINGLE ;break ;default :dev_warn (dev->hw_dev,"This option for single/continuous mode does not exist\n" );return -EINVAL ; - }/* switch(data[4]) */ + } i_TimerCounterMode = data[2 ] | data[4 ] |7 ;/* Test the reload value */ if ((data[3 ] >=0 ) && (data[3 ] <=65535 )) {if (data[7 ] ==APCI1500_ENABLE || data[7 ] ==APCI1500_DISABLE ) {/* Selects the mode register of timer/counter 1 */ outb (APCI1500_RW_CPT_TMR1_MODE_SPECIFICATION , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Writes the new mode */ outb (i_TimerCounterMode, devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Selects the constant register of timer/counter 1 */ outb(APCI1500_RW_CPT_TMR1_TIME_CST_LOW,
@@ -1295,111 +1268,109 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,outb (APCI1500_RW_CPT_TMR1_CMD_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Disable timer/counter 1 */ outb (0x0 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Selects the commands register of */ /* timer/counter 1 */ outb (APCI1500_RW_CPT_TMR1_CMD_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Trigger timer/counter 1 */ outb (0x2 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); - }/* if(data[7]== APCI1500_ENABLE ||data[7]== APCI1500_DISABLE) */ -else { + }else {dev_warn (dev->hw_dev,"Error in selection of interrupt enable or disable\n" );return -EINVAL ; - }/* elseif(data[7]== APCI1500_ENABLE ||data[7]== APCI1500_DISABLE) */ - }/* if ((data[3]>= 0) && (data[3] <= 65535)) */ -else { + } + }else {dev_warn (dev->hw_dev,"Error in selection of reload value\n" );return -EINVAL ; - }/* else if ((data[3]>= 0) && (data[3] <= 65535)) */ + } i_TimerCounterWatchdogInterrupt = data[7 ]; i_TimerCounter1Init =1 ;break ;case COUNTER2 :/* selecting counter or timer */ switch (data[2 ]) {case 0 : data[2 ] =APCI1500_COUNTER ;break ;case 1 : data[2 ] =APCI1500_TIMER ;break ;default :dev_warn (dev->hw_dev,"This choice is not a timer nor a counter\n" );return -EINVAL ; - }/* switch(data[2]) */ + }/* Selecting single or continuous mode */ switch (data[4 ]) {case 0 : data[4 ] =APCI1500_CONTINUOUS ;break ;case 1 : data[4 ] =APCI1500_SINGLE ;break ;default :dev_warn (dev->hw_dev,"This option for single/continuous mode does not exist\n" );return -EINVAL ; - }/* switch(data[4]) */ + }/* Selecting software or hardware trigger */ switch (data[5 ]) {case 0 : data[5 ] =APCI1500_SOFTWARE_TRIGGER ;break ;case 1 : data[5 ] =APCI1500_HARDWARE_TRIGGER ;break ;default :dev_warn (dev->hw_dev,"This choice for software or hardware trigger does not exist\n" );return -EINVAL ; - }/* switch(data[5]) */ + }/* Selecting software or hardware gate */ switch (data[6 ]) {case 0 : data[6 ] =APCI1500_SOFTWARE_GATE ;break ;case 1 : data[6 ] =APCI1500_HARDWARE_GATE ;break ;default :dev_warn (dev->hw_dev,"This choice for software or hardware gate does not exist\n" );return -EINVAL ; - }/* switch(data[6]) */ + } i_TimerCounterMode = data[2 ] | data[4 ] | data[5 ] | data[6 ] |7 ;/* Test the reload value */ if ((data[3 ] >=0 ) && (data[3 ] <=65535 )) {if (data[7 ] ==APCI1500_ENABLE || data[7 ] ==APCI1500_DISABLE ) {/* Selects the mode register of timer/counter 2 */ outb (APCI1500_RW_CPT_TMR2_MODE_SPECIFICATION , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Writes the new mode */ outb (i_TimerCounterMode, devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Selects the constant register of timer/counter 2 */
@@ -1457,109 +1428,106 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,outb (APCI1500_RW_CPT_TMR2_CMD_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Disable timer/counter 2 */ outb (0x0 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Selects the commands register of */ /* timer/counter 2 */ outb (APCI1500_RW_CPT_TMR2_CMD_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Trigger timer/counter 1 */ outb (0x2 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); - }/* if(data[7]== APCI1500_ENABLE ||data[7]== APCI1500_DISABLE) */ -else { + }else {dev_warn (dev->hw_dev,"Error in selection of interrupt enable or disable\n" );return -EINVAL ; - }/* elseif(data[7]== APCI1500_ENABLE ||data[7]== APCI1500_DISABLE) */ - }/* if ((data[3]>= 0) && (data[3] <= 65535)) */ -else { + } + }else {dev_warn (dev->hw_dev,"Error in selection of reload value\n" );return -EINVAL ; - }/* else if ((data[3]>= 0) && (data[3] <= 65535)) */ + } i_TimerCounterWatchdogInterrupt = data[7 ]; i_TimerCounter2Init =1 ;break ;case COUNTER3 :/* selecting counter or watchdog */ switch (data[2 ]) {case 0 : data[2 ] =APCI1500_COUNTER ;break ;case 1 : data[2 ] =APCI1500_WATCHDOG ;break ;default :dev_warn (dev->hw_dev,"This choice is not a watchdog nor a counter\n" );return -EINVAL ; - }/* switch(data[2]) */ + }/* Selecting single or continuous mode */ switch (data[4 ]) {case 0 : data[4 ] =APCI1500_CONTINUOUS ;break ;case 1 : data[4 ] =APCI1500_SINGLE ;break ;default :dev_warn (dev->hw_dev,"This option for single/continuous mode does not exist\n" );return -EINVAL ; - }/* switch(data[4]) */ + }/* Selecting software or hardware gate */ switch (data[6 ]) {case 0 : data[6 ] =APCI1500_SOFTWARE_GATE ;break ;case 1 : data[6 ] =APCI1500_HARDWARE_GATE ;break ;default :dev_warn (dev->hw_dev,"This choice for software or hardware gate does not exist\n" );return -EINVAL ; - }/* switch(data[6]) */ + }/* Test if used for watchdog */ if (data[2 ] ==APCI1500_WATCHDOG ) {/* - Enables the output line */ /* - Enables retrigger */ /* - Pulses output */ i_TimerCounterMode = data[2 ] | data[4 ] |0x54 ; - }/* if (data[2] == APCI1500_WATCHDOG) */ -else { + }else { i_TimerCounterMode = data[2 ] | data[4 ] | data[6 ] |7 ; - }/* elseif (data[2] == APCI1500_WATCHDOG) */ + }/* Test the reload value */ if ((data[3 ] >=0 ) && (data[3 ] <=65535 )) {if (data[7 ] ==APCI1500_ENABLE || data[7 ] ==APCI1500_DISABLE ) {/* Selects the mode register of watchdog/counter 3 */ outb (APCI1500_RW_CPT_TMR3_MODE_SPECIFICATION , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Writes the new mode */ outb (i_TimerCounterMode, devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Selects the constant register of watchdog/counter 3 */ outb (APCI1500_RW_CPT_TMR3_TIME_CST_LOW , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );
@@ -1617,63 +1585,61 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,/* watchdog/counter 3 */ outb (APCI1500_RW_CPT_TMR3_CMD_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Disable the watchdog/counter 3 and starts it */ outb (0x0 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Selects the command register of */ /* watchdog/counter 3 */ outb (APCI1500_RW_CPT_TMR3_CMD_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Trigger the watchdog/counter 3 and starts it */ outb (0x2 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); - }/* elseif(data[2]==APCI1500_COUNTER) */ + } - }/* if(data[7]== APCI1500_ENABLE ||data[7]== APCI1500_DISABLE) */ -else { + }else {dev_warn (dev->hw_dev,"Error in selection of interrupt enable or disable\n" );return -EINVAL ; - }/* elseif(data[7]== APCI1500_ENABLE ||data[7]== APCI1500_DISABLE) */ - }/* if ((data[3]>= 0) && (data[3] <= 65535)) */ -else { + } + }else {dev_warn (dev->hw_dev,"Error in selection of reload value\n" );return -EINVAL ; - }/* else if ((data[3]>= 0) && (data[3] <= 65535)) */ + } i_TimerCounterWatchdogInterrupt = data[7 ]; i_WatchdogCounter3Init =1 ;break ;default :dev_warn (dev->hw_dev,"The specified counter/timer option does not exist\n" );return -EINVAL ; - }/* switch(data[1]) */ + } i_CounterLogic = data[2 ];return insn->n; }/* +----------------------------------------------------------------------------+ | Function Name : int i_apci1500_timer_watchdog | (struct comedi_device *dev,struct comedi_subdevice *s, | struct comedi_insn *insn,unsigned int *data); | +----------------------------------------------------------------------------+ | Task : Start / Stop or trigger the timer counter or Watchdog | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure | struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | | data[0] : 0 Counter1/Timer1 | 1 Counter2/Timer2 | 2 Counter3/Watchdog | data[1] : 0 start
@@ -1684,465 +1650,426 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,+----------------------------------------------------------------------------+ | Output Parameters : -- | +----------------------------------------------------------------------------+ | Return Value : TRUE : No error occur | | : FALSE : Error occur. Return the error | | | +----------------------------------------------------------------------------+ */ static int i_apci1500_timer_watchdog (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) {struct addi_private *devpriv = dev->private;int i_CommandAndStatusValue;switch (data[0 ]) {case COUNTER1 :switch (data[1 ]) {case START :if (i_TimerCounter1Init ==1 ) { -if (i_TimerCounterWatchdogInterrupt ==1 ) { +if (i_TimerCounterWatchdogInterrupt ==1 ) i_CommandAndStatusValue =0xC4 ;/* Enable the interrupt */ - }/* if(i_TimerCounterWatchdogInterrupt==1) */ -else { +else i_CommandAndStatusValue =0xE4 ;/* disable the interrupt */ - }/* elseif(i_TimerCounterWatchdogInterrupt==1) */ /* Starts timer/counter 1 */ i_TimerCounter1Enabled =1 ;/* Selects the commands and status register */ outb (APCI1500_RW_CPT_TMR1_CMD_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );outb (i_CommandAndStatusValue, devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); - }/* if( i_TimerCounter1Init==1) */ -else { + }else {dev_warn (dev->hw_dev,"Counter/Timer1 not configured\n" );return -EINVAL ; }break ;case STOP : -/* Stop timer/counter 1 */ /* Selects the commands and status register */ outb (APCI1500_RW_CPT_TMR1_CMD_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );outb (0x00 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); i_TimerCounter1Enabled =0 ;break ;case TRIGGER :if (i_TimerCounter1Init ==1 ) {if (i_TimerCounter1Enabled ==1 ) {/* Set Trigger and gate */ i_CommandAndStatusValue =0x6 ; - }/* if( i_TimerCounter1Enabled==1) */ -else { + }else {/* Set Trigger */ i_CommandAndStatusValue =0x2 ; - }/* elseif(i_TimerCounter1Enabled==1) */ + }/* Selects the commands and status register */ outb (APCI1500_RW_CPT_TMR1_CMD_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );outb (i_CommandAndStatusValue, devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); - }/* if( i_TimerCounter1Init==1) */ -else { + }else {dev_warn (dev->hw_dev,"Counter/Timer1 not configured\n" );return -EINVAL ; }break ;default :dev_warn (dev->hw_dev,"The specified option for start/stop/trigger does not exist\n" );return -EINVAL ; - }/* switch(data[1]) */ + }break ;case COUNTER2 :switch (data[1 ]) {case START :if (i_TimerCounter2Init ==1 ) { -if (i_TimerCounterWatchdogInterrupt ==1 ) { +if (i_TimerCounterWatchdogInterrupt ==1 ) i_CommandAndStatusValue =0xC4 ;/* Enable the interrupt */ - }/* if(i_TimerCounterWatchdogInterrupt==1) */ -else { +else i_CommandAndStatusValue =0xE4 ;/* disable the interrupt */ - }/* elseif(i_TimerCounterWatchdogInterrupt==1) */ /* Starts timer/counter 2 */ i_TimerCounter2Enabled =1 ;/* Selects the commands and status register */ outb (APCI1500_RW_CPT_TMR2_CMD_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );outb (i_CommandAndStatusValue, devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); - }/* if( i_TimerCounter2Init==1) */ -else { + }else {dev_warn (dev->hw_dev,"Counter/Timer2 not configured\n" );return -EINVAL ; }break ;case STOP :/* Stop timer/counter 2 */ /* Selects the commands and status register */ outb (APCI1500_RW_CPT_TMR2_CMD_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );outb (0x00 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); i_TimerCounter2Enabled =0 ;break ;case TRIGGER :if (i_TimerCounter2Init ==1 ) { -if (i_TimerCounter2Enabled ==1 ) { +if (i_TimerCounter2Enabled ==1 )/* Set Trigger and gate */ - i_CommandAndStatusValue =0x6 ; - }/* if( i_TimerCounter2Enabled==1) */ -else { +else /* Set Trigger */ - i_CommandAndStatusValue =0x2 ; - }/* elseif(i_TimerCounter2Enabled==1) */ /* Selects the commands and status register */ outb (APCI1500_RW_CPT_TMR2_CMD_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );outb (i_CommandAndStatusValue, devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); - }/* if( i_TimerCounter2Init==1) */ -else { + }else {dev_warn (dev->hw_dev,"Counter/Timer2 not configured\n" );return -EINVAL ; }break ;default :dev_warn (dev->hw_dev,"The specified option for start/stop/trigger does not exist\n" );return -EINVAL ; - }/* switch(data[1]) */ + }break ;case COUNTER3 :switch (data[1 ]) {case START :if (i_WatchdogCounter3Init ==1 ) { -if (i_TimerCounterWatchdogInterrupt ==1 ) { +if (i_TimerCounterWatchdogInterrupt ==1 ) i_CommandAndStatusValue =0xC4 ;/* Enable the interrupt */ - }/* if(i_TimerCounterWatchdogInterrupt==1) */ -else { +else i_CommandAndStatusValue =0xE4 ;/* disable the interrupt */ - }/* elseif(i_TimerCounterWatchdogInterrupt==1) */ /* Starts Watchdog/counter 3 */ i_WatchdogCounter3Enabled =1 ;/* Selects the commands and status register */ outb (APCI1500_RW_CPT_TMR3_CMD_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );outb (i_CommandAndStatusValue, devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); - }/* if( i_WatchdogCounter3init==1) */ -else { + }else {dev_warn (dev->hw_dev,"Watchdog/Counter3 not configured\n" );return -EINVAL ; }break ;case STOP :/* Stop Watchdog/counter 3 */ /* Selects the commands and status register */ outb (APCI1500_RW_CPT_TMR3_CMD_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );outb (0x00 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); i_WatchdogCounter3Enabled =0 ;break ;case TRIGGER :switch (data[2 ]) {case 0 :/* triggering counter 3 */ if (i_WatchdogCounter3Init ==1 ) { -if (i_WatchdogCounter3Enabled ==1 ) { +if (i_WatchdogCounter3Enabled ==1 )/* Set Trigger and gate */ - i_CommandAndStatusValue =0x6 ; - }/* if( i_WatchdogCounter3Enabled==1) */ -else { +else /* Set Trigger */ - i_CommandAndStatusValue =0x2 ; - }/* elseif(i_WatchdogCounter3Enabled==1) */ /* Selects the commands and status register */ outb (APCI1500_RW_CPT_TMR3_CMD_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );outb (i_CommandAndStatusValue, devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); - }/* if( i_WatchdogCounter3Init==1) */ -else { + }else {dev_warn (dev->hw_dev,"Counter3 not configured\n" );return -EINVAL ; }break ;case 1 :/* triggering Watchdog 3 */ if (i_WatchdogCounter3Init ==1 ) { -/* Selects the commands and status register */ outb (APCI1500_RW_CPT_TMR3_CMD_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );outb (0x6 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); - }/* if( i_WatchdogCounter3Init==1) */ -else { + }else {dev_warn (dev->hw_dev,"Watchdog 3 not configured\n" );return -EINVAL ; }break ;default :dev_warn (dev->hw_dev,"Wrong choice of watchdog/counter3\n" );return -EINVAL ; - }/* switch(data[2]) */ + }break ;default :dev_warn (dev->hw_dev,"The specified option for start/stop/trigger does not exist\n" );return -EINVAL ; - }/* switch(data[1]) */ + }break ;default :dev_warn (dev->hw_dev,"The specified choice for counter/watchdog/timer does not exist\n" );return -EINVAL ; - }/* switch(data[0]) */ + }return insn->n; }/* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_ReadCounterTimerWatchdog | | (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn, | unsigned int *data); | +----------------------------------------------------------------------------+ | Task : Read The Watchdog | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure | struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | | data[0] : 0 Counter1/Timer1 | 1 Counter2/Timer2 | 2 Counter3/Watchdog | +----------------------------------------------------------------------------+ | Output Parameters : -- | +----------------------------------------------------------------------------+ | Return Value : TRUE : No error occur | | : FALSE : Error occur. Return the error | | | +----------------------------------------------------------------------------+ */ static int i_APCI1500_ReadCounterTimerWatchdog (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) {struct addi_private *devpriv = dev->private;int i_CommandAndStatusValue;switch (data[0 ]) {case COUNTER1 :/* Read counter/timer1 */ if (i_TimerCounter1Init ==1 ) { -if (i_TimerCounter1Enabled ==1 ) { +if (i_TimerCounter1Enabled ==1 )/* Set RCC and gate */ - i_CommandAndStatusValue =0xC ; - }/* if( i_TimerCounter1Init==1) */ -else { +else /* Set RCC */ - i_CommandAndStatusValue =0x8 ; - }/* elseif(i_TimerCounter1Init==1) */ /* Selects the commands and status register */ outb (APCI1500_RW_CPT_TMR1_CMD_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );outb (i_CommandAndStatusValue, devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Selects the counter register (high) */ outb (APCI1500_R_CPT_TMR1_VALUE_HIGH , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); data[0 ] =inb (devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); data[0 ] = data[0 ] <<8 ; data[0 ] = data[0 ] &0xff00 ;outb (APCI1500_R_CPT_TMR1_VALUE_LOW , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); data[0 ] = data[0 ] |inb (devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); - }/* if( i_TimerCounter1Init==1) */ -else { + }else {dev_warn (dev->hw_dev,"Timer/Counter1 not configured\n" );return -EINVAL ; - }/* elseif( i_TimerCounter1Init==1) */ + }break ;case COUNTER2 :/* Read counter/timer2 */ if (i_TimerCounter2Init ==1 ) { -if (i_TimerCounter2Enabled ==1 ) { +if (i_TimerCounter2Enabled ==1 )/* Set RCC and gate */ - i_CommandAndStatusValue =0xC ; - }/* if( i_TimerCounter2Init==1) */ -else { +else /* Set RCC */ - i_CommandAndStatusValue =0x8 ; - }/* elseif(i_TimerCounter2Init==1) */ /* Selects the commands and status register */ outb (APCI1500_RW_CPT_TMR2_CMD_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );outb (i_CommandAndStatusValue, devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Selects the counter register (high) */ outb (APCI1500_R_CPT_TMR2_VALUE_HIGH , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); data[0 ] =inb (devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); data[0 ] = data[0 ] <<8 ; data[0 ] = data[0 ] &0xff00 ;outb (APCI1500_R_CPT_TMR2_VALUE_LOW , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); data[0 ] = data[0 ] |inb (devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); - }/* if( i_TimerCounter2Init==1) */ -else { + }else {dev_warn (dev->hw_dev,"Timer/Counter2 not configured\n" );return -EINVAL ; - }/* elseif( i_TimerCounter2Init==1) */ + }break ;case COUNTER3 :/* Read counter/watchdog2 */ if (i_WatchdogCounter3Init ==1 ) { -if (i_WatchdogCounter3Enabled ==1 ) { +if (i_WatchdogCounter3Enabled ==1 )/* Set RCC and gate */ - i_CommandAndStatusValue =0xC ; - }/* if( i_TimerCounter2Init==1) */ -else { +else /* Set RCC */ - i_CommandAndStatusValue =0x8 ; - }/* elseif(i_WatchdogCounter3Init==1) */ /* Selects the commands and status register */ outb (APCI1500_RW_CPT_TMR3_CMD_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );outb (i_CommandAndStatusValue, devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Selects the counter register (high) */ outb (APCI1500_R_CPT_TMR3_VALUE_HIGH , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); data[0 ] =inb (devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); data[0 ] = data[0 ] <<8 ; data[0 ] = data[0 ] &0xff00 ;outb (APCI1500_R_CPT_TMR3_VALUE_LOW , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); data[0 ] = data[0 ] |inb (devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); - }/* if( i_WatchdogCounter3Init==1) */ -else { + }else {dev_warn (dev->hw_dev,"WatchdogCounter3 not configured\n" );return -EINVAL ; - }/* elseif( i_WatchdogCounter3Init==1) */ + }break ;default :dev_warn (dev->hw_dev,"The choice of timer/counter/watchdog does not exist\n" );return -EINVAL ; - }/* switch(data[0]) */ + }return insn->n; }/* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_ReadInterruptMask | | (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn, | unsigned int *data); | +----------------------------------------------------------------------------+ | Task : Read the interrupt mask | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure | struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | +----------------------------------------------------------------------------+ | Output Parameters : -- data[0]:The interrupt mask value data[1]:Channel no
@@ -2182,51 +2109,49 @@ static int i_APCI1500_ReadInterruptMask(struct comedi_device *dev,+----------------------------------------------------------------------------+ | Return Value : TRUE : No error occur | | : FALSE : Error occur. Return the error | | | +----------------------------------------------------------------------------+ */ static int i_APCI1500_ConfigureInterrupt (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;int i_RegValue;int i_Constant; devpriv->tsk_Current = current;outl (0x0 , devpriv->i_IobaseAmcc +0x38 );if (data[0 ] ==1 ) { i_Constant =0xC0 ; - }/* if(data[0]==1) */ -else { + }else {if (data[0 ] ==0 ) { i_Constant =0x00 ; - }/* if{data[0]==0) */ -else { + }else {dev_warn (dev->hw_dev,"The parameter passed to driver is in error for enabling the voltage interrupt\n" );return -EINVAL ; - }/* else if(data[0]==0) */ - }/* elseif(data[0]==1) */ + } + }/* Selects the mode specification register of port B */ outb (APCI1500_RW_PORT_B_SPECIFICATION , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); i_RegValue =inb (devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );outb (APCI1500_RW_PORT_B_SPECIFICATION , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Writes the new configuration (APCI1500_OR) */ i_RegValue = (i_RegValue &0xF9 ) |APCI1500_OR ;outb (i_RegValue, devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Selects the command and status register of port B */ outb (APCI1500_RW_PORT_B_COMMAND_AND_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Authorises the interrupt on the board */ outb (0xC0 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Selects the pattern polarity register of port B */ outb (APCI1500_RW_PORT_B_PATTERN_POLARITY , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );outb (i_Constant, devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );
@@ -2362,161 +2287,154 @@ static void v_APCI1500_Interrupt(int irq, void *d) APCI1500_Z8536_CONTROL_REGISTER); i_InterruptMask = i_InterruptMask |1 ;if (i_Logic ==APCI1500_OR_PRIORITY ) {outb (APCI1500_RW_PORT_A_SPECIFICATION , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); i_RegValue =inb (devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Selects the interrupt vector register of port A */ outb (APCI1500_RW_PORT_A_INTERRUPT_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); i_RegValue =inb (devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); i_InputChannel =1 + (i_RegValue >>1 ); - }/* if(i_Logic==APCI1500_OR_PRIORITY) */ -else { + }else { i_InputChannel =0 ; - }/* elseif(i_Logic==APCI1500_OR_PRIORITY) */ - }/* if ((i_RegValue & 0x60) == 0x60) */ + } + }/* Selects the command and status register of port B */ outb (APCI1500_RW_PORT_B_COMMAND_AND_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); i_RegValue =inb (devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );if ((i_RegValue &0x60 ) ==0x60 ) {/* Selects the command and status register of port B */ outb (APCI1500_RW_PORT_B_COMMAND_AND_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Deletes the interrupt of port B */ i_RegValue = (i_RegValue &0x0F ) |0x20 ;outb (i_RegValue, devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Reads port B */ i_RegValue =inb ((unsigned int ) devpriv->iobase +APCI1500_Z8536_PORT_B ); i_RegValue = i_RegValue &0xC0 ;/* Tests if this is an external error */ if (i_RegValue) {/* Disable the interrupt */ /* Selects the command and status register of port B */ outl (0x0 , devpriv->i_IobaseAmcc +0x38 );if (i_RegValue &0x80 ) { i_InterruptMask = i_InterruptMask |0x40 ; - }/* if (i_RegValue & 0x80) */ + }if (i_RegValue &0x40 ) { i_InterruptMask = i_InterruptMask |0x80 ; - }/* if (i_RegValue & 0x40) */ - }/* if (i_RegValue) */ -else { + } + }else { i_InterruptMask = i_InterruptMask |2 ; - }/* if (i_RegValue) */ - }/* if ((i_RegValue & 0x60) == 0x60) */ + } + }/* Selects the command and status register of timer 1 */ outb (APCI1500_RW_CPT_TMR1_CMD_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); i_RegValue =inb (devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );if ((i_RegValue &0x60 ) ==0x60 ) {/* Selects the command and status register of timer 1 */ outb (APCI1500_RW_CPT_TMR1_CMD_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Deletes the interrupt of timer 1 */ i_RegValue = (i_RegValue &0x0F ) |0x20 ;outb (i_RegValue, devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); i_InterruptMask = i_InterruptMask |4 ; - }/* if ((i_RegValue & 0x60) == 0x60) */ + }/* Selects the command and status register of timer 2 */ outb (APCI1500_RW_CPT_TMR2_CMD_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); i_RegValue =inb (devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );if ((i_RegValue &0x60 ) ==0x60 ) {/* Selects the command and status register of timer 2 */ outb (APCI1500_RW_CPT_TMR2_CMD_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Deletes the interrupt of timer 2 */ i_RegValue = (i_RegValue &0x0F ) |0x20 ;outb (i_RegValue, devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); i_InterruptMask = i_InterruptMask |8 ; - }/* if ((i_RegValue & 0x60) == 0x60) */ + }/* Selects the command and status register of timer 3 */ outb (APCI1500_RW_CPT_TMR3_CMD_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); i_RegValue =inb (devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );if ((i_RegValue &0x60 ) ==0x60 ) {/* Selects the command and status register of timer 3 */ outb (APCI1500_RW_CPT_TMR3_CMD_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Deletes the interrupt of timer 3 */ i_RegValue = (i_RegValue &0x0F ) |0x20 ;outb (i_RegValue, devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); -if (i_CounterLogic ==APCI1500_COUNTER ) { +if (i_CounterLogic ==APCI1500_COUNTER ) i_InterruptMask = i_InterruptMask |0x10 ; - }/* if(i_CounterLogic==APCI1500_COUNTER) */ -else { +else i_InterruptMask = i_InterruptMask |0x20 ; - } - }/* if ((i_RegValue & 0x60) == 0x60) */ + }send_sig (SIGIO , devpriv->tsk_Current,0 );/* send signal to the sample */ /* Enable all Interrupts */ /* Selects the master interrupt control register */ outb (APCI1500_RW_MASTER_INTERRUPT_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER );/* Authorizes the main interrupt on the board */ outb (0xD0 , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); - }/* if ((ui_InterruptStatus & 0x800000) == 0x800000) */ -else { -dev_warn (dev->hw_dev, -"Interrupt from unknown source\n" ); - - }/* else if ((ui_InterruptStatus & 0x800000) == 0x800000) */ + }else { +dev_warn (dev->hw_dev,"Interrupt from unknown source\n" ); + }return ; }/* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_Reset(struct comedi_device *dev) | | +----------------------------------------------------------------------------+ | Task :resets all the registers | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev +----------------------------------------------------------------------------+ | Output Parameters : -- | +----------------------------------------------------------------------------+ | Return Value : | | | +----------------------------------------------------------------------------+ */ static int i_APCI1500_Reset (struct comedi_device *dev) {struct addi_private *devpriv = dev->private;
Signature · 1 line
1.8.5.3
PATCH 2/2 Staging: comedi: Validate early to flatten code
Take advantage of -EINVAL returns to flatten code structure and hopefully reduce the number of 80+ character lines.
--- .../comedi/drivers/addi-data/hwdrv_apci1500.c | 621 ++++++++++----------- 1 file changed, 303 insertions(+), 318 deletions(-)
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c +303 -318
@@ -307,439 +307,424 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev, i_PatternTransition | (1 << (i_MaxChannel - i_Count));break ;case 4 : i_PatternTransition = i_PatternTransition | (1 << (i_MaxChannel - i_Count));break ;case 5 :break ;default :dev_warn (dev->hw_dev,"The option indicated in the event mask does not exist\n" );return -EINVAL ; } }if (data[0 ] ==1 ) {/* Test the interrupt logic */ -if (data[1 ] ==APCI1500_AND || - data[1 ] ==APCI1500_OR || - data[1 ] ==APCI1500_OR_PRIORITY ) { -/* Tests if a transition was declared */ -/* for a OR PRIORITY logic */ - -if (data[1 ] ==APCI1500_OR_PRIORITY - && i_PatternTransition !=0 ) { -dev_warn (dev->hw_dev, -"Transition error on an OR PRIORITY logic\n" ); -return -EINVAL ; - } +if (data[1 ] !=APCI1500_AND && data[1 ] !=APCI1500_OR && + data[1 ] !=APCI1500_OR_PRIORITY ) { +dev_warn (dev->hw_dev, +"The choice for interrupt logic does not exist\n" ); +return -EINVAL ; + } -/* Tests if more than one transition */ -/* was declared for an AND logic */ +/* Tests if a transition was declared */ +/* for a OR PRIORITY logic */ -if (data[1 ] ==APCI1500_AND ) { -for (i_Count =0 ; i_Count <8 ; i_Count++) { - i_PatternTransitionCount = - i_PatternTransitionCount + - ((i_PatternTransition >> - i_Count) &0x1 ); +if (data[1 ] ==APCI1500_OR_PRIORITY + && i_PatternTransition !=0 ) { +dev_warn (dev->hw_dev, +"Transition error on an OR PRIORITY logic\n" ); +return -EINVAL ; + } - } +/* Tests if more than one transition */ +/* was declared for an AND logic */ -if (i_PatternTransitionCount >1 ) { -dev_warn (dev->hw_dev, -"Transition error on an AND logic\n" ); -return -EINVAL ; - } - } +if (data[1 ] ==APCI1500_AND ) { +for (i_Count =0 ; i_Count <8 ; i_Count++) { + i_PatternTransitionCount = + i_PatternTransitionCount + + ((i_PatternTransition >> + i_Count) &0x1 ); -/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ -outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); -/* Disable Port A */ -outb (0xF0 , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); -/* Selects the polarity register of port 1 */ -outb (APCI1500_RW_PORT_A_PATTERN_POLARITY , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); -outb (i_PatternPolarity, - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); - -/* Selects the pattern mask register of */ -/* port 1 */ -outb (APCI1500_RW_PORT_A_PATTERN_MASK , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); -outb (i_PatternMask, - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); -/* Selects the pattern transition register */ -/* of port 1 */ -outb (APCI1500_RW_PORT_A_PATTERN_TRANSITION , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); -outb (i_PatternTransition, - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); + } -/* Selects the mode specification mask */ -/* register of port 1 */ -outb (APCI1500_RW_PORT_A_SPECIFICATION , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); - i_RegValue = -inb (devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); +if (i_PatternTransitionCount >1 ) { +dev_warn (dev->hw_dev, +"Transition error on an AND logic\n" ); +return -EINVAL ; + } + } -/* Selects the mode specification mask */ -/* register of port 1 */ -outb (APCI1500_RW_PORT_A_SPECIFICATION , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); +/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ +outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); +/* Disable Port A */ +outb (0xF0 , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); +/* Selects the polarity register of port 1 */ +outb (APCI1500_RW_PORT_A_PATTERN_POLARITY , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); +outb (i_PatternPolarity, + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); + +/* Selects the pattern mask register of */ +/* port 1 */ +outb (APCI1500_RW_PORT_A_PATTERN_MASK , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); +outb (i_PatternMask, + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); +/* Selects the pattern transition register */ +/* of port 1 */ +outb (APCI1500_RW_PORT_A_PATTERN_TRANSITION , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); +outb (i_PatternTransition, + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); + +/* Selects the mode specification mask */ +/* register of port 1 */ +outb (APCI1500_RW_PORT_A_SPECIFICATION , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); + i_RegValue = +inb (devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); -/* Port A new mode */ +/* Selects the mode specification mask */ +/* register of port 1 */ +outb (APCI1500_RW_PORT_A_SPECIFICATION , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); - i_RegValue = (i_RegValue &0xF9 ) | data[1 ] |0x9 ; -outb (i_RegValue, - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); +/* Port A new mode */ - i_Event1Status =1 ; + i_RegValue = (i_RegValue &0xF9 ) | data[1 ] |0x9 ; +outb (i_RegValue, + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); -/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ + i_Event1Status =1 ; -outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); -/* Enable Port A */ -outb (0xF4 , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); +/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ - }else { -dev_warn (dev->hw_dev, -"The choice for interrupt logic does not exist\n" ); -return -EINVAL ; - } +outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); +/* Enable Port A */ +outb (0xF4 , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); }/* Test if event setting for port 2 */ if (data[0 ] ==2 ) {/* Test the event logic */ -if (data[1 ] ==APCI1500_OR ) { -/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ -outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); -/* Disable Port B */ -outb (0x74 , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); -/* Selects the mode specification mask */ -/* register of port B */ -outb (APCI1500_RW_PORT_B_SPECIFICATION , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); - i_RegValue = -inb (devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); - -/* Selects the mode specification mask */ -/* register of port B */ -outb (APCI1500_RW_PORT_B_SPECIFICATION , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); - i_RegValue = i_RegValue &0xF9 ; -outb (i_RegValue, - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); - -/* Selects error channels 1 and 2 */ - - i_PatternMask = (i_PatternMask |0xC0 ); - i_PatternPolarity = (i_PatternPolarity |0xC0 ); - i_PatternTransition = (i_PatternTransition |0xC0 ); - -/* Selects the polarity register of port 2 */ -outb (APCI1500_RW_PORT_B_PATTERN_POLARITY , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); -outb (i_PatternPolarity, - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); -/* Selects the pattern transition register */ -/* of port 2 */ -outb (APCI1500_RW_PORT_B_PATTERN_TRANSITION , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); -outb (i_PatternTransition, - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); -/* Selects the pattern Mask register */ -/* of port 2 */ - -outb (APCI1500_RW_PORT_B_PATTERN_MASK , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); -outb (i_PatternMask, - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); - -/* Selects the mode specification mask */ -/* register of port 2 */ -outb (APCI1500_RW_PORT_B_SPECIFICATION , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); - i_RegValue = -inb (devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); -/* Selects the mode specification mask */ -/* register of port 2 */ -outb (APCI1500_RW_PORT_B_SPECIFICATION , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); - i_RegValue = (i_RegValue &0xF9 ) |4 ; -outb (i_RegValue, - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); - - i_Event2Status =1 ; -/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ - -outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); -/* Enable Port B */ - -outb (0xF4 , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); - }else { +if (data[1 ] !=APCI1500_OR ) {dev_warn (dev->hw_dev,"The choice for interrupt logic does not exist\n" );return -EINVAL ; } + +/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ +outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); +/* Disable Port B */ +outb (0x74 , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); +/* Selects the mode specification mask */ +/* register of port B */ +outb (APCI1500_RW_PORT_B_SPECIFICATION , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); + i_RegValue = +inb (devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); + +/* Selects the mode specification mask */ +/* register of port B */ +outb (APCI1500_RW_PORT_B_SPECIFICATION , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); + i_RegValue = i_RegValue &0xF9 ; +outb (i_RegValue, + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); + +/* Selects error channels 1 and 2 */ + + i_PatternMask = (i_PatternMask |0xC0 ); + i_PatternPolarity = (i_PatternPolarity |0xC0 ); + i_PatternTransition = (i_PatternTransition |0xC0 ); + +/* Selects the polarity register of port 2 */ +outb (APCI1500_RW_PORT_B_PATTERN_POLARITY , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); +outb (i_PatternPolarity, + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); +/* Selects the pattern transition register */ +/* of port 2 */ +outb (APCI1500_RW_PORT_B_PATTERN_TRANSITION , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); +outb (i_PatternTransition, + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); +/* Selects the pattern Mask register */ +/* of port 2 */ + +outb (APCI1500_RW_PORT_B_PATTERN_MASK , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); +outb (i_PatternMask, + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); + +/* Selects the mode specification mask */ +/* register of port 2 */ +outb (APCI1500_RW_PORT_B_SPECIFICATION , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); + i_RegValue = +inb (devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); +/* Selects the mode specification mask */ +/* register of port 2 */ +outb (APCI1500_RW_PORT_B_SPECIFICATION , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); + i_RegValue = (i_RegValue &0xF9 ) |4 ; +outb (i_RegValue, + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); + + i_Event2Status =1 ; +/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ + +outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); +/* Enable Port B */ + +outb (0xF4 , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); }return insn->n; }/* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_StartStopInputEvent | | (struct comedi_device *dev,struct comedi_subdevice *s, | | struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Allows or disallows a port event | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | unsigned int ui_Channel : Channel number to read | | unsigned int *data : Data Pointer to read status | | data[0] :0 Start input event | 1 Stop input event | data[1] :No of port (1 or 2) +----------------------------------------------------------------------------+ | Output Parameters : -- | +----------------------------------------------------------------------------+ | Return Value : TRUE : No error occur | | : FALSE : Error occur. Return the error | | | +----------------------------------------------------------------------------+ */ static int i_APCI1500_StartStopInputEvent (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) {struct addi_private *devpriv = dev->private;int i_Event1InterruptStatus =0 , i_Event2InterruptStatus =0 , i_RegValue;switch (data[0 ]) {case START : -/* Tests the port number */ - -if (data[1 ] ==1 || data[1 ] ==2 ) { -/* Test if port 1 selected */ +/* Test if port 1 selected */ +if (data[1 ] ==1 ) { +/* Test if event initialised */ +if (i_Event1Status !=1 ) { +dev_warn (dev->hw_dev, +"Event 1 not initialised\n" ); +return -EINVAL ; + } -if (data[1 ] ==1 ) { -/* Test if event initialised */ -if (i_Event1Status ==1 ) { -/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ -outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); -/* Disable Port A */ -outb (0xF0 , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); -/* Selects the command and status register of */ -/* port 1 */ -outb (APCI1500_RW_PORT_A_COMMAND_AND_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); -/* Allows the pattern interrupt */ -outb (0xC0 , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); -/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ -outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); -/* Enable Port A */ -outb (0xF4 , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); - i_Event1InterruptStatus =1 ; -outb (APCI1500_RW_PORT_A_SPECIFICATION , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); - i_RegValue = -inb (devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); +/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ +outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); +/* Disable Port A */ +outb (0xF0 , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); +/* Selects the command and status register of */ +/* port 1 */ +outb (APCI1500_RW_PORT_A_COMMAND_AND_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); +/* Allows the pattern interrupt */ +outb (0xC0 , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); +/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ +outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); +/* Enable Port A */ +outb (0xF4 , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); + i_Event1InterruptStatus =1 ; +outb (APCI1500_RW_PORT_A_SPECIFICATION , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); + i_RegValue = +inb (devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); -/* Selects the master interrupt control register */ -outb (APCI1500_RW_MASTER_INTERRUPT_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); -/* Authorizes the main interrupt on the board */ -outb (0xD0 , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); +/* Selects the master interrupt control register */ +outb (APCI1500_RW_MASTER_INTERRUPT_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); +/* Authorizes the main interrupt on the board */ +outb (0xD0 , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); + }else if (data[1 ] ==2 ) { - }else { -dev_warn (dev->hw_dev, -"Event 1 not initialised\n" ); -return -EINVAL ; - } +if (i_Event2Status !=1 ) { +dev_warn (dev->hw_dev, +"Event 2 not initialised\n" ); +return -EINVAL ; } -if (data[1 ] ==2 ) { -if (i_Event2Status ==1 ) { -/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ -outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); -/* Disable Port B */ -outb (0x74 , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); -/* Selects the command and status register of */ -/* port 2 */ -outb (APCI1500_RW_PORT_B_COMMAND_AND_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); -/* Allows the pattern interrupt */ -outb (0xC0 , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); -/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ -outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); -/* Enable Port B */ -outb (0xF4 , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); +/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ +outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); +/* Disable Port B */ +outb (0x74 , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); +/* Selects the command and status register of */ +/* port 2 */ +outb (APCI1500_RW_PORT_B_COMMAND_AND_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); +/* Allows the pattern interrupt */ +outb (0xC0 , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); +/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ +outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); +/* Enable Port B */ +outb (0xF4 , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); -/* Selects the master interrupt control register */ -outb (APCI1500_RW_MASTER_INTERRUPT_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); -/* Authorizes the main interrupt on the board */ -outb (0xD0 , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); - i_Event2InterruptStatus =1 ; - }else { -dev_warn (dev->hw_dev, -"Event 2 not initialised\n" ); -return -EINVAL ; - } - } +/* Selects the master interrupt control register */ +outb (APCI1500_RW_MASTER_INTERRUPT_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); +/* Authorizes the main interrupt on the board */ +outb (0xD0 , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); + i_Event2InterruptStatus =1 ; }else {dev_warn (dev->hw_dev,"The port parameter is in error\n" );return -EINVAL ; }break ;case STOP : -/* Tests the port number */ +/* Test if port 1 selected */ -if (data[1 ] ==1 || data[1 ] ==2 ) { -/* Test if port 1 selected */ - -if (data[1 ] ==1 ) { -/* Test if event initialised */ -if (i_Event1Status ==1 ) { -/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ -outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); -/* Disable Port A */ -outb (0xF0 , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); -/* Selects the command and status register of */ -/* port 1 */ -outb (APCI1500_RW_PORT_A_COMMAND_AND_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); -/* Inhibits the pattern interrupt */ -outb (0xE0 , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); -/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ -outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); -/* Enable Port A */ -outb (0xF4 , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); - i_Event1InterruptStatus =0 ; - }else { -dev_warn (dev->hw_dev, -"Event 1 not initialised\n" ); -return -EINVAL ; - } +if (data[1 ] ==1 ) { +/* Test if event initialised */ +if (i_Event1Status !=1 ) { +dev_warn (dev->hw_dev, +"Event 1 not initialised\n" ); +return -EINVAL ; } -if (data[1 ] ==2 ) { -/* Test if event initialised */ -if (i_Event2Status ==1 ) { -/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ -outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); -/* Disable Port B */ -outb (0x74 , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); -/* Selects the command and status register of */ -/* port 2 */ -outb (APCI1500_RW_PORT_B_COMMAND_AND_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); -/* Inhibits the pattern interrupt */ -outb (0xE0 , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); -/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ -outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); -/* Enable Port B */ -outb (0xF4 , - devpriv->iobase + -APCI1500_Z8536_CONTROL_REGISTER ); - i_Event2InterruptStatus =0 ; - }else { -dev_warn (dev->hw_dev, -"Event 2 not initialised\n" ); -return -EINVAL ; - } + +/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ +outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); +/* Disable Port A */ +outb (0xF0 , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); +/* Selects the command and status register of */ +/* port 1 */ +outb (APCI1500_RW_PORT_A_COMMAND_AND_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); +/* Inhibits the pattern interrupt */ +outb (0xE0 , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); +/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ +outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); +/* Enable Port A */ +outb (0xF4 , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); + i_Event1InterruptStatus =0 ; + }else if (data[1 ] ==2 ) { +/* Test if event initialised */ +if (i_Event2Status !=1 ) { +dev_warn (dev->hw_dev, +"Event 2 not initialised\n" ); +return -EINVAL ; } +/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ +outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); +/* Disable Port B */ +outb (0x74 , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); +/* Selects the command and status register of */ +/* port 2 */ +outb (APCI1500_RW_PORT_B_COMMAND_AND_STATUS , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); +/* Inhibits the pattern interrupt */ +outb (0xE0 , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); +/* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */ +outb (APCI1500_RW_MASTER_CONFIGURATION_CONTROL , devpriv->iobase +APCI1500_Z8536_CONTROL_REGISTER ); +/* Enable Port B */ +outb (0xF4 , + devpriv->iobase + +APCI1500_Z8536_CONTROL_REGISTER ); + i_Event2InterruptStatus =0 ; }else {dev_warn (dev->hw_dev,"The port parameter is in error\n" );return -EINVAL ; }break ;default :dev_warn (dev->hw_dev,"The option of START/STOP logic does not exist\n" );return -EINVAL ; }return insn->n; }/* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_Initialisation | | (struct comedi_device *dev,struct comedi_subdevice *s, | | struct comedi_insn *insn,unsigned int *data) |
Signature · 1 line
1.8.5.3
Re: [PATCH 2/2] Staging: comedi: Validate early to flatten code
Quoted 4 lines · Conrad Meyer
Take advantage of
-EINVALreturns to flatten code structure and hopefully reduce the number of 80+ character lines.Signed-off-by Conrad Meyer <[email protected]>
Signature · 2 lines
-=( Ian Abbott @ MEV Ltd. E-mail: <[email protected]> )=- -=( Tel: +44 (0)161 477 1898 FAX: +44 (0)161 718 3587 )=-
Quoted 9 lines · Conrad Meyer
Also kill some useless comments while I was there, e.g.:
if (foo) { ... } /* if (foo) */With vim:
:%s/}\t\t*\/\*\s\s*\(if\|else\|for\|while\|switch\).*$/}/Signed-off-by Conrad Meyer <[email protected]>
Signature · 2 lines
-=( Ian Abbott @ MEV Ltd. E-mail: <[email protected]> )=- -=( Tel: +44 (0)161 477 1898 FAX: +44 (0)161 718 3587 )=-
Greg Kroah-Hartman
maintainerQuoted 7 lines · Conrad Meyer
Also kill some useless comments while I was there, e.g.:
if (foo) { ...} /* if (foo) */
With vim:
:%s/}\t\t*\/\*\s\s*\(if\|else\|for\|while\|switch\).*$/}/
Neither of these patches apply to my tree, can you redo them and resend?
thanks,
greg k-h