diff options
| author | Dale S. Rahn <rahnds@cvs.openbsd.org> | 2000-06-15 03:12:47 +0000 |
|---|---|---|
| committer | Dale S. Rahn <rahnds@cvs.openbsd.org> | 2000-06-15 03:12:47 +0000 |
| commit | 047e6b2e6de64229b26d6c37b6079c79a1e3622d (patch) | |
| tree | d61eab5600a0ae53a456b72b3c81ffec8fcdce9b /sys/arch | |
| parent | 91c9198627a51381295bad0ec7ad113c8e5bfb3d (diff) | |
#if 0 support for WSCONS, not currently used and wscons has changed since
this code worked.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/powerpc/powerpc/conf.c | 39 |
1 files changed, 29 insertions, 10 deletions
diff --git a/sys/arch/powerpc/powerpc/conf.c b/sys/arch/powerpc/powerpc/conf.c index 1f227f1b12f..6d283d4de4e 100644 --- a/sys/arch/powerpc/powerpc/conf.c +++ b/sys/arch/powerpc/powerpc/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.14 1999/11/09 00:20:42 rahnds Exp $ */ +/* $OpenBSD: conf.c,v 1.15 2000/06/15 03:12:46 rahnds Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -110,13 +110,19 @@ cdev_decl(ofrtc); cdev_decl(kbd); cdev_decl(ms); -#define cdev_wscons_init(c,n) { \ - dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ - dev_init(c,n,write), dev_init(c,n,ioctl), dev_init(c,n,stop), \ - dev_init(c,n,tty), ttselect /* ttpoll */, dev_init(c,n,mmap), D_TTY } +#if 0 +#include "wsdisplay.h" +#include "wskdb.h" +#include "wsmouse.h" +#else +#define NWSKBD 0 +#define NWSDISPLAY 0 +#define NWSMOUSE 0 -#include "wscons.h" -cdev_decl(wscons); +cdev_decl(wsdisplay); +cdev_decl(wskdb); +cdev_decl(wsmouse); +#endif #include <sd.h> #include <st.h> @@ -190,12 +196,21 @@ struct cdevsw cdevsw[] = { cdev_bpftun_init(NBPFILTER,bpf),/* 22: berkeley packet filter */ cdev_bpftun_init(NTUN,tun), /* 23: network tunnel */ cdev_lkm_init(NLKM,lkm), /* 24: loadable module driver */ - cdev_wscons_init(NWSCONS,wscons), /* 25: workstation console */ + #if 0 + cdev_wsdisplay_init(NWSDISPLAY,wscons), /* 25: workstation console */ + #else + cdev_notdef(), /* 25 */ + #endif cdev_notdef(), /* 26 */ cdev_notdef(), /* 27 */ cdev_notdef(), /* 28 */ - cdev_mouse_init(NWSCONS,kbd), /* 29 /dev/kbd XX */ - cdev_mouse_init(NWSCONS,ms), /* 30 /dev/mouse XXX */ + #if 0 + cdev_mouse_init(NWSKDB,wskbd), /* 29 /dev/kbd XX */ + cdev_mouse_init(NWSMOUSE,msmouse), /* 30 /dev/mouse XXX */ + #else + cdev_notdef(), /* 29 */ + cdev_notdef(), /* 30 */ + #endif cdev_notdef(), /* 31 */ cdev_notdef(), /* 32 */ cdev_lkm_dummy(), /* 33 */ @@ -315,11 +330,15 @@ blktochr(dev) cons_decl(com); cons_decl(ofc); +/* cons_decl(wscons); */ struct consdev constab[] = { #if NOFCONS > 0 cons_init(ofc), #endif +#if NWSCONS1 > 0 + cons_init(wscons), +#endif #if NCOM > 0 cons_init(com), #endif |