--- a/drivers/char/isicom.c 2005-09-11 01:08:58.000000000 +0200 +++ b/drivers/char/isicom.c 2005-09-11 01:09:50.000000000 +0200 @@ -20,7 +20,7 @@ * 3/9/99 sameer Added support for ISI4616 cards. * * 16/9/99 sameer We do not force RTS low anymore. - * This is to prevent the firmware + * This is to prevent the firmware * from getting confused. * * 26/10/99 sameer Cosmetic changes:The driver now @@ -31,19 +31,19 @@ * * 10/5/00 sameer Fixed isicom_shutdown_board() * to not lower DTR on all the ports - * when the last port on the card is + * when the last port on the card is * closed. * * 10/5/00 sameer Signal mask setup command added - * to isicom_setup_port and + * to isicom_setup_port and * isicom_shutdown_port. * * 24/5/00 sameer The driver is now SMP aware. - * - * + * + * * 27/11/00 Vinayak P Risbud Fixed the Driver Crash Problem - * - * + * + * * 03/01/01 anil .s Added support for resetting the * internal modems on ISI cards. * @@ -52,7 +52,7 @@ * * 11/04/01 Kevin Fixed firmware load problem with * ISIHP-4X card - * + * * 30/04/01 anil .s Fixed the remote login through * ISI port problem. Now the link * does not go down before password @@ -62,9 +62,9 @@ * among ISI-PCI cards. * * 03/05/01 anil .s Added support to display the version - * info during insmod as well as module + * info during insmod as well as module * listing by lsmod. - * + * * 10/05/01 anil .s Done the modifications to the source * file and Install script so that the * same installation can be used for @@ -73,7 +73,7 @@ * 06/06/01 anil .s Now we drop both dtr and rts during * shutdown_port as well as raise them * during isicom_config_port. - * + * * 09/06/01 acme@conectiva.com.br use capable, not suser, do * restore_flags on failure in * isicom_send_break, verify put_user @@ -81,11 +81,11 @@ * * 11/02/03 ranjeeth Added support for 230 Kbps and 460 Kbps * Baud index extended to 21 - * + * * 20/03/03 ranjeeth Made to work for Linux Advanced server. - * Taken care of license warning. - * - * 10/12/03 Ravindra Made to work for Fedora Core 1 of + * Taken care of license warning. + * + * 10/12/03 Ravindra Made to work for Fedora Core 1 of * Red Hat Distribution * * 06/01/05 Alan Cox Merged the ISI and base kernel strands @@ -95,10 +95,10 @@ * * *********************************************************** * - * To use this driver you also need the support package. You + * To use this driver you also need the support package. You * can find this in RPM format on * ftp://ftp.linux.org.uk/pub/linux/alan - * + * * You can find the original tools for this direct from Multitech * ftp://ftp.multitech.com/ISI-Cards/ * @@ -175,18 +175,17 @@ static void isicom_start(struct tty_stru /* baud index mappings from linux defns to isi */ static s8 linuxb_to_isib[] = { - -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 13, 15, 16, 17, - 18, 19 + -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 13, 15, 16, 17, 18, 19 }; -struct isi_board { +struct isi_board { u16 base; u8 irq; u8 port_count; u16 status; u16 port_status; /* each bit represents a ... */ u16 shift_count; /* ... single port */ - struct isi_port * ports; + struct isi_port *ports; s8 count; u8 isa; spinlock_t card_lock; /* Card wide lock 11/5/00 -sameer */ @@ -194,7 +193,7 @@ struct isi_board { struct device device; }; -struct isi_port { +struct isi_port { u16 magic; unsigned int flags; int count; @@ -203,13 +202,13 @@ struct isi_port { u16 channel; u16 status; u16 closing_wait; - struct isi_board * card; - struct tty_struct * tty; + struct isi_board *card; + struct tty_struct *tty; wait_queue_head_t close_wait; wait_queue_head_t open_wait; struct work_struct hangup_tq; struct work_struct bh_tqueue; - u8 * xmit_buf; + u8 *xmit_buf; int xmit_head; int xmit_tail; int xmit_cnt; @@ -223,7 +222,7 @@ static struct isi_port isi_ports[PORT_C * the kernel lock for the card and have the card in a position that * it wants to talk. */ - + static int lock_card(struct isi_board *card) { char retries; @@ -232,7 +231,7 @@ static int lock_card(struct isi_board *c for (retries = 0; retries < 100; retries++) { spin_lock_irqsave(&card->card_lock, card->flags); if (inw(base + 0xe) & 0x1) { - return 1; + return 1; } else { spin_unlock_irqrestore(&card->card_lock, card->flags); udelay(1000); /* 1ms */ @@ -251,7 +250,7 @@ static int lock_card_at_interrupt(struct spin_lock_irqsave(&card->card_lock, card->flags); if (inw(base + 0xe) & 0x1) - return 1; + return 1; else spin_unlock_irqrestore(&card->card_lock, card->flags); } @@ -267,7 +266,7 @@ static void unlock_card(struct isi_board /* * ISI Card specific ops ... */ - + static void raise_dtr(struct isi_port * port) { struct isi_board * card = port->card; @@ -285,7 +284,7 @@ static void raise_dtr(struct isi_port * } static inline void drop_dtr(struct isi_port * port) -{ +{ struct isi_board * card = port->card; u16 base = card->base; u8 channel = port->channel; @@ -295,7 +294,7 @@ static inline void drop_dtr(struct isi_p outw(0x8000 | (channel << card->shift_count) | 0x02 , base); outw(0x0404, base); - InterruptTheCard(base); + InterruptTheCard(base); port->status &= ~ISI_DTR; unlock_card(card); } @@ -311,7 +310,7 @@ static inline void raise_rts(struct isi_ outw(0x8000 | (channel << card->shift_count) | 0x02 , base); outw(0x0a04, base); - InterruptTheCard(base); + InterruptTheCard(base); port->status |= ISI_RTS; unlock_card(card); } @@ -326,7 +325,7 @@ static inline void drop_rts(struct isi_p outw(0x8000 | (channel << card->shift_count) | 0x02 , base); outw(0x0804, base); - InterruptTheCard(base); + InterruptTheCard(base); port->status &= ~ISI_RTS; unlock_card(card); } @@ -358,7 +357,7 @@ static void drop_dtr_rts(struct isi_port outw(0x8000 | (channel << card->shift_count) | 0x02 , base); outw(0x0c04, base); - InterruptTheCard(base); + InterruptTheCard(base); port->status &= ~(ISI_RTS | ISI_DTR); unlock_card(card); } @@ -374,7 +373,7 @@ static inline void kill_queue(struct isi outw(0x8000 | (channel << card->shift_count) | 0x02 , base); outw((queue << 8) | 0x06, base); - InterruptTheCard(base); + InterruptTheCard(base); unlock_card(card); } @@ -396,13 +395,13 @@ static inline int isicom_paranoia_check( printk(KERN_WARNING "ISICOM: Warning: NULL isicom port for " "dev %s in %s.\n", name, routine); return 1; - } -#endif + } +#endif return 0; } - + /* - * Transmitter. + * Transmitter. * * We shovel data into the card buffers on a regular basis. The card * will do the rest of the work for us. @@ -414,23 +413,23 @@ static void isicom_tx(unsigned long _dat short txcount, wrd, residue, word_count, cnt; struct isi_port * port; struct tty_struct * tty; - + #ifdef ISICOM_DEBUG ++tx_count; -#endif - +#endif + /* find next active board */ card = (prev_card + 1) & 0x0003; while(count-- > 0) { - if (isi_card[card].status & BOARD_ACTIVE) + if (isi_card[card].status & BOARD_ACTIVE) break; - card = (card + 1) & 0x0003; + card = (card + 1) & 0x0003; } if (!(isi_card[card].status & BOARD_ACTIVE)) goto sched_again; - + prev_card = card; - + count = isi_card[card].port_count; port = isi_card[card].ports; base = isi_card[card].base; @@ -442,15 +441,15 @@ static void isicom_tx(unsigned long _dat !(port->status & ISI_TXOK)) unlock_card(&isi_card[card]); continue; - + tty = port->tty; - - + + if(tty == NULL) { unlock_card(&isi_card[card]); continue; } - + txcount = min_t(short, TX_SIZE, port->xmit_cnt); if (txcount <= 0 || tty->stopped || tty->hw_stopped) { unlock_card(&isi_card[card]); @@ -458,16 +457,16 @@ static void isicom_tx(unsigned long _dat } if (!(inw(base + 0x02) & (1 << port->channel))) { unlock_card(&isi_card[card]); - continue; + continue; } #ifdef ISICOM_DEBUG - printk(KERN_DEBUG "ISICOM: txing %d bytes, port%d.\n", - txcount, port->channel+1); -#endif + printk(KERN_DEBUG "ISICOM: txing %d bytes, port%d.\n", + txcount, port->channel+1); +#endif outw((port->channel << isi_card[card].shift_count) | txcount , base); residue = NO; - wrd = 0; + wrd = 0; while (1) { cnt = min_t(int, txcount, (SERIAL_XMIT_SIZE - port->xmit_tail)); if (residue == YES) { @@ -478,13 +477,13 @@ static void isicom_tx(unsigned long _dat port->xmit_cnt--; txcount--; cnt--; - outw(wrd, base); + outw(wrd, base); } else { outw(wrd, base); break; } - } + } if (cnt <= 0) break; word_count = cnt >> 1; outsw(base, port->xmit_buf+port->xmit_tail, word_count); @@ -521,14 +520,14 @@ sched_again: tx.data = 0; tx.function = isicom_tx; add_timer(&tx); - - return; -} - + + return; +} + /* Interrupt handlers */ - -static void isicom_bottomhalf(void * data) + +static void isicom_bottomhalf(void *data) { struct isi_port * port = (struct isi_port *) data; struct tty_struct * tty = port->tty; @@ -536,14 +535,14 @@ static void isicom_bottomhalf(void * dat if (!tty) return; - tty_wakeup(tty); + tty_wakeup(tty); wake_up_interruptible(&tty->write_wait); -} - +} + /* - * Main interrupt handler routine + * Main interrupt handler routine */ - + static irqreturn_t isicom_interrupt(int irq, void *dev_id, struct pt_regs *regs) { @@ -571,21 +570,21 @@ static irqreturn_t isicom_interrupt(int outw(0x8000, base+0x04); ClearInterrupt(base); } - + inw(base); /* get the dummy word out */ header = inw(base); channel = (header & 0x7800) >> card->shift_count; byte_count = header & 0xff; if (channel + 1 > card->port_count) { - printk(KERN_WARNING "ISICOM: isicom_interrupt(0x%x): %d(channel) > port_count.\n", - base, channel+1); + printk(KERN_WARNING "ISICOM: isicom_interrupt(0x%x): " + "%d(channel) > port_count.\n", base, channel + 1); if (card->isa) ClearInterrupt(base); else - outw(0x0000, base+0x04); /* enable interrupts */ + outw(0x0000, base+0x04); /* enable interrupts */ spin_unlock(&card->card_lock); - return IRQ_HANDLED; + return IRQ_HANDLED; } port = card->ports + channel; if (!(port->flags & ASYNC_INITIALIZED)) { @@ -594,8 +593,8 @@ static irqreturn_t isicom_interrupt(int else outw(0x0000, base+0x04); /* enable interrupts */ return IRQ_HANDLED; - } - + } + tty = port->tty; if (tty == NULL) { word_count = byte_count >> 1; @@ -612,19 +611,19 @@ static irqreturn_t isicom_interrupt(int spin_unlock(&card->card_lock); return IRQ_HANDLED; } - + if (header & 0x8000) { /* Status Packet */ header = inw(base); switch(header & 0xff) { case 0: /* Change in EIA signals */ - + if (port->flags & ASYNC_CHECK_CD) { if (port->status & ISI_DCD) { if (!(header & ISI_DCD)) { /* Carrier has been lost */ -#ifdef ISICOM_DEBUG +#ifdef ISICOM_DEBUG printk(KERN_DEBUG "ISICOM: interrupt: DCD->low.\n"); -#endif +#endif port->status &= ~ISI_DCD; schedule_work(&port->hangup_tq); } @@ -634,19 +633,19 @@ static irqreturn_t isicom_interrupt(int /* Carrier has been detected */ #ifdef ISICOM_DEBUG printk(KERN_DEBUG "ISICOM: interrupt: DCD->high.\n"); -#endif +#endif port->status |= ISI_DCD; wake_up_interruptible(&port->open_wait); } } } else { - if (header & ISI_DCD) + if (header & ISI_DCD) port->status |= ISI_DCD; else port->status &= ~ISI_DCD; - } - + } + if (port->flags & ASYNC_CTS_FLOW) { if (port->tty->hw_stopped) { if (header & ISI_CTS) { @@ -665,24 +664,24 @@ static irqreturn_t isicom_interrupt(int } } else { - if (header & ISI_CTS) + if (header & ISI_CTS) port->status |= ISI_CTS; else port->status &= ~ISI_CTS; } - - if (header & ISI_DSR) + + if (header & ISI_DSR) port->status |= ISI_DSR; else port->status &= ~ISI_DSR; - - if (header & ISI_RI) + + if (header & ISI_RI) port->status |= ISI_RI; else - port->status &= ~ISI_RI; - + port->status &= ~ISI_RI; + break; - + case 1: /* Received Break !!! */ tty_insert_flip_char(tty, 0, TTY_BREAK); if (port->flags & ASYNC_SAK) @@ -697,13 +696,13 @@ static irqreturn_t isicom_interrupt(int default: printk(KERN_WARNING "ISICOM: Intr: Unknown code in status packet.\n"); break; - } + } } else { /* Data Packet */ count = tty_prepare_flip_string(tty, &rp, byte_count & ~1); #ifdef ISICOM_DEBUG - printk(KERN_DEBUG "ISICOM: Intr: Can rx %d of %d bytes.\n", + printk(KERN_DEBUG "ISICOM: Intr: Can rx %d of %d bytes.\n", count, byte_count); #endif word_count = count >> 1; @@ -726,9 +725,9 @@ static irqreturn_t isicom_interrupt(int if (card->isa == YES) ClearInterrupt(base); else - outw(0x0000, base+0x04); /* enable interrupts */ + outw(0x0000, base+0x04); /* enable interrupts */ return IRQ_HANDLED; -} +} static void isicom_config_port(struct isi_port * port) { @@ -738,43 +737,43 @@ static void isicom_config_port(struct is u16 channel_setup, base = card->base; u16 channel = port->channel, shift_count = card->shift_count; u8 flow_ctrl; - + if (!(tty = port->tty) || !tty->termios) return; baud = C_BAUD(tty); if (baud & CBAUDEX) { baud &= ~CBAUDEX; - + /* if CBAUDEX bit is on and the baud is set to either 50 or 75 * then the card is programmed for 57.6Kbps or 115Kbps * respectively. - */ - + */ + if (baud < 1 || baud > 2) port->tty->termios->c_cflag &= ~CBAUDEX; else baud += 15; - } + } if (baud == 15) { - - /* the ASYNC_SPD_HI and ASYNC_SPD_VHI options are set + + /* the ASYNC_SPD_HI and ASYNC_SPD_VHI options are set * by the set_serial_info ioctl ... this is done by * the 'setserial' utility. - */ - + */ + if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI) baud++; /* 57.6 Kbps */ if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI) - baud +=2; /* 115 Kbps */ + baud +=2; /* 115 Kbps */ } if (linuxb_to_isib[baud] == -1) { /* hang up */ drop_dtr(port); return; - } - else + } + else raise_dtr(port); - + if (lock_card(card)) { outw(0x8000 | (channel << shift_count) |0x03, base); outw(linuxb_to_isib[baud] << 8 | 0x03, base); @@ -793,35 +792,35 @@ static void isicom_config_port(struct is channel_setup |= ISICOM_CS8; break; } - + if (C_CSTOPB(tty)) channel_setup |= ISICOM_2SB; if (C_PARENB(tty)) { channel_setup |= ISICOM_EVPAR; if (C_PARODD(tty)) - channel_setup |= ISICOM_ODPAR; + channel_setup |= ISICOM_ODPAR; } - outw(channel_setup, base); + outw(channel_setup, base); InterruptTheCard(base); - unlock_card(card); - } + unlock_card(card); + } if (C_CLOCAL(tty)) port->flags &= ~ASYNC_CHECK_CD; else - port->flags |= ASYNC_CHECK_CD; - + port->flags |= ASYNC_CHECK_CD; + /* flow control settings ...*/ flow_ctrl = 0; port->flags &= ~ASYNC_CTS_FLOW; if (C_CRTSCTS(tty)) { port->flags |= ASYNC_CTS_FLOW; flow_ctrl |= ISICOM_CTSRTS; - } - if (I_IXON(tty)) + } + if (I_IXON(tty)) flow_ctrl |= ISICOM_RESPOND_XONXOFF; if (I_IXOFF(tty)) - flow_ctrl |= ISICOM_INITIATE_XONXOFF; - + flow_ctrl |= ISICOM_INITIATE_XONXOFF; + if (lock_card(card)) { outw(0x8000 | (channel << shift_count) |0x04, base); outw(flow_ctrl << 8 | 0x05, base); @@ -829,22 +828,22 @@ static void isicom_config_port(struct is InterruptTheCard(base); unlock_card(card); } - + /* rx enabled -> enable port for rx on the card */ if (C_CREAD(tty)) { card->port_status |= (1 << channel); outw(card->port_status, base + 0x02); } } - -/* open et all */ + +/* open et all */ static inline void isicom_setup_board(struct isi_board * bp) { int channel; struct isi_port * port; unsigned long flags; - + spin_lock_irqsave(&bp->card_lock, flags); if (bp->status & BOARD_ACTIVE) { spin_unlock_irqrestore(&bp->card_lock, flags); @@ -857,47 +856,47 @@ static inline void isicom_setup_board(st drop_dtr_rts(port); return; } - + static int isicom_setup_port(struct isi_port * port) { struct isi_board * card = port->card; unsigned long flags; - + if (port->flags & ASYNC_INITIALIZED) { return 0; } if (!port->xmit_buf) { unsigned long page; - + if (!(page = get_zeroed_page(GFP_KERNEL))) return -ENOMEM; - + if (port->xmit_buf) { free_page(page); return -ERESTARTSYS; } - port->xmit_buf = (u8 *) page; - } + port->xmit_buf = (u8 *) page; + } spin_lock_irqsave(&card->card_lock, flags); if (port->tty) clear_bit(TTY_IO_ERROR, &port->tty->flags); if (port->count == 1) card->count++; - + port->xmit_cnt = port->xmit_head = port->xmit_tail = 0; - + /* discard any residual data */ kill_queue(port, ISICOM_KILLTX | ISICOM_KILLRX); - + isicom_config_port(port); port->flags |= ASYNC_INITIALIZED; spin_unlock_irqrestore(&card->card_lock, flags); - - return 0; -} - -static int block_til_ready(struct tty_struct * tty, struct file * filp, struct isi_port * port) + + return 0; +} + +static int block_til_ready(struct tty_struct * tty, struct file * filp, struct isi_port * port) { struct isi_board * card = port->card; int do_clocal = 0, retval; @@ -907,30 +906,30 @@ static int block_til_ready(struct tty_st /* block if port is in the process of being closed */ if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING) { -#ifdef ISICOM_DEBUG +#ifdef ISICOM_DEBUG printk(KERN_DEBUG "ISICOM: block_til_ready: close in progress.\n"); -#endif +#endif interruptible_sleep_on(&port->close_wait); if (port->flags & ASYNC_HUP_NOTIFY) return -EAGAIN; else return -ERESTARTSYS; } - + /* if non-blocking mode is set ... */ - + if ((filp->f_flags & O_NONBLOCK) || (tty->flags & (1 << TTY_IO_ERROR))) { -#ifdef ISICOM_DEBUG +#ifdef ISICOM_DEBUG printk(KERN_DEBUG "ISICOM: block_til_ready: non-block mode.\n"); -#endif +#endif port->flags |= ASYNC_NORMAL_ACTIVE; - return 0; - } - + return 0; + } + if (C_CLOCAL(tty)) do_clocal = 1; - - /* block waiting for DCD to be asserted, and while + + /* block waiting for DCD to be asserted, and while callout dev is busy */ retval = 0; add_wait_queue(&port->open_wait, &wait); @@ -940,27 +939,27 @@ static int block_til_ready(struct tty_st port->count--; port->blocked_open++; spin_unlock_irqrestore(&card->card_lock, flags); - + while (1) { raise_dtr_rts(port); set_current_state(TASK_INTERRUPTIBLE); - if (tty_hung_up_p(filp) || !(port->flags & ASYNC_INITIALIZED)) { + if (tty_hung_up_p(filp) || !(port->flags & ASYNC_INITIALIZED)) { if (port->flags & ASYNC_HUP_NOTIFY) retval = -EAGAIN; else retval = -ERESTARTSYS; break; - } + } if (!(port->flags & ASYNC_CLOSING) && (do_clocal || (port->status & ISI_DCD))) { break; - } + } if (signal_pending(current)) { retval = -ERESTARTSYS; break; } - schedule(); + schedule(); } set_current_state(TASK_RUNNING); remove_wait_queue(&port->open_wait, &wait); @@ -974,7 +973,7 @@ static int block_til_ready(struct tty_st port->flags |= ASYNC_NORMAL_ACTIVE; return 0; } - + static int isicom_open(struct tty_struct * tty, struct file * filp) { struct isi_port * port; @@ -987,20 +986,20 @@ static int isicom_open(struct tty_struct return -ENODEV; board = BOARD(line); card = &isi_card[board]; - + if (!(card->status & FIRMWARE_LOADED)) return -ENODEV; - + /* open on a port greater than the port count for the card !!! */ if (line > ((board * 16) + card->port_count - 1)) return -ENODEV; - port = &isi_ports[line]; + port = &isi_ports[line]; if (isicom_paranoia_check(port, tty->name, "isicom_open")) return -ENODEV; - - isicom_setup_board(card); - + + isicom_setup_board(card); + port->count++; tty->driver_data = port; port->tty = tty; @@ -1009,9 +1008,9 @@ static int isicom_open(struct tty_struct if ((error = block_til_ready(tty, filp, port))!=0) return error; - return 0; + return 0; } - + /* close et all */ static inline void isicom_shutdown_board(struct isi_board * bp) @@ -1028,12 +1027,12 @@ static inline void isicom_shutdown_board static void isicom_shutdown_port(struct isi_port * port) { struct isi_board * card = port->card; - struct tty_struct * tty; + struct tty_struct * tty; unsigned long flags; - + tty = port->tty; - spin_lock_irqsave(&card->card_lock, flags); + spin_lock_irqsave(&card->card_lock, flags); if (!(port->flags & ASYNC_INITIALIZED)) { spin_unlock_irqrestore(&card->card_lock, flags); return; @@ -1041,32 +1040,32 @@ static void isicom_shutdown_port(struct if (port->xmit_buf) { free_page((unsigned long) port->xmit_buf); port->xmit_buf = NULL; - } + } port->flags &= ~ASYNC_INITIALIZED; /* 3rd October 2000 : Vinayak P Risbud */ port->tty = NULL; spin_unlock_irqrestore(&card->card_lock, flags); - + /*Fix done by Anil .S on 30-04-2001 remote login through isi port has dtr toggle problem due to which the carrier drops before the password prompt - appears on the remote end. Now we drop the dtr only if the + appears on the remote end. Now we drop the dtr only if the HUPCL(Hangup on close) flag is set for the tty*/ - - if (C_HUPCL(tty)) + + if (C_HUPCL(tty)) /* drop dtr on this port */ drop_dtr(port); - - /* any other port uninits */ + + /* any other port uninits */ if (tty) set_bit(TTY_IO_ERROR, &tty->flags); - + if (--card->count < 0) { - printk(KERN_DEBUG "ISICOM: isicom_shutdown_port: bad board(0x%x) count %d.\n", - card->base, card->count); - card->count = 0; + printk(KERN_DEBUG "ISICOM: isicom_shutdown_port: bad " + "board(0x%x) count %d.\n", card->base, card->count); + card->count = 0; } - + /* last port was closed , shutdown that boad too */ if(C_HUPCL(tty)) { if (!card->count) @@ -1079,55 +1078,55 @@ static void isicom_close(struct tty_stru struct isi_port * port = (struct isi_port *) tty->driver_data; struct isi_board * card = port->card; unsigned long flags; - + if (!port) return; if (isicom_paranoia_check(port, tty->name, "isicom_close")) return; - -#ifdef ISICOM_DEBUG + +#ifdef ISICOM_DEBUG printk(KERN_DEBUG "ISICOM: Close start!!!.\n"); -#endif - +#endif + spin_lock_irqsave(&card->card_lock, flags); if (tty_hung_up_p(filp)) { spin_unlock_irqrestore(&card->card_lock, flags); return; } - + if (tty->count == 1 && port->count != 1) { - printk(KERN_WARNING "ISICOM:(0x%x) isicom_close: bad port count" - "tty->count = 1 port count = %d.\n", - card->base, port->count); + printk(KERN_WARNING "ISICOM:(0x%x) isicom_close: bad port " + "count tty->count = 1 port count = %d.\n", card->base, + port->count); port->count = 1; } if (--port->count < 0) { - printk(KERN_WARNING "ISICOM:(0x%x) isicom_close: bad port count for" - "channel%d = %d", card->base, port->channel, + printk(KERN_WARNING "ISICOM:(0x%x) isicom_close: bad port " + "count for channel%d = %d", card->base, port->channel, port->count); - port->count = 0; + port->count = 0; } - + if (port->count) { spin_unlock_irqrestore(&card->card_lock, flags); return; - } + } port->flags |= ASYNC_CLOSING; tty->closing = 1; spin_unlock_irqrestore(&card->card_lock, flags); - + if (port->closing_wait != ASYNC_CLOSING_WAIT_NONE) tty_wait_until_sent(tty, port->closing_wait); - /* indicate to the card that no more data can be received + /* indicate to the card that no more data can be received on this port */ spin_lock_irqsave(&card->card_lock, flags); - if (port->flags & ASYNC_INITIALIZED) { + if (port->flags & ASYNC_INITIALIZED) { card->port_status &= ~(1 << port->channel); outw(card->port_status, card->base + 0x02); - } + } isicom_shutdown_port(port); spin_unlock_irqrestore(&card->card_lock, flags); - + if (tty->driver->flush_buffer) tty->driver->flush_buffer(tty); tty_ldisc_flush(tty); @@ -1138,14 +1137,14 @@ static void isicom_close(struct tty_stru if (port->blocked_open) { spin_unlock_irqrestore(&card->card_lock, flags); if (port->close_delay) { -#ifdef ISICOM_DEBUG +#ifdef ISICOM_DEBUG printk(KERN_DEBUG "ISICOM: scheduling until time out.\n"); -#endif +#endif msleep_interruptible(jiffies_to_msecs(port->close_delay)); } spin_lock_irqsave(&card->card_lock, flags); wake_up_interruptible(&port->open_wait); - } + } port->flags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_CLOSING); wake_up_interruptible(&port->close_wait); spin_unlock_irqrestore(&card->card_lock, flags); @@ -1165,26 +1164,27 @@ static int isicom_write(struct tty_struc if (!tty || !port->xmit_buf) return 0; - + spin_lock_irqsave(&card->card_lock, flags); - - while(1) { - cnt = min_t(int, count, min(SERIAL_XMIT_SIZE - port->xmit_cnt - 1, - SERIAL_XMIT_SIZE - port->xmit_head)); - if (cnt <= 0) + + while(1) { + cnt = min_t(int, count, min(SERIAL_XMIT_SIZE - port->xmit_cnt + - 1, SERIAL_XMIT_SIZE - port->xmit_head)); + if (cnt <= 0) break; - + memcpy(port->xmit_buf + port->xmit_head, buf, cnt); - port->xmit_head = (port->xmit_head + cnt) & (SERIAL_XMIT_SIZE - 1); + port->xmit_head = (port->xmit_head + cnt) & (SERIAL_XMIT_SIZE + - 1); port->xmit_cnt += cnt; buf += cnt; count -= cnt; total += cnt; - } + } if (port->xmit_cnt && !tty->stopped && !tty->hw_stopped) port->status |= ISI_TXOK; spin_unlock_irqrestore(&card->card_lock, flags); - return total; + return total; } /* put_char et all */ @@ -1193,10 +1193,10 @@ static void isicom_put_char(struct tty_s struct isi_port * port = (struct isi_port *) tty->driver_data; struct isi_board * card = port->card; unsigned long flags; - + if (isicom_paranoia_check(port, tty->name, "isicom_put_char")) return; - + if (!tty || !port->xmit_buf) return; @@ -1205,7 +1205,7 @@ static void isicom_put_char(struct tty_s spin_unlock_irqrestore(&card->card_lock, flags); return; } - + port->xmit_buf[port->xmit_head++] = ch; port->xmit_head &= (SERIAL_XMIT_SIZE - 1); port->xmit_cnt++; @@ -1216,16 +1216,17 @@ static void isicom_put_char(struct tty_s static void isicom_flush_chars(struct tty_struct * tty) { struct isi_port * port = (struct isi_port *) tty->driver_data; - + if (isicom_paranoia_check(port, tty->name, "isicom_flush_chars")) return; - - if (port->xmit_cnt <= 0 || tty->stopped || tty->hw_stopped || !port->xmit_buf) + + if (port->xmit_cnt <= 0 || tty->stopped || tty->hw_stopped || + !port->xmit_buf) return; - + /* this tells the transmitter to consider this port for data output to the card ... that's the best we can do. */ - port->status |= ISI_TXOK; + port->status |= ISI_TXOK; } /* write_room et all */ @@ -1236,7 +1237,7 @@ static int isicom_write_room(struct tty_ if (isicom_paranoia_check(port, tty->name, "isicom_write_room")) return 0; - + free = SERIAL_XMIT_SIZE - port->xmit_cnt - 1; if (free < 0) free = 0; @@ -1253,14 +1254,15 @@ static int isicom_chars_in_buffer(struct } /* ioctl et all */ -static inline void isicom_send_break(struct isi_port * port, unsigned long length) +static inline void isicom_send_break(struct isi_port * port, + unsigned long length) { struct isi_board * card = port->card; - u16 base = card->base; - + u16 base = card->base; + if(!lock_card(card)) return; - + outw(0x8000 | ((port->channel) << (card->shift_count)) | 0x3, base); outw((length & 0xff) << 8 | 0x00, base); outw((length & 0xff00), base); @@ -1277,7 +1279,7 @@ static int isicom_tiocmget(struct tty_st if (isicom_paranoia_check(port, tty->name, "isicom_ioctl")) return -ENODEV; - + return ((status & ISI_RTS) ? TIOCM_RTS : 0) | ((status & ISI_DTR) ? TIOCM_DTR : 0) | ((status & ISI_DCD) ? TIOCM_CAR : 0) | @@ -1290,10 +1292,10 @@ static int isicom_tiocmset(struct tty_st unsigned int set, unsigned int clear) { struct isi_port * port = (struct isi_port *) tty->driver_data; - + if (isicom_paranoia_check(port, tty->name, "isicom_ioctl")) return -ENODEV; - + if (set & TIOCM_RTS) raise_rts(port); if (set & TIOCM_DTR) @@ -1305,46 +1307,46 @@ static int isicom_tiocmset(struct tty_st drop_dtr(port); return 0; -} +} static int isicom_set_serial_info(struct isi_port * port, - struct serial_struct __user *info) + struct serial_struct __user *info) { struct serial_struct newinfo; int reconfig_port; if(copy_from_user(&newinfo, info, sizeof(newinfo))) return -EFAULT; - - reconfig_port = ((port->flags & ASYNC_SPD_MASK) != + + reconfig_port = ((port->flags & ASYNC_SPD_MASK) != (newinfo.flags & ASYNC_SPD_MASK)); - + if (!capable(CAP_SYS_ADMIN)) { if ((newinfo.close_delay != port->close_delay) || (newinfo.closing_wait != port->closing_wait) || - ((newinfo.flags & ~ASYNC_USR_MASK) != + ((newinfo.flags & ~ASYNC_USR_MASK) != (port->flags & ~ASYNC_USR_MASK))) return -EPERM; port->flags = ((port->flags & ~ ASYNC_USR_MASK) | (newinfo.flags & ASYNC_USR_MASK)); - } + } else { port->close_delay = newinfo.close_delay; - port->closing_wait = newinfo.closing_wait; - port->flags = ((port->flags & ~ASYNC_FLAGS) | + port->closing_wait = newinfo.closing_wait; + port->flags = ((port->flags & ~ASYNC_FLAGS) | (newinfo.flags & ASYNC_FLAGS)); } if (reconfig_port) { isicom_config_port(port); } - return 0; -} + return 0; +} -static int isicom_get_serial_info(struct isi_port * port, - struct serial_struct __user *info) +static int isicom_get_serial_info(struct isi_port * port, + struct serial_struct __user *info) { struct serial_struct out_info; - + memset(&out_info, 0, sizeof(out_info)); /* out_info.type = ? */ out_info.line = port - isi_ports; @@ -1357,10 +1359,10 @@ static int isicom_get_serial_info(struct if(copy_to_user(info, &out_info, sizeof(out_info))) return -EFAULT; return 0; -} +} static int isicom_ioctl(struct tty_struct * tty, struct file * filp, - unsigned int cmd, unsigned long arg) + unsigned int cmd, unsigned long arg) { struct isi_port * port = (struct isi_port *) tty->driver_data; void __user *argp = (void __user *)arg; @@ -1378,34 +1380,35 @@ static int isicom_ioctl(struct tty_struc if (!arg) isicom_send_break(port, HZ/4); return 0; - - case TCSBRKP: + + case TCSBRKP: retval = tty_check_change(tty); if (retval) return retval; tty_wait_until_sent(tty, 0); isicom_send_break(port, arg ? arg * (HZ/10) : HZ/4); return 0; - + case TIOCGSOFTCAR: - return put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned long __user *)argp); - + return put_user(!!C_CLOCAL(tty), + (unsigned long __user *)argp); + case TIOCSSOFTCAR: if(get_user(arg, (unsigned long __user *) argp)) return -EFAULT; tty->termios->c_cflag = ((tty->termios->c_cflag & ~CLOCAL) | (arg ? CLOCAL : 0)); - return 0; - + return 0; + case TIOCGSERIAL: return isicom_get_serial_info(port, argp); - + case TIOCSSERIAL: return isicom_set_serial_info(port, argp); - + default: - return -ENOIOCTLCMD; + return -ENOIOCTLCMD; } return 0; } @@ -1414,21 +1417,21 @@ static int isicom_ioctl(struct tty_struc static void isicom_set_termios(struct tty_struct * tty, struct termios * old_termios) { struct isi_port * port = (struct isi_port *) tty->driver_data; - + if (isicom_paranoia_check(port, tty->name, "isicom_set_termios")) return; - + if (tty->termios->c_cflag == old_termios->c_cflag && tty->termios->c_iflag == old_termios->c_iflag) return; - + isicom_config_port(port); - + if ((old_termios->c_cflag & CRTSCTS) && - !(tty->termios->c_cflag & CRTSCTS)) { + !(tty->termios->c_cflag & CRTSCTS)) { tty->hw_stopped = 0; - isicom_start(tty); - } + isicom_start(tty); + } } /* throttle et all */ @@ -1436,10 +1439,10 @@ static void isicom_throttle(struct tty_s { struct isi_port * port = (struct isi_port *) tty->driver_data; struct isi_board * card = port->card; - + if (isicom_paranoia_check(port, tty->name, "isicom_throttle")) return; - + /* tell the card that this port cannot handle any more data for now */ card->port_status &= ~(1 << port->channel); outw(card->port_status, card->base + 0x02); @@ -1450,10 +1453,10 @@ static void isicom_unthrottle(struct tty { struct isi_port * port = (struct isi_port *) tty->driver_data; struct isi_board * card = port->card; - + if (isicom_paranoia_check(port, tty->name, "isicom_unthrottle")) return; - + /* tell the card that this port is ready to accept more data */ card->port_status |= (1 << port->channel); outw(card->port_status, card->base + 0x02); @@ -1466,7 +1469,7 @@ static void isicom_stop(struct tty_struc if (isicom_paranoia_check(port, tty->name, "isicom_stop")) return; - + /* this tells the transmitter not to consider this port for data output to the card. */ port->status &= ~ISI_TXOK; @@ -1476,10 +1479,10 @@ static void isicom_stop(struct tty_struc static void isicom_start(struct tty_struct * tty) { struct isi_port * port = (struct isi_port *) tty->driver_data; - + if (isicom_paranoia_check(port, tty->name, "isicom_start")) return; - + /* this tells the transmitter to consider this port for data output to the card. */ port->status |= ISI_TXOK; @@ -1490,7 +1493,7 @@ static void do_isicom_hangup(void * data { struct isi_port * port = (struct isi_port *) data; struct tty_struct * tty; - + tty = port->tty; if (tty) tty_hangup(tty); @@ -1499,10 +1502,10 @@ static void do_isicom_hangup(void * data static void isicom_hangup(struct tty_struct * tty) { struct isi_port * port = (struct isi_port *) tty->driver_data; - + if (isicom_paranoia_check(port, tty->name, "isicom_hangup")) return; - + isicom_shutdown_port(port); port->count = 0; port->flags &= ~ASYNC_NORMAL_ACTIVE; @@ -1516,14 +1519,14 @@ static void isicom_flush_buffer(struct t struct isi_port * port = (struct isi_port *) tty->driver_data; struct isi_board * card = port->card; unsigned long flags; - + if (isicom_paranoia_check(port, tty->name, "isicom_flush_buffer")) return; - + spin_lock_irqsave(&card->card_lock, flags); port->xmit_cnt = port->xmit_head = port->xmit_tail = 0; spin_unlock_irqrestore(&card->card_lock, flags); - + wake_up_interruptible(&tty->write_wait); tty_wakeup(tty); } @@ -1533,7 +1536,7 @@ static int register_ioregion(struct isi_ { if (!board->base) return 0; - + if (!request_region(board->base, 16, ISICOM_NAME)) { printk(KERN_DEBUG "ISICOM: I/O Region 0x%x-0x%x is busy. " "Card%d will be disabled.\n", board->base, @@ -1639,7 +1642,7 @@ static int register_isr(struct isi_board index + 1); return retval; } - + return 0; } @@ -1896,7 +1899,7 @@ errrelfw: /* * Insmod can set static symbols so keep these static */ - + static int io[4]; static int irq[4]; static int card; @@ -1975,7 +1978,7 @@ static void __devexit isicom_remove(stru if (idx == BOARD_COUNT) return; - + unregister_isr(&isi_card[idx]); unregister_ioregion(&isi_card[idx], idx); } @@ -2039,16 +2042,16 @@ static int __devinit isicom_setup(void) printk(KERN_ERR "ISICOM: Unable to register pci driver.\n"); goto error; } - + init_timer(&tx); tx.expires = jiffies + 1; tx.data = 0; tx.function = isicom_tx; re_schedule = 1; add_timer(&tx); - + return 0; - + error: return retval; }