diff options
author | kato <kato@FreeBSD.org> | 1998-08-28 12:45:43 +0000 |
---|---|---|
committer | kato <kato@FreeBSD.org> | 1998-08-28 12:45:43 +0000 |
commit | 1217ca484ec4b232c6796b09a02d09fd9280930a (patch) | |
tree | 02bb2121a8bbd4b39625f1d267c9bbe8290d8876 /sys/pc98 | |
parent | b0a0bc33d95990ec4e5c8b176e642912e906e886 (diff) | |
download | FreeBSD-src-1217ca484ec4b232c6796b09a02d09fd9280930a.zip FreeBSD-src-1217ca484ec4b232c6796b09a02d09fd9280930a.tar.gz |
Sync with sys/i386/isa/syscons.c revision 1.276.
Diffstat (limited to 'sys/pc98')
-rw-r--r-- | sys/pc98/pc98/syscons.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/sys/pc98/pc98/syscons.c b/sys/pc98/pc98/syscons.c index 23b2173..51287e5 100644 --- a/sys/pc98/pc98/syscons.c +++ b/sys/pc98/pc98/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.98 1998/08/15 09:08:26 kato Exp $ + * $Id: syscons.c,v 1.99 1998/08/19 09:35:18 kato Exp $ */ #include "sc.h" @@ -375,11 +375,14 @@ static d_ioctl_t scioctl; static d_devtotty_t scdevtotty; static d_mmap_t scmmap; -#define CDEV_MAJOR 12 -static struct cdevsw scdevsw = { +#define CDEV_MAJOR 12 +static struct cdevsw sc_cdevsw = { scopen, scclose, scread, scwrite, scioctl, nullstop, noreset, scdevtotty, - ttpoll, scmmap, nostrategy, "sc", NULL, -1 }; + ttpoll, scmmap, nostrategy, "sc", + NULL, -1, nodump, nopsize, + D_TTY, +}; #ifdef PC98 static u_char ibmpc_to_pc98[16] = @@ -957,16 +960,16 @@ scattach(struct isa_device *dev) at_shutdown(scshutdown, NULL, SHUTDOWN_PRE_SYNC); - cdevsw_add(&cdev, &scdevsw, NULL); + cdevsw_add(&cdev, &sc_cdevsw, NULL); #ifdef DEVFS for (vc = 0; vc < MAXCONS; vc++) - sc_devfs_token[vc] = devfs_add_devswf(&scdevsw, vc, DV_CHR, + sc_devfs_token[vc] = devfs_add_devswf(&sc_cdevsw, vc, DV_CHR, UID_ROOT, GID_WHEEL, 0600, "ttyv%r", vc); sc_vga_devfs_token = devfs_link(sc_devfs_token[0], "vga"); - sc_mouse_devfs_token = devfs_add_devswf(&scdevsw, SC_MOUSE, DV_CHR, + sc_mouse_devfs_token = devfs_add_devswf(&sc_cdevsw, SC_MOUSE, DV_CHR, UID_ROOT, GID_WHEEL, 0600, "sysmouse"); - sc_console_devfs_token = devfs_add_devswf(&scdevsw, SC_CONSOLE, DV_CHR, + sc_console_devfs_token = devfs_add_devswf(&sc_cdevsw, SC_CONSOLE, DV_CHR, UID_ROOT, GID_WHEEL, 0600, "consolectl"); #endif return 0; @@ -1010,7 +1013,6 @@ scopen(dev_t dev, int flag, int mode, struct proc *p) tp->t_lflag = TTYDEF_LFLAG; tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; scparam(tp, &tp->t_termios); - ttsetwater(tp); (*linesw[tp->t_line].l_modem)(tp, 1); if (minor(dev) == SC_MOUSE) mouse_level = 0; /* XXX */ |