* [PATCH -mm 1/2] drivers/char/isicom old api rewritten @ 2005-09-10 23:19 Jiri Slaby 2005-09-10 23:21 ` [PATCH -mm 2/2] drivers/char/isicom whitespace cleanup Jiri Slaby 2005-09-10 23:53 ` [PATCH -mm 1/2] drivers/char/isicom old api rewritten Andrew Morton 0 siblings, 2 replies; 22+ messages in thread From: Jiri Slaby @ 2005-09-10 23:19 UTC (permalink / raw) To: Andrew Morton; +Cc: Greg KH, Linux Kernel Mailing List This patch removes old api in pci probing and replaces it with new. Firmware loading added. Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> drivers/char/isicom.c | 1056 ++++++++++++++++++++++++------------------------- include/linux/isicom.h | 54 -- 2 files changed, 539 insertions(+), 571 deletions(-) Patch is here for its size (40 KiB): http://www.fi.muni.cz/~xslaby/lnx/isi_main.txt -- Jiri Slaby www.fi.muni.cz/~xslaby ~\-/~ jirislaby@gmail.com ~\-/~ 241B347EC88228DE51EE A49C4A73A25004CB2A10 ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH -mm 2/2] drivers/char/isicom whitespace cleanup 2005-09-10 23:19 [PATCH -mm 1/2] drivers/char/isicom old api rewritten Jiri Slaby @ 2005-09-10 23:21 ` Jiri Slaby 2005-09-10 23:53 ` [PATCH -mm 1/2] drivers/char/isicom old api rewritten Andrew Morton 1 sibling, 0 replies; 22+ messages in thread From: Jiri Slaby @ 2005-09-10 23:21 UTC (permalink / raw) To: Andrew Morton; +Cc: Greg KH, Linux Kernel Mailing List Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> isicom.c | 559 +++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 281 insertions(+), 278 deletions(-) Patch is here for its size (35 KiB): http://www.fi.muni.cz/~xslaby/lnx/isi_w.txt -- Jiri Slaby www.fi.muni.cz/~xslaby ~\-/~ jirislaby@gmail.com ~\-/~ 241B347EC88228DE51EE A49C4A73A25004CB2A10 ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH -mm 1/2] drivers/char/isicom old api rewritten 2005-09-10 23:19 [PATCH -mm 1/2] drivers/char/isicom old api rewritten Jiri Slaby 2005-09-10 23:21 ` [PATCH -mm 2/2] drivers/char/isicom whitespace cleanup Jiri Slaby @ 2005-09-10 23:53 ` Andrew Morton 2005-09-11 22:04 ` [PATCH] drivers/char/isicom old api rewritten (round 2) Jiri Slaby 1 sibling, 1 reply; 22+ messages in thread From: Andrew Morton @ 2005-09-10 23:53 UTC (permalink / raw) To: Jiri Slaby; +Cc: greg, linux-kernel Jiri Slaby <jirislaby@gmail.com> wrote: > > This patch removes old api in pci probing and replaces it with new. > Firmware loading added. > > Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> > > drivers/char/isicom.c | 1056 > ++++++++++++++++++++++++------------------------- > include/linux/isicom.h | 54 -- > 2 files changed, 539 insertions(+), 571 deletions(-) > > Patch is here for its size (40 KiB): > http://www.fi.muni.cz/~xslaby/lnx/isi_main.txt 40k isn't large - please include such patches in the email. > +sched_again: > + if (!re_schedule) > + { coding style. > +static void unregister_tty_driver(void) > +static int register_isr(struct isi_board* board, const int index) Not a great choice of function names, IMO. Nicer to have "isicom" in the name. Your call. > + > + for(t = jiffies + HZ/100; time_before(jiffies, t); ) > + ; mdelay() > + outw(0, base + 0x8); /* Reset */ > + > + for(j = 1; j <= 3; j++) { > + for(t = jiffies + HZ; time_before(jiffies, t); ) > + ; mdelay() > + > + switch (signature) { > + case 0xa5: > + name = "isi608.bin"; > + break; We usually do this: switch (...) { case N: > + for(i = 0; i <= 0x2f; i++) /* a wee bit of delay */ > + ; eep. udelay() > + for(i = 0; i <= 0x0f; i++) /* another wee bit of delay */ > + ; more eep. > +/* XXX: should I test it by reading it back and comparing with original like > + * in load firmware package? */ > +#if 0 hrm > + case MIOCTL_READ_FIRMWARE: > + if (!capable(CAP_SYS_ADMIN)) > + return -EPERM; Is this the right place to be performing permission checks? > + if(copy_from_user(&frame, argp, sizeof(bin_header))) if ( > + return -EFAULT; > + It's just as well this code if ifdefed out. Avoid using return statements buried deep in the logic. It's just asking for resource leaks, now or in the future. Aim for a simgle return point per function, or at least keep all the returns right at the end of the function. > + if ((status=inw(base+0x4))!=0) { > + printk(KERN_WARNING "ISILoad:Card%d rejected verify header:\nAddress:0x%x \nCount:0x%x \nStatus:0x%x \n", 80 cols > + for(i=0;i<=0x0f;i++); /* another wee bit of delay */ udelay() > + > + if (card >= BOARD_COUNT) { > + return -EPERM; > + } unneeded braces. embedded `return' > + > +static void __devexit isicom_remove(struct pci_dev *pdev) > +{ > + int idx; > + > + for(idx = 0; idx < BOARD_COUNT; idx++) > + if (isi_card[idx].base == pci_resource_start(pdev, 3)) > + break; > + whitespace weevils at work > + printk(KERN_ERR "ISICOM: ISA not supported yet."); newline > + retval = pci_register_driver(&isicom_driver); > + if (retval < 0) { > + printk(KERN_ERR "ISICOM: Unable to register pci driver.\n"); > + goto error; > } weevils > +#define InterruptTheCard(base) (outw(0,(base)+0xc)) > +#define ClearInterrupt(base) (inw((base)+0x0a)) Somewhat risky identifiers for a header file.. ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH] drivers/char/isicom old api rewritten (round 2) 2005-09-10 23:53 ` [PATCH -mm 1/2] drivers/char/isicom old api rewritten Andrew Morton @ 2005-09-11 22:04 ` Jiri Slaby 2005-09-11 22:20 ` Andrew Morton 0 siblings, 1 reply; 22+ messages in thread From: Jiri Slaby @ 2005-09-11 22:04 UTC (permalink / raw) To: Andrew Morton; +Cc: greg, linux-kernel Andrew Morton wrote: >Jiri Slaby <jirislaby@gmail.com> wrote: > > >>This patch removes old api in pci probing and replaces it with new. >> Firmware loading added. >> >> >> Patch is here for its size (40 KiB): >> http://www.fi.muni.cz/~xslaby/lnx/isi_main.txt >> >> > >40k isn't large - please include such patches in the email. > > Thank you, Andrew, for your reply and hints, you sent. Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> drivers/char/isicom.c | 2005 ++++++++++++++++++++++++------------------------- include/linux/isicom.h | 53 - 2 files changed, 1004 insertions(+), 1054 deletions(-) Now, it is 80k: http://www.fi.muni.cz/~xslaby/lnx/isicom.txt -- Jiri Slaby www.fi.muni.cz/~xslaby ~\-/~ jirislaby@gmail.com ~\-/~ 241B347EC88228DE51EE A49C4A73A25004CB2A10 ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] drivers/char/isicom old api rewritten (round 2) 2005-09-11 22:04 ` [PATCH] drivers/char/isicom old api rewritten (round 2) Jiri Slaby @ 2005-09-11 22:20 ` Andrew Morton 2005-09-11 23:11 ` [PATCH] drivers/char/isicom old api rewritten (round 3) Jiri Slaby 0 siblings, 1 reply; 22+ messages in thread From: Andrew Morton @ 2005-09-11 22:20 UTC (permalink / raw) To: Jiri Slaby; +Cc: greg, linux-kernel Jiri Slaby <jirislaby@gmail.com> wrote: > > Andrew Morton wrote: > > >Jiri Slaby <jirislaby@gmail.com> wrote: > > > > > >>This patch removes old api in pci probing and replaces it with new. > >> Firmware loading added. > >> > >> > >> Patch is here for its size (40 KiB): > >> http://www.fi.muni.cz/~xslaby/lnx/isi_main.txt > >> > >> > > > >40k isn't large - please include such patches in the email. > > > > > Thank you, Andrew, for your reply and hints, you sent. > Did everything get addressed? > > Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> > > drivers/char/isicom.c | 2005 > ++++++++++++++++++++++++------------------------- > include/linux/isicom.h | 53 - > 2 files changed, 1004 insertions(+), 1054 deletions(-) Please fix your email client's wordwrapping problem. > Now, it is 80k: > > http://www.fi.muni.cz/~xslaby/lnx/isicom.txt Then send the patch, cc'ed to the mailing list as per http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt, thanks. ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH] drivers/char/isicom old api rewritten (round 3) 2005-09-11 22:20 ` Andrew Morton @ 2005-09-11 23:11 ` Jiri Slaby 2005-09-12 4:58 ` Greg KH 0 siblings, 1 reply; 22+ messages in thread From: Jiri Slaby @ 2005-09-11 23:11 UTC (permalink / raw) To: Andrew Morton; +Cc: Linux Kernel Mailing List, greg > > >40k isn't large - please include such patches in the email. > > > > > Thank you, Andrew, for your reply and hints, you sent. > Did everything get addressed? Maybe not, if you still want it in e-mail as plaintext, grr. > Then send the patch, cc'ed to the mailing list as per > http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt, thanks. Oops, I read only SubmittingPatches. So this file should be changed in point 7 (that not everybody wants URLs). This patch removes old api in pci probing and replaces it with new. Firmware loading added. Generated in 2.6.13-mm2 kernel version. Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> --- drivers/char/isicom.c | 2009 ++++++++++++++++++++++++------------------------- include/linux/isicom.h | 53 - 2 files changed, 1006 insertions(+), 1056 deletions(-) diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c @@ -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,28 +31,28 @@ * * 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. * * 08/02/01 anil .s Upgraded the driver for kernel * 2.4.x * - * 11/04/01 Kevin Fixed firmware load problem with + * 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,22 +81,24 @@ * * 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 * into a single 2.6 driver * + * 10/09/05 Jiri Slaby driver rewritten to 2.6 API + * * *********************************************************** * - * 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/ * @@ -107,12 +109,12 @@ * Omit those entries for boards you don't have installed. * * TODO - * Hotplug * Merge testing * 64-bit verification */ #include <linux/module.h> +#include <linux/firmware.h> #include <linux/kernel.h> #include <linux/tty.h> #include <linux/tty_flip.h> @@ -121,7 +123,6 @@ #include <linux/sched.h> #include <linux/serial.h> #include <linux/mm.h> -#include <linux/miscdevice.h> #include <linux/interrupt.h> #include <linux/timer.h> #include <linux/delay.h> @@ -135,74 +136,87 @@ #include <linux/isicom.h> +#define InterruptTheCard(base) outw(0, (base) + 0xc) +#define ClearInterrupt(base) inw((base) + 0x0a) + +#ifdef ISICOM_DEBUG +#define pr_deb(str, ...) printk((str), ##args); +#define isicom_paranoia_check(a, b, c) __isicom_paranoia_check((a), (b), (c)) +#else +#define pr_deb(str, ...) +#define isicom_paranoia_check(a, b, c) 0 +#endif + +static int isicom_probe(struct pci_dev*, const struct pci_device_id*); +static void __devexit isicom_remove(struct pci_dev*); + static struct pci_device_id isicom_pci_tbl[] = { - { VENDOR_ID, 0x2028, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, - { VENDOR_ID, 0x2051, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, - { VENDOR_ID, 0x2052, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, - { VENDOR_ID, 0x2053, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, - { VENDOR_ID, 0x2054, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, - { VENDOR_ID, 0x2055, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, - { VENDOR_ID, 0x2056, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, - { VENDOR_ID, 0x2057, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, - { VENDOR_ID, 0x2058, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, + { PCI_DEVICE(VENDOR_ID, 0x2028) }, + { PCI_DEVICE(VENDOR_ID, 0x2051) }, + { PCI_DEVICE(VENDOR_ID, 0x2052) }, + { PCI_DEVICE(VENDOR_ID, 0x2053) }, + { PCI_DEVICE(VENDOR_ID, 0x2054) }, + { PCI_DEVICE(VENDOR_ID, 0x2055) }, + { PCI_DEVICE(VENDOR_ID, 0x2056) }, + { PCI_DEVICE(VENDOR_ID, 0x2057) }, + { PCI_DEVICE(VENDOR_ID, 0x2058) }, { 0 } }; MODULE_DEVICE_TABLE(pci, isicom_pci_tbl); +static struct pci_driver isicom_driver = { + .name = "isicom", + .id_table = isicom_pci_tbl, + .probe = isicom_probe, + .remove = __devexit_p(isicom_remove) +}; + static int prev_card = 3; /* start servicing isi_card[0] */ static struct tty_driver *isicom_normal; static struct timer_list tx; static char re_schedule = 1; -#ifdef ISICOM_DEBUG -static unsigned long tx_count = 0; -#endif - -static int ISILoad_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); static void isicom_tx(unsigned long _data); -static void isicom_start(struct tty_struct * tty); - -static unsigned char * tmp_buf; -static DECLARE_MUTEX(tmp_buf_sem); +static void isicom_start(struct tty_struct *tty); /* baud index mappings from linux defns to isi */ -static signed char linuxb_to_isib[] = { - -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 13, 15, 16, 17, - 18, 19 +static s8 linuxb_to_isib[] = { + -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 13, 15, 16, 17, 18, 19 }; struct isi_board { - unsigned short base; - unsigned char irq; - unsigned char port_count; - unsigned short status; - unsigned short port_status; /* each bit represents a single port */ - unsigned short shift_count; - struct isi_port * ports; - signed char count; - unsigned char isa; + 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; + s8 count; + u8 isa; spinlock_t card_lock; /* Card wide lock 11/5/00 -sameer */ unsigned long flags; + struct device device; }; struct isi_port { - unsigned short magic; + u16 magic; unsigned int flags; int count; int blocked_open; int close_delay; - unsigned short channel; - unsigned short status; - unsigned short closing_wait; - struct isi_board * card; - struct tty_struct * tty; + u16 channel; + u16 status; + u16 closing_wait; + 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; - unsigned char * xmit_buf; + u8 *xmit_buf; int xmit_head; int xmit_tail; int xmit_cnt; @@ -216,16 +230,16 @@ 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; - unsigned short base = card->base; + u16 base = card->base; 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 */ @@ -237,14 +251,14 @@ static int lock_card(struct isi_board *c static int lock_card_at_interrupt(struct isi_board *card) { - unsigned char retries; - unsigned short base = card->base; + u8 retries; + u16 base = card->base; for (retries = 0; retries < 200; 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); } @@ -260,373 +274,141 @@ static void unlock_card(struct isi_board /* * ISI Card specific ops ... */ - -static void raise_dtr(struct isi_port * port) + +static void raise_dtr(struct isi_port *port) { - struct isi_board * card = port->card; - unsigned short base = card->base; - unsigned char channel = port->channel; + struct isi_board *card = port->card; + u16 base = card->base; + u8 channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw(0x0504, base); InterruptTheCard(base); port->status |= ISI_DTR; unlock_card(card); } -static inline void drop_dtr(struct isi_port * port) -{ - struct isi_board * card = port->card; - unsigned short base = card->base; - unsigned char channel = port->channel; +static inline void drop_dtr(struct isi_port *port) +{ + struct isi_board *card = port->card; + u16 base = card->base; + u8 channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw(0x0404, base); - InterruptTheCard(base); + InterruptTheCard(base); port->status &= ~ISI_DTR; unlock_card(card); } -static inline void raise_rts(struct isi_port * port) +static inline void raise_rts(struct isi_port *port) { - struct isi_board * card = port->card; - unsigned short base = card->base; - unsigned char channel = port->channel; + struct isi_board *card = port->card; + u16 base = card->base; + u8 channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw(0x0a04, base); - InterruptTheCard(base); + InterruptTheCard(base); port->status |= ISI_RTS; unlock_card(card); } -static inline void drop_rts(struct isi_port * port) +static inline void drop_rts(struct isi_port *port) { - struct isi_board * card = port->card; - unsigned short base = card->base; - unsigned char channel = port->channel; + struct isi_board *card = port->card; + u16 base = card->base; + u8 channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw(0x0804, base); - InterruptTheCard(base); + InterruptTheCard(base); port->status &= ~ISI_RTS; unlock_card(card); } -static inline void raise_dtr_rts(struct isi_port * port) +static inline void raise_dtr_rts(struct isi_port *port) { - struct isi_board * card = port->card; - unsigned short base = card->base; - unsigned char channel = port->channel; + struct isi_board *card = port->card; + u16 base = card->base; + u8 channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw(0x0f04, base); InterruptTheCard(base); port->status |= (ISI_DTR | ISI_RTS); unlock_card(card); } -static void drop_dtr_rts(struct isi_port * port) +static void drop_dtr_rts(struct isi_port *port) { - struct isi_board * card = port->card; - unsigned short base = card->base; - unsigned char channel = port->channel; + struct isi_board *card = port->card; + u16 base = card->base; + u8 channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw(0x0c04, base); - InterruptTheCard(base); + InterruptTheCard(base); port->status &= ~(ISI_RTS | ISI_DTR); unlock_card(card); } -static inline void kill_queue(struct isi_port * port, short queue) +static inline void kill_queue(struct isi_port *port, short queue) { - struct isi_board * card = port->card; - unsigned short base = card->base; - unsigned char channel = port->channel; + struct isi_board *card = port->card; + u16 base = card->base; + u8 channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw((queue << 8) | 0x06, base); - InterruptTheCard(base); + InterruptTheCard(base); unlock_card(card); } - -/* - * Firmware loader driver specific routines. This needs to mostly die - * and be replaced with request_firmware. - */ - -static struct file_operations ISILoad_fops = { - .owner = THIS_MODULE, - .ioctl = ISILoad_ioctl, -}; - -static struct miscdevice isiloader_device = { - ISILOAD_MISC_MINOR, "isictl", &ISILoad_fops -}; - - -static inline int WaitTillCardIsFree(unsigned short base) -{ - unsigned long count=0; - while( (!(inw(base+0xe) & 0x1)) && (count++ < 6000000)); - if (inw(base+0xe)&0x1) - return 0; - else - return 1; -} - -static int ISILoad_ioctl(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg) -{ - unsigned int card, i, j, signature, status, portcount = 0; - unsigned long t; - unsigned short word_count, base; - bin_frame frame; - void __user *argp = (void __user *)arg; - /* exec_record exec_rec; */ - - if(get_user(card, (int __user *)argp)) - return -EFAULT; - - if(card < 0 || card >= BOARD_COUNT) - return -ENXIO; - - base=isi_card[card].base; - - if(base==0) - return -ENXIO; /* disabled or not used */ - - switch(cmd) { - case MIOCTL_RESET_CARD: - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; - printk(KERN_DEBUG "ISILoad:Resetting Card%d at 0x%x ",card+1,base); - - inw(base+0x8); - - for(t=jiffies+HZ/100;time_before(jiffies, t);); - - outw(0,base+0x8); /* Reset */ - - for(j=1;j<=3;j++) { - for(t=jiffies+HZ;time_before(jiffies, t);); - printk("."); - } - signature=(inw(base+0x4)) & 0xff; - if (isi_card[card].isa) { - - if (!(inw(base+0xe) & 0x1) || (inw(base+0x2))) { -#ifdef ISICOM_DEBUG - printk("\nbase+0x2=0x%x , base+0xe=0x%x",inw(base+0x2),inw(base+0xe)); -#endif - printk("\nISILoad:ISA Card%d reset failure (Possible bad I/O Port Address 0x%x).\n",card+1,base); - return -EIO; - } - } - else { - portcount = inw(base+0x2); - if (!(inw(base+0xe) & 0x1) || ((portcount!=0) && (portcount!=4) && (portcount!=8))) { -#ifdef ISICOM_DEBUG - printk("\nbase+0x2=0x%x , base+0xe=0x%x",inw(base+0x2),inw(base+0xe)); -#endif - printk("\nISILoad:PCI Card%d reset failure (Possible bad I/O Port Address 0x%x).\n",card+1,base); - return -EIO; - } - } - switch(signature) { - case 0xa5: - case 0xbb: - case 0xdd: - if (isi_card[card].isa) - isi_card[card].port_count = 8; - else { - if (portcount == 4) - isi_card[card].port_count = 4; - else - isi_card[card].port_count = 8; - } - isi_card[card].shift_count = 12; - break; - - case 0xcc: isi_card[card].port_count = 16; - isi_card[card].shift_count = 11; - break; - - default: printk("ISILoad:Card%d reset failure (Possible bad I/O Port Address 0x%x).\n",card+1,base); -#ifdef ISICOM_DEBUG - printk("Sig=0x%x\n",signature); -#endif - return -EIO; - } - printk("-Done\n"); - return put_user(signature,(unsigned __user *)argp); - - case MIOCTL_LOAD_FIRMWARE: - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; - - if(copy_from_user(&frame, argp, sizeof(bin_frame))) - return -EFAULT; - - if (WaitTillCardIsFree(base)) - return -EIO; - - outw(0xf0,base); /* start upload sequence */ - outw(0x00,base); - outw((frame.addr), base);/* lsb of adderess */ - - word_count=(frame.count >> 1) + frame.count % 2; - outw(word_count, base); - InterruptTheCard(base); - - for(i=0;i<=0x2f;i++); /* a wee bit of delay */ - - if (WaitTillCardIsFree(base)) - return -EIO; - - if ((status=inw(base+0x4))!=0) { - printk(KERN_WARNING "ISILoad:Card%d rejected load header:\nAddress:0x%x \nCount:0x%x \nStatus:0x%x \n", - card+1, frame.addr, frame.count, status); - return -EIO; - } - outsw(base, (void *) frame.bin_data, word_count); - - InterruptTheCard(base); - - for(i=0;i<=0x0f;i++); /* another wee bit of delay */ - - if (WaitTillCardIsFree(base)) - return -EIO; - - if ((status=inw(base+0x4))!=0) { - printk(KERN_ERR "ISILoad:Card%d got out of sync.Card Status:0x%x\n",card+1, status); - return -EIO; - } - return 0; - - case MIOCTL_READ_FIRMWARE: - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; - - if(copy_from_user(&frame, argp, sizeof(bin_header))) - return -EFAULT; - - if (WaitTillCardIsFree(base)) - return -EIO; - - outw(0xf1,base); /* start download sequence */ - outw(0x00,base); - outw((frame.addr), base);/* lsb of adderess */ - - word_count=(frame.count >> 1) + frame.count % 2; - outw(word_count+1, base); - InterruptTheCard(base); - - for(i=0;i<=0xf;i++); /* a wee bit of delay */ - - if (WaitTillCardIsFree(base)) - return -EIO; - - if ((status=inw(base+0x4))!=0) { - printk(KERN_WARNING "ISILoad:Card%d rejected verify header:\nAddress:0x%x \nCount:0x%x \nStatus:0x%x \n", - card+1, frame.addr, frame.count, status); - return -EIO; - } - - inw(base); - insw(base, frame.bin_data, word_count); - InterruptTheCard(base); - - for(i=0;i<=0x0f;i++); /* another wee bit of delay */ - - if (WaitTillCardIsFree(base)) - return -EIO; - - if ((status=inw(base+0x4))!=0) { - printk(KERN_ERR "ISILoad:Card%d verify got out of sync.Card Status:0x%x\n",card+1, status); - return -EIO; - } - - if(copy_to_user(argp, &frame, sizeof(bin_frame))) - return -EFAULT; - return 0; - - case MIOCTL_XFER_CTRL: - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; - if (WaitTillCardIsFree(base)) - return -EIO; - - outw(0xf2, base); - outw(0x800, base); - outw(0x0, base); - outw(0x0, base); - InterruptTheCard(base); - outw(0x0, base+0x4); /* for ISI4608 cards */ - - isi_card[card].status |= FIRMWARE_LOADED; - return 0; - - default: -#ifdef ISICOM_DEBUG - printk(KERN_DEBUG "ISILoad: Received Ioctl cmd 0x%x.\n", cmd); -#endif - return -ENOIOCTLCMD; - - } - -} - - /* * ISICOM Driver specific routines ... * */ - -static inline int isicom_paranoia_check(struct isi_port const * port, char *name, - const char * routine) + +static inline int __isicom_paranoia_check(struct isi_port const *port, + char *name, const char *routine) { -#ifdef ISICOM_DEBUG - static const char * badmagic = - KERN_WARNING "ISICOM: Warning: bad isicom magic for dev %s in %s.\n"; - static const char * badport = - KERN_WARNING "ISICOM: Warning: NULL isicom port for dev %s in %s.\n"; if (!port) { - printk(badport, name, routine); + printk(KERN_WARNING "ISICOM: Warning: bad isicom magic for " + "dev %s in %s.\n", name, routine); return 1; } if (port->magic != ISICOM_MAGIC) { - printk(badmagic, name, routine); + printk(KERN_WARNING "ISICOM: Warning: NULL isicom port for " + "dev %s in %s.\n", name, routine); return 1; - } -#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. @@ -636,25 +418,21 @@ static void isicom_tx(unsigned long _dat { short count = (BOARD_COUNT-1), card, base; short txcount, wrd, residue, word_count, cnt; - struct isi_port * port; - struct tty_struct * tty; - -#ifdef ISICOM_DEBUG - ++tx_count; -#endif - + struct isi_port *port; + struct tty_struct *tty; + /* 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; @@ -663,18 +441,18 @@ static void isicom_tx(unsigned long _dat continue; /* port not active or tx disabled to force flow control */ if (!(port->flags & ASYNC_INITIALIZED) || - !(port->status & ISI_TXOK)) + !(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]); @@ -682,44 +460,45 @@ 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 - outw((port->channel << isi_card[card].shift_count) | txcount - , base); + pr_deb(KERN_DEBUG "ISICOM: txing %d bytes, port%d.\n", + txcount, port->channel+1); + 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)); + cnt = min_t(int, txcount, (SERIAL_XMIT_SIZE + - port->xmit_tail)); if (residue == YES) { residue = NO; if (cnt > 0) { - wrd |= (port->xmit_buf[port->xmit_tail] << 8); - port->xmit_tail = (port->xmit_tail + 1) & (SERIAL_XMIT_SIZE - 1); + wrd |= (port->xmit_buf[port->xmit_tail] + << 8); + port->xmit_tail = (port->xmit_tail + 1) + & (SERIAL_XMIT_SIZE - 1); port->xmit_cnt--; txcount--; cnt--; - outw(wrd, base); - } - else { + 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); - port->xmit_tail = (port->xmit_tail + (word_count << 1)) & - (SERIAL_XMIT_SIZE - 1); + port->xmit_tail = (port->xmit_tail + + (word_count << 1)) & (SERIAL_XMIT_SIZE - 1); txcount -= (word_count << 1); port->xmit_cnt -= (word_count << 1); if (cnt & 0x0001) { residue = YES; wrd = port->xmit_buf[port->xmit_tail]; - port->xmit_tail = (port->xmit_tail + 1) & (SERIAL_XMIT_SIZE - 1); + port->xmit_tail = (port->xmit_tail + 1) & + (SERIAL_XMIT_SIZE - 1); port->xmit_cnt--; txcount--; } @@ -731,82 +510,81 @@ static void isicom_tx(unsigned long _dat if (port->xmit_cnt <= WAKEUP_CHARS) schedule_work(&port->bh_tqueue); unlock_card(&isi_card[card]); - } + } - /* schedule another tx for hopefully in about 10ms */ -sched_again: - if (!re_schedule) + /* schedule another tx for hopefully in about 10ms */ +sched_again: + if (!re_schedule) { + re_schedule = 2; return; + } init_timer(&tx); tx.expires = jiffies + HZ/100; 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; - + struct isi_port *port = data; + struct tty_struct *tty = port->tty; + 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) + +static irqreturn_t isicom_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct isi_board * card; - struct isi_port * port; - struct tty_struct * tty; - unsigned short base, header, word_count, count; - unsigned char channel; + struct isi_board *card = dev_id; + struct isi_port *port; + struct tty_struct *tty; + u16 base, header, word_count, count; + u8 channel; short byte_count; unsigned char *rp; - - card = (struct isi_board *) dev_id; if (!card || !(card->status & FIRMWARE_LOADED)) return IRQ_NONE; - + base = card->base; spin_lock(&card->card_lock); - + if (card->isa == NO) { /* - * disable any interrupts from the PCI card and lower the - * interrupt line + * disable any interrupts from the PCI card and lower the + * interrupt line */ 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)) { @@ -815,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; @@ -833,109 +611,102 @@ 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 - printk(KERN_DEBUG "ISICOM: interrupt: DCD->low.\n"); -#endif - port->status &= ~ISI_DCD; - schedule_work(&port->hangup_tq); - } - } - else { - if (header & ISI_DCD) { - /* Carrier has been detected */ -#ifdef ISICOM_DEBUG - printk(KERN_DEBUG "ISICOM: interrupt: DCD->high.\n"); -#endif - port->status |= ISI_DCD; - wake_up_interruptible(&port->open_wait); - } - } - } - else { - if (header & ISI_DCD) - port->status |= ISI_DCD; - else + 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 */ + pr_deb(KERN_DEBUG "ISICOM: " + "interrupt: " + "DCD->low.\n"); port->status &= ~ISI_DCD; - } - - if (port->flags & ASYNC_CTS_FLOW) { - if (port->tty->hw_stopped) { - if (header & ISI_CTS) { - port->tty->hw_stopped = 0; - /* start tx ing */ - port->status |= (ISI_TXOK | ISI_CTS); - schedule_work(&port->bh_tqueue); - } + schedule_work(&port->hangup_tq); } - else { - if (!(header & ISI_CTS)) { - port->tty->hw_stopped = 1; - /* stop tx ing */ - port->status &= ~(ISI_TXOK | ISI_CTS); - } - } - } - else { - if (header & ISI_CTS) - port->status |= ISI_CTS; - else - port->status &= ~ISI_CTS; + } else if (header & ISI_DCD) { + /* Carrier has been detected */ + pr_deb(KERN_DEBUG "ISICOM: " + "interrupt: " + "DCD->high.\n"); + port->status |= ISI_DCD; + wake_up_interruptible( + &port->open_wait); } - - if (header & ISI_DSR) - port->status |= ISI_DSR; + } else { + if (header & ISI_DCD) + port->status |= ISI_DCD; else - port->status &= ~ISI_DSR; - - if (header & ISI_RI) - port->status |= ISI_RI; + port->status &= ~ISI_DCD; + } + + if (port->flags & ASYNC_CTS_FLOW) { + if (port->tty->hw_stopped) { + if (header & ISI_CTS) { + port->tty->hw_stopped = 0; + /* start tx ing */ + port->status |= (ISI_TXOK | + ISI_CTS); + schedule_work(&port->bh_tqueue); + } + } else if (!(header & ISI_CTS)) { + port->tty->hw_stopped = 1; + /* stop tx ing */ + port->status &= ~(ISI_TXOK | + ISI_CTS); + } + } else if (header & ISI_CTS) + port->status |= ISI_CTS; else - port->status &= ~ISI_RI; - - break; - - case 1: /* Received Break !!! */ - tty_insert_flip_char(tty, 0, TTY_BREAK); - if (port->flags & ASYNC_SAK) - do_SAK(tty); - tty_flip_buffer_push(tty); - break; - - case 2: /* Statistics */ - printk(KERN_DEBUG "ISICOM: isicom_interrupt: stats!!!.\n"); - break; - - default: - printk(KERN_WARNING "ISICOM: Intr: Unknown code in status packet.\n"); - break; - } - } - else { /* Data Packet */ + port->status &= ~ISI_CTS; + + if (header & ISI_DSR) + port->status |= ISI_DSR; + else + port->status &= ~ISI_DSR; + + if (header & ISI_RI) + port->status |= ISI_RI; + else + port->status &= ~ISI_RI; + + break; + + case 1: /* Received Break !!! */ + tty_insert_flip_char(tty, 0, TTY_BREAK); + if (port->flags & ASYNC_SAK) + do_SAK(tty); + tty_flip_buffer_push(tty); + break; + + case 2: /* Statistics */ + printk(KERN_DEBUG "ISICOM: isicom_interrupt: " + "stats!!!.\n"); + break; + + 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", + pr_deb(KERN_DEBUG "ISICOM: Intr: Can rx %d of %d bytes.\n", count, byte_count); -#endif word_count = count >> 1; insw(base, rp, word_count); byte_count -= (word_count << 1); if (count & 0x0001) { - tty_insert_flip_char(tty, inw(base) & 0xff, TTY_NORMAL); + tty_insert_flip_char(tty, inw(base) & 0xff, + TTY_NORMAL); byte_count -= 2; - } + } if (byte_count > 0) { - printk(KERN_DEBUG "ISICOM: Intr(0x%x:%d): Flip buffer overflow! dropping bytes...\n", + printk(KERN_DEBUG "ISICOM: Intr(0x%x:%d): Flip buffer " + "overflow! dropping bytes...\n", base, channel+1); while(byte_count > 0) { /* drain out unread xtra data */ inw(base); @@ -947,55 +718,54 @@ 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) +static void isicom_config_port(struct isi_port *port) { - struct isi_board * card = port->card; - struct tty_struct * tty; + struct isi_board *card = port->card; + struct tty_struct *tty; unsigned long baud; - unsigned short channel_setup, base = card->base; - unsigned short channel = port->channel, shift_count = card->shift_count; - unsigned char flow_ctrl; - + 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 */ + 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 + drop_dtr(port); + return; + } else raise_dtr(port); - + if (lock_card(card)) { outw(0x8000 | (channel << shift_count) |0x03, base); outw(linuxb_to_isib[baud] << 8 | 0x03, base); @@ -1014,35 +784,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); @@ -1050,22 +820,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 */ -static inline void isicom_setup_board(struct isi_board * bp) +/* open et all */ + +static inline void isicom_setup_board(struct isi_board *bp) { int channel; - struct isi_port * port; + 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); @@ -1078,49 +848,50 @@ static inline void isicom_setup_board(st drop_dtr_rts(port); return; } - -static int isicom_setup_port(struct isi_port * port) + +static int isicom_setup_port(struct isi_port *port) { - struct isi_board * card = port->card; + 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 = (unsigned char *) 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; + struct isi_board *card = port->card; int do_clocal = 0, retval; unsigned long flags; DECLARE_WAITQUEUE(wait, current); @@ -1128,30 +899,28 @@ 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 - printk(KERN_DEBUG "ISICOM: block_til_ready: close in progress.\n"); -#endif + pr_deb(KERN_DEBUG "ISICOM: block_til_ready: close in " + "progress.\n"); 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 - printk(KERN_DEBUG "ISICOM: block_til_ready: non-block mode.\n"); -#endif + + if ((filp->f_flags & O_NONBLOCK) || + (tty->flags & (1 << TTY_IO_ERROR))) { + pr_deb(KERN_DEBUG "ISICOM: block_til_ready: non-block mode.\n"); 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); @@ -1161,27 +930,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))) { + (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); @@ -1195,11 +964,11 @@ 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) + +static int isicom_open(struct tty_struct *tty, struct file *filp) { - struct isi_port * port; - struct isi_board * card; + struct isi_port *port; + struct isi_board *card; unsigned int line, board; int error; @@ -1208,20 +977,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; @@ -1230,12 +999,12 @@ 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) +static inline void isicom_shutdown_board(struct isi_board *bp) { unsigned long flags; @@ -1246,15 +1015,15 @@ static inline void isicom_shutdown_board spin_unlock_irqrestore(&bp->card_lock, flags); } -static void isicom_shutdown_port(struct isi_port * port) +static void isicom_shutdown_port(struct isi_port *port) { - struct isi_board * card = port->card; - struct tty_struct * tty; + struct isi_board *card = port->card; + 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; @@ -1262,32 +1031,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) @@ -1295,27 +1064,25 @@ static void isicom_shutdown_port(struct } } -static void isicom_close(struct tty_struct * tty, struct file * filp) +static void isicom_close(struct tty_struct *tty, struct file *filp) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - struct isi_board * card = port->card; + 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 - printk(KERN_DEBUG "ISICOM: Close start!!!.\n"); -#endif - + + pr_deb(KERN_DEBUG "ISICOM: Close start!!!.\n"); + 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", @@ -1323,32 +1090,32 @@ static void isicom_close(struct tty_stru 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); @@ -1359,65 +1126,65 @@ 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 - printk(KERN_DEBUG "ISICOM: scheduling until time out.\n"); -#endif - msleep_interruptible(jiffies_to_msecs(port->close_delay)); + pr_deb(KERN_DEBUG "ISICOM: scheduling until time " + "out.\n"); + 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); } /* write et all */ -static int isicom_write(struct tty_struct * tty, - const unsigned char * buf, int count) +static int isicom_write(struct tty_struct *tty, const u8 *buf, int count) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - struct isi_board * card = port->card; + struct isi_port *port = tty->driver_data; + struct isi_board *card = port->card; unsigned long flags; int cnt, total = 0; if (isicom_paranoia_check(port, tty->name, "isicom_write")) return 0; - - if (!tty || !port->xmit_buf || !tmp_buf) + + 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 */ -static void isicom_put_char(struct tty_struct * tty, unsigned char ch) +static void isicom_put_char(struct tty_struct *tty, u8 ch) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - struct isi_board * card = port->card; + struct isi_port *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; @@ -1426,7 +1193,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++; @@ -1434,30 +1201,31 @@ static void isicom_put_char(struct tty_s } /* flush_chars et all */ -static void isicom_flush_chars(struct tty_struct * tty) +static void isicom_flush_chars(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - + struct isi_port *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 */ -static int isicom_write_room(struct tty_struct * tty) +static int isicom_write_room(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; int free; 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; @@ -1465,23 +1233,24 @@ static int isicom_write_room(struct tty_ } /* chars_in_buffer et all */ -static int isicom_chars_in_buffer(struct tty_struct * tty) +static int isicom_chars_in_buffer(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; if (isicom_paranoia_check(port, tty->name, "isicom_chars_in_buffer")) return 0; return port->xmit_cnt; } /* 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; - unsigned short base = card->base; - + struct isi_board *card = port->card; + 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); @@ -1492,13 +1261,13 @@ static inline void isicom_send_break(str static int isicom_tiocmget(struct tty_struct *tty, struct file *file) { - struct isi_port * port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; /* just send the port status */ - unsigned short status = port->status; + u16 status = port->status; 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) | @@ -1508,13 +1277,13 @@ static int isicom_tiocmget(struct tty_st } static int isicom_tiocmset(struct tty_struct *tty, struct file *file, - unsigned int set, unsigned int clear) + unsigned int set, unsigned int clear) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - + struct isi_port *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) @@ -1526,46 +1295,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) +static int isicom_set_serial_info(struct isi_port *port, + struct serial_struct __user *info) { struct serial_struct newinfo; int reconfig_port; - if(copy_from_user(&newinfo, info, sizeof(newinfo))) + if (copy_from_user(&newinfo, info, sizeof(newinfo))) return -EFAULT; - - reconfig_port = ((port->flags & ASYNC_SPD_MASK) != - (newinfo.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) != - (port->flags & ~ASYNC_USR_MASK))) + (newinfo.closing_wait != port->closing_wait) || + ((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 { + } 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) { + + if (reconfig_port) isicom_config_port(port); - } - return 0; -} -static int isicom_get_serial_info(struct isi_port * port, - struct serial_struct __user *info) + return 0; +} + +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; @@ -1575,15 +1344,15 @@ static int isicom_get_serial_info(struct /* out_info.baud_base = ? */ out_info.close_delay = port->close_delay; out_info.closing_wait = port->closing_wait; - if(copy_to_user(info, &out_info, sizeof(out_info))) + 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) +static int isicom_ioctl(struct tty_struct *tty, struct file *filp, + unsigned int cmd, unsigned long arg) { - struct isi_port * port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; void __user *argp = (void __user *)arg; int retval; @@ -1599,131 +1368,133 @@ 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) ? 1 : 0, + (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; } /* set_termios et all */ -static void isicom_set_termios(struct tty_struct * tty, struct termios * old_termios) +static void isicom_set_termios(struct tty_struct *tty, + struct termios *old_termios) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - + struct isi_port *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) + 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 */ -static void isicom_throttle(struct tty_struct * tty) +static void isicom_throttle(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - struct isi_board * card = port->card; - + struct isi_port *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); } /* unthrottle et all */ -static void isicom_unthrottle(struct tty_struct * tty) +static void isicom_unthrottle(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - struct isi_board * card = port->card; - + struct isi_port *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); } /* stop et all */ -static void isicom_stop(struct tty_struct * tty) +static void isicom_stop(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; 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; } /* start et all */ -static void isicom_start(struct tty_struct * tty) +static void isicom_start(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - + struct isi_port *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; } /* hangup et all */ -static void do_isicom_hangup(void * data) +static void do_isicom_hangup(void *data) { - struct isi_port * port = (struct isi_port *) data; - struct tty_struct * tty; - + struct isi_port *port = data; + struct tty_struct *tty; + tty = port->tty; if (tty) tty_hangup(tty); } -static void isicom_hangup(struct tty_struct * tty) +static void isicom_hangup(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - + struct isi_port *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; @@ -1732,342 +1503,558 @@ static void isicom_hangup(struct tty_str } /* flush_buffer et all */ -static void isicom_flush_buffer(struct tty_struct * tty) +static void isicom_flush_buffer(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - struct isi_board * card = port->card; + struct isi_port *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); } +/* + * Driver init and deinit functions + */ -static int __devinit register_ioregion(void) +static int __devinit isicom_register_ioregion(struct isi_board *board, + const unsigned int index) { - int count, done=0; - for (count=0; count < BOARD_COUNT; count++ ) { - if (isi_card[count].base) - if (!request_region(isi_card[count].base,16,ISICOM_NAME)) { - printk(KERN_DEBUG "ISICOM: I/O Region 0x%x-0x%x is busy. Card%d will be disabled.\n", - isi_card[count].base,isi_card[count].base+15,count+1); - isi_card[count].base=0; - done++; - } + 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, + board->base + 15, index + 1); + return -EBUSY; } - return done; + + return 0; } -static void unregister_ioregion(void) +static void isicom_unregister_ioregion(struct isi_board *board, + const unsigned int index) { - int count; - for (count=0; count < BOARD_COUNT; count++ ) - if (isi_card[count].base) { - release_region(isi_card[count].base,16); -#ifdef ISICOM_DEBUG - printk(KERN_DEBUG "ISICOM: I/O Region 0x%x-0x%x released for Card%d.\n",isi_card[count].base,isi_card[count].base+15,count+1); -#endif - } + if (!board->base) + return; + + release_region(board->base, 16); + board->base = 0; + pr_deb(KERN_DEBUG "ISICOM: I/O Region 0x%x-0x%x released for Card%d.\n", + board->base, board->base + 15, index + 1); } static struct tty_operations isicom_ops = { - .open = isicom_open, - .close = isicom_close, - .write = isicom_write, - .put_char = isicom_put_char, - .flush_chars = isicom_flush_chars, - .write_room = isicom_write_room, + .open = isicom_open, + .close = isicom_close, + .write = isicom_write, + .put_char = isicom_put_char, + .flush_chars = isicom_flush_chars, + .write_room = isicom_write_room, .chars_in_buffer = isicom_chars_in_buffer, - .ioctl = isicom_ioctl, - .set_termios = isicom_set_termios, - .throttle = isicom_throttle, - .unthrottle = isicom_unthrottle, - .stop = isicom_stop, - .start = isicom_start, - .hangup = isicom_hangup, - .flush_buffer = isicom_flush_buffer, - .tiocmget = isicom_tiocmget, - .tiocmset = isicom_tiocmset, + .ioctl = isicom_ioctl, + .set_termios = isicom_set_termios, + .throttle = isicom_throttle, + .unthrottle = isicom_unthrottle, + .stop = isicom_stop, + .start = isicom_start, + .hangup = isicom_hangup, + .flush_buffer = isicom_flush_buffer, + .tiocmget = isicom_tiocmget, + .tiocmset = isicom_tiocmset, }; -static int __devinit register_drivers(void) +static int __devinit isicom_register_tty_driver(void) { - int error; + int error = -ENOMEM; /* tty driver structure initialization */ isicom_normal = alloc_tty_driver(PORT_COUNT); if (!isicom_normal) - return -ENOMEM; + goto end; - isicom_normal->owner = THIS_MODULE; - isicom_normal->name = "ttyM"; - isicom_normal->devfs_name = "isicom/"; - isicom_normal->major = ISICOM_NMAJOR; - isicom_normal->minor_start = 0; - isicom_normal->type = TTY_DRIVER_TYPE_SERIAL; - isicom_normal->subtype = SERIAL_TYPE_NORMAL; - isicom_normal->init_termios = tty_std_termios; - isicom_normal->init_termios.c_cflag = - B9600 | CS8 | CREAD | HUPCL |CLOCAL; - isicom_normal->flags = TTY_DRIVER_REAL_RAW; + isicom_normal->owner = THIS_MODULE; + isicom_normal->name = "ttyM"; + isicom_normal->devfs_name = "isicom/"; + isicom_normal->major = ISICOM_NMAJOR; + isicom_normal->minor_start = 0; + isicom_normal->type = TTY_DRIVER_TYPE_SERIAL; + isicom_normal->subtype = SERIAL_TYPE_NORMAL; + isicom_normal->init_termios = tty_std_termios; + isicom_normal->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | + CLOCAL; + isicom_normal->flags = TTY_DRIVER_REAL_RAW; tty_set_operations(isicom_normal, &isicom_ops); - - if ((error=tty_register_driver(isicom_normal))!=0) { - printk(KERN_DEBUG "ISICOM: Couldn't register the dialin driver, error=%d\n", - error); + + if ((error = tty_register_driver(isicom_normal))) { + printk(KERN_DEBUG "ISICOM: Couldn't register the dialin " + "driver, error=%d\n", error); put_tty_driver(isicom_normal); - return error; } - return 0; +end: + return error; } -static void unregister_drivers(void) +static void isicom_unregister_tty_driver(void) { - int error = tty_unregister_driver(isicom_normal); - if (error) - printk(KERN_DEBUG "ISICOM: couldn't unregister normal driver error=%d.\n",error); + int error; + + if ((error = tty_unregister_driver(isicom_normal))) + printk(KERN_DEBUG "ISICOM: couldn't unregister normal driver, " + "error=%d.\n", error); + put_tty_driver(isicom_normal); } -static int __devinit register_isr(void) +static int __devinit isicom_register_isr(struct isi_board *board, + const unsigned int index) { - int count, done=0; - unsigned long irqflags; + unsigned long irqflags = SA_INTERRUPT; + int retval; - for (count=0; count < BOARD_COUNT; count++ ) { - if (isi_card[count].base) { - irqflags = (isi_card[count].isa == YES) ? - SA_INTERRUPT : - (SA_INTERRUPT | SA_SHIRQ); - - if (request_irq(isi_card[count].irq, - isicom_interrupt, - irqflags, - ISICOM_NAME, &isi_card[count])) { - - printk(KERN_WARNING "ISICOM: Could not" - " install handler at Irq %d." - " Card%d will be disabled.\n", - isi_card[count].irq, count+1); + if (!board->base) + return 0; - release_region(isi_card[count].base,16); - isi_card[count].base=0; - } - else - done++; - } + if (board->isa == NO) + irqflags |= SA_SHIRQ; + + retval = request_irq(board->irq, isicom_interrupt, irqflags, + ISICOM_NAME, board); + if (retval < 0) { + printk(KERN_WARNING "ISICOM: Could not install handler at Irq " + "%d. Card%d will be disabled.\n", board->irq, + index + 1); + return retval; } - return done; + + return 0; } -static void __exit unregister_isr(void) +static void isicom_unregister_isr(struct isi_board *board) { - int count; + if (board->base) + free_irq(board->irq, board); +} - for (count=0; count < BOARD_COUNT; count++ ) { - if (isi_card[count].base) - free_irq(isi_card[count].irq, &isi_card[count]); - } +static inline int __devinit WaitTillCardIsFree(u16 base) +{ + int count = 0; + + while ((!(inw(base + 0xe) & 0x1)) && (count++ < 1000)) + msleep(1); + + return !(inw(base + 0xe) & 0x1); } -static int __devinit isicom_init(void) +static int __devinit reset_card(struct isi_board *board, + const unsigned int card, unsigned int *signature) { - int card, channel, base; - struct isi_port * port; - unsigned long page; - - if (!tmp_buf) { - page = get_zeroed_page(GFP_KERNEL); - if (!page) { -#ifdef ISICOM_DEBUG - printk(KERN_DEBUG "ISICOM: Couldn't allocate page for tmp_buf.\n"); -#else - printk(KERN_ERR "ISICOM: Not enough memory...\n"); -#endif - return 0; - } - tmp_buf = (unsigned char *) page; - } - - if (!register_ioregion()) - { - printk(KERN_ERR "ISICOM: All required I/O space found busy.\n"); - free_page((unsigned long)tmp_buf); - return 0; + u16 base = board->base; + unsigned int portcount = 0; + int retval = 0; + + printk(KERN_DEBUG "ISILoad:Resetting Card%d at 0x%x\n", card + 1, base); + + inw(base + 0x8); + + mdelay(10); + + outw(0, base + 0x8); /* Reset */ + + msleep(3000); + + *signature = inw(base + 0x4) & 0xff; + + if (board->isa == YES) { + if (!(inw(base + 0xe) & 0x1) || (inw(base + 0x2))) { + pr_deb(KERN_DEBUG "base+0x2=0x%x, base+0xe=0x%x", + inw(base + 0x2), inw(base + 0xe)); + printk(KERN_ERR "ISILoad:ISA Card%d reset failure " + "(Possible bad I/O Port Address 0x%x).\n", + card + 1, base); + retval = -EIO; + goto end; + } + } else { + portcount = inw(base + 0x2); + if (!(inw(base + 0xe) & 0x1) || ((portcount != 0) && + (portcount != 4) && (portcount != 8))) { + pr_deb("\nbase+0x2=0x%x , base+0xe=0x%x", + inw(base + 0x2), inw(base + 0xe)); + printk("\nISILoad:PCI Card%d reset failure (Possible " + "bad I/O Port Address 0x%x).\n", card + 1, + base); + retval = -EIO; + goto end; + } } - if (register_drivers()) - { - unregister_ioregion(); - free_page((unsigned long)tmp_buf); - return 0; + + switch (*signature) { + case 0xa5: + case 0xbb: + case 0xdd: + board->port_count = (board->isa == NO && portcount == 4) ? 4 : + 8; + board->shift_count = 12; + break; + case 0xcc: + board->port_count = 16; + board->shift_count = 11; + break; + default: + printk(KERN_WARNING "ISILoad:Card%d reset failure (Possible " + "bad I/O Port Address 0x%x).\n", card + 1, base); + pr_deb(KERN_DEBUG "Sig=0x%x\n", signature); + retval = -EIO; + } + printk(KERN_INFO "-Done\n"); + +end: + return retval; +} + +static int __devinit load_firmware(struct isi_board *board, + const unsigned int index, const unsigned int signature) +{ + int retval = -EIO; + unsigned int a; + char *name; + u8 *data; + u16 word_count, status, base = board->base; + const struct firmware *fw; + struct stframe { + u16 addr; + u16 count; + u8 data[0]; + } *frame; + + switch (signature) { + case 0xa5: + name = "isi608.bin"; + break; + case 0xbb: + name = "isi608em.bin"; + break; + case 0xcc: + name = "isi616em.bin"; + break; + case 0xdd: + name = "isi4608.bin"; + break; + case 0xee: + name = "isi4616.bin"; + break; + default: + printk(KERN_ERR "Unknown signature.\n"); + goto end; } - if (!register_isr()) - { - unregister_drivers(); - /* ioports already uregistered in register_isr */ - free_page((unsigned long)tmp_buf); - return 0; + + retval = request_firmware(&fw, name, &board->device); + if (retval) + goto end; + + for (frame = (struct stframe*)fw->data; + frame < (struct stframe*)(fw->data + fw->size); + frame++) { + if (WaitTillCardIsFree(base)) + goto errrelfw; + + outw(0xf0, base); /* start upload sequence */ + outw(0x00, base); + outw(frame->addr, base); /* lsb of address */ + + word_count = frame->count / 2 + frame->count % 2; + outw(word_count, base); + InterruptTheCard(base); + + udelay(100); /* 0x2f */ + + if (WaitTillCardIsFree(base)) + goto errrelfw; + + if ((status = inw(base + 0x4)) != 0) { + printk(KERN_WARNING "ISILoad:Card%d rejected load " + "header:\nAddress:0x%x \nCount:0x%x \n" + "Status:0x%x \n", index + 1, frame->addr, + frame->count, status); + goto errrelfw; + } + outsw(base, frame->data, word_count); + + InterruptTheCard(base); + + udelay(50); /* 0x0f */ + + if (WaitTillCardIsFree(base)) + goto errrelfw; + + if ((status = inw(base + 0x4)) != 0) { + printk(KERN_ERR "ISILoad:Card%d got out of sync.Card " + "Status:0x%x\n", index + 1, status); + goto errrelfw; + } } - - memset(isi_ports, 0, sizeof(isi_ports)); - for (card = 0; card < BOARD_COUNT; card++) { - port = &isi_ports[card * 16]; - isi_card[card].ports = port; - spin_lock_init(&isi_card[card].card_lock); - base = isi_card[card].base; - for (channel = 0; channel < 16; channel++, port++) { - port->magic = ISICOM_MAGIC; - port->card = &isi_card[card]; - port->channel = channel; - port->close_delay = 50 * HZ/100; - port->closing_wait = 3000 * HZ/100; - INIT_WORK(&port->hangup_tq, do_isicom_hangup, port); - INIT_WORK(&port->bh_tqueue, isicom_bottomhalf, port); - port->status = 0; - init_waitqueue_head(&port->open_wait); - init_waitqueue_head(&port->close_wait); - /* . . . */ - } - } - - return 1; + + retval = -EIO; + + if (WaitTillCardIsFree(base)) + goto errrelfw; + + outw(0xf2, base); + outw(0x800, base); + outw(0x0, base); + outw(0x0, base); + InterruptTheCard(base); + outw(0x0, base + 0x4); /* for ISI4608 cards */ + +/* XXX: should we test it by reading it back and comparing with original like + * in load firmware package? */ + for (frame = (struct stframe*)fw->data; + frame < (struct stframe*)(fw->data + fw->size); + frame++) { + if (WaitTillCardIsFree(base)) + goto errrelfw; + + outw(0xf1, base); /* start download sequence */ + outw(0x00, base); + outw(frame->addr, base); /* lsb of address */ + + word_count = (frame->count >> 1) + frame->count % 2; + outw(word_count + 1, base); + InterruptTheCard(base); + + udelay(50); /* 0xf */ + + if (WaitTillCardIsFree(base)) + goto errrelfw; + + if ((status = inw(base + 0x4)) != 0) { + printk(KERN_WARNING "ISILoad:Card%d rejected verify " + "header:\nAddress:0x%x \nCount:0x%x\nStatus: " + "0x%x \n", index + 1, frame->addr, frame->count, + status); + goto errrelfw; + } + + data = kmalloc(word_count * 2, GFP_KERNEL); + inw(base); + insw(base, data, word_count); + InterruptTheCard(base); + + for (a = 0; a < frame->count; a++) + if (data[a] != frame->data[a]) { + kfree(data); + printk(KERN_ERR "ISILoad:Card%d, firmware " + "upload failed\n", index + 1); + goto errrelfw; + } + kfree(data); + + udelay(50); /* 0xf */ + + if (WaitTillCardIsFree(base)) + goto errrelfw; + + if ((status = inw(base + 0x4)) != 0) { + printk(KERN_ERR "ISILoad:Card%d verify got out of " + "sync. Card Status:0x%x\n", index + 1, status); + goto errrelfw; + } + } + + board->status |= FIRMWARE_LOADED; + retval = 0; + +errrelfw: + release_firmware(fw); +end: + return retval; } /* * Insmod can set static symbols so keep these static */ - static int io[4]; static int irq[4]; +static int card; -MODULE_AUTHOR("MultiTech"); -MODULE_DESCRIPTION("Driver for the ISI series of cards by MultiTech"); -MODULE_LICENSE("GPL"); -module_param_array(io, int, NULL, 0); -MODULE_PARM_DESC(io, "I/O ports for the cards"); -module_param_array(irq, int, NULL, 0); -MODULE_PARM_DESC(irq, "Interrupts for the cards"); +static int __devinit isicom_probe(struct pci_dev *pdev, + const struct pci_device_id *ent) +{ + unsigned int ioaddr, signature, index; + int retval = -EPERM; + u8 pciirq; + struct isi_board *board = NULL; + + if (card >= BOARD_COUNT) + goto err; + + ioaddr = pci_resource_start(pdev, 3); + /* i.e at offset 0x1c in the PCI configuration register space. */ + pciirq = pdev->irq; + printk(KERN_INFO "ISI PCI Card(Device ID 0x%x)\n", ent->device); + + /* allot the first empty slot in the array */ + for (index = 0; index < BOARD_COUNT; index++) + if (isi_card[index].base == 0) { + board = &isi_card[index]; + break; + } + + board->base = ioaddr; + board->irq = pciirq; + board->isa = NO; + board->device = pdev->dev; + card++; + + retval = isicom_register_ioregion(board, index); + if (retval < 0) + goto err; + + retval = isicom_register_isr(board, index); + if (retval < 0) + goto errunrr; + + retval = reset_card(board, index, &signature); + if (retval < 0) + goto errunri; + + retval = load_firmware(board, index, signature); + if (retval < 0) + goto errunri; + + return 0; + +errunri: + isicom_unregister_isr(board); +errunrr: + isicom_unregister_ioregion(board, index); +err: + board->base = 0; + return retval; +} + +static void __devexit isicom_remove(struct pci_dev *pdev) +{ + unsigned int idx; + + for (idx = 0; idx < BOARD_COUNT; idx++) + if (isi_card[idx].base == pci_resource_start(pdev, 3)) + break; + + if (idx == BOARD_COUNT) + return; + + isicom_unregister_isr(&isi_card[idx]); + isicom_unregister_ioregion(&isi_card[idx], idx); +} static int __devinit isicom_setup(void) { - struct pci_dev *dev = NULL; - int retval, card, idx, count; - unsigned char pciirq; - unsigned int ioaddr; - + int retval, idx, channel; + struct isi_port *port; + card = 0; - for(idx=0; idx < BOARD_COUNT; idx++) { - if (io[idx]) { - isi_card[idx].base=io[idx]; - isi_card[idx].irq=irq[idx]; - isi_card[idx].isa=YES; - card++; - } - else { - isi_card[idx].base = 0; - isi_card[idx].irq = 0; - } - } - - for (idx=0 ;idx < card; idx++) { - if (!((isi_card[idx].irq==2)||(isi_card[idx].irq==3)|| - (isi_card[idx].irq==4)||(isi_card[idx].irq==5)|| - (isi_card[idx].irq==7)||(isi_card[idx].irq==10)|| - (isi_card[idx].irq==11)||(isi_card[idx].irq==12)|| - (isi_card[idx].irq==15))) { - - if (isi_card[idx].base) { - printk(KERN_ERR "ISICOM: Irq %d unsupported. Disabling Card%d...\n", - isi_card[idx].irq, idx+1); - isi_card[idx].base=0; - card--; - } - } - } - - if (card < BOARD_COUNT) { - for (idx=0; idx < DEVID_COUNT; idx++) { - dev = NULL; - for (;;){ - if (!(dev = pci_find_device(VENDOR_ID, isicom_pci_tbl[idx].device, dev))) - break; - if (card >= BOARD_COUNT) - break; - - if (pci_enable_device(dev)) - break; + memset(isi_ports, 0, sizeof(isi_ports)); - /* found a PCI ISI card! */ - ioaddr = pci_resource_start (dev, 3); /* i.e at offset 0x1c in the - * PCI configuration register - * space. - */ - pciirq = dev->irq; - printk(KERN_INFO "ISI PCI Card(Device ID 0x%x)\n", isicom_pci_tbl[idx].device); - /* - * allot the first empty slot in the array - */ - for (count=0; count < BOARD_COUNT; count++) { - if (isi_card[count].base == 0) { - isi_card[count].base = ioaddr; - isi_card[count].irq = pciirq; - isi_card[count].isa = NO; - card++; - break; - } - } - } - if (card >= BOARD_COUNT) break; + for(idx = 0; idx < BOARD_COUNT; idx++) { + port = &isi_ports[idx * 16]; + isi_card[idx].ports = port; + spin_lock_init(&isi_card[idx].card_lock); + for (channel = 0; channel < 16; channel++, port++) { + port->magic = ISICOM_MAGIC; + port->card = &isi_card[idx]; + port->channel = channel; + port->close_delay = 50 * HZ/100; + port->closing_wait = 3000 * HZ/100; + INIT_WORK(&port->hangup_tq, do_isicom_hangup, port); + INIT_WORK(&port->bh_tqueue, isicom_bottomhalf, port); + port->status = 0; + init_waitqueue_head(&port->open_wait); + init_waitqueue_head(&port->close_wait); + /* . . . */ } - } - - if (!(isi_card[0].base || isi_card[1].base || isi_card[2].base || isi_card[3].base)) { - printk(KERN_ERR "ISICOM: No valid card configuration. Driver cannot be initialized...\n"); - return -EIO; - } - retval = misc_register(&isiloader_device); + isi_card[idx].base = 0; + isi_card[idx].irq = 0; + + if (!io[idx]) + continue; + + if (irq[idx] == 2 || irq[idx] == 3 || irq[idx] == 4 || + irq[idx] == 5 || irq[idx] == 7 || + irq[idx] == 10 || irq[idx] == 11 || + irq[idx] == 12 || irq[idx] == 15) { + printk(KERN_ERR "ISICOM: ISA not supported yet.\n"); + return -EIO; +/* isi_card[idx].base = io[idx]; + isi_card[idx].irq = irq[idx]; + isi_card[idx].isa = YES; + FIXME: which device for request_firmware use? if you know, uncomment this and + delete printk and return + isi_card[idx].device = ???; + card++;*/ + } else + printk(KERN_ERR "ISICOM: Irq %d unsupported. " + "Disabling Card%d...\n", irq[idx], idx + 1); + } + + retval = isicom_register_tty_driver(); + if (retval < 0) + goto error; + + retval = pci_register_driver(&isicom_driver); if (retval < 0) { - printk(KERN_ERR "ISICOM: Unable to register firmware loader driver.\n"); - return retval; - } - - if (!isicom_init()) { - if (misc_deregister(&isiloader_device)) - printk(KERN_ERR "ISICOM: Unable to unregister Firmware Loader driver\n"); - return -EIO; + 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; } static void __exit isicom_exit(void) { + unsigned int index = 0; + re_schedule = 0; - /* FIXME */ - msleep(1000); - unregister_isr(); - unregister_drivers(); - unregister_ioregion(); - if(tmp_buf) - free_page((unsigned long)tmp_buf); - if (misc_deregister(&isiloader_device)) - printk(KERN_ERR "ISICOM: Unable to unregister Firmware Loader driver\n"); + + while (re_schedule != 2 && index++ < 100) + msleep(10); + + pci_unregister_driver(&isicom_driver); + isicom_unregister_tty_driver(); + + for (index = 0; index < BOARD_COUNT; index++) { + isicom_unregister_isr(&isi_card[index]); + isicom_unregister_ioregion(&isi_card[index], index); + } } module_init(isicom_setup); module_exit(isicom_exit); + +MODULE_AUTHOR("MultiTech"); +MODULE_DESCRIPTION("Driver for the ISI series of cards by MultiTech"); +MODULE_LICENSE("GPL"); +module_param_array(io, int, NULL, 0); +MODULE_PARM_DESC(io, "I/O ports for the cards"); +module_param_array(irq, int, NULL, 0); +MODULE_PARM_DESC(irq, "Interrupts for the cards"); diff --git a/include/linux/isicom.h b/include/linux/isicom.h --- a/include/linux/isicom.h +++ b/include/linux/isicom.h @@ -5,46 +5,12 @@ /*#define ISICOM_DEBUG_DTR_RTS*/ -/* - * Firmware Loader definitions ... - */ - -#define __MultiTech ('M'<<8) -#define MIOCTL_LOAD_FIRMWARE (__MultiTech | 0x01) -#define MIOCTL_READ_FIRMWARE (__MultiTech | 0x02) -#define MIOCTL_XFER_CTRL (__MultiTech | 0x03) -#define MIOCTL_RESET_CARD (__MultiTech | 0x04) - -#define DATA_SIZE 16 - -typedef struct { - unsigned short exec_segment; - unsigned short exec_addr; -} exec_record; - -typedef struct { - int board; /* Board to load */ - unsigned short addr; - unsigned short count; -} bin_header; - -typedef struct { - int board; /* Board to load */ - unsigned short addr; - unsigned short count; - unsigned short segment; - unsigned char bin_data[DATA_SIZE]; -} bin_frame; - #ifdef __KERNEL__ #define YES 1 #define NO 0 -#define ISILOAD_MISC_MINOR 155 /* /dev/isctl */ -#define ISILOAD_NAME "ISILoad" - -/* +/* * ISICOM Driver definitions ... * */ @@ -66,9 +32,9 @@ typedef struct { #define ISICOM_CMAJOR 113 /* callout */ #define ISICOM_MAGIC (('M' << 8) | 'T') -#define WAKEUP_CHARS 256 /* hard coded for now */ -#define TX_SIZE 254 - +#define WAKEUP_CHARS 256 /* hard coded for now */ +#define TX_SIZE 254 + #define BOARD_COUNT 4 #define PORT_COUNT (BOARD_COUNT*16) @@ -98,18 +64,15 @@ typedef struct { #define ISICOM_INITIATE_XONXOFF 0x04 #define ISICOM_RESPOND_XONXOFF 0x08 -#define InterruptTheCard(base) (outw(0,(base)+0xc)) -#define ClearInterrupt(base) (inw((base)+0x0a)) - #define BOARD(line) (((line) >> 4) & 0x3) /* isi kill queue bitmap */ - + #define ISICOM_KILLTX 0x01 #define ISICOM_KILLRX 0x02 /* isi_board status bitmap */ - + #define FIRMWARE_LOADED 0x0001 #define BOARD_ACTIVE 0x0002 @@ -123,8 +86,8 @@ typedef struct { #define ISI_RTS 0x0200 -#define ISI_TXOK 0x0001 - +#define ISI_TXOK 0x0001 + #endif /* __KERNEL__ */ #endif /* ISICOM_H */ ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] drivers/char/isicom old api rewritten (round 3) 2005-09-11 23:11 ` [PATCH] drivers/char/isicom old api rewritten (round 3) Jiri Slaby @ 2005-09-12 4:58 ` Greg KH 2005-09-12 12:58 ` [PATCH] drivers/char/isicom whitespace cleanup Jiri Slaby 2005-09-13 16:49 ` [PATCH 0/5] isicom char driver to 2.6 api Jiri Slaby 0 siblings, 2 replies; 22+ messages in thread From: Greg KH @ 2005-09-12 4:58 UTC (permalink / raw) To: Jiri Slaby; +Cc: Andrew Morton, Linux Kernel Mailing List On Mon, Sep 12, 2005 at 01:11:00AM +0200, Jiri Slaby wrote: > > > >40k isn't large - please include such patches in the email. > > > > > > > Thank you, Andrew, for your reply and hints, you sent. > > Did everything get addressed? > Maybe not, if you still want it in e-mail as plaintext, grr. > > > Then send the patch, cc'ed to the mailing list as per > > http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt, thanks. > Oops, I read only SubmittingPatches. So this file should be changed in point 7 > (that not everybody wants URLs). > > > > This patch removes old api in pci probing and replaces it with new. Firmware > loading added. You do a lot of different things in this patch (whitespace changes, line wrapps, etc.) Try a few patches in order (coding style issues, then pci api, then firmware, etc.) thanks, greg k-h ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH] drivers/char/isicom whitespace cleanup 2005-09-12 4:58 ` Greg KH @ 2005-09-12 12:58 ` Jiri Slaby 2005-09-13 16:49 ` [PATCH 0/5] isicom char driver to 2.6 api Jiri Slaby 1 sibling, 0 replies; 22+ messages in thread From: Jiri Slaby @ 2005-09-12 12:58 UTC (permalink / raw) To: Andrew Morton; +Cc: Greg KH, Linux Kernel Mailing List Whitespace cleanup in isicom driver. Don't bite me for lines, that has more than 80 chars, next patches will eliminate them. Generated in 2.6.13-mm3 kernel version. Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> --- isicom.c | 1303 +++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 651 insertions(+), 652 deletions(-) diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c @@ -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,28 +31,28 @@ * * 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. * * 08/02/01 anil .s Upgraded the driver for kernel * 2.4.x * - * 11/04/01 Kevin Fixed firmware load problem with + * 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,19 +73,19 @@ * 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 * result * - * 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 + * 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 * Red Hat Distribution * * 06/01/05 Alan Cox Merged the ISI and base kernel strands @@ -93,10 +93,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/ * @@ -161,16 +161,15 @@ static unsigned long tx_count = 0; static int ISILoad_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); static void isicom_tx(unsigned long _data); -static void isicom_start(struct tty_struct * tty); +static void isicom_start(struct tty_struct *tty); -static unsigned char * tmp_buf; +static unsigned char *tmp_buf; static DECLARE_MUTEX(tmp_buf_sem); /* baud index mappings from linux defns to isi */ static signed char 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 { @@ -216,7 +215,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; @@ -225,7 +224,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 */ @@ -244,7 +243,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); } @@ -260,119 +259,119 @@ static void unlock_card(struct isi_board /* * ISI Card specific ops ... */ - -static void raise_dtr(struct isi_port * port) + +static void raise_dtr(struct isi_port *port) { - struct isi_board * card = port->card; + struct isi_board *card = port->card; unsigned short base = card->base; unsigned char channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw(0x0504, base); InterruptTheCard(base); port->status |= ISI_DTR; unlock_card(card); } -static inline void drop_dtr(struct isi_port * port) -{ - struct isi_board * card = port->card; +static inline void drop_dtr(struct isi_port *port) +{ + struct isi_board *card = port->card; unsigned short base = card->base; unsigned char channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw(0x0404, base); - InterruptTheCard(base); + InterruptTheCard(base); port->status &= ~ISI_DTR; unlock_card(card); } -static inline void raise_rts(struct isi_port * port) +static inline void raise_rts(struct isi_port *port) { - struct isi_board * card = port->card; + struct isi_board *card = port->card; unsigned short base = card->base; unsigned char channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw(0x0a04, base); - InterruptTheCard(base); + InterruptTheCard(base); port->status |= ISI_RTS; unlock_card(card); } -static inline void drop_rts(struct isi_port * port) +static inline void drop_rts(struct isi_port *port) { - struct isi_board * card = port->card; + struct isi_board *card = port->card; unsigned short base = card->base; unsigned char channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw(0x0804, base); - InterruptTheCard(base); + InterruptTheCard(base); port->status &= ~ISI_RTS; unlock_card(card); } -static inline void raise_dtr_rts(struct isi_port * port) +static inline void raise_dtr_rts(struct isi_port *port) { - struct isi_board * card = port->card; + struct isi_board *card = port->card; unsigned short base = card->base; unsigned char channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw(0x0f04, base); InterruptTheCard(base); port->status |= (ISI_DTR | ISI_RTS); unlock_card(card); } -static void drop_dtr_rts(struct isi_port * port) +static void drop_dtr_rts(struct isi_port *port) { - struct isi_board * card = port->card; + struct isi_board *card = port->card; unsigned short base = card->base; unsigned char channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw(0x0c04, base); - InterruptTheCard(base); + InterruptTheCard(base); port->status &= ~(ISI_RTS | ISI_DTR); unlock_card(card); } -static inline void kill_queue(struct isi_port * port, short queue) +static inline void kill_queue(struct isi_port *port, short queue) { - struct isi_board * card = port->card; + struct isi_board *card = port->card; unsigned short base = card->base; unsigned char channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw((queue << 8) | 0x06, base); - InterruptTheCard(base); + InterruptTheCard(base); unlock_card(card); } -/* +/* * Firmware loader driver specific routines. This needs to mostly die * and be replaced with request_firmware. */ @@ -386,19 +385,19 @@ static struct miscdevice isiloader_devic ISILOAD_MISC_MINOR, "isictl", &ISILoad_fops }; - + static inline int WaitTillCardIsFree(unsigned short base) { unsigned long count=0; while( (!(inw(base+0xe) & 0x1)) && (count++ < 6000000)); - if (inw(base+0xe)&0x1) + if (inw(base+0xe)&0x1) return 0; else return 1; } static int ISILoad_ioctl(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg) + unsigned int cmd, unsigned long arg) { unsigned int card, i, j, signature, status, portcount = 0; unsigned long t; @@ -406,213 +405,211 @@ static int ISILoad_ioctl(struct inode *i bin_frame frame; void __user *argp = (void __user *)arg; /* exec_record exec_rec; */ - + if(get_user(card, (int __user *)argp)) return -EFAULT; - + if(card < 0 || card >= BOARD_COUNT) return -ENXIO; - + base=isi_card[card].base; - + if(base==0) return -ENXIO; /* disabled or not used */ - + switch(cmd) { - case MIOCTL_RESET_CARD: - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; - printk(KERN_DEBUG "ISILoad:Resetting Card%d at 0x%x ",card+1,base); - - inw(base+0x8); - - for(t=jiffies+HZ/100;time_before(jiffies, t);); - - outw(0,base+0x8); /* Reset */ - - for(j=1;j<=3;j++) { - for(t=jiffies+HZ;time_before(jiffies, t);); - printk("."); - } - signature=(inw(base+0x4)) & 0xff; - if (isi_card[card].isa) { - - if (!(inw(base+0xe) & 0x1) || (inw(base+0x2))) { -#ifdef ISICOM_DEBUG - printk("\nbase+0x2=0x%x , base+0xe=0x%x",inw(base+0x2),inw(base+0xe)); -#endif - printk("\nISILoad:ISA Card%d reset failure (Possible bad I/O Port Address 0x%x).\n",card+1,base); - return -EIO; - } - } - else { - portcount = inw(base+0x2); - if (!(inw(base+0xe) & 0x1) || ((portcount!=0) && (portcount!=4) && (portcount!=8))) { + case MIOCTL_RESET_CARD: + if (!capable(CAP_SYS_ADMIN)) + return -EPERM; + printk(KERN_DEBUG "ISILoad:Resetting Card%d at 0x%x ",card+1,base); + + inw(base+0x8); + + for(t=jiffies+HZ/100;time_before(jiffies, t);); + + outw(0,base+0x8); /* Reset */ + + for(j=1;j<=3;j++) { + for(t=jiffies+HZ;time_before(jiffies, t);); + printk("."); + } + signature=(inw(base+0x4)) & 0xff; + if (isi_card[card].isa) { + + if (!(inw(base+0xe) & 0x1) || (inw(base+0x2))) { #ifdef ISICOM_DEBUG - printk("\nbase+0x2=0x%x , base+0xe=0x%x",inw(base+0x2),inw(base+0xe)); + printk("\nbase+0x2=0x%x , base+0xe=0x%x",inw(base+0x2),inw(base+0xe)); #endif - printk("\nISILoad:PCI Card%d reset failure (Possible bad I/O Port Address 0x%x).\n",card+1,base); - return -EIO; - } - } - switch(signature) { - case 0xa5: - case 0xbb: - case 0xdd: - if (isi_card[card].isa) - isi_card[card].port_count = 8; - else { - if (portcount == 4) - isi_card[card].port_count = 4; - else - isi_card[card].port_count = 8; - } - isi_card[card].shift_count = 12; - break; - - case 0xcc: isi_card[card].port_count = 16; - isi_card[card].shift_count = 11; - break; - - default: printk("ISILoad:Card%d reset failure (Possible bad I/O Port Address 0x%x).\n",card+1,base); -#ifdef ISICOM_DEBUG - printk("Sig=0x%x\n",signature); -#endif - return -EIO; + printk("\nISILoad:ISA Card%d reset failure (Possible bad I/O Port Address 0x%x).\n",card+1,base); + return -EIO; + } + } + else { + portcount = inw(base+0x2); + if (!(inw(base+0xe) & 0x1) || ((portcount!=0) && (portcount!=4) && (portcount!=8))) { +#ifdef ISICOM_DEBUG + printk("\nbase+0x2=0x%x , base+0xe=0x%x",inw(base+0x2),inw(base+0xe)); +#endif + printk("\nISILoad:PCI Card%d reset failure (Possible bad I/O Port Address 0x%x).\n",card+1,base); + return -EIO; } - printk("-Done\n"); - return put_user(signature,(unsigned __user *)argp); - + } + switch(signature) { + case 0xa5: + case 0xbb: + case 0xdd: + if (isi_card[card].isa) + isi_card[card].port_count = 8; + else { + if (portcount == 4) + isi_card[card].port_count = 4; + else + isi_card[card].port_count = 8; + } + isi_card[card].shift_count = 12; + break; + + case 0xcc: isi_card[card].port_count = 16; + isi_card[card].shift_count = 11; + break; + + default: printk("ISILoad:Card%d reset failure (Possible bad I/O Port Address 0x%x).\n",card+1,base); +#ifdef ISICOM_DEBUG + printk("Sig=0x%x\n",signature); +#endif + return -EIO; + } + printk("-Done\n"); + return put_user(signature,(unsigned __user *)argp); + case MIOCTL_LOAD_FIRMWARE: if (!capable(CAP_SYS_ADMIN)) return -EPERM; - + if(copy_from_user(&frame, argp, sizeof(bin_frame))) return -EFAULT; - + if (WaitTillCardIsFree(base)) return -EIO; - - outw(0xf0,base); /* start upload sequence */ + + outw(0xf0,base); /* start upload sequence */ outw(0x00,base); - outw((frame.addr), base);/* lsb of adderess */ - + outw((frame.addr), base); /* lsb of adderess */ + word_count=(frame.count >> 1) + frame.count % 2; outw(word_count, base); InterruptTheCard(base); - + for(i=0;i<=0x2f;i++); /* a wee bit of delay */ - - if (WaitTillCardIsFree(base)) + + if (WaitTillCardIsFree(base)) return -EIO; - + if ((status=inw(base+0x4))!=0) { - printk(KERN_WARNING "ISILoad:Card%d rejected load header:\nAddress:0x%x \nCount:0x%x \nStatus:0x%x \n", + printk(KERN_WARNING "ISILoad:Card%d rejected load header:\nAddress:0x%x \nCount:0x%x \nStatus:0x%x \n", card+1, frame.addr, frame.count, status); return -EIO; } outsw(base, (void *) frame.bin_data, word_count); - + InterruptTheCard(base); - - for(i=0;i<=0x0f;i++); /* another wee bit of delay */ - - if (WaitTillCardIsFree(base)) + + for(i=0;i<=0x0f;i++); /* another wee bit of delay */ + + if (WaitTillCardIsFree(base)) return -EIO; - + if ((status=inw(base+0x4))!=0) { printk(KERN_ERR "ISILoad:Card%d got out of sync.Card Status:0x%x\n",card+1, status); return -EIO; - } + } return 0; - + case MIOCTL_READ_FIRMWARE: if (!capable(CAP_SYS_ADMIN)) return -EPERM; - + if(copy_from_user(&frame, argp, sizeof(bin_header))) return -EFAULT; - + if (WaitTillCardIsFree(base)) return -EIO; - - outw(0xf1,base); /* start download sequence */ + + outw(0xf1,base); /* start download sequence */ outw(0x00,base); - outw((frame.addr), base);/* lsb of adderess */ - + outw((frame.addr), base); /* lsb of adderess */ + word_count=(frame.count >> 1) + frame.count % 2; outw(word_count+1, base); InterruptTheCard(base); - + for(i=0;i<=0xf;i++); /* a wee bit of delay */ - - if (WaitTillCardIsFree(base)) + + if (WaitTillCardIsFree(base)) return -EIO; - + if ((status=inw(base+0x4))!=0) { - printk(KERN_WARNING "ISILoad:Card%d rejected verify header:\nAddress:0x%x \nCount:0x%x \nStatus:0x%x \n", + printk(KERN_WARNING "ISILoad:Card%d rejected verify header:\nAddress:0x%x \nCount:0x%x \nStatus:0x%x \n", card+1, frame.addr, frame.count, status); return -EIO; } - + inw(base); insw(base, frame.bin_data, word_count); InterruptTheCard(base); - - for(i=0;i<=0x0f;i++); /* another wee bit of delay */ - - if (WaitTillCardIsFree(base)) + + for(i=0;i<=0x0f;i++); /* another wee bit of delay */ + + if (WaitTillCardIsFree(base)) return -EIO; - + if ((status=inw(base+0x4))!=0) { printk(KERN_ERR "ISILoad:Card%d verify got out of sync.Card Status:0x%x\n",card+1, status); return -EIO; - } - + } + if(copy_to_user(argp, &frame, sizeof(bin_frame))) return -EFAULT; return 0; - + case MIOCTL_XFER_CTRL: if (!capable(CAP_SYS_ADMIN)) return -EPERM; - if (WaitTillCardIsFree(base)) + if (WaitTillCardIsFree(base)) return -EIO; - + outw(0xf2, base); outw(0x800, base); outw(0x0, base); outw(0x0, base); InterruptTheCard(base); - outw(0x0, base+0x4); /* for ISI4608 cards */ - + outw(0x0, base+0x4); /* for ISI4608 cards */ + isi_card[card].status |= FIRMWARE_LOADED; - return 0; - + return 0; + default: -#ifdef ISICOM_DEBUG - printk(KERN_DEBUG "ISILoad: Received Ioctl cmd 0x%x.\n", cmd); +#ifdef ISICOM_DEBUG + printk(KERN_DEBUG "ISILoad: Received Ioctl cmd 0x%x.\n", cmd); #endif return -ENOIOCTLCMD; - } - } - + /* * ISICOM Driver specific routines ... * */ - -static inline int isicom_paranoia_check(struct isi_port const * port, char *name, - const char * routine) + +static inline int isicom_paranoia_check(struct isi_port const *port, char *name, + const char *routine) { -#ifdef ISICOM_DEBUG - static const char * badmagic = +#ifdef ISICOM_DEBUG + static const char *badmagic = KERN_WARNING "ISICOM: Warning: bad isicom magic for dev %s in %s.\n"; - static const char * badport = - KERN_WARNING "ISICOM: Warning: NULL isicom port for dev %s in %s.\n"; + static const char *badport = + KERN_WARNING "ISICOM: Warning: NULL isicom port for dev %s in %s.\n"; if (!port) { printk(badport, name, routine); return 1; @@ -620,13 +617,13 @@ static inline int isicom_paranoia_check( if (port->magic != ISICOM_MAGIC) { printk(badmagic, 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. @@ -636,25 +633,25 @@ static void isicom_tx(unsigned long _dat { short count = (BOARD_COUNT-1), card, base; short txcount, wrd, residue, word_count, cnt; - struct isi_port * port; - struct tty_struct * tty; - + 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; @@ -663,18 +660,18 @@ static void isicom_tx(unsigned long _dat continue; /* port not active or tx disabled to force flow control */ if (!(port->flags & ASYNC_INITIALIZED) || - !(port->status & ISI_TXOK)) + !(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]); @@ -682,16 +679,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) { @@ -702,13 +699,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); @@ -731,68 +728,68 @@ static void isicom_tx(unsigned long _dat if (port->xmit_cnt <= WAKEUP_CHARS) schedule_work(&port->bh_tqueue); unlock_card(&isi_card[card]); - } + } - /* schedule another tx for hopefully in about 10ms */ -sched_again: - if (!re_schedule) + /* schedule another tx for hopefully in about 10ms */ +sched_again: + if (!re_schedule) return; init_timer(&tx); tx.expires = jiffies + HZ/100; 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; - + struct isi_port *port = (struct isi_port *) data; + struct tty_struct *tty = port->tty; + 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) { - struct isi_board * card; - struct isi_port * port; - struct tty_struct * tty; + struct isi_board *card; + struct isi_port *port; + struct tty_struct *tty; unsigned short base, header, word_count, count; unsigned char channel; short byte_count; unsigned char *rp; - + card = (struct isi_board *) dev_id; if (!card || !(card->status & FIRMWARE_LOADED)) return IRQ_NONE; - + base = card->base; spin_lock(&card->card_lock); - + if (card->isa == NO) { /* - * disable any interrupts from the PCI card and lower the - * interrupt line + * disable any interrupts from the PCI card and lower the + * interrupt line */ outw(0x8000, base+0x04); ClearInterrupt(base); } - + inw(base); /* get the dummy word out */ header = inw(base); channel = (header & 0x7800) >> card->shift_count; @@ -804,9 +801,9 @@ static irqreturn_t isicom_interrupt(int 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)) { @@ -815,8 +812,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; @@ -833,107 +830,107 @@ 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 - printk(KERN_DEBUG "ISICOM: interrupt: DCD->low.\n"); -#endif - port->status &= ~ISI_DCD; - schedule_work(&port->hangup_tq); - } - } - else { - if (header & ISI_DCD) { - /* Carrier has been detected */ + 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 - printk(KERN_DEBUG "ISICOM: interrupt: DCD->high.\n"); -#endif - port->status |= ISI_DCD; - wake_up_interruptible(&port->open_wait); - } + printk(KERN_DEBUG "ISICOM: interrupt: DCD->low.\n"); +#endif + port->status &= ~ISI_DCD; + schedule_work(&port->hangup_tq); } } else { - if (header & ISI_DCD) + if (header & ISI_DCD) { + /* Carrier has been detected */ +#ifdef ISICOM_DEBUG + printk(KERN_DEBUG "ISICOM: interrupt: DCD->high.\n"); +#endif port->status |= ISI_DCD; - else - port->status &= ~ISI_DCD; - } - - if (port->flags & ASYNC_CTS_FLOW) { - if (port->tty->hw_stopped) { - if (header & ISI_CTS) { - port->tty->hw_stopped = 0; - /* start tx ing */ - port->status |= (ISI_TXOK | ISI_CTS); - schedule_work(&port->bh_tqueue); - } + wake_up_interruptible(&port->open_wait); } - else { - if (!(header & ISI_CTS)) { - port->tty->hw_stopped = 1; - /* stop tx ing */ - port->status &= ~(ISI_TXOK | ISI_CTS); - } + } + } + else { + 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) { + port->tty->hw_stopped = 0; + /* start tx ing */ + port->status |= (ISI_TXOK | ISI_CTS); + schedule_work(&port->bh_tqueue); } } else { - if (header & ISI_CTS) - port->status |= ISI_CTS; - else - port->status &= ~ISI_CTS; + if (!(header & ISI_CTS)) { + port->tty->hw_stopped = 1; + /* stop tx ing */ + port->status &= ~(ISI_TXOK | ISI_CTS); + } } - - if (header & ISI_DSR) - port->status |= ISI_DSR; - else - port->status &= ~ISI_DSR; - - if (header & ISI_RI) - port->status |= ISI_RI; + } + else { + if (header & ISI_CTS) + port->status |= ISI_CTS; else - port->status &= ~ISI_RI; - - break; - - case 1: /* Received Break !!! */ - tty_insert_flip_char(tty, 0, TTY_BREAK); - if (port->flags & ASYNC_SAK) - do_SAK(tty); - tty_flip_buffer_push(tty); - break; - - case 2: /* Statistics */ - printk(KERN_DEBUG "ISICOM: isicom_interrupt: stats!!!.\n"); - break; - - default: - printk(KERN_WARNING "ISICOM: Intr: Unknown code in status packet.\n"); - break; - } + port->status &= ~ISI_CTS; + } + + if (header & ISI_DSR) + port->status |= ISI_DSR; + else + port->status &= ~ISI_DSR; + + if (header & ISI_RI) + port->status |= ISI_RI; + else + port->status &= ~ISI_RI; + + break; + + case 1: /* Received Break !!! */ + tty_insert_flip_char(tty, 0, TTY_BREAK); + if (port->flags & ASYNC_SAK) + do_SAK(tty); + tty_flip_buffer_push(tty); + break; + + case 2: /* Statistics */ + printk(KERN_DEBUG "ISICOM: isicom_interrupt: stats!!!.\n"); + break; + + 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 +#endif word_count = count >> 1; insw(base, rp, word_count); byte_count -= (word_count << 1); if (count & 0x0001) { tty_insert_flip_char(tty, inw(base) & 0xff, TTY_NORMAL); byte_count -= 2; - } + } if (byte_count > 0) { printk(KERN_DEBUG "ISICOM: Intr(0x%x:%d): Flip buffer overflow! dropping bytes...\n", base, channel+1); @@ -947,102 +944,102 @@ 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) +static void isicom_config_port(struct isi_port *port) { - struct isi_board * card = port->card; - struct tty_struct * tty; + struct isi_board *card = port->card; + struct tty_struct *tty; unsigned long baud; unsigned short channel_setup, base = card->base; unsigned short channel = port->channel, shift_count = card->shift_count; unsigned char 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 */ + 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 + drop_dtr(port); + return; + } + else raise_dtr(port); - + if (lock_card(card)) { outw(0x8000 | (channel << shift_count) |0x03, base); outw(linuxb_to_isib[baud] << 8 | 0x03, base); channel_setup = 0; switch(C_CSIZE(tty)) { - case CS5: - channel_setup |= ISICOM_CS5; - break; - case CS6: - channel_setup |= ISICOM_CS6; - break; - case CS7: - channel_setup |= ISICOM_CS7; - break; - case CS8: - channel_setup |= ISICOM_CS8; - break; + case CS5: + channel_setup |= ISICOM_CS5; + break; + case CS6: + channel_setup |= ISICOM_CS6; + break; + case CS7: + channel_setup |= ISICOM_CS7; + break; + case CS8: + 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); @@ -1050,22 +1047,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 */ -static inline void isicom_setup_board(struct isi_board * bp) +/* open et all */ + +static inline void isicom_setup_board(struct isi_board *bp) { int channel; - struct isi_port * port; + 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); @@ -1078,49 +1075,49 @@ static inline void isicom_setup_board(st drop_dtr_rts(port); return; } - -static int isicom_setup_port(struct isi_port * port) + +static int isicom_setup_port(struct isi_port *port) { - struct isi_board * card = port->card; + 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 = (unsigned char *) page; - } + port->xmit_buf = (unsigned char *) 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; + struct isi_board *card = port->card; int do_clocal = 0, retval; unsigned long flags; DECLARE_WAITQUEUE(wait, current); @@ -1128,30 +1125,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); @@ -1161,27 +1158,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))) { + (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); @@ -1195,11 +1192,11 @@ 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) + +static int isicom_open(struct tty_struct *tty, struct file *filp) { - struct isi_port * port; - struct isi_board * card; + struct isi_port *port; + struct isi_board *card; unsigned int line, board; int error; @@ -1208,20 +1205,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; @@ -1230,12 +1227,12 @@ 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) +static inline void isicom_shutdown_board(struct isi_board *bp) { unsigned long flags; @@ -1246,15 +1243,15 @@ static inline void isicom_shutdown_board spin_unlock_irqrestore(&bp->card_lock, flags); } -static void isicom_shutdown_port(struct isi_port * port) +static void isicom_shutdown_port(struct isi_port *port) { - struct isi_board * card = port->card; - struct tty_struct * tty; + struct isi_board *card = port->card; + 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; @@ -1262,32 +1259,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; + card->count = 0; } - + /* last port was closed , shutdown that boad too */ if(C_HUPCL(tty)) { if (!card->count) @@ -1295,27 +1292,27 @@ static void isicom_shutdown_port(struct } } -static void isicom_close(struct tty_struct * tty, struct file * filp) +static void isicom_close(struct tty_struct *tty, struct file *filp) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - struct isi_board * card = port->card; + 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", @@ -1324,31 +1321,31 @@ static void isicom_close(struct tty_stru } if (--port->count < 0) { printk(KERN_WARNING "ISICOM:(0x%x) isicom_close: bad port count for" - "channel%d = %d", card->base, port->channel, + "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); @@ -1359,65 +1356,65 @@ 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); } /* write et all */ -static int isicom_write(struct tty_struct * tty, - const unsigned char * buf, int count) +static int isicom_write(struct tty_struct *tty, const unsigned char *buf, + int count) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - struct isi_board * card = port->card; + struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_board *card = port->card; unsigned long flags; int cnt, total = 0; if (isicom_paranoia_check(port, tty->name, "isicom_write")) return 0; - + if (!tty || !port->xmit_buf || !tmp_buf) return 0; - + spin_lock_irqsave(&card->card_lock, flags); - - while(1) { + + while(1) { cnt = min_t(int, count, min(SERIAL_XMIT_SIZE - port->xmit_cnt - 1, - SERIAL_XMIT_SIZE - port->xmit_head)); - if (cnt <= 0) + 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_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 */ -static void isicom_put_char(struct tty_struct * tty, unsigned char ch) +static void isicom_put_char(struct tty_struct *tty, unsigned char ch) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - struct isi_board * card = port->card; + 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; @@ -1426,7 +1423,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++; @@ -1434,30 +1431,30 @@ static void isicom_put_char(struct tty_s } /* flush_chars et all */ -static void isicom_flush_chars(struct tty_struct * tty) +static void isicom_flush_chars(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - + 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) 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 */ -static int isicom_write_room(struct tty_struct * tty) +static int isicom_write_room(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; + struct isi_port *port = (struct isi_port *) tty->driver_data; int free; 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; @@ -1465,23 +1462,23 @@ static int isicom_write_room(struct tty_ } /* chars_in_buffer et all */ -static int isicom_chars_in_buffer(struct tty_struct * tty) +static int isicom_chars_in_buffer(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; + struct isi_port *port = (struct isi_port *) tty->driver_data; if (isicom_paranoia_check(port, tty->name, "isicom_chars_in_buffer")) return 0; return port->xmit_cnt; } /* 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; - unsigned short base = card->base; - + struct isi_board *card = port->card; + unsigned short 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); @@ -1492,13 +1489,13 @@ static inline void isicom_send_break(str static int isicom_tiocmget(struct tty_struct *tty, struct file *file) { - struct isi_port * port = (struct isi_port *) tty->driver_data; + struct isi_port *port = (struct isi_port *) tty->driver_data; /* just send the port status */ unsigned short status = port->status; 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) | @@ -1508,13 +1505,13 @@ static int isicom_tiocmget(struct tty_st } static int isicom_tiocmset(struct tty_struct *tty, struct file *file, - unsigned int set, unsigned int clear) + unsigned int set, unsigned int clear) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - + 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) @@ -1526,46 +1523,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) +static int isicom_set_serial_info(struct isi_port *port, + 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) != - (newinfo.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) != - (port->flags & ~ASYNC_USR_MASK))) + (newinfo.closing_wait != port->closing_wait) || + ((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; @@ -1578,12 +1575,12 @@ 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) +static int isicom_ioctl(struct tty_struct *tty, struct file *filp, + unsigned int cmd, unsigned long arg) { - struct isi_port * port = (struct isi_port *) tty->driver_data; + struct isi_port *port = (struct isi_port *) tty->driver_data; void __user *argp = (void __user *)arg; int retval; @@ -1591,139 +1588,140 @@ static int isicom_ioctl(struct tty_struc return -ENODEV; switch(cmd) { - case TCSBRK: - retval = tty_check_change(tty); - if (retval) - return retval; - tty_wait_until_sent(tty, 0); - if (!arg) - isicom_send_break(port, HZ/4); - return 0; - - 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); - - 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; - - case TIOCGSERIAL: - return isicom_get_serial_info(port, argp); - - case TIOCSSERIAL: - return isicom_set_serial_info(port, argp); - - default: - return -ENOIOCTLCMD; + case TCSBRK: + retval = tty_check_change(tty); + if (retval) + return retval; + tty_wait_until_sent(tty, 0); + if (!arg) + isicom_send_break(port, HZ/4); + return 0; + + 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); + + 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; + + case TIOCGSERIAL: + return isicom_get_serial_info(port, argp); + + case TIOCSSERIAL: + return isicom_set_serial_info(port, argp); + + default: + return -ENOIOCTLCMD; } return 0; } /* set_termios et all */ -static void isicom_set_termios(struct tty_struct * tty, struct termios * old_termios) +static void isicom_set_termios(struct tty_struct *tty, + struct termios *old_termios) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - + 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) + 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 */ -static void isicom_throttle(struct tty_struct * tty) +static void isicom_throttle(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - struct isi_board * card = port->card; - + 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); } /* unthrottle et all */ -static void isicom_unthrottle(struct tty_struct * tty) +static void isicom_unthrottle(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - struct isi_board * card = port->card; - + 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); } /* stop et all */ -static void isicom_stop(struct tty_struct * tty) +static void isicom_stop(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; + struct isi_port *port = (struct isi_port *) tty->driver_data; 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; } /* start et all */ -static void isicom_start(struct tty_struct * tty) +static void isicom_start(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - + 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; } /* hangup et all */ -static void do_isicom_hangup(void * data) +static void do_isicom_hangup(void *data) { - struct isi_port * port = (struct isi_port *) data; - struct tty_struct * tty; - + struct isi_port *port = (struct isi_port *) data; + struct tty_struct *tty; + tty = port->tty; if (tty) tty_hangup(tty); } -static void isicom_hangup(struct tty_struct * tty) +static void isicom_hangup(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - + 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; @@ -1732,19 +1730,19 @@ static void isicom_hangup(struct tty_str } /* flush_buffer et all */ -static void isicom_flush_buffer(struct tty_struct * tty) +static void isicom_flush_buffer(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - struct isi_board * card = port->card; + 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); } @@ -1768,12 +1766,12 @@ static int __devinit register_ioregion(v static void unregister_ioregion(void) { int count; - for (count=0; count < BOARD_COUNT; count++ ) + for (count=0; count < BOARD_COUNT; count++ ) if (isi_card[count].base) { release_region(isi_card[count].base,16); -#ifdef ISICOM_DEBUG +#ifdef ISICOM_DEBUG printk(KERN_DEBUG "ISICOM: I/O Region 0x%x-0x%x released for Card%d.\n",isi_card[count].base,isi_card[count].base+15,count+1); -#endif +#endif } } @@ -1814,11 +1812,11 @@ static int __devinit register_drivers(vo isicom_normal->type = TTY_DRIVER_TYPE_SERIAL; isicom_normal->subtype = SERIAL_TYPE_NORMAL; isicom_normal->init_termios = tty_std_termios; - isicom_normal->init_termios.c_cflag = + isicom_normal->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL |CLOCAL; isicom_normal->flags = TTY_DRIVER_REAL_RAW; tty_set_operations(isicom_normal, &isicom_ops); - + if ((error=tty_register_driver(isicom_normal))!=0) { printk(KERN_DEBUG "ISICOM: Couldn't register the dialin driver, error=%d\n", error); @@ -1843,13 +1841,13 @@ static int __devinit register_isr(void) for (count=0; count < BOARD_COUNT; count++ ) { if (isi_card[count].base) { - irqflags = (isi_card[count].isa == YES) ? - SA_INTERRUPT : + irqflags = (isi_card[count].isa == YES) ? + SA_INTERRUPT : (SA_INTERRUPT | SA_SHIRQ); - if (request_irq(isi_card[count].irq, - isicom_interrupt, - irqflags, + if (request_irq(isi_card[count].irq, + isicom_interrupt, + irqflags, ISICOM_NAME, &isi_card[count])) { printk(KERN_WARNING "ISICOM: Could not" @@ -1862,7 +1860,7 @@ static int __devinit register_isr(void) } else done++; - } + } } return done; } @@ -1880,42 +1878,42 @@ static void __exit unregister_isr(void) static int __devinit isicom_init(void) { int card, channel, base; - struct isi_port * port; + struct isi_port *port; unsigned long page; - - if (!tmp_buf) { + + if (!tmp_buf) { page = get_zeroed_page(GFP_KERNEL); - if (!page) { -#ifdef ISICOM_DEBUG - printk(KERN_DEBUG "ISICOM: Couldn't allocate page for tmp_buf.\n"); + if (!page) { +#ifdef ISICOM_DEBUG + printk(KERN_DEBUG "ISICOM: Couldn't allocate page for tmp_buf.\n"); #else printk(KERN_ERR "ISICOM: Not enough memory...\n"); -#endif - return 0; - } - tmp_buf = (unsigned char *) page; +#endif + return 0; + } + tmp_buf = (unsigned char *) page; } - - if (!register_ioregion()) + + if (!register_ioregion()) { printk(KERN_ERR "ISICOM: All required I/O space found busy.\n"); free_page((unsigned long)tmp_buf); return 0; } - if (register_drivers()) + if (register_drivers()) { unregister_ioregion(); free_page((unsigned long)tmp_buf); return 0; } - if (!register_isr()) + if (!register_isr()) { unregister_drivers(); /* ioports already uregistered in register_isr */ free_page((unsigned long)tmp_buf); - return 0; + return 0; } - + memset(isi_ports, 0, sizeof(isi_ports)); for (card = 0; card < BOARD_COUNT; card++) { port = &isi_ports[card * 16]; @@ -1926,24 +1924,24 @@ static int __devinit isicom_init(void) port->magic = ISICOM_MAGIC; port->card = &isi_card[card]; port->channel = channel; - port->close_delay = 50 * HZ/100; - port->closing_wait = 3000 * HZ/100; - INIT_WORK(&port->hangup_tq, do_isicom_hangup, port); - INIT_WORK(&port->bh_tqueue, isicom_bottomhalf, port); - port->status = 0; - init_waitqueue_head(&port->open_wait); + port->close_delay = 50 * HZ/100; + port->closing_wait = 3000 * HZ/100; + INIT_WORK(&port->hangup_tq, do_isicom_hangup, port); + INIT_WORK(&port->bh_tqueue, isicom_bottomhalf, port); + port->status = 0; + init_waitqueue_head(&port->open_wait); init_waitqueue_head(&port->close_wait); /* . . . */ - } - } - - return 1; + } + } + + return 1; } /* * Insmod can set static symbols so keep these static */ - + static int io[4]; static int irq[4]; @@ -1961,9 +1959,9 @@ static int __devinit isicom_setup(void) int retval, card, idx, count; unsigned char pciirq; unsigned int ioaddr; - + card = 0; - for(idx=0; idx < BOARD_COUNT; idx++) { + for(idx=0; idx < BOARD_COUNT; idx++) { if (io[idx]) { isi_card[idx].base=io[idx]; isi_card[idx].irq=irq[idx]; @@ -1975,23 +1973,23 @@ static int __devinit isicom_setup(void) isi_card[idx].irq = 0; } } - + for (idx=0 ;idx < card; idx++) { if (!((isi_card[idx].irq==2)||(isi_card[idx].irq==3)|| - (isi_card[idx].irq==4)||(isi_card[idx].irq==5)|| - (isi_card[idx].irq==7)||(isi_card[idx].irq==10)|| - (isi_card[idx].irq==11)||(isi_card[idx].irq==12)|| - (isi_card[idx].irq==15))) { - + (isi_card[idx].irq==4)||(isi_card[idx].irq==5)|| + (isi_card[idx].irq==7)||(isi_card[idx].irq==10)|| + (isi_card[idx].irq==11)||(isi_card[idx].irq==12)|| + (isi_card[idx].irq==15))) { + if (isi_card[idx].base) { printk(KERN_ERR "ISICOM: Irq %d unsupported. Disabling Card%d...\n", isi_card[idx].irq, idx+1); isi_card[idx].base=0; card--; - } + } } - } - + } + if (card < BOARD_COUNT) { for (idx=0; idx < DEVID_COUNT; idx++) { dev = NULL; @@ -2000,21 +1998,22 @@ static int __devinit isicom_setup(void) break; if (card >= BOARD_COUNT) break; - + if (pci_enable_device(dev)) break; /* found a PCI ISI card! */ - ioaddr = pci_resource_start (dev, 3); /* i.e at offset 0x1c in the - * PCI configuration register - * space. - */ + ioaddr = pci_resource_start (dev, 3); + /* i.e at offset 0x1c in the + * PCI configuration register + * space. + */ pciirq = dev->irq; printk(KERN_INFO "ISI PCI Card(Device ID 0x%x)\n", isicom_pci_tbl[idx].device); /* * allot the first empty slot in the array - */ - for (count=0; count < BOARD_COUNT; count++) { + */ + for (count=0; count < BOARD_COUNT; count++) { if (isi_card[count].base == 0) { isi_card[count].base = ioaddr; isi_card[count].irq = pciirq; @@ -2023,35 +2022,35 @@ static int __devinit isicom_setup(void) break; } } - } + } if (card >= BOARD_COUNT) break; } } - + if (!(isi_card[0].base || isi_card[1].base || isi_card[2].base || isi_card[3].base)) { - printk(KERN_ERR "ISICOM: No valid card configuration. Driver cannot be initialized...\n"); + printk(KERN_ERR "ISICOM: No valid card configuration. Driver cannot be initialized...\n"); return -EIO; - } + } retval = misc_register(&isiloader_device); if (retval < 0) { printk(KERN_ERR "ISICOM: Unable to register firmware loader driver.\n"); return retval; } - + if (!isicom_init()) { - if (misc_deregister(&isiloader_device)) + if (misc_deregister(&isiloader_device)) printk(KERN_ERR "ISICOM: Unable to unregister Firmware Loader driver\n"); return -EIO; } - + init_timer(&tx); tx.expires = jiffies + 1; tx.data = 0; tx.function = isicom_tx; re_schedule = 1; add_timer(&tx); - + return 0; } @@ -2062,7 +2061,7 @@ static void __exit isicom_exit(void) msleep(1000); unregister_isr(); unregister_drivers(); - unregister_ioregion(); + unregister_ioregion(); if(tmp_buf) free_page((unsigned long)tmp_buf); if (misc_deregister(&isiloader_device)) ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 0/5] isicom char driver to 2.6 api 2005-09-12 4:58 ` Greg KH 2005-09-12 12:58 ` [PATCH] drivers/char/isicom whitespace cleanup Jiri Slaby @ 2005-09-13 16:49 ` Jiri Slaby 2005-09-13 16:52 ` [PATCH 2/5] isicom: types Jiri Slaby ` (4 more replies) 1 sibling, 5 replies; 22+ messages in thread From: Jiri Slaby @ 2005-09-13 16:49 UTC (permalink / raw) To: akpm; +Cc: Linux Kernel Mailing List, linux-pci, Greg KH This patches convert isicom char driver to 2.6 API. 1 - whispace cleanup 2 - types changes 3 - pci probing 4 - firmware loading 5 - more whitespace cleanup + wrapping lines ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 2/5] isicom: types 2005-09-13 16:49 ` [PATCH 0/5] isicom char driver to 2.6 api Jiri Slaby @ 2005-09-13 16:52 ` Jiri Slaby 2005-09-13 16:52 ` [PATCH 3/5] isicom: pci probing Jiri Slaby ` (3 subsequent siblings) 4 siblings, 0 replies; 22+ messages in thread From: Jiri Slaby @ 2005-09-13 16:52 UTC (permalink / raw) To: akpm; +Cc: Linux Kernel Mailing List, linux-pci, Greg KH Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> isicom.c | 203 ++++++++++++++++++++++++++++++--------------------------------- 1 files changed, 98 insertions(+), 105 deletions(-) diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c @@ -154,9 +154,6 @@ static struct tty_driver *isicom_normal; static struct timer_list tx; static char re_schedule = 1; -#ifdef ISICOM_DEBUG -static unsigned long tx_count = 0; -#endif static int ISILoad_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); @@ -164,7 +161,6 @@ static void isicom_tx(unsigned long _dat static void isicom_start(struct tty_struct *tty); static unsigned char *tmp_buf; -static DECLARE_MUTEX(tmp_buf_sem); /* baud index mappings from linux defns to isi */ @@ -173,35 +169,35 @@ static signed char linuxb_to_isib[] = { }; struct isi_board { - unsigned short base; - unsigned char irq; - unsigned char port_count; - unsigned short status; - unsigned short port_status; /* each bit represents a single port */ - unsigned short shift_count; - struct isi_port * ports; - signed char count; - unsigned char isa; + u16 base; + u8 irq; + u8 port_count; + u16 status; + u16 port_status; /* each bit for each port */ + u16 shift_count; + struct isi_port *ports; + s8 count; + u8 isa; spinlock_t card_lock; /* Card wide lock 11/5/00 -sameer */ unsigned long flags; }; struct isi_port { - unsigned short magic; + u16 magic; unsigned int flags; int count; int blocked_open; int close_delay; - unsigned short channel; - unsigned short status; - unsigned short closing_wait; - struct isi_board * card; - struct tty_struct * tty; + u16 channel; + u16 status; + u16 closing_wait; + 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; - unsigned char * xmit_buf; + u8 *xmit_buf; int xmit_head; int xmit_tail; int xmit_cnt; @@ -219,7 +215,7 @@ static struct isi_port isi_ports[PORT_C static int lock_card(struct isi_board *card) { char retries; - unsigned short base = card->base; + u16 base = card->base; for (retries = 0; retries < 100; retries++) { spin_lock_irqsave(&card->card_lock, card->flags); @@ -237,7 +233,7 @@ static int lock_card(struct isi_board *c static int lock_card_at_interrupt(struct isi_board *card) { unsigned char retries; - unsigned short base = card->base; + u16 base = card->base; for (retries = 0; retries < 200; retries++) { spin_lock_irqsave(&card->card_lock, card->flags); @@ -263,8 +259,8 @@ static void unlock_card(struct isi_board static void raise_dtr(struct isi_port *port) { struct isi_board *card = port->card; - unsigned short base = card->base; - unsigned char channel = port->channel; + u16 base = card->base; + u8 channel = port->channel; if (!lock_card(card)) return; @@ -279,8 +275,8 @@ static void raise_dtr(struct isi_port *p static inline void drop_dtr(struct isi_port *port) { struct isi_board *card = port->card; - unsigned short base = card->base; - unsigned char channel = port->channel; + u16 base = card->base; + u8 channel = port->channel; if (!lock_card(card)) return; @@ -295,8 +291,8 @@ static inline void drop_dtr(struct isi_p static inline void raise_rts(struct isi_port *port) { struct isi_board *card = port->card; - unsigned short base = card->base; - unsigned char channel = port->channel; + u16 base = card->base; + u8 channel = port->channel; if (!lock_card(card)) return; @@ -310,8 +306,8 @@ static inline void raise_rts(struct isi_ static inline void drop_rts(struct isi_port *port) { struct isi_board *card = port->card; - unsigned short base = card->base; - unsigned char channel = port->channel; + u16 base = card->base; + u8 channel = port->channel; if (!lock_card(card)) return; @@ -326,8 +322,8 @@ static inline void drop_rts(struct isi_p static inline void raise_dtr_rts(struct isi_port *port) { struct isi_board *card = port->card; - unsigned short base = card->base; - unsigned char channel = port->channel; + u16 base = card->base; + u8 channel = port->channel; if (!lock_card(card)) return; @@ -342,8 +338,8 @@ static inline void raise_dtr_rts(struct static void drop_dtr_rts(struct isi_port *port) { struct isi_board *card = port->card; - unsigned short base = card->base; - unsigned char channel = port->channel; + u16 base = card->base; + u8 channel = port->channel; if (!lock_card(card)) return; @@ -358,8 +354,8 @@ static void drop_dtr_rts(struct isi_port static inline void kill_queue(struct isi_port *port, short queue) { struct isi_board *card = port->card; - unsigned short base = card->base; - unsigned char channel = port->channel; + u16 base = card->base; + u8 channel = port->channel; if (!lock_card(card)) return; @@ -386,7 +382,7 @@ static struct miscdevice isiloader_devic }; -static inline int WaitTillCardIsFree(unsigned short base) +static inline int WaitTillCardIsFree(u16 base) { unsigned long count=0; while( (!(inw(base+0xe) & 0x1)) && (count++ < 6000000)); @@ -401,20 +397,20 @@ static int ISILoad_ioctl(struct inode *i { unsigned int card, i, j, signature, status, portcount = 0; unsigned long t; - unsigned short word_count, base; + u16 word_count, base; bin_frame frame; void __user *argp = (void __user *)arg; /* exec_record exec_rec; */ - if(get_user(card, (int __user *)argp)) + if (get_user(card, (int __user *)argp)) return -EFAULT; - if(card < 0 || card >= BOARD_COUNT) + if (card < 0 || card >= BOARD_COUNT) return -ENXIO; base=isi_card[card].base; - if(base==0) + if (base==0) return -ENXIO; /* disabled or not used */ switch(cmd) { @@ -425,12 +421,12 @@ static int ISILoad_ioctl(struct inode *i inw(base+0x8); - for(t=jiffies+HZ/100;time_before(jiffies, t);); + for (t=jiffies+HZ/100;time_before(jiffies, t);); outw(0,base+0x8); /* Reset */ - for(j=1;j<=3;j++) { - for(t=jiffies+HZ;time_before(jiffies, t);); + for (j=1;j<=3;j++) { + for (t=jiffies+HZ;time_before(jiffies, t);); printk("."); } signature=(inw(base+0x4)) & 0xff; @@ -486,7 +482,7 @@ static int ISILoad_ioctl(struct inode *i if (!capable(CAP_SYS_ADMIN)) return -EPERM; - if(copy_from_user(&frame, argp, sizeof(bin_frame))) + if (copy_from_user(&frame, argp, sizeof(bin_frame))) return -EFAULT; if (WaitTillCardIsFree(base)) @@ -500,7 +496,7 @@ static int ISILoad_ioctl(struct inode *i outw(word_count, base); InterruptTheCard(base); - for(i=0;i<=0x2f;i++); /* a wee bit of delay */ + for (i=0;i<=0x2f;i++); /* a wee bit of delay */ if (WaitTillCardIsFree(base)) return -EIO; @@ -514,7 +510,7 @@ static int ISILoad_ioctl(struct inode *i InterruptTheCard(base); - for(i=0;i<=0x0f;i++); /* another wee bit of delay */ + for (i=0;i<=0x0f;i++); /* another wee bit of delay */ if (WaitTillCardIsFree(base)) return -EIO; @@ -529,7 +525,7 @@ static int ISILoad_ioctl(struct inode *i if (!capable(CAP_SYS_ADMIN)) return -EPERM; - if(copy_from_user(&frame, argp, sizeof(bin_header))) + if (copy_from_user(&frame, argp, sizeof(bin_header))) return -EFAULT; if (WaitTillCardIsFree(base)) @@ -543,7 +539,7 @@ static int ISILoad_ioctl(struct inode *i outw(word_count+1, base); InterruptTheCard(base); - for(i=0;i<=0xf;i++); /* a wee bit of delay */ + for (i=0;i<=0xf;i++); /* a wee bit of delay */ if (WaitTillCardIsFree(base)) return -EIO; @@ -558,7 +554,7 @@ static int ISILoad_ioctl(struct inode *i insw(base, frame.bin_data, word_count); InterruptTheCard(base); - for(i=0;i<=0x0f;i++); /* another wee bit of delay */ + for (i=0;i<=0x0f;i++); /* another wee bit of delay */ if (WaitTillCardIsFree(base)) return -EIO; @@ -568,7 +564,7 @@ static int ISILoad_ioctl(struct inode *i return -EIO; } - if(copy_to_user(argp, &frame, sizeof(bin_frame))) + if (copy_to_user(argp, &frame, sizeof(bin_frame))) return -EFAULT; return 0; @@ -667,7 +663,7 @@ static void isicom_tx(unsigned long _dat tty = port->tty; - if(tty == NULL) { + if (tty == NULL) { unlock_card(&isi_card[card]); continue; } @@ -762,19 +758,16 @@ static void isicom_bottomhalf(void *data * Main interrupt handler routine */ -static irqreturn_t isicom_interrupt(int irq, void *dev_id, - struct pt_regs *regs) +static irqreturn_t isicom_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct isi_board *card; + struct isi_board *card = dev_id; struct isi_port *port; struct tty_struct *tty; - unsigned short base, header, word_count, count; - unsigned char channel; + u16 base, header, word_count, count; + u8 channel; short byte_count; unsigned char *rp; - card = (struct isi_board *) dev_id; - if (!card || !(card->status & FIRMWARE_LOADED)) return IRQ_NONE; @@ -953,8 +946,8 @@ static void isicom_config_port(struct is struct isi_board *card = port->card; struct tty_struct *tty; unsigned long baud; - unsigned short channel_setup, base = card->base; - unsigned short channel = port->channel, shift_count = card->shift_count; + u16 channel_setup, base = card->base; + u16 channel = port->channel, shift_count = card->shift_count; unsigned char flow_ctrl; if (!(tty = port->tty) || !tty->termios) @@ -1071,7 +1064,7 @@ static inline void isicom_setup_board(st port = bp->ports; bp->status |= BOARD_ACTIVE; spin_unlock_irqrestore(&bp->card_lock, flags); - for(channel = 0; channel < bp->port_count; channel++, port++) + for (channel = 0; channel < bp->port_count; channel++, port++) drop_dtr_rts(port); return; } @@ -1094,7 +1087,7 @@ static int isicom_setup_port(struct isi_ free_page(page); return -ERESTARTSYS; } - port->xmit_buf = (unsigned char *) page; + port->xmit_buf = (u8*) page; } spin_lock_irqsave(&card->card_lock, flags); @@ -1286,7 +1279,7 @@ static void isicom_shutdown_port(struct } /* last port was closed , shutdown that boad too */ - if(C_HUPCL(tty)) { + if (C_HUPCL(tty)) { if (!card->count) isicom_shutdown_board(card); } @@ -1294,7 +1287,7 @@ static void isicom_shutdown_port(struct static void isicom_close(struct tty_struct *tty, struct file *filp) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; struct isi_board *card = port->card; unsigned long flags; @@ -1373,7 +1366,7 @@ static void isicom_close(struct tty_stru static int isicom_write(struct tty_struct *tty, const unsigned char *buf, int count) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; struct isi_board *card = port->card; unsigned long flags; int cnt, total = 0; @@ -1408,7 +1401,7 @@ static int isicom_write(struct tty_struc /* put_char et all */ static void isicom_put_char(struct tty_struct *tty, unsigned char ch) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; struct isi_board *card = port->card; unsigned long flags; @@ -1433,7 +1426,7 @@ static void isicom_put_char(struct tty_s /* flush_chars et all */ static void isicom_flush_chars(struct tty_struct *tty) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; if (isicom_paranoia_check(port, tty->name, "isicom_flush_chars")) return; @@ -1449,7 +1442,7 @@ static void isicom_flush_chars(struct tt /* write_room et all */ static int isicom_write_room(struct tty_struct *tty) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; int free; if (isicom_paranoia_check(port, tty->name, "isicom_write_room")) @@ -1464,7 +1457,7 @@ static int isicom_write_room(struct tty_ /* chars_in_buffer et all */ static int isicom_chars_in_buffer(struct tty_struct *tty) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; if (isicom_paranoia_check(port, tty->name, "isicom_chars_in_buffer")) return 0; return port->xmit_cnt; @@ -1474,9 +1467,9 @@ static int isicom_chars_in_buffer(struct static inline void isicom_send_break(struct isi_port *port, unsigned long length) { struct isi_board *card = port->card; - unsigned short base = card->base; + u16 base = card->base; - if(!lock_card(card)) + if (!lock_card(card)) return; outw(0x8000 | ((port->channel) << (card->shift_count)) | 0x3, base); @@ -1489,9 +1482,9 @@ static inline void isicom_send_break(str static int isicom_tiocmget(struct tty_struct *tty, struct file *file) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; /* just send the port status */ - unsigned short status = port->status; + u16 status = port->status; if (isicom_paranoia_check(port, tty->name, "isicom_ioctl")) return -ENODEV; @@ -1507,7 +1500,7 @@ static int isicom_tiocmget(struct tty_st static int isicom_tiocmset(struct tty_struct *tty, struct file *file, unsigned int set, unsigned int clear) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; if (isicom_paranoia_check(port, tty->name, "isicom_ioctl")) return -ENODEV; @@ -1531,7 +1524,7 @@ static int isicom_set_serial_info(struct struct serial_struct newinfo; int reconfig_port; - if(copy_from_user(&newinfo, info, sizeof(newinfo))) + if (copy_from_user(&newinfo, info, sizeof(newinfo))) return -EFAULT; reconfig_port = ((port->flags & ASYNC_SPD_MASK) != @@ -1572,7 +1565,7 @@ static int isicom_get_serial_info(struct /* out_info.baud_base = ? */ out_info.close_delay = port->close_delay; out_info.closing_wait = port->closing_wait; - if(copy_to_user(info, &out_info, sizeof(out_info))) + if (copy_to_user(info, &out_info, sizeof(out_info))) return -EFAULT; return 0; } @@ -1580,7 +1573,7 @@ static int isicom_get_serial_info(struct static int isicom_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd, unsigned long arg) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; void __user *argp = (void __user *)arg; int retval; @@ -1609,7 +1602,7 @@ static int isicom_ioctl(struct tty_struc return put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned long __user *)argp); case TIOCSSOFTCAR: - if(get_user(arg, (unsigned long __user *) argp)) + if (get_user(arg, (unsigned long __user *) argp)) return -EFAULT; tty->termios->c_cflag = ((tty->termios->c_cflag & ~CLOCAL) | @@ -1632,7 +1625,7 @@ 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; + struct isi_port *port = tty->driver_data; if (isicom_paranoia_check(port, tty->name, "isicom_set_termios")) return; @@ -1653,7 +1646,7 @@ static void isicom_set_termios(struct tt /* throttle et all */ static void isicom_throttle(struct tty_struct *tty) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; struct isi_board *card = port->card; if (isicom_paranoia_check(port, tty->name, "isicom_throttle")) @@ -1667,7 +1660,7 @@ static void isicom_throttle(struct tty_s /* unthrottle et all */ static void isicom_unthrottle(struct tty_struct *tty) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; struct isi_board *card = port->card; if (isicom_paranoia_check(port, tty->name, "isicom_unthrottle")) @@ -1681,7 +1674,7 @@ static void isicom_unthrottle(struct tty /* stop et all */ static void isicom_stop(struct tty_struct *tty) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; if (isicom_paranoia_check(port, tty->name, "isicom_stop")) return; @@ -1694,7 +1687,7 @@ static void isicom_stop(struct tty_struc /* start et all */ static void isicom_start(struct tty_struct *tty) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; if (isicom_paranoia_check(port, tty->name, "isicom_start")) return; @@ -1707,7 +1700,7 @@ static void isicom_start(struct tty_stru /* hangup et all */ static void do_isicom_hangup(void *data) { - struct isi_port *port = (struct isi_port *) data; + struct isi_port *port = data; struct tty_struct *tty; tty = port->tty; @@ -1717,7 +1710,7 @@ 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; + struct isi_port *port = tty->driver_data; if (isicom_paranoia_check(port, tty->name, "isicom_hangup")) return; @@ -1732,7 +1725,7 @@ static void isicom_hangup(struct tty_str /* flush_buffer et all */ static void isicom_flush_buffer(struct tty_struct *tty) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; struct isi_board *card = port->card; unsigned long flags; @@ -1776,23 +1769,23 @@ static void unregister_ioregion(void) } static struct tty_operations isicom_ops = { - .open = isicom_open, - .close = isicom_close, - .write = isicom_write, - .put_char = isicom_put_char, - .flush_chars = isicom_flush_chars, - .write_room = isicom_write_room, + .open = isicom_open, + .close = isicom_close, + .write = isicom_write, + .put_char = isicom_put_char, + .flush_chars = isicom_flush_chars, + .write_room = isicom_write_room, .chars_in_buffer = isicom_chars_in_buffer, - .ioctl = isicom_ioctl, - .set_termios = isicom_set_termios, - .throttle = isicom_throttle, - .unthrottle = isicom_unthrottle, - .stop = isicom_stop, - .start = isicom_start, - .hangup = isicom_hangup, - .flush_buffer = isicom_flush_buffer, - .tiocmget = isicom_tiocmget, - .tiocmset = isicom_tiocmset, + .ioctl = isicom_ioctl, + .set_termios = isicom_set_termios, + .throttle = isicom_throttle, + .unthrottle = isicom_unthrottle, + .stop = isicom_stop, + .start = isicom_start, + .hangup = isicom_hangup, + .flush_buffer = isicom_flush_buffer, + .tiocmget = isicom_tiocmget, + .tiocmset = isicom_tiocmset, }; static int __devinit register_drivers(void) @@ -1961,7 +1954,7 @@ static int __devinit isicom_setup(void) unsigned int ioaddr; card = 0; - for(idx=0; idx < BOARD_COUNT; idx++) { + for (idx=0; idx < BOARD_COUNT; idx++) { if (io[idx]) { isi_card[idx].base=io[idx]; isi_card[idx].irq=irq[idx]; @@ -2062,7 +2055,7 @@ static void __exit isicom_exit(void) unregister_isr(); unregister_drivers(); unregister_ioregion(); - if(tmp_buf) + if (tmp_buf) free_page((unsigned long)tmp_buf); if (misc_deregister(&isiloader_device)) printk(KERN_ERR "ISICOM: Unable to unregister Firmware Loader driver\n"); ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 3/5] isicom: pci probing 2005-09-13 16:49 ` [PATCH 0/5] isicom char driver to 2.6 api Jiri Slaby 2005-09-13 16:52 ` [PATCH 2/5] isicom: types Jiri Slaby @ 2005-09-13 16:52 ` Jiri Slaby 2005-09-13 17:21 ` Greg KH 2005-09-13 16:52 ` [PATCH 4/5] isicom: firmware Jiri Slaby ` (2 subsequent siblings) 4 siblings, 1 reply; 22+ messages in thread From: Jiri Slaby @ 2005-09-13 16:52 UTC (permalink / raw) To: akpm; +Cc: Linux Kernel Mailing List, linux-pci, Greg KH Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> drivers/char/isicom.c | 598 +++++++++++++++++++++++++++---------------------- include/linux/isicom.h | 3 2 files changed, 333 insertions(+), 268 deletions(-) diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c @@ -91,6 +91,8 @@ * 06/01/05 Alan Cox Merged the ISI and base kernel strands * into a single 2.6 driver * + * 10/09/05 Jiri Slaby driver rewritten to 2.6 API + * * *********************************************************** * * To use this driver you also need the support package. You @@ -107,7 +109,6 @@ * Omit those entries for boards you don't have installed. * * TODO - * Hotplug * Merge testing * 64-bit verification */ @@ -135,20 +136,41 @@ #include <linux/isicom.h> +#define InterruptTheCard(base) outw(0, (base) + 0xc) +#define ClearInterrupt(base) inw((base) + 0x0a) + +#ifdef ISICOM_DEBUG +#define pr_deb(str, ...) printk((str), ##args); +#define isicom_paranoia_check(a, b, c) __isicom_paranoia_check((a), (b), (c)) +#else +#define pr_deb(str, ...) +#define isicom_paranoia_check(a, b, c) 0 +#endif + +static int isicom_probe(struct pci_dev*, const struct pci_device_id*); +static void __devexit isicom_remove(struct pci_dev*); + static struct pci_device_id isicom_pci_tbl[] = { - { VENDOR_ID, 0x2028, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, - { VENDOR_ID, 0x2051, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, - { VENDOR_ID, 0x2052, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, - { VENDOR_ID, 0x2053, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, - { VENDOR_ID, 0x2054, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, - { VENDOR_ID, 0x2055, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, - { VENDOR_ID, 0x2056, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, - { VENDOR_ID, 0x2057, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, - { VENDOR_ID, 0x2058, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, + { PCI_DEVICE(VENDOR_ID, 0x2028) }, + { PCI_DEVICE(VENDOR_ID, 0x2051) }, + { PCI_DEVICE(VENDOR_ID, 0x2052) }, + { PCI_DEVICE(VENDOR_ID, 0x2053) }, + { PCI_DEVICE(VENDOR_ID, 0x2054) }, + { PCI_DEVICE(VENDOR_ID, 0x2055) }, + { PCI_DEVICE(VENDOR_ID, 0x2056) }, + { PCI_DEVICE(VENDOR_ID, 0x2057) }, + { PCI_DEVICE(VENDOR_ID, 0x2058) }, { 0 } }; MODULE_DEVICE_TABLE(pci, isicom_pci_tbl); +static struct pci_driver isicom_driver = { + .name = "isicom", + .id_table = isicom_pci_tbl, + .probe = isicom_probe, + .remove = __devexit_p(isicom_remove) +}; + static int prev_card = 3; /* start servicing isi_card[0] */ static struct tty_driver *isicom_normal; @@ -160,8 +182,6 @@ static int ISILoad_ioctl(struct inode *i static void isicom_tx(unsigned long _data); static void isicom_start(struct tty_struct *tty); -static unsigned char *tmp_buf; - /* baud index mappings from linux defns to isi */ static signed char linuxb_to_isib[] = { @@ -180,6 +200,7 @@ struct isi_board { u8 isa; spinlock_t card_lock; /* Card wide lock 11/5/00 -sameer */ unsigned long flags; + struct device device; }; struct isi_port { @@ -598,23 +619,20 @@ static int ISILoad_ioctl(struct inode *i * */ -static inline int isicom_paranoia_check(struct isi_port const *port, char *name, - const char *routine) +static inline int __isicom_paranoia_check(struct isi_port const *port, + char *name, const char *routine) { -#ifdef ISICOM_DEBUG - static const char *badmagic = - KERN_WARNING "ISICOM: Warning: bad isicom magic for dev %s in %s.\n"; - static const char *badport = - KERN_WARNING "ISICOM: Warning: NULL isicom port for dev %s in %s.\n"; if (!port) { - printk(badport, name, routine); + printk(KERN_WARNING "ISICOM: Warning: bad isicom magic for " + "dev %s in %s.\n", name, routine); return 1; } if (port->magic != ISICOM_MAGIC) { - printk(badmagic, name, routine); + printk(KERN_WARNING "ISICOM: Warning: NULL isicom port for " + "dev %s in %s.\n", name, routine); return 1; } -#endif + return 0; } @@ -632,10 +650,6 @@ static void isicom_tx(unsigned long _dat struct isi_port *port; struct tty_struct *tty; -#ifdef ISICOM_DEBUG - ++tx_count; -#endif - /* find next active board */ card = (prev_card + 1) & 0x0003; while(count-- > 0) { @@ -677,12 +691,10 @@ static void isicom_tx(unsigned long _dat unlock_card(&isi_card[card]); continue; } -#ifdef ISICOM_DEBUG - 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); + pr_deb(KERN_DEBUG "ISICOM: txing %d bytes, port%d.\n", + txcount, port->channel + 1); + outw((port->channel << isi_card[card].shift_count) | txcount, + base); residue = NO; wrd = 0; while (1) { @@ -728,8 +740,11 @@ static void isicom_tx(unsigned long _dat /* schedule another tx for hopefully in about 10ms */ sched_again: - if (!re_schedule) - return; + if (!re_schedule) { + re_schedule = 2; + return; + } + init_timer(&tx); tx.expires = jiffies + HZ/100; tx.data = 0; @@ -1374,7 +1389,7 @@ static int isicom_write(struct tty_struc if (isicom_paranoia_check(port, tty->name, "isicom_write")) return 0; - if (!tty || !port->xmit_buf || !tmp_buf) + if (!tty || !port->xmit_buf) return 0; spin_lock_irqsave(&card->card_lock, flags); @@ -1740,32 +1755,36 @@ static void isicom_flush_buffer(struct t tty_wakeup(tty); } +/* + * Driver init and deinit functions + */ -static int __devinit register_ioregion(void) +static int __devinit isicom_register_ioregion(struct isi_board *board, + const unsigned int index) { - int count, done=0; - for (count=0; count < BOARD_COUNT; count++ ) { - if (isi_card[count].base) - if (!request_region(isi_card[count].base,16,ISICOM_NAME)) { - printk(KERN_DEBUG "ISICOM: I/O Region 0x%x-0x%x is busy. Card%d will be disabled.\n", - isi_card[count].base,isi_card[count].base+15,count+1); - isi_card[count].base=0; - done++; - } - } - return done; + if (!board->base) + return -EINVAL; + + 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, + board->base + 15, index + 1); + return -EBUSY; + } + + return 0; } -static void unregister_ioregion(void) +static void isicom_unregister_ioregion(struct isi_board *board, + const unsigned int index) { - int count; - for (count=0; count < BOARD_COUNT; count++ ) - if (isi_card[count].base) { - release_region(isi_card[count].base,16); -#ifdef ISICOM_DEBUG - printk(KERN_DEBUG "ISICOM: I/O Region 0x%x-0x%x released for Card%d.\n",isi_card[count].base,isi_card[count].base+15,count+1); -#endif - } + if (!board->base) + return; + + release_region(board->base, 16); + board->base = 0; + pr_deb(KERN_DEBUG "ISICOM: I/O Region 0x%x-0x%x released for Card%d.\n", + board->base, board->base + 15, index + 1); } static struct tty_operations isicom_ops = { @@ -1788,134 +1807,238 @@ static struct tty_operations isicom_ops .tiocmset = isicom_tiocmset, }; -static int __devinit register_drivers(void) +static int __devinit isicom_register_tty_driver(void) { - int error; + int error = -ENOMEM; /* tty driver structure initialization */ isicom_normal = alloc_tty_driver(PORT_COUNT); if (!isicom_normal) - return -ENOMEM; + goto end; - isicom_normal->owner = THIS_MODULE; - isicom_normal->name = "ttyM"; - isicom_normal->devfs_name = "isicom/"; - isicom_normal->major = ISICOM_NMAJOR; - isicom_normal->minor_start = 0; - isicom_normal->type = TTY_DRIVER_TYPE_SERIAL; - isicom_normal->subtype = SERIAL_TYPE_NORMAL; - isicom_normal->init_termios = tty_std_termios; - isicom_normal->init_termios.c_cflag = - B9600 | CS8 | CREAD | HUPCL |CLOCAL; - isicom_normal->flags = TTY_DRIVER_REAL_RAW; + isicom_normal->owner = THIS_MODULE; + isicom_normal->name = "ttyM"; + isicom_normal->devfs_name = "isicom/"; + isicom_normal->major = ISICOM_NMAJOR; + isicom_normal->minor_start = 0; + isicom_normal->type = TTY_DRIVER_TYPE_SERIAL; + isicom_normal->subtype = SERIAL_TYPE_NORMAL; + isicom_normal->init_termios = tty_std_termios; + isicom_normal->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | + CLOCAL; + isicom_normal->flags = TTY_DRIVER_REAL_RAW; tty_set_operations(isicom_normal, &isicom_ops); - if ((error=tty_register_driver(isicom_normal))!=0) { - printk(KERN_DEBUG "ISICOM: Couldn't register the dialin driver, error=%d\n", - error); + if ((error = tty_register_driver(isicom_normal))) { + printk(KERN_DEBUG "ISICOM: Couldn't register the dialin " + "driver, error=%d\n", error); put_tty_driver(isicom_normal); - return error; } - return 0; +end: + return error; } -static void unregister_drivers(void) +static void isicom_unregister_tty_driver(void) { - int error = tty_unregister_driver(isicom_normal); - if (error) - printk(KERN_DEBUG "ISICOM: couldn't unregister normal driver error=%d.\n",error); + int error; + + if ((error = tty_unregister_driver(isicom_normal))) + printk(KERN_DEBUG "ISICOM: couldn't unregister normal driver, " + "error=%d.\n", error); + put_tty_driver(isicom_normal); } -static int __devinit register_isr(void) +static int __devinit isicom_register_isr(struct isi_board *board, + const unsigned int index) { - int count, done=0; - unsigned long irqflags; + unsigned long irqflags = SA_INTERRUPT; + int retval = -EINVAL; - for (count=0; count < BOARD_COUNT; count++ ) { - if (isi_card[count].base) { - irqflags = (isi_card[count].isa == YES) ? - SA_INTERRUPT : - (SA_INTERRUPT | SA_SHIRQ); - - if (request_irq(isi_card[count].irq, - isicom_interrupt, - irqflags, - ISICOM_NAME, &isi_card[count])) { - - printk(KERN_WARNING "ISICOM: Could not" - " install handler at Irq %d." - " Card%d will be disabled.\n", - isi_card[count].irq, count+1); + if (!board->base) + goto end; - release_region(isi_card[count].base,16); - isi_card[count].base=0; - } - else - done++; - } + if (board->isa == NO) + irqflags |= SA_SHIRQ; + + retval = request_irq(board->irq, isicom_interrupt, irqflags, + ISICOM_NAME, board); + if (retval < 0) { + printk(KERN_WARNING "ISICOM: Could not install handler at Irq " + "%d. Card%d will be disabled.\n", board->irq, + index + 1); + } else + retval = 0; +end: + return retval; +} + +static void isicom_unregister_isr(struct isi_board *board) +{ + if (board->base) + free_irq(board->irq, board); +} + +static int __devinit reset_card(struct isi_board *board, + const unsigned int card, unsigned int *signature) +{ + u16 base = board->base; + unsigned int portcount = 0; + int retval = 0; + + printk(KERN_DEBUG "ISILoad:Resetting Card%d at 0x%x\n", card + 1, base); + + inw(base + 0x8); + + mdelay(10); + + outw(0, base + 0x8); /* Reset */ + + msleep(3000); + + *signature = inw(base + 0x4) & 0xff; + + if (board->isa == YES) { + if (!(inw(base + 0xe) & 0x1) || (inw(base + 0x2))) { + pr_deb(KERN_DEBUG "base+0x2=0x%x, base+0xe=0x%x", + inw(base + 0x2), inw(base + 0xe)); + printk(KERN_ERR "ISILoad:ISA Card%d reset failure " + "(Possible bad I/O Port Address 0x%x).\n", + card + 1, base); + retval = -EIO; + goto end; + } + } else { + portcount = inw(base + 0x2); + if (!(inw(base + 0xe) & 0x1) || ((portcount != 0) && + (portcount != 4) && (portcount != 8))) { + pr_deb("\nbase+0x2=0x%x , base+0xe=0x%x", + inw(base + 0x2), inw(base + 0xe)); + printk("\nISILoad:PCI Card%d reset failure (Possible " + "bad I/O Port Address 0x%x).\n", card + 1, + base); + retval = -EIO; + goto end; + } + } + + switch (*signature) { + case 0xa5: + case 0xbb: + case 0xdd: + board->port_count = (board->isa == NO && portcount == 4) ? 4 : + 8; + board->shift_count = 12; + break; + case 0xcc: + board->port_count = 16; + board->shift_count = 11; + break; + default: + printk(KERN_WARNING "ISILoad:Card%d reset failure (Possible " + "bad I/O Port Address 0x%x).\n", card + 1, base); + pr_deb(KERN_DEBUG "Sig=0x%x\n", signature); + retval = -EIO; } - return done; + printk(KERN_INFO "-Done\n"); + +end: + return retval; } -static void __exit unregister_isr(void) +/* + * Insmod can set static symbols so keep these static + */ +static int io[4]; +static int irq[4]; +static int card; + +static int __devinit isicom_probe(struct pci_dev *pdev, + const struct pci_device_id *ent) { - int count; + unsigned int ioaddr, signature, index; + int retval = -EPERM; + u8 pciirq; + struct isi_board *board = NULL; + + if (card >= BOARD_COUNT) + goto err; + + ioaddr = pci_resource_start(pdev, 3); + /* i.e at offset 0x1c in the PCI configuration register space. */ + pciirq = pdev->irq; + printk(KERN_INFO "ISI PCI Card(Device ID 0x%x)\n", ent->device); + + /* allot the first empty slot in the array */ + for (index = 0; index < BOARD_COUNT; index++) + if (isi_card[index].base == 0) { + board = &isi_card[index]; + break; + } - for (count=0; count < BOARD_COUNT; count++ ) { - if (isi_card[count].base) - free_irq(isi_card[count].irq, &isi_card[count]); - } + board->base = ioaddr; + board->irq = pciirq; + board->isa = NO; + board->device = pdev->dev; + card++; + + retval = isicom_register_ioregion(board, index); + if (retval < 0) + goto err; + + retval = isicom_register_isr(board, index); + if (retval < 0) + goto errunrr; + + retval = reset_card(board, index, &signature); + if (retval < 0) + goto errunri; + +/* retval = load_firmware(board, index, signature); + if (retval < 0) + goto errunri; */ + + return 0; + +errunri: + isicom_unregister_isr(board); +errunrr: + isicom_unregister_ioregion(board, index); +err: + board->base = 0; + return retval; } -static int __devinit isicom_init(void) +static void __devexit isicom_remove(struct pci_dev *pdev) { - int card, channel, base; - struct isi_port *port; - unsigned long page; + unsigned int idx; - if (!tmp_buf) { - page = get_zeroed_page(GFP_KERNEL); - if (!page) { -#ifdef ISICOM_DEBUG - printk(KERN_DEBUG "ISICOM: Couldn't allocate page for tmp_buf.\n"); -#else - printk(KERN_ERR "ISICOM: Not enough memory...\n"); -#endif - return 0; - } - tmp_buf = (unsigned char *) page; - } + for (idx = 0; idx < BOARD_COUNT; idx++) + if (isi_card[idx].base == pci_resource_start(pdev, 3)) + break; - if (!register_ioregion()) - { - printk(KERN_ERR "ISICOM: All required I/O space found busy.\n"); - free_page((unsigned long)tmp_buf); - return 0; - } - if (register_drivers()) - { - unregister_ioregion(); - free_page((unsigned long)tmp_buf); - return 0; - } - if (!register_isr()) - { - unregister_drivers(); - /* ioports already uregistered in register_isr */ - free_page((unsigned long)tmp_buf); - return 0; - } + if (idx == BOARD_COUNT) + return; + isicom_unregister_isr(&isi_card[idx]); + isicom_unregister_ioregion(&isi_card[idx], idx); +} + +static int __devinit isicom_setup(void) +{ + int retval, idx, channel; + struct isi_port *port; + + card = 0; memset(isi_ports, 0, sizeof(isi_ports)); - for (card = 0; card < BOARD_COUNT; card++) { - port = &isi_ports[card * 16]; - isi_card[card].ports = port; - spin_lock_init(&isi_card[card].card_lock); - base = isi_card[card].base; + + for(idx = 0; idx < BOARD_COUNT; idx++) { + port = &isi_ports[idx * 16]; + isi_card[idx].ports = port; + spin_lock_init(&isi_card[idx].card_lock); for (channel = 0; channel < 16; channel++, port++) { port->magic = ISICOM_MAGIC; - port->card = &isi_card[card]; + port->card = &isi_card[idx]; port->channel = channel; port->close_delay = 50 * HZ/100; port->closing_wait = 3000 * HZ/100; @@ -1925,117 +2048,44 @@ static int __devinit isicom_init(void) init_waitqueue_head(&port->open_wait); init_waitqueue_head(&port->close_wait); /* . . . */ - } - } - - return 1; -} - -/* - * Insmod can set static symbols so keep these static - */ - -static int io[4]; -static int irq[4]; - -MODULE_AUTHOR("MultiTech"); -MODULE_DESCRIPTION("Driver for the ISI series of cards by MultiTech"); -MODULE_LICENSE("GPL"); -module_param_array(io, int, NULL, 0); -MODULE_PARM_DESC(io, "I/O ports for the cards"); -module_param_array(irq, int, NULL, 0); -MODULE_PARM_DESC(irq, "Interrupts for the cards"); + } + isi_card[idx].base = 0; + isi_card[idx].irq = 0; -static int __devinit isicom_setup(void) -{ - struct pci_dev *dev = NULL; - int retval, card, idx, count; - unsigned char pciirq; - unsigned int ioaddr; - - card = 0; - for (idx=0; idx < BOARD_COUNT; idx++) { - if (io[idx]) { - isi_card[idx].base=io[idx]; - isi_card[idx].irq=irq[idx]; - isi_card[idx].isa=YES; - card++; - } - else { - isi_card[idx].base = 0; - isi_card[idx].irq = 0; - } - } - - for (idx=0 ;idx < card; idx++) { - if (!((isi_card[idx].irq==2)||(isi_card[idx].irq==3)|| - (isi_card[idx].irq==4)||(isi_card[idx].irq==5)|| - (isi_card[idx].irq==7)||(isi_card[idx].irq==10)|| - (isi_card[idx].irq==11)||(isi_card[idx].irq==12)|| - (isi_card[idx].irq==15))) { - - if (isi_card[idx].base) { - printk(KERN_ERR "ISICOM: Irq %d unsupported. Disabling Card%d...\n", - isi_card[idx].irq, idx+1); - isi_card[idx].base=0; - card--; - } - } - } - - if (card < BOARD_COUNT) { - for (idx=0; idx < DEVID_COUNT; idx++) { - dev = NULL; - for (;;){ - if (!(dev = pci_find_device(VENDOR_ID, isicom_pci_tbl[idx].device, dev))) - break; - if (card >= BOARD_COUNT) - break; - - if (pci_enable_device(dev)) - break; - - /* found a PCI ISI card! */ - ioaddr = pci_resource_start (dev, 3); - /* i.e at offset 0x1c in the - * PCI configuration register - * space. - */ - pciirq = dev->irq; - printk(KERN_INFO "ISI PCI Card(Device ID 0x%x)\n", isicom_pci_tbl[idx].device); - /* - * allot the first empty slot in the array - */ - for (count=0; count < BOARD_COUNT; count++) { - if (isi_card[count].base == 0) { - isi_card[count].base = ioaddr; - isi_card[count].irq = pciirq; - isi_card[count].isa = NO; - card++; - break; - } - } - } - if (card >= BOARD_COUNT) break; - } - } + if (!io[idx]) + continue; - if (!(isi_card[0].base || isi_card[1].base || isi_card[2].base || isi_card[3].base)) { - printk(KERN_ERR "ISICOM: No valid card configuration. Driver cannot be initialized...\n"); - return -EIO; - } + if (irq[idx] == 2 || irq[idx] == 3 || irq[idx] == 4 || + irq[idx] == 5 || irq[idx] == 7 || + irq[idx] == 10 || irq[idx] == 11 || + irq[idx] == 12 || irq[idx] == 15) { + printk(KERN_ERR "ISICOM: ISA not supported yet.\n"); + return -EIO; +/* isi_card[idx].base = io[idx]; + isi_card[idx].irq = irq[idx]; + isi_card[idx].isa = YES; + FIXME: which device for request_firmware use? if you know, uncomment this and + delete printk and return + isi_card[idx].device = ???; + card++;*/ + } else + printk(KERN_ERR "ISICOM: Irq %d unsupported. " + "Disabling Card%d...\n", irq[idx], idx + 1); + } + + retval = isicom_register_tty_driver(); + if (retval < 0) + goto error; - retval = misc_register(&isiloader_device); + retval = pci_register_driver(&isicom_driver); if (retval < 0) { - printk(KERN_ERR "ISICOM: Unable to register firmware loader driver.\n"); - return retval; + printk(KERN_ERR "ISICOM: Unable to register pci driver.\n"); + goto errtty; } - if (!isicom_init()) { - if (misc_deregister(&isiloader_device)) - printk(KERN_ERR "ISICOM: Unable to unregister Firmware Loader driver\n"); - return -EIO; - } + retval = misc_register(&isiloader_device); + if (retval < 0) + goto errpci; init_timer(&tx); tx.expires = jiffies + 1; @@ -2045,21 +2095,39 @@ static int __devinit isicom_setup(void) add_timer(&tx); return 0; +errpci: + pci_unregister_driver(&isicom_driver); +errtty: + isicom_unregister_tty_driver(); +error: + return retval; } static void __exit isicom_exit(void) { + unsigned int index = 0; + re_schedule = 0; - /* FIXME */ - msleep(1000); - unregister_isr(); - unregister_drivers(); - unregister_ioregion(); - if (tmp_buf) - free_page((unsigned long)tmp_buf); - if (misc_deregister(&isiloader_device)) - printk(KERN_ERR "ISICOM: Unable to unregister Firmware Loader driver\n"); + + while (re_schedule != 2 && index++ < 100) + msleep(10); + + pci_unregister_driver(&isicom_driver); + isicom_unregister_tty_driver(); + + for (index = 0; index < BOARD_COUNT; index++) { + isicom_unregister_isr(&isi_card[index]); + isicom_unregister_ioregion(&isi_card[index], index); + } } module_init(isicom_setup); module_exit(isicom_exit); + +MODULE_AUTHOR("MultiTech"); +MODULE_DESCRIPTION("Driver for the ISI series of cards by MultiTech"); +MODULE_LICENSE("GPL"); +module_param_array(io, int, NULL, 0); +MODULE_PARM_DESC(io, "I/O ports for the cards"); +module_param_array(irq, int, NULL, 0); +MODULE_PARM_DESC(irq, "Interrupts for the cards"); diff --git a/include/linux/isicom.h b/include/linux/isicom.h --- a/include/linux/isicom.h +++ b/include/linux/isicom.h @@ -98,9 +98,6 @@ typedef struct { #define ISICOM_INITIATE_XONXOFF 0x04 #define ISICOM_RESPOND_XONXOFF 0x08 -#define InterruptTheCard(base) (outw(0,(base)+0xc)) -#define ClearInterrupt(base) (inw((base)+0x0a)) - #define BOARD(line) (((line) >> 4) & 0x3) /* isi kill queue bitmap */ ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 3/5] isicom: pci probing 2005-09-13 16:52 ` [PATCH 3/5] isicom: pci probing Jiri Slaby @ 2005-09-13 17:21 ` Greg KH 2005-09-14 0:10 ` [PATCH 0/6] isicom char driver rewritten to 2.6 api Jiri Slaby 0 siblings, 1 reply; 22+ messages in thread From: Greg KH @ 2005-09-13 17:21 UTC (permalink / raw) To: Jiri Slaby; +Cc: akpm, Linux Kernel Mailing List, linux-pci On Tue, Sep 13, 2005 at 06:52:56PM +0200, Jiri Slaby wrote: > Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> > > drivers/char/isicom.c | 598 +++++++++++++++++++++++++++---------------------- > include/linux/isicom.h | 3 > 2 files changed, 333 insertions(+), 268 deletions(-) > > diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c > --- a/drivers/char/isicom.c > +++ b/drivers/char/isicom.c > @@ -91,6 +91,8 @@ > * 06/01/05 Alan Cox Merged the ISI and base kernel strands > * into a single 2.6 driver > * > + * 10/09/05 Jiri Slaby driver rewritten to 2.6 API > + * The git changelog works well enough that you don't need to add stuff to the files themselves anymore. > +#define InterruptTheCard(base) outw(0, (base) + 0xc) > +#define ClearInterrupt(base) inw((base) + 0x0a) > + > +#ifdef ISICOM_DEBUG > +#define pr_deb(str, ...) printk((str), ##args); > +#define isicom_paranoia_check(a, b, c) __isicom_paranoia_check((a), (b), (c)) > +#else > +#define pr_deb(str, ...) > +#define isicom_paranoia_check(a, b, c) 0 > +#endif This doesn't look like "pci probe changes" In fact, a lot of other changes in this patch don't look like them either... Care to split it up even more? thanks, greg k-h ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 0/6] isicom char driver rewritten to 2.6 api 2005-09-13 17:21 ` Greg KH @ 2005-09-14 0:10 ` Jiri Slaby 2005-09-14 0:12 ` [PATCH 1/6] isicom: Whitespace cleanup Jiri Slaby ` (5 more replies) 0 siblings, 6 replies; 22+ messages in thread From: Jiri Slaby @ 2005-09-14 0:10 UTC (permalink / raw) To: akpm; +Cc: Greg KH, Linux Kernel Mailing List, linux-pci This patches convert isicom char driver to 2.6 API. 01-whitespace-cleanup 02-type-conversion-and-variables-deletion 03-others-little-changes 04-pci-probing-added 05-firmware-loading 06-more-whitespaces-and-coding-style ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 1/6] isicom: Whitespace cleanup 2005-09-14 0:10 ` [PATCH 0/6] isicom char driver rewritten to 2.6 api Jiri Slaby @ 2005-09-14 0:12 ` Jiri Slaby 2005-09-14 0:12 ` [PATCH 2/6] isicom: Type conversion and variables deletion Jiri Slaby ` (4 subsequent siblings) 5 siblings, 0 replies; 22+ messages in thread From: Jiri Slaby @ 2005-09-14 0:12 UTC (permalink / raw) To: Andrew Morton; +Cc: Linux Kernel Mailing List, linux-pci, Greg KH Generated in 2.6.13-mm3 kernel version Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> Whitespace cleanup Such as trailing spaces and tabs and space used for indentation. Indented contains od structtures. Switch/case indent. --- drivers/char/isicom.c | 1365 ++++++++++++++++++++++++------------------------- 1 files changed, 682 insertions(+), 683 deletions(-) diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c @@ -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,28 +31,28 @@ * * 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. * * 08/02/01 anil .s Upgraded the driver for kernel * 2.4.x * - * 11/04/01 Kevin Fixed firmware load problem with + * 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,19 +73,19 @@ * 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 * result * - * 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 + * 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 * Red Hat Distribution * * 06/01/05 Alan Cox Merged the ISI and base kernel strands @@ -93,10 +93,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/ * @@ -161,16 +161,15 @@ static unsigned long tx_count = 0; static int ISILoad_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); static void isicom_tx(unsigned long _data); -static void isicom_start(struct tty_struct * tty); +static void isicom_start(struct tty_struct *tty); -static unsigned char * tmp_buf; +static unsigned char *tmp_buf; static DECLARE_MUTEX(tmp_buf_sem); /* baud index mappings from linux defns to isi */ static signed char 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 { @@ -216,7 +215,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; @@ -225,7 +224,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 */ @@ -244,7 +243,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); } @@ -260,119 +259,119 @@ static void unlock_card(struct isi_board /* * ISI Card specific ops ... */ - -static void raise_dtr(struct isi_port * port) + +static void raise_dtr(struct isi_port *port) { - struct isi_board * card = port->card; + struct isi_board *card = port->card; unsigned short base = card->base; unsigned char channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw(0x0504, base); InterruptTheCard(base); port->status |= ISI_DTR; unlock_card(card); } -static inline void drop_dtr(struct isi_port * port) -{ - struct isi_board * card = port->card; +static inline void drop_dtr(struct isi_port *port) +{ + struct isi_board *card = port->card; unsigned short base = card->base; unsigned char channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw(0x0404, base); - InterruptTheCard(base); + InterruptTheCard(base); port->status &= ~ISI_DTR; unlock_card(card); } -static inline void raise_rts(struct isi_port * port) +static inline void raise_rts(struct isi_port *port) { - struct isi_board * card = port->card; + struct isi_board *card = port->card; unsigned short base = card->base; unsigned char channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw(0x0a04, base); - InterruptTheCard(base); + InterruptTheCard(base); port->status |= ISI_RTS; unlock_card(card); } -static inline void drop_rts(struct isi_port * port) +static inline void drop_rts(struct isi_port *port) { - struct isi_board * card = port->card; + struct isi_board *card = port->card; unsigned short base = card->base; unsigned char channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw(0x0804, base); - InterruptTheCard(base); + InterruptTheCard(base); port->status &= ~ISI_RTS; unlock_card(card); } -static inline void raise_dtr_rts(struct isi_port * port) +static inline void raise_dtr_rts(struct isi_port *port) { - struct isi_board * card = port->card; + struct isi_board *card = port->card; unsigned short base = card->base; unsigned char channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw(0x0f04, base); InterruptTheCard(base); port->status |= (ISI_DTR | ISI_RTS); unlock_card(card); } -static void drop_dtr_rts(struct isi_port * port) +static void drop_dtr_rts(struct isi_port *port) { - struct isi_board * card = port->card; + struct isi_board *card = port->card; unsigned short base = card->base; unsigned char channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw(0x0c04, base); - InterruptTheCard(base); + InterruptTheCard(base); port->status &= ~(ISI_RTS | ISI_DTR); unlock_card(card); } -static inline void kill_queue(struct isi_port * port, short queue) +static inline void kill_queue(struct isi_port *port, short queue) { - struct isi_board * card = port->card; + struct isi_board *card = port->card; unsigned short base = card->base; unsigned char channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw((queue << 8) | 0x06, base); - InterruptTheCard(base); + InterruptTheCard(base); unlock_card(card); } -/* +/* * Firmware loader driver specific routines. This needs to mostly die * and be replaced with request_firmware. */ @@ -386,19 +385,19 @@ static struct miscdevice isiloader_devic ISILOAD_MISC_MINOR, "isictl", &ISILoad_fops }; - + static inline int WaitTillCardIsFree(unsigned short base) { unsigned long count=0; while( (!(inw(base+0xe) & 0x1)) && (count++ < 6000000)); - if (inw(base+0xe)&0x1) + if (inw(base+0xe)&0x1) return 0; else return 1; } static int ISILoad_ioctl(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg) + unsigned int cmd, unsigned long arg) { unsigned int card, i, j, signature, status, portcount = 0; unsigned long t; @@ -406,213 +405,211 @@ static int ISILoad_ioctl(struct inode *i bin_frame frame; void __user *argp = (void __user *)arg; /* exec_record exec_rec; */ - - if(get_user(card, (int __user *)argp)) + + if (get_user(card, (int __user *)argp)) return -EFAULT; - - if(card < 0 || card >= BOARD_COUNT) + + if (card < 0 || card >= BOARD_COUNT) return -ENXIO; - + base=isi_card[card].base; - - if(base==0) + + if (base==0) return -ENXIO; /* disabled or not used */ - + switch(cmd) { - case MIOCTL_RESET_CARD: - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; - printk(KERN_DEBUG "ISILoad:Resetting Card%d at 0x%x ",card+1,base); - - inw(base+0x8); - - for(t=jiffies+HZ/100;time_before(jiffies, t);); - - outw(0,base+0x8); /* Reset */ - - for(j=1;j<=3;j++) { - for(t=jiffies+HZ;time_before(jiffies, t);); - printk("."); - } - signature=(inw(base+0x4)) & 0xff; - if (isi_card[card].isa) { - - if (!(inw(base+0xe) & 0x1) || (inw(base+0x2))) { -#ifdef ISICOM_DEBUG - printk("\nbase+0x2=0x%x , base+0xe=0x%x",inw(base+0x2),inw(base+0xe)); -#endif - printk("\nISILoad:ISA Card%d reset failure (Possible bad I/O Port Address 0x%x).\n",card+1,base); - return -EIO; - } - } - else { - portcount = inw(base+0x2); - if (!(inw(base+0xe) & 0x1) || ((portcount!=0) && (portcount!=4) && (portcount!=8))) { + case MIOCTL_RESET_CARD: + if (!capable(CAP_SYS_ADMIN)) + return -EPERM; + printk(KERN_DEBUG "ISILoad:Resetting Card%d at 0x%x ",card+1,base); + + inw(base+0x8); + + for (t=jiffies+HZ/100;time_before(jiffies, t);); + + outw(0,base+0x8); /* Reset */ + + for (j=1;j<=3;j++) { + for (t=jiffies+HZ;time_before(jiffies, t);); + printk("."); + } + signature=(inw(base+0x4)) & 0xff; + if (isi_card[card].isa) { + + if (!(inw(base+0xe) & 0x1) || (inw(base+0x2))) { #ifdef ISICOM_DEBUG - printk("\nbase+0x2=0x%x , base+0xe=0x%x",inw(base+0x2),inw(base+0xe)); + printk("\nbase+0x2=0x%x , base+0xe=0x%x",inw(base+0x2),inw(base+0xe)); #endif - printk("\nISILoad:PCI Card%d reset failure (Possible bad I/O Port Address 0x%x).\n",card+1,base); - return -EIO; - } - } - switch(signature) { - case 0xa5: - case 0xbb: - case 0xdd: - if (isi_card[card].isa) - isi_card[card].port_count = 8; - else { - if (portcount == 4) - isi_card[card].port_count = 4; - else - isi_card[card].port_count = 8; - } - isi_card[card].shift_count = 12; - break; - - case 0xcc: isi_card[card].port_count = 16; - isi_card[card].shift_count = 11; - break; - - default: printk("ISILoad:Card%d reset failure (Possible bad I/O Port Address 0x%x).\n",card+1,base); -#ifdef ISICOM_DEBUG - printk("Sig=0x%x\n",signature); -#endif - return -EIO; + printk("\nISILoad:ISA Card%d reset failure (Possible bad I/O Port Address 0x%x).\n",card+1,base); + return -EIO; + } + } + else { + portcount = inw(base+0x2); + if (!(inw(base+0xe) & 0x1) || ((portcount!=0) && (portcount!=4) && (portcount!=8))) { +#ifdef ISICOM_DEBUG + printk("\nbase+0x2=0x%x , base+0xe=0x%x",inw(base+0x2),inw(base+0xe)); +#endif + printk("\nISILoad:PCI Card%d reset failure (Possible bad I/O Port Address 0x%x).\n",card+1,base); + return -EIO; } - printk("-Done\n"); - return put_user(signature,(unsigned __user *)argp); - + } + switch(signature) { + case 0xa5: + case 0xbb: + case 0xdd: + if (isi_card[card].isa) + isi_card[card].port_count = 8; + else { + if (portcount == 4) + isi_card[card].port_count = 4; + else + isi_card[card].port_count = 8; + } + isi_card[card].shift_count = 12; + break; + + case 0xcc: isi_card[card].port_count = 16; + isi_card[card].shift_count = 11; + break; + + default: printk("ISILoad:Card%d reset failure (Possible bad I/O Port Address 0x%x).\n",card+1,base); +#ifdef ISICOM_DEBUG + printk("Sig=0x%x\n",signature); +#endif + return -EIO; + } + printk("-Done\n"); + return put_user(signature,(unsigned __user *)argp); + case MIOCTL_LOAD_FIRMWARE: if (!capable(CAP_SYS_ADMIN)) return -EPERM; - - if(copy_from_user(&frame, argp, sizeof(bin_frame))) + + if (copy_from_user(&frame, argp, sizeof(bin_frame))) return -EFAULT; - + if (WaitTillCardIsFree(base)) return -EIO; - - outw(0xf0,base); /* start upload sequence */ + + outw(0xf0,base); /* start upload sequence */ outw(0x00,base); - outw((frame.addr), base);/* lsb of adderess */ - + outw((frame.addr), base); /* lsb of adderess */ + word_count=(frame.count >> 1) + frame.count % 2; outw(word_count, base); InterruptTheCard(base); - - for(i=0;i<=0x2f;i++); /* a wee bit of delay */ - - if (WaitTillCardIsFree(base)) + + for (i=0;i<=0x2f;i++); /* a wee bit of delay */ + + if (WaitTillCardIsFree(base)) return -EIO; - + if ((status=inw(base+0x4))!=0) { - printk(KERN_WARNING "ISILoad:Card%d rejected load header:\nAddress:0x%x \nCount:0x%x \nStatus:0x%x \n", + printk(KERN_WARNING "ISILoad:Card%d rejected load header:\nAddress:0x%x \nCount:0x%x \nStatus:0x%x \n", card+1, frame.addr, frame.count, status); return -EIO; } outsw(base, (void *) frame.bin_data, word_count); - + InterruptTheCard(base); - - for(i=0;i<=0x0f;i++); /* another wee bit of delay */ - - if (WaitTillCardIsFree(base)) + + for (i=0;i<=0x0f;i++); /* another wee bit of delay */ + + if (WaitTillCardIsFree(base)) return -EIO; - + if ((status=inw(base+0x4))!=0) { printk(KERN_ERR "ISILoad:Card%d got out of sync.Card Status:0x%x\n",card+1, status); return -EIO; - } + } return 0; - + case MIOCTL_READ_FIRMWARE: if (!capable(CAP_SYS_ADMIN)) return -EPERM; - - if(copy_from_user(&frame, argp, sizeof(bin_header))) + + if (copy_from_user(&frame, argp, sizeof(bin_header))) return -EFAULT; - + if (WaitTillCardIsFree(base)) return -EIO; - - outw(0xf1,base); /* start download sequence */ + + outw(0xf1,base); /* start download sequence */ outw(0x00,base); - outw((frame.addr), base);/* lsb of adderess */ - + outw((frame.addr), base); /* lsb of adderess */ + word_count=(frame.count >> 1) + frame.count % 2; outw(word_count+1, base); InterruptTheCard(base); - - for(i=0;i<=0xf;i++); /* a wee bit of delay */ - - if (WaitTillCardIsFree(base)) + + for (i=0;i<=0xf;i++); /* a wee bit of delay */ + + if (WaitTillCardIsFree(base)) return -EIO; - + if ((status=inw(base+0x4))!=0) { - printk(KERN_WARNING "ISILoad:Card%d rejected verify header:\nAddress:0x%x \nCount:0x%x \nStatus:0x%x \n", + printk(KERN_WARNING "ISILoad:Card%d rejected verify header:\nAddress:0x%x \nCount:0x%x \nStatus:0x%x \n", card+1, frame.addr, frame.count, status); return -EIO; } - + inw(base); insw(base, frame.bin_data, word_count); InterruptTheCard(base); - - for(i=0;i<=0x0f;i++); /* another wee bit of delay */ - - if (WaitTillCardIsFree(base)) + + for (i=0;i<=0x0f;i++); /* another wee bit of delay */ + + if (WaitTillCardIsFree(base)) return -EIO; - + if ((status=inw(base+0x4))!=0) { printk(KERN_ERR "ISILoad:Card%d verify got out of sync.Card Status:0x%x\n",card+1, status); return -EIO; - } - - if(copy_to_user(argp, &frame, sizeof(bin_frame))) + } + + if (copy_to_user(argp, &frame, sizeof(bin_frame))) return -EFAULT; return 0; - + case MIOCTL_XFER_CTRL: if (!capable(CAP_SYS_ADMIN)) return -EPERM; - if (WaitTillCardIsFree(base)) + if (WaitTillCardIsFree(base)) return -EIO; - + outw(0xf2, base); outw(0x800, base); outw(0x0, base); outw(0x0, base); InterruptTheCard(base); - outw(0x0, base+0x4); /* for ISI4608 cards */ - + outw(0x0, base+0x4); /* for ISI4608 cards */ + isi_card[card].status |= FIRMWARE_LOADED; - return 0; - + return 0; + default: -#ifdef ISICOM_DEBUG - printk(KERN_DEBUG "ISILoad: Received Ioctl cmd 0x%x.\n", cmd); +#ifdef ISICOM_DEBUG + printk(KERN_DEBUG "ISILoad: Received Ioctl cmd 0x%x.\n", cmd); #endif return -ENOIOCTLCMD; - } - } - + /* * ISICOM Driver specific routines ... * */ - -static inline int isicom_paranoia_check(struct isi_port const * port, char *name, - const char * routine) + +static inline int isicom_paranoia_check(struct isi_port const *port, char *name, + const char *routine) { -#ifdef ISICOM_DEBUG - static const char * badmagic = +#ifdef ISICOM_DEBUG + static const char *badmagic = KERN_WARNING "ISICOM: Warning: bad isicom magic for dev %s in %s.\n"; - static const char * badport = - KERN_WARNING "ISICOM: Warning: NULL isicom port for dev %s in %s.\n"; + static const char *badport = + KERN_WARNING "ISICOM: Warning: NULL isicom port for dev %s in %s.\n"; if (!port) { printk(badport, name, routine); return 1; @@ -620,13 +617,13 @@ static inline int isicom_paranoia_check( if (port->magic != ISICOM_MAGIC) { printk(badmagic, 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. @@ -636,25 +633,25 @@ static void isicom_tx(unsigned long _dat { short count = (BOARD_COUNT-1), card, base; short txcount, wrd, residue, word_count, cnt; - struct isi_port * port; - struct tty_struct * tty; - + 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; @@ -663,18 +660,18 @@ static void isicom_tx(unsigned long _dat continue; /* port not active or tx disabled to force flow control */ if (!(port->flags & ASYNC_INITIALIZED) || - !(port->status & ISI_TXOK)) + !(port->status & ISI_TXOK)) unlock_card(&isi_card[card]); continue; - + tty = port->tty; - - - if(tty == NULL) { + + + 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]); @@ -682,16 +679,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) { @@ -702,13 +699,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); @@ -731,68 +728,68 @@ static void isicom_tx(unsigned long _dat if (port->xmit_cnt <= WAKEUP_CHARS) schedule_work(&port->bh_tqueue); unlock_card(&isi_card[card]); - } + } - /* schedule another tx for hopefully in about 10ms */ -sched_again: - if (!re_schedule) + /* schedule another tx for hopefully in about 10ms */ +sched_again: + if (!re_schedule) return; init_timer(&tx); tx.expires = jiffies + HZ/100; 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; - + struct isi_port *port = (struct isi_port *) data; + struct tty_struct *tty = port->tty; + 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) { - struct isi_board * card; - struct isi_port * port; - struct tty_struct * tty; + struct isi_board *card; + struct isi_port *port; + struct tty_struct *tty; unsigned short base, header, word_count, count; unsigned char channel; short byte_count; unsigned char *rp; - + card = (struct isi_board *) dev_id; if (!card || !(card->status & FIRMWARE_LOADED)) return IRQ_NONE; - + base = card->base; spin_lock(&card->card_lock); - + if (card->isa == NO) { /* - * disable any interrupts from the PCI card and lower the - * interrupt line + * disable any interrupts from the PCI card and lower the + * interrupt line */ outw(0x8000, base+0x04); ClearInterrupt(base); } - + inw(base); /* get the dummy word out */ header = inw(base); channel = (header & 0x7800) >> card->shift_count; @@ -804,9 +801,9 @@ static irqreturn_t isicom_interrupt(int 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)) { @@ -815,8 +812,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; @@ -833,107 +830,107 @@ 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 - printk(KERN_DEBUG "ISICOM: interrupt: DCD->low.\n"); -#endif - port->status &= ~ISI_DCD; - schedule_work(&port->hangup_tq); - } - } - else { - if (header & ISI_DCD) { - /* Carrier has been detected */ + 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 - printk(KERN_DEBUG "ISICOM: interrupt: DCD->high.\n"); -#endif - port->status |= ISI_DCD; - wake_up_interruptible(&port->open_wait); - } + printk(KERN_DEBUG "ISICOM: interrupt: DCD->low.\n"); +#endif + port->status &= ~ISI_DCD; + schedule_work(&port->hangup_tq); } } else { - if (header & ISI_DCD) + if (header & ISI_DCD) { + /* Carrier has been detected */ +#ifdef ISICOM_DEBUG + printk(KERN_DEBUG "ISICOM: interrupt: DCD->high.\n"); +#endif port->status |= ISI_DCD; - else - port->status &= ~ISI_DCD; - } - - if (port->flags & ASYNC_CTS_FLOW) { - if (port->tty->hw_stopped) { - if (header & ISI_CTS) { - port->tty->hw_stopped = 0; - /* start tx ing */ - port->status |= (ISI_TXOK | ISI_CTS); - schedule_work(&port->bh_tqueue); - } + wake_up_interruptible(&port->open_wait); } - else { - if (!(header & ISI_CTS)) { - port->tty->hw_stopped = 1; - /* stop tx ing */ - port->status &= ~(ISI_TXOK | ISI_CTS); - } + } + } + else { + 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) { + port->tty->hw_stopped = 0; + /* start tx ing */ + port->status |= (ISI_TXOK | ISI_CTS); + schedule_work(&port->bh_tqueue); } } else { - if (header & ISI_CTS) - port->status |= ISI_CTS; - else - port->status &= ~ISI_CTS; + if (!(header & ISI_CTS)) { + port->tty->hw_stopped = 1; + /* stop tx ing */ + port->status &= ~(ISI_TXOK | ISI_CTS); + } } - - if (header & ISI_DSR) - port->status |= ISI_DSR; - else - port->status &= ~ISI_DSR; - - if (header & ISI_RI) - port->status |= ISI_RI; + } + else { + if (header & ISI_CTS) + port->status |= ISI_CTS; else - port->status &= ~ISI_RI; - - break; - - case 1: /* Received Break !!! */ - tty_insert_flip_char(tty, 0, TTY_BREAK); - if (port->flags & ASYNC_SAK) - do_SAK(tty); - tty_flip_buffer_push(tty); - break; - - case 2: /* Statistics */ - printk(KERN_DEBUG "ISICOM: isicom_interrupt: stats!!!.\n"); - break; - - default: - printk(KERN_WARNING "ISICOM: Intr: Unknown code in status packet.\n"); - break; - } + port->status &= ~ISI_CTS; + } + + if (header & ISI_DSR) + port->status |= ISI_DSR; + else + port->status &= ~ISI_DSR; + + if (header & ISI_RI) + port->status |= ISI_RI; + else + port->status &= ~ISI_RI; + + break; + + case 1: /* Received Break !!! */ + tty_insert_flip_char(tty, 0, TTY_BREAK); + if (port->flags & ASYNC_SAK) + do_SAK(tty); + tty_flip_buffer_push(tty); + break; + + case 2: /* Statistics */ + printk(KERN_DEBUG "ISICOM: isicom_interrupt: stats!!!.\n"); + break; + + 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 +#endif word_count = count >> 1; insw(base, rp, word_count); byte_count -= (word_count << 1); if (count & 0x0001) { tty_insert_flip_char(tty, inw(base) & 0xff, TTY_NORMAL); byte_count -= 2; - } + } if (byte_count > 0) { printk(KERN_DEBUG "ISICOM: Intr(0x%x:%d): Flip buffer overflow! dropping bytes...\n", base, channel+1); @@ -947,102 +944,102 @@ 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) +static void isicom_config_port(struct isi_port *port) { - struct isi_board * card = port->card; - struct tty_struct * tty; + struct isi_board *card = port->card; + struct tty_struct *tty; unsigned long baud; unsigned short channel_setup, base = card->base; unsigned short channel = port->channel, shift_count = card->shift_count; unsigned char 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 */ + 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 + drop_dtr(port); + return; + } + else raise_dtr(port); - + if (lock_card(card)) { outw(0x8000 | (channel << shift_count) |0x03, base); outw(linuxb_to_isib[baud] << 8 | 0x03, base); channel_setup = 0; switch(C_CSIZE(tty)) { - case CS5: - channel_setup |= ISICOM_CS5; - break; - case CS6: - channel_setup |= ISICOM_CS6; - break; - case CS7: - channel_setup |= ISICOM_CS7; - break; - case CS8: - channel_setup |= ISICOM_CS8; - break; + case CS5: + channel_setup |= ISICOM_CS5; + break; + case CS6: + channel_setup |= ISICOM_CS6; + break; + case CS7: + channel_setup |= ISICOM_CS7; + break; + case CS8: + 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); @@ -1050,22 +1047,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 */ -static inline void isicom_setup_board(struct isi_board * bp) +/* open et all */ + +static inline void isicom_setup_board(struct isi_board *bp) { int channel; - struct isi_port * port; + 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); @@ -1074,53 +1071,53 @@ static inline void isicom_setup_board(st port = bp->ports; bp->status |= BOARD_ACTIVE; spin_unlock_irqrestore(&bp->card_lock, flags); - for(channel = 0; channel < bp->port_count; channel++, port++) + for (channel = 0; channel < bp->port_count; channel++, port++) drop_dtr_rts(port); return; } - -static int isicom_setup_port(struct isi_port * port) + +static int isicom_setup_port(struct isi_port *port) { - struct isi_board * card = port->card; + 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 = (unsigned char *) page; - } + port->xmit_buf = (unsigned char *) 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; + struct isi_board *card = port->card; int do_clocal = 0, retval; unsigned long flags; DECLARE_WAITQUEUE(wait, current); @@ -1128,30 +1125,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); @@ -1161,27 +1158,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))) { + (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); @@ -1195,11 +1192,11 @@ 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) + +static int isicom_open(struct tty_struct *tty, struct file *filp) { - struct isi_port * port; - struct isi_board * card; + struct isi_port *port; + struct isi_board *card; unsigned int line, board; int error; @@ -1208,20 +1205,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; @@ -1230,12 +1227,12 @@ 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) +static inline void isicom_shutdown_board(struct isi_board *bp) { unsigned long flags; @@ -1246,15 +1243,15 @@ static inline void isicom_shutdown_board spin_unlock_irqrestore(&bp->card_lock, flags); } -static void isicom_shutdown_port(struct isi_port * port) +static void isicom_shutdown_port(struct isi_port *port) { - struct isi_board * card = port->card; - struct tty_struct * tty; + struct isi_board *card = port->card; + 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; @@ -1262,60 +1259,60 @@ 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; + card->count = 0; } - + /* last port was closed , shutdown that boad too */ - if(C_HUPCL(tty)) { + if (C_HUPCL(tty)) { if (!card->count) isicom_shutdown_board(card); } } -static void isicom_close(struct tty_struct * tty, struct file * filp) +static void isicom_close(struct tty_struct *tty, struct file *filp) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - struct isi_board * card = port->card; + 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", @@ -1324,31 +1321,31 @@ static void isicom_close(struct tty_stru } if (--port->count < 0) { printk(KERN_WARNING "ISICOM:(0x%x) isicom_close: bad port count for" - "channel%d = %d", card->base, port->channel, + "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); @@ -1359,65 +1356,65 @@ 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); } /* write et all */ -static int isicom_write(struct tty_struct * tty, - const unsigned char * buf, int count) +static int isicom_write(struct tty_struct *tty, const unsigned char *buf, + int count) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - struct isi_board * card = port->card; + struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_board *card = port->card; unsigned long flags; int cnt, total = 0; if (isicom_paranoia_check(port, tty->name, "isicom_write")) return 0; - + if (!tty || !port->xmit_buf || !tmp_buf) return 0; - + spin_lock_irqsave(&card->card_lock, flags); - - while(1) { + + while(1) { cnt = min_t(int, count, min(SERIAL_XMIT_SIZE - port->xmit_cnt - 1, - SERIAL_XMIT_SIZE - port->xmit_head)); - if (cnt <= 0) + 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_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 */ -static void isicom_put_char(struct tty_struct * tty, unsigned char ch) +static void isicom_put_char(struct tty_struct *tty, unsigned char ch) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - struct isi_board * card = port->card; + 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; @@ -1426,7 +1423,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++; @@ -1434,30 +1431,30 @@ static void isicom_put_char(struct tty_s } /* flush_chars et all */ -static void isicom_flush_chars(struct tty_struct * tty) +static void isicom_flush_chars(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - + 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) 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 */ -static int isicom_write_room(struct tty_struct * tty) +static int isicom_write_room(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; + struct isi_port *port = (struct isi_port *) tty->driver_data; int free; 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; @@ -1465,23 +1462,23 @@ static int isicom_write_room(struct tty_ } /* chars_in_buffer et all */ -static int isicom_chars_in_buffer(struct tty_struct * tty) +static int isicom_chars_in_buffer(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; + struct isi_port *port = (struct isi_port *) tty->driver_data; if (isicom_paranoia_check(port, tty->name, "isicom_chars_in_buffer")) return 0; return port->xmit_cnt; } /* 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; - unsigned short base = card->base; - - if(!lock_card(card)) + struct isi_board *card = port->card; + unsigned short 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); @@ -1492,13 +1489,13 @@ static inline void isicom_send_break(str static int isicom_tiocmget(struct tty_struct *tty, struct file *file) { - struct isi_port * port = (struct isi_port *) tty->driver_data; + struct isi_port *port = (struct isi_port *) tty->driver_data; /* just send the port status */ unsigned short status = port->status; 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) | @@ -1508,13 +1505,13 @@ static int isicom_tiocmget(struct tty_st } static int isicom_tiocmset(struct tty_struct *tty, struct file *file, - unsigned int set, unsigned int clear) + unsigned int set, unsigned int clear) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - + 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) @@ -1526,46 +1523,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) +static int isicom_set_serial_info(struct isi_port *port, + struct serial_struct __user *info) { struct serial_struct newinfo; int reconfig_port; - if(copy_from_user(&newinfo, info, sizeof(newinfo))) + if (copy_from_user(&newinfo, info, sizeof(newinfo))) return -EFAULT; - - reconfig_port = ((port->flags & ASYNC_SPD_MASK) != - (newinfo.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) != - (port->flags & ~ASYNC_USR_MASK))) + (newinfo.closing_wait != port->closing_wait) || + ((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; @@ -1575,15 +1572,15 @@ static int isicom_get_serial_info(struct /* out_info.baud_base = ? */ out_info.close_delay = port->close_delay; out_info.closing_wait = port->closing_wait; - if(copy_to_user(info, &out_info, sizeof(out_info))) + 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) +static int isicom_ioctl(struct tty_struct *tty, struct file *filp, + unsigned int cmd, unsigned long arg) { - struct isi_port * port = (struct isi_port *) tty->driver_data; + struct isi_port *port = (struct isi_port *) tty->driver_data; void __user *argp = (void __user *)arg; int retval; @@ -1591,139 +1588,140 @@ static int isicom_ioctl(struct tty_struc return -ENODEV; switch(cmd) { - case TCSBRK: - retval = tty_check_change(tty); - if (retval) - return retval; - tty_wait_until_sent(tty, 0); - if (!arg) - isicom_send_break(port, HZ/4); - return 0; - - 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); - - 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; - - case TIOCGSERIAL: - return isicom_get_serial_info(port, argp); - - case TIOCSSERIAL: - return isicom_set_serial_info(port, argp); - - default: - return -ENOIOCTLCMD; + case TCSBRK: + retval = tty_check_change(tty); + if (retval) + return retval; + tty_wait_until_sent(tty, 0); + if (!arg) + isicom_send_break(port, HZ/4); + return 0; + + 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); + + 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; + + case TIOCGSERIAL: + return isicom_get_serial_info(port, argp); + + case TIOCSSERIAL: + return isicom_set_serial_info(port, argp); + + default: + return -ENOIOCTLCMD; } return 0; } /* set_termios et all */ -static void isicom_set_termios(struct tty_struct * tty, struct termios * old_termios) +static void isicom_set_termios(struct tty_struct *tty, + struct termios *old_termios) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - + 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) + 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 */ -static void isicom_throttle(struct tty_struct * tty) +static void isicom_throttle(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - struct isi_board * card = port->card; - + 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); } /* unthrottle et all */ -static void isicom_unthrottle(struct tty_struct * tty) +static void isicom_unthrottle(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - struct isi_board * card = port->card; - + 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); } /* stop et all */ -static void isicom_stop(struct tty_struct * tty) +static void isicom_stop(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; + struct isi_port *port = (struct isi_port *) tty->driver_data; 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; } /* start et all */ -static void isicom_start(struct tty_struct * tty) +static void isicom_start(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - + 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; } /* hangup et all */ -static void do_isicom_hangup(void * data) +static void do_isicom_hangup(void *data) { - struct isi_port * port = (struct isi_port *) data; - struct tty_struct * tty; - + struct isi_port *port = (struct isi_port *) data; + struct tty_struct *tty; + tty = port->tty; if (tty) tty_hangup(tty); } -static void isicom_hangup(struct tty_struct * tty) +static void isicom_hangup(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - + 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; @@ -1732,19 +1730,19 @@ static void isicom_hangup(struct tty_str } /* flush_buffer et all */ -static void isicom_flush_buffer(struct tty_struct * tty) +static void isicom_flush_buffer(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - struct isi_board * card = port->card; + 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); } @@ -1768,33 +1766,33 @@ static int __devinit register_ioregion(v static void unregister_ioregion(void) { int count; - for (count=0; count < BOARD_COUNT; count++ ) + for (count=0; count < BOARD_COUNT; count++ ) if (isi_card[count].base) { release_region(isi_card[count].base,16); -#ifdef ISICOM_DEBUG +#ifdef ISICOM_DEBUG printk(KERN_DEBUG "ISICOM: I/O Region 0x%x-0x%x released for Card%d.\n",isi_card[count].base,isi_card[count].base+15,count+1); -#endif +#endif } } static struct tty_operations isicom_ops = { - .open = isicom_open, - .close = isicom_close, - .write = isicom_write, - .put_char = isicom_put_char, - .flush_chars = isicom_flush_chars, - .write_room = isicom_write_room, + .open = isicom_open, + .close = isicom_close, + .write = isicom_write, + .put_char = isicom_put_char, + .flush_chars = isicom_flush_chars, + .write_room = isicom_write_room, .chars_in_buffer = isicom_chars_in_buffer, - .ioctl = isicom_ioctl, - .set_termios = isicom_set_termios, - .throttle = isicom_throttle, - .unthrottle = isicom_unthrottle, - .stop = isicom_stop, - .start = isicom_start, - .hangup = isicom_hangup, - .flush_buffer = isicom_flush_buffer, - .tiocmget = isicom_tiocmget, - .tiocmset = isicom_tiocmset, + .ioctl = isicom_ioctl, + .set_termios = isicom_set_termios, + .throttle = isicom_throttle, + .unthrottle = isicom_unthrottle, + .stop = isicom_stop, + .start = isicom_start, + .hangup = isicom_hangup, + .flush_buffer = isicom_flush_buffer, + .tiocmget = isicom_tiocmget, + .tiocmset = isicom_tiocmset, }; static int __devinit register_drivers(void) @@ -1814,11 +1812,11 @@ static int __devinit register_drivers(vo isicom_normal->type = TTY_DRIVER_TYPE_SERIAL; isicom_normal->subtype = SERIAL_TYPE_NORMAL; isicom_normal->init_termios = tty_std_termios; - isicom_normal->init_termios.c_cflag = + isicom_normal->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL |CLOCAL; isicom_normal->flags = TTY_DRIVER_REAL_RAW; tty_set_operations(isicom_normal, &isicom_ops); - + if ((error=tty_register_driver(isicom_normal))!=0) { printk(KERN_DEBUG "ISICOM: Couldn't register the dialin driver, error=%d\n", error); @@ -1843,13 +1841,13 @@ static int __devinit register_isr(void) for (count=0; count < BOARD_COUNT; count++ ) { if (isi_card[count].base) { - irqflags = (isi_card[count].isa == YES) ? - SA_INTERRUPT : + irqflags = (isi_card[count].isa == YES) ? + SA_INTERRUPT : (SA_INTERRUPT | SA_SHIRQ); - if (request_irq(isi_card[count].irq, - isicom_interrupt, - irqflags, + if (request_irq(isi_card[count].irq, + isicom_interrupt, + irqflags, ISICOM_NAME, &isi_card[count])) { printk(KERN_WARNING "ISICOM: Could not" @@ -1862,7 +1860,7 @@ static int __devinit register_isr(void) } else done++; - } + } } return done; } @@ -1880,42 +1878,42 @@ static void __exit unregister_isr(void) static int __devinit isicom_init(void) { int card, channel, base; - struct isi_port * port; + struct isi_port *port; unsigned long page; - - if (!tmp_buf) { + + if (!tmp_buf) { page = get_zeroed_page(GFP_KERNEL); - if (!page) { -#ifdef ISICOM_DEBUG - printk(KERN_DEBUG "ISICOM: Couldn't allocate page for tmp_buf.\n"); + if (!page) { +#ifdef ISICOM_DEBUG + printk(KERN_DEBUG "ISICOM: Couldn't allocate page for tmp_buf.\n"); #else printk(KERN_ERR "ISICOM: Not enough memory...\n"); -#endif - return 0; - } - tmp_buf = (unsigned char *) page; +#endif + return 0; + } + tmp_buf = (unsigned char *) page; } - - if (!register_ioregion()) + + if (!register_ioregion()) { printk(KERN_ERR "ISICOM: All required I/O space found busy.\n"); free_page((unsigned long)tmp_buf); return 0; } - if (register_drivers()) + if (register_drivers()) { unregister_ioregion(); free_page((unsigned long)tmp_buf); return 0; } - if (!register_isr()) + if (!register_isr()) { unregister_drivers(); /* ioports already uregistered in register_isr */ free_page((unsigned long)tmp_buf); - return 0; + return 0; } - + memset(isi_ports, 0, sizeof(isi_ports)); for (card = 0; card < BOARD_COUNT; card++) { port = &isi_ports[card * 16]; @@ -1926,24 +1924,24 @@ static int __devinit isicom_init(void) port->magic = ISICOM_MAGIC; port->card = &isi_card[card]; port->channel = channel; - port->close_delay = 50 * HZ/100; - port->closing_wait = 3000 * HZ/100; - INIT_WORK(&port->hangup_tq, do_isicom_hangup, port); - INIT_WORK(&port->bh_tqueue, isicom_bottomhalf, port); - port->status = 0; - init_waitqueue_head(&port->open_wait); + port->close_delay = 50 * HZ/100; + port->closing_wait = 3000 * HZ/100; + INIT_WORK(&port->hangup_tq, do_isicom_hangup, port); + INIT_WORK(&port->bh_tqueue, isicom_bottomhalf, port); + port->status = 0; + init_waitqueue_head(&port->open_wait); init_waitqueue_head(&port->close_wait); /* . . . */ - } - } - - return 1; + } + } + + return 1; } /* * Insmod can set static symbols so keep these static */ - + static int io[4]; static int irq[4]; @@ -1961,9 +1959,9 @@ static int __devinit isicom_setup(void) int retval, card, idx, count; unsigned char pciirq; unsigned int ioaddr; - + card = 0; - for(idx=0; idx < BOARD_COUNT; idx++) { + for (idx=0; idx < BOARD_COUNT; idx++) { if (io[idx]) { isi_card[idx].base=io[idx]; isi_card[idx].irq=irq[idx]; @@ -1975,23 +1973,23 @@ static int __devinit isicom_setup(void) isi_card[idx].irq = 0; } } - + for (idx=0 ;idx < card; idx++) { if (!((isi_card[idx].irq==2)||(isi_card[idx].irq==3)|| - (isi_card[idx].irq==4)||(isi_card[idx].irq==5)|| - (isi_card[idx].irq==7)||(isi_card[idx].irq==10)|| - (isi_card[idx].irq==11)||(isi_card[idx].irq==12)|| - (isi_card[idx].irq==15))) { - + (isi_card[idx].irq==4)||(isi_card[idx].irq==5)|| + (isi_card[idx].irq==7)||(isi_card[idx].irq==10)|| + (isi_card[idx].irq==11)||(isi_card[idx].irq==12)|| + (isi_card[idx].irq==15))) { + if (isi_card[idx].base) { printk(KERN_ERR "ISICOM: Irq %d unsupported. Disabling Card%d...\n", isi_card[idx].irq, idx+1); isi_card[idx].base=0; card--; - } + } } - } - + } + if (card < BOARD_COUNT) { for (idx=0; idx < DEVID_COUNT; idx++) { dev = NULL; @@ -2000,21 +1998,22 @@ static int __devinit isicom_setup(void) break; if (card >= BOARD_COUNT) break; - + if (pci_enable_device(dev)) break; /* found a PCI ISI card! */ - ioaddr = pci_resource_start (dev, 3); /* i.e at offset 0x1c in the - * PCI configuration register - * space. - */ + ioaddr = pci_resource_start (dev, 3); + /* i.e at offset 0x1c in the + * PCI configuration register + * space. + */ pciirq = dev->irq; printk(KERN_INFO "ISI PCI Card(Device ID 0x%x)\n", isicom_pci_tbl[idx].device); /* * allot the first empty slot in the array - */ - for (count=0; count < BOARD_COUNT; count++) { + */ + for (count=0; count < BOARD_COUNT; count++) { if (isi_card[count].base == 0) { isi_card[count].base = ioaddr; isi_card[count].irq = pciirq; @@ -2023,35 +2022,35 @@ static int __devinit isicom_setup(void) break; } } - } + } if (card >= BOARD_COUNT) break; } } - + if (!(isi_card[0].base || isi_card[1].base || isi_card[2].base || isi_card[3].base)) { - printk(KERN_ERR "ISICOM: No valid card configuration. Driver cannot be initialized...\n"); + printk(KERN_ERR "ISICOM: No valid card configuration. Driver cannot be initialized...\n"); return -EIO; - } + } retval = misc_register(&isiloader_device); if (retval < 0) { printk(KERN_ERR "ISICOM: Unable to register firmware loader driver.\n"); return retval; } - + if (!isicom_init()) { - if (misc_deregister(&isiloader_device)) + if (misc_deregister(&isiloader_device)) printk(KERN_ERR "ISICOM: Unable to unregister Firmware Loader driver\n"); return -EIO; } - + init_timer(&tx); tx.expires = jiffies + 1; tx.data = 0; tx.function = isicom_tx; re_schedule = 1; add_timer(&tx); - + return 0; } @@ -2062,8 +2061,8 @@ static void __exit isicom_exit(void) msleep(1000); unregister_isr(); unregister_drivers(); - unregister_ioregion(); - if(tmp_buf) + unregister_ioregion(); + if (tmp_buf) free_page((unsigned long)tmp_buf); if (misc_deregister(&isiloader_device)) printk(KERN_ERR "ISICOM: Unable to unregister Firmware Loader driver\n"); ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 2/6] isicom: Type conversion and variables deletion 2005-09-14 0:10 ` [PATCH 0/6] isicom char driver rewritten to 2.6 api Jiri Slaby 2005-09-14 0:12 ` [PATCH 1/6] isicom: Whitespace cleanup Jiri Slaby @ 2005-09-14 0:12 ` Jiri Slaby 2005-09-14 0:12 ` [PATCH 3/6] isicom: Others little changes Jiri Slaby ` (3 subsequent siblings) 5 siblings, 0 replies; 22+ messages in thread From: Jiri Slaby @ 2005-09-14 0:12 UTC (permalink / raw) To: Andrew Morton; +Cc: Linux Kernel Mailing List, linux-pci, Greg KH Generated in 2.6.13-mm3 kernel version Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> Type conversion and variables deletion Type which is needed to have accurate size was converted to [us]{8,16}. Removed from void* cast. --- drivers/char/isicom.c | 127 +++++++++++++++++++++++-------------------------- 1 files changed, 60 insertions(+), 67 deletions(-) diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c @@ -154,9 +154,6 @@ static struct tty_driver *isicom_normal; static struct timer_list tx; static char re_schedule = 1; -#ifdef ISICOM_DEBUG -static unsigned long tx_count = 0; -#endif static int ISILoad_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); @@ -164,7 +161,6 @@ static void isicom_tx(unsigned long _dat static void isicom_start(struct tty_struct *tty); static unsigned char *tmp_buf; -static DECLARE_MUTEX(tmp_buf_sem); /* baud index mappings from linux defns to isi */ @@ -173,35 +169,35 @@ static signed char linuxb_to_isib[] = { }; struct isi_board { - unsigned short base; - unsigned char irq; - unsigned char port_count; - unsigned short status; - unsigned short port_status; /* each bit represents a single port */ - unsigned short shift_count; - struct isi_port * ports; - signed char count; - unsigned char isa; + u16 base; + u8 irq; + u8 port_count; + u16 status; + u16 port_status; /* each bit for each port */ + u16 shift_count; + struct isi_port *ports; + s8 count; + u8 isa; spinlock_t card_lock; /* Card wide lock 11/5/00 -sameer */ unsigned long flags; }; struct isi_port { - unsigned short magic; + u16 magic; unsigned int flags; int count; int blocked_open; int close_delay; - unsigned short channel; - unsigned short status; - unsigned short closing_wait; - struct isi_board * card; - struct tty_struct * tty; + u16 channel; + u16 status; + u16 closing_wait; + 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; - unsigned char * xmit_buf; + u8 *xmit_buf; int xmit_head; int xmit_tail; int xmit_cnt; @@ -219,7 +215,7 @@ static struct isi_port isi_ports[PORT_C static int lock_card(struct isi_board *card) { char retries; - unsigned short base = card->base; + u16 base = card->base; for (retries = 0; retries < 100; retries++) { spin_lock_irqsave(&card->card_lock, card->flags); @@ -237,7 +233,7 @@ static int lock_card(struct isi_board *c static int lock_card_at_interrupt(struct isi_board *card) { unsigned char retries; - unsigned short base = card->base; + u16 base = card->base; for (retries = 0; retries < 200; retries++) { spin_lock_irqsave(&card->card_lock, card->flags); @@ -263,8 +259,8 @@ static void unlock_card(struct isi_board static void raise_dtr(struct isi_port *port) { struct isi_board *card = port->card; - unsigned short base = card->base; - unsigned char channel = port->channel; + u16 base = card->base; + u8 channel = port->channel; if (!lock_card(card)) return; @@ -279,8 +275,8 @@ static void raise_dtr(struct isi_port *p static inline void drop_dtr(struct isi_port *port) { struct isi_board *card = port->card; - unsigned short base = card->base; - unsigned char channel = port->channel; + u16 base = card->base; + u8 channel = port->channel; if (!lock_card(card)) return; @@ -295,8 +291,8 @@ static inline void drop_dtr(struct isi_p static inline void raise_rts(struct isi_port *port) { struct isi_board *card = port->card; - unsigned short base = card->base; - unsigned char channel = port->channel; + u16 base = card->base; + u8 channel = port->channel; if (!lock_card(card)) return; @@ -310,8 +306,8 @@ static inline void raise_rts(struct isi_ static inline void drop_rts(struct isi_port *port) { struct isi_board *card = port->card; - unsigned short base = card->base; - unsigned char channel = port->channel; + u16 base = card->base; + u8 channel = port->channel; if (!lock_card(card)) return; @@ -326,8 +322,8 @@ static inline void drop_rts(struct isi_p static inline void raise_dtr_rts(struct isi_port *port) { struct isi_board *card = port->card; - unsigned short base = card->base; - unsigned char channel = port->channel; + u16 base = card->base; + u8 channel = port->channel; if (!lock_card(card)) return; @@ -342,8 +338,8 @@ static inline void raise_dtr_rts(struct static void drop_dtr_rts(struct isi_port *port) { struct isi_board *card = port->card; - unsigned short base = card->base; - unsigned char channel = port->channel; + u16 base = card->base; + u8 channel = port->channel; if (!lock_card(card)) return; @@ -358,8 +354,8 @@ static void drop_dtr_rts(struct isi_port static inline void kill_queue(struct isi_port *port, short queue) { struct isi_board *card = port->card; - unsigned short base = card->base; - unsigned char channel = port->channel; + u16 base = card->base; + u8 channel = port->channel; if (!lock_card(card)) return; @@ -386,7 +382,7 @@ static struct miscdevice isiloader_devic }; -static inline int WaitTillCardIsFree(unsigned short base) +static inline int WaitTillCardIsFree(u16 base) { unsigned long count=0; while( (!(inw(base+0xe) & 0x1)) && (count++ < 6000000)); @@ -401,7 +397,7 @@ static int ISILoad_ioctl(struct inode *i { unsigned int card, i, j, signature, status, portcount = 0; unsigned long t; - unsigned short word_count, base; + u16 word_count, base; bin_frame frame; void __user *argp = (void __user *)arg; /* exec_record exec_rec; */ @@ -762,19 +758,16 @@ static void isicom_bottomhalf(void *data * Main interrupt handler routine */ -static irqreturn_t isicom_interrupt(int irq, void *dev_id, - struct pt_regs *regs) +static irqreturn_t isicom_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct isi_board *card; + struct isi_board *card = dev_id; struct isi_port *port; struct tty_struct *tty; - unsigned short base, header, word_count, count; - unsigned char channel; + u16 base, header, word_count, count; + u8 channel; short byte_count; unsigned char *rp; - card = (struct isi_board *) dev_id; - if (!card || !(card->status & FIRMWARE_LOADED)) return IRQ_NONE; @@ -953,8 +946,8 @@ static void isicom_config_port(struct is struct isi_board *card = port->card; struct tty_struct *tty; unsigned long baud; - unsigned short channel_setup, base = card->base; - unsigned short channel = port->channel, shift_count = card->shift_count; + u16 channel_setup, base = card->base; + u16 channel = port->channel, shift_count = card->shift_count; unsigned char flow_ctrl; if (!(tty = port->tty) || !tty->termios) @@ -1094,7 +1087,7 @@ static int isicom_setup_port(struct isi_ free_page(page); return -ERESTARTSYS; } - port->xmit_buf = (unsigned char *) page; + port->xmit_buf = (u8*) page; } spin_lock_irqsave(&card->card_lock, flags); @@ -1294,7 +1287,7 @@ static void isicom_shutdown_port(struct static void isicom_close(struct tty_struct *tty, struct file *filp) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; struct isi_board *card = port->card; unsigned long flags; @@ -1373,7 +1366,7 @@ static void isicom_close(struct tty_stru static int isicom_write(struct tty_struct *tty, const unsigned char *buf, int count) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; struct isi_board *card = port->card; unsigned long flags; int cnt, total = 0; @@ -1408,7 +1401,7 @@ static int isicom_write(struct tty_struc /* put_char et all */ static void isicom_put_char(struct tty_struct *tty, unsigned char ch) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; struct isi_board *card = port->card; unsigned long flags; @@ -1433,7 +1426,7 @@ static void isicom_put_char(struct tty_s /* flush_chars et all */ static void isicom_flush_chars(struct tty_struct *tty) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; if (isicom_paranoia_check(port, tty->name, "isicom_flush_chars")) return; @@ -1449,7 +1442,7 @@ static void isicom_flush_chars(struct tt /* write_room et all */ static int isicom_write_room(struct tty_struct *tty) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; int free; if (isicom_paranoia_check(port, tty->name, "isicom_write_room")) @@ -1464,7 +1457,7 @@ static int isicom_write_room(struct tty_ /* chars_in_buffer et all */ static int isicom_chars_in_buffer(struct tty_struct *tty) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; if (isicom_paranoia_check(port, tty->name, "isicom_chars_in_buffer")) return 0; return port->xmit_cnt; @@ -1474,7 +1467,7 @@ static int isicom_chars_in_buffer(struct static inline void isicom_send_break(struct isi_port *port, unsigned long length) { struct isi_board *card = port->card; - unsigned short base = card->base; + u16 base = card->base; if (!lock_card(card)) return; @@ -1489,9 +1482,9 @@ static inline void isicom_send_break(str static int isicom_tiocmget(struct tty_struct *tty, struct file *file) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; /* just send the port status */ - unsigned short status = port->status; + u16 status = port->status; if (isicom_paranoia_check(port, tty->name, "isicom_ioctl")) return -ENODEV; @@ -1507,7 +1500,7 @@ static int isicom_tiocmget(struct tty_st static int isicom_tiocmset(struct tty_struct *tty, struct file *file, unsigned int set, unsigned int clear) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; if (isicom_paranoia_check(port, tty->name, "isicom_ioctl")) return -ENODEV; @@ -1580,7 +1573,7 @@ static int isicom_get_serial_info(struct static int isicom_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd, unsigned long arg) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; void __user *argp = (void __user *)arg; int retval; @@ -1632,7 +1625,7 @@ 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; + struct isi_port *port = tty->driver_data; if (isicom_paranoia_check(port, tty->name, "isicom_set_termios")) return; @@ -1653,7 +1646,7 @@ static void isicom_set_termios(struct tt /* throttle et all */ static void isicom_throttle(struct tty_struct *tty) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; struct isi_board *card = port->card; if (isicom_paranoia_check(port, tty->name, "isicom_throttle")) @@ -1667,7 +1660,7 @@ static void isicom_throttle(struct tty_s /* unthrottle et all */ static void isicom_unthrottle(struct tty_struct *tty) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; struct isi_board *card = port->card; if (isicom_paranoia_check(port, tty->name, "isicom_unthrottle")) @@ -1681,7 +1674,7 @@ static void isicom_unthrottle(struct tty /* stop et all */ static void isicom_stop(struct tty_struct *tty) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; if (isicom_paranoia_check(port, tty->name, "isicom_stop")) return; @@ -1694,7 +1687,7 @@ static void isicom_stop(struct tty_struc /* start et all */ static void isicom_start(struct tty_struct *tty) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; if (isicom_paranoia_check(port, tty->name, "isicom_start")) return; @@ -1707,7 +1700,7 @@ static void isicom_start(struct tty_stru /* hangup et all */ static void do_isicom_hangup(void *data) { - struct isi_port *port = (struct isi_port *) data; + struct isi_port *port = data; struct tty_struct *tty; tty = port->tty; @@ -1717,7 +1710,7 @@ 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; + struct isi_port *port = tty->driver_data; if (isicom_paranoia_check(port, tty->name, "isicom_hangup")) return; @@ -1732,7 +1725,7 @@ static void isicom_hangup(struct tty_str /* flush_buffer et all */ static void isicom_flush_buffer(struct tty_struct *tty) { - struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_port *port = tty->driver_data; struct isi_board *card = port->card; unsigned long flags; ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 3/6] isicom: Others little changes 2005-09-14 0:10 ` [PATCH 0/6] isicom char driver rewritten to 2.6 api Jiri Slaby 2005-09-14 0:12 ` [PATCH 1/6] isicom: Whitespace cleanup Jiri Slaby 2005-09-14 0:12 ` [PATCH 2/6] isicom: Type conversion and variables deletion Jiri Slaby @ 2005-09-14 0:12 ` Jiri Slaby 2005-09-14 0:13 ` [PATCH 4/6] isicom: Pci probing added Jiri Slaby ` (2 subsequent siblings) 5 siblings, 0 replies; 22+ messages in thread From: Jiri Slaby @ 2005-09-14 0:12 UTC (permalink / raw) To: Andrew Morton; +Cc: Linux Kernel Mailing List, linux-pci, Greg KH Generated in 2.6.13-mm3 kernel version Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> Others little changes Move some code from one place to another. Get rid of ugly ifdefs in code in next p[patches, so here create functions and macros to enable it. Rename some functions and align some code to 80 chars. --- drivers/char/isicom.c | 128 ++++++++++++++++++++++++++---------------------- include/linux/isicom.h | 3 - 2 files changed, 70 insertions(+), 61 deletions(-) diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c @@ -135,6 +135,17 @@ #include <linux/isicom.h> +#define InterruptTheCard(base) outw(0, (base) + 0xc) +#define ClearInterrupt(base) inw((base) + 0x0a) + +#ifdef ISICOM_DEBUG +#define pr_deb(str, ...) printk((str), ##args); +#define isicom_paranoia_check(a, b, c) __isicom_paranoia_check((a), (b), (c)) +#else +#define pr_deb(str, ...) +#define isicom_paranoia_check(a, b, c) 0 +#endif + static struct pci_device_id isicom_pci_tbl[] = { { VENDOR_ID, 0x2028, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { VENDOR_ID, 0x2051, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, @@ -598,23 +609,20 @@ static int ISILoad_ioctl(struct inode *i * */ -static inline int isicom_paranoia_check(struct isi_port const *port, char *name, - const char *routine) +static inline int __isicom_paranoia_check(struct isi_port const *port, + char *name, const char *routine) { -#ifdef ISICOM_DEBUG - static const char *badmagic = - KERN_WARNING "ISICOM: Warning: bad isicom magic for dev %s in %s.\n"; - static const char *badport = - KERN_WARNING "ISICOM: Warning: NULL isicom port for dev %s in %s.\n"; if (!port) { - printk(badport, name, routine); + printk(KERN_WARNING "ISICOM: Warning: bad isicom magic for " + "dev %s in %s.\n", name, routine); return 1; } if (port->magic != ISICOM_MAGIC) { - printk(badmagic, name, routine); + printk(KERN_WARNING "ISICOM: Warning: NULL isicom port for " + "dev %s in %s.\n", name, routine); return 1; } -#endif + return 0; } @@ -632,10 +640,6 @@ static void isicom_tx(unsigned long _dat struct isi_port *port; struct tty_struct *tty; -#ifdef ISICOM_DEBUG - ++tx_count; -#endif - /* find next active board */ card = (prev_card + 1) & 0x0003; while(count-- > 0) { @@ -677,12 +681,10 @@ static void isicom_tx(unsigned long _dat unlock_card(&isi_card[card]); continue; } -#ifdef ISICOM_DEBUG - 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); + pr_deb(KERN_DEBUG "ISICOM: txing %d bytes, port%d.\n", + txcount, port->channel + 1); + outw((port->channel << isi_card[card].shift_count) | txcount, + base); residue = NO; wrd = 0; while (1) { @@ -728,8 +730,11 @@ static void isicom_tx(unsigned long _dat /* schedule another tx for hopefully in about 10ms */ sched_again: - if (!re_schedule) - return; + if (!re_schedule) { + re_schedule = 2; + return; + } + init_timer(&tx); tx.expires = jiffies + HZ/100; tx.data = 0; @@ -1788,42 +1793,45 @@ static struct tty_operations isicom_ops .tiocmset = isicom_tiocmset, }; -static int __devinit register_drivers(void) +static int __devinit isicom_register_tty_driver(void) { - int error; + int error = -ENOMEM; /* tty driver structure initialization */ isicom_normal = alloc_tty_driver(PORT_COUNT); if (!isicom_normal) - return -ENOMEM; + goto end; - isicom_normal->owner = THIS_MODULE; - isicom_normal->name = "ttyM"; - isicom_normal->devfs_name = "isicom/"; - isicom_normal->major = ISICOM_NMAJOR; - isicom_normal->minor_start = 0; - isicom_normal->type = TTY_DRIVER_TYPE_SERIAL; - isicom_normal->subtype = SERIAL_TYPE_NORMAL; - isicom_normal->init_termios = tty_std_termios; - isicom_normal->init_termios.c_cflag = - B9600 | CS8 | CREAD | HUPCL |CLOCAL; - isicom_normal->flags = TTY_DRIVER_REAL_RAW; + isicom_normal->owner = THIS_MODULE; + isicom_normal->name = "ttyM"; + isicom_normal->devfs_name = "isicom/"; + isicom_normal->major = ISICOM_NMAJOR; + isicom_normal->minor_start = 0; + isicom_normal->type = TTY_DRIVER_TYPE_SERIAL; + isicom_normal->subtype = SERIAL_TYPE_NORMAL; + isicom_normal->init_termios = tty_std_termios; + isicom_normal->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | + CLOCAL; + isicom_normal->flags = TTY_DRIVER_REAL_RAW; tty_set_operations(isicom_normal, &isicom_ops); - if ((error=tty_register_driver(isicom_normal))!=0) { - printk(KERN_DEBUG "ISICOM: Couldn't register the dialin driver, error=%d\n", - error); + if ((error = tty_register_driver(isicom_normal))) { + printk(KERN_DEBUG "ISICOM: Couldn't register the dialin " + "driver, error=%d\n", error); put_tty_driver(isicom_normal); - return error; } - return 0; +end: + return error; } -static void unregister_drivers(void) +static void isicom_unregister_tty_driver(void) { - int error = tty_unregister_driver(isicom_normal); - if (error) - printk(KERN_DEBUG "ISICOM: couldn't unregister normal driver error=%d.\n",error); + int error; + + if ((error = tty_unregister_driver(isicom_normal))) + printk(KERN_DEBUG "ISICOM: couldn't unregister normal driver, " + "error=%d.\n", error); + put_tty_driver(isicom_normal); } @@ -1893,7 +1901,7 @@ static int __devinit isicom_init(void) free_page((unsigned long)tmp_buf); return 0; } - if (register_drivers()) + if (isicom_register_tty_driver()) { unregister_ioregion(); free_page((unsigned long)tmp_buf); @@ -1901,7 +1909,7 @@ static int __devinit isicom_init(void) } if (!register_isr()) { - unregister_drivers(); + isicom_unregister_tty_driver(); /* ioports already uregistered in register_isr */ free_page((unsigned long)tmp_buf); return 0; @@ -1938,14 +1946,6 @@ static int __devinit isicom_init(void) static int io[4]; static int irq[4]; -MODULE_AUTHOR("MultiTech"); -MODULE_DESCRIPTION("Driver for the ISI series of cards by MultiTech"); -MODULE_LICENSE("GPL"); -module_param_array(io, int, NULL, 0); -MODULE_PARM_DESC(io, "I/O ports for the cards"); -module_param_array(irq, int, NULL, 0); -MODULE_PARM_DESC(irq, "Interrupts for the cards"); - static int __devinit isicom_setup(void) { struct pci_dev *dev = NULL; @@ -2049,11 +2049,15 @@ static int __devinit isicom_setup(void) static void __exit isicom_exit(void) { + unsigned int index = 0; + re_schedule = 0; - /* FIXME */ - msleep(1000); + + while (re_schedule != 2 && index++ < 100) + msleep(10); + unregister_isr(); - unregister_drivers(); + isicom_unregister_tty_driver(); unregister_ioregion(); if (tmp_buf) free_page((unsigned long)tmp_buf); @@ -2063,3 +2067,11 @@ static void __exit isicom_exit(void) module_init(isicom_setup); module_exit(isicom_exit); + +MODULE_AUTHOR("MultiTech"); +MODULE_DESCRIPTION("Driver for the ISI series of cards by MultiTech"); +MODULE_LICENSE("GPL"); +module_param_array(io, int, NULL, 0); +MODULE_PARM_DESC(io, "I/O ports for the cards"); +module_param_array(irq, int, NULL, 0); +MODULE_PARM_DESC(irq, "Interrupts for the cards"); diff --git a/include/linux/isicom.h b/include/linux/isicom.h --- a/include/linux/isicom.h +++ b/include/linux/isicom.h @@ -98,9 +98,6 @@ typedef struct { #define ISICOM_INITIATE_XONXOFF 0x04 #define ISICOM_RESPOND_XONXOFF 0x08 -#define InterruptTheCard(base) (outw(0,(base)+0xc)) -#define ClearInterrupt(base) (inw((base)+0x0a)) - #define BOARD(line) (((line) >> 4) & 0x3) /* isi kill queue bitmap */ ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 4/6] isicom: Pci probing added 2005-09-14 0:10 ` [PATCH 0/6] isicom char driver rewritten to 2.6 api Jiri Slaby ` (2 preceding siblings ...) 2005-09-14 0:12 ` [PATCH 3/6] isicom: Others little changes Jiri Slaby @ 2005-09-14 0:13 ` Jiri Slaby 2005-09-14 0:13 ` [PATCH 5/6] isicom: Firmware loading Jiri Slaby 2005-09-14 0:13 ` [PATCH 6/6] isicom: More whitespaces and coding style Jiri Slaby 5 siblings, 0 replies; 22+ messages in thread From: Jiri Slaby @ 2005-09-14 0:13 UTC (permalink / raw) To: Andrew Morton; +Cc: Linux Kernel Mailing List, linux-pci, Greg KH Generated in 2.6.13-mm3 kernel version Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> Pci probing added Pci probing functions added, most of functions rewrited because od it (some for cycles are redundant). Used PCI_DEVICE macro. --- drivers/char/isicom.c | 468 +++++++++++++++++++++++++++---------------------- 1 files changed, 261 insertions(+), 207 deletions(-) diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c @@ -107,7 +107,6 @@ * Omit those entries for boards you don't have installed. * * TODO - * Hotplug * Merge testing * 64-bit verification */ @@ -146,20 +145,30 @@ #define isicom_paranoia_check(a, b, c) 0 #endif +static int isicom_probe(struct pci_dev*, const struct pci_device_id*); +static void __devexit isicom_remove(struct pci_dev*); + static struct pci_device_id isicom_pci_tbl[] = { - { VENDOR_ID, 0x2028, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, - { VENDOR_ID, 0x2051, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, - { VENDOR_ID, 0x2052, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, - { VENDOR_ID, 0x2053, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, - { VENDOR_ID, 0x2054, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, - { VENDOR_ID, 0x2055, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, - { VENDOR_ID, 0x2056, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, - { VENDOR_ID, 0x2057, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, - { VENDOR_ID, 0x2058, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, + { PCI_DEVICE(VENDOR_ID, 0x2028) }, + { PCI_DEVICE(VENDOR_ID, 0x2051) }, + { PCI_DEVICE(VENDOR_ID, 0x2052) }, + { PCI_DEVICE(VENDOR_ID, 0x2053) }, + { PCI_DEVICE(VENDOR_ID, 0x2054) }, + { PCI_DEVICE(VENDOR_ID, 0x2055) }, + { PCI_DEVICE(VENDOR_ID, 0x2056) }, + { PCI_DEVICE(VENDOR_ID, 0x2057) }, + { PCI_DEVICE(VENDOR_ID, 0x2058) }, { 0 } }; MODULE_DEVICE_TABLE(pci, isicom_pci_tbl); +static struct pci_driver isicom_driver = { + .name = "isicom", + .id_table = isicom_pci_tbl, + .probe = isicom_probe, + .remove = __devexit_p(isicom_remove) +}; + static int prev_card = 3; /* start servicing isi_card[0] */ static struct tty_driver *isicom_normal; @@ -171,8 +180,6 @@ static int ISILoad_ioctl(struct inode *i static void isicom_tx(unsigned long _data); static void isicom_start(struct tty_struct *tty); -static unsigned char *tmp_buf; - /* baud index mappings from linux defns to isi */ static signed char linuxb_to_isib[] = { @@ -191,6 +198,7 @@ struct isi_board { u8 isa; spinlock_t card_lock; /* Card wide lock 11/5/00 -sameer */ unsigned long flags; + struct device device; }; struct isi_port { @@ -1379,7 +1387,7 @@ static int isicom_write(struct tty_struc if (isicom_paranoia_check(port, tty->name, "isicom_write")) return 0; - if (!tty || !port->xmit_buf || !tmp_buf) + if (!tty || !port->xmit_buf) return 0; spin_lock_irqsave(&card->card_lock, flags); @@ -1745,32 +1753,36 @@ static void isicom_flush_buffer(struct t tty_wakeup(tty); } +/* + * Driver init and deinit functions + */ -static int __devinit register_ioregion(void) +static int __devinit isicom_register_ioregion(struct isi_board *board, + const unsigned int index) { - int count, done=0; - for (count=0; count < BOARD_COUNT; count++ ) { - if (isi_card[count].base) - if (!request_region(isi_card[count].base,16,ISICOM_NAME)) { - printk(KERN_DEBUG "ISICOM: I/O Region 0x%x-0x%x is busy. Card%d will be disabled.\n", - isi_card[count].base,isi_card[count].base+15,count+1); - isi_card[count].base=0; - done++; - } - } - return done; + if (!board->base) + return -EINVAL; + + 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, + board->base + 15, index + 1); + return -EBUSY; + } + + return 0; } -static void unregister_ioregion(void) +static void isicom_unregister_ioregion(struct isi_board *board, + const unsigned int index) { - int count; - for (count=0; count < BOARD_COUNT; count++ ) - if (isi_card[count].base) { - release_region(isi_card[count].base,16); -#ifdef ISICOM_DEBUG - printk(KERN_DEBUG "ISICOM: I/O Region 0x%x-0x%x released for Card%d.\n",isi_card[count].base,isi_card[count].base+15,count+1); -#endif - } + if (!board->base) + return; + + release_region(board->base, 16); + board->base = 0; + pr_deb(KERN_DEBUG "ISICOM: I/O Region 0x%x-0x%x released for Card%d.\n", + board->base, board->base + 15, index + 1); } static struct tty_operations isicom_ops = { @@ -1835,207 +1847,243 @@ static void isicom_unregister_tty_driver put_tty_driver(isicom_normal); } -static int __devinit register_isr(void) +static int __devinit isicom_register_isr(struct isi_board *board, + const unsigned int index) { - int count, done=0; - unsigned long irqflags; + unsigned long irqflags = SA_INTERRUPT; + int retval = -EINVAL; - for (count=0; count < BOARD_COUNT; count++ ) { - if (isi_card[count].base) { - irqflags = (isi_card[count].isa == YES) ? - SA_INTERRUPT : - (SA_INTERRUPT | SA_SHIRQ); - - if (request_irq(isi_card[count].irq, - isicom_interrupt, - irqflags, - ISICOM_NAME, &isi_card[count])) { - - printk(KERN_WARNING "ISICOM: Could not" - " install handler at Irq %d." - " Card%d will be disabled.\n", - isi_card[count].irq, count+1); + if (!board->base) + goto end; - release_region(isi_card[count].base,16); - isi_card[count].base=0; - } - else - done++; - } - } - return done; + if (board->isa == NO) + irqflags |= SA_SHIRQ; + + retval = request_irq(board->irq, isicom_interrupt, irqflags, + ISICOM_NAME, board); + if (retval < 0) { + printk(KERN_WARNING "ISICOM: Could not install handler at Irq " + "%d. Card%d will be disabled.\n", board->irq, + index + 1); + } else + retval = 0; +end: + return retval; } -static void __exit unregister_isr(void) +static void isicom_unregister_isr(struct isi_board *board) { - int count; - - for (count=0; count < BOARD_COUNT; count++ ) { - if (isi_card[count].base) - free_irq(isi_card[count].irq, &isi_card[count]); - } + if (board->base) + free_irq(board->irq, board); } -static int __devinit isicom_init(void) +static int __devinit reset_card(struct isi_board *board, + const unsigned int card, unsigned int *signature) { - int card, channel, base; - struct isi_port *port; - unsigned long page; + u16 base = board->base; + unsigned int portcount = 0; + int retval = 0; - if (!tmp_buf) { - page = get_zeroed_page(GFP_KERNEL); - if (!page) { -#ifdef ISICOM_DEBUG - printk(KERN_DEBUG "ISICOM: Couldn't allocate page for tmp_buf.\n"); -#else - printk(KERN_ERR "ISICOM: Not enough memory...\n"); -#endif - return 0; - } - tmp_buf = (unsigned char *) page; - } + printk(KERN_DEBUG "ISILoad:Resetting Card%d at 0x%x\n", card + 1, base); - if (!register_ioregion()) - { - printk(KERN_ERR "ISICOM: All required I/O space found busy.\n"); - free_page((unsigned long)tmp_buf); - return 0; - } - if (isicom_register_tty_driver()) - { - unregister_ioregion(); - free_page((unsigned long)tmp_buf); - return 0; - } - if (!register_isr()) - { - isicom_unregister_tty_driver(); - /* ioports already uregistered in register_isr */ - free_page((unsigned long)tmp_buf); - return 0; - } + inw(base + 0x8); - memset(isi_ports, 0, sizeof(isi_ports)); - for (card = 0; card < BOARD_COUNT; card++) { - port = &isi_ports[card * 16]; - isi_card[card].ports = port; - spin_lock_init(&isi_card[card].card_lock); - base = isi_card[card].base; - for (channel = 0; channel < 16; channel++, port++) { - port->magic = ISICOM_MAGIC; - port->card = &isi_card[card]; - port->channel = channel; - port->close_delay = 50 * HZ/100; - port->closing_wait = 3000 * HZ/100; - INIT_WORK(&port->hangup_tq, do_isicom_hangup, port); - INIT_WORK(&port->bh_tqueue, isicom_bottomhalf, port); - port->status = 0; - init_waitqueue_head(&port->open_wait); - init_waitqueue_head(&port->close_wait); - /* . . . */ + mdelay(10); + + outw(0, base + 0x8); /* Reset */ + + msleep(3000); + + *signature = inw(base + 0x4) & 0xff; + + if (board->isa == YES) { + if (!(inw(base + 0xe) & 0x1) || (inw(base + 0x2))) { + pr_deb(KERN_DEBUG "base+0x2=0x%x, base+0xe=0x%x", + inw(base + 0x2), inw(base + 0xe)); + printk(KERN_ERR "ISILoad:ISA Card%d reset failure " + "(Possible bad I/O Port Address 0x%x).\n", + card + 1, base); + retval = -EIO; + goto end; + } + } else { + portcount = inw(base + 0x2); + if (!(inw(base + 0xe) & 0x1) || ((portcount != 0) && + (portcount != 4) && (portcount != 8))) { + pr_deb("\nbase+0x2=0x%x , base+0xe=0x%x", + inw(base + 0x2), inw(base + 0xe)); + printk("\nISILoad:PCI Card%d reset failure (Possible " + "bad I/O Port Address 0x%x).\n", card + 1, + base); + retval = -EIO; + goto end; } } - return 1; + switch (*signature) { + case 0xa5: + case 0xbb: + case 0xdd: + board->port_count = (board->isa == NO && portcount == 4) ? 4 : + 8; + board->shift_count = 12; + break; + case 0xcc: + board->port_count = 16; + board->shift_count = 11; + break; + default: + printk(KERN_WARNING "ISILoad:Card%d reset failure (Possible " + "bad I/O Port Address 0x%x).\n", card + 1, base); + pr_deb(KERN_DEBUG "Sig=0x%x\n", signature); + retval = -EIO; + } + printk(KERN_INFO "-Done\n"); + +end: + return retval; } /* * Insmod can set static symbols so keep these static */ - static int io[4]; static int irq[4]; +static int card; -static int __devinit isicom_setup(void) +static int __devinit isicom_probe(struct pci_dev *pdev, + const struct pci_device_id *ent) { - struct pci_dev *dev = NULL; - int retval, card, idx, count; - unsigned char pciirq; - unsigned int ioaddr; - - card = 0; - for (idx=0; idx < BOARD_COUNT; idx++) { - if (io[idx]) { - isi_card[idx].base=io[idx]; - isi_card[idx].irq=irq[idx]; - isi_card[idx].isa=YES; - card++; - } - else { - isi_card[idx].base = 0; - isi_card[idx].irq = 0; + unsigned int ioaddr, signature, index; + int retval = -EPERM; + u8 pciirq; + struct isi_board *board = NULL; + + if (card >= BOARD_COUNT) + goto err; + + ioaddr = pci_resource_start(pdev, 3); + /* i.e at offset 0x1c in the PCI configuration register space. */ + pciirq = pdev->irq; + printk(KERN_INFO "ISI PCI Card(Device ID 0x%x)\n", ent->device); + + /* allot the first empty slot in the array */ + for (index = 0; index < BOARD_COUNT; index++) + if (isi_card[index].base == 0) { + board = &isi_card[index]; + break; } - } - for (idx=0 ;idx < card; idx++) { - if (!((isi_card[idx].irq==2)||(isi_card[idx].irq==3)|| - (isi_card[idx].irq==4)||(isi_card[idx].irq==5)|| - (isi_card[idx].irq==7)||(isi_card[idx].irq==10)|| - (isi_card[idx].irq==11)||(isi_card[idx].irq==12)|| - (isi_card[idx].irq==15))) { - - if (isi_card[idx].base) { - printk(KERN_ERR "ISICOM: Irq %d unsupported. Disabling Card%d...\n", - isi_card[idx].irq, idx+1); - isi_card[idx].base=0; - card--; - } - } - } + board->base = ioaddr; + board->irq = pciirq; + board->isa = NO; + board->device = pdev->dev; + card++; + + retval = isicom_register_ioregion(board, index); + if (retval < 0) + goto err; + + retval = isicom_register_isr(board, index); + if (retval < 0) + goto errunrr; + + retval = reset_card(board, index, &signature); + if (retval < 0) + goto errunri; + +/* retval = load_firmware(board, index, signature); + if (retval < 0) + goto errunri; */ - if (card < BOARD_COUNT) { - for (idx=0; idx < DEVID_COUNT; idx++) { - dev = NULL; - for (;;){ - if (!(dev = pci_find_device(VENDOR_ID, isicom_pci_tbl[idx].device, dev))) - break; - if (card >= BOARD_COUNT) - break; + return 0; - if (pci_enable_device(dev)) - break; +errunri: + isicom_unregister_isr(board); +errunrr: + isicom_unregister_ioregion(board, index); +err: + board->base = 0; + return retval; +} - /* found a PCI ISI card! */ - ioaddr = pci_resource_start (dev, 3); - /* i.e at offset 0x1c in the - * PCI configuration register - * space. - */ - pciirq = dev->irq; - printk(KERN_INFO "ISI PCI Card(Device ID 0x%x)\n", isicom_pci_tbl[idx].device); - /* - * allot the first empty slot in the array - */ - for (count=0; count < BOARD_COUNT; count++) { - if (isi_card[count].base == 0) { - isi_card[count].base = ioaddr; - isi_card[count].irq = pciirq; - isi_card[count].isa = NO; - card++; - break; - } - } - } - if (card >= BOARD_COUNT) break; - } - } +static void __devexit isicom_remove(struct pci_dev *pdev) +{ + unsigned int idx; - if (!(isi_card[0].base || isi_card[1].base || isi_card[2].base || isi_card[3].base)) { - printk(KERN_ERR "ISICOM: No valid card configuration. Driver cannot be initialized...\n"); - return -EIO; - } + for (idx = 0; idx < BOARD_COUNT; idx++) + if (isi_card[idx].base == pci_resource_start(pdev, 3)) + break; - retval = misc_register(&isiloader_device); + if (idx == BOARD_COUNT) + return; + + isicom_unregister_isr(&isi_card[idx]); + isicom_unregister_ioregion(&isi_card[idx], idx); +} + +static int __devinit isicom_setup(void) +{ + int retval, idx, channel; + struct isi_port *port; + + card = 0; + memset(isi_ports, 0, sizeof(isi_ports)); + + for(idx = 0; idx < BOARD_COUNT; idx++) { + port = &isi_ports[idx * 16]; + isi_card[idx].ports = port; + spin_lock_init(&isi_card[idx].card_lock); + for (channel = 0; channel < 16; channel++, port++) { + port->magic = ISICOM_MAGIC; + port->card = &isi_card[idx]; + port->channel = channel; + port->close_delay = 50 * HZ/100; + port->closing_wait = 3000 * HZ/100; + INIT_WORK(&port->hangup_tq, do_isicom_hangup, port); + INIT_WORK(&port->bh_tqueue, isicom_bottomhalf, port); + port->status = 0; + init_waitqueue_head(&port->open_wait); + init_waitqueue_head(&port->close_wait); + /* . . . */ + } + isi_card[idx].base = 0; + isi_card[idx].irq = 0; + + if (!io[idx]) + continue; + + if (irq[idx] == 2 || irq[idx] == 3 || irq[idx] == 4 || + irq[idx] == 5 || irq[idx] == 7 || + irq[idx] == 10 || irq[idx] == 11 || + irq[idx] == 12 || irq[idx] == 15) { + printk(KERN_ERR "ISICOM: ISA not supported yet.\n"); + return -EIO; +/* isi_card[idx].base = io[idx]; + isi_card[idx].irq = irq[idx]; + isi_card[idx].isa = YES; + FIXME: which device for request_firmware use? if you know, uncomment this and + delete printk and return + isi_card[idx].device = ???; + card++;*/ + } else + printk(KERN_ERR "ISICOM: Irq %d unsupported. " + "Disabling Card%d...\n", irq[idx], idx + 1); + } + + retval = isicom_register_tty_driver(); + if (retval < 0) + goto error; + + retval = pci_register_driver(&isicom_driver); if (retval < 0) { - printk(KERN_ERR "ISICOM: Unable to register firmware loader driver.\n"); - return retval; + printk(KERN_ERR "ISICOM: Unable to register pci driver.\n"); + goto errtty; } - if (!isicom_init()) { - if (misc_deregister(&isiloader_device)) - printk(KERN_ERR "ISICOM: Unable to unregister Firmware Loader driver\n"); - return -EIO; - } + retval = misc_register(&isiloader_device); + if (retval < 0) + goto errpci; init_timer(&tx); tx.expires = jiffies + 1; @@ -2045,6 +2093,12 @@ static int __devinit isicom_setup(void) add_timer(&tx); return 0; +errpci: + pci_unregister_driver(&isicom_driver); +errtty: + isicom_unregister_tty_driver(); +error: + return retval; } static void __exit isicom_exit(void) @@ -2056,13 +2110,13 @@ static void __exit isicom_exit(void) while (re_schedule != 2 && index++ < 100) msleep(10); - unregister_isr(); + pci_unregister_driver(&isicom_driver); isicom_unregister_tty_driver(); - unregister_ioregion(); - if (tmp_buf) - free_page((unsigned long)tmp_buf); - if (misc_deregister(&isiloader_device)) - printk(KERN_ERR "ISICOM: Unable to unregister Firmware Loader driver\n"); + + for (index = 0; index < BOARD_COUNT; index++) { + isicom_unregister_isr(&isi_card[index]); + isicom_unregister_ioregion(&isi_card[index], index); + } } module_init(isicom_setup); ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 5/6] isicom: Firmware loading 2005-09-14 0:10 ` [PATCH 0/6] isicom char driver rewritten to 2.6 api Jiri Slaby ` (3 preceding siblings ...) 2005-09-14 0:13 ` [PATCH 4/6] isicom: Pci probing added Jiri Slaby @ 2005-09-14 0:13 ` Jiri Slaby 2005-09-14 0:13 ` [PATCH 6/6] isicom: More whitespaces and coding style Jiri Slaby 5 siblings, 0 replies; 22+ messages in thread From: Jiri Slaby @ 2005-09-14 0:13 UTC (permalink / raw) To: Andrew Morton; +Cc: Linux Kernel Mailing List, linux-pci, Greg KH Generated in 2.6.13-mm3 kernel version Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> Firmware loading Firmware loading via hotplug added. Cleanup firmware old-method fields in header file. --- drivers/char/isicom.c | 409 ++++++++++++++++++++---------------------------- include/linux/isicom.h | 35 ---- 2 files changed, 171 insertions(+), 273 deletions(-) diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c @@ -112,6 +112,7 @@ */ #include <linux/module.h> +#include <linux/firmware.h> #include <linux/kernel.h> #include <linux/tty.h> #include <linux/tty_flip.h> @@ -120,7 +121,6 @@ #include <linux/sched.h> #include <linux/serial.h> #include <linux/mm.h> -#include <linux/miscdevice.h> #include <linux/interrupt.h> #include <linux/timer.h> #include <linux/delay.h> @@ -175,8 +175,6 @@ static struct tty_driver *isicom_normal; static struct timer_list tx; static char re_schedule = 1; -static int ISILoad_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); - static void isicom_tx(unsigned long _data); static void isicom_start(struct tty_struct *tty); @@ -385,233 +383,6 @@ static inline void kill_queue(struct isi unlock_card(card); } - -/* - * Firmware loader driver specific routines. This needs to mostly die - * and be replaced with request_firmware. - */ - -static struct file_operations ISILoad_fops = { - .owner = THIS_MODULE, - .ioctl = ISILoad_ioctl, -}; - -static struct miscdevice isiloader_device = { - ISILOAD_MISC_MINOR, "isictl", &ISILoad_fops -}; - - -static inline int WaitTillCardIsFree(u16 base) -{ - unsigned long count=0; - while( (!(inw(base+0xe) & 0x1)) && (count++ < 6000000)); - if (inw(base+0xe)&0x1) - return 0; - else - return 1; -} - -static int ISILoad_ioctl(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg) -{ - unsigned int card, i, j, signature, status, portcount = 0; - unsigned long t; - u16 word_count, base; - bin_frame frame; - void __user *argp = (void __user *)arg; - /* exec_record exec_rec; */ - - if (get_user(card, (int __user *)argp)) - return -EFAULT; - - if (card < 0 || card >= BOARD_COUNT) - return -ENXIO; - - base=isi_card[card].base; - - if (base==0) - return -ENXIO; /* disabled or not used */ - - switch(cmd) { - case MIOCTL_RESET_CARD: - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; - printk(KERN_DEBUG "ISILoad:Resetting Card%d at 0x%x ",card+1,base); - - inw(base+0x8); - - for (t=jiffies+HZ/100;time_before(jiffies, t);); - - outw(0,base+0x8); /* Reset */ - - for (j=1;j<=3;j++) { - for (t=jiffies+HZ;time_before(jiffies, t);); - printk("."); - } - signature=(inw(base+0x4)) & 0xff; - if (isi_card[card].isa) { - - if (!(inw(base+0xe) & 0x1) || (inw(base+0x2))) { -#ifdef ISICOM_DEBUG - printk("\nbase+0x2=0x%x , base+0xe=0x%x",inw(base+0x2),inw(base+0xe)); -#endif - printk("\nISILoad:ISA Card%d reset failure (Possible bad I/O Port Address 0x%x).\n",card+1,base); - return -EIO; - } - } - else { - portcount = inw(base+0x2); - if (!(inw(base+0xe) & 0x1) || ((portcount!=0) && (portcount!=4) && (portcount!=8))) { -#ifdef ISICOM_DEBUG - printk("\nbase+0x2=0x%x , base+0xe=0x%x",inw(base+0x2),inw(base+0xe)); -#endif - printk("\nISILoad:PCI Card%d reset failure (Possible bad I/O Port Address 0x%x).\n",card+1,base); - return -EIO; - } - } - switch(signature) { - case 0xa5: - case 0xbb: - case 0xdd: - if (isi_card[card].isa) - isi_card[card].port_count = 8; - else { - if (portcount == 4) - isi_card[card].port_count = 4; - else - isi_card[card].port_count = 8; - } - isi_card[card].shift_count = 12; - break; - - case 0xcc: isi_card[card].port_count = 16; - isi_card[card].shift_count = 11; - break; - - default: printk("ISILoad:Card%d reset failure (Possible bad I/O Port Address 0x%x).\n",card+1,base); -#ifdef ISICOM_DEBUG - printk("Sig=0x%x\n",signature); -#endif - return -EIO; - } - printk("-Done\n"); - return put_user(signature,(unsigned __user *)argp); - - case MIOCTL_LOAD_FIRMWARE: - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; - - if (copy_from_user(&frame, argp, sizeof(bin_frame))) - return -EFAULT; - - if (WaitTillCardIsFree(base)) - return -EIO; - - outw(0xf0,base); /* start upload sequence */ - outw(0x00,base); - outw((frame.addr), base); /* lsb of adderess */ - - word_count=(frame.count >> 1) + frame.count % 2; - outw(word_count, base); - InterruptTheCard(base); - - for (i=0;i<=0x2f;i++); /* a wee bit of delay */ - - if (WaitTillCardIsFree(base)) - return -EIO; - - if ((status=inw(base+0x4))!=0) { - printk(KERN_WARNING "ISILoad:Card%d rejected load header:\nAddress:0x%x \nCount:0x%x \nStatus:0x%x \n", - card+1, frame.addr, frame.count, status); - return -EIO; - } - outsw(base, (void *) frame.bin_data, word_count); - - InterruptTheCard(base); - - for (i=0;i<=0x0f;i++); /* another wee bit of delay */ - - if (WaitTillCardIsFree(base)) - return -EIO; - - if ((status=inw(base+0x4))!=0) { - printk(KERN_ERR "ISILoad:Card%d got out of sync.Card Status:0x%x\n",card+1, status); - return -EIO; - } - return 0; - - case MIOCTL_READ_FIRMWARE: - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; - - if (copy_from_user(&frame, argp, sizeof(bin_header))) - return -EFAULT; - - if (WaitTillCardIsFree(base)) - return -EIO; - - outw(0xf1,base); /* start download sequence */ - outw(0x00,base); - outw((frame.addr), base); /* lsb of adderess */ - - word_count=(frame.count >> 1) + frame.count % 2; - outw(word_count+1, base); - InterruptTheCard(base); - - for (i=0;i<=0xf;i++); /* a wee bit of delay */ - - if (WaitTillCardIsFree(base)) - return -EIO; - - if ((status=inw(base+0x4))!=0) { - printk(KERN_WARNING "ISILoad:Card%d rejected verify header:\nAddress:0x%x \nCount:0x%x \nStatus:0x%x \n", - card+1, frame.addr, frame.count, status); - return -EIO; - } - - inw(base); - insw(base, frame.bin_data, word_count); - InterruptTheCard(base); - - for (i=0;i<=0x0f;i++); /* another wee bit of delay */ - - if (WaitTillCardIsFree(base)) - return -EIO; - - if ((status=inw(base+0x4))!=0) { - printk(KERN_ERR "ISILoad:Card%d verify got out of sync.Card Status:0x%x\n",card+1, status); - return -EIO; - } - - if (copy_to_user(argp, &frame, sizeof(bin_frame))) - return -EFAULT; - return 0; - - case MIOCTL_XFER_CTRL: - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; - if (WaitTillCardIsFree(base)) - return -EIO; - - outw(0xf2, base); - outw(0x800, base); - outw(0x0, base); - outw(0x0, base); - InterruptTheCard(base); - outw(0x0, base+0x4); /* for ISI4608 cards */ - - isi_card[card].status |= FIRMWARE_LOADED; - return 0; - - default: -#ifdef ISICOM_DEBUG - printk(KERN_DEBUG "ISILoad: Received Ioctl cmd 0x%x.\n", cmd); -#endif - return -ENOIOCTLCMD; - } -} - - /* * ISICOM Driver specific routines ... * @@ -1944,6 +1715,174 @@ end: return retval; } +static inline int WaitTillCardIsFree(u16 base) +{ + unsigned long count=0; + while( (!(inw(base+0xe) & 0x1)) && (count++ < 6000000)); + if (inw(base+0xe)&0x1) + return 0; + else + return 1; +} + +static int __devinit load_firmware(struct isi_board *board, + const unsigned int index, const unsigned int signature) +{ + int retval = -EIO; + unsigned int a; + char *name; + u8 *data; + u16 word_count, status, base = board->base; + const struct firmware *fw; + struct stframe { + u16 addr; + u16 count; + u8 data[0]; + } *frame; + + switch (signature) { + case 0xa5: + name = "isi608.bin"; + break; + case 0xbb: + name = "isi608em.bin"; + break; + case 0xcc: + name = "isi616em.bin"; + break; + case 0xdd: + name = "isi4608.bin"; + break; + case 0xee: + name = "isi4616.bin"; + break; + default: + printk(KERN_ERR "Unknown signature.\n"); + goto end; + } + + retval = request_firmware(&fw, name, &board->device); + if (retval) + goto end; + + for (frame = (struct stframe*)fw->data; + frame < (struct stframe*)(fw->data + fw->size); + frame++) { + if (WaitTillCardIsFree(base)) + goto errrelfw; + + outw(0xf0, base); /* start upload sequence */ + outw(0x00, base); + outw(frame->addr, base); /* lsb of address */ + + word_count = frame->count / 2 + frame->count % 2; + outw(word_count, base); + InterruptTheCard(base); + + udelay(100); /* 0x2f */ + + if (WaitTillCardIsFree(base)) + goto errrelfw; + + if ((status = inw(base + 0x4)) != 0) { + printk(KERN_WARNING "ISILoad:Card%d rejected load " + "header:\nAddress:0x%x \nCount:0x%x \n" + "Status:0x%x \n", index + 1, frame->addr, + frame->count, status); + goto errrelfw; + } + outsw(base, frame->data, word_count); + + InterruptTheCard(base); + + udelay(50); /* 0x0f */ + + if (WaitTillCardIsFree(base)) + goto errrelfw; + + if ((status = inw(base + 0x4)) != 0) { + printk(KERN_ERR "ISILoad:Card%d got out of sync.Card " + "Status:0x%x\n", index + 1, status); + goto errrelfw; + } + } + + retval = -EIO; + + if (WaitTillCardIsFree(base)) + goto errrelfw; + + outw(0xf2, base); + outw(0x800, base); + outw(0x0, base); + outw(0x0, base); + InterruptTheCard(base); + outw(0x0, base + 0x4); /* for ISI4608 cards */ + +/* XXX: should we test it by reading it back and comparing with original like + * in load firmware package? */ + for (frame = (struct stframe*)fw->data; + frame < (struct stframe*)(fw->data + fw->size); + frame++) { + if (WaitTillCardIsFree(base)) + goto errrelfw; + + outw(0xf1, base); /* start download sequence */ + outw(0x00, base); + outw(frame->addr, base); /* lsb of address */ + + word_count = (frame->count >> 1) + frame->count % 2; + outw(word_count + 1, base); + InterruptTheCard(base); + + udelay(50); /* 0xf */ + + if (WaitTillCardIsFree(base)) + goto errrelfw; + + if ((status = inw(base + 0x4)) != 0) { + printk(KERN_WARNING "ISILoad:Card%d rejected verify " + "header:\nAddress:0x%x \nCount:0x%x\nStatus: " + "0x%x \n", index + 1, frame->addr, frame->count, + status); + goto errrelfw; + } + + data = kmalloc(word_count * 2, GFP_KERNEL); + inw(base); + insw(base, data, word_count); + InterruptTheCard(base); + + for (a = 0; a < frame->count; a++) + if (data[a] != frame->data[a]) { + kfree(data); + printk(KERN_ERR "ISILoad:Card%d, firmware " + "upload failed\n", index + 1); + goto errrelfw; + } + kfree(data); + + udelay(50); /* 0xf */ + + if (WaitTillCardIsFree(base)) + goto errrelfw; + + if ((status = inw(base + 0x4)) != 0) { + printk(KERN_ERR "ISILoad:Card%d verify got out of " + "sync. Card Status:0x%x\n", index + 1, status); + goto errrelfw; + } + } + + board->status |= FIRMWARE_LOADED; + retval = 0; + +errrelfw: + release_firmware(fw); +end: + return retval; +} + /* * Insmod can set static symbols so keep these static */ @@ -1992,9 +1931,9 @@ static int __devinit isicom_probe(struct if (retval < 0) goto errunri; -/* retval = load_firmware(board, index, signature); + retval = load_firmware(board, index, signature); if (retval < 0) - goto errunri; */ + goto errunri; return 0; @@ -2081,10 +2020,6 @@ static int __devinit isicom_setup(void) goto errtty; } - retval = misc_register(&isiloader_device); - if (retval < 0) - goto errpci; - init_timer(&tx); tx.expires = jiffies + 1; tx.data = 0; @@ -2093,8 +2028,6 @@ static int __devinit isicom_setup(void) add_timer(&tx); return 0; -errpci: - pci_unregister_driver(&isicom_driver); errtty: isicom_unregister_tty_driver(); error: diff --git a/include/linux/isicom.h b/include/linux/isicom.h --- a/include/linux/isicom.h +++ b/include/linux/isicom.h @@ -4,46 +4,11 @@ /*#define ISICOM_DEBUG*/ /*#define ISICOM_DEBUG_DTR_RTS*/ - -/* - * Firmware Loader definitions ... - */ - -#define __MultiTech ('M'<<8) -#define MIOCTL_LOAD_FIRMWARE (__MultiTech | 0x01) -#define MIOCTL_READ_FIRMWARE (__MultiTech | 0x02) -#define MIOCTL_XFER_CTRL (__MultiTech | 0x03) -#define MIOCTL_RESET_CARD (__MultiTech | 0x04) - -#define DATA_SIZE 16 - -typedef struct { - unsigned short exec_segment; - unsigned short exec_addr; -} exec_record; - -typedef struct { - int board; /* Board to load */ - unsigned short addr; - unsigned short count; -} bin_header; - -typedef struct { - int board; /* Board to load */ - unsigned short addr; - unsigned short count; - unsigned short segment; - unsigned char bin_data[DATA_SIZE]; -} bin_frame; - #ifdef __KERNEL__ #define YES 1 #define NO 0 -#define ISILOAD_MISC_MINOR 155 /* /dev/isctl */ -#define ISILOAD_NAME "ISILoad" - /* * ISICOM Driver definitions ... * ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 6/6] isicom: More whitespaces and coding style 2005-09-14 0:10 ` [PATCH 0/6] isicom char driver rewritten to 2.6 api Jiri Slaby ` (4 preceding siblings ...) 2005-09-14 0:13 ` [PATCH 5/6] isicom: Firmware loading Jiri Slaby @ 2005-09-14 0:13 ` Jiri Slaby 5 siblings, 0 replies; 22+ messages in thread From: Jiri Slaby @ 2005-09-14 0:13 UTC (permalink / raw) To: Andrew Morton; +Cc: Linux Kernel Mailing List, linux-pci, Greg KH Generated in 2.6.13-mm3 kernel version Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> More whitespaces and coding style Wrap all code to 80 chars on line. Some }\nelse changed to } else. Clean whitespaces in header file. --- drivers/char/isicom.c | 148 +++++++++++++++++++++++------------------------- include/linux/isicom.h | 21 +++---- 2 files changed, 82 insertions(+), 87 deletions(-) diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c @@ -467,33 +467,36 @@ static void isicom_tx(unsigned long _dat residue = NO; wrd = 0; while (1) { - cnt = min_t(int, txcount, (SERIAL_XMIT_SIZE - port->xmit_tail)); + cnt = min_t(int, txcount, (SERIAL_XMIT_SIZE + - port->xmit_tail)); if (residue == YES) { residue = NO; if (cnt > 0) { - wrd |= (port->xmit_buf[port->xmit_tail] << 8); - port->xmit_tail = (port->xmit_tail + 1) & (SERIAL_XMIT_SIZE - 1); + wrd |= (port->xmit_buf[port->xmit_tail] + << 8); + port->xmit_tail = (port->xmit_tail + 1) + & (SERIAL_XMIT_SIZE - 1); port->xmit_cnt--; txcount--; cnt--; outw(wrd, base); - } - else { + } else { outw(wrd, base); break; } } if (cnt <= 0) break; word_count = cnt >> 1; - outsw(base, port->xmit_buf+port->xmit_tail, word_count); - port->xmit_tail = (port->xmit_tail + (word_count << 1)) & - (SERIAL_XMIT_SIZE - 1); + outsw(base, port->xmit_buf+port->xmit_tail,word_count); + port->xmit_tail = (port->xmit_tail + + (word_count << 1)) & (SERIAL_XMIT_SIZE - 1); txcount -= (word_count << 1); port->xmit_cnt -= (word_count << 1); if (cnt & 0x0001) { residue = YES; wrd = port->xmit_buf[port->xmit_tail]; - port->xmit_tail = (port->xmit_tail + 1) & (SERIAL_XMIT_SIZE - 1); + port->xmit_tail = (port->xmit_tail + 1) + & (SERIAL_XMIT_SIZE - 1); port->xmit_cnt--; txcount--; } @@ -612,30 +615,24 @@ static irqreturn_t isicom_interrupt(int 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 - printk(KERN_DEBUG "ISICOM: interrupt: DCD->low.\n"); -#endif + pr_deb(KERN_DEBUG "ISICOM: " + "interrupt: " + "DCD->low.\n"); port->status &= ~ISI_DCD; schedule_work(&port->hangup_tq); } - } - else { - if (header & ISI_DCD) { + } else if (header & ISI_DCD) { /* Carrier has been detected */ -#ifdef ISICOM_DEBUG - printk(KERN_DEBUG "ISICOM: interrupt: DCD->high.\n"); -#endif - port->status |= ISI_DCD; - wake_up_interruptible(&port->open_wait); - } + printk(KERN_DEBUG "ISICOM: interrupt: " + "DCD->high.\n"); + port->status |= ISI_DCD; + wake_up_interruptible(&port->open_wait); } - } - else { + } else { if (header & ISI_DCD) port->status |= ISI_DCD; else @@ -647,19 +644,16 @@ static irqreturn_t isicom_interrupt(int if (header & ISI_CTS) { port->tty->hw_stopped = 0; /* start tx ing */ - port->status |= (ISI_TXOK | ISI_CTS); + port->status |= (ISI_TXOK + | ISI_CTS); schedule_work(&port->bh_tqueue); } + } else if (!(header & ISI_CTS)) { + port->tty->hw_stopped = 1; + /* stop tx ing */ + port->status &= ~(ISI_TXOK | ISI_CTS); } - else { - if (!(header & ISI_CTS)) { - port->tty->hw_stopped = 1; - /* stop tx ing */ - port->status &= ~(ISI_TXOK | ISI_CTS); - } - } - } - else { + } else { if (header & ISI_CTS) port->status |= ISI_CTS; else @@ -678,7 +672,7 @@ static irqreturn_t isicom_interrupt(int break; - case 1: /* Received Break !!! */ + case 1: /* Received Break !!! */ tty_insert_flip_char(tty, 0, TTY_BREAK); if (port->flags & ASYNC_SAK) do_SAK(tty); @@ -686,31 +680,31 @@ static irqreturn_t isicom_interrupt(int break; case 2: /* Statistics */ - printk(KERN_DEBUG "ISICOM: isicom_interrupt: stats!!!.\n"); + printk(KERN_DEBUG "ISICOM: isicom_interrupt: " + "stats!!!.\n"); break; default: - printk(KERN_WARNING "ISICOM: Intr: Unknown code in status packet.\n"); + printk(KERN_WARNING "ISICOM: Intr: Unknown code in " + "status packet.\n"); break; } - } - else { /* Data Packet */ - + } 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", - count, byte_count); -#endif + pr_deb(KERN_DEBUG "ISICOM: Intr: Can rx %d of %d bytes.\n", + count, byte_count); word_count = count >> 1; insw(base, rp, word_count); byte_count -= (word_count << 1); if (count & 0x0001) { - tty_insert_flip_char(tty, inw(base) & 0xff, TTY_NORMAL); + tty_insert_flip_char(tty, inw(base) & 0xff, + TTY_NORMAL); byte_count -= 2; } if (byte_count > 0) { - printk(KERN_DEBUG "ISICOM: Intr(0x%x:%d): Flip buffer overflow! dropping bytes...\n", - base, channel+1); + printk(KERN_DEBUG "ISICOM: Intr(0x%x:%d): Flip buffer " + "overflow! dropping bytes...\n", base, + channel + 1); while(byte_count > 0) { /* drain out unread xtra data */ inw(base); byte_count -= 2; @@ -722,6 +716,7 @@ static irqreturn_t isicom_interrupt(int ClearInterrupt(base); else outw(0x0000, base+0x04); /* enable interrupts */ + return IRQ_HANDLED; } @@ -892,7 +887,8 @@ static int isicom_setup_port(struct isi_ return 0; } -static int block_til_ready(struct tty_struct *tty, struct file *filp, struct isi_port *port) +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; @@ -902,9 +898,8 @@ 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 - printk(KERN_DEBUG "ISICOM: block_til_ready: close in progress.\n"); -#endif + pr_deb(KERN_DEBUG "ISICOM: block_til_ready: close in " + "progress.\n"); interruptible_sleep_on(&port->close_wait); if (port->flags & ASYNC_HUP_NOTIFY) return -EAGAIN; @@ -914,10 +909,9 @@ static int block_til_ready(struct tty_st /* if non-blocking mode is set ... */ - if ((filp->f_flags & O_NONBLOCK) || (tty->flags & (1 << TTY_IO_ERROR))) { -#ifdef ISICOM_DEBUG - printk(KERN_DEBUG "ISICOM: block_til_ready: non-block mode.\n"); -#endif + if ((filp->f_flags & O_NONBLOCK) || + (tty->flags & (1 << TTY_IO_ERROR))) { + pr_deb(KERN_DEBUG "ISICOM: block_til_ready: non-block mode.\n"); port->flags |= ASYNC_NORMAL_ACTIVE; return 0; } @@ -1057,12 +1051,12 @@ static void isicom_shutdown_port(struct 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); + 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 */ + /* last port was closed, shutdown that boad too */ if (C_HUPCL(tty)) { if (!card->count) isicom_shutdown_board(card); @@ -1080,9 +1074,7 @@ static void isicom_close(struct tty_stru if (isicom_paranoia_check(port, tty->name, "isicom_close")) return; -#ifdef ISICOM_DEBUG - printk(KERN_DEBUG "ISICOM: Close start!!!.\n"); -#endif + pr_deb(KERN_DEBUG "ISICOM: Close start!!!.\n"); spin_lock_irqsave(&card->card_lock, flags); if (tty_hung_up_p(filp)) { @@ -1091,14 +1083,14 @@ static void isicom_close(struct tty_stru } 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; } @@ -1133,10 +1125,10 @@ 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 - printk(KERN_DEBUG "ISICOM: scheduling until time out.\n"); -#endif - msleep_interruptible(jiffies_to_msecs(port->close_delay)); + printk(KERN_DEBUG "ISICOM: scheduling until time " + "out.\n"); + msleep_interruptible( + jiffies_to_msecs(port->close_delay)); } spin_lock_irqsave(&card->card_lock, flags); wake_up_interruptible(&port->open_wait); @@ -1164,13 +1156,14 @@ static int isicom_write(struct tty_struc 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)); + 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; @@ -1215,7 +1208,8 @@ static void isicom_flush_chars(struct tt 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 @@ -1248,7 +1242,8 @@ 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; @@ -1383,7 +1378,8 @@ static int isicom_ioctl(struct tty_struc return 0; case TIOCGSOFTCAR: - return put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned long __user *)argp); + return put_user(C_CLOCAL(tty) ? 1 : 0, + (unsigned long __user *)argp); case TIOCSSOFTCAR: if (get_user(arg, (unsigned long __user *) argp)) diff --git a/include/linux/isicom.h b/include/linux/isicom.h --- a/include/linux/isicom.h +++ b/include/linux/isicom.h @@ -9,7 +9,7 @@ #define YES 1 #define NO 0 -/* +/* * ISICOM Driver definitions ... * */ @@ -20,8 +20,8 @@ * PCI definitions */ - #define DEVID_COUNT 9 - #define VENDOR_ID 0x10b5 +#define DEVID_COUNT 9 +#define VENDOR_ID 0x10b5 /* * These are now officially allocated numbers @@ -31,9 +31,9 @@ #define ISICOM_CMAJOR 113 /* callout */ #define ISICOM_MAGIC (('M' << 8) | 'T') -#define WAKEUP_CHARS 256 /* hard coded for now */ -#define TX_SIZE 254 - +#define WAKEUP_CHARS 256 /* hard coded for now */ +#define TX_SIZE 254 + #define BOARD_COUNT 4 #define PORT_COUNT (BOARD_COUNT*16) @@ -66,12 +66,12 @@ #define BOARD(line) (((line) >> 4) & 0x3) /* isi kill queue bitmap */ - + #define ISICOM_KILLTX 0x01 #define ISICOM_KILLRX 0x02 /* isi_board status bitmap */ - + #define FIRMWARE_LOADED 0x0001 #define BOARD_ACTIVE 0x0002 @@ -85,9 +85,8 @@ #define ISI_RTS 0x0200 -#define ISI_TXOK 0x0001 - +#define ISI_TXOK 0x0001 + #endif /* __KERNEL__ */ #endif /* ISICOM_H */ - ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 4/5] isicom: firmware 2005-09-13 16:49 ` [PATCH 0/5] isicom char driver to 2.6 api Jiri Slaby 2005-09-13 16:52 ` [PATCH 2/5] isicom: types Jiri Slaby 2005-09-13 16:52 ` [PATCH 3/5] isicom: pci probing Jiri Slaby @ 2005-09-13 16:52 ` Jiri Slaby 2005-09-13 16:52 ` [PATCH 1/5] isicom: whitespace Jiri Slaby 2005-09-13 16:52 ` [PATCH 5/5] isicom: more whitespace Jiri Slaby 4 siblings, 0 replies; 22+ messages in thread From: Jiri Slaby @ 2005-09-13 16:52 UTC (permalink / raw) To: akpm; +Cc: Linux Kernel Mailing List, linux-pci, Greg KH Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> drivers/char/isicom.c | 409 ++++++++++++++++++++----------------------------- include/linux/isicom.h | 35 ---- 2 files changed, 171 insertions(+), 273 deletions(-) diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c @@ -114,6 +114,7 @@ */ #include <linux/module.h> +#include <linux/firmware.h> #include <linux/kernel.h> #include <linux/tty.h> #include <linux/tty_flip.h> @@ -122,7 +123,6 @@ #include <linux/sched.h> #include <linux/serial.h> #include <linux/mm.h> -#include <linux/miscdevice.h> #include <linux/interrupt.h> #include <linux/timer.h> #include <linux/delay.h> @@ -177,8 +177,6 @@ static struct tty_driver *isicom_normal; static struct timer_list tx; static char re_schedule = 1; -static int ISILoad_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); - static void isicom_tx(unsigned long _data); static void isicom_start(struct tty_struct *tty); @@ -387,233 +385,6 @@ static inline void kill_queue(struct isi unlock_card(card); } - -/* - * Firmware loader driver specific routines. This needs to mostly die - * and be replaced with request_firmware. - */ - -static struct file_operations ISILoad_fops = { - .owner = THIS_MODULE, - .ioctl = ISILoad_ioctl, -}; - -static struct miscdevice isiloader_device = { - ISILOAD_MISC_MINOR, "isictl", &ISILoad_fops -}; - - -static inline int WaitTillCardIsFree(u16 base) -{ - unsigned long count=0; - while( (!(inw(base+0xe) & 0x1)) && (count++ < 6000000)); - if (inw(base+0xe)&0x1) - return 0; - else - return 1; -} - -static int ISILoad_ioctl(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg) -{ - unsigned int card, i, j, signature, status, portcount = 0; - unsigned long t; - u16 word_count, base; - bin_frame frame; - void __user *argp = (void __user *)arg; - /* exec_record exec_rec; */ - - if (get_user(card, (int __user *)argp)) - return -EFAULT; - - if (card < 0 || card >= BOARD_COUNT) - return -ENXIO; - - base=isi_card[card].base; - - if (base==0) - return -ENXIO; /* disabled or not used */ - - switch(cmd) { - case MIOCTL_RESET_CARD: - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; - printk(KERN_DEBUG "ISILoad:Resetting Card%d at 0x%x ",card+1,base); - - inw(base+0x8); - - for (t=jiffies+HZ/100;time_before(jiffies, t);); - - outw(0,base+0x8); /* Reset */ - - for (j=1;j<=3;j++) { - for (t=jiffies+HZ;time_before(jiffies, t);); - printk("."); - } - signature=(inw(base+0x4)) & 0xff; - if (isi_card[card].isa) { - - if (!(inw(base+0xe) & 0x1) || (inw(base+0x2))) { -#ifdef ISICOM_DEBUG - printk("\nbase+0x2=0x%x , base+0xe=0x%x",inw(base+0x2),inw(base+0xe)); -#endif - printk("\nISILoad:ISA Card%d reset failure (Possible bad I/O Port Address 0x%x).\n",card+1,base); - return -EIO; - } - } - else { - portcount = inw(base+0x2); - if (!(inw(base+0xe) & 0x1) || ((portcount!=0) && (portcount!=4) && (portcount!=8))) { -#ifdef ISICOM_DEBUG - printk("\nbase+0x2=0x%x , base+0xe=0x%x",inw(base+0x2),inw(base+0xe)); -#endif - printk("\nISILoad:PCI Card%d reset failure (Possible bad I/O Port Address 0x%x).\n",card+1,base); - return -EIO; - } - } - switch(signature) { - case 0xa5: - case 0xbb: - case 0xdd: - if (isi_card[card].isa) - isi_card[card].port_count = 8; - else { - if (portcount == 4) - isi_card[card].port_count = 4; - else - isi_card[card].port_count = 8; - } - isi_card[card].shift_count = 12; - break; - - case 0xcc: isi_card[card].port_count = 16; - isi_card[card].shift_count = 11; - break; - - default: printk("ISILoad:Card%d reset failure (Possible bad I/O Port Address 0x%x).\n",card+1,base); -#ifdef ISICOM_DEBUG - printk("Sig=0x%x\n",signature); -#endif - return -EIO; - } - printk("-Done\n"); - return put_user(signature,(unsigned __user *)argp); - - case MIOCTL_LOAD_FIRMWARE: - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; - - if (copy_from_user(&frame, argp, sizeof(bin_frame))) - return -EFAULT; - - if (WaitTillCardIsFree(base)) - return -EIO; - - outw(0xf0,base); /* start upload sequence */ - outw(0x00,base); - outw((frame.addr), base); /* lsb of adderess */ - - word_count=(frame.count >> 1) + frame.count % 2; - outw(word_count, base); - InterruptTheCard(base); - - for (i=0;i<=0x2f;i++); /* a wee bit of delay */ - - if (WaitTillCardIsFree(base)) - return -EIO; - - if ((status=inw(base+0x4))!=0) { - printk(KERN_WARNING "ISILoad:Card%d rejected load header:\nAddress:0x%x \nCount:0x%x \nStatus:0x%x \n", - card+1, frame.addr, frame.count, status); - return -EIO; - } - outsw(base, (void *) frame.bin_data, word_count); - - InterruptTheCard(base); - - for (i=0;i<=0x0f;i++); /* another wee bit of delay */ - - if (WaitTillCardIsFree(base)) - return -EIO; - - if ((status=inw(base+0x4))!=0) { - printk(KERN_ERR "ISILoad:Card%d got out of sync.Card Status:0x%x\n",card+1, status); - return -EIO; - } - return 0; - - case MIOCTL_READ_FIRMWARE: - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; - - if (copy_from_user(&frame, argp, sizeof(bin_header))) - return -EFAULT; - - if (WaitTillCardIsFree(base)) - return -EIO; - - outw(0xf1,base); /* start download sequence */ - outw(0x00,base); - outw((frame.addr), base); /* lsb of adderess */ - - word_count=(frame.count >> 1) + frame.count % 2; - outw(word_count+1, base); - InterruptTheCard(base); - - for (i=0;i<=0xf;i++); /* a wee bit of delay */ - - if (WaitTillCardIsFree(base)) - return -EIO; - - if ((status=inw(base+0x4))!=0) { - printk(KERN_WARNING "ISILoad:Card%d rejected verify header:\nAddress:0x%x \nCount:0x%x \nStatus:0x%x \n", - card+1, frame.addr, frame.count, status); - return -EIO; - } - - inw(base); - insw(base, frame.bin_data, word_count); - InterruptTheCard(base); - - for (i=0;i<=0x0f;i++); /* another wee bit of delay */ - - if (WaitTillCardIsFree(base)) - return -EIO; - - if ((status=inw(base+0x4))!=0) { - printk(KERN_ERR "ISILoad:Card%d verify got out of sync.Card Status:0x%x\n",card+1, status); - return -EIO; - } - - if (copy_to_user(argp, &frame, sizeof(bin_frame))) - return -EFAULT; - return 0; - - case MIOCTL_XFER_CTRL: - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; - if (WaitTillCardIsFree(base)) - return -EIO; - - outw(0xf2, base); - outw(0x800, base); - outw(0x0, base); - outw(0x0, base); - InterruptTheCard(base); - outw(0x0, base+0x4); /* for ISI4608 cards */ - - isi_card[card].status |= FIRMWARE_LOADED; - return 0; - - default: -#ifdef ISICOM_DEBUG - printk(KERN_DEBUG "ISILoad: Received Ioctl cmd 0x%x.\n", cmd); -#endif - return -ENOIOCTLCMD; - } -} - - /* * ISICOM Driver specific routines ... * @@ -1946,6 +1717,174 @@ end: return retval; } +static inline int WaitTillCardIsFree(u16 base) +{ + unsigned long count=0; + while( (!(inw(base+0xe) & 0x1)) && (count++ < 6000000)); + if (inw(base+0xe)&0x1) + return 0; + else + return 1; +} + +static int __devinit load_firmware(struct isi_board *board, + const unsigned int index, const unsigned int signature) +{ + int retval = -EIO; + unsigned int a; + char *name; + u8 *data; + u16 word_count, status, base = board->base; + const struct firmware *fw; + struct stframe { + u16 addr; + u16 count; + u8 data[0]; + } *frame; + + switch (signature) { + case 0xa5: + name = "isi608.bin"; + break; + case 0xbb: + name = "isi608em.bin"; + break; + case 0xcc: + name = "isi616em.bin"; + break; + case 0xdd: + name = "isi4608.bin"; + break; + case 0xee: + name = "isi4616.bin"; + break; + default: + printk(KERN_ERR "Unknown signature.\n"); + goto end; + } + + retval = request_firmware(&fw, name, &board->device); + if (retval) + goto end; + + for (frame = (struct stframe*)fw->data; + frame < (struct stframe*)(fw->data + fw->size); + frame++) { + if (WaitTillCardIsFree(base)) + goto errrelfw; + + outw(0xf0, base); /* start upload sequence */ + outw(0x00, base); + outw(frame->addr, base); /* lsb of address */ + + word_count = frame->count / 2 + frame->count % 2; + outw(word_count, base); + InterruptTheCard(base); + + udelay(100); /* 0x2f */ + + if (WaitTillCardIsFree(base)) + goto errrelfw; + + if ((status = inw(base + 0x4)) != 0) { + printk(KERN_WARNING "ISILoad:Card%d rejected load " + "header:\nAddress:0x%x \nCount:0x%x \n" + "Status:0x%x \n", index + 1, frame->addr, + frame->count, status); + goto errrelfw; + } + outsw(base, frame->data, word_count); + + InterruptTheCard(base); + + udelay(50); /* 0x0f */ + + if (WaitTillCardIsFree(base)) + goto errrelfw; + + if ((status = inw(base + 0x4)) != 0) { + printk(KERN_ERR "ISILoad:Card%d got out of sync.Card " + "Status:0x%x\n", index + 1, status); + goto errrelfw; + } + } + + retval = -EIO; + + if (WaitTillCardIsFree(base)) + goto errrelfw; + + outw(0xf2, base); + outw(0x800, base); + outw(0x0, base); + outw(0x0, base); + InterruptTheCard(base); + outw(0x0, base + 0x4); /* for ISI4608 cards */ + +/* XXX: should we test it by reading it back and comparing with original like + * in load firmware package? */ + for (frame = (struct stframe*)fw->data; + frame < (struct stframe*)(fw->data + fw->size); + frame++) { + if (WaitTillCardIsFree(base)) + goto errrelfw; + + outw(0xf1, base); /* start download sequence */ + outw(0x00, base); + outw(frame->addr, base); /* lsb of address */ + + word_count = (frame->count >> 1) + frame->count % 2; + outw(word_count + 1, base); + InterruptTheCard(base); + + udelay(50); /* 0xf */ + + if (WaitTillCardIsFree(base)) + goto errrelfw; + + if ((status = inw(base + 0x4)) != 0) { + printk(KERN_WARNING "ISILoad:Card%d rejected verify " + "header:\nAddress:0x%x \nCount:0x%x\nStatus: " + "0x%x \n", index + 1, frame->addr, frame->count, + status); + goto errrelfw; + } + + data = kmalloc(word_count * 2, GFP_KERNEL); + inw(base); + insw(base, data, word_count); + InterruptTheCard(base); + + for (a = 0; a < frame->count; a++) + if (data[a] != frame->data[a]) { + kfree(data); + printk(KERN_ERR "ISILoad:Card%d, firmware " + "upload failed\n", index + 1); + goto errrelfw; + } + kfree(data); + + udelay(50); /* 0xf */ + + if (WaitTillCardIsFree(base)) + goto errrelfw; + + if ((status = inw(base + 0x4)) != 0) { + printk(KERN_ERR "ISILoad:Card%d verify got out of " + "sync. Card Status:0x%x\n", index + 1, status); + goto errrelfw; + } + } + + board->status |= FIRMWARE_LOADED; + retval = 0; + +errrelfw: + release_firmware(fw); +end: + return retval; +} + /* * Insmod can set static symbols so keep these static */ @@ -1994,9 +1933,9 @@ static int __devinit isicom_probe(struct if (retval < 0) goto errunri; -/* retval = load_firmware(board, index, signature); + retval = load_firmware(board, index, signature); if (retval < 0) - goto errunri; */ + goto errunri; return 0; @@ -2083,10 +2022,6 @@ static int __devinit isicom_setup(void) goto errtty; } - retval = misc_register(&isiloader_device); - if (retval < 0) - goto errpci; - init_timer(&tx); tx.expires = jiffies + 1; tx.data = 0; @@ -2095,8 +2030,6 @@ static int __devinit isicom_setup(void) add_timer(&tx); return 0; -errpci: - pci_unregister_driver(&isicom_driver); errtty: isicom_unregister_tty_driver(); error: diff --git a/include/linux/isicom.h b/include/linux/isicom.h --- a/include/linux/isicom.h +++ b/include/linux/isicom.h @@ -4,46 +4,11 @@ /*#define ISICOM_DEBUG*/ /*#define ISICOM_DEBUG_DTR_RTS*/ - -/* - * Firmware Loader definitions ... - */ - -#define __MultiTech ('M'<<8) -#define MIOCTL_LOAD_FIRMWARE (__MultiTech | 0x01) -#define MIOCTL_READ_FIRMWARE (__MultiTech | 0x02) -#define MIOCTL_XFER_CTRL (__MultiTech | 0x03) -#define MIOCTL_RESET_CARD (__MultiTech | 0x04) - -#define DATA_SIZE 16 - -typedef struct { - unsigned short exec_segment; - unsigned short exec_addr; -} exec_record; - -typedef struct { - int board; /* Board to load */ - unsigned short addr; - unsigned short count; -} bin_header; - -typedef struct { - int board; /* Board to load */ - unsigned short addr; - unsigned short count; - unsigned short segment; - unsigned char bin_data[DATA_SIZE]; -} bin_frame; - #ifdef __KERNEL__ #define YES 1 #define NO 0 -#define ISILOAD_MISC_MINOR 155 /* /dev/isctl */ -#define ISILOAD_NAME "ISILoad" - /* * ISICOM Driver definitions ... * ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 1/5] isicom: whitespace 2005-09-13 16:49 ` [PATCH 0/5] isicom char driver to 2.6 api Jiri Slaby ` (2 preceding siblings ...) 2005-09-13 16:52 ` [PATCH 4/5] isicom: firmware Jiri Slaby @ 2005-09-13 16:52 ` Jiri Slaby 2005-09-13 16:52 ` [PATCH 5/5] isicom: more whitespace Jiri Slaby 4 siblings, 0 replies; 22+ messages in thread From: Jiri Slaby @ 2005-09-13 16:52 UTC (permalink / raw) To: akpm; +Cc: Linux Kernel Mailing List, linux-pci, Greg KH Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> isicom.c | 1303 +++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 651 insertions(+), 652 deletions(-) diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c @@ -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,28 +31,28 @@ * * 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. * * 08/02/01 anil .s Upgraded the driver for kernel * 2.4.x * - * 11/04/01 Kevin Fixed firmware load problem with + * 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,19 +73,19 @@ * 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 * result * - * 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 + * 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 * Red Hat Distribution * * 06/01/05 Alan Cox Merged the ISI and base kernel strands @@ -93,10 +93,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/ * @@ -161,16 +161,15 @@ static unsigned long tx_count = 0; static int ISILoad_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); static void isicom_tx(unsigned long _data); -static void isicom_start(struct tty_struct * tty); +static void isicom_start(struct tty_struct *tty); -static unsigned char * tmp_buf; +static unsigned char *tmp_buf; static DECLARE_MUTEX(tmp_buf_sem); /* baud index mappings from linux defns to isi */ static signed char 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 { @@ -216,7 +215,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; @@ -225,7 +224,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 */ @@ -244,7 +243,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); } @@ -260,119 +259,119 @@ static void unlock_card(struct isi_board /* * ISI Card specific ops ... */ - -static void raise_dtr(struct isi_port * port) + +static void raise_dtr(struct isi_port *port) { - struct isi_board * card = port->card; + struct isi_board *card = port->card; unsigned short base = card->base; unsigned char channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw(0x0504, base); InterruptTheCard(base); port->status |= ISI_DTR; unlock_card(card); } -static inline void drop_dtr(struct isi_port * port) -{ - struct isi_board * card = port->card; +static inline void drop_dtr(struct isi_port *port) +{ + struct isi_board *card = port->card; unsigned short base = card->base; unsigned char channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw(0x0404, base); - InterruptTheCard(base); + InterruptTheCard(base); port->status &= ~ISI_DTR; unlock_card(card); } -static inline void raise_rts(struct isi_port * port) +static inline void raise_rts(struct isi_port *port) { - struct isi_board * card = port->card; + struct isi_board *card = port->card; unsigned short base = card->base; unsigned char channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw(0x0a04, base); - InterruptTheCard(base); + InterruptTheCard(base); port->status |= ISI_RTS; unlock_card(card); } -static inline void drop_rts(struct isi_port * port) +static inline void drop_rts(struct isi_port *port) { - struct isi_board * card = port->card; + struct isi_board *card = port->card; unsigned short base = card->base; unsigned char channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw(0x0804, base); - InterruptTheCard(base); + InterruptTheCard(base); port->status &= ~ISI_RTS; unlock_card(card); } -static inline void raise_dtr_rts(struct isi_port * port) +static inline void raise_dtr_rts(struct isi_port *port) { - struct isi_board * card = port->card; + struct isi_board *card = port->card; unsigned short base = card->base; unsigned char channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw(0x0f04, base); InterruptTheCard(base); port->status |= (ISI_DTR | ISI_RTS); unlock_card(card); } -static void drop_dtr_rts(struct isi_port * port) +static void drop_dtr_rts(struct isi_port *port) { - struct isi_board * card = port->card; + struct isi_board *card = port->card; unsigned short base = card->base; unsigned char channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw(0x0c04, base); - InterruptTheCard(base); + InterruptTheCard(base); port->status &= ~(ISI_RTS | ISI_DTR); unlock_card(card); } -static inline void kill_queue(struct isi_port * port, short queue) +static inline void kill_queue(struct isi_port *port, short queue) { - struct isi_board * card = port->card; + struct isi_board *card = port->card; unsigned short base = card->base; unsigned char channel = port->channel; if (!lock_card(card)) return; - outw(0x8000 | (channel << card->shift_count) | 0x02 , base); + outw(0x8000 | (channel << card->shift_count) | 0x02, base); outw((queue << 8) | 0x06, base); - InterruptTheCard(base); + InterruptTheCard(base); unlock_card(card); } -/* +/* * Firmware loader driver specific routines. This needs to mostly die * and be replaced with request_firmware. */ @@ -386,19 +385,19 @@ static struct miscdevice isiloader_devic ISILOAD_MISC_MINOR, "isictl", &ISILoad_fops }; - + static inline int WaitTillCardIsFree(unsigned short base) { unsigned long count=0; while( (!(inw(base+0xe) & 0x1)) && (count++ < 6000000)); - if (inw(base+0xe)&0x1) + if (inw(base+0xe)&0x1) return 0; else return 1; } static int ISILoad_ioctl(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg) + unsigned int cmd, unsigned long arg) { unsigned int card, i, j, signature, status, portcount = 0; unsigned long t; @@ -406,213 +405,211 @@ static int ISILoad_ioctl(struct inode *i bin_frame frame; void __user *argp = (void __user *)arg; /* exec_record exec_rec; */ - + if(get_user(card, (int __user *)argp)) return -EFAULT; - + if(card < 0 || card >= BOARD_COUNT) return -ENXIO; - + base=isi_card[card].base; - + if(base==0) return -ENXIO; /* disabled or not used */ - + switch(cmd) { - case MIOCTL_RESET_CARD: - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; - printk(KERN_DEBUG "ISILoad:Resetting Card%d at 0x%x ",card+1,base); - - inw(base+0x8); - - for(t=jiffies+HZ/100;time_before(jiffies, t);); - - outw(0,base+0x8); /* Reset */ - - for(j=1;j<=3;j++) { - for(t=jiffies+HZ;time_before(jiffies, t);); - printk("."); - } - signature=(inw(base+0x4)) & 0xff; - if (isi_card[card].isa) { - - if (!(inw(base+0xe) & 0x1) || (inw(base+0x2))) { -#ifdef ISICOM_DEBUG - printk("\nbase+0x2=0x%x , base+0xe=0x%x",inw(base+0x2),inw(base+0xe)); -#endif - printk("\nISILoad:ISA Card%d reset failure (Possible bad I/O Port Address 0x%x).\n",card+1,base); - return -EIO; - } - } - else { - portcount = inw(base+0x2); - if (!(inw(base+0xe) & 0x1) || ((portcount!=0) && (portcount!=4) && (portcount!=8))) { + case MIOCTL_RESET_CARD: + if (!capable(CAP_SYS_ADMIN)) + return -EPERM; + printk(KERN_DEBUG "ISILoad:Resetting Card%d at 0x%x ",card+1,base); + + inw(base+0x8); + + for(t=jiffies+HZ/100;time_before(jiffies, t);); + + outw(0,base+0x8); /* Reset */ + + for(j=1;j<=3;j++) { + for(t=jiffies+HZ;time_before(jiffies, t);); + printk("."); + } + signature=(inw(base+0x4)) & 0xff; + if (isi_card[card].isa) { + + if (!(inw(base+0xe) & 0x1) || (inw(base+0x2))) { #ifdef ISICOM_DEBUG - printk("\nbase+0x2=0x%x , base+0xe=0x%x",inw(base+0x2),inw(base+0xe)); + printk("\nbase+0x2=0x%x , base+0xe=0x%x",inw(base+0x2),inw(base+0xe)); #endif - printk("\nISILoad:PCI Card%d reset failure (Possible bad I/O Port Address 0x%x).\n",card+1,base); - return -EIO; - } - } - switch(signature) { - case 0xa5: - case 0xbb: - case 0xdd: - if (isi_card[card].isa) - isi_card[card].port_count = 8; - else { - if (portcount == 4) - isi_card[card].port_count = 4; - else - isi_card[card].port_count = 8; - } - isi_card[card].shift_count = 12; - break; - - case 0xcc: isi_card[card].port_count = 16; - isi_card[card].shift_count = 11; - break; - - default: printk("ISILoad:Card%d reset failure (Possible bad I/O Port Address 0x%x).\n",card+1,base); -#ifdef ISICOM_DEBUG - printk("Sig=0x%x\n",signature); -#endif - return -EIO; + printk("\nISILoad:ISA Card%d reset failure (Possible bad I/O Port Address 0x%x).\n",card+1,base); + return -EIO; + } + } + else { + portcount = inw(base+0x2); + if (!(inw(base+0xe) & 0x1) || ((portcount!=0) && (portcount!=4) && (portcount!=8))) { +#ifdef ISICOM_DEBUG + printk("\nbase+0x2=0x%x , base+0xe=0x%x",inw(base+0x2),inw(base+0xe)); +#endif + printk("\nISILoad:PCI Card%d reset failure (Possible bad I/O Port Address 0x%x).\n",card+1,base); + return -EIO; } - printk("-Done\n"); - return put_user(signature,(unsigned __user *)argp); - + } + switch(signature) { + case 0xa5: + case 0xbb: + case 0xdd: + if (isi_card[card].isa) + isi_card[card].port_count = 8; + else { + if (portcount == 4) + isi_card[card].port_count = 4; + else + isi_card[card].port_count = 8; + } + isi_card[card].shift_count = 12; + break; + + case 0xcc: isi_card[card].port_count = 16; + isi_card[card].shift_count = 11; + break; + + default: printk("ISILoad:Card%d reset failure (Possible bad I/O Port Address 0x%x).\n",card+1,base); +#ifdef ISICOM_DEBUG + printk("Sig=0x%x\n",signature); +#endif + return -EIO; + } + printk("-Done\n"); + return put_user(signature,(unsigned __user *)argp); + case MIOCTL_LOAD_FIRMWARE: if (!capable(CAP_SYS_ADMIN)) return -EPERM; - + if(copy_from_user(&frame, argp, sizeof(bin_frame))) return -EFAULT; - + if (WaitTillCardIsFree(base)) return -EIO; - - outw(0xf0,base); /* start upload sequence */ + + outw(0xf0,base); /* start upload sequence */ outw(0x00,base); - outw((frame.addr), base);/* lsb of adderess */ - + outw((frame.addr), base); /* lsb of adderess */ + word_count=(frame.count >> 1) + frame.count % 2; outw(word_count, base); InterruptTheCard(base); - + for(i=0;i<=0x2f;i++); /* a wee bit of delay */ - - if (WaitTillCardIsFree(base)) + + if (WaitTillCardIsFree(base)) return -EIO; - + if ((status=inw(base+0x4))!=0) { - printk(KERN_WARNING "ISILoad:Card%d rejected load header:\nAddress:0x%x \nCount:0x%x \nStatus:0x%x \n", + printk(KERN_WARNING "ISILoad:Card%d rejected load header:\nAddress:0x%x \nCount:0x%x \nStatus:0x%x \n", card+1, frame.addr, frame.count, status); return -EIO; } outsw(base, (void *) frame.bin_data, word_count); - + InterruptTheCard(base); - - for(i=0;i<=0x0f;i++); /* another wee bit of delay */ - - if (WaitTillCardIsFree(base)) + + for(i=0;i<=0x0f;i++); /* another wee bit of delay */ + + if (WaitTillCardIsFree(base)) return -EIO; - + if ((status=inw(base+0x4))!=0) { printk(KERN_ERR "ISILoad:Card%d got out of sync.Card Status:0x%x\n",card+1, status); return -EIO; - } + } return 0; - + case MIOCTL_READ_FIRMWARE: if (!capable(CAP_SYS_ADMIN)) return -EPERM; - + if(copy_from_user(&frame, argp, sizeof(bin_header))) return -EFAULT; - + if (WaitTillCardIsFree(base)) return -EIO; - - outw(0xf1,base); /* start download sequence */ + + outw(0xf1,base); /* start download sequence */ outw(0x00,base); - outw((frame.addr), base);/* lsb of adderess */ - + outw((frame.addr), base); /* lsb of adderess */ + word_count=(frame.count >> 1) + frame.count % 2; outw(word_count+1, base); InterruptTheCard(base); - + for(i=0;i<=0xf;i++); /* a wee bit of delay */ - - if (WaitTillCardIsFree(base)) + + if (WaitTillCardIsFree(base)) return -EIO; - + if ((status=inw(base+0x4))!=0) { - printk(KERN_WARNING "ISILoad:Card%d rejected verify header:\nAddress:0x%x \nCount:0x%x \nStatus:0x%x \n", + printk(KERN_WARNING "ISILoad:Card%d rejected verify header:\nAddress:0x%x \nCount:0x%x \nStatus:0x%x \n", card+1, frame.addr, frame.count, status); return -EIO; } - + inw(base); insw(base, frame.bin_data, word_count); InterruptTheCard(base); - - for(i=0;i<=0x0f;i++); /* another wee bit of delay */ - - if (WaitTillCardIsFree(base)) + + for(i=0;i<=0x0f;i++); /* another wee bit of delay */ + + if (WaitTillCardIsFree(base)) return -EIO; - + if ((status=inw(base+0x4))!=0) { printk(KERN_ERR "ISILoad:Card%d verify got out of sync.Card Status:0x%x\n",card+1, status); return -EIO; - } - + } + if(copy_to_user(argp, &frame, sizeof(bin_frame))) return -EFAULT; return 0; - + case MIOCTL_XFER_CTRL: if (!capable(CAP_SYS_ADMIN)) return -EPERM; - if (WaitTillCardIsFree(base)) + if (WaitTillCardIsFree(base)) return -EIO; - + outw(0xf2, base); outw(0x800, base); outw(0x0, base); outw(0x0, base); InterruptTheCard(base); - outw(0x0, base+0x4); /* for ISI4608 cards */ - + outw(0x0, base+0x4); /* for ISI4608 cards */ + isi_card[card].status |= FIRMWARE_LOADED; - return 0; - + return 0; + default: -#ifdef ISICOM_DEBUG - printk(KERN_DEBUG "ISILoad: Received Ioctl cmd 0x%x.\n", cmd); +#ifdef ISICOM_DEBUG + printk(KERN_DEBUG "ISILoad: Received Ioctl cmd 0x%x.\n", cmd); #endif return -ENOIOCTLCMD; - } - } - + /* * ISICOM Driver specific routines ... * */ - -static inline int isicom_paranoia_check(struct isi_port const * port, char *name, - const char * routine) + +static inline int isicom_paranoia_check(struct isi_port const *port, char *name, + const char *routine) { -#ifdef ISICOM_DEBUG - static const char * badmagic = +#ifdef ISICOM_DEBUG + static const char *badmagic = KERN_WARNING "ISICOM: Warning: bad isicom magic for dev %s in %s.\n"; - static const char * badport = - KERN_WARNING "ISICOM: Warning: NULL isicom port for dev %s in %s.\n"; + static const char *badport = + KERN_WARNING "ISICOM: Warning: NULL isicom port for dev %s in %s.\n"; if (!port) { printk(badport, name, routine); return 1; @@ -620,13 +617,13 @@ static inline int isicom_paranoia_check( if (port->magic != ISICOM_MAGIC) { printk(badmagic, 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. @@ -636,25 +633,25 @@ static void isicom_tx(unsigned long _dat { short count = (BOARD_COUNT-1), card, base; short txcount, wrd, residue, word_count, cnt; - struct isi_port * port; - struct tty_struct * tty; - + 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; @@ -663,18 +660,18 @@ static void isicom_tx(unsigned long _dat continue; /* port not active or tx disabled to force flow control */ if (!(port->flags & ASYNC_INITIALIZED) || - !(port->status & ISI_TXOK)) + !(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]); @@ -682,16 +679,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) { @@ -702,13 +699,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); @@ -731,68 +728,68 @@ static void isicom_tx(unsigned long _dat if (port->xmit_cnt <= WAKEUP_CHARS) schedule_work(&port->bh_tqueue); unlock_card(&isi_card[card]); - } + } - /* schedule another tx for hopefully in about 10ms */ -sched_again: - if (!re_schedule) + /* schedule another tx for hopefully in about 10ms */ +sched_again: + if (!re_schedule) return; init_timer(&tx); tx.expires = jiffies + HZ/100; 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; - + struct isi_port *port = (struct isi_port *) data; + struct tty_struct *tty = port->tty; + 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) { - struct isi_board * card; - struct isi_port * port; - struct tty_struct * tty; + struct isi_board *card; + struct isi_port *port; + struct tty_struct *tty; unsigned short base, header, word_count, count; unsigned char channel; short byte_count; unsigned char *rp; - + card = (struct isi_board *) dev_id; if (!card || !(card->status & FIRMWARE_LOADED)) return IRQ_NONE; - + base = card->base; spin_lock(&card->card_lock); - + if (card->isa == NO) { /* - * disable any interrupts from the PCI card and lower the - * interrupt line + * disable any interrupts from the PCI card and lower the + * interrupt line */ outw(0x8000, base+0x04); ClearInterrupt(base); } - + inw(base); /* get the dummy word out */ header = inw(base); channel = (header & 0x7800) >> card->shift_count; @@ -804,9 +801,9 @@ static irqreturn_t isicom_interrupt(int 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)) { @@ -815,8 +812,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; @@ -833,107 +830,107 @@ 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 - printk(KERN_DEBUG "ISICOM: interrupt: DCD->low.\n"); -#endif - port->status &= ~ISI_DCD; - schedule_work(&port->hangup_tq); - } - } - else { - if (header & ISI_DCD) { - /* Carrier has been detected */ + 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 - printk(KERN_DEBUG "ISICOM: interrupt: DCD->high.\n"); -#endif - port->status |= ISI_DCD; - wake_up_interruptible(&port->open_wait); - } + printk(KERN_DEBUG "ISICOM: interrupt: DCD->low.\n"); +#endif + port->status &= ~ISI_DCD; + schedule_work(&port->hangup_tq); } } else { - if (header & ISI_DCD) + if (header & ISI_DCD) { + /* Carrier has been detected */ +#ifdef ISICOM_DEBUG + printk(KERN_DEBUG "ISICOM: interrupt: DCD->high.\n"); +#endif port->status |= ISI_DCD; - else - port->status &= ~ISI_DCD; - } - - if (port->flags & ASYNC_CTS_FLOW) { - if (port->tty->hw_stopped) { - if (header & ISI_CTS) { - port->tty->hw_stopped = 0; - /* start tx ing */ - port->status |= (ISI_TXOK | ISI_CTS); - schedule_work(&port->bh_tqueue); - } + wake_up_interruptible(&port->open_wait); } - else { - if (!(header & ISI_CTS)) { - port->tty->hw_stopped = 1; - /* stop tx ing */ - port->status &= ~(ISI_TXOK | ISI_CTS); - } + } + } + else { + 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) { + port->tty->hw_stopped = 0; + /* start tx ing */ + port->status |= (ISI_TXOK | ISI_CTS); + schedule_work(&port->bh_tqueue); } } else { - if (header & ISI_CTS) - port->status |= ISI_CTS; - else - port->status &= ~ISI_CTS; + if (!(header & ISI_CTS)) { + port->tty->hw_stopped = 1; + /* stop tx ing */ + port->status &= ~(ISI_TXOK | ISI_CTS); + } } - - if (header & ISI_DSR) - port->status |= ISI_DSR; - else - port->status &= ~ISI_DSR; - - if (header & ISI_RI) - port->status |= ISI_RI; + } + else { + if (header & ISI_CTS) + port->status |= ISI_CTS; else - port->status &= ~ISI_RI; - - break; - - case 1: /* Received Break !!! */ - tty_insert_flip_char(tty, 0, TTY_BREAK); - if (port->flags & ASYNC_SAK) - do_SAK(tty); - tty_flip_buffer_push(tty); - break; - - case 2: /* Statistics */ - printk(KERN_DEBUG "ISICOM: isicom_interrupt: stats!!!.\n"); - break; - - default: - printk(KERN_WARNING "ISICOM: Intr: Unknown code in status packet.\n"); - break; - } + port->status &= ~ISI_CTS; + } + + if (header & ISI_DSR) + port->status |= ISI_DSR; + else + port->status &= ~ISI_DSR; + + if (header & ISI_RI) + port->status |= ISI_RI; + else + port->status &= ~ISI_RI; + + break; + + case 1: /* Received Break !!! */ + tty_insert_flip_char(tty, 0, TTY_BREAK); + if (port->flags & ASYNC_SAK) + do_SAK(tty); + tty_flip_buffer_push(tty); + break; + + case 2: /* Statistics */ + printk(KERN_DEBUG "ISICOM: isicom_interrupt: stats!!!.\n"); + break; + + 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 +#endif word_count = count >> 1; insw(base, rp, word_count); byte_count -= (word_count << 1); if (count & 0x0001) { tty_insert_flip_char(tty, inw(base) & 0xff, TTY_NORMAL); byte_count -= 2; - } + } if (byte_count > 0) { printk(KERN_DEBUG "ISICOM: Intr(0x%x:%d): Flip buffer overflow! dropping bytes...\n", base, channel+1); @@ -947,102 +944,102 @@ 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) +static void isicom_config_port(struct isi_port *port) { - struct isi_board * card = port->card; - struct tty_struct * tty; + struct isi_board *card = port->card; + struct tty_struct *tty; unsigned long baud; unsigned short channel_setup, base = card->base; unsigned short channel = port->channel, shift_count = card->shift_count; unsigned char 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 */ + 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 + drop_dtr(port); + return; + } + else raise_dtr(port); - + if (lock_card(card)) { outw(0x8000 | (channel << shift_count) |0x03, base); outw(linuxb_to_isib[baud] << 8 | 0x03, base); channel_setup = 0; switch(C_CSIZE(tty)) { - case CS5: - channel_setup |= ISICOM_CS5; - break; - case CS6: - channel_setup |= ISICOM_CS6; - break; - case CS7: - channel_setup |= ISICOM_CS7; - break; - case CS8: - channel_setup |= ISICOM_CS8; - break; + case CS5: + channel_setup |= ISICOM_CS5; + break; + case CS6: + channel_setup |= ISICOM_CS6; + break; + case CS7: + channel_setup |= ISICOM_CS7; + break; + case CS8: + 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); @@ -1050,22 +1047,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 */ -static inline void isicom_setup_board(struct isi_board * bp) +/* open et all */ + +static inline void isicom_setup_board(struct isi_board *bp) { int channel; - struct isi_port * port; + 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); @@ -1078,49 +1075,49 @@ static inline void isicom_setup_board(st drop_dtr_rts(port); return; } - -static int isicom_setup_port(struct isi_port * port) + +static int isicom_setup_port(struct isi_port *port) { - struct isi_board * card = port->card; + 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 = (unsigned char *) page; - } + port->xmit_buf = (unsigned char *) 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; + struct isi_board *card = port->card; int do_clocal = 0, retval; unsigned long flags; DECLARE_WAITQUEUE(wait, current); @@ -1128,30 +1125,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); @@ -1161,27 +1158,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))) { + (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); @@ -1195,11 +1192,11 @@ 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) + +static int isicom_open(struct tty_struct *tty, struct file *filp) { - struct isi_port * port; - struct isi_board * card; + struct isi_port *port; + struct isi_board *card; unsigned int line, board; int error; @@ -1208,20 +1205,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; @@ -1230,12 +1227,12 @@ 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) +static inline void isicom_shutdown_board(struct isi_board *bp) { unsigned long flags; @@ -1246,15 +1243,15 @@ static inline void isicom_shutdown_board spin_unlock_irqrestore(&bp->card_lock, flags); } -static void isicom_shutdown_port(struct isi_port * port) +static void isicom_shutdown_port(struct isi_port *port) { - struct isi_board * card = port->card; - struct tty_struct * tty; + struct isi_board *card = port->card; + 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; @@ -1262,32 +1259,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; + card->count = 0; } - + /* last port was closed , shutdown that boad too */ if(C_HUPCL(tty)) { if (!card->count) @@ -1295,27 +1292,27 @@ static void isicom_shutdown_port(struct } } -static void isicom_close(struct tty_struct * tty, struct file * filp) +static void isicom_close(struct tty_struct *tty, struct file *filp) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - struct isi_board * card = port->card; + 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", @@ -1324,31 +1321,31 @@ static void isicom_close(struct tty_stru } if (--port->count < 0) { printk(KERN_WARNING "ISICOM:(0x%x) isicom_close: bad port count for" - "channel%d = %d", card->base, port->channel, + "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); @@ -1359,65 +1356,65 @@ 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); } /* write et all */ -static int isicom_write(struct tty_struct * tty, - const unsigned char * buf, int count) +static int isicom_write(struct tty_struct *tty, const unsigned char *buf, + int count) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - struct isi_board * card = port->card; + struct isi_port *port = (struct isi_port *) tty->driver_data; + struct isi_board *card = port->card; unsigned long flags; int cnt, total = 0; if (isicom_paranoia_check(port, tty->name, "isicom_write")) return 0; - + if (!tty || !port->xmit_buf || !tmp_buf) return 0; - + spin_lock_irqsave(&card->card_lock, flags); - - while(1) { + + while(1) { cnt = min_t(int, count, min(SERIAL_XMIT_SIZE - port->xmit_cnt - 1, - SERIAL_XMIT_SIZE - port->xmit_head)); - if (cnt <= 0) + 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_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 */ -static void isicom_put_char(struct tty_struct * tty, unsigned char ch) +static void isicom_put_char(struct tty_struct *tty, unsigned char ch) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - struct isi_board * card = port->card; + 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; @@ -1426,7 +1423,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++; @@ -1434,30 +1431,30 @@ static void isicom_put_char(struct tty_s } /* flush_chars et all */ -static void isicom_flush_chars(struct tty_struct * tty) +static void isicom_flush_chars(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - + 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) 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 */ -static int isicom_write_room(struct tty_struct * tty) +static int isicom_write_room(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; + struct isi_port *port = (struct isi_port *) tty->driver_data; int free; 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; @@ -1465,23 +1462,23 @@ static int isicom_write_room(struct tty_ } /* chars_in_buffer et all */ -static int isicom_chars_in_buffer(struct tty_struct * tty) +static int isicom_chars_in_buffer(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; + struct isi_port *port = (struct isi_port *) tty->driver_data; if (isicom_paranoia_check(port, tty->name, "isicom_chars_in_buffer")) return 0; return port->xmit_cnt; } /* 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; - unsigned short base = card->base; - + struct isi_board *card = port->card; + unsigned short 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); @@ -1492,13 +1489,13 @@ static inline void isicom_send_break(str static int isicom_tiocmget(struct tty_struct *tty, struct file *file) { - struct isi_port * port = (struct isi_port *) tty->driver_data; + struct isi_port *port = (struct isi_port *) tty->driver_data; /* just send the port status */ unsigned short status = port->status; 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) | @@ -1508,13 +1505,13 @@ static int isicom_tiocmget(struct tty_st } static int isicom_tiocmset(struct tty_struct *tty, struct file *file, - unsigned int set, unsigned int clear) + unsigned int set, unsigned int clear) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - + 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) @@ -1526,46 +1523,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) +static int isicom_set_serial_info(struct isi_port *port, + 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) != - (newinfo.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) != - (port->flags & ~ASYNC_USR_MASK))) + (newinfo.closing_wait != port->closing_wait) || + ((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; @@ -1578,12 +1575,12 @@ 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) +static int isicom_ioctl(struct tty_struct *tty, struct file *filp, + unsigned int cmd, unsigned long arg) { - struct isi_port * port = (struct isi_port *) tty->driver_data; + struct isi_port *port = (struct isi_port *) tty->driver_data; void __user *argp = (void __user *)arg; int retval; @@ -1591,139 +1588,140 @@ static int isicom_ioctl(struct tty_struc return -ENODEV; switch(cmd) { - case TCSBRK: - retval = tty_check_change(tty); - if (retval) - return retval; - tty_wait_until_sent(tty, 0); - if (!arg) - isicom_send_break(port, HZ/4); - return 0; - - 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); - - 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; - - case TIOCGSERIAL: - return isicom_get_serial_info(port, argp); - - case TIOCSSERIAL: - return isicom_set_serial_info(port, argp); - - default: - return -ENOIOCTLCMD; + case TCSBRK: + retval = tty_check_change(tty); + if (retval) + return retval; + tty_wait_until_sent(tty, 0); + if (!arg) + isicom_send_break(port, HZ/4); + return 0; + + 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); + + 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; + + case TIOCGSERIAL: + return isicom_get_serial_info(port, argp); + + case TIOCSSERIAL: + return isicom_set_serial_info(port, argp); + + default: + return -ENOIOCTLCMD; } return 0; } /* set_termios et all */ -static void isicom_set_termios(struct tty_struct * tty, struct termios * old_termios) +static void isicom_set_termios(struct tty_struct *tty, + struct termios *old_termios) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - + 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) + 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 */ -static void isicom_throttle(struct tty_struct * tty) +static void isicom_throttle(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - struct isi_board * card = port->card; - + 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); } /* unthrottle et all */ -static void isicom_unthrottle(struct tty_struct * tty) +static void isicom_unthrottle(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - struct isi_board * card = port->card; - + 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); } /* stop et all */ -static void isicom_stop(struct tty_struct * tty) +static void isicom_stop(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; + struct isi_port *port = (struct isi_port *) tty->driver_data; 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; } /* start et all */ -static void isicom_start(struct tty_struct * tty) +static void isicom_start(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - + 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; } /* hangup et all */ -static void do_isicom_hangup(void * data) +static void do_isicom_hangup(void *data) { - struct isi_port * port = (struct isi_port *) data; - struct tty_struct * tty; - + struct isi_port *port = (struct isi_port *) data; + struct tty_struct *tty; + tty = port->tty; if (tty) tty_hangup(tty); } -static void isicom_hangup(struct tty_struct * tty) +static void isicom_hangup(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - + 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; @@ -1732,19 +1730,19 @@ static void isicom_hangup(struct tty_str } /* flush_buffer et all */ -static void isicom_flush_buffer(struct tty_struct * tty) +static void isicom_flush_buffer(struct tty_struct *tty) { - struct isi_port * port = (struct isi_port *) tty->driver_data; - struct isi_board * card = port->card; + 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); } @@ -1768,12 +1766,12 @@ static int __devinit register_ioregion(v static void unregister_ioregion(void) { int count; - for (count=0; count < BOARD_COUNT; count++ ) + for (count=0; count < BOARD_COUNT; count++ ) if (isi_card[count].base) { release_region(isi_card[count].base,16); -#ifdef ISICOM_DEBUG +#ifdef ISICOM_DEBUG printk(KERN_DEBUG "ISICOM: I/O Region 0x%x-0x%x released for Card%d.\n",isi_card[count].base,isi_card[count].base+15,count+1); -#endif +#endif } } @@ -1814,11 +1812,11 @@ static int __devinit register_drivers(vo isicom_normal->type = TTY_DRIVER_TYPE_SERIAL; isicom_normal->subtype = SERIAL_TYPE_NORMAL; isicom_normal->init_termios = tty_std_termios; - isicom_normal->init_termios.c_cflag = + isicom_normal->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL |CLOCAL; isicom_normal->flags = TTY_DRIVER_REAL_RAW; tty_set_operations(isicom_normal, &isicom_ops); - + if ((error=tty_register_driver(isicom_normal))!=0) { printk(KERN_DEBUG "ISICOM: Couldn't register the dialin driver, error=%d\n", error); @@ -1843,13 +1841,13 @@ static int __devinit register_isr(void) for (count=0; count < BOARD_COUNT; count++ ) { if (isi_card[count].base) { - irqflags = (isi_card[count].isa == YES) ? - SA_INTERRUPT : + irqflags = (isi_card[count].isa == YES) ? + SA_INTERRUPT : (SA_INTERRUPT | SA_SHIRQ); - if (request_irq(isi_card[count].irq, - isicom_interrupt, - irqflags, + if (request_irq(isi_card[count].irq, + isicom_interrupt, + irqflags, ISICOM_NAME, &isi_card[count])) { printk(KERN_WARNING "ISICOM: Could not" @@ -1862,7 +1860,7 @@ static int __devinit register_isr(void) } else done++; - } + } } return done; } @@ -1880,42 +1878,42 @@ static void __exit unregister_isr(void) static int __devinit isicom_init(void) { int card, channel, base; - struct isi_port * port; + struct isi_port *port; unsigned long page; - - if (!tmp_buf) { + + if (!tmp_buf) { page = get_zeroed_page(GFP_KERNEL); - if (!page) { -#ifdef ISICOM_DEBUG - printk(KERN_DEBUG "ISICOM: Couldn't allocate page for tmp_buf.\n"); + if (!page) { +#ifdef ISICOM_DEBUG + printk(KERN_DEBUG "ISICOM: Couldn't allocate page for tmp_buf.\n"); #else printk(KERN_ERR "ISICOM: Not enough memory...\n"); -#endif - return 0; - } - tmp_buf = (unsigned char *) page; +#endif + return 0; + } + tmp_buf = (unsigned char *) page; } - - if (!register_ioregion()) + + if (!register_ioregion()) { printk(KERN_ERR "ISICOM: All required I/O space found busy.\n"); free_page((unsigned long)tmp_buf); return 0; } - if (register_drivers()) + if (register_drivers()) { unregister_ioregion(); free_page((unsigned long)tmp_buf); return 0; } - if (!register_isr()) + if (!register_isr()) { unregister_drivers(); /* ioports already uregistered in register_isr */ free_page((unsigned long)tmp_buf); - return 0; + return 0; } - + memset(isi_ports, 0, sizeof(isi_ports)); for (card = 0; card < BOARD_COUNT; card++) { port = &isi_ports[card * 16]; @@ -1926,24 +1924,24 @@ static int __devinit isicom_init(void) port->magic = ISICOM_MAGIC; port->card = &isi_card[card]; port->channel = channel; - port->close_delay = 50 * HZ/100; - port->closing_wait = 3000 * HZ/100; - INIT_WORK(&port->hangup_tq, do_isicom_hangup, port); - INIT_WORK(&port->bh_tqueue, isicom_bottomhalf, port); - port->status = 0; - init_waitqueue_head(&port->open_wait); + port->close_delay = 50 * HZ/100; + port->closing_wait = 3000 * HZ/100; + INIT_WORK(&port->hangup_tq, do_isicom_hangup, port); + INIT_WORK(&port->bh_tqueue, isicom_bottomhalf, port); + port->status = 0; + init_waitqueue_head(&port->open_wait); init_waitqueue_head(&port->close_wait); /* . . . */ - } - } - - return 1; + } + } + + return 1; } /* * Insmod can set static symbols so keep these static */ - + static int io[4]; static int irq[4]; @@ -1961,9 +1959,9 @@ static int __devinit isicom_setup(void) int retval, card, idx, count; unsigned char pciirq; unsigned int ioaddr; - + card = 0; - for(idx=0; idx < BOARD_COUNT; idx++) { + for(idx=0; idx < BOARD_COUNT; idx++) { if (io[idx]) { isi_card[idx].base=io[idx]; isi_card[idx].irq=irq[idx]; @@ -1975,23 +1973,23 @@ static int __devinit isicom_setup(void) isi_card[idx].irq = 0; } } - + for (idx=0 ;idx < card; idx++) { if (!((isi_card[idx].irq==2)||(isi_card[idx].irq==3)|| - (isi_card[idx].irq==4)||(isi_card[idx].irq==5)|| - (isi_card[idx].irq==7)||(isi_card[idx].irq==10)|| - (isi_card[idx].irq==11)||(isi_card[idx].irq==12)|| - (isi_card[idx].irq==15))) { - + (isi_card[idx].irq==4)||(isi_card[idx].irq==5)|| + (isi_card[idx].irq==7)||(isi_card[idx].irq==10)|| + (isi_card[idx].irq==11)||(isi_card[idx].irq==12)|| + (isi_card[idx].irq==15))) { + if (isi_card[idx].base) { printk(KERN_ERR "ISICOM: Irq %d unsupported. Disabling Card%d...\n", isi_card[idx].irq, idx+1); isi_card[idx].base=0; card--; - } + } } - } - + } + if (card < BOARD_COUNT) { for (idx=0; idx < DEVID_COUNT; idx++) { dev = NULL; @@ -2000,21 +1998,22 @@ static int __devinit isicom_setup(void) break; if (card >= BOARD_COUNT) break; - + if (pci_enable_device(dev)) break; /* found a PCI ISI card! */ - ioaddr = pci_resource_start (dev, 3); /* i.e at offset 0x1c in the - * PCI configuration register - * space. - */ + ioaddr = pci_resource_start (dev, 3); + /* i.e at offset 0x1c in the + * PCI configuration register + * space. + */ pciirq = dev->irq; printk(KERN_INFO "ISI PCI Card(Device ID 0x%x)\n", isicom_pci_tbl[idx].device); /* * allot the first empty slot in the array - */ - for (count=0; count < BOARD_COUNT; count++) { + */ + for (count=0; count < BOARD_COUNT; count++) { if (isi_card[count].base == 0) { isi_card[count].base = ioaddr; isi_card[count].irq = pciirq; @@ -2023,35 +2022,35 @@ static int __devinit isicom_setup(void) break; } } - } + } if (card >= BOARD_COUNT) break; } } - + if (!(isi_card[0].base || isi_card[1].base || isi_card[2].base || isi_card[3].base)) { - printk(KERN_ERR "ISICOM: No valid card configuration. Driver cannot be initialized...\n"); + printk(KERN_ERR "ISICOM: No valid card configuration. Driver cannot be initialized...\n"); return -EIO; - } + } retval = misc_register(&isiloader_device); if (retval < 0) { printk(KERN_ERR "ISICOM: Unable to register firmware loader driver.\n"); return retval; } - + if (!isicom_init()) { - if (misc_deregister(&isiloader_device)) + if (misc_deregister(&isiloader_device)) printk(KERN_ERR "ISICOM: Unable to unregister Firmware Loader driver\n"); return -EIO; } - + init_timer(&tx); tx.expires = jiffies + 1; tx.data = 0; tx.function = isicom_tx; re_schedule = 1; add_timer(&tx); - + return 0; } @@ -2062,7 +2061,7 @@ static void __exit isicom_exit(void) msleep(1000); unregister_isr(); unregister_drivers(); - unregister_ioregion(); + unregister_ioregion(); if(tmp_buf) free_page((unsigned long)tmp_buf); if (misc_deregister(&isiloader_device)) ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 5/5] isicom: more whitespace 2005-09-13 16:49 ` [PATCH 0/5] isicom char driver to 2.6 api Jiri Slaby ` (3 preceding siblings ...) 2005-09-13 16:52 ` [PATCH 1/5] isicom: whitespace Jiri Slaby @ 2005-09-13 16:52 ` Jiri Slaby 4 siblings, 0 replies; 22+ messages in thread From: Jiri Slaby @ 2005-09-13 16:52 UTC (permalink / raw) To: akpm; +Cc: Linux Kernel Mailing List, linux-pci, Greg KH Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> drivers/char/isicom.c | 150 +++++++++++++++++++++++-------------------------- include/linux/isicom.h | 21 +++--- 2 files changed, 83 insertions(+), 88 deletions(-) diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c @@ -469,33 +469,36 @@ static void isicom_tx(unsigned long _dat residue = NO; wrd = 0; while (1) { - cnt = min_t(int, txcount, (SERIAL_XMIT_SIZE - port->xmit_tail)); + cnt = min_t(int, txcount, (SERIAL_XMIT_SIZE + - port->xmit_tail)); if (residue == YES) { residue = NO; if (cnt > 0) { - wrd |= (port->xmit_buf[port->xmit_tail] << 8); - port->xmit_tail = (port->xmit_tail + 1) & (SERIAL_XMIT_SIZE - 1); + wrd |= (port->xmit_buf[port->xmit_tail] + << 8); + port->xmit_tail = (port->xmit_tail + 1) + & (SERIAL_XMIT_SIZE - 1); port->xmit_cnt--; txcount--; cnt--; outw(wrd, base); - } - else { + } else { outw(wrd, base); break; } } if (cnt <= 0) break; word_count = cnt >> 1; - outsw(base, port->xmit_buf+port->xmit_tail, word_count); - port->xmit_tail = (port->xmit_tail + (word_count << 1)) & - (SERIAL_XMIT_SIZE - 1); + outsw(base, port->xmit_buf+port->xmit_tail,word_count); + port->xmit_tail = (port->xmit_tail + + (word_count << 1)) & (SERIAL_XMIT_SIZE - 1); txcount -= (word_count << 1); port->xmit_cnt -= (word_count << 1); if (cnt & 0x0001) { residue = YES; wrd = port->xmit_buf[port->xmit_tail]; - port->xmit_tail = (port->xmit_tail + 1) & (SERIAL_XMIT_SIZE - 1); + port->xmit_tail = (port->xmit_tail + 1) + & (SERIAL_XMIT_SIZE - 1); port->xmit_cnt--; txcount--; } @@ -614,30 +617,24 @@ static irqreturn_t isicom_interrupt(int header = inw(base); switch(header & 0xff) { case 0: /* Change in EIA signals */ - if (port->flags & ASYNC_CHECK_CD) { - if (port->status & ISI_DCD) { + if (port->status & ISI_DCD) if (!(header & ISI_DCD)) { /* Carrier has been lost */ -#ifdef ISICOM_DEBUG - printk(KERN_DEBUG "ISICOM: interrupt: DCD->low.\n"); -#endif + pr_deb(KERN_DEBUG "ISICOM: " + "interrupt: " + "DCD->low.\n"); port->status &= ~ISI_DCD; schedule_work(&port->hangup_tq); } - } - else { - if (header & ISI_DCD) { + else if (header & ISI_DCD) { /* Carrier has been detected */ -#ifdef ISICOM_DEBUG - printk(KERN_DEBUG "ISICOM: interrupt: DCD->high.\n"); -#endif - port->status |= ISI_DCD; - wake_up_interruptible(&port->open_wait); - } + printk(KERN_DEBUG "ISICOM: interrupt: " + "DCD->high.\n"); + port->status |= ISI_DCD; + wake_up_interruptible(&port->open_wait); } - } - else { + } else { if (header & ISI_DCD) port->status |= ISI_DCD; else @@ -649,19 +646,16 @@ static irqreturn_t isicom_interrupt(int if (header & ISI_CTS) { port->tty->hw_stopped = 0; /* start tx ing */ - port->status |= (ISI_TXOK | ISI_CTS); + port->status |= (ISI_TXOK + | ISI_CTS); schedule_work(&port->bh_tqueue); } + } else if (!(header & ISI_CTS)) { + port->tty->hw_stopped = 1; + /* stop tx ing */ + port->status &= ~(ISI_TXOK | ISI_CTS); } - else { - if (!(header & ISI_CTS)) { - port->tty->hw_stopped = 1; - /* stop tx ing */ - port->status &= ~(ISI_TXOK | ISI_CTS); - } - } - } - else { + } else { if (header & ISI_CTS) port->status |= ISI_CTS; else @@ -680,7 +674,7 @@ static irqreturn_t isicom_interrupt(int break; - case 1: /* Received Break !!! */ + case 1: /* Received Break !!! */ tty_insert_flip_char(tty, 0, TTY_BREAK); if (port->flags & ASYNC_SAK) do_SAK(tty); @@ -688,31 +682,31 @@ static irqreturn_t isicom_interrupt(int break; case 2: /* Statistics */ - printk(KERN_DEBUG "ISICOM: isicom_interrupt: stats!!!.\n"); + printk(KERN_DEBUG "ISICOM: isicom_interrupt: " + "stats!!!.\n"); break; default: - printk(KERN_WARNING "ISICOM: Intr: Unknown code in status packet.\n"); + printk(KERN_WARNING "ISICOM: Intr: Unknown code in " + "status packet.\n"); break; } - } - else { /* Data Packet */ - + } 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", - count, byte_count); -#endif + pr_deb(KERN_DEBUG "ISICOM: Intr: Can rx %d of %d bytes.\n", + count, byte_count); word_count = count >> 1; insw(base, rp, word_count); byte_count -= (word_count << 1); if (count & 0x0001) { - tty_insert_flip_char(tty, inw(base) & 0xff, TTY_NORMAL); + tty_insert_flip_char(tty, inw(base) & 0xff, + TTY_NORMAL); byte_count -= 2; } if (byte_count > 0) { - printk(KERN_DEBUG "ISICOM: Intr(0x%x:%d): Flip buffer overflow! dropping bytes...\n", - base, channel+1); + printk(KERN_DEBUG "ISICOM: Intr(0x%x:%d): Flip buffer " + "overflow! dropping bytes...\n", base, + channel + 1); while(byte_count > 0) { /* drain out unread xtra data */ inw(base); byte_count -= 2; @@ -724,6 +718,7 @@ static irqreturn_t isicom_interrupt(int ClearInterrupt(base); else outw(0x0000, base+0x04); /* enable interrupts */ + return IRQ_HANDLED; } @@ -894,7 +889,8 @@ static int isicom_setup_port(struct isi_ return 0; } -static int block_til_ready(struct tty_struct *tty, struct file *filp, struct isi_port *port) +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; @@ -904,9 +900,8 @@ 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 - printk(KERN_DEBUG "ISICOM: block_til_ready: close in progress.\n"); -#endif + pr_deb(KERN_DEBUG "ISICOM: block_til_ready: close in " + "progress.\n"); interruptible_sleep_on(&port->close_wait); if (port->flags & ASYNC_HUP_NOTIFY) return -EAGAIN; @@ -916,10 +911,9 @@ static int block_til_ready(struct tty_st /* if non-blocking mode is set ... */ - if ((filp->f_flags & O_NONBLOCK) || (tty->flags & (1 << TTY_IO_ERROR))) { -#ifdef ISICOM_DEBUG - printk(KERN_DEBUG "ISICOM: block_til_ready: non-block mode.\n"); -#endif + if ((filp->f_flags & O_NONBLOCK) || + (tty->flags & (1 << TTY_IO_ERROR))) { + pr_deb(KERN_DEBUG "ISICOM: block_til_ready: non-block mode.\n"); port->flags |= ASYNC_NORMAL_ACTIVE; return 0; } @@ -1059,12 +1053,12 @@ static void isicom_shutdown_port(struct 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); + 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 */ + /* last port was closed, shutdown that boad too */ if (C_HUPCL(tty)) { if (!card->count) isicom_shutdown_board(card); @@ -1082,9 +1076,7 @@ static void isicom_close(struct tty_stru if (isicom_paranoia_check(port, tty->name, "isicom_close")) return; -#ifdef ISICOM_DEBUG - printk(KERN_DEBUG "ISICOM: Close start!!!.\n"); -#endif + pr_deb(KERN_DEBUG "ISICOM: Close start!!!.\n"); spin_lock_irqsave(&card->card_lock, flags); if (tty_hung_up_p(filp)) { @@ -1093,14 +1085,14 @@ static void isicom_close(struct tty_stru } 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; } @@ -1135,10 +1127,10 @@ 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 - printk(KERN_DEBUG "ISICOM: scheduling until time out.\n"); -#endif - msleep_interruptible(jiffies_to_msecs(port->close_delay)); + printk(KERN_DEBUG "ISICOM: scheduling until time " + "out.\n"); + msleep_interruptible( + jiffies_to_msecs(port->close_delay)); } spin_lock_irqsave(&card->card_lock, flags); wake_up_interruptible(&port->open_wait); @@ -1166,13 +1158,14 @@ static int isicom_write(struct tty_struc 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)); + 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; @@ -1217,7 +1210,8 @@ static void isicom_flush_chars(struct tt 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 @@ -1250,7 +1244,8 @@ 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; @@ -1385,7 +1380,8 @@ static int isicom_ioctl(struct tty_struc return 0; case TIOCGSOFTCAR: - return put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned long __user *)argp); + return put_user(C_CLOCAL(tty) ? 1 : 0, + (unsigned long __user *)argp); case TIOCSSOFTCAR: if (get_user(arg, (unsigned long __user *) argp)) diff --git a/include/linux/isicom.h b/include/linux/isicom.h --- a/include/linux/isicom.h +++ b/include/linux/isicom.h @@ -9,7 +9,7 @@ #define YES 1 #define NO 0 -/* +/* * ISICOM Driver definitions ... * */ @@ -20,8 +20,8 @@ * PCI definitions */ - #define DEVID_COUNT 9 - #define VENDOR_ID 0x10b5 +#define DEVID_COUNT 9 +#define VENDOR_ID 0x10b5 /* * These are now officially allocated numbers @@ -31,9 +31,9 @@ #define ISICOM_CMAJOR 113 /* callout */ #define ISICOM_MAGIC (('M' << 8) | 'T') -#define WAKEUP_CHARS 256 /* hard coded for now */ -#define TX_SIZE 254 - +#define WAKEUP_CHARS 256 /* hard coded for now */ +#define TX_SIZE 254 + #define BOARD_COUNT 4 #define PORT_COUNT (BOARD_COUNT*16) @@ -66,12 +66,12 @@ #define BOARD(line) (((line) >> 4) & 0x3) /* isi kill queue bitmap */ - + #define ISICOM_KILLTX 0x01 #define ISICOM_KILLRX 0x02 /* isi_board status bitmap */ - + #define FIRMWARE_LOADED 0x0001 #define BOARD_ACTIVE 0x0002 @@ -85,9 +85,8 @@ #define ISI_RTS 0x0200 -#define ISI_TXOK 0x0001 - +#define ISI_TXOK 0x0001 + #endif /* __KERNEL__ */ #endif /* ISICOM_H */ - ^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2005-09-14 0:14 UTC | newest] Thread overview: 22+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2005-09-10 23:19 [PATCH -mm 1/2] drivers/char/isicom old api rewritten Jiri Slaby 2005-09-10 23:21 ` [PATCH -mm 2/2] drivers/char/isicom whitespace cleanup Jiri Slaby 2005-09-10 23:53 ` [PATCH -mm 1/2] drivers/char/isicom old api rewritten Andrew Morton 2005-09-11 22:04 ` [PATCH] drivers/char/isicom old api rewritten (round 2) Jiri Slaby 2005-09-11 22:20 ` Andrew Morton 2005-09-11 23:11 ` [PATCH] drivers/char/isicom old api rewritten (round 3) Jiri Slaby 2005-09-12 4:58 ` Greg KH 2005-09-12 12:58 ` [PATCH] drivers/char/isicom whitespace cleanup Jiri Slaby 2005-09-13 16:49 ` [PATCH 0/5] isicom char driver to 2.6 api Jiri Slaby 2005-09-13 16:52 ` [PATCH 2/5] isicom: types Jiri Slaby 2005-09-13 16:52 ` [PATCH 3/5] isicom: pci probing Jiri Slaby 2005-09-13 17:21 ` Greg KH 2005-09-14 0:10 ` [PATCH 0/6] isicom char driver rewritten to 2.6 api Jiri Slaby 2005-09-14 0:12 ` [PATCH 1/6] isicom: Whitespace cleanup Jiri Slaby 2005-09-14 0:12 ` [PATCH 2/6] isicom: Type conversion and variables deletion Jiri Slaby 2005-09-14 0:12 ` [PATCH 3/6] isicom: Others little changes Jiri Slaby 2005-09-14 0:13 ` [PATCH 4/6] isicom: Pci probing added Jiri Slaby 2005-09-14 0:13 ` [PATCH 5/6] isicom: Firmware loading Jiri Slaby 2005-09-14 0:13 ` [PATCH 6/6] isicom: More whitespaces and coding style Jiri Slaby 2005-09-13 16:52 ` [PATCH 4/5] isicom: firmware Jiri Slaby 2005-09-13 16:52 ` [PATCH 1/5] isicom: whitespace Jiri Slaby 2005-09-13 16:52 ` [PATCH 5/5] isicom: more whitespace Jiri Slaby
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox