patch-2.1.74 linux/drivers/char/istallion.c
Next file: linux/drivers/char/stallion.c
Previous file: linux/drivers/block/ide-cd.c
Back to the patch index
Back to the overall index
- Lines: 1721
- Date:
Fri Dec 19 12:30:54 1997
- Orig file:
v2.1.73/linux/drivers/char/istallion.c
- Orig date:
Wed Sep 24 20:05:46 1997
diff -u --recursive --new-file v2.1.73/linux/drivers/char/istallion.c linux/drivers/char/istallion.c
@@ -77,6 +77,8 @@
#define BRD_ECPE 24
#define BRD_ECPMC 25
#define BRD_ECHPCI 26
+#define BRD_ECH64PCI 27
+#define BRD_EASYIOPCI 28
#define BRD_BRUMBY BRD_BRUMBY4
@@ -166,8 +168,9 @@
* Define our local driver identity first. Set up stuff to deal with
* all the local structures required by a serial tty driver.
*/
-static char *stli_drvname = "Stallion Intelligent Multiport Serial Driver";
-static char *stli_drvversion = "5.3.4";
+static char *stli_drvtitle = "Stallion Intelligent Multiport Serial Driver";
+static char *stli_drvname = "istallion";
+static char *stli_drvversion = "5.4.1";
static char *stli_serialname = "ttyE";
static char *stli_calloutname = "cue";
@@ -291,6 +294,8 @@
"EC8/64-EI",
"EC8/64-MC",
"EC8/32-PCI",
+ "EC8/64-PCI",
+ "EasyIO-PCI",
};
/*
@@ -484,9 +489,9 @@
/*
* Define the maximal baud rate, and the default baud base for ports.
*/
-#define STL_MAXBAUD 921600
+#define STL_MAXBAUD 460800
#define STL_BAUDBASE 115200
-#define STL_CLOSEDELAY 50
+#define STL_CLOSEDELAY (5 * HZ / 10)
/*****************************************************************************/
@@ -539,18 +544,18 @@
static void stli_stop(struct tty_struct *tty);
static void stli_start(struct tty_struct *tty);
static void stli_flushbuffer(struct tty_struct *tty);
+static void stli_breakctl(struct tty_struct *tty, int state);
+static void stli_waituntilsent(struct tty_struct *tty, int timeout);
+static void stli_sendxchar(struct tty_struct *tty, char ch);
static void stli_hangup(struct tty_struct *tty);
+static int stli_portinfo(stlibrd_t *brdp, stliport_t *portp, int portnr, char *pos);
-static inline int stli_initbrds(void);
-static inline int stli_initecp(stlibrd_t *brdp);
-static inline int stli_initonb(stlibrd_t *brdp);
-static inline int stli_findeisabrds(void);
-static inline int stli_initports(stlibrd_t *brdp);
-static int stli_eisamemprobe(stlibrd_t *brdp);
static int stli_brdinit(stlibrd_t *brdp);
static int stli_startbrd(stlibrd_t *brdp);
-static long stli_memread(struct inode *ip, struct file *fp, char *buf, unsigned long count);
-static long stli_memwrite(struct inode *ip, struct file *fp, const char *buf, unsigned long count);
+static int stli_memopen(struct inode *ip, struct file *fp);
+static int stli_memclose(struct inode *ip, struct file *fp);
+static ssize_t stli_memread(struct file *fp, char *buf, size_t count, loff_t *offp);
+static ssize_t stli_memwrite(struct file *fp, const char *buf, size_t count, loff_t *offp);
static int stli_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, unsigned long arg);
static void stli_brdpoll(stlibrd_t *brdp, volatile cdkhdr_t *hdrp);
static void stli_poll(unsigned long arg);
@@ -573,6 +578,7 @@
static int stli_setserial(stliport_t *portp, struct serial_struct *sp);
static int stli_getbrdstats(combrd_t *bp);
static int stli_getportstats(stliport_t *portp, comstats_t *cp);
+static int stli_portcmdstats(stliport_t *portp);
static int stli_clrportstats(stliport_t *portp, comstats_t *cp);
static int stli_getportstruct(unsigned long arg);
static int stli_getbrdstruct(unsigned long arg);
@@ -613,6 +619,13 @@
static stliport_t *stli_getport(int brdnr, int panelnr, int portnr);
+static inline int stli_initbrds(void);
+static inline int stli_initecp(stlibrd_t *brdp);
+static inline int stli_initonb(stlibrd_t *brdp);
+static inline int stli_findeisabrds(void);
+static inline int stli_eisamemprobe(stlibrd_t *brdp);
+static inline int stli_initports(stlibrd_t *brdp);
+
/*****************************************************************************/
/*
@@ -629,8 +642,8 @@
NULL,
stli_memioctl,
NULL,
- NULL,
- NULL,
+ stli_memopen,
+ stli_memclose,
NULL
};
@@ -690,7 +703,8 @@
printk("cleanup_module()\n");
#endif
- printk(KERN_INFO "Unloading %s: version %s\n", stli_drvname, stli_drvversion);
+ printk(KERN_INFO "Unloading %s: version %s\n", stli_drvtitle,
+ stli_drvversion);
save_flags(flags);
cli();
@@ -707,12 +721,14 @@
i = tty_unregister_driver(&stli_serial);
j = tty_unregister_driver(&stli_callout);
if (i || j) {
- printk("STALLION: failed to un-register tty driver, errno=%d,%d\n", -i, -j);
+ printk("STALLION: failed to un-register tty driver, "
+ "errno=%d,%d\n", -i, -j);
restore_flags(flags);
return;
}
if ((i = unregister_chrdev(STL_SIOMEMMAJOR, "staliomem")))
- printk("STALLION: failed to un-register serial memory device, errno=%d\n", -i);
+ printk("STALLION: failed to un-register serial memory device, "
+ "errno=%d\n", -i);
if (stli_tmpwritebuf != (char *) NULL)
kfree_s(stli_tmpwritebuf, STLI_TXBUFSIZE);
@@ -733,7 +749,9 @@
}
iounmap(brdp->membase);
- if ((brdp->brdtype == BRD_ECP) || (brdp->brdtype == BRD_ECPE) || (brdp->brdtype == BRD_ECPMC))
+ if ((brdp->brdtype == BRD_ECP) ||
+ (brdp->brdtype == BRD_ECPE) ||
+ (brdp->brdtype == BRD_ECPMC))
release_region(brdp->iobase, ECP_IOSIZE);
else
release_region(brdp->iobase, ONB_IOSIZE);
@@ -767,7 +785,8 @@
int brdnr, portnr, rc;
#if DEBUG
- printk("stli_open(tty=%x,filp=%x): device=%x\n", (int) tty, (int) filp, tty->device);
+ printk("stli_open(tty=%x,filp=%x): device=%x\n", (int) tty,
+ (int) filp, tty->device);
#endif
minordev = MINOR(tty->device);
@@ -789,6 +808,8 @@
if (portp->devnr < 1)
return(-ENODEV);
+ MOD_INC_USE_COUNT;
+
/*
* Check if this port is in the middle of closing. If so then wait
* until it is closed then return error status based on flag settings.
@@ -853,10 +874,10 @@
return(-EBUSY);
if (portp->flags & ASYNC_CALLOUT_ACTIVE) {
if ((portp->flags & ASYNC_SESSION_LOCKOUT) &&
- (portp->session != current->session))
+ (portp->session != current->session))
return(-EBUSY);
if ((portp->flags & ASYNC_PGRP_LOCKOUT) &&
- (portp->pgrp != current->pgrp))
+ (portp->pgrp != current->pgrp))
return(-EBUSY);
}
portp->flags |= ASYNC_CALLOUT_ACTIVE;
@@ -903,10 +924,14 @@
save_flags(flags);
cli();
if (tty_hung_up_p(filp)) {
+ MOD_DEC_USE_COUNT;
restore_flags(flags);
return;
}
+ if ((tty->count == 1) && (portp->refcount != 1))
+ portp->refcount = 1;
if (portp->refcount-- > 1) {
+ MOD_DEC_USE_COUNT;
restore_flags(flags);
return;
}
@@ -927,10 +952,8 @@
if (tty == stli_txcooktty)
stli_flushchars(tty);
tty->closing = 1;
- if (test_bit(ST_TXBUSY, &portp->state)) {
- if (portp->closing_wait != ASYNC_CLOSING_WAIT_NONE)
- tty_wait_until_sent(tty, portp->closing_wait);
- }
+ if (portp->closing_wait != ASYNC_CLOSING_WAIT_NONE)
+ tty_wait_until_sent(tty, portp->closing_wait);
portp->flags &= ~ASYNC_INITIALIZED;
brdp = stli_brds[portp->brdnr];
@@ -940,7 +963,8 @@
if (test_bit(ST_CMDING, &portp->state))
set_bit(ST_DOSIGS, &portp->state);
else
- stli_sendcmd(brdp, portp, A_SETSIGNALS, &portp->asig, sizeof(asysigs_t), 0);
+ stli_sendcmd(brdp, portp, A_SETSIGNALS, &portp->asig,
+ sizeof(asysigs_t), 0);
}
clear_bit(ST_TXBUSY, &portp->state);
clear_bit(ST_RXSTOP, &portp->state);
@@ -951,7 +975,6 @@
stli_flushbuffer(tty);
tty->closing = 0;
- tty->driver_data = (void *) NULL;
portp->tty = (struct tty_struct *) NULL;
if (portp->openwaitcnt) {
@@ -960,8 +983,10 @@
wake_up_interruptible(&portp->open_wait);
}
- portp->flags &= ~(ASYNC_CALLOUT_ACTIVE | ASYNC_NORMAL_ACTIVE | ASYNC_CLOSING);
+ portp->flags &= ~(ASYNC_CALLOUT_ACTIVE | ASYNC_NORMAL_ACTIVE |
+ ASYNC_CLOSING);
wake_up_interruptible(&portp->close_wait);
+ MOD_DEC_USE_COUNT;
restore_flags(flags);
}
@@ -992,23 +1017,27 @@
memset(&nt, 0, sizeof(asynotify_t));
nt.data = (DT_TXLOW | DT_TXEMPTY | DT_RXBUSY | DT_RXBREAK);
nt.signal = SG_DCD;
- if ((rc = stli_cmdwait(brdp, portp, A_SETNOTIFY, &nt, sizeof(asynotify_t), 0)) < 0)
+ if ((rc = stli_cmdwait(brdp, portp, A_SETNOTIFY, &nt,
+ sizeof(asynotify_t), 0)) < 0)
return(rc);
tty = portp->tty;
if (tty == (struct tty_struct *) NULL)
return(-ENODEV);
stli_mkasyport(portp, &aport, tty->termios);
- if ((rc = stli_cmdwait(brdp, portp, A_SETPORT, &aport, sizeof(asyport_t), 0)) < 0)
+ if ((rc = stli_cmdwait(brdp, portp, A_SETPORT, &aport,
+ sizeof(asyport_t), 0)) < 0)
return(rc);
set_bit(ST_GETSIGS, &portp->state);
- if ((rc = stli_cmdwait(brdp, portp, A_GETSIGNALS, &portp->asig, sizeof(asysigs_t), 1)) < 0)
+ if ((rc = stli_cmdwait(brdp, portp, A_GETSIGNALS, &portp->asig,
+ sizeof(asysigs_t), 1)) < 0)
return(rc);
if (test_and_clear_bit(ST_GETSIGS, &portp->state))
portp->sigs = stli_mktiocm(portp->asig.sigvalue);
stli_mkasysigs(&portp->asig, 1, 1);
- if ((rc = stli_cmdwait(brdp, portp, A_SETSIGNALS, &portp->asig, sizeof(asysigs_t), 0)) < 0)
+ if ((rc = stli_cmdwait(brdp, portp, A_SETSIGNALS, &portp->asig,
+ sizeof(asysigs_t), 0)) < 0)
return(rc);
return(0);
@@ -1032,7 +1061,8 @@
int rc;
#if DEBUG
- printk("stli_rawopen(brdp=%x,portp=%x,arg=%x,wait=%d)\n", (int) brdp, (int) portp, (int) arg, wait);
+ printk("stli_rawopen(brdp=%x,portp=%x,arg=%x,wait=%d)\n",
+ (int) brdp, (int) portp, (int) arg, wait);
#endif
/*
@@ -1065,7 +1095,8 @@
cp->openarg = arg;
cp->open = 1;
hdrp = (volatile cdkhdr_t *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);
- bits = ((volatile unsigned char *) hdrp) + brdp->slaveoffset + portp->portidx;
+ bits = ((volatile unsigned char *) hdrp) + brdp->slaveoffset +
+ portp->portidx;
*bits |= portp->portbit;
EBRDDISABLE(brdp);
@@ -1111,7 +1142,8 @@
int rc;
#if DEBUG
- printk("stli_rawclose(brdp=%x,portp=%x,arg=%x,wait=%d)\n", (int) brdp, (int) portp, (int) arg, wait);
+ printk("stli_rawclose(brdp=%x,portp=%x,arg=%x,wait=%d)\n",
+ (int) brdp, (int) portp, (int) arg, wait);
#endif
save_flags(flags);
@@ -1139,7 +1171,8 @@
cp->closearg = arg;
cp->close = 1;
hdrp = (volatile cdkhdr_t *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);
- bits = ((volatile unsigned char *) hdrp) + brdp->slaveoffset + portp->portidx;
+ bits = ((volatile unsigned char *) hdrp) + brdp->slaveoffset +
+ portp->portidx;
*bits |= portp->portbit;
EBRDDISABLE(brdp);
@@ -1182,7 +1215,9 @@
unsigned long flags;
#if DEBUG
- printk("stli_cmdwait(brdp=%x,portp=%x,cmd=%x,arg=%x,size=%d,copyback=%d)\n", (int) brdp, (int) portp, (int) cmd, (int) arg, size, copyback);
+ printk("stli_cmdwait(brdp=%x,portp=%x,cmd=%x,arg=%x,size=%d,"
+ "copyback=%d)\n", (int) brdp, (int) portp, (int) cmd,
+ (int) arg, size, copyback);
#endif
save_flags(flags);
@@ -1252,12 +1287,13 @@
static void stli_delay(int len)
{
#if DEBUG
- printk("stl_delay(len=%d)\n", len);
+ printk("stli_delay(len=%d)\n", len);
#endif
if (len > 0) {
current->state = TASK_INTERRUPTIBLE;
current->timeout = jiffies + len;
schedule();
+ current->state = TASK_RUNNING;
}
}
@@ -1274,7 +1310,8 @@
int rc, doclocal;
#if DEBUG
- printk("stli_waitcarrier(brdp=%x,portp=%x,filp=%x)\n", (int) brdp, (int) portp, (int) filp);
+ printk("stli_waitcarrier(brdp=%x,portp=%x,filp=%x)\n",
+ (int) brdp, (int) portp, (int) filp);
#endif
rc = 0;
@@ -1291,16 +1328,18 @@
save_flags(flags);
cli();
portp->openwaitcnt++;
- if (portp->refcount > 0)
+ if (! tty_hung_up_p(filp))
portp->refcount--;
for (;;) {
if ((portp->flags & ASYNC_CALLOUT_ACTIVE) == 0) {
stli_mkasysigs(&portp->asig, 1, 1);
- if ((rc = stli_cmdwait(brdp, portp, A_SETSIGNALS, &portp->asig, sizeof(asysigs_t), 0)) < 0)
+ if ((rc = stli_cmdwait(brdp, portp, A_SETSIGNALS,
+ &portp->asig, sizeof(asysigs_t), 0)) < 0)
break;
}
- if (tty_hung_up_p(filp) || ((portp->flags & ASYNC_INITIALIZED) == 0)) {
+ if (tty_hung_up_p(filp) ||
+ ((portp->flags & ASYNC_INITIALIZED) == 0)) {
if (portp->flags & ASYNC_HUP_NOTIFY)
rc = -EBUSY;
else
@@ -1308,8 +1347,8 @@
break;
}
if (((portp->flags & ASYNC_CALLOUT_ACTIVE) == 0) &&
- ((portp->flags & ASYNC_CLOSING) == 0) &&
- (doclocal || (portp->sigs & TIOCM_CD))) {
+ ((portp->flags & ASYNC_CLOSING) == 0) &&
+ (doclocal || (portp->sigs & TIOCM_CD))) {
break;
}
if (signal_pending(current)) {
@@ -1347,10 +1386,12 @@
unsigned long flags;
#if DEBUG
- printk("stli_write(tty=%x,from_user=%d,buf=%x,count=%d)\n", (int) tty, from_user, (int) buf, count);
+ printk("stli_write(tty=%x,from_user=%d,buf=%x,count=%d)\n",
+ (int) tty, from_user, (int) buf, count);
#endif
- if ((tty == (struct tty_struct *) NULL) || (stli_tmpwritebuf == (char *) NULL))
+ if ((tty == (struct tty_struct *) NULL) ||
+ (stli_tmpwritebuf == (char *) NULL))
return(0);
if (tty == stli_txcooktty)
stli_flushchars(tty);
@@ -1384,7 +1425,8 @@
tail = (unsigned int) ap->txq.tail;
if (tail != ((unsigned int) ap->txq.tail))
tail = (unsigned int) ap->txq.tail;
- len = (head >= tail) ? (portp->txsize - (head - tail) - 1) : (tail - head - 1);
+ len = (head >= tail) ? (portp->txsize - (head - tail) - 1) :
+ (tail - head - 1);
count = MIN(len, count);
EBRDDISABLE(brdp);
@@ -1439,7 +1481,8 @@
ap->changed.data &= ~DT_TXEMPTY;
}
hdrp = (volatile cdkhdr_t *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);
- bits = ((volatile unsigned char *) hdrp) + brdp->slaveoffset + portp->portidx;
+ bits = ((volatile unsigned char *) hdrp) + brdp->slaveoffset +
+ portp->portidx;
*bits |= portp->portbit;
set_bit(ST_TXBUSY, &portp->state);
@@ -1570,7 +1613,8 @@
ap->changed.data &= ~DT_TXEMPTY;
}
hdrp = (volatile cdkhdr_t *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);
- bits = ((volatile unsigned char *) hdrp) + brdp->slaveoffset + portp->portidx;
+ bits = ((volatile unsigned char *) hdrp) + brdp->slaveoffset +
+ portp->portidx;
*bits |= portp->portbit;
set_bit(ST_TXBUSY, &portp->state);
@@ -1736,12 +1780,14 @@
copy_from_user(&sio, sp, sizeof(struct serial_struct));
if (!suser()) {
if ((sio.baud_base != portp->baud_base) ||
- (sio.close_delay != portp->close_delay) ||
- ((sio.flags & ~ASYNC_USR_MASK) != (portp->flags & ~ASYNC_USR_MASK)))
+ (sio.close_delay != portp->close_delay) ||
+ ((sio.flags & ~ASYNC_USR_MASK) !=
+ (portp->flags & ~ASYNC_USR_MASK)))
return(-EPERM);
}
- portp->flags = (portp->flags & ~ASYNC_USR_MASK) | (sio.flags & ASYNC_USR_MASK);
+ portp->flags = (portp->flags & ~ASYNC_USR_MASK) |
+ (sio.flags & ASYNC_USR_MASK);
portp->baud_base = sio.baud_base;
portp->close_delay = sio.close_delay;
portp->closing_wait = sio.closing_wait;
@@ -1763,7 +1809,8 @@
int rc;
#if DEBUG
- printk("stli_ioctl(tty=%x,file=%x,cmd=%x,arg=%x)\n", (int) tty, (int) file, cmd, (int) arg);
+ printk("stli_ioctl(tty=%x,file=%x,cmd=%x,arg=%x)\n",
+ (int) tty, (int) file, cmd, (int) arg);
#endif
if (tty == (struct tty_struct *) NULL)
@@ -1778,7 +1825,7 @@
return(0);
if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
- (cmd != COM_GETPORTSTATS) && (cmd != COM_CLRPORTSTATS)) {
+ (cmd != COM_GETPORTSTATS) && (cmd != COM_CLRPORTSTATS)) {
if (tty->flags & (1 << TTY_IO_ERROR))
return(-EIO);
}
@@ -1786,85 +1833,92 @@
rc = 0;
switch (cmd) {
- case TCSBRK:
- if ((rc = tty_check_change(tty)) == 0) {
- tty_wait_until_sent(tty, 0);
- if (! arg) {
- lval = 250;
- rc = stli_cmdwait(brdp, portp, A_BREAK, &lval, sizeof(unsigned long), 0);
- }
- }
- break;
- case TCSBRKP:
- if ((rc = tty_check_change(tty)) == 0) {
- tty_wait_until_sent(tty, 0);
- lval = (arg ? (arg * 100) : 250);
- rc = stli_cmdwait(brdp, portp, A_BREAK, &lval, sizeof(unsigned long), 0);
- }
- break;
case TIOCGSOFTCAR:
rc = put_user(((tty->termios->c_cflag & CLOCAL) ? 1 : 0),
- (unsigned int *) arg);
+ (unsigned int *) arg);
break;
case TIOCSSOFTCAR:
- if ((rc = verify_area(VERIFY_READ, (void *) arg, sizeof(unsigned int))) == 0) {
+ if ((rc = verify_area(VERIFY_READ, (void *) arg,
+ sizeof(unsigned int))) == 0) {
get_user(ival, (unsigned int *) arg);
- tty->termios->c_cflag = (tty->termios->c_cflag & ~CLOCAL) | (ival ? CLOCAL : 0);
+ tty->termios->c_cflag =
+ (tty->termios->c_cflag & ~CLOCAL) |
+ (ival ? CLOCAL : 0);
}
break;
case TIOCMGET:
- if ((rc = verify_area(VERIFY_WRITE, (void *) arg, sizeof(unsigned int))) == 0) {
- if ((rc = stli_cmdwait(brdp, portp, A_GETSIGNALS, &portp->asig, sizeof(asysigs_t), 1)) < 0)
+ if ((rc = verify_area(VERIFY_WRITE, (void *) arg,
+ sizeof(unsigned int))) == 0) {
+ if ((rc = stli_cmdwait(brdp, portp, A_GETSIGNALS,
+ &portp->asig, sizeof(asysigs_t), 1)) < 0)
return(rc);
lval = stli_mktiocm(portp->asig.sigvalue);
put_user(lval, (unsigned int *) arg);
}
break;
case TIOCMBIS:
- if ((rc = verify_area(VERIFY_READ, (void *) arg, sizeof(unsigned int))) == 0) {
+ if ((rc = verify_area(VERIFY_READ, (void *) arg,
+ sizeof(unsigned int))) == 0) {
get_user(ival, (unsigned int *) arg);
- stli_mkasysigs(&portp->asig, ((ival & TIOCM_DTR) ? 1 : -1), ((ival & TIOCM_RTS) ? 1 : -1));
- rc = stli_cmdwait(brdp, portp, A_SETSIGNALS, &portp->asig, sizeof(asysigs_t), 0);
+ stli_mkasysigs(&portp->asig,
+ ((ival & TIOCM_DTR) ? 1 : -1),
+ ((ival & TIOCM_RTS) ? 1 : -1));
+ rc = stli_cmdwait(brdp, portp, A_SETSIGNALS,
+ &portp->asig, sizeof(asysigs_t), 0);
}
break;
case TIOCMBIC:
- if ((rc = verify_area(VERIFY_READ, (void *) arg, sizeof(unsigned int))) == 0) {
+ if ((rc = verify_area(VERIFY_READ, (void *) arg,
+ sizeof(unsigned int))) == 0) {
get_user(ival, (unsigned int *) arg);
- stli_mkasysigs(&portp->asig, ((ival & TIOCM_DTR) ? 0 : -1), ((ival & TIOCM_RTS) ? 0 : -1));
- rc = stli_cmdwait(brdp, portp, A_SETSIGNALS, &portp->asig, sizeof(asysigs_t), 0);
+ stli_mkasysigs(&portp->asig,
+ ((ival & TIOCM_DTR) ? 0 : -1),
+ ((ival & TIOCM_RTS) ? 0 : -1));
+ rc = stli_cmdwait(brdp, portp, A_SETSIGNALS,
+ &portp->asig, sizeof(asysigs_t), 0);
}
break;
case TIOCMSET:
- if ((rc = verify_area(VERIFY_READ, (void *) arg, sizeof(unsigned int))) == 0) {
+ if ((rc = verify_area(VERIFY_READ, (void *) arg,
+ sizeof(unsigned int))) == 0) {
get_user(ival, (unsigned int *) arg);
- stli_mkasysigs(&portp->asig, ((ival & TIOCM_DTR) ? 1 : 0), ((ival & TIOCM_RTS) ? 1 : 0));
- rc = stli_cmdwait(brdp, portp, A_SETSIGNALS, &portp->asig, sizeof(asysigs_t), 0);
+ stli_mkasysigs(&portp->asig,
+ ((ival & TIOCM_DTR) ? 1 : 0),
+ ((ival & TIOCM_RTS) ? 1 : 0));
+ rc = stli_cmdwait(brdp, portp, A_SETSIGNALS,
+ &portp->asig, sizeof(asysigs_t), 0);
}
break;
case TIOCGSERIAL:
- if ((rc = verify_area(VERIFY_WRITE, (void *) arg, sizeof(struct serial_struct))) == 0)
+ if ((rc = verify_area(VERIFY_WRITE, (void *) arg,
+ sizeof(struct serial_struct))) == 0)
stli_getserial(portp, (struct serial_struct *) arg);
break;
case TIOCSSERIAL:
- if ((rc = verify_area(VERIFY_READ, (void *) arg, sizeof(struct serial_struct))) == 0)
- rc = stli_setserial(portp, (struct serial_struct *) arg);
+ if ((rc = verify_area(VERIFY_READ, (void *) arg,
+ sizeof(struct serial_struct))) == 0)
+ rc = stli_setserial(portp, (struct serial_struct *)arg);
break;
case STL_GETPFLAG:
- if ((rc = verify_area(VERIFY_WRITE, (void *) arg, sizeof(unsigned long))) == 0)
+ if ((rc = verify_area(VERIFY_WRITE, (void *) arg,
+ sizeof(unsigned long))) == 0)
put_user(portp->pflag, (unsigned int *) arg);
break;
case STL_SETPFLAG:
- if ((rc = verify_area(VERIFY_READ, (void *) arg, sizeof(unsigned long))) == 0) {
+ if ((rc = verify_area(VERIFY_READ, (void *) arg,
+ sizeof(unsigned long))) == 0) {
get_user(portp->pflag, (unsigned int *) arg);
stli_setport(portp);
}
break;
case COM_GETPORTSTATS:
- if ((rc = verify_area(VERIFY_WRITE, (void *) arg, sizeof(comstats_t))) == 0)
+ if ((rc = verify_area(VERIFY_WRITE, (void *) arg,
+ sizeof(comstats_t))) == 0)
rc = stli_getportstats(portp, (comstats_t *) arg);
break;
case COM_CLRPORTSTATS:
- if ((rc = verify_area(VERIFY_WRITE, (void *) arg, sizeof(comstats_t))) == 0)
+ if ((rc = verify_area(VERIFY_WRITE, (void *) arg,
+ sizeof(comstats_t))) == 0)
rc = stli_clrportstats(portp, (comstats_t *) arg);
break;
case TIOCSERCONFIG:
@@ -1912,13 +1966,15 @@
return;
tiosp = tty->termios;
- if ((tiosp->c_cflag == old->c_cflag) && (tiosp->c_iflag == old->c_iflag))
+ if ((tiosp->c_cflag == old->c_cflag) &&
+ (tiosp->c_iflag == old->c_iflag))
return;
stli_mkasyport(portp, &aport, tiosp);
stli_cmdwait(brdp, portp, A_SETPORT, &aport, sizeof(asyport_t), 0);
stli_mkasysigs(&portp->asig, ((tiosp->c_cflag & CBAUD) ? 1 : 0), -1);
- stli_cmdwait(brdp, portp, A_SETSIGNALS, &portp->asig, sizeof(asysigs_t), 0);
+ stli_cmdwait(brdp, portp, A_SETSIGNALS, &portp->asig,
+ sizeof(asysigs_t), 0);
if ((old->c_cflag & CRTSCTS) && ((tiosp->c_cflag & CRTSCTS) == 0))
tty->hw_stopped = 0;
if (((old->c_cflag & CLOCAL) == 0) && (tiosp->c_cflag & CLOCAL))
@@ -2010,7 +2066,7 @@
memset(&actrl, 0, sizeof(asyctrl_t));
actrl.txctrl = CT_STOPFLOW;
#if 0
- stli_cmdwait(brdp, portp, A_PORTCTRL, &actrl, sizeof(asyctrl_t));
+ stli_cmdwait(brdp, portp, A_PORTCTRL, &actrl, sizeof(asyctrl_t), 0);
#endif
}
@@ -2044,7 +2100,7 @@
memset(&actrl, 0, sizeof(asyctrl_t));
actrl.txctrl = CT_STARTFLOW;
#if 0
- stli_cmdwait(brdp, portp, A_PORTCTRL, &actrl, sizeof(asyctrl_t));
+ stli_cmdwait(brdp, portp, A_PORTCTRL, &actrl, sizeof(asyctrl_t), 0);
#endif
}
@@ -2118,7 +2174,8 @@
set_bit(ST_DOFLUSHTX, &portp->state);
set_bit(ST_DOFLUSHRX, &portp->state);
} else {
- stli_sendcmd(brdp, portp, A_SETSIGNALSF, &portp->asig, sizeof(asysigs_t), 0);
+ stli_sendcmd(brdp, portp, A_SETSIGNALSF,
+ &portp->asig, sizeof(asysigs_t), 0);
}
}
restore_flags(flags);
@@ -2126,7 +2183,6 @@
clear_bit(ST_TXBUSY, &portp->state);
clear_bit(ST_RXSTOP, &portp->state);
set_bit(TTY_IO_ERROR, &tty->flags);
- tty->driver_data = (void *) NULL;
portp->tty = (struct tty_struct *) NULL;
portp->flags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_CALLOUT_ACTIVE);
portp->refcount = 0;
@@ -2178,17 +2234,258 @@
ftype |= FLUSHRX;
clear_bit(ST_DOFLUSHRX, &portp->state);
}
- stli_sendcmd(brdp, portp, A_FLUSH, &ftype, sizeof(unsigned long), 0);
+ stli_sendcmd(brdp, portp, A_FLUSH, &ftype,
+ sizeof(unsigned long), 0);
}
restore_flags(flags);
wake_up_interruptible(&tty->write_wait);
- if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) && tty->ldisc.write_wakeup)
+ if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
+ tty->ldisc.write_wakeup)
(tty->ldisc.write_wakeup)(tty);
}
/*****************************************************************************/
+static void stli_breakctl(struct tty_struct *tty, int state)
+{
+ stlibrd_t *brdp;
+ stliport_t *portp;
+ long arg, savestate, savetime;
+
+#if DEBUG
+ printk("stli_breakctl(tty=%x,state=%d)\n", (int) tty, state);
+#endif
+
+ if (tty == (struct tty_struct *) NULL)
+ return;
+ portp = tty->driver_data;
+ if (portp == (stliport_t *) NULL)
+ return;
+ if ((portp->brdnr < 0) || (portp->brdnr >= stli_nrbrds))
+ return;
+ brdp = stli_brds[portp->brdnr];
+ if (brdp == (stlibrd_t *) NULL)
+ return;
+
+/*
+ * Due to a bug in the tty send_break() code we need to preserve
+ * the current process state and timeout...
+ */
+ savetime = current->timeout;
+ savestate = current->state;
+
+ arg = (state == -1) ? BREAKON : BREAKOFF;
+ stli_cmdwait(brdp, portp, A_BREAK, &arg, sizeof(long), 0);
+
+ current->timeout = savetime;
+ current->state = savestate;
+}
+
+/*****************************************************************************/
+
+static void stli_waituntilsent(struct tty_struct *tty, int timeout)
+{
+ stliport_t *portp;
+ unsigned long tend;
+
+#if DEBUG
+ printk("stli_waituntilsent(tty=%x,timeout=%x)\n", (int) tty, timeout);
+#endif
+
+ if (tty == (struct tty_struct *) NULL)
+ return;
+ portp = tty->driver_data;
+ if (portp == (stliport_t *) NULL)
+ return;
+
+ if (timeout == 0)
+ timeout = HZ;
+ tend = jiffies + timeout;
+
+ while (test_bit(ST_TXBUSY, &portp->state)) {
+ if (signal_pending(current))
+ break;
+ stli_delay(2);
+ if (jiffies >= tend)
+ break;
+ }
+}
+
+/*****************************************************************************/
+
+static void stli_sendxchar(struct tty_struct *tty, char ch)
+{
+ stlibrd_t *brdp;
+ stliport_t *portp;
+ asyctrl_t actrl;
+
+#if DEBUG
+ printk("stli_sendxchar(tty=%x,ch=%x)\n", (int) tty, ch);
+#endif
+
+ if (tty == (struct tty_struct *) NULL)
+ return;
+ portp = tty->driver_data;
+ if (portp == (stliport_t *) NULL)
+ return;
+ if ((portp->brdnr < 0) || (portp->brdnr >= stli_nrbrds))
+ return;
+ brdp = stli_brds[portp->brdnr];
+ if (brdp == (stlibrd_t *) NULL)
+ return;
+
+ memset(&actrl, 0, sizeof(asyctrl_t));
+ if (ch == STOP_CHAR(tty)) {
+ actrl.rxctrl = CT_STOPFLOW;
+ } else if (ch == START_CHAR(tty)) {
+ actrl.rxctrl = CT_STARTFLOW;
+ } else {
+ actrl.txctrl = CT_SENDCHR;
+ actrl.tximdch = ch;
+ }
+
+ stli_cmdwait(brdp, portp, A_PORTCTRL, &actrl, sizeof(asyctrl_t), 0);
+}
+
+/*****************************************************************************/
+
+#define MAXLINE 80
+
+/*
+ * Format info for a specified port. The line is deliberately limited
+ * to 80 characters. (If it is too long it will be truncated, if too
+ * short then padded with spaces).
+ */
+
+static int stli_portinfo(stlibrd_t *brdp, stliport_t *portp, int portnr, char *pos)
+{
+ char *sp, *uart;
+ int rc, cnt;
+
+ rc = stli_portcmdstats(portp);
+
+ uart = "UNKNOWN";
+ if (brdp->state & BST_STARTED) {
+ switch (stli_comstats.hwid) {
+ case 0: uart = "2681"; break;
+ case 1: uart = "SC26198"; break;
+ default: uart = "CD1400"; break;
+ }
+ }
+
+ sp = pos;
+ sp += sprintf(sp, "%d: uart:%s ", portnr, uart);
+
+ if ((brdp->state & BST_STARTED) && (rc >= 0)) {
+ sp += sprintf(sp, "tx:%d rx:%d", (int) stli_comstats.txtotal,
+ (int) stli_comstats.rxtotal);
+
+ if (stli_comstats.rxframing)
+ sp += sprintf(sp, " fe:%d",
+ (int) stli_comstats.rxframing);
+ if (stli_comstats.rxparity)
+ sp += sprintf(sp, " pe:%d",
+ (int) stli_comstats.rxparity);
+ if (stli_comstats.rxbreaks)
+ sp += sprintf(sp, " brk:%d",
+ (int) stli_comstats.rxbreaks);
+ if (stli_comstats.rxoverrun)
+ sp += sprintf(sp, " oe:%d",
+ (int) stli_comstats.rxoverrun);
+
+ cnt = sprintf(sp, "%s%s%s%s%s ",
+ (stli_comstats.signals & TIOCM_RTS) ? "|RTS" : "",
+ (stli_comstats.signals & TIOCM_CTS) ? "|CTS" : "",
+ (stli_comstats.signals & TIOCM_DTR) ? "|DTR" : "",
+ (stli_comstats.signals & TIOCM_CD) ? "|DCD" : "",
+ (stli_comstats.signals & TIOCM_DSR) ? "|DSR" : "");
+ *sp = ' ';
+ sp += cnt;
+ }
+
+ for (cnt = (sp - pos); (cnt < (MAXLINE - 1)); cnt++)
+ *sp++ = ' ';
+ if (cnt >= MAXLINE)
+ pos[(MAXLINE - 2)] = '+';
+ pos[(MAXLINE - 1)] = '\n';
+
+ return(MAXLINE);
+}
+
+/*****************************************************************************/
+
+/*
+ * Port info, read from the /proc file system.
+ */
+
+static int stli_readproc(char *page, char **start, off_t off, int count, int *eof, void *data)
+{
+ stlibrd_t *brdp;
+ stliport_t *portp;
+ int brdnr, portnr, totalport;
+ int curoff, maxoff;
+ char *pos;
+
+#if DEBUG
+ printk("stli_readproc(page=%x,start=%x,off=%x,count=%d,eof=%x,"
+ "data=%x\n", (int) page, (int) start, (int) off, count,
+ (int) eof, (int) data);
+#endif
+
+ pos = page;
+ totalport = 0;
+ curoff = 0;
+
+ if (off == 0) {
+ pos += sprintf(pos, "%s: version %s", stli_drvtitle,
+ stli_drvversion);
+ while (pos < (page + MAXLINE - 1))
+ *pos++ = ' ';
+ *pos++ = '\n';
+ }
+ curoff = MAXLINE;
+
+/*
+ * We scan through for each board, panel and port. The offset is
+ * calculated on the fly, and irrelevant ports are skipped.
+ */
+ for (brdnr = 0; (brdnr < stli_nrbrds); brdnr++) {
+ brdp = stli_brds[brdnr];
+ if (brdp == (stlibrd_t *) NULL)
+ continue;
+ if (brdp->state == 0)
+ continue;
+
+ maxoff = curoff + (brdp->nrports * MAXLINE);
+ if (off >= maxoff) {
+ curoff = maxoff;
+ continue;
+ }
+
+ totalport = brdnr * STL_MAXPORTS;
+ for (portnr = 0; (portnr < brdp->nrports); portnr++,
+ totalport++) {
+ portp = brdp->ports[portnr];
+ if (portp == (stliport_t *) NULL)
+ continue;
+ if (off >= (curoff += MAXLINE))
+ continue;
+ if ((pos - page + MAXLINE) > count)
+ goto stli_readdone;
+ pos += stli_portinfo(brdp, portp, totalport, pos);
+ }
+ }
+
+ *eof = 1;
+
+stli_readdone:
+ *start = page;
+ return(pos - page);
+}
+
+/*****************************************************************************/
+
/*
* Generic send command routine. This will send a message to the slave,
* of the specified type with the specified argument. Must be very
@@ -2207,7 +2504,9 @@
unsigned long flags;
#if DEBUG
- printk("stli_sendcmd(brdp=%x,portp=%x,cmd=%x,arg=%x,size=%d,copyback=%d)\n", (int) brdp, (int) portp, (int) cmd, (int) arg, size, copyback);
+ printk("stli_sendcmd(brdp=%x,portp=%x,cmd=%x,arg=%x,size=%d,"
+ "copyback=%d)\n", (int) brdp, (int) portp, (int) cmd,
+ (int) arg, size, copyback);
#endif
save_flags(flags);
@@ -2231,7 +2530,8 @@
cp->status = 0;
cp->cmd = cmd;
hdrp = (volatile cdkhdr_t *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);
- bits = ((volatile unsigned char *) hdrp) + brdp->slaveoffset + portp->portidx;
+ bits = ((volatile unsigned char *) hdrp) + brdp->slaveoffset +
+ portp->portidx;
*bits |= portp->portbit;
set_bit(ST_CMDING, &portp->state);
EBRDDISABLE(brdp);
@@ -2320,7 +2620,8 @@
int cmd;
if (test_bit(ST_DOSIGS, &portp->state)) {
- if (test_bit(ST_DOFLUSHTX, &portp->state) && test_bit(ST_DOFLUSHRX, &portp->state))
+ if (test_bit(ST_DOFLUSHTX, &portp->state) &&
+ test_bit(ST_DOFLUSHRX, &portp->state))
cmd = A_SETSIGNALSF;
else if (test_bit(ST_DOFLUSHTX, &portp->state))
cmd = A_SETSIGNALSFTX;
@@ -2331,11 +2632,13 @@
clear_bit(ST_DOFLUSHTX, &portp->state);
clear_bit(ST_DOFLUSHRX, &portp->state);
clear_bit(ST_DOSIGS, &portp->state);
- memcpy((void *) &(cp->args[0]), (void *) &portp->asig, sizeof(asysigs_t));
+ memcpy((void *) &(cp->args[0]), (void *) &portp->asig,
+ sizeof(asysigs_t));
cp->status = 0;
cp->cmd = cmd;
set_bit(ST_CMDING, &portp->state);
- } else if (test_bit(ST_DOFLUSHTX, &portp->state) || test_bit(ST_DOFLUSHRX, &portp->state)) {
+ } else if (test_bit(ST_DOFLUSHTX, &portp->state) ||
+ test_bit(ST_DOFLUSHRX, &portp->state)) {
cmd = ((test_bit(ST_DOFLUSHTX, &portp->state)) ? FLUSHTX : 0);
cmd |= ((test_bit(ST_DOFLUSHRX, &portp->state)) ? FLUSHRX : 0);
clear_bit(ST_DOFLUSHTX, &portp->state);
@@ -2416,7 +2719,8 @@
if (rc > 0)
rc--;
if (portp->argp != (void *) NULL) {
- memcpy(portp->argp, (void *) &(cp->args[0]), portp->argsize);
+ memcpy(portp->argp, (void *) &(cp->args[0]),
+ portp->argsize);
portp->argp = (void *) NULL;
}
cp->status = 0;
@@ -2443,12 +2747,14 @@
oldsigs = portp->sigs;
portp->sigs = stli_mktiocm(nt.sigvalue);
clear_bit(ST_GETSIGS, &portp->state);
- if ((portp->sigs & TIOCM_CD) && ((oldsigs & TIOCM_CD) == 0))
+ if ((portp->sigs & TIOCM_CD) &&
+ ((oldsigs & TIOCM_CD) == 0))
wake_up_interruptible(&portp->open_wait);
- if ((oldsigs & TIOCM_CD) && ((portp->sigs & TIOCM_CD) == 0)) {
+ if ((oldsigs & TIOCM_CD) &&
+ ((portp->sigs & TIOCM_CD) == 0)) {
if (portp->flags & ASYNC_CHECK_CD) {
if (! ((portp->flags & ASYNC_CALLOUT_ACTIVE) &&
- (portp->flags & ASYNC_CALLOUT_NOHUP))) {
+ (portp->flags & ASYNC_CALLOUT_NOHUP))) {
if (tty != (struct tty_struct *) NULL)
queue_task(&portp->tqhangup, &tq_scheduler);
}
@@ -2460,7 +2766,8 @@
clear_bit(ST_TXBUSY, &portp->state);
if (nt.data & (DT_TXEMPTY | DT_TXLOW)) {
if (tty != (struct tty_struct *) NULL) {
- if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) && tty->ldisc.write_wakeup) {
+ if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
+ tty->ldisc.write_wakeup) {
(tty->ldisc.write_wakeup)(tty);
EBRDENABLE(brdp);
}
@@ -2474,12 +2781,10 @@
tty->flip.count++;
*tty->flip.flag_buf_ptr++ = TTY_BREAK;
*tty->flip.char_buf_ptr++ = 0;
-#ifndef MODULE
if (portp->flags & ASYNC_SAK) {
do_SAK(tty);
EBRDENABLE(brdp);
}
-#endif
tty_schedule_flip(tty);
}
}
@@ -2538,7 +2843,8 @@
* 8 service bits at a time in the inner loop, so we can bypass
* the lot if none of them want service.
*/
- memcpy(&hostbits[0], (((unsigned char *) hdrp) + brdp->hostoffset), bitsize);
+ memcpy(&hostbits[0], (((unsigned char *) hdrp) + brdp->hostoffset),
+ bitsize);
memset(&slavebits[0], 0, bitsize);
slavebitchange = 0;
@@ -2621,7 +2927,8 @@
static void stli_mkasyport(stliport_t *portp, asyport_t *pp, struct termios *tiosp)
{
#if DEBUG
- printk("stli_mkasyport(portp=%x,pp=%x,tiosp=%d)\n", (int) portp, (int) pp, (int) tiosp);
+ printk("stli_mkasyport(portp=%x,pp=%x,tiosp=%d)\n",
+ (int) portp, (int) pp, (int) tiosp);
#endif
memset(pp, 0, sizeof(asyport_t));
@@ -2632,7 +2939,7 @@
pp->baudout = tiosp->c_cflag & CBAUD;
if (pp->baudout & CBAUDEX) {
pp->baudout &= ~CBAUDEX;
- if ((pp->baudout < 1) || (pp->baudout > 5))
+ if ((pp->baudout < 1) || (pp->baudout > 4))
tiosp->c_cflag &= ~CBAUDEX;
else
pp->baudout += 15;
@@ -2643,6 +2950,10 @@
pp->baudout = 57600;
else if ((portp->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
pp->baudout = 115200;
+ else if ((portp->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
+ pp->baudout = 230400;
+ else if ((portp->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
+ pp->baudout = 460800;
else if ((portp->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST)
pp->baudout = (portp->baud_base / portp->custom_divisor);
}
@@ -2723,7 +3034,10 @@
/*
* Transfer any persistent flags into the asyport structure.
*/
- pp->pflag = portp->pflag;
+ pp->pflag = (portp->pflag & 0xffff);
+ pp->vmin = (portp->pflag & P_RXIMIN) ? 1 : 0;
+ pp->vtime = (portp->pflag & P_RXITIME) ? 1 : 0;
+ pp->cc[1] = (portp->pflag & P_RXTHOLD) ? 1 : 0;
}
/*****************************************************************************/
@@ -2872,11 +3186,14 @@
unsigned char val;
#if DEBUG
- printk("stli_ecpgetmemptr(brdp=%x,offset=%x)\n", (int) brdp, (int) offset);
+ printk("stli_ecpgetmemptr(brdp=%x,offset=%x)\n", (int) brdp,
+ (int) offset);
#endif
if (offset > brdp->memsize) {
- printk("STALLION: shared memory pointer=%x out of range at line=%d(%d), brd=%d\n", (int) offset, line, __LINE__, brdp->brdnr);
+ printk("STALLION: shared memory pointer=%x out of range at "
+ "line=%d(%d), brd=%d\n", (int) offset, line,
+ __LINE__, brdp->brdnr);
ptr = 0;
val = 0;
} else {
@@ -2959,11 +3276,14 @@
unsigned char val;
#if DEBUG
- printk("stli_ecpeigetmemptr(brdp=%x,offset=%x,line=%d)\n", (int) brdp, (int) offset, line);
+ printk("stli_ecpeigetmemptr(brdp=%x,offset=%x,line=%d)\n",
+ (int) brdp, (int) offset, line);
#endif
if (offset > brdp->memsize) {
- printk("STALLION: shared memory pointer=%x out of range at line=%d(%d), brd=%d\n", (int) offset, line, __LINE__, brdp->brdnr);
+ printk("STALLION: shared memory pointer=%x out of range at "
+ "line=%d(%d), brd=%d\n", (int) offset, line,
+ __LINE__, brdp->brdnr);
ptr = 0;
val = 0;
} else {
@@ -3013,7 +3333,9 @@
unsigned char val;
if (offset > brdp->memsize) {
- printk("STALLION: shared memory pointer=%x out of range at line=%d(%d), brd=%d\n", (int) offset, line, __LINE__, brdp->brdnr);
+ printk("STALLION: shared memory pointer=%x out of range at "
+ "line=%d(%d), brd=%d\n", (int) offset, line,
+ __LINE__, brdp->brdnr);
ptr = 0;
val = 0;
} else {
@@ -3088,11 +3410,14 @@
void *ptr;
#if DEBUG
- printk("stli_onbgetmemptr(brdp=%x,offset=%x)\n", (int) brdp, (int) offset);
+ printk("stli_onbgetmemptr(brdp=%x,offset=%x)\n", (int) brdp,
+ (int) offset);
#endif
if (offset > brdp->memsize) {
- printk("STALLION: shared memory pointer=%x out of range at line=%d(%d), brd=%d\n", (int) offset, line, __LINE__, brdp->brdnr);
+ printk("STALLION: shared memory pointer=%x out of range at "
+ "line=%d(%d), brd=%d\n", (int) offset, line,
+ __LINE__, brdp->brdnr);
ptr = 0;
} else {
ptr = brdp->membase + (offset % ONB_ATPAGESIZE);
@@ -3175,11 +3500,14 @@
unsigned char val;
#if DEBUG
- printk("stli_onbegetmemptr(brdp=%x,offset=%x,line=%d)\n", (int) brdp, (int) offset, line);
+ printk("stli_onbegetmemptr(brdp=%x,offset=%x,line=%d)\n",
+ (int) brdp, (int) offset, line);
#endif
if (offset > brdp->memsize) {
- printk("STALLION: shared memory pointer=%x out of range at line=%d(%d), brd=%d\n", (int) offset, line, __LINE__, brdp->brdnr);
+ printk("STALLION: shared memory pointer=%x out of range at "
+ "line=%d(%d), brd=%d\n", (int) offset, line,
+ __LINE__, brdp->brdnr);
ptr = 0;
val = 0;
} else {
@@ -3241,11 +3569,14 @@
unsigned char val;
#if DEBUG
- printk("stli_bbygetmemptr(brdp=%x,offset=%x)\n", (int) brdp, (int) offset);
+ printk("stli_bbygetmemptr(brdp=%x,offset=%x)\n", (int) brdp,
+ (int) offset);
#endif
if (offset > brdp->memsize) {
- printk("STALLION: shared memory pointer=%x out of range at line=%d(%d), brd=%d\n", (int) offset, line, __LINE__, brdp->brdnr);
+ printk("STALLION: shared memory pointer=%x out of range at "
+ "line=%d(%d), brd=%d\n", (int) offset, line,
+ __LINE__, brdp->brdnr);
ptr = 0;
val = 0;
} else {
@@ -3299,11 +3630,14 @@
void *ptr;
#if DEBUG
- printk("stli_stalgetmemptr(brdp=%x,offset=%x)\n", (int) brdp, (int) offset);
+ printk("stli_stalgetmemptr(brdp=%x,offset=%x)\n", (int) brdp,
+ (int) offset);
#endif
if (offset > brdp->memsize) {
- printk("STALLION: shared memory pointer=%x out of range at line=%d(%d), brd=%d\n", (int) offset, line, __LINE__, brdp->brdnr);
+ printk("STALLION: shared memory pointer=%x out of range at "
+ "line=%d(%d), brd=%d\n", (int) offset, line,
+ __LINE__, brdp->brdnr);
ptr = 0;
} else {
ptr = brdp->membase + (offset % STAL_PAGESIZE);
@@ -3341,6 +3675,7 @@
cdkecpsig_t sig;
cdkecpsig_t *sigsp;
unsigned int status, nxtid;
+ char *name;
int panelnr, nrports;
#if DEBUG
@@ -3353,10 +3688,9 @@
if ((brdp->iobase == 0) || (brdp->memaddr == 0))
return(-ENODEV);
- if (check_region(brdp->iobase, ECP_IOSIZE)) {
- printk("STALLION: Warning, unit %d I/O address %x conflicts with another device\n",
- brdp->brdnr, brdp->iobase);
- }
+ if (check_region(brdp->iobase, ECP_IOSIZE))
+ printk("STALLION: Warning, unit %d I/O address %x conflicts "
+ "with another device\n", brdp->brdnr, brdp->iobase);
/*
* Based on the specific board type setup the common vars to access
@@ -3375,6 +3709,7 @@
brdp->getmemptr = stli_ecpgetmemptr;
brdp->intr = stli_ecpintr;
brdp->reset = stli_ecpreset;
+ name = "serial(EC8/64)";
break;
case BRD_ECPE:
@@ -3388,6 +3723,7 @@
brdp->getmemptr = stli_ecpeigetmemptr;
brdp->intr = stli_ecpintr;
brdp->reset = stli_ecpeireset;
+ name = "serial(EC8/64-EI)";
break;
case BRD_ECPMC:
@@ -3401,6 +3737,7 @@
brdp->getmemptr = stli_ecpmcgetmemptr;
brdp->intr = stli_ecpintr;
brdp->reset = stli_ecpmcreset;
+ name = "serial(EC8/64-MCA)";
break;
default:
@@ -3430,10 +3767,11 @@
EBRDDISABLE(brdp);
#if 0
- printk("%s(%d): sig-> magic=%x romver=%x panel=%x,%x,%x,%x,%x,%x,%x,%x\n",
+ printk("%s(%d): sig-> magic=%x rom=%x panel=%x,%x,%x,%x,%x,%x,%x,%x\n",
__FILE__, __LINE__, (int) sig.magic, sig.romver, sig.panelid[0],
- (int) sig.panelid[1], (int) sig.panelid[2], (int) sig.panelid[3],
- (int) sig.panelid[4], (int) sig.panelid[5], (int) sig.panelid[6],
+ (int) sig.panelid[1], (int) sig.panelid[2],
+ (int) sig.panelid[3], (int) sig.panelid[4],
+ (int) sig.panelid[5], (int) sig.panelid[6],
(int) sig.panelid[7]);
#endif
@@ -3448,6 +3786,7 @@
status = sig.panelid[nxtid];
if ((status & ECH_PNLIDMASK) != nxtid)
break;
+
brdp->panelids[panelnr] = status;
nrports = (status & ECH_PNL16PORT) ? 16 : 8;
if ((nrports == 16) && ((status & ECH_PNLXPID) == 0))
@@ -3458,7 +3797,7 @@
brdp->nrpanels++;
}
- request_region(brdp->iobase, ECP_IOSIZE, "serial(ECP)");
+ request_region(brdp->iobase, ECP_IOSIZE, name);
brdp->state |= BST_FOUND;
return(0);
}
@@ -3474,6 +3813,7 @@
{
cdkonbsig_t sig;
cdkonbsig_t *sigsp;
+ char *name;
int i;
#if DEBUG
@@ -3486,10 +3826,9 @@
if ((brdp->iobase == 0) || (brdp->memaddr == 0))
return(-ENODEV);
- if (check_region(brdp->iobase, ONB_IOSIZE)) {
- printk("STALLION: Warning, unit %d I/O address %x conflicts with another device\n",
- brdp->brdnr, brdp->iobase);
- }
+ if (check_region(brdp->iobase, ONB_IOSIZE))
+ printk("STALLION: Warning, unit %d I/O address %x conflicts "
+ "with another device\n", brdp->brdnr, brdp->iobase);
/*
* Based on the specific board type setup the common vars to access
@@ -3516,6 +3855,7 @@
brdp->enabval = ONB_MEMENABHI;
else
brdp->enabval = ONB_MEMENABLO;
+ name = "serial(ONBoard)";
break;
case BRD_ONBOARDE:
@@ -3529,6 +3869,7 @@
brdp->getmemptr = stli_onbegetmemptr;
brdp->intr = stli_ecpintr;
brdp->reset = stli_onbereset;
+ name = "serial(ONBoard/E)";
break;
case BRD_BRUMBY4:
@@ -3544,6 +3885,7 @@
brdp->getmemptr = stli_bbygetmemptr;
brdp->intr = stli_ecpintr;
brdp->reset = stli_bbyreset;
+ name = "serial(Brumby)";
break;
case BRD_STALLION:
@@ -3557,6 +3899,7 @@
brdp->getmemptr = stli_stalgetmemptr;
brdp->intr = stli_ecpintr;
brdp->reset = stli_stalreset;
+ name = "serial(Stallion)";
break;
default:
@@ -3592,7 +3935,7 @@
#endif
if ((sig.magic0 != ONB_MAGIC0) || (sig.magic1 != ONB_MAGIC1) ||
- (sig.magic2 != ONB_MAGIC2) || (sig.magic3 != ONB_MAGIC3))
+ (sig.magic2 != ONB_MAGIC2) || (sig.magic3 != ONB_MAGIC3))
return(-ENODEV);
/*
@@ -3611,7 +3954,7 @@
}
brdp->panels[0] = brdp->nrports;
- request_region(brdp->iobase, ONB_IOSIZE, "serial(ONB/BBY)");
+ request_region(brdp->iobase, ONB_IOSIZE, name);
brdp->state |= BST_FOUND;
return(0);
}
@@ -3646,14 +3989,16 @@
nrdevs = hdrp->nrdevs;
#if 0
- printk("%s(%d): CDK version %d.%d.%d --> nrdevs=%d memp=%x hostp=%x slavep=%x\n",
+ printk("%s(%d): CDK version %d.%d.%d --> "
+ "nrdevs=%d memp=%x hostp=%x slavep=%x\n",
__FILE__, __LINE__, hdrp->ver_release, hdrp->ver_modification,
hdrp->ver_fix, nrdevs, (int) hdrp->memp, (int) hdrp->hostp,
(int) hdrp->slavep);
#endif
if (nrdevs < (brdp->nrports + 1)) {
- printk("STALLION: slave failed to allocate memory for all devices, devices=%d\n", nrdevs);
+ printk("STALLION: slave failed to allocate memory for all "
+ "devices, devices=%d\n", nrdevs);
brdp->nrports = nrdevs - 1;
}
brdp->nrdevs = nrdevs;
@@ -3765,20 +4110,27 @@
case BRD_ECH:
case BRD_ECHMC:
case BRD_ECHPCI:
- printk("STALLION: %s board type not supported in this driver\n", stli_brdnames[brdp->brdtype]);
+ printk("STALLION: %s board type not supported in this driver\n",
+ stli_brdnames[brdp->brdtype]);
return(ENODEV);
default:
- printk("STALLION: unit=%d is unknown board type=%d\n", brdp->brdnr, brdp->brdtype);
+ printk("STALLION: unit=%d is unknown board type=%d\n",
+ brdp->brdnr, brdp->brdtype);
return(ENODEV);
}
if ((brdp->state & BST_FOUND) == 0) {
- printk("STALLION: %s board not found, unit=%d io=%x mem=%x\n", stli_brdnames[brdp->brdtype], brdp->brdnr, brdp->iobase, (int) brdp->memaddr);
+ printk("STALLION: %s board not found, unit=%d io=%x mem=%x\n",
+ stli_brdnames[brdp->brdtype], brdp->brdnr,
+ brdp->iobase, (int) brdp->memaddr);
return(ENODEV);
}
stli_initports(brdp);
- printk("STALLION: %s found, unit=%d io=%x mem=%x nrpanels=%d nrports=%d\n", stli_brdnames[brdp->brdtype], brdp->brdnr, brdp->iobase, (int) brdp->memaddr, brdp->nrpanels, brdp->nrports);
+ printk("STALLION: %s found, unit=%d io=%x mem=%x "
+ "nrpanels=%d nrports=%d\n", stli_brdnames[brdp->brdtype],
+ brdp->brdnr, brdp->iobase, (int) brdp->memaddr,
+ brdp->nrpanels, brdp->nrports);
return(0);
}
@@ -3789,7 +4141,7 @@
* might be. This is a bit if hack, but it is the best we can do.
*/
-__initfunc(static int stli_eisamemprobe(stlibrd_t *brdp))
+static inline int stli_eisamemprobe(stlibrd_t *brdp)
{
cdkecpsig_t ecpsig, *ecpsigp;
cdkonbsig_t onbsig, *onbsigp;
@@ -3841,15 +4193,19 @@
continue;
if (brdp->brdtype == BRD_ECPE) {
- ecpsigp = (cdkecpsig_t *) stli_ecpeigetmemptr(brdp, CDK_SIGADDR, __LINE__);
+ ecpsigp = (cdkecpsig_t *) stli_ecpeigetmemptr(brdp,
+ CDK_SIGADDR, __LINE__);
memcpy(&ecpsig, ecpsigp, sizeof(cdkecpsig_t));
if (ecpsig.magic == ECP_MAGIC)
foundit = 1;
} else {
- onbsigp = (cdkonbsig_t *) stli_onbegetmemptr(brdp, CDK_SIGADDR, __LINE__);
+ onbsigp = (cdkonbsig_t *) stli_onbegetmemptr(brdp,
+ CDK_SIGADDR, __LINE__);
memcpy(&onbsig, onbsigp, sizeof(cdkonbsig_t));
- if ((onbsig.magic0 == ONB_MAGIC0) && (onbsig.magic1 == ONB_MAGIC1) &&
- (onbsig.magic2 == ONB_MAGIC2) && (onbsig.magic3 == ONB_MAGIC3))
+ if ((onbsig.magic0 == ONB_MAGIC0) &&
+ (onbsig.magic1 == ONB_MAGIC1) &&
+ (onbsig.magic2 == ONB_MAGIC2) &&
+ (onbsig.magic3 == ONB_MAGIC3))
foundit = 1;
}
@@ -3870,7 +4226,9 @@
if (! foundit) {
brdp->memaddr = 0;
brdp->membase = 0;
- printk("STALLION: failed to probe shared memory region for %s in EISA slot=%d\n", stli_brdnames[brdp->brdtype], (brdp->iobase >> 12));
+ printk("STALLION: failed to probe shared memory region for "
+ "%s in EISA slot=%d\n", stli_brdnames[brdp->brdtype],
+ (brdp->iobase >> 12));
return(-ENODEV);
}
return(0);
@@ -3936,7 +4294,8 @@
* info table.
*/
if (stli_nrbrds >= STL_MAXBRDS) {
- printk("STALLION: no room for more probed boards, maximum supported %d\n", STL_MAXBRDS);
+ printk("STALLION: no room for more probed boards, "
+ "maximum supported %d\n", STL_MAXBRDS);
break;
}
@@ -3946,7 +4305,8 @@
*/
brdp = (stlibrd_t *) stli_memalloc(sizeof(stlibrd_t));
if (brdp == (stlibrd_t *) NULL) {
- printk("STALLION: failed to allocate memory (size=%d)\n", sizeof(stlibrd_t));
+ printk("STALLION: failed to allocate memory "
+ "(size=%d)\n", sizeof(stlibrd_t));
return(-ENOMEM);
}
memset(brdp, 0, sizeof(stlibrd_t));
@@ -3988,7 +4348,8 @@
#endif
if (stli_nrbrds > STL_MAXBRDS) {
- printk("STALLION: too many boards in configuration table, truncating to %d\n", STL_MAXBRDS);
+ printk("STALLION: too many boards in configuration table, "
+ "truncating to %d\n", STL_MAXBRDS);
stli_nrbrds = STL_MAXBRDS;
}
@@ -4000,7 +4361,8 @@
confp = &stli_brdconf[i];
brdp = (stlibrd_t *) stli_memalloc(sizeof(stlibrd_t));
if (brdp == (stlibrd_t *) NULL) {
- printk("STALLION: failed to allocate memory (size=%d)\n", sizeof(stlibrd_t));
+ printk("STALLION: failed to allocate memory "
+ "(size=%d)\n", sizeof(stlibrd_t));
return(-ENOMEM);
}
memset(brdp, 0, sizeof(stlibrd_t));
@@ -4034,7 +4396,9 @@
nxtbrdp = stli_brds[j];
if (nxtbrdp == (stlibrd_t *) NULL)
continue;
- if ((brdp->membase >= nxtbrdp->membase) && (brdp->membase <= (nxtbrdp->membase + nxtbrdp->memsize - 1))) {
+ if ((brdp->membase >= nxtbrdp->membase) &&
+ (brdp->membase <= (nxtbrdp->membase +
+ nxtbrdp->memsize - 1))) {
stli_shared++;
break;
}
@@ -4066,7 +4430,7 @@
* the slave image (and debugging :-)
*/
-static long stli_memread(struct inode *ip, struct file *fp, char *buf, unsigned long count)
+static ssize_t stli_memread(struct file *fp, char *buf, size_t count, loff_t *offp)
{
unsigned long flags;
void *memptr;
@@ -4074,10 +4438,11 @@
int brdnr, size, n;
#if DEBUG
- printk("stli_memread(ip=%x,fp=%x,buf=%x,count=%lu)\n", (int) ip, (int) fp, (int) buf, count);
+ printk("stli_memread(fp=%x,buf=%x,count=%x,offp=%x)\n", (int) fp,
+ (int) buf, count, (int) offp);
#endif
- brdnr = MINOR(ip->i_rdev);
+ brdnr = MINOR(fp->f_dentry->d_inode->i_rdev);
if (brdnr >= stli_nrbrds)
return(-ENODEV);
brdp = stli_brds[brdnr];
@@ -4115,7 +4480,7 @@
* the slave image (and debugging :-)
*/
-static long stli_memwrite(struct inode *ip, struct file *fp, const char *buf, unsigned long count)
+static ssize_t stli_memwrite(struct file *fp, const char *buf, size_t count, loff_t *offp)
{
unsigned long flags;
void *memptr;
@@ -4124,10 +4489,11 @@
int brdnr, size, n;
#if DEBUG
- printk("stli_memwrite(ip=%x,fp=%x,buf=%x,count=%lu)\n", (int) ip, (int) fp, (int) buf, count);
+ printk("stli_memwrite(fp=%x,buf=%x,count=%x,offp=%x)\n", (int) fp,
+ (int) buf, count, (int) offp);
#endif
- brdnr = MINOR(ip->i_rdev);
+ brdnr = MINOR(fp->f_dentry->d_inode->i_rdev);
if (brdnr >= stli_nrbrds)
return(-ENODEV);
brdp = stli_brds[brdnr];
@@ -4226,31 +4592,28 @@
* what port to get stats for (used through board control device).
*/
-static int stli_getportstats(stliport_t *portp, comstats_t *cp)
+static int stli_portcmdstats(stliport_t *portp)
{
unsigned long flags;
stlibrd_t *brdp;
int rc;
- if (portp == (stliport_t *) NULL) {
- copy_from_user(&stli_comstats, cp, sizeof(comstats_t));
- portp = stli_getport(stli_comstats.brd, stli_comstats.panel, stli_comstats.port);
- if (portp == (stliport_t *) NULL)
- return(-ENODEV);
- }
+ memset(&stli_comstats, 0, sizeof(comstats_t));
+ if (portp == (stliport_t *) NULL)
+ return(-ENODEV);
brdp = stli_brds[portp->brdnr];
if (brdp == (stlibrd_t *) NULL)
return(-ENODEV);
if (brdp->state & BST_STARTED) {
- if ((rc = stli_cmdwait(brdp, portp, A_GETSTATS, &stli_cdkstats, sizeof(asystats_t), 1)) < 0)
+ if ((rc = stli_cmdwait(brdp, portp, A_GETSTATS,
+ &stli_cdkstats, sizeof(asystats_t), 1)) < 0)
return(rc);
} else {
memset(&stli_cdkstats, 0, sizeof(asystats_t));
}
- memset(&stli_comstats, 0, sizeof(comstats_t));
stli_comstats.brd = portp->brdnr;
stli_comstats.panel = portp->panelnr;
stli_comstats.port = portp->portnr;
@@ -4293,6 +4656,37 @@
stli_comstats.hwid = stli_cdkstats.hwid;
stli_comstats.signals = stli_mktiocm(stli_cdkstats.signals);
+ return(0);
+}
+
+/*****************************************************************************/
+
+/*
+ * Return the port stats structure to user app. A NULL port struct
+ * pointer passed in means that we need to find out from the app
+ * what port to get stats for (used through board control device).
+ */
+
+static int stli_getportstats(stliport_t *portp, comstats_t *cp)
+{
+ stlibrd_t *brdp;
+ int rc;
+
+ if (portp == (stliport_t *) NULL) {
+ copy_from_user(&stli_comstats, cp, sizeof(comstats_t));
+ portp = stli_getport(stli_comstats.brd, stli_comstats.panel,
+ stli_comstats.port);
+ if (portp == (stliport_t *) NULL)
+ return(-ENODEV);
+ }
+
+ brdp = stli_brds[portp->brdnr];
+ if (brdp == (stlibrd_t *) NULL)
+ return(-ENODEV);
+
+ if ((rc = stli_portcmdstats(portp)) < 0)
+ return(rc);
+
copy_to_user(cp, &stli_comstats, sizeof(comstats_t));
return(0);
}
@@ -4310,7 +4704,8 @@
if (portp == (stliport_t *) NULL) {
copy_from_user(&stli_comstats, cp, sizeof(comstats_t));
- portp = stli_getport(stli_comstats.brd, stli_comstats.panel, stli_comstats.port);
+ portp = stli_getport(stli_comstats.brd, stli_comstats.panel,
+ stli_comstats.port);
if (portp == (stliport_t *) NULL)
return(-ENODEV);
}
@@ -4375,6 +4770,27 @@
/*****************************************************************************/
/*
+ * Memory device open code. Need to keep track of opens and close
+ * for module handling.
+ */
+
+static int stli_memopen(struct inode *ip, struct file *fp)
+{
+ MOD_INC_USE_COUNT;
+ return(0);
+}
+
+/*****************************************************************************/
+
+static int stli_memclose(struct inode *ip, struct file *fp)
+{
+ MOD_DEC_USE_COUNT;
+ return(0);
+}
+
+/*****************************************************************************/
+
+/*
* The "staliomem" device is also required to do some special operations on
* the board. We need to be able to send an interrupt to the board,
* reset it, and start/stop it.
@@ -4386,7 +4802,8 @@
int brdnr, rc, done;
#if DEBUG
- printk("stli_memioctl(ip=%x,fp=%x,cmd=%x,arg=%x)\n", (int) ip, (int) fp, cmd, (int) arg);
+ printk("stli_memioctl(ip=%x,fp=%x,cmd=%x,arg=%x)\n", (int) ip,
+ (int) fp, cmd, (int) arg);
#endif
/*
@@ -4397,27 +4814,34 @@
switch (cmd) {
case COM_GETPORTSTATS:
- if ((rc = verify_area(VERIFY_WRITE, (void *) arg, sizeof(comstats_t))) == 0)
- rc = stli_getportstats((stliport_t *) NULL, (comstats_t *) arg);
+ if ((rc = verify_area(VERIFY_WRITE, (void *) arg,
+ sizeof(comstats_t))) == 0)
+ rc = stli_getportstats((stliport_t *) NULL,
+ (comstats_t *) arg);
done++;
break;
case COM_CLRPORTSTATS:
- if ((rc = verify_area(VERIFY_WRITE, (void *) arg, sizeof(comstats_t))) == 0)
- rc = stli_clrportstats((stliport_t *) NULL, (comstats_t *) arg);
+ if ((rc = verify_area(VERIFY_WRITE, (void *) arg,
+ sizeof(comstats_t))) == 0)
+ rc = stli_clrportstats((stliport_t *) NULL,
+ (comstats_t *) arg);
done++;
break;
case COM_GETBRDSTATS:
- if ((rc = verify_area(VERIFY_WRITE, (void *) arg, sizeof(combrd_t))) == 0)
+ if ((rc = verify_area(VERIFY_WRITE, (void *) arg,
+ sizeof(combrd_t))) == 0)
rc = stli_getbrdstats((combrd_t *) arg);
done++;
break;
case COM_READPORT:
- if ((rc = verify_area(VERIFY_WRITE, (void *) arg, sizeof(stliport_t))) == 0)
+ if ((rc = verify_area(VERIFY_WRITE, (void *) arg,
+ sizeof(stliport_t))) == 0)
rc = stli_getportstruct(arg);
done++;
break;
case COM_READBOARD:
- if ((rc = verify_area(VERIFY_WRITE, (void *) arg, sizeof(stlibrd_t))) == 0)
+ if ((rc = verify_area(VERIFY_WRITE, (void *) arg,
+ sizeof(stlibrd_t))) == 0)
rc = stli_getbrdstruct(arg);
done++;
break;
@@ -4469,9 +4893,9 @@
/*****************************************************************************/
-__initfunc(int stli_init())
+__initfunc(int stli_init(void))
{
- printk(KERN_INFO "%s: version %s\n", stli_drvname, stli_drvversion);
+ printk(KERN_INFO "%s: version %s\n", stli_drvtitle, stli_drvversion);
stli_initbrds();
@@ -4480,10 +4904,12 @@
*/
stli_tmpwritebuf = (char *) stli_memalloc(STLI_TXBUFSIZE);
if (stli_tmpwritebuf == (char *) NULL)
- printk("STALLION: failed to allocate memory (size=%d)\n", STLI_TXBUFSIZE);
+ printk("STALLION: failed to allocate memory (size=%d)\n",
+ STLI_TXBUFSIZE);
stli_txcookbuf = (char *) stli_memalloc(STLI_TXBUFSIZE);
if (stli_txcookbuf == (char *) NULL)
- printk("STALLION: failed to allocate memory (size=%d)\n", STLI_TXBUFSIZE);
+ printk("STALLION: failed to allocate memory (size=%d)\n",
+ STLI_TXBUFSIZE);
/*
* Set up a character driver for the shared memory region. We need this
@@ -4498,6 +4924,7 @@
*/
memset(&stli_serial, 0, sizeof(struct tty_driver));
stli_serial.magic = TTY_DRIVER_MAGIC;
+ stli_serial.driver_name = stli_drvname;
stli_serial.name = stli_serialname;
stli_serial.major = STL_SERIALMAJOR;
stli_serial.minor_start = 0;
@@ -4526,11 +4953,16 @@
stli_serial.start = stli_start;
stli_serial.hangup = stli_hangup;
stli_serial.flush_buffer = stli_flushbuffer;
+ stli_serial.break_ctl = stli_breakctl;
+ stli_serial.wait_until_sent = stli_waituntilsent;
+ stli_serial.send_xchar = stli_sendxchar;
+ stli_serial.read_proc = stli_readproc;
stli_callout = stli_serial;
stli_callout.name = stli_calloutname;
stli_callout.major = STL_CALLOUTMAJOR;
stli_callout.subtype = STL_DRVTYPCALLOUT;
+ stli_callout.read_proc = 0;
if (tty_register_driver(&stli_serial))
printk("STALLION: failed to register serial driver\n");
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov