Char: cyclades, save indent levels
PATCH 1/4 Char: cyclades, save indent levels
cyclades, save indent levels
Save 3 indent levels in interrupt routine by moving the code to a separate function. This needs to be done to allow Lindent do its work, since only 4 columns are used for indenting now and hence Lindent makes a big mess in the code, when moves it 4*5 columns to the right.
---
commit 304c38fb121d969b3c0dd5fdd1d3c1bc9fa5d5e7
tree 45ec01982559a562b45214f9a89f134dfefa110f
parent ed7e6d6767a62758ff7de164953a4342dd820938
author Jiri Slaby <[email protected]> Mon, 06 Nov 2006 14:55:45 +0100 committer Jiri Slaby <[email protected]> Thu, 09 Nov 2006 17:30:26 +0100
drivers/char/cyclades.c | 675 ++++++++++++++++++++++++----------------------- 1 files changed, 340 insertions(+), 335 deletions(-)
drivers/char/cyclades.c +340 -335
@@ -1052,6 +1052,341 @@ detect_isa_irq(void __iomem *address) }#endif /* CONFIG_ISA */ +static void cyy_intr_chip (struct cyclades_card *cinfo,int chip, +void __iomem *base_addr,int status,int index) +{ +struct cyclades_port *info; +struct tty_struct *tty; +volatile int char_count; +int i, j, len, mdm_change, mdm_status, outch; +int save_xir, channel, save_car; +char data; + +if (status & CySRReceive) {/* reception interrupt */ +#ifdef CY_DEBUG_INTERRUPTS +printk ("cyy_interrupt: rcvd intr, chip %d\n\r" , chip); +#endif +/* determine the channel & change to that context */ +spin_lock (&cinfo->card_lock); + save_xir = (u_char )cy_readb (base_addr+(CyRIR<<index)); + channel = (u_short ) (save_xir & CyIRChannel); + i = channel + chip *4 + cinfo->first_line; + info = &cy_port[i]; + info->last_active = jiffies; + save_car =cy_readb (base_addr+(CyCAR<<index)); +cy_writeb (base_addr+(CyCAR<<index), save_xir); + +/* if there is nowhere to put the data, discard it */ +if (info->tty ==0 ){ + j = (cy_readb (base_addr+(CyRIVR<<index)) & CyIVRMask); +if ( j == CyIVRRxEx ) {/* exception */ + data =cy_readb (base_addr+(CyRDSR<<index)); + }else {/* normal character reception */ + char_count =cy_readb (base_addr+(CyRDCR<<index)); +while (char_count--){ + data =cy_readb (base_addr+(CyRDSR<<index)); + } + } + }else {/* there is an open port for this data */ + tty = info->tty; + j = (cy_readb (base_addr+(CyRIVR<<index)) & CyIVRMask); +if ( j == CyIVRRxEx ) {/* exception */ + data =cy_readb (base_addr+(CyRDSR<<index)); + +/* For statistics only */ +if (data & CyBREAK) + info->icount.brk++; +else if (data & CyFRAME) + info->icount.frame++; +else if (data & CyPARITY) + info->icount.parity++; +else if (data & CyOVERRUN) + info->icount.overrun++; + +if (data & info->ignore_status_mask){ + info->icount.rx++; +return ; + } +if (tty_buffer_request_room (tty,1 )) { +if (data & info->read_status_mask){ +if (data & CyBREAK){ +tty_insert_flip_char (tty,cy_readb (base_addr+(CyRDSR<<index)),TTY_BREAK ); + info->icount.rx++; +if (info->flags &ASYNC_SAK ){ +do_SAK (tty); + } + }else if (data & CyFRAME){ +tty_insert_flip_char (tty,cy_readb (base_addr+(CyRDSR<<index)),TTY_FRAME ); + info->icount.rx++; + info->idle_stats.frame_errs++; + }else if (data & CyPARITY){ +/* Pieces of seven... */ +tty_insert_flip_char (tty,cy_readb (base_addr+(CyRDSR<<index)),TTY_PARITY ); + info->icount.rx++; + info->idle_stats.parity_errs++; + }else if (data & CyOVERRUN){ +tty_insert_flip_char (tty,0 ,TTY_OVERRUN ); + info->icount.rx++; +/* If the flip buffer itself is +overflowing, we still lose +the next incoming character. +*/ +tty_insert_flip_char (tty,cy_readb (base_addr+(CyRDSR<<index)),TTY_FRAME ); + info->icount.rx++; + info->idle_stats.overruns++; +/* These two conditions may imply */ +/* a normal read should be done. */ +/* }else if(data & CyTIMEOUT){ */ +/* }else if(data & CySPECHAR){ */ + }else { +tty_insert_flip_char (tty,0 ,TTY_NORMAL ); + info->icount.rx++; + } + }else { +tty_insert_flip_char (tty,0 ,TTY_NORMAL ); + info->icount.rx++; + } + }else { +/* there was a software buffer +overrun and nothing could be +done about it!!! */ + info->icount.buf_overrun++; + info->idle_stats.overruns++; + } + }else {/* normal character reception */ +/* load # chars available from the chip */ + char_count =cy_readb (base_addr+(CyRDCR<<index)); + +#ifdef CY_ENABLE_MONITORING + ++info->mon.int_count; + info->mon.char_count += char_count; +if (char_count > info->mon.char_max) + info->mon.char_max = char_count; + info->mon.char_last = char_count; +#endif + len =tty_buffer_request_room (tty, char_count); +while (len--){ + data =cy_readb (base_addr+(CyRDSR<<index)); +tty_insert_flip_char (tty, data,TTY_NORMAL ); + info->idle_stats.recv_bytes++; + info->icount.rx++; +#ifdef CY_16Y_HACK +udelay (10L ); +#endif + } + info->idle_stats.recv_idle = jiffies; + } +tty_schedule_flip (tty); + } +/* end of service */ +cy_writeb (base_addr+(CyRIR<<index), (save_xir &0x3f )); +cy_writeb (base_addr+(CyCAR<<index), (save_car)); +spin_unlock (&cinfo->card_lock); + } + + +if (status & CySRTransmit) {/* transmission interrupt */ +/* Since we only get here when the transmit buffer +is empty, we know we can always stuff a dozen +characters. */ +#ifdef CY_DEBUG_INTERRUPTS +printk ("cyy_interrupt: xmit intr, chip %d\n\r" , chip); +#endif + +/* determine the channel & change to that context */ +spin_lock (&cinfo->card_lock); + save_xir = (u_char )cy_readb (base_addr+(CyTIR<<index)); + channel = (u_short ) (save_xir & CyIRChannel); + i = channel + chip *4 + cinfo->first_line; + save_car =cy_readb (base_addr+(CyCAR<<index)); +cy_writeb (base_addr+(CyCAR<<index), save_xir); + +/* validate the port# (as configured and open) */ +if ( (i <0 ) || (NR_PORTS <= i) ){ +cy_writeb (base_addr+(CySRER<<index), +cy_readb (base_addr+(CySRER<<index)) & ~CyTxRdy); + goto txend; + } + info = &cy_port[i]; + info->last_active = jiffies; +if (info->tty ==0 ){ +cy_writeb (base_addr+(CySRER<<index), +cy_readb (base_addr+(CySRER<<index)) & ~CyTxRdy); + goto txdone; + } + +/* load the on-chip space for outbound data */ + char_count = info->xmit_fifo_size; + +if (info->x_char) {/* send special char */ + outch = info->x_char; +cy_writeb (base_addr+(CyTDR<<index), outch); + char_count--; + info->icount.tx++; + info->x_char =0 ; + } + +if (info->breakon || info->breakoff) { +if (info->breakon) { +cy_writeb (base_addr + (CyTDR<<index),0 ); +cy_writeb (base_addr + (CyTDR<<index),0x81 ); + info->breakon =0 ; + char_count -=2 ; + } +if (info->breakoff) { +cy_writeb (base_addr + (CyTDR<<index),0 ); +cy_writeb (base_addr + (CyTDR<<index),0x83 ); + info->breakoff =0 ; + char_count -=2 ; + } + } + +while (char_count-- >0 ){ +if (!info->xmit_cnt){ +if (cy_readb (base_addr+(CySRER<<index))&CyTxMpty) { +cy_writeb (base_addr+(CySRER<<index), +cy_readb (base_addr+(CySRER<<index)) & + ~CyTxMpty); + }else { +cy_writeb (base_addr+(CySRER<<index), + ((cy_readb (base_addr+(CySRER<<index)) + & ~CyTxRdy) + | CyTxMpty)); + } + goto txdone; + } +if (info->xmit_buf ==0 ){ +cy_writeb (base_addr+(CySRER<<index), +cy_readb (base_addr+(CySRER<<index)) & + ~CyTxRdy); + goto txdone; + } +if (info->tty->stopped || info->tty->hw_stopped){ +cy_writeb (base_addr+(CySRER<<index), +cy_readb (base_addr+(CySRER<<index)) & + ~CyTxRdy); + goto txdone; + } +/* Because the Embedded Transmit Commands have +been enabled, we must check to see if the +escape character, NULL, is being sent. If it +is, we must ensure that there is room for it +to be doubled in the output stream. Therefore +we no longer advance the pointer when the +character is fetched, but rather wait until +after the check for a NULL output character. +This is necessary because there may not be +room for the two chars needed to send a NULL.) +*/ + outch = info->xmit_buf[info->xmit_tail]; +if ( outch ){ + info->xmit_cnt--; + info->xmit_tail = (info->xmit_tail +1 ) + & (SERIAL_XMIT_SIZE -1 ); +cy_writeb (base_addr+(CyTDR<<index), outch); + info->icount.tx++; + }else { +if (char_count >1 ){ + info->xmit_cnt--; + info->xmit_tail = (info->xmit_tail +1 ) + & (SERIAL_XMIT_SIZE -1 ); +cy_writeb (base_addr+(CyTDR<<index), + outch); +cy_writeb (base_addr+(CyTDR<<index),0 ); + info->icount.tx++; + char_count--; + }else { + } + } + } + +txdone: +if (info->xmit_cnt <WAKEUP_CHARS ) { +cy_sched_event (info, Cy_EVENT_WRITE_WAKEUP); + } +txend: +/* end of service */ +cy_writeb (base_addr+(CyTIR<<index), + (save_xir &0x3f )); +cy_writeb (base_addr+(CyCAR<<index), (save_car)); +spin_unlock (&cinfo->card_lock); + } + +if (status & CySRModem) {/* modem interrupt */ + +/* determine the channel & change to that context */ +spin_lock (&cinfo->card_lock); + save_xir = (u_char )cy_readb (base_addr+(CyMIR<<index)); + channel = (u_short ) (save_xir & CyIRChannel); + info = &cy_port[channel + chip *4 + + cinfo->first_line]; + info->last_active = jiffies; + save_car =cy_readb (base_addr+(CyCAR<<index)); +cy_writeb (base_addr+(CyCAR<<index), save_xir); + + mdm_change =cy_readb (base_addr+(CyMISR<<index)); + mdm_status =cy_readb (base_addr+(CyMSVR1<<index)); + +if (info->tty ==0 ){/* no place for data, ignore it*/ + ; + }else { +if (mdm_change & CyANY_DELTA) { +/* For statistics only */ +if (mdm_change & CyDCD) info->icount.dcd++; +if (mdm_change & CyCTS) info->icount.cts++; +if (mdm_change & CyDSR) info->icount.dsr++; +if (mdm_change & CyRI) info->icount.rng++; + +cy_sched_event (info, Cy_EVENT_DELTA_WAKEUP); + } + +if ((mdm_change & CyDCD) + && (info->flags &ASYNC_CHECK_CD )){ +if (mdm_status & CyDCD){ +cy_sched_event (info, + Cy_EVENT_OPEN_WAKEUP); + }else { +cy_sched_event (info, + Cy_EVENT_HANGUP); + } + } +if ((mdm_change & CyCTS) + && (info->flags &ASYNC_CTS_FLOW )){ +if (info->tty->hw_stopped){ +if (mdm_status & CyCTS){ +/* cy_start isn't used +because... !!! */ + info->tty->hw_stopped =0 ; +cy_writeb (base_addr+(CySRER<<index), +cy_readb (base_addr+(CySRER<<index)) | + CyTxRdy); +cy_sched_event (info, + Cy_EVENT_WRITE_WAKEUP); + } + }else { +if (!(mdm_status & CyCTS)){ +/* cy_stop isn't used +because ... !!! */ + info->tty->hw_stopped =1 ; +cy_writeb (base_addr+(CySRER<<index), +cy_readb (base_addr+(CySRER<<index)) & + ~CyTxRdy); + } + } + } +if (mdm_change & CyDSR){ + } +if (mdm_change & CyRI){ + } + } +/* end of service */ +cy_writeb (base_addr+(CyMIR<<index), + (save_xir &0x3f )); +cy_writeb (base_addr+(CyCAR<<index), save_car); +spin_unlock (&cinfo->card_lock); + } +} +/* The real interrupt service routine is called whenever the card wants its hand held--chars received, out buffer empty, modem change, etc.
@@ -1059,22 +1394,14 @@ #endif /* CONFIG_ISA */static irqreturn_t cyy_interrupt (int irq,void *dev_id) { -struct tty_struct *tty;int status;struct cyclades_card *cinfo; -struct cyclades_port *info;void __iomem *base_addr, *card_base_addr;int chip; -int save_xir, channel, save_car; -char data; -volatile int char_count; -int outch; -int i,j,index; +int index;int too_many;int had_work; -int mdm_change; -int mdm_status; -int len; +if ((cinfo = (struct cyclades_card *)dev_id) ==0 ){#ifdef CY_DEBUG_INTERRUPTS printk ("cyy_interrupt: spurious interrupt %d\n\r" , irq);
@@ -1106,331 +1433,9 @@ #endifif (1000 <too_many++){break ; } -if (status & CySRReceive) {/* reception interrupt */ -#ifdef CY_DEBUG_INTERRUPTS -printk ("cyy_interrupt: rcvd intr, chip %d\n\r" , chip); -#endif -/* determine the channel & change to that context */ -spin_lock (&cinfo->card_lock); - save_xir = (u_char )cy_readb (base_addr+(CyRIR<<index)); - channel = (u_short ) (save_xir & CyIRChannel); - i = channel + chip *4 + cinfo->first_line; - info = &cy_port[i]; - info->last_active = jiffies; - save_car =cy_readb (base_addr+(CyCAR<<index)); -cy_writeb (base_addr+(CyCAR<<index), save_xir); - -/* if there is nowhere to put the data, discard it */ -if (info->tty ==0 ){ - j = (cy_readb (base_addr+(CyRIVR<<index)) & CyIVRMask); -if ( j == CyIVRRxEx ) {/* exception */ - data =cy_readb (base_addr+(CyRDSR<<index)); - }else {/* normal character reception */ - char_count =cy_readb (base_addr+(CyRDCR<<index)); -while (char_count--){ - data =cy_readb (base_addr+(CyRDSR<<index)); - } - } - }else {/* there is an open port for this data */ - tty = info->tty; - j = (cy_readb (base_addr+(CyRIVR<<index)) & CyIVRMask); -if ( j == CyIVRRxEx ) {/* exception */ - data =cy_readb (base_addr+(CyRDSR<<index)); - -/* For statistics only */ -if (data & CyBREAK) - info->icount.brk++; -else if (data & CyFRAME) - info->icount.frame++; -else if (data & CyPARITY) - info->icount.parity++; -else if (data & CyOVERRUN) - info->icount.overrun++; - -if (data & info->ignore_status_mask){ - info->icount.rx++; -continue ; - } -if (tty_buffer_request_room (tty,1 )) { -if (data & info->read_status_mask){ -if (data & CyBREAK){ -tty_insert_flip_char (tty,cy_readb (base_addr+(CyRDSR<<index)),TTY_BREAK ); - info->icount.rx++; -if (info->flags &ASYNC_SAK ){ -do_SAK (tty); - } - }else if (data & CyFRAME){ -tty_insert_flip_char (tty,cy_readb (base_addr+(CyRDSR<<index)),TTY_FRAME ); - info->icount.rx++; - info->idle_stats.frame_errs++; - }else if (data & CyPARITY){ -/* Pieces of seven... */ -tty_insert_flip_char (tty,cy_readb (base_addr+(CyRDSR<<index)),TTY_PARITY ); - info->icount.rx++; - info->idle_stats.parity_errs++; - }else if (data & CyOVERRUN){ -tty_insert_flip_char (tty,0 ,TTY_OVERRUN ); - info->icount.rx++; -/* If the flip buffer itself is -overflowing, we still lose -the next incoming character. -*/ -tty_insert_flip_char (tty,cy_readb (base_addr+(CyRDSR<<index)),TTY_FRAME ); - info->icount.rx++; - info->idle_stats.overruns++; -/* These two conditions may imply */ -/* a normal read should be done. */ -/* }else if(data & CyTIMEOUT){ */ -/* }else if(data & CySPECHAR){ */ - }else { -tty_insert_flip_char (tty,0 ,TTY_NORMAL ); - info->icount.rx++; - } - }else { -tty_insert_flip_char (tty,0 ,TTY_NORMAL ); - info->icount.rx++; - } - }else { -/* there was a software buffer -overrun and nothing could be -done about it!!! */ - info->icount.buf_overrun++; - info->idle_stats.overruns++; - } - }else {/* normal character reception */ -/* load # chars available from the chip */ - char_count =cy_readb (base_addr+(CyRDCR<<index)); - -#ifdef CY_ENABLE_MONITORING - ++info->mon.int_count; - info->mon.char_count += char_count; -if (char_count > info->mon.char_max) - info->mon.char_max = char_count; - info->mon.char_last = char_count; -#endif - len =tty_buffer_request_room (tty, char_count); -while (len--){ - data =cy_readb (base_addr+(CyRDSR<<index)); -tty_insert_flip_char (tty, data,TTY_NORMAL ); - info->idle_stats.recv_bytes++; - info->icount.rx++; -#ifdef CY_16Y_HACK -udelay (10L ); -#endif - } - info->idle_stats.recv_idle = jiffies; - } -tty_schedule_flip (tty); - } -/* end of service */ -cy_writeb (base_addr+(CyRIR<<index), (save_xir &0x3f )); -cy_writeb (base_addr+(CyCAR<<index), (save_car)); -spin_unlock (&cinfo->card_lock); - } - - -if (status & CySRTransmit) {/* transmission interrupt */ -/* Since we only get here when the transmit buffer -is empty, we know we can always stuff a dozen -characters. */ -#ifdef CY_DEBUG_INTERRUPTS -printk ("cyy_interrupt: xmit intr, chip %d\n\r" , chip); -#endif - -/* determine the channel & change to that context */ -spin_lock (&cinfo->card_lock); - save_xir = (u_char )cy_readb (base_addr+(CyTIR<<index)); - channel = (u_short ) (save_xir & CyIRChannel); - i = channel + chip *4 + cinfo->first_line; - save_car =cy_readb (base_addr+(CyCAR<<index)); -cy_writeb (base_addr+(CyCAR<<index), save_xir); - -/* validate the port# (as configured and open) */ -if ( (i <0 ) || (NR_PORTS <= i) ){ -cy_writeb (base_addr+(CySRER<<index), -cy_readb (base_addr+(CySRER<<index)) & ~CyTxRdy); - goto txend; - } - info = &cy_port[i]; - info->last_active = jiffies; -if (info->tty ==0 ){ -cy_writeb (base_addr+(CySRER<<index), -cy_readb (base_addr+(CySRER<<index)) & ~CyTxRdy); - goto txdone; - } - -/* load the on-chip space for outbound data */ - char_count = info->xmit_fifo_size; - -if (info->x_char) {/* send special char */ - outch = info->x_char; -cy_writeb (base_addr+(CyTDR<<index), outch); - char_count--; - info->icount.tx++; - info->x_char =0 ; - } - -if (info->breakon || info->breakoff) { -if (info->breakon) { -cy_writeb (base_addr + (CyTDR<<index),0 ); -cy_writeb (base_addr + (CyTDR<<index),0x81 ); - info->breakon =0 ; - char_count -=2 ; - } -if (info->breakoff) { -cy_writeb (base_addr + (CyTDR<<index),0 ); -cy_writeb (base_addr + (CyTDR<<index),0x83 ); - info->breakoff =0 ; - char_count -=2 ; - } - } - -while (char_count-- >0 ){ -if (!info->xmit_cnt){ -if (cy_readb (base_addr+(CySRER<<index))&CyTxMpty) { -cy_writeb (base_addr+(CySRER<<index), -cy_readb (base_addr+(CySRER<<index)) & - ~CyTxMpty); - }else { -cy_writeb (base_addr+(CySRER<<index), - ((cy_readb (base_addr+(CySRER<<index)) - & ~CyTxRdy) - | CyTxMpty)); - } - goto txdone; - } -if (info->xmit_buf ==0 ){ -cy_writeb (base_addr+(CySRER<<index), -cy_readb (base_addr+(CySRER<<index)) & - ~CyTxRdy); - goto txdone; - } -if (info->tty->stopped || info->tty->hw_stopped){ -cy_writeb (base_addr+(CySRER<<index), -cy_readb (base_addr+(CySRER<<index)) & - ~CyTxRdy); - goto txdone; - } -/* Because the Embedded Transmit Commands have -been enabled, we must check to see if the -escape character, NULL, is being sent. If it -is, we must ensure that there is room for it -to be doubled in the output stream. Therefore -we no longer advance the pointer when the -character is fetched, but rather wait until -after the check for a NULL output character. -This is necessary because there may not be -room for the two chars needed to send a NULL.) -*/ - outch = info->xmit_buf[info->xmit_tail]; -if ( outch ){ - info->xmit_cnt--; - info->xmit_tail = (info->xmit_tail +1 ) - & (SERIAL_XMIT_SIZE -1 ); -cy_writeb (base_addr+(CyTDR<<index), outch); - info->icount.tx++; - }else { -if (char_count >1 ){ - info->xmit_cnt--; - info->xmit_tail = (info->xmit_tail +1 ) - & (SERIAL_XMIT_SIZE -1 ); -cy_writeb (base_addr+(CyTDR<<index), - outch); -cy_writeb (base_addr+(CyTDR<<index),0 ); - info->icount.tx++; - char_count--; - }else { - } - } - } - - txdone: -if (info->xmit_cnt <WAKEUP_CHARS ) { -cy_sched_event (info, Cy_EVENT_WRITE_WAKEUP); - } - txend: -/* end of service */ -cy_writeb (base_addr+(CyTIR<<index), - (save_xir &0x3f )); -cy_writeb (base_addr+(CyCAR<<index), (save_car)); -spin_unlock (&cinfo->card_lock); - } - -if (status & CySRModem) {/* modem interrupt */ - -/* determine the channel & change to that context */ -spin_lock (&cinfo->card_lock); - save_xir = (u_char )cy_readb (base_addr+(CyMIR<<index)); - channel = (u_short ) (save_xir & CyIRChannel); - info = &cy_port[channel + chip *4 - + cinfo->first_line]; - info->last_active = jiffies; - save_car =cy_readb (base_addr+(CyCAR<<index)); -cy_writeb (base_addr+(CyCAR<<index), save_xir); - - mdm_change =cy_readb (base_addr+(CyMISR<<index)); - mdm_status =cy_readb (base_addr+(CyMSVR1<<index)); - -if (info->tty ==0 ){/* no place for data, ignore it*/ - ; - }else { -if (mdm_change & CyANY_DELTA) { -/* For statistics only */ -if (mdm_change & CyDCD) info->icount.dcd++; -if (mdm_change & CyCTS) info->icount.cts++; -if (mdm_change & CyDSR) info->icount.dsr++; -if (mdm_change & CyRI) info->icount.rng++; - -cy_sched_event (info, Cy_EVENT_DELTA_WAKEUP); - } - -if ((mdm_change & CyDCD) - && (info->flags &ASYNC_CHECK_CD )){ -if (mdm_status & CyDCD){ -cy_sched_event (info, - Cy_EVENT_OPEN_WAKEUP); - }else { -cy_sched_event (info, - Cy_EVENT_HANGUP); - } - } -if ((mdm_change & CyCTS) - && (info->flags &ASYNC_CTS_FLOW )){ -if (info->tty->hw_stopped){ -if (mdm_status & CyCTS){ -/* cy_start isn't used -because... !!! */ - info->tty->hw_stopped =0 ; -cy_writeb (base_addr+(CySRER<<index), -cy_readb (base_addr+(CySRER<<index)) | - CyTxRdy); -cy_sched_event (info, - Cy_EVENT_WRITE_WAKEUP); - } - }else { -if (!(mdm_status & CyCTS)){ -/* cy_stop isn't used -because ... !!! */ - info->tty->hw_stopped =1 ; -cy_writeb (base_addr+(CySRER<<index), -cy_readb (base_addr+(CySRER<<index)) & - ~CyTxRdy); - } - } - } -if (mdm_change & CyDSR){ - } -if (mdm_change & CyRI){ - } - } -/* end of service */ -cy_writeb (base_addr+(CyMIR<<index), - (save_xir &0x3f )); -cy_writeb (base_addr+(CyCAR<<index), save_car); -spin_unlock (&cinfo->card_lock); - } - }/* end while status != 0 */ - }/* end loop for chips... */ +cyy_intr_chip (cinfo, chip, base_addr, status, index); + } + } }while (had_work);/* clear interrupts */
PATCH 3/4 Char: cyclades, cleanup
cyclades, cleanup
- remove cvs rcsid and alter code that uses it.
- allow a semicolon after use of macro to not confuse parsers (e.g. indent) by do {} while (0)
- JIFFIES_DIFF is simple subtraction, subtract directly
- returns cleanup -- do not put values in parenthesis and do not return nothing at the end of void functions
- comments are /* */ in C (not //)
---
commit 76495d5f78bf804b07f646abfbcb7a0a12938e11
tree 64678a10d342b5be363cce1200139f8be190318d
parent 55af131be8da830a1580ce56331e7388a1eebb95
author Jiri Slaby <[email protected]> Thu, 09 Nov 2006 21:58:58 +0100 committer Jiri Slaby <[email protected]> Thu, 09 Nov 2006 21:58:58 +0100
drivers/char/cyclades.c | 133 ++++++++++++++++++----------------------------- 1 files changed, 50 insertions(+), 83 deletions(-)
drivers/char/cyclades.c +50 -83
@@ -1,7 +1,6 @@#undef BLOCKMOVE#define Z_WAKE #undef Z_EXT_CHARS_IN_BUFFER -static char rcsid[] ="$Revision: 2.3.2.20 $$Date: 2004/02/25 18:14:16 $" ;/* * linux/drivers/char/cyclades.c
@@ -592,6 +591,8 @@ static char rcsid[] = "$Revision: 2.3.2.* */ +#define CY_VERSION "2.4" +/* If you need to install more boards than NR_CARDS, change the constant in the definition below. No other change is necessary to support up to eight boards. Beyond that you'll have to extend cy_isa_addresses. */
@@ -624,9 +625,9 @@ #undef CY_ENABLE_MONITORING#undef CY_PCI_DEBUG#if 0 -#define PAUSE __asm__("nop"); +#define PAUSE __asm__("nop")#else -#define PAUSE ; +#define PAUSE do {} while (0)#endif /*
@@ -697,8 +698,6 @@ #define WAKEUP_CHARS 256#define STD_COM_FLAGS (0) -#define JIFFIES_DIFF (n, j) ((j) - (n)) -static struct tty_driver *cy_serial_driver;#ifdef CONFIG_ISA
@@ -870,26 +869,22 @@ static inline int serial_paranoia_check( char *name, const char *routine) { #ifdef SERIAL_PARANOIA_CHECK - static const char *badmagic = -"cyc Warning: bad magic number for serial struct (%s) in %s\n" ; -static const char *badinfo = -"cyc Warning: null cyclades_port for (%s) in %s\n" ; -static const char *badrange = -"cyc Warning: cyclades_port out of range for (%s) in %s\n" ; - if (!info) { -printk (badinfo, name, routine); + printk("cyc Warning: null cyclades_port for (%s) in %s\n", + name, routine);return 1 ; }if ((long )info < (long )(&cy_port[0 ]) || (long )(&cy_port[NR_PORTS ]) < (long )info) { -printk (badrange, name, routine); +printk ("cyc Warning: cyclades_port out of range for (%s) in " +"%s\n" , name, routine);return 1 ; }if (info->magic !=CYCLADES_MAGIC ) { -printk (badmagic, name, routine); +printk ("cyc Warning: bad magic number for serial struct (%s) " +"in %s\n" , name, routine);return 1 ; }#endif
@@ -994,12 +989,12 @@ static int cyy_issue_cmd(void __iomem */* if the CCR never cleared, the previous command didn't finish within the "reasonable time" */ if (i ==100 ) -return (-1 ); +return -1 ;/* Issue the new command */ cy_writeb (base_addr + (CyCCR << index), cmd); -return (0 ); +return 0 ; }/* cyy_issue_cmd */ #ifdef CONFIG_ISA
@@ -1514,7 +1509,7 @@ cyz_fetch_msg(struct cyclades_card *cinf firm_id = cinfo->base_addr +ID_ADDRESS ;if (!ISZLOADED (*cinfo)) { -return (-1 ); +return -1 ; } zfw_ctrl = cinfo->base_addr + (cy_readl (&firm_id->zfwctrl_addr) &0xfffff );
@@ -1545,7 +1540,7 @@ cyz_issue_cmd(struct cyclades_card *cinf firm_id = cinfo->base_addr +ID_ADDRESS ;if (!ISZLOADED (*cinfo)) { -return (-1 ); +return -1 ; } zfw_ctrl = cinfo->base_addr + (cy_readl (&firm_id->zfwctrl_addr) &0xfffff );
@@ -1556,7 +1551,7 @@ cyz_issue_cmd(struct cyclades_card *cinf &((struct RUNTIME_9060 __iomem *)(cinfo->ctl_addr))->pci_doorbell;while ((cy_readl (pci_doorbell) &0xff ) !=0 ) {if (index++ ==1000 ) { -return ((int )(cy_readl (pci_doorbell) &0xff )); +return (int )(cy_readl (pci_doorbell) &0xff ); }udelay (50L ); }
@@ -1564,7 +1559,7 @@ cyz_issue_cmd(struct cyclades_card *cinfcy_writel (&board_ctrl->hcmd_param, param);cy_writel (pci_doorbell, (long )cmd); -return (0 ); +return 0 ; }/* cyz_issue_cmd */ static void
@@ -1962,8 +1957,6 @@ static void cyz_poll(unsigned long arg) cyz_timerlist.expires = jiffies + cyz_polling_cycle; }add_timer (&cyz_timerlist); - -return ; }/* cyz_poll */ #endif /* CONFIG_CYZ_INTR */
@@ -2321,7 +2314,6 @@ #endif#ifdef CY_DEBUG_OPEN printk (" cyc shutdown done\n" );#endif -return ; }/* shutdown */ /*
@@ -2352,8 +2344,7 @@ block_til_ready(struct tty_struct *tty,if (info->flags &ASYNC_CLOSING ) {interruptible_sleep_on (&info->close_wait); } -return ((info-> - flags &ASYNC_HUP_NOTIFY ) ? -EAGAIN : -ERESTARTSYS ); +return (info->flags &ASYNC_HUP_NOTIFY ) ? -EAGAIN : -ERESTARTSYS ; }/*
@@ -2632,8 +2623,7 @@ #endifif (tty_hung_up_p (filp) || (info->flags &ASYNC_CLOSING )) {if (info->flags &ASYNC_CLOSING )interruptible_sleep_on (&info->close_wait); -return ((info-> - flags &ASYNC_HUP_NOTIFY ) ? -EAGAIN : -ERESTARTSYS ); +return (info->flags &ASYNC_HUP_NOTIFY ) ? -EAGAIN : -ERESTARTSYS ; }/*
@@ -2730,7 +2720,7 @@ #endifbreak ; } }else { -// Nothing to do! +/* Nothing to do! */ }/* Run one more char cycle */ msleep_interruptible (jiffies_to_msecs (char_time *5 ));
@@ -2872,7 +2862,6 @@ #ifdef CY_DEBUG_OTHER#endif CY_UNLOCK (info, flags); -return ; }/* cy_close */ /* This routine gets called when tty_write has put something into
@@ -3056,7 +3045,7 @@ #ifdef Z_EXT_CHARS_IN_BUFFER#ifdef CY_DEBUG_IO printk ("cyc:cy_chars_in_buffer ttyC%d %d\n" , info->line, info->xmit_cnt + char_count);/* */ #endif - return (info->xmit_cnt + char_count); + return info->xmit_cnt + char_count; }#endif /* Z_EXT_CHARS_IN_BUFFER */ }/* cy_chars_in_buffer */
@@ -3921,7 +3910,7 @@ static int set_threshold(struct cycladescyy_issue_cmd (base_addr, CyCOR_CHANGE | CyCOR3ch, index);CY_UNLOCK (info, flags); }else { -// Nothing to do! +/* Nothing to do! */ }return 0 ; }/* set_threshold */
@@ -3945,7 +3934,7 @@ get_threshold(struct cyclades_port *info tmp =cy_readb (base_addr + (CyCOR3 << index)) & CyREC_FIFO;return put_user (tmp, value); }else { -// Nothing to do! +/* Nothing to do! */ return 0 ; } }/* get_threshold */
@@ -3982,7 +3971,7 @@ static int set_timeout(struct cyclades_pcy_writeb (base_addr + (CyRTPR << index), value &0xff );CY_UNLOCK (info, flags); }else { -// Nothing to do! +/* Nothing to do! */ }return 0 ; }/* set_timeout */
@@ -4005,7 +3994,7 @@ static int get_timeout(struct cyclades_p tmp =cy_readb (base_addr + (CyRTPR << index));return put_user (tmp, value); }else { -// Nothing to do! +/* Nothing to do! */ return 0 ; } }/* get_timeout */
@@ -4252,8 +4241,6 @@ #if 0 (tty->termios->c_cflag & CLOCAL))wake_up_interruptible (&info->open_wait);#endif - -return ; }/* cy_set_termios */ /* This function is used to send a high-priority XON/XOFF character to
@@ -4340,8 +4327,6 @@ #endif info->throttle =1 ; } } - -return ; }/* cy_throttle */ /*
@@ -4399,8 +4384,6 @@ #endif info->throttle =0 ; } } - -return ; }/* cy_unthrottle */ /* cy_start and cy_stop provide software output flow control as a
@@ -4437,10 +4420,8 @@ #endif cy_readb(base_addr + (CySRER << index)) & ~CyTxRdy);CY_UNLOCK (info, flags); }else { -// Nothing to do! +/* Nothing to do! */ } - -return ; }/* cy_stop */ static void cy_start (struct tty_struct *tty)
@@ -4473,10 +4454,8 @@ #endif cy_readb(base_addr + (CySRER << index)) | CyTxRdy);CY_UNLOCK (info, flags); }else { -// Nothing to do! +/* Nothing to do! */ } - -return ; }/* cy_start */ static void cy_flush_buffer (struct tty_struct *tty)
@@ -4664,7 +4643,7 @@ #endiffor (i =0 ; i <NR_ISA_ADDRS ; i++) {unsigned int isa_address = cy_isa_addresses[i];if (isa_address ==0x0000 ) { -return (nboard); +return nboard; }/* probe for CD1400... */
@@ -4694,7 +4673,7 @@ #endifprintk ("but no more channels are available.\n" );printk ("Change NR_PORTS in cyclades.c and recompile " "kernel.\n" ); -return (nboard); +return nboard; }/* fill the next cy_card structure available */ for (j =0 ; j <NR_CARDS ; j++) {
@@ -4707,7 +4686,7 @@ #endifprintk ("but no more cards can be used .\n" );printk ("Change NR_CARDS in cyclades.c and recompile " "kernel.\n" ); -return (nboard); +return nboard; }/* allocate IRQ */
@@ -4716,7 +4695,7 @@ #endifprintk ("Cyclom-Y/ISA found at 0x%lx " , (unsigned long )cy_isa_address);printk ("but could not allocate IRQ#%d.\n" , cy_isa_irq); -return (nboard); +return nboard; }/* set cy_card */
@@ -4737,9 +4716,9 @@ #endif cy_isa_nchan, cy_next_channel); cy_next_channel += cy_isa_nchan; } -return (nboard); +return nboard;#else -return (0 ); +return 0 ;#endif /* CONFIG_ISA */ }/* cy_detect_isa */
@@ -4870,7 +4849,7 @@ #endifprintk ("but no channels are available.\n" );printk ("Change NR_PORTS in cyclades.c and " "recompile kernel.\n" ); -return (i); +return i; }/* fill the next cy_card structure available */ for (j =0 ; j <NR_CARDS ; j++) {
@@ -4883,7 +4862,7 @@ #endifprintk ("but no more cards can be used.\n" );printk ("Change NR_CARDS in cyclades.c and " "recompile kernel.\n" ); -return (i); +return i; }/* allocate IRQ */
@@ -4893,7 +4872,7 @@ #endif (ulong) cy_pci_phys2);printk ("but could not allocate IRQ%d.\n" , cy_pci_irq); -return (i); +return i; }/* set cy_card */
@@ -5032,7 +5011,7 @@ #ifdef CY_PCI_DEBUGcy_writel (&((struct RUNTIME_9060 *) (cy_pci_addr0))->loc_addr_base,WIN_CREG ); - PAUSE +PAUSE ; printk("Cyclades-8Zo/PCI: FPGA id %lx, ver " "%lx\n", (ulong) (0xff & cy_readl(&((struct CUSTOM_REG *)
@@ -5053,7 +5032,7 @@ #endifensures that the driver will not attempt to talk to the board until it has been properly initialized. */ - PAUSE +PAUSE ;if ((mailbox ==ZO_V1 ) || (mailbox ==ZO_V2 ))cy_writel (cy_pci_addr2 +ID_ADDRESS ,0L );
@@ -5067,7 +5046,7 @@ #endif"no channels are available.\nChange " "NR_PORTS in cyclades.c and recompile " "kernel.\n", (ulong)cy_pci_phys2); -return (i); +return i; }/* fill the next cy_card structure available */
@@ -5080,7 +5059,7 @@ #endif"no more cards can be used.\nChange " "NR_CARDS in cyclades.c and recompile " "kernel.\n", (ulong)cy_pci_phys2); -return (i); +return i; }#ifdef CONFIG_CYZ_INTR /* allocate IRQ only if board has an IRQ */
@@ -5092,7 +5071,7 @@ #ifdef CONFIG_CYZ_INTR"but could not allocate " "IRQ%d.\n" , (ulong )cy_pci_phys2, cy_pci_irq); - return (i); + return i; } }#endif /* CONFIG_CYZ_INTR */
@@ -5152,7 +5131,7 @@ #ifdef CY_PCI_DEBUGprintk ("Cyclades-Z/PCI: New Cyclades-Z board. FPGA not " "loaded\n" );#endif -PAUSE +PAUSE ;/* This must be the new Cyclades-Ze/PCI. */ cy_pci_nchan =ZE_V1_NPORTS ;
@@ -5161,7 +5140,7 @@ #endif"are available.\nChange NR_PORTS in cyclades.c " "and recompile kernel.\n" , (ulong) cy_pci_phys2); -return (i); +return i; }/* fill the next cy_card structure available */
@@ -5174,7 +5153,7 @@ #endif"cards can be used.\nChange NR_CARDS in " "cyclades.c and recompile kernel.\n" , (ulong) cy_pci_phys2); -return (i); +return i; }#ifdef CONFIG_CYZ_INTR /* allocate IRQ only if board has an IRQ */
@@ -5186,7 +5165,7 @@ #ifdef CONFIG_CYZ_INTR (ulong) cy_pci_phys2);printk ("but could not allocate IRQ%d.\n" , cy_pci_irq); - return (i); + return i; } }#endif /* CONFIG_CYZ_INTR */
@@ -5225,9 +5204,9 @@ #endif /* CONFIG_CYZ_INTR */"used.\nChange NR_CARDS in cyclades.c and recompile " "kernel.\n", (unsigned int)Ze_phys2[0]); } -return (i); +return i;#else -return (0 ); +return 0 ;#endif /* ifdef CONFIG_PCI */ }/* cy_detect_pci */
@@ -5237,16 +5216,7 @@ #endif /* ifdef CONFIG_PCI */*/ static inline void show_version (void ) { -char *rcsvers, *rcsdate, *tmp; - rcsvers =strchr (rcsid,' ' ); - rcsvers++; - tmp =strchr (rcsvers,' ' ); - *tmp++ ='\0' ; - rcsdate =strchr (tmp,' ' ); - rcsdate++; - tmp =strrchr (rcsdate,' ' ); - *tmp ='\0' ; -printk ("Cyclades driver %s %s\n" , rcsvers, rcsdate); +printk ("Cyclades driver " CY_VERSION "\n" );printk (" built %s %s\n" , __DATE__, __TIME__); }/* show_version */
@@ -5275,14 +5245,11 @@ cyclades_get_proc_info(char *buf, char *if (info->count) size =sprintf (buf + len,"%3d %8lu %10lu %8lu %10lu " "%8lu %9lu %6ld\n" , info->line, -JIFFIES_DIFF (info->idle_stats.in_use, - cur_jifs) /HZ , + (cur_jifs - info->idle_stats.in_use) /HZ , info->idle_stats.xmit_bytes, -JIFFIES_DIFF (info->idle_stats.xmit_idle, - cur_jifs) /HZ , + (cur_jifs - info->idle_stats.xmit_idle) /HZ , info->idle_stats.recv_bytes, -JIFFIES_DIFF (info->idle_stats.recv_idle, - cur_jifs) /HZ , + (cur_jifs - info->idle_stats.recv_idle) /HZ , info->idle_stats.overruns, (long )info->tty->ldisc.num);else
PATCH 4/4 Char: cyclades, fix warnings
In reply to Jiri Slabycyclades, fix warnings
fix gcc signed/unsigned warnings
---
commit d58848fe07c13a82e9d429d481f9677857e73019
tree f3bb653ef8a7de4d91d172f1763904051849055b
parent 76495d5f78bf804b07f646abfbcb7a0a12938e11
author Jiri Slaby <[email protected]> Thu, 09 Nov 2006 22:21:54 +0100 committer Jiri Slaby <[email protected]> Thu, 09 Nov 2006 22:21:54 +0100
drivers/char/cyclades.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
drivers/char/cyclades.c +3 -2
@@ -1647,7 +1647,8 @@ #ifdef CONFIG_CYZ_INTR char_count = rx_put - rx_get; else char_count = rx_put - rx_get + rx_bufsize; -if (char_count >=cy_readl (&buf_ctrl->rx_threshold)) { +if (char_count >= (int )cy_readl (&buf_ctrl-> + rx_threshold)) {cy_sched_event (info, Cy_EVENT_Z_RX_FULL); }#endif
@@ -2944,7 +2945,7 @@ #endifreturn ;CY_LOCK (info, flags); -if (info->xmit_cnt >=SERIAL_XMIT_SIZE -1 ) { +if (info->xmit_cnt >= (int )(SERIAL_XMIT_SIZE -1 )) {CY_UNLOCK (info, flags);return ; }