The second phase of syscons reorganization.

- Split syscons source code into manageable chunks and reorganize
  some of complicated functions.

- Many static variables are moved to the softc structure.

- Added a new key function, PREV.  When this key is pressed, the vty
  immediately before the current vty will become foreground.  Analogue
  to PREV, which is usually assigned to the PrntScrn key.
  PR: kern/10113
  Submitted by: Christian Weisgerber <naddy@mips.rhein-neckar.de>

- Modified the kernel console input function sccngetc() so that it
  handles function keys properly.

- Reorganized the screen update routine.

- VT switching code is reorganized.  It now should be slightly more
  robust than before.

- Added the DEVICE_RESUME function so that syscons no longer hooks the
  APM resume event directly.

- New kernel configuration options: SC_NO_CUTPASTE, SC_NO_FONT_LOADING,
  SC_NO_HISTORY and SC_NO_SYSMOUSE.
  Various parts of syscons can be omitted so that the kernel size is
  reduced.

  SC_PIXEL_MODE
  Made the VESA 800x600 mode an option, rather than a standard part of
  syscons.

  SC_DISABLE_DDBKEY
  Disables the `debug' key combination.

  SC_ALT_MOUSE_IMAGE
  Inverse the character cell at the mouse cursor position in the text
  console, rather than drawing an arrow on the screen.
  Submitted by: Nick Hibma (n_hibma@FreeBSD.ORG)

  SC_DFLT_FONT
  makeoptions "SC_DFLT_FONT=_font_name_"
  Include the named font as the default font of syscons.  16-line,
  14-line and 8-line font data will be compiled in.  This option replaces
  the existing STD8X16FONT option, which loads 16-line font data only.

- The VGA driver is split into /sys/dev/fb/vga.c and /sys/isa/vga_isa.c.

- The video driver provides a set of ioctl commands to manipulate the
  frame buffer.

- New kernel configuration option: VGA_WIDTH90
  Enables 90 column modes: 90x25, 90x30, 90x43, 90x50, 90x60.  These
  modes are mot always supported by the video card.
  PR: i386/7510
  Submitted by: kbyanc@freedomnet.com and alexv@sui.gda.itesm.mx.

- The header file machine/console.h is reorganized; its contents is now
  split into sys/fbio.h, sys/kbio.h (a new file) and sys/consio.h
  (another new file).  machine/console.h is still maintained for
  compatibility reasons.

- Kernel console selection/installation routines are fixed and
  slightly rebumped so that it should now be possible to switch between
  the interanl kernel console (sc or vt) and a remote kernel console
  (sio) again, as it was in 2.x, 3.0 and 3.1.

- Screen savers and splash screen decoders
  Because of the header file reorganization described above, screen
  savers and splash screen decoders are slightly modified.  After this
  update, /sys/modules/syscons/saver.h is no longer necessary and is
  removed.

1 files changed, 165 insertions, 5 deletions

diff --git a/sys/isa/syscons_isa.c b/sys/isa/syscons_isa.c
index 85e626e..fcb2b06 100644
--- a/sys/isa/syscons_isa.c
+++ b/sys/isa/syscons_isa.c
@@ -23,7 +23,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_isa.c,v 1.3 1999/05/08 21:59:31 dfr Exp $
+ * $Id: syscons_isa.c,v 1.4 1999/05/30 11:12:29 dfr Exp $
  */
 
 #include "sc.h"
@@ -37,33 +37,53 @@
 #include <sys/module.h>
 #include <sys/bus.h>
 
+#include <machine/cons.h>
 #include <machine/console.h>
+
 #ifdef __i386__
-#include <machine/apm_bios.h>
-#endif
+
+#include <machine/clock.h>
+#include <machine/md_var.h>
+#include <machine/pc/bios.h>
+
+#include <vm/vm.h>
+#include <vm/pmap.h>
+
+#include <i386/isa/timerreg.h>
+
+#define BIOS_CLKED	(1 << 6)
+#define BIOS_NLKED	(1 << 5)
+#define BIOS_SLKED	(1 << 4)
+#define BIOS_ALKED	0
+
+#endif /* __i386__ */
 
 #include <dev/syscons/syscons.h>
 
 #include <isa/isareg.h>
 #include <isa/isavar.h>
 
-devclass_t	sc_devclass;
+static devclass_t	sc_devclass;
 
 static int	scprobe(device_t dev);
 static int	scattach(device_t dev);
+static int	scresume(device_t dev);
 
 static device_method_t sc_methods[] = {
 	DEVMETHOD(device_probe,         scprobe),
 	DEVMETHOD(device_attach,        scattach),
+	DEVMETHOD(device_resume,        scresume),
 	{ 0, 0 }
 };
 
 static driver_t sc_driver = {
-	"sc",
+	SC_DRIVER_NAME,
 	sc_methods,
 	1,                          /* XXX */
 };
 
+static sc_softc_t main_softc = { 0, 0, 0, -1, NULL, -1, NULL, };
+
 static int
 scprobe(device_t dev)
 {
@@ -81,6 +101,146 @@ scattach(device_t dev)
 	return sc_attach_unit(device_get_unit(dev), isa_get_flags(dev));
 }
 
+static int
+scresume(device_t dev)
+{
+	return sc_resume_unit(device_get_unit(dev));
+}
+
+int
+sc_max_unit(void)
+{
+	return devclass_get_maxunit(sc_devclass);
+}
+
+sc_softc_t
+*sc_get_softc(int unit, int flags)
+{
+	sc_softc_t *sc;
+
+	if ((unit < 0) || (unit >= NSC))
+		return NULL;
+	if (flags & SC_KERNEL_CONSOLE) {
+		/* FIXME: clear if it is wired to another unit! */
+		main_softc.unit = unit;
+		return &main_softc;
+	} else {
+	        sc = (sc_softc_t *)devclass_get_softc(sc_devclass, unit);
+		if (!(sc->flags & SC_INIT_DONE)) {
+			sc->unit = unit;
+			sc->keyboard = -1;
+			sc->adapter = -1;
+		}
+		return sc;
+	}
+}
+
+sc_softc_t
+*sc_find_softc(struct video_adapter *adp, struct keyboard *kbd)
+{
+	sc_softc_t *sc;
+	int units;
+	int i;
+
+	sc = &main_softc;
+	if (((adp == NULL) || (adp == sc->adp))
+	    && ((kbd == NULL) || (kbd == sc->kbd)))
+		return sc;
+	units = devclass_get_maxunit(sc_devclass);
+	for (i = 0; i < units; ++i) {
+	        sc = (sc_softc_t *)devclass_get_softc(sc_devclass, i);
+		if (sc == NULL)
+			continue;
+		if (((adp == NULL) || (adp == sc->adp))
+		    && ((kbd == NULL) || (kbd == sc->kbd)))
+			return sc;
+	}
+	return NULL;
+}
+
+int
+sc_get_cons_priority(int *unit, int *flags)
+{
+	int disabled;
+	int u, f;
+	int i;
+
+	*unit = -1;
+	for (i = -1; (i = resource_locate(i, SC_DRIVER_NAME)) >= 0;) {
+		u = resource_query_unit(i);
+		if ((resource_int_value(SC_DRIVER_NAME, u, "disabled",
+					&disabled) == 0) && disabled)
+			continue;
+		if (resource_int_value(SC_DRIVER_NAME, u, "flags", &f) != 0)
+			f = 0;
+		if (f & SC_KERNEL_CONSOLE) {
+			/* the user designates this unit to be the console */
+			*unit = u;
+			*flags = f;
+			break;
+		}
+		if (*unit < 0) {
+			/* ...otherwise remember the first found unit */
+			*unit = u;
+			*flags = f;
+		}
+	}
+	if ((i < 0) && (*unit < 0))
+		return CN_DEAD;
+#if 0
+	return ((*flags & SC_KERNEL_CONSOLE) ? CN_INTERNAL : CN_NORMAL);
+#endif
+	return CN_INTERNAL;
+}
+
+void
+sc_get_bios_values(bios_values_t *values)
+{
+#ifdef __i386__
+	u_int8_t shift;
+
+	values->cursor_start = *(u_int8_t *)BIOS_PADDRTOVADDR(0x461);
+	values->cursor_end = *(u_int8_t *)BIOS_PADDRTOVADDR(0x460);
+	shift = *(u_int8_t *)BIOS_PADDRTOVADDR(0x417);
+	values->shift_state = ((shift & BIOS_CLKED) ? CLKED : 0)
+			       | ((shift & BIOS_NLKED) ? NLKED : 0)
+			       | ((shift & BIOS_SLKED) ? SLKED : 0)
+			       | ((shift & BIOS_ALKED) ? ALKED : 0);
+	values->bell_pitch = BELL_PITCH;
+#else /* !__i386__ */
+	values->cursor_start = 0;
+	values->cursor_end = 32;
+	values->shift_state = 0;
+	values->bell_pitch = BELL_PITCH;
+#endif /* __i386__ */
+}
+
+int
+sc_tone(int herz)
+{
+#ifdef __i386__
+	int pitch;
+
+	if (herz) {
+		/* set command for counter 2, 2 byte write */
+		if (acquire_timer2(TIMER_16BIT | TIMER_SQWAVE))
+			return EBUSY;
+		/* set pitch */
+		pitch = timer_freq/herz;
+		outb(TIMER_CNTR2, pitch);
+		outb(TIMER_CNTR2, pitch >> 8);
+		/* enable counter 2 output to speaker */
+		outb(IO_PPI, inb(IO_PPI) | 3);
+	} else {
+		/* disable counter 2 output to speaker */
+		outb(IO_PPI, inb(IO_PPI) & 0xFC);
+		release_timer2();
+	}
+#endif /* __i386__ */
+
+	return 0;
+}
+
 DRIVER_MODULE(sc, isa, sc_driver, sc_devclass, 0, 0);
 
 #endif /* NSC > 0 */