patch-2.3.13 linux/include/linux/isicom.h
Next file: linux/include/linux/kernel.h
Previous file: linux/include/linux/ioport.h
Back to the patch index
Back to the overall index
- Lines: 85
- Date:
Thu Aug 5 14:34:01 1999
- Orig file:
v2.3.12/linux/include/linux/isicom.h
- Orig date:
Wed May 12 13:27:37 1999
diff -u --recursive --new-file v2.3.12/linux/include/linux/isicom.h linux/include/linux/isicom.h
@@ -52,6 +52,13 @@
#define ISICOM_NAME "ISICom"
/*
+ * PCI definitions
+ */
+
+ #define DEVID_COUNT 9
+ #define VENDOR_ID 0x10b5
+
+/*
* These are now officially allocated numbers
*/
@@ -129,6 +136,7 @@
unsigned short shift_count;
struct isi_port * ports;
signed char count;
+ unsigned char isa;
};
struct isi_port {
@@ -166,7 +174,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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");
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)