diff options
author | pst <pst@FreeBSD.org> | 1995-02-25 20:09:44 +0000 |
---|---|---|
committer | pst <pst@FreeBSD.org> | 1995-02-25 20:09:44 +0000 |
commit | 1dcb420b646ff6fd0ab578e340fd7f26b32ed79d (patch) | |
tree | 1f0482b969de4dd457ac5b450c026dcaab6317e2 /sys/isa | |
parent | 04958419e842202587df95082c8717fe0b164213 (diff) | |
download | FreeBSD-src-1dcb420b646ff6fd0ab578e340fd7f26b32ed79d.zip FreeBSD-src-1dcb420b646ff6fd0ab578e340fd7f26b32ed79d.tar.gz |
(a) remove the pointer to each driver's tty structure array from cdevsw
(b) add a function callback vector to tty drivers that will return a pointer
to a valid tty structure based upon a dev_t
(c) make syscons structures the same size whether or not APM is enabled so
utilities don't crash if NAPM changes (and make the damn kernel compile!)
(d) rewrite /dev/snp ioctl interface so that it is device driver and i386
independant
Diffstat (limited to 'sys/isa')
-rw-r--r-- | sys/isa/sio.c | 41 | ||||
-rw-r--r-- | sys/isa/syscons.c | 63 | ||||
-rw-r--r-- | sys/isa/syscons.h | 11 |
3 files changed, 82 insertions, 33 deletions
diff --git a/sys/isa/sio.c b/sys/isa/sio.c index c284150..39bec6d 100644 --- a/sys/isa/sio.c +++ b/sys/isa/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.65 1995/01/20 07:34:15 wpaul Exp $ + * $Id: sio.c,v 1.66 1995/02/24 00:11:01 ache Exp $ */ #include "sio.h" @@ -1819,15 +1819,50 @@ siostop(tp, rw) enable_intr(); } +struct tty * +siodevtotty(dev) + dev_t dev; +{ + register int mynor, unit; + struct com_s *com; + + mynor = minor(dev); + if (mynor & CONTROL_MASK) + return NULL; + + unit = MINOR_TO_UNIT(mynor); + if (unit >= NSIO) + return NULL; + + com = com_addr(unit); + if (com == NULL) + return NULL; + + return com->tp; +} + int sioselect(dev, rw, p) dev_t dev; int rw; struct proc *p; { - if (minor(dev) & CONTROL_MASK) + register int mynor, unit; + struct com_s *com; + + mynor = minor(dev); + if (mynor & CONTROL_MASK) return (ENODEV); - return (ttselect(dev & ~MINOR_MAGIC_MASK, rw, p)); + + unit = MINOR_TO_UNIT(mynor); + if (unit >= NSIO) + return (ENXIO); + + com = com_addr(unit); + if (com == NULL) + return (ENXIO); + + return (ttyselect(com->tp, rw, p)); } static void diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c index 1671125..379776b 100644 --- a/sys/isa/syscons.c +++ b/sys/isa/syscons.c @@ -25,10 +25,11 @@ * (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$ + * $Id: syscons.c,v 1.104 1995/02/22 13:40:19 sos Exp $ */ #include "sc.h" +#include "apm.h" #if NSC > 0 #include <sys/param.h> #include <sys/systm.h> @@ -50,6 +51,7 @@ #include <machine/psl.h> #include <machine/frame.h> #include <machine/pc/display.h> +#include <machine/apm_bios.h> #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> @@ -61,10 +63,6 @@ #if !defined(MAXCONS) #define MAXCONS 16 #endif -#include "apm.h" -#if NAPM > 0 -#include "machine/apm_bios.h" -#endif /* this may break on older VGA's but is usefull on real 32 bit systems */ #define bcopyw bcopy @@ -218,6 +216,19 @@ sc_registerdev(struct isa_device *id) dev_attach(&kdc_sc[id->id_unit]); } +#if NAPM > 0 +static int +scresume(void *dummy) +{ + shfts = 0; + ctls = 0; + alts = 0; + agrs = 0; + metas = 0; + return 0; +} +#endif + int scattach(struct isa_device *dev) { @@ -267,7 +278,7 @@ scattach(struct isa_device *dev) update_leds(scp->status); sc_registerdev(dev); #if NAPM > 0 - scp->r_hook.ah_fun = pcresume; + scp->r_hook.ah_fun = scresume; scp->r_hook.ah_arg = NULL; scp->r_hook.ah_name = "system keyboard"; scp->r_hook.ah_order = APM_MID_ORDER; @@ -276,8 +287,8 @@ scattach(struct isa_device *dev) return 0; } -static struct tty -*get_tty_ptr(dev_t dev) +struct tty +*scdevtotty(dev_t dev) { int unit = minor(dev); @@ -288,6 +299,17 @@ static struct tty return VIRTUAL_TTY(unit); } +int +scselect(dev_t dev, int rw, struct proc *p) +{ + struct tty *tp = scdevtotty(dev); + + if (tp == NULL) + return(ENXIO); + + return (ttyselect(tp, rw, p)); +} + static scr_stat *get_scr_stat(dev_t dev) { @@ -313,7 +335,7 @@ get_scr_num() int scopen(dev_t dev, int flag, int mode, struct proc *p) { - struct tty *tp = get_tty_ptr(dev); + struct tty *tp = scdevtotty(dev); if (!tp) return(ENXIO); @@ -344,7 +366,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 = get_tty_ptr(dev); + struct tty *tp = scdevtotty(dev); struct scr_stat *scp; if (!tp) @@ -379,7 +401,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 = get_tty_ptr(dev); + struct tty *tp = scdevtotty(dev); if (!tp) return(ENXIO); @@ -389,7 +411,7 @@ scread(dev_t dev, struct uio *uio, int flag) int scwrite(dev_t dev, struct uio *uio, int flag) { - struct tty *tp = get_tty_ptr(dev); + struct tty *tp = scdevtotty(dev); if (!tp) return(ENXIO); @@ -458,7 +480,7 @@ scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p) struct trapframe *fp; scr_stat *scp; - tp = get_tty_ptr(dev); + tp = scdevtotty(dev); if (!tp) return ENXIO; scp = get_scr_stat(tp->t_dev); @@ -1050,7 +1072,7 @@ set_mouse_pos: void scxint(dev_t dev) { - struct tty *tp = get_tty_ptr(dev); + struct tty *tp = scdevtotty(dev); if (!tp) return; @@ -1094,19 +1116,6 @@ scstart(struct tty *tp) splx(s); } -#if NAPM > 0 -static int -scresume(void *dummy) -{ - shfts = 0; - ctls = 0; - alts = 0; - agrs = 0; - metas = 0; - return 0; -} -#endif - void pccnprobe(struct consdev *cp) { diff --git a/sys/isa/syscons.h b/sys/isa/syscons.h index 546b2de..60cf84e 100644 --- a/sys/isa/syscons.h +++ b/sys/isa/syscons.h @@ -25,9 +25,16 @@ * (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$ + * $Id: syscons.h,v 1.1 1995/02/22 13:40:21 sos Exp $ */ +/* + * The APM stuff is -not- under conditional compilation because we don't want + * the size of the scr_stat structure to vary depending upon if APM has been + * compiled in or not, that can cause utilities and lkms to crash! + */ +#include <machine/apm_bios.h> + /* vm things */ #define ISMAPPED(pa, width) \ (((pa) <= (u_long)0x1000 - (width)) \ @@ -140,9 +147,7 @@ typedef struct scr_stat { u_short *history_pos; /* position shown on screen */ u_short *history_save; /* save area index */ int history_size; /* size of history buffer */ -#if NAPM > 0 struct apmhook r_hook; /* reconfiguration support */ -#endif } scr_stat; typedef struct default_attr { |