From d6434e1042f3b0a6dfe1b1f615af369486f9b1fa Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Sat, 9 Oct 1999 00:00:47 +0000 Subject: Merge with 2.3.19. --- include/linux/isicom.h | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'include/linux/isicom.h') diff --git a/include/linux/isicom.h b/include/linux/isicom.h index 7f929b895..670d72f4e 100644 --- a/include/linux/isicom.h +++ b/include/linux/isicom.h @@ -51,6 +51,13 @@ typedef struct { #define ISICOM_NAME "ISICom" +/* + * PCI definitions + */ + + #define DEVID_COUNT 9 + #define VENDOR_ID 0x10b5 + /* * These are now officially allocated numbers */ @@ -129,6 +136,7 @@ struct isi_board { unsigned short shift_count; struct isi_port * ports; signed char count; + unsigned char isa; }; struct isi_port { @@ -166,7 +174,7 @@ extern inline void raise_dtr(struct isi_port * port) struct isi_board * card = port->card; unsigned short base = card->base; unsigned char channel = port->channel; - short wait=300; + short wait=400; while(((inw(base+0x0e) & 0x01) == 0) && (wait-- > 0)); if (wait <= 0) { printk(KERN_WARNING "ISICOM: Card found busy in raise_dtr.\n"); @@ -186,7 +194,7 @@ extern inline void drop_dtr(struct isi_port * port) struct isi_board * card = port->card; unsigned short base = card->base; unsigned char channel = port->channel; - short wait=300; + short wait=400; while(((inw(base+0x0e) & 0x01) == 0) && (wait-- > 0)); if (wait <= 0) { printk(KERN_WARNING "ISICOM: Card found busy in drop_dtr.\n"); @@ -205,7 +213,7 @@ extern inline void raise_rts(struct isi_port * port) struct isi_board * card = port->card; unsigned short base = card->base; unsigned char channel = port->channel; - short wait=300; + short wait=400; while(((inw(base+0x0e) & 0x01) == 0) && (wait-- > 0)); if (wait <= 0) { printk(KERN_WARNING "ISICOM: Card found busy in raise_rts.\n"); @@ -224,7 +232,7 @@ extern inline void drop_rts(struct isi_port * port) struct isi_board * card = port->card; unsigned short base = card->base; unsigned char channel = port->channel; - short wait=300; + short wait=400; while(((inw(base+0x0e) & 0x01) == 0) && (wait-- > 0)); if (wait <= 0) { printk(KERN_WARNING "ISICOM: Card found busy in drop_rts.\n"); @@ -243,7 +251,7 @@ extern 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; - short wait=300; + short wait=400; while(((inw(base+0x0e) & 0x01) == 0) && (wait-- > 0)); if (wait <= 0) { printk(KERN_WARNING "ISICOM: Card found busy in raise_dtr_rts.\n"); @@ -262,7 +270,7 @@ extern inline void drop_dtr_rts(struct isi_port * port) struct isi_board * card = port->card; unsigned short base = card->base; unsigned char channel = port->channel; - short wait=300; + short wait=400; while(((inw(base+0x0e) & 0x01) == 0) && (wait-- > 0)); if (wait <= 0) { printk(KERN_WARNING "ISICOM: Card found busy in drop_dtr_rts.\n"); @@ -282,7 +290,7 @@ extern 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; - short wait=300; + short wait=400; while(((inw(base+0x0e) & 0x01) == 0) && (wait-- > 0)); if (wait <= 0) { printk(KERN_WARNING "ISICOM: Card found busy in kill_queue.\n"); -- cgit v1.2.3