Update of /cvsroot/linux-vax/kernel-2.4/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv21997
Modified Files:
vxt2694.c
Log Message:
Replace occurrences of "vxt2694" with "vxtserial"
Index: vxt2694.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/vxt2694.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vxt2694.c 29 May 2002 03:37:39 -0000 1.1
+++ vxt2694.c 3 Jun 2002 02:05:21 -0000 1.2
@@ -31,20 +31,20 @@
#include "sc26c94.h"
-#define VXT2694_PHYS_ADDR 0x200A0000
+#define VXT_SERIAL_PHYS_ADDR 0x200A0000
-volatile int *vxt2694_addr = NULL;
+volatile int *vxt_serial = NULL;
/*
* callbacks for sc26c94.c
*/
static u8 readreg(struct sc26c94 *quart, int reg) {
- return vxt2694_addr[reg];
+ return vxt_serial[reg];
}
static void writereg(struct sc26c94 *quart, int reg, u8 value) {
- vxt2694_addr[reg]=value;
+ vxt_serial[reg]=value;
}
static void set_handshake(struct sc26c94 *quart, int channel, int ready) {
@@ -155,7 +155,7 @@
NULL
};
-static int vxt2694_open(struct tty_struct *tty, struct file *filp)
+static int vxtserial_open(struct tty_struct *tty, struct file *filp)
{
return sc26c94_open(&the_quart, tty, filp);
}
@@ -167,17 +167,17 @@
struct tty_driver tty_driver;
struct tty_driver callout_driver;
-int vxt2694_init()
+int vxtserial_init()
{
int irq;
int error;
#if 0
- printk("vxt2694_init\n");
+ printk("vxtserial_init\n");
mdelay(1000); /* let TxFIFO drain before messing with UART */
#endif
- if(vxt2694_addr == NULL)
- vxt2694_addr = ioremap(VXT2694_PHYS_ADDR, 256);
+ if(vxt_serial == NULL)
+ vxt_serial = ioremap(VXT_SERIAL_PHYS_ADDR, 256);
sc26c94_init_chip(&the_quart);
@@ -211,7 +211,7 @@
#endif
sc26c94_init_drivers(&tty_driver, &callout_driver);
- tty_driver.open = vxt2694_open;
+ tty_driver.open = vxtserial_open;
#if 1
if ((error = tty_register_driver(&tty_driver))) {
printk(KERN_ERR "Couldn't register sc29c94 driver, error = %d\n", error);
@@ -263,15 +263,15 @@
static int __init vxt_console_setup(struct console *co, char *options)
{
#if 0
- vxt2694_init();
+ vxtserial_init();
co->cflag = CREAD | HUPCL | CLOCAL | B9600 | CS8;
writereg(&the_quart, SC26C94_REG_CRa, SC26C94_CR_TX_ON);
writereg(&the_quart, SC26C94_REG_CRa, SC26C94_CR_RX_ON);
#endif
/* this is called really early in kernel initialization, so we can't do
- a full vxt2694_init. but that's ok because all we'll be calling is
+ a full vxtserial_init. but that's ok because all we'll be calling is
the _immediate_putc and _immediate_getc */
- vxt2694_addr = ioremap(VXT2694_PHYS_ADDR, 256);
+ vxt_serial = ioremap(VXT_SERIAL_PHYS_ADDR, 256);
return 0;
}
|
