patch-2.4.20 linux-2.4.20/drivers/char/pcxx.c
Next file: linux-2.4.20/drivers/char/pdc_console.c
Previous file: linux-2.4.20/drivers/char/pcwd.c
Back to the patch index
Back to the overall index
- Lines: 87
- Date:
Thu Nov 28 15:53:12 2002
- Orig file:
linux-2.4.19/drivers/char/pcxx.c
- Orig date:
Thu Sep 13 15:21:32 2001
diff -urN linux-2.4.19/drivers/char/pcxx.c linux-2.4.20/drivers/char/pcxx.c
@@ -153,7 +153,6 @@
DECLARE_TASK_QUEUE(tq_pcxx);
static void pcxxpoll(unsigned long dummy);
-static void pcxxdelay(int);
static void fepcmd(struct channel *, int, int, int, int, int);
static void pcxe_put_char(struct tty_struct *, unsigned char);
static void pcxe_flush_chars(struct tty_struct *);
@@ -1271,7 +1270,7 @@
for(crd=0; crd < numcards; crd++) {
bd = &boards[crd];
outb(FEPRST, bd->port);
- pcxxdelay(1);
+ mdelay(1);
for(i=0; (inb(bd->port) & FEPMASK) != FEPRST; i++) {
if(i > 100) {
@@ -1283,7 +1282,7 @@
#ifdef MODULE
schedule();
#endif
- pcxxdelay(10);
+ mdelay(10);
}
if(bd->status == DISABLED)
continue;
@@ -1362,7 +1361,7 @@
#ifdef MODULE
schedule();
#endif
- pcxxdelay(1);
+ mdelay(1);
}
if(bd->status == DISABLED)
continue;
@@ -1413,7 +1412,7 @@
#ifdef MODULE
schedule();
#endif
- pcxxdelay(50);
+ mdelay(50);
}
printk("\nPC/Xx: BIOS download failed for board at 0x%x(addr=%lx-%lx)!\n",
@@ -1443,7 +1442,7 @@
#ifdef MODULE
schedule();
#endif
- pcxxdelay(10);
+ mdelay(10);
}
printk("\nPC/Xx: BIOS download failed on the %s at 0x%x!\n",
@@ -1487,7 +1486,7 @@
#ifdef MODULE
schedule();
#endif
- pcxxdelay(1);
+ mdelay(1);
}
if(bd->status == DISABLED)
@@ -1520,7 +1519,7 @@
#ifdef MODULE
schedule();
#endif
- pcxxdelay(1);
+ mdelay(1);
}
if(bd->status == DISABLED)
continue;
@@ -1825,15 +1824,6 @@
}
-/*
- * pcxxdelay - delays a specified number of milliseconds
- */
-static void pcxxdelay(int msec)
-{
- mdelay(msec);
-}
-
-
static void
fepcmd(struct channel *ch, int cmd, int word_or_byte, int byte2, int ncmds,
int bytecmd)
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)