diff options
| author | phk <phk@FreeBSD.org> | 2004-09-17 22:26:27 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2004-09-17 22:26:27 +0000 |
| commit | 2ca675d9a88fde7c309b7bdd38263acc90f3dade (patch) | |
| tree | c9ba1d212146bfd7ea8c0c84066db28dc9e45b41 /sys/dev/sio | |
| parent | b3e38752b197d930007a2a1b66ec10a926cee8a9 (diff) | |
| download | FreeBSD-src-2ca675d9a88fde7c309b7bdd38263acc90f3dade.zip FreeBSD-src-2ca675d9a88fde7c309b7bdd38263acc90f3dade.tar.gz | |
Fix an issue with ng_tty which (ab)used the tty->t_sc field which is
reserved for the device drivers:
Add a t_lsc field for line discipline private use.
Diffstat (limited to 'sys/dev/sio')
| -rw-r--r-- | sys/dev/sio/sio.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index 599f188..9fbfad8 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/sio.c @@ -1152,8 +1152,10 @@ determined_type: ; com->devs[5] = make_dev(&sioc_cdevsw, minorbase | CALLOUT_MASK | CONTROL_LOCK_STATE, UID_UUCP, GID_DIALER, 0660, "cuala%r", unit); - for (rid = 0; rid < 6; rid++) + for (rid = 0; rid < 6; rid++) { com->devs[rid]->si_drv1 = com; + com->devs[rid]->si_tty = tp; + } com->flags = flags; com->pps.ppscap = PPS_CAPTUREASSERT | PPS_CAPTURECLEAR; @@ -1523,7 +1525,7 @@ siowrite(dev, uio, flag) mynor = minor(dev); unit = MINOR_TO_UNIT(mynor); - com = com_addr(unit); + com = dev->si_drv1; if (com == NULL || com->gone) return (ENODEV); /* @@ -1991,10 +1993,10 @@ siocioctl(dev, cmd, data, flag, td) struct termios *ct; mynor = minor(dev); - com = com_addr(MINOR_TO_UNIT(mynor)); - tp = com->tp; + com = dev->si_drv1; if (com == NULL || com->gone) return (ENODEV); + tp = com->tp; switch (mynor & CONTROL_MASK) { case CONTROL_INIT_STATE: |
