From owner-freebsd-commit Sun Sep 10 14:36:27 1995 Return-Path: commit-owner Received: (from majordom@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id OAA23569 for freebsd-commit-outgoing; Sun, 10 Sep 1995 14:36:27 -0700 Received: (from majordom@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id OAA23556 for cvs-all-outgoing; Sun, 10 Sep 1995 14:36:19 -0700 Received: (from majordom@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id OAA23543 for cvs-sys-outgoing; Sun, 10 Sep 1995 14:36:18 -0700 Received: (from bde@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id OAA23533 ; Sun, 10 Sep 1995 14:36:13 -0700 Date: Sun, 10 Sep 1995 14:36:13 -0700 From: Bruce Evans Message-Id: <199509102136.OAA23533@freefall.freebsd.org> To: CVS-commiters, cvs-sys Subject: cvs commit: src/sys/sys conf.h Sender: commit-owner@FreeBSD.org Precedence: bulk bde 95/09/10 14:36:12 Modified: sys/i386/i386 conf.c cons.c cons.h machdep.c sys/i386/isa isa.c isa_device.h syscons.c syscons.h sys/i386/isa/pcvt pcvt_drv.c pcvt_hdr.h pcvt_out.c sys/kern subr_xxx.c sys/sys conf.h Log: Make pcvt and syscons live in the same kernel. If both are enabled, then the first one in the config has priority. They can be switched using userconfig(). i386/i386/conf.c: Initialize the shared syscons/pcvt cdevsw entry to `nx'. Add cdevsw registration functions. Use devsw functions of the correct type if they exist. i386/i386/cons.c: Add renamed syscons entry points to constab. i386/i386/cons.h: Declare the renamed syscons entry points. i386/i386/machdep.c: Repeat console initialization after userconfig() in case the current console has become wrong. This depends on cn functions not wiring down anything important. sys/conf.h: Declare new functions. i386/isa/isa.[ch]: Add a function to decide which display driver has priority. Should be done better. i386/isa/syscons.c: Rename pccn* -> sccn*. Initialize CRTC start address in case the previous driver has moved it. i386/isa/syscons.c, i386/isa/pcvt/* Initialize the bogusly shared variable Crtat dynamically in case the stored value was changed by the previous driver. Initialize cdevsw table from a template. Don't grab the console if another display driver has priority. i386/isa/syscons.h, i386/isa/pcvt/pcvt_hdr.h: Don't externally declare now-static cdevsw functions. i386/isa/pcvt/pcvt_hdr.h: Set the sensitive hardware flag so that pcvt doesn't always have lower priority than syscons. This also fixes the "stupid" detection of the display after filling the display with text. i386/isa/pcvt/pcvt_out.c: Don't be confused the off-screen cursor offset 0xffff set by syscons. kern/subr_xxx.c: Add enough nxio/nodev/null devsw functions of the correct type for syscons and pcvt.