diff options
author | tanimura <tanimura@FreeBSD.org> | 2000-06-12 15:21:59 +0000 |
---|---|---|
committer | tanimura <tanimura@FreeBSD.org> | 2000-06-12 15:21:59 +0000 |
commit | 5b16a7cb5e64de401c8b380214f52bdba3c9fe9d (patch) | |
tree | 3424f4123c372e163c234165f5f5b375b307a6ba /sys/dev/rp/rp.c | |
parent | 4b768a4a2f1fc42357d3b8c5b1c553ad0874793f (diff) | |
download | FreeBSD-src-5b16a7cb5e64de401c8b380214f52bdba3c9fe9d.zip FreeBSD-src-5b16a7cb5e64de401c8b380214f52bdba3c9fe9d.tar.gz |
- Eliminate rpread(). Call generic ttyread(). (cf rev 1.33)
- Comment out deftermios. Termioschars() will give the default
value.
Pointed out by: bde
Diffstat (limited to 'sys/dev/rp/rp.c')
-rw-r--r-- | sys/dev/rp/rp.c | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c index 0590a72..215ddf6 100644 --- a/sys/dev/rp/rp.c +++ b/sys/dev/rp/rp.c @@ -113,6 +113,8 @@ Byte_t rp_sBitMapSetTbl[8] = 0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80 }; +/* Actually not used */ +#if notdef struct termios deftermios = { TTYDEF_IFLAG, TTYDEF_OFLAG, @@ -124,6 +126,7 @@ struct termios deftermios = { TTYDEF_SPEED, TTYDEF_SPEED }; +#endif /*************************************************************************** Function: sReadAiopID @@ -563,7 +566,6 @@ static timeout_t rpdtrwakeup; static d_open_t rpopen; static d_close_t rpclose; -static d_read_t rpread; static d_write_t rpwrite; static d_ioctl_t rpioctl; @@ -571,7 +573,7 @@ static d_ioctl_t rpioctl; struct cdevsw rp_cdevsw = { /* open */ rpopen, /* close */ rpclose, - /* read */ rpread, + /* read */ ttyread, /* write */ rpwrite, /* ioctl */ rpioctl, /* poll */ ttypoll, @@ -1188,30 +1190,6 @@ rphardclose(struct rp_port *rp) static int -rpread(dev, uio, flag) - dev_t dev; - struct uio *uio; - int flag; -{ - struct rp_port *rp; - struct tty *tp; - int unit, mynor, umynor, port, error = 0; /* SG */ - - umynor = (((minor(dev) >> 16) -1) * 32); /* SG */ - port = (minor(dev) & 0x1f); /* SG */ - mynor = (port + umynor); /* SG */ - unit = minor_to_unit[mynor]; /* SG */ - - if(IS_CONTROL(dev)) - return(ENODEV); - rp = rp_addr(unit) + port; - tp = rp->rp_tty; - error = (*linesw[tp->t_line].l_read)(tp, uio, flag); - return(error); -} - -static -int rpwrite(dev, uio, flag) dev_t dev; struct uio *uio; |