d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s/si_tty_tty/si_tty/g

Browse Source
This commit is contained in:
Poul-Henning Kamp 1999-08-30 10:35:37 +00:00
parent 291e7c65a6
commit c5b72c3d85
6 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/sio/sio.c
View File

@ -1160,7 +1160,7 @@ sioopen(dev, flag, mode, p)
return (ENXIO);
if (mynor & CONTROL_MASK)
return (0);
tp = dev->si_tty_tty = com->tp = ttymalloc(com->tp);
tp = dev->si_tty = com->tp = ttymalloc(com->tp);
s = spltty();
/*
* We jump to this label after all non-interrupted sleeps to pick
@ -2431,7 +2431,7 @@ siodevtotty(dev)
unit = MINOR_TO_UNIT(mynor);
if ((u_int) unit >= NSIOTOT)
return (NULL);
return (dev->si_tty_tty);
return (dev->si_tty);
}
static int

20
sys/dev/syscons/syscons.c
View File

@ -373,17 +373,17 @@ sc_attach_unit(int unit, int flags)
for (vc = 0; vc < MAXCONS; vc++) {
dev = make_dev(&sc_cdevsw, vc,
UID_ROOT, GID_WHEEL, 0600, "ttyv%r", vc + unit * MAXCONS);
dev->si_tty_tty = &sc->tty[vc];
dev->si_tty = &sc->tty[vc];
}
if (scp == sc_console) {
#ifndef SC_NO_SYSMOUSE
dev = make_dev(&sc_cdevsw, SC_MOUSE,
UID_ROOT, GID_WHEEL, 0600, "sysmouse");
dev->si_tty_tty = MOUSE_TTY;
dev->si_tty = MOUSE_TTY;
#endif /* SC_NO_SYSMOUSE */
dev = make_dev(&sc_cdevsw, SC_CONSOLECTL,
UID_ROOT, GID_WHEEL, 0600, "consolectl");
dev->si_tty_tty = CONSOLE_TTY;
dev->si_tty = CONSOLE_TTY;
}
return 0;
@ -438,7 +438,7 @@ struct tty
*scdevtotty(dev_t dev)
{
return (dev->si_tty_tty);
return (dev->si_tty);
}
static int
@ -459,7 +459,7 @@ scdevtounit(dev_t dev)
int
scopen(dev_t dev, int flag, int mode, struct proc *p)
{
struct tty *tp = dev->si_tty_tty;
struct tty *tp = dev->si_tty;
int unit = scdevtounit(dev);
sc_softc_t *sc;
keyarg_t key;
@ -526,7 +526,7 @@ scopen(dev_t dev, int flag, int mode, struct proc *p)
int
scclose(dev_t dev, int flag, int mode, struct proc *p)
{
struct tty *tp = dev->si_tty_tty;
struct tty *tp = dev->si_tty;
struct scr_stat *scp;
int s;
@ -584,7 +584,7 @@ scclose(dev_t dev, int flag, int mode, struct proc *p)
int
scread(dev_t dev, struct uio *uio, int flag)
{
struct tty *tp = dev->si_tty_tty;
struct tty *tp = dev->si_tty;
if (!tp)
return(ENXIO);
@ -595,7 +595,7 @@ scread(dev_t dev, struct uio *uio, int flag)
int
scwrite(dev_t dev, struct uio *uio, int flag)
{
struct tty *tp = dev->si_tty_tty;
struct tty *tp = dev->si_tty;
if (!tp)
return(ENXIO);
@ -691,7 +691,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
scr_stat *scp;
int s;
tp = dev->si_tty_tty;
tp = dev->si_tty;
if (!tp)
return ENXIO;
@ -3841,7 +3841,7 @@ scmmap(dev_t dev, vm_offset_t offset, int nprot)
struct tty *tp;
struct scr_stat *scp;
tp = dev->si_tty_tty;
tp = dev->si_tty;
if (!tp)
return ENXIO;
scp = sc_get_scr_stat(tp->t_dev);

4
sys/isa/sio.c
View File

@ -1160,7 +1160,7 @@ sioopen(dev, flag, mode, p)
return (ENXIO);
if (mynor & CONTROL_MASK)
return (0);
tp = dev->si_tty_tty = com->tp = ttymalloc(com->tp);
tp = dev->si_tty = com->tp = ttymalloc(com->tp);
s = spltty();
/*
* We jump to this label after all non-interrupted sleeps to pick
@ -2431,7 +2431,7 @@ siodevtotty(dev)
unit = MINOR_TO_UNIT(mynor);
if ((u_int) unit >= NSIOTOT)
return (NULL);
return (dev->si_tty_tty);
return (dev->si_tty);
}
static int

24
sys/kern/tty_pty.c
View File

@ -166,7 +166,7 @@ ptyinit(n)
0, 0, 0666, "pty%c%r", names[n / 32], n % 32);
devs->si_drv1 = devc->si_drv1 = pt;
devs->si_tty_tty = devc->si_tty_tty = &pt->pt_tty;
devs->si_tty = devc->si_tty = &pt->pt_tty;
ttyregister(&pt->pt_tty);
}
@ -198,7 +198,7 @@ ptsopen(dev, flag, devtype, p)
ptyinit(minor(dev));
if (!dev->si_drv1)
return(ENXIO);
tp = dev->si_tty_tty;
tp = dev->si_tty;
if ((tp->t_state & TS_ISOPEN) == 0) {
ttychars(tp); /* Set up default chars */
tp->t_iflag = TTYDEF_IFLAG;
@ -233,7 +233,7 @@ ptsclose(dev, flag, mode, p)
register struct tty *tp;
int err;
tp = dev->si_tty_tty;
tp = dev->si_tty;
err = (*linesw[tp->t_line].l_close)(tp, flag);
ptsstop(tp, FREAD|FWRITE);
(void) ttyclose(tp);
@ -247,7 +247,7 @@ ptsread(dev, uio, flag)
int flag;
{
struct proc *p = curproc;
register struct tty *tp = dev->si_tty_tty;
register struct tty *tp = dev->si_tty;
register struct pt_ioctl *pti = dev->si_drv1;
int error = 0;
@ -303,7 +303,7 @@ ptswrite(dev, uio, flag)
{
register struct tty *tp;
tp = dev->si_tty_tty;
tp = dev->si_tty;
if (tp->t_oproc == 0)
return (EIO);
return ((*linesw[tp->t_line].l_write)(tp, uio, flag));
@ -358,7 +358,7 @@ ptcopen(dev, flag, devtype, p)
ptyinit(minor(dev));
if (!dev->si_drv1)
return(ENXIO);
tp = dev->si_tty_tty;
tp = dev->si_tty;
if (tp->t_oproc)
return (EIO);
tp->t_oproc = ptsstart;
@ -380,7 +380,7 @@ ptcclose(dev, flags, fmt, p)
{
register struct tty *tp;
tp = dev->si_tty_tty;
tp = dev->si_tty;
(void)(*linesw[tp->t_line].l_modem)(tp, 0);
/*
@ -407,7 +407,7 @@ ptcread(dev, uio, flag)
struct uio *uio;
int flag;
{
register struct tty *tp = dev->si_tty_tty;
register struct tty *tp = dev->si_tty;
struct pt_ioctl *pti = dev->si_drv1;
char buf[BUFSIZ];
int error = 0, cc;
@ -493,7 +493,7 @@ ptcpoll(dev, events, p)
int events;
struct proc *p;
{
register struct tty *tp = dev->si_tty_tty;
register struct tty *tp = dev->si_tty;
struct pt_ioctl *pti = dev->si_drv1;
int revents = 0;
int s;
@ -543,7 +543,7 @@ ptcwrite(dev, uio, flag)
register struct uio *uio;
int flag;
{
register struct tty *tp = dev->si_tty_tty;
register struct tty *tp = dev->si_tty;
register u_char *cp = 0;
register int cc = 0;
u_char locbuf[BUFSIZ];
@ -654,7 +654,7 @@ ptydevtotty(dev)
if (minor(dev) & ~0xff)
return (NULL);
return dev->si_tty_tty;
return dev->si_tty;
}
/*ARGSUSED*/
@ -666,7 +666,7 @@ ptyioctl(dev, cmd, data, flag, p)
int flag;
struct proc *p;
{
register struct tty *tp = dev->si_tty_tty;
register struct tty *tp = dev->si_tty;
register struct pt_ioctl *pti = dev->si_drv1;
register u_char *cc = tp->t_cc;
int stop, error;

4
sys/sys/conf.h
View File

@ -74,8 +74,8 @@ struct specinfo {
} __si_u;
};
#define si_tty_tty __si_u.__si_tty.__sit_tty
#define si_disk __si_u.__si_disk.__sid_disk
#define si_tty __si_u.__si_tty.__sit_tty
#define si_disk __si_u.__si_disk.__sid_disk
#define si_mountpoint __si_u.__si_disk.__sid_mountpoint
#define si_bsize_phys __si_u.__si_disk.__sid_bsize_phys
#define si_bsize_max __si_u.__si_disk.__sid_bsize_max

4
sys/sys/linedisc.h
View File

@ -74,8 +74,8 @@ struct specinfo {
} __si_u;
};
#define si_tty_tty __si_u.__si_tty.__sit_tty
#define si_disk __si_u.__si_disk.__sid_disk
#define si_tty __si_u.__si_tty.__sit_tty
#define si_disk __si_u.__si_disk.__sid_disk
#define si_mountpoint __si_u.__si_disk.__sid_mountpoint
#define si_bsize_phys __si_u.__si_disk.__sid_bsize_phys
#define si_bsize_max __si_u.__si_disk.__sid_bsize_max