Upgrade the kbdio rutines to provide queued kbd & mouse events.
Minor other updates to syscons by me. Submitted by: Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
This commit is contained in:
Søren Schmidt
parent
d42e16a0d6
commit
b6b9dfa17e
@ -1,5 +1,5 @@
|
||||
/*-
|
||||
* Copyright (c) 1995 Søren Schmidt
|
||||
* Copyright (c) 1995-1997 Søren Schmidt
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@ -68,7 +68,7 @@ fade_saver(int blank)
|
||||
}
|
||||
}
|
||||
else {
|
||||
load_palette();
|
||||
load_palette(palette);
|
||||
count = scrn_blanked = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,4 +1,32 @@
|
||||
/* $FreeBSD$ */
|
||||
/*-
|
||||
* Copyright (c) 1995-1997 Søren Schmidt
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer
|
||||
* in this position and unchanged.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. The name of the author may not be used to endorse or promote products
|
||||
* derived from this software withough specific prior written permission
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
||||
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
@ -14,6 +42,10 @@
|
||||
extern scr_stat *cur_console;
|
||||
extern u_short *Crtat;
|
||||
extern u_int crtc_addr;
|
||||
extern char crtc_vga;
|
||||
extern char scr_map[];
|
||||
extern int scrn_blanked;
|
||||
extern char palette[];
|
||||
extern int fonts_loaded;
|
||||
extern char *font_8, *font_14, *font_16;
|
||||
extern char *palette;
|
||||
extern char *video_mode_ptr;
|
||||
|
||||
@ -117,6 +117,7 @@ i386/isa/istallion.c optional stli device-driver
|
||||
i386/isa/joy.c optional joy device-driver
|
||||
i386/isa/kbdio.c optional psm device-driver
|
||||
i386/isa/kbdio.c optional sc device-driver
|
||||
i386/isa/kbdio.c optional vt device-driver
|
||||
i386/isa/lpt.c optional lpt device-driver
|
||||
i386/isa/labpc.c optional labpc device-driver
|
||||
i386/isa/mcd.c optional mcd device-driver
|
||||
|
||||
@ -46,6 +46,15 @@ SC_SPLASH_SCREEN opt_syscons.h
|
||||
MAXCONS opt_syscons.h
|
||||
SLOW_VGA opt_syscons.h
|
||||
|
||||
PSM_ACCEL opt_psm.h
|
||||
PSM_EMULATION opt_psm.h
|
||||
PSM_CHECKSYNC opt_psm.h
|
||||
PSM_DEBUG opt_psm.h
|
||||
|
||||
KBD_RESETDELAY opt_kbdio.h
|
||||
KBD_MAXWAIT opt_kbdio.h
|
||||
KBDIO_DEBUG opt_kbdio.h
|
||||
|
||||
ATAPI opt_atapi.h
|
||||
ATAPI_STATIC opt_atapi.h
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*-
|
||||
* Copyright (c) 1995 Søren Schmidt
|
||||
* Copyright (c) 1995-1997 Søren Schmidt
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@ -68,7 +68,7 @@ fade_saver(int blank)
|
||||
}
|
||||
}
|
||||
else {
|
||||
load_palette();
|
||||
load_palette(palette);
|
||||
count = scrn_blanked = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*-
|
||||
* Copyright (c) 1992-1996 Søren Schmidt
|
||||
* Copyright (c) 1992-1997 Søren Schmidt
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@ -103,6 +103,7 @@ static term_stat kernel_console;
|
||||
static default_attr *current_default;
|
||||
static int flags = 0;
|
||||
static int sc_port = IO_KBD;
|
||||
static KBDC sc_kbdc = NULL;
|
||||
static char init_done = COLD;
|
||||
static u_short sc_buffer[ROW*COL];
|
||||
static char switch_in_progress = FALSE;
|
||||
@ -113,9 +114,6 @@ static int blinkrate = 0;
|
||||
char crtc_vga = FALSE;
|
||||
static u_char shfts = 0, ctls = 0, alts = 0, agrs = 0, metas = 0;
|
||||
static u_char nlkcnt = 0, clkcnt = 0, slkcnt = 0, alkcnt = 0;
|
||||
char *font_8 = NULL, *font_14 = NULL, *font_16 = NULL;
|
||||
int fonts_loaded = 0;
|
||||
char *palette;
|
||||
static const u_int n_fkey_tab = sizeof(fkey_tab) / sizeof(*fkey_tab);
|
||||
static int delayed_next_scr = FALSE;
|
||||
static long scrn_blank_time = 0; /* screen saver timeout value */
|
||||
@ -124,6 +122,11 @@ static long scrn_time_stamp;
|
||||
u_char scr_map[256];
|
||||
u_char scr_rmap[256];
|
||||
char *video_mode_ptr = NULL;
|
||||
int fonts_loaded = 0;
|
||||
char font_8[256*8];
|
||||
char font_14[256*14];
|
||||
char font_16[256*16];
|
||||
char palette[256*3];
|
||||
static char *cut_buffer;
|
||||
static u_short mouse_and_mask[16] = {
|
||||
0xc000, 0xe000, 0xf000, 0xf800,
|
||||
@ -194,6 +197,7 @@ static void history_to_screen(scr_stat *scp);
|
||||
static int history_up_line(scr_stat *scp);
|
||||
static int history_down_line(scr_stat *scp);
|
||||
static int mask2attr(struct term_stat *term);
|
||||
static void set_keyboard(int command, int data);
|
||||
static void update_leds(int which);
|
||||
static void set_vgaregs(char *modetable);
|
||||
static void set_font_mode(void);
|
||||
@ -294,28 +298,34 @@ move_crsr(scr_stat *scp, int x, int y)
|
||||
static int
|
||||
scprobe(struct isa_device *dev)
|
||||
{
|
||||
int c;
|
||||
int codeset;
|
||||
int c = -1;
|
||||
int m;
|
||||
|
||||
sc_port = dev->id_iobase;
|
||||
sc_kbdc = kbdc_open(sc_port);
|
||||
|
||||
if (!kbdc_lock(sc_kbdc, TRUE)) {
|
||||
/* driver error? */
|
||||
printf("sc%d: unable to lock the controller.\n", dev->id_unit);
|
||||
return ((dev->id_flags & DETECT_KBD) ? 0 : IO_KBDSIZE);
|
||||
}
|
||||
|
||||
/* discard anything left after UserConfig */
|
||||
empty_both_buffers(sc_port, 10);
|
||||
empty_both_buffers(sc_kbdc, 10);
|
||||
|
||||
/* save the current keyboard controller command byte */
|
||||
c = -1;
|
||||
if (!write_controller_command(sc_port, KBDC_GET_COMMAND_BYTE)) {
|
||||
/* CONTROLLER ERROR */
|
||||
printf("sc%d: unable to get the current command byte value.\n",
|
||||
dev->id_unit);
|
||||
goto fail;
|
||||
}
|
||||
c = read_controller_data(sc_port);
|
||||
m = kbdc_get_device_mask(sc_kbdc) & ~KBD_KBD_CONTROL_BITS;
|
||||
c = get_controller_command_byte(sc_kbdc);
|
||||
if (c == -1) {
|
||||
/* CONTROLLER ERROR */
|
||||
printf("sc%d: unable to get the current command byte value.\n",
|
||||
dev->id_unit);
|
||||
goto fail;
|
||||
}
|
||||
if (bootverbose)
|
||||
printf("sc%d: the current keyboard controller command byte %04x\n",
|
||||
dev->id_unit, c);
|
||||
#if 0
|
||||
/* override the keyboard lock switch */
|
||||
c |= KBD_OVERRIDE_KBD_LOCK;
|
||||
@ -325,19 +335,40 @@ scprobe(struct isa_device *dev)
|
||||
* enable the keyboard port, but disable the keyboard intr.
|
||||
* the aux port (mouse port) is disabled too.
|
||||
*/
|
||||
if (!set_controller_command_byte(sc_port,
|
||||
c & ~(KBD_KBD_CONTROL_BITS | KBD_AUX_CONTROL_BITS),
|
||||
if (!set_controller_command_byte(sc_kbdc,
|
||||
KBD_KBD_CONTROL_BITS | KBD_AUX_CONTROL_BITS,
|
||||
KBD_ENABLE_KBD_PORT | KBD_DISABLE_KBD_INT
|
||||
| KBD_DISABLE_AUX_PORT | KBD_DISABLE_AUX_INT)) {
|
||||
| KBD_DISABLE_AUX_PORT | KBD_DISABLE_AUX_INT)) {
|
||||
/* CONTROLLER ERROR
|
||||
* there is very little we can do...
|
||||
*/
|
||||
printf("sc%d: unable to set the command byte.\n", dev->id_unit);
|
||||
goto fail;
|
||||
}
|
||||
|
||||
/*
|
||||
* Check if we have an XT keyboard before we attempt to reset it.
|
||||
* The procedure assumes that the keyboard and the controller have
|
||||
* been set up properly by BIOS and have not been messed up
|
||||
* during the boot process.
|
||||
*/
|
||||
codeset = -1;
|
||||
if (dev->id_flags & XT_KEYBD)
|
||||
/* the user says there is a XT keyboard */
|
||||
codeset = 1;
|
||||
#ifdef DETECT_XT_KEYBOARD
|
||||
else if ((c & KBD_TRANSLATION) == 0) {
|
||||
/* SET_SCANCODE_SET is not always supported; ignore error */
|
||||
if (send_kbd_command_and_data(sc_kbdc, KBDC_SET_SCANCODE_SET, 0)
|
||||
== KBD_ACK)
|
||||
codeset = read_kbd_data(sc_kbdc);
|
||||
}
|
||||
if (bootverbose)
|
||||
printf("sc%d: keyboard scancode set %d\n", dev->id_unit, codeset);
|
||||
#endif /* DETECT_XT_KEYBOARD */
|
||||
|
||||
/* reset keyboard hardware */
|
||||
if (!reset_kbd(sc_port)) {
|
||||
if (!reset_kbd(sc_kbdc)) {
|
||||
/* KEYBOARD ERROR
|
||||
* Keyboard reset may fail either because the keyboard doen't exist,
|
||||
* or because the keyboard doesn't pass the self-test, or the keyboard
|
||||
@ -347,14 +378,14 @@ scprobe(struct isa_device *dev)
|
||||
* test_controller() and test_kbd_port() appear to bring the keyboard
|
||||
* controller back (I don't know why and how, though.)
|
||||
*/
|
||||
empty_both_buffers(sc_port, 10);
|
||||
test_controller(sc_port);
|
||||
test_kbd_port(sc_port);
|
||||
empty_both_buffers(sc_kbdc, 10);
|
||||
test_controller(sc_kbdc);
|
||||
test_kbd_port(sc_kbdc);
|
||||
/* We could disable the keyboard port and interrupt... but,
|
||||
* the keyboard may still exist (see above).
|
||||
*/
|
||||
if (bootverbose)
|
||||
printf("sc%d: failed to reset the keyboard.\n", dev->id_unit);
|
||||
if (bootverbose)
|
||||
printf("sc%d: failed to reset the keyboard.\n", dev->id_unit);
|
||||
goto fail;
|
||||
}
|
||||
|
||||
@ -363,9 +394,9 @@ scprobe(struct isa_device *dev)
|
||||
* such as those on the IBM ThinkPad laptop computers can be used
|
||||
* with the standard console driver.
|
||||
*/
|
||||
if (dev->id_flags & XT_KEYBD) {
|
||||
if (codeset == 1) {
|
||||
if (send_kbd_command_and_data(
|
||||
sc_port, KBDC_SET_SCAN_CODESET, 1) == KBD_ACK) {
|
||||
sc_kbdc, KBDC_SET_SCANCODE_SET, codeset) == KBD_ACK) {
|
||||
/* XT kbd doesn't need scan code translation */
|
||||
c &= ~KBD_TRANSLATION;
|
||||
} else {
|
||||
@ -378,8 +409,10 @@ scprobe(struct isa_device *dev)
|
||||
}
|
||||
}
|
||||
/* enable the keyboard port and intr. */
|
||||
if (!set_controller_command_byte(sc_port, c & ~KBD_KBD_CONTROL_BITS,
|
||||
KBD_ENABLE_KBD_PORT | KBD_ENABLE_KBD_INT)) {
|
||||
if (!set_controller_command_byte(sc_kbdc,
|
||||
KBD_KBD_CONTROL_BITS | KBD_AUX_CONTROL_BITS | KBD_OVERRIDE_KBD_LOCK,
|
||||
(c & (KBD_AUX_CONTROL_BITS | KBD_OVERRIDE_KBD_LOCK))
|
||||
| KBD_ENABLE_KBD_PORT | KBD_ENABLE_KBD_INT)) {
|
||||
/* CONTROLLER ERROR
|
||||
* This is serious; we are left with the disabled keyboard intr.
|
||||
*/
|
||||
@ -389,12 +422,17 @@ scprobe(struct isa_device *dev)
|
||||
}
|
||||
|
||||
succeed:
|
||||
kbdc_set_device_mask(sc_kbdc, m | KBD_KBD_CONTROL_BITS),
|
||||
kbdc_lock(sc_kbdc, FALSE);
|
||||
return (IO_KBDSIZE);
|
||||
|
||||
fail:
|
||||
if (c != -1)
|
||||
/* try to restore the command byte as before, if possible */
|
||||
set_controller_command_byte(sc_port, c, 0);
|
||||
/* try to restore the command byte as before, if possible */
|
||||
set_controller_command_byte(sc_kbdc, 0xff, c);
|
||||
kbdc_set_device_mask(sc_kbdc,
|
||||
(dev->id_flags & DETECT_KBD) ? m : m | KBD_KBD_CONTROL_BITS);
|
||||
kbdc_lock(sc_kbdc, FALSE);
|
||||
return ((dev->id_flags & DETECT_KBD) ? 0 : IO_KBDSIZE);
|
||||
}
|
||||
|
||||
@ -423,14 +461,6 @@ scattach(struct isa_device *dev)
|
||||
|
||||
if (crtc_vga) {
|
||||
cut_buffer = (char *)malloc(scp->xsize*scp->ysize, M_DEVBUF, M_NOWAIT);
|
||||
font_8 = (char *)malloc(8*256, M_DEVBUF, M_NOWAIT);
|
||||
font_14 = (char *)malloc(14*256, M_DEVBUF, M_NOWAIT);
|
||||
font_16 = (char *)malloc(16*256, M_DEVBUF, M_NOWAIT);
|
||||
copy_font(SAVE, FONT_16, font_16);
|
||||
fonts_loaded = FONT_16;
|
||||
scp->font_size = FONT_16;
|
||||
palette = (char *)malloc(3*256, M_DEVBUF, M_NOWAIT);
|
||||
save_palette();
|
||||
}
|
||||
|
||||
scp->scr_buf = (u_short *)malloc(scp->xsize*scp->ysize*sizeof(u_short),
|
||||
@ -1106,7 +1136,7 @@ scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
|
||||
copy_font(LOAD, FONT_16, font_16);
|
||||
if (flags & CHAR_CURSOR)
|
||||
set_destructive_cursor(scp);
|
||||
load_palette();
|
||||
load_palette(palette);
|
||||
}
|
||||
/* FALL THROUGH */
|
||||
|
||||
@ -1155,9 +1185,8 @@ scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
|
||||
case KDSETRAD: /* set keyboard repeat & delay rates */
|
||||
if (*data & 0x80)
|
||||
return EINVAL;
|
||||
i = spltty();
|
||||
send_kbd_command_and_data(sc_port, KBDC_SET_TYPEMATIC, *data);
|
||||
splx(i);
|
||||
if (sc_kbdc != NULL)
|
||||
set_keyboard(KBDC_SET_TYPEMATIC, *data);
|
||||
return 0;
|
||||
|
||||
case KDSKBMODE: /* set keyboard mode */
|
||||
@ -1405,6 +1434,8 @@ sccnprobe(struct consdev *cp)
|
||||
/* initialize required fields */
|
||||
cp->cn_dev = makedev(CDEV_MAJOR, SC_CONSOLE);
|
||||
cp->cn_pri = CN_INTERNAL;
|
||||
|
||||
sc_kbdc = kbdc_open(sc_port);
|
||||
}
|
||||
|
||||
void
|
||||
@ -1499,8 +1530,21 @@ scrn_timer()
|
||||
* This ugly hack calls scintr if input is ready for the keyboard
|
||||
* and conveniently hides the problem. XXX
|
||||
*/
|
||||
if ((inb(sc_port+KBD_STATUS_PORT)&KBDS_BUFFER_FULL) == KBDS_KBD_BUFFER_FULL)
|
||||
scintr(0);
|
||||
/* Try removing anything stuck in the keyboard controller; whether
|
||||
* it's a keyboard scan code or mouse data. `scintr()' doesn't
|
||||
* read the mouse data directly, but `kbdio' routines will, as a
|
||||
* side effect.
|
||||
*/
|
||||
if (kbdc_lock(sc_kbdc, TRUE)) {
|
||||
/*
|
||||
* We have seen the lock flag is not set. Let's reset the flag early;
|
||||
* otherwise `update_led()' failes which may want the lock
|
||||
* during `scintr()'.
|
||||
*/
|
||||
kbdc_lock(sc_kbdc, FALSE);
|
||||
if (kbdc_data_ready(sc_kbdc))
|
||||
scintr(0);
|
||||
}
|
||||
|
||||
/* should we just return ? */
|
||||
if ((scp->status&UNKNOWN_MODE) || blink_in_progress || switch_in_progress) {
|
||||
@ -1659,7 +1703,7 @@ exchange_scr(void)
|
||||
if ((old_scp->status & UNKNOWN_MODE) && crtc_vga) {
|
||||
if (flags & CHAR_CURSOR)
|
||||
set_destructive_cursor(new_scp);
|
||||
load_palette();
|
||||
load_palette(palette);
|
||||
}
|
||||
if (old_scp->status & KBD_RAW_MODE || new_scp->status & KBD_RAW_MODE)
|
||||
shfts = ctls = alts = agrs = metas = 0;
|
||||
@ -2354,9 +2398,8 @@ scinit(void)
|
||||
u_long segoff;
|
||||
|
||||
crtc_vga = TRUE;
|
||||
/*
|
||||
* Get the BIOS video mode pointer.
|
||||
*/
|
||||
|
||||
/* Get the BIOS video mode pointer */
|
||||
segoff = *(u_long *)pa_to_va(0x4a8);
|
||||
pa = (((segoff & 0xffff0000) >> 12) + (segoff & 0xffff));
|
||||
if (ISMAPPED(pa, sizeof(u_long))) {
|
||||
@ -2374,6 +2417,13 @@ scinit(void)
|
||||
bcopyw(Crtat, sc_buffer,
|
||||
console[0]->xsize * console[0]->ysize * sizeof(u_short));
|
||||
|
||||
/* Save font and palette if VGA */
|
||||
if (crtc_vga) {
|
||||
copy_font(SAVE, FONT_16, font_16);
|
||||
fonts_loaded = FONT_16;
|
||||
save_palette();
|
||||
}
|
||||
|
||||
console[0]->scr_buf = console[0]->mouse_pos = sc_buffer;
|
||||
console[0]->cursor_pos = console[0]->cursor_oldpos = sc_buffer + hw_cursor;
|
||||
console[0]->xpos = hw_cursor % COL;
|
||||
@ -2387,6 +2437,7 @@ scinit(void)
|
||||
kernel_console.cur_color = kernel_console.std_color =
|
||||
kernel_default.std_color;
|
||||
kernel_console.rev_color = kernel_default.rev_color;
|
||||
|
||||
/* initialize mapscrn arrays to a one to one map */
|
||||
for (i=0; i<sizeof(scr_map); i++) {
|
||||
scr_map[i] = scr_rmap[i] = i;
|
||||
@ -2433,7 +2484,7 @@ init_scp(scr_stat *scp)
|
||||
if (crtc_addr == MONO_BASE)
|
||||
scp->mode = M_VGA_M80x25;
|
||||
else
|
||||
scp->mode = M_VGA_C80x25;
|
||||
scp->mode = M_VGA_C80x25;
|
||||
else
|
||||
if (crtc_addr == MONO_BASE)
|
||||
scp->mode = M_B80x25;
|
||||
@ -2542,12 +2593,12 @@ scgetc(u_int flags)
|
||||
next_code:
|
||||
/* first see if there is something in the keyboard port */
|
||||
if (flags & SCGETC_NONBLOCK) {
|
||||
c = read_kbd_data_no_wait(sc_port);
|
||||
c = read_kbd_data_no_wait(sc_kbdc);
|
||||
if (c == -1)
|
||||
return(NOKEY);
|
||||
} else {
|
||||
do {
|
||||
c = read_kbd_data(sc_port);
|
||||
c = read_kbd_data(sc_kbdc);
|
||||
} while(c == -1);
|
||||
}
|
||||
scancode = (u_char)c;
|
||||
@ -3001,9 +3052,54 @@ mask2attr(struct term_stat *term)
|
||||
}
|
||||
|
||||
static void
|
||||
update_leds(int which)
|
||||
set_keyboard(int command, int data)
|
||||
{
|
||||
int s;
|
||||
int c;
|
||||
|
||||
if (sc_kbdc == NULL)
|
||||
return;
|
||||
|
||||
/* prevent the timeout routine from polling the keyboard */
|
||||
if (!kbdc_lock(sc_kbdc, TRUE))
|
||||
return;
|
||||
|
||||
/* disable the keyboard and mouse interrupt */
|
||||
s = spltty();
|
||||
c = get_controller_command_byte(sc_kbdc);
|
||||
if ((c == -1)
|
||||
|| !set_controller_command_byte(sc_kbdc,
|
||||
kbdc_get_device_mask(sc_kbdc),
|
||||
KBD_ENABLE_KBD_PORT | KBD_DISABLE_KBD_INT
|
||||
| KBD_DISABLE_AUX_PORT | KBD_DISABLE_AUX_INT)) {
|
||||
/* CONTROLLER ERROR */
|
||||
kbdc_lock(sc_kbdc, FALSE);
|
||||
splx(s);
|
||||
return;
|
||||
}
|
||||
/*
|
||||
* Now that the keyboard controller is told not to generate
|
||||
* the keyboard and mouse interrupts, call `splx()' to allow
|
||||
* the other tty interrupts. The clock interrupt may also occur,
|
||||
* but the timeout routine (`scrn_timer()') will be blocked
|
||||
* by the lock flag set via `kbdc_lock()'
|
||||
*/
|
||||
splx(s);
|
||||
|
||||
send_kbd_command_and_data(sc_kbdc, command, data);
|
||||
|
||||
/* restore the interrupts */
|
||||
if (!set_controller_command_byte(sc_kbdc,
|
||||
kbdc_get_device_mask(sc_kbdc),
|
||||
c & (KBD_KBD_CONTROL_BITS | KBD_AUX_CONTROL_BITS))) {
|
||||
/* CONTROLLER ERROR */
|
||||
}
|
||||
kbdc_lock(sc_kbdc, FALSE);
|
||||
}
|
||||
|
||||
static void
|
||||
update_leds(int which)
|
||||
{
|
||||
static u_char xlate_leds[8] = { 0, 4, 2, 6, 1, 5, 3, 7 };
|
||||
|
||||
/* replace CAPS led with ALTGR led for ALTGR keyboards */
|
||||
@ -3014,10 +3110,7 @@ update_leds(int which)
|
||||
which &= ~CLKED;
|
||||
}
|
||||
|
||||
s = spltty();
|
||||
send_kbd_command_and_data(sc_port, KBDC_SET_LEDS,
|
||||
xlate_leds[which & LED_MASK]);
|
||||
splx(s);
|
||||
set_keyboard(KBDC_SET_LEDS, xlate_leds[which & LED_MASK]);
|
||||
}
|
||||
|
||||
void
|
||||
@ -3595,7 +3688,7 @@ save_palette(void)
|
||||
}
|
||||
|
||||
void
|
||||
load_palette(void)
|
||||
load_palette(char *palette)
|
||||
{
|
||||
int i;
|
||||
|
||||
@ -3658,6 +3751,7 @@ toggle_splash_screen(scr_stat *scp)
|
||||
scp->mode = save_mode;
|
||||
scp->status &= ~UNKNOWN_MODE;
|
||||
set_mode(scp);
|
||||
load_palette(palette);
|
||||
toggle = 0;
|
||||
}
|
||||
else {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*-
|
||||
* Copyright (c) 1995-1996 Søren Schmidt
|
||||
* Copyright (c) 1995-1997 Søren Schmidt
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@ -192,6 +192,6 @@ typedef struct default_attr {
|
||||
void set_border(u_char color);
|
||||
void set_mode(scr_stat *scp);
|
||||
void copy_font(int operation, int font_type, char* font_image);
|
||||
void load_palette(void);
|
||||
void load_palette(char *palette);
|
||||
|
||||
#endif /* !_I386_ISA_SYSCONS_H_ */
|
||||
|
||||
@ -117,6 +117,7 @@ i386/isa/istallion.c optional stli device-driver
|
||||
i386/isa/joy.c optional joy device-driver
|
||||
i386/isa/kbdio.c optional psm device-driver
|
||||
i386/isa/kbdio.c optional sc device-driver
|
||||
i386/isa/kbdio.c optional vt device-driver
|
||||
i386/isa/lpt.c optional lpt device-driver
|
||||
i386/isa/labpc.c optional labpc device-driver
|
||||
i386/isa/mcd.c optional mcd device-driver
|
||||
|
||||
@ -46,6 +46,15 @@ SC_SPLASH_SCREEN opt_syscons.h
|
||||
MAXCONS opt_syscons.h
|
||||
SLOW_VGA opt_syscons.h
|
||||
|
||||
PSM_ACCEL opt_psm.h
|
||||
PSM_EMULATION opt_psm.h
|
||||
PSM_CHECKSYNC opt_psm.h
|
||||
PSM_DEBUG opt_psm.h
|
||||
|
||||
KBD_RESETDELAY opt_kbdio.h
|
||||
KBD_MAXWAIT opt_kbdio.h
|
||||
KBDIO_DEBUG opt_kbdio.h
|
||||
|
||||
ATAPI opt_atapi.h
|
||||
ATAPI_STATIC opt_atapi.h
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -39,15 +39,18 @@
|
||||
#define KBD_STATUS_PORT 2 /* status port, read */
|
||||
#define KBD_COMMAND_PORT 2 /* controller command port, write */
|
||||
#define KBD_DATA_PORT 0 /* data port, read/write
|
||||
also used as keyboard command
|
||||
and mouse command port */
|
||||
* also used as keyboard command
|
||||
* and mouse command port
|
||||
*/
|
||||
#else
|
||||
#define KBD_STATUS_PORT 4 /* status port, read */
|
||||
#define KBD_COMMAND_PORT 4 /* controller command port, write */
|
||||
#define KBD_DATA_PORT 0 /* data port, read/write
|
||||
also used as keyboard command
|
||||
and mouse command port */
|
||||
* also used as keyboard command
|
||||
* and mouse command port
|
||||
*/
|
||||
#endif /* PC98 */
|
||||
|
||||
/* FIXME: `IO_PSMSIZE' should really be in `isa.h'. */
|
||||
#define IO_PSMSIZE (KBD_COMMAND_PORT - KBD_DATA_PORT + 1) /* 5 */
|
||||
|
||||
@ -86,13 +89,14 @@
|
||||
#define KBDC_SEND_DEV_ID 0x00f2
|
||||
#define KBDC_SET_LEDS 0x00ed
|
||||
#define KBDC_ECHO 0x00ee
|
||||
#define KBDC_SET_SCAN_CODESET 0x00f0
|
||||
#define KBDC_SET_SCANCODE_SET 0x00f0
|
||||
#define KBDC_SET_TYPEMATIC 0x00f3
|
||||
|
||||
/* aux device commands (sent to KBD_DATA_PORT) */
|
||||
#define PSMC_RESET_DEV 0x00ff
|
||||
#define PSMC_ENABLE_DEV 0x00f4
|
||||
#define PSMC_DISABLE_DEV 0x00f5
|
||||
#define PSMC_SET_DEFAULTS 0x00f6
|
||||
#define PSMC_SEND_DEV_ID 0x00f2
|
||||
#define PSMC_SEND_DEV_STATUS 0x00e9
|
||||
#define PSMC_SEND_DEV_DATA 0x00eb
|
||||
@ -104,15 +108,11 @@
|
||||
#define PSMC_SET_SAMPLING_RATE 0x00f3
|
||||
|
||||
/* PSMC_SET_RESOLUTION argument */
|
||||
#define PSMD_RESOLUTION_25 0 /* 25ppi */
|
||||
#define PSMD_RESOLUTION_50 1 /* 50ppi */
|
||||
#define PSMD_RESOLUTION_100 2 /* 100ppi (default after reset) */
|
||||
#define PSMD_RESOLUTION_200 3 /* 200ppi */
|
||||
/* FIXME: I don't know if it's possible to go beyond 200ppi.
|
||||
The values below are of my wild guess. */
|
||||
#define PSMD_RESOLUTION_400 4 /* 400ppi */
|
||||
#define PSMD_RESOLUTION_800 5 /* 800ppi */
|
||||
#define PSMD_MAX_RESOLUTION PSMD_RESOLUTION_800
|
||||
#define PSMD_RES_LOW 0 /* typically 25ppi */
|
||||
#define PSMD_RES_MEDIUM_LOW 1 /* typically 50ppi */
|
||||
#define PSMD_RES_MEDIUM_HIGH 2 /* typically 100ppi (default) */
|
||||
#define PSMD_RES_HIGH 3 /* typically 200ppi */
|
||||
#define PSMD_MAX_RESOLUTION PSMD_RES_HIGH
|
||||
|
||||
/* PSMC_SET_SAMPLING_RATE */
|
||||
#define PSMD_MAX_RATE 255 /* FIXME: not sure if it's possible */
|
||||
@ -151,79 +151,57 @@
|
||||
|
||||
#ifdef KERNEL
|
||||
|
||||
/* driver specific options: the following options may be set by
|
||||
`options' statements in the kernel configuration file. */
|
||||
|
||||
/* retry count */
|
||||
#ifndef KBD_MAXRETRY
|
||||
#define KBD_MAXRETRY 3
|
||||
#endif
|
||||
|
||||
/* timing parameters */
|
||||
#ifndef KBD_RESETDELAY
|
||||
#define KBD_RESETDELAY 200 /* wait 200msec after kbd/mouse reset */
|
||||
#endif
|
||||
#ifndef KBD_MAXWAIT
|
||||
#define KBD_MAXWAIT 5 /* wait 5 times at most after reset */
|
||||
#endif
|
||||
|
||||
/* I/O recovery time */
|
||||
#ifdef PC98
|
||||
#define KBDC_DELAYTIME 37
|
||||
#define KBDD_DELAYTIME 37
|
||||
#else
|
||||
#define KBDC_DELAYTIME 20
|
||||
#define KBDD_DELAYTIME 7
|
||||
#endif
|
||||
|
||||
/* debugging */
|
||||
/* #define KBDIO_DEBUG produces debugging output */
|
||||
|
||||
/* end of driver specific options */
|
||||
|
||||
/* misc */
|
||||
#ifndef TRUE
|
||||
#define TRUE (-1)
|
||||
#define TRUE 1
|
||||
#endif
|
||||
#ifndef FALSE
|
||||
#define FALSE 0
|
||||
#endif
|
||||
|
||||
/* types/structures */
|
||||
|
||||
typedef caddr_t KBDC;
|
||||
|
||||
/* function prototypes */
|
||||
|
||||
int wait_while_controller_busy __P((int port));
|
||||
KBDC kbdc_open __P((int port));
|
||||
|
||||
int wait_for_data __P((int port));
|
||||
int wait_for_kbd_data __P((int port));
|
||||
int wait_for_aux_data __P((int port));
|
||||
int kbdc_lock __P((KBDC kbdc, int lock));
|
||||
|
||||
int write_controller_command __P((int port,int c));
|
||||
int write_controller_data __P((int port,int c));
|
||||
int kbdc_data_ready __P((KBDC kbdc));
|
||||
|
||||
int write_kbd_command __P((int port,int c));
|
||||
int write_aux_command __P((int port,int c));
|
||||
int send_kbd_command __P((int port,int c));
|
||||
int send_aux_command __P((int port,int c));
|
||||
int send_kbd_command_and_data __P((int port,int c,int d));
|
||||
int send_aux_command_and_data __P((int port,int c,int d));
|
||||
int write_controller_command __P((KBDC kbdc,int c));
|
||||
int write_controller_data __P((KBDC kbdc,int c));
|
||||
|
||||
int read_controller_data __P((int port));
|
||||
int read_kbd_data __P((int port));
|
||||
int read_kbd_data_no_wait __P((int port));
|
||||
int read_aux_data __P((int port));
|
||||
int write_kbd_command __P((KBDC kbdc,int c));
|
||||
int write_aux_command __P((KBDC kbdc,int c));
|
||||
int send_kbd_command __P((KBDC kbdc,int c));
|
||||
int send_aux_command __P((KBDC kbdc,int c));
|
||||
int send_kbd_command_and_data __P((KBDC kbdc,int c,int d));
|
||||
int send_aux_command_and_data __P((KBDC kbdc,int c,int d));
|
||||
|
||||
void empty_kbd_buffer __P((int port, int t));
|
||||
void empty_aux_buffer __P((int port, int t));
|
||||
void empty_both_buffers __P((int port, int t));
|
||||
int read_controller_data __P((KBDC kbdc));
|
||||
int read_kbd_data __P((KBDC kbdc));
|
||||
int read_kbd_data_no_wait __P((KBDC kbdc));
|
||||
int read_aux_data __P((KBDC kbdc));
|
||||
int read_aux_data_no_wait __P((KBDC kbdc));
|
||||
|
||||
int reset_kbd __P((int port));
|
||||
int reset_aux_dev __P((int port));
|
||||
void empty_kbd_buffer __P((KBDC kbdc, int t));
|
||||
void empty_aux_buffer __P((KBDC kbdc, int t));
|
||||
void empty_both_buffers __P((KBDC kbdc, int t));
|
||||
|
||||
int test_controller __P((int port));
|
||||
int test_kbd_port __P((int port));
|
||||
int test_aux_port __P((int port));
|
||||
int reset_kbd __P((KBDC kbdc));
|
||||
int reset_aux_dev __P((KBDC kbdc));
|
||||
|
||||
int set_controller_command_byte __P((int port,int command,int flag));
|
||||
int test_controller __P((KBDC kbdc));
|
||||
int test_kbd_port __P((KBDC kbdc));
|
||||
int test_aux_port __P((KBDC kbdc));
|
||||
|
||||
int kbdc_get_device_mask __P((KBDC kbdc));
|
||||
void kbdc_set_device_mask __P((KBDC kbdc, int mask));
|
||||
|
||||
int get_controller_command_byte __P((KBDC kbdc));
|
||||
int set_controller_command_byte __P((KBDC kbdc, int command, int flag));
|
||||
|
||||
#endif /* KERNEL */
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,5 @@
|
||||
/*-
|
||||
* Copyright (c) 1992-1996 Søren Schmidt
|
||||
* Copyright (c) 1992-1997 Søren Schmidt
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@ -103,6 +103,7 @@ static term_stat kernel_console;
|
||||
static default_attr *current_default;
|
||||
static int flags = 0;
|
||||
static int sc_port = IO_KBD;
|
||||
static KBDC sc_kbdc = NULL;
|
||||
static char init_done = COLD;
|
||||
static u_short sc_buffer[ROW*COL];
|
||||
static char switch_in_progress = FALSE;
|
||||
@ -113,9 +114,6 @@ static int blinkrate = 0;
|
||||
char crtc_vga = FALSE;
|
||||
static u_char shfts = 0, ctls = 0, alts = 0, agrs = 0, metas = 0;
|
||||
static u_char nlkcnt = 0, clkcnt = 0, slkcnt = 0, alkcnt = 0;
|
||||
char *font_8 = NULL, *font_14 = NULL, *font_16 = NULL;
|
||||
int fonts_loaded = 0;
|
||||
char *palette;
|
||||
static const u_int n_fkey_tab = sizeof(fkey_tab) / sizeof(*fkey_tab);
|
||||
static int delayed_next_scr = FALSE;
|
||||
static long scrn_blank_time = 0; /* screen saver timeout value */
|
||||
@ -124,6 +122,11 @@ static long scrn_time_stamp;
|
||||
u_char scr_map[256];
|
||||
u_char scr_rmap[256];
|
||||
char *video_mode_ptr = NULL;
|
||||
int fonts_loaded = 0;
|
||||
char font_8[256*8];
|
||||
char font_14[256*14];
|
||||
char font_16[256*16];
|
||||
char palette[256*3];
|
||||
static char *cut_buffer;
|
||||
static u_short mouse_and_mask[16] = {
|
||||
0xc000, 0xe000, 0xf000, 0xf800,
|
||||
@ -194,6 +197,7 @@ static void history_to_screen(scr_stat *scp);
|
||||
static int history_up_line(scr_stat *scp);
|
||||
static int history_down_line(scr_stat *scp);
|
||||
static int mask2attr(struct term_stat *term);
|
||||
static void set_keyboard(int command, int data);
|
||||
static void update_leds(int which);
|
||||
static void set_vgaregs(char *modetable);
|
||||
static void set_font_mode(void);
|
||||
@ -294,28 +298,34 @@ move_crsr(scr_stat *scp, int x, int y)
|
||||
static int
|
||||
scprobe(struct isa_device *dev)
|
||||
{
|
||||
int c;
|
||||
int codeset;
|
||||
int c = -1;
|
||||
int m;
|
||||
|
||||
sc_port = dev->id_iobase;
|
||||
sc_kbdc = kbdc_open(sc_port);
|
||||
|
||||
if (!kbdc_lock(sc_kbdc, TRUE)) {
|
||||
/* driver error? */
|
||||
printf("sc%d: unable to lock the controller.\n", dev->id_unit);
|
||||
return ((dev->id_flags & DETECT_KBD) ? 0 : IO_KBDSIZE);
|
||||
}
|
||||
|
||||
/* discard anything left after UserConfig */
|
||||
empty_both_buffers(sc_port, 10);
|
||||
empty_both_buffers(sc_kbdc, 10);
|
||||
|
||||
/* save the current keyboard controller command byte */
|
||||
c = -1;
|
||||
if (!write_controller_command(sc_port, KBDC_GET_COMMAND_BYTE)) {
|
||||
/* CONTROLLER ERROR */
|
||||
printf("sc%d: unable to get the current command byte value.\n",
|
||||
dev->id_unit);
|
||||
goto fail;
|
||||
}
|
||||
c = read_controller_data(sc_port);
|
||||
m = kbdc_get_device_mask(sc_kbdc) & ~KBD_KBD_CONTROL_BITS;
|
||||
c = get_controller_command_byte(sc_kbdc);
|
||||
if (c == -1) {
|
||||
/* CONTROLLER ERROR */
|
||||
printf("sc%d: unable to get the current command byte value.\n",
|
||||
dev->id_unit);
|
||||
goto fail;
|
||||
}
|
||||
if (bootverbose)
|
||||
printf("sc%d: the current keyboard controller command byte %04x\n",
|
||||
dev->id_unit, c);
|
||||
#if 0
|
||||
/* override the keyboard lock switch */
|
||||
c |= KBD_OVERRIDE_KBD_LOCK;
|
||||
@ -325,19 +335,40 @@ scprobe(struct isa_device *dev)
|
||||
* enable the keyboard port, but disable the keyboard intr.
|
||||
* the aux port (mouse port) is disabled too.
|
||||
*/
|
||||
if (!set_controller_command_byte(sc_port,
|
||||
c & ~(KBD_KBD_CONTROL_BITS | KBD_AUX_CONTROL_BITS),
|
||||
if (!set_controller_command_byte(sc_kbdc,
|
||||
KBD_KBD_CONTROL_BITS | KBD_AUX_CONTROL_BITS,
|
||||
KBD_ENABLE_KBD_PORT | KBD_DISABLE_KBD_INT
|
||||
| KBD_DISABLE_AUX_PORT | KBD_DISABLE_AUX_INT)) {
|
||||
| KBD_DISABLE_AUX_PORT | KBD_DISABLE_AUX_INT)) {
|
||||
/* CONTROLLER ERROR
|
||||
* there is very little we can do...
|
||||
*/
|
||||
printf("sc%d: unable to set the command byte.\n", dev->id_unit);
|
||||
goto fail;
|
||||
}
|
||||
|
||||
/*
|
||||
* Check if we have an XT keyboard before we attempt to reset it.
|
||||
* The procedure assumes that the keyboard and the controller have
|
||||
* been set up properly by BIOS and have not been messed up
|
||||
* during the boot process.
|
||||
*/
|
||||
codeset = -1;
|
||||
if (dev->id_flags & XT_KEYBD)
|
||||
/* the user says there is a XT keyboard */
|
||||
codeset = 1;
|
||||
#ifdef DETECT_XT_KEYBOARD
|
||||
else if ((c & KBD_TRANSLATION) == 0) {
|
||||
/* SET_SCANCODE_SET is not always supported; ignore error */
|
||||
if (send_kbd_command_and_data(sc_kbdc, KBDC_SET_SCANCODE_SET, 0)
|
||||
== KBD_ACK)
|
||||
codeset = read_kbd_data(sc_kbdc);
|
||||
}
|
||||
if (bootverbose)
|
||||
printf("sc%d: keyboard scancode set %d\n", dev->id_unit, codeset);
|
||||
#endif /* DETECT_XT_KEYBOARD */
|
||||
|
||||
/* reset keyboard hardware */
|
||||
if (!reset_kbd(sc_port)) {
|
||||
if (!reset_kbd(sc_kbdc)) {
|
||||
/* KEYBOARD ERROR
|
||||
* Keyboard reset may fail either because the keyboard doen't exist,
|
||||
* or because the keyboard doesn't pass the self-test, or the keyboard
|
||||
@ -347,14 +378,14 @@ scprobe(struct isa_device *dev)
|
||||
* test_controller() and test_kbd_port() appear to bring the keyboard
|
||||
* controller back (I don't know why and how, though.)
|
||||
*/
|
||||
empty_both_buffers(sc_port, 10);
|
||||
test_controller(sc_port);
|
||||
test_kbd_port(sc_port);
|
||||
empty_both_buffers(sc_kbdc, 10);
|
||||
test_controller(sc_kbdc);
|
||||
test_kbd_port(sc_kbdc);
|
||||
/* We could disable the keyboard port and interrupt... but,
|
||||
* the keyboard may still exist (see above).
|
||||
*/
|
||||
if (bootverbose)
|
||||
printf("sc%d: failed to reset the keyboard.\n", dev->id_unit);
|
||||
if (bootverbose)
|
||||
printf("sc%d: failed to reset the keyboard.\n", dev->id_unit);
|
||||
goto fail;
|
||||
}
|
||||
|
||||
@ -363,9 +394,9 @@ scprobe(struct isa_device *dev)
|
||||
* such as those on the IBM ThinkPad laptop computers can be used
|
||||
* with the standard console driver.
|
||||
*/
|
||||
if (dev->id_flags & XT_KEYBD) {
|
||||
if (codeset == 1) {
|
||||
if (send_kbd_command_and_data(
|
||||
sc_port, KBDC_SET_SCAN_CODESET, 1) == KBD_ACK) {
|
||||
sc_kbdc, KBDC_SET_SCANCODE_SET, codeset) == KBD_ACK) {
|
||||
/* XT kbd doesn't need scan code translation */
|
||||
c &= ~KBD_TRANSLATION;
|
||||
} else {
|
||||
@ -378,8 +409,10 @@ scprobe(struct isa_device *dev)
|
||||
}
|
||||
}
|
||||
/* enable the keyboard port and intr. */
|
||||
if (!set_controller_command_byte(sc_port, c & ~KBD_KBD_CONTROL_BITS,
|
||||
KBD_ENABLE_KBD_PORT | KBD_ENABLE_KBD_INT)) {
|
||||
if (!set_controller_command_byte(sc_kbdc,
|
||||
KBD_KBD_CONTROL_BITS | KBD_AUX_CONTROL_BITS | KBD_OVERRIDE_KBD_LOCK,
|
||||
(c & (KBD_AUX_CONTROL_BITS | KBD_OVERRIDE_KBD_LOCK))
|
||||
| KBD_ENABLE_KBD_PORT | KBD_ENABLE_KBD_INT)) {
|
||||
/* CONTROLLER ERROR
|
||||
* This is serious; we are left with the disabled keyboard intr.
|
||||
*/
|
||||
@ -389,12 +422,17 @@ scprobe(struct isa_device *dev)
|
||||
}
|
||||
|
||||
succeed:
|
||||
kbdc_set_device_mask(sc_kbdc, m | KBD_KBD_CONTROL_BITS),
|
||||
kbdc_lock(sc_kbdc, FALSE);
|
||||
return (IO_KBDSIZE);
|
||||
|
||||
fail:
|
||||
if (c != -1)
|
||||
/* try to restore the command byte as before, if possible */
|
||||
set_controller_command_byte(sc_port, c, 0);
|
||||
/* try to restore the command byte as before, if possible */
|
||||
set_controller_command_byte(sc_kbdc, 0xff, c);
|
||||
kbdc_set_device_mask(sc_kbdc,
|
||||
(dev->id_flags & DETECT_KBD) ? m : m | KBD_KBD_CONTROL_BITS);
|
||||
kbdc_lock(sc_kbdc, FALSE);
|
||||
return ((dev->id_flags & DETECT_KBD) ? 0 : IO_KBDSIZE);
|
||||
}
|
||||
|
||||
@ -423,14 +461,6 @@ scattach(struct isa_device *dev)
|
||||
|
||||
if (crtc_vga) {
|
||||
cut_buffer = (char *)malloc(scp->xsize*scp->ysize, M_DEVBUF, M_NOWAIT);
|
||||
font_8 = (char *)malloc(8*256, M_DEVBUF, M_NOWAIT);
|
||||
font_14 = (char *)malloc(14*256, M_DEVBUF, M_NOWAIT);
|
||||
font_16 = (char *)malloc(16*256, M_DEVBUF, M_NOWAIT);
|
||||
copy_font(SAVE, FONT_16, font_16);
|
||||
fonts_loaded = FONT_16;
|
||||
scp->font_size = FONT_16;
|
||||
palette = (char *)malloc(3*256, M_DEVBUF, M_NOWAIT);
|
||||
save_palette();
|
||||
}
|
||||
|
||||
scp->scr_buf = (u_short *)malloc(scp->xsize*scp->ysize*sizeof(u_short),
|
||||
@ -1106,7 +1136,7 @@ scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
|
||||
copy_font(LOAD, FONT_16, font_16);
|
||||
if (flags & CHAR_CURSOR)
|
||||
set_destructive_cursor(scp);
|
||||
load_palette();
|
||||
load_palette(palette);
|
||||
}
|
||||
/* FALL THROUGH */
|
||||
|
||||
@ -1155,9 +1185,8 @@ scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
|
||||
case KDSETRAD: /* set keyboard repeat & delay rates */
|
||||
if (*data & 0x80)
|
||||
return EINVAL;
|
||||
i = spltty();
|
||||
send_kbd_command_and_data(sc_port, KBDC_SET_TYPEMATIC, *data);
|
||||
splx(i);
|
||||
if (sc_kbdc != NULL)
|
||||
set_keyboard(KBDC_SET_TYPEMATIC, *data);
|
||||
return 0;
|
||||
|
||||
case KDSKBMODE: /* set keyboard mode */
|
||||
@ -1405,6 +1434,8 @@ sccnprobe(struct consdev *cp)
|
||||
/* initialize required fields */
|
||||
cp->cn_dev = makedev(CDEV_MAJOR, SC_CONSOLE);
|
||||
cp->cn_pri = CN_INTERNAL;
|
||||
|
||||
sc_kbdc = kbdc_open(sc_port);
|
||||
}
|
||||
|
||||
void
|
||||
@ -1499,8 +1530,21 @@ scrn_timer()
|
||||
* This ugly hack calls scintr if input is ready for the keyboard
|
||||
* and conveniently hides the problem. XXX
|
||||
*/
|
||||
if ((inb(sc_port+KBD_STATUS_PORT)&KBDS_BUFFER_FULL) == KBDS_KBD_BUFFER_FULL)
|
||||
scintr(0);
|
||||
/* Try removing anything stuck in the keyboard controller; whether
|
||||
* it's a keyboard scan code or mouse data. `scintr()' doesn't
|
||||
* read the mouse data directly, but `kbdio' routines will, as a
|
||||
* side effect.
|
||||
*/
|
||||
if (kbdc_lock(sc_kbdc, TRUE)) {
|
||||
/*
|
||||
* We have seen the lock flag is not set. Let's reset the flag early;
|
||||
* otherwise `update_led()' failes which may want the lock
|
||||
* during `scintr()'.
|
||||
*/
|
||||
kbdc_lock(sc_kbdc, FALSE);
|
||||
if (kbdc_data_ready(sc_kbdc))
|
||||
scintr(0);
|
||||
}
|
||||
|
||||
/* should we just return ? */
|
||||
if ((scp->status&UNKNOWN_MODE) || blink_in_progress || switch_in_progress) {
|
||||
@ -1659,7 +1703,7 @@ exchange_scr(void)
|
||||
if ((old_scp->status & UNKNOWN_MODE) && crtc_vga) {
|
||||
if (flags & CHAR_CURSOR)
|
||||
set_destructive_cursor(new_scp);
|
||||
load_palette();
|
||||
load_palette(palette);
|
||||
}
|
||||
if (old_scp->status & KBD_RAW_MODE || new_scp->status & KBD_RAW_MODE)
|
||||
shfts = ctls = alts = agrs = metas = 0;
|
||||
@ -2354,9 +2398,8 @@ scinit(void)
|
||||
u_long segoff;
|
||||
|
||||
crtc_vga = TRUE;
|
||||
/*
|
||||
* Get the BIOS video mode pointer.
|
||||
*/
|
||||
|
||||
/* Get the BIOS video mode pointer */
|
||||
segoff = *(u_long *)pa_to_va(0x4a8);
|
||||
pa = (((segoff & 0xffff0000) >> 12) + (segoff & 0xffff));
|
||||
if (ISMAPPED(pa, sizeof(u_long))) {
|
||||
@ -2374,6 +2417,13 @@ scinit(void)
|
||||
bcopyw(Crtat, sc_buffer,
|
||||
console[0]->xsize * console[0]->ysize * sizeof(u_short));
|
||||
|
||||
/* Save font and palette if VGA */
|
||||
if (crtc_vga) {
|
||||
copy_font(SAVE, FONT_16, font_16);
|
||||
fonts_loaded = FONT_16;
|
||||
save_palette();
|
||||
}
|
||||
|
||||
console[0]->scr_buf = console[0]->mouse_pos = sc_buffer;
|
||||
console[0]->cursor_pos = console[0]->cursor_oldpos = sc_buffer + hw_cursor;
|
||||
console[0]->xpos = hw_cursor % COL;
|
||||
@ -2387,6 +2437,7 @@ scinit(void)
|
||||
kernel_console.cur_color = kernel_console.std_color =
|
||||
kernel_default.std_color;
|
||||
kernel_console.rev_color = kernel_default.rev_color;
|
||||
|
||||
/* initialize mapscrn arrays to a one to one map */
|
||||
for (i=0; i<sizeof(scr_map); i++) {
|
||||
scr_map[i] = scr_rmap[i] = i;
|
||||
@ -2433,7 +2484,7 @@ init_scp(scr_stat *scp)
|
||||
if (crtc_addr == MONO_BASE)
|
||||
scp->mode = M_VGA_M80x25;
|
||||
else
|
||||
scp->mode = M_VGA_C80x25;
|
||||
scp->mode = M_VGA_C80x25;
|
||||
else
|
||||
if (crtc_addr == MONO_BASE)
|
||||
scp->mode = M_B80x25;
|
||||
@ -2542,12 +2593,12 @@ scgetc(u_int flags)
|
||||
next_code:
|
||||
/* first see if there is something in the keyboard port */
|
||||
if (flags & SCGETC_NONBLOCK) {
|
||||
c = read_kbd_data_no_wait(sc_port);
|
||||
c = read_kbd_data_no_wait(sc_kbdc);
|
||||
if (c == -1)
|
||||
return(NOKEY);
|
||||
} else {
|
||||
do {
|
||||
c = read_kbd_data(sc_port);
|
||||
c = read_kbd_data(sc_kbdc);
|
||||
} while(c == -1);
|
||||
}
|
||||
scancode = (u_char)c;
|
||||
@ -3001,9 +3052,54 @@ mask2attr(struct term_stat *term)
|
||||
}
|
||||
|
||||
static void
|
||||
update_leds(int which)
|
||||
set_keyboard(int command, int data)
|
||||
{
|
||||
int s;
|
||||
int c;
|
||||
|
||||
if (sc_kbdc == NULL)
|
||||
return;
|
||||
|
||||
/* prevent the timeout routine from polling the keyboard */
|
||||
if (!kbdc_lock(sc_kbdc, TRUE))
|
||||
return;
|
||||
|
||||
/* disable the keyboard and mouse interrupt */
|
||||
s = spltty();
|
||||
c = get_controller_command_byte(sc_kbdc);
|
||||
if ((c == -1)
|
||||
|| !set_controller_command_byte(sc_kbdc,
|
||||
kbdc_get_device_mask(sc_kbdc),
|
||||
KBD_ENABLE_KBD_PORT | KBD_DISABLE_KBD_INT
|
||||
| KBD_DISABLE_AUX_PORT | KBD_DISABLE_AUX_INT)) {
|
||||
/* CONTROLLER ERROR */
|
||||
kbdc_lock(sc_kbdc, FALSE);
|
||||
splx(s);
|
||||
return;
|
||||
}
|
||||
/*
|
||||
* Now that the keyboard controller is told not to generate
|
||||
* the keyboard and mouse interrupts, call `splx()' to allow
|
||||
* the other tty interrupts. The clock interrupt may also occur,
|
||||
* but the timeout routine (`scrn_timer()') will be blocked
|
||||
* by the lock flag set via `kbdc_lock()'
|
||||
*/
|
||||
splx(s);
|
||||
|
||||
send_kbd_command_and_data(sc_kbdc, command, data);
|
||||
|
||||
/* restore the interrupts */
|
||||
if (!set_controller_command_byte(sc_kbdc,
|
||||
kbdc_get_device_mask(sc_kbdc),
|
||||
c & (KBD_KBD_CONTROL_BITS | KBD_AUX_CONTROL_BITS))) {
|
||||
/* CONTROLLER ERROR */
|
||||
}
|
||||
kbdc_lock(sc_kbdc, FALSE);
|
||||
}
|
||||
|
||||
static void
|
||||
update_leds(int which)
|
||||
{
|
||||
static u_char xlate_leds[8] = { 0, 4, 2, 6, 1, 5, 3, 7 };
|
||||
|
||||
/* replace CAPS led with ALTGR led for ALTGR keyboards */
|
||||
@ -3014,10 +3110,7 @@ update_leds(int which)
|
||||
which &= ~CLKED;
|
||||
}
|
||||
|
||||
s = spltty();
|
||||
send_kbd_command_and_data(sc_port, KBDC_SET_LEDS,
|
||||
xlate_leds[which & LED_MASK]);
|
||||
splx(s);
|
||||
set_keyboard(KBDC_SET_LEDS, xlate_leds[which & LED_MASK]);
|
||||
}
|
||||
|
||||
void
|
||||
@ -3595,7 +3688,7 @@ save_palette(void)
|
||||
}
|
||||
|
||||
void
|
||||
load_palette(void)
|
||||
load_palette(char *palette)
|
||||
{
|
||||
int i;
|
||||
|
||||
@ -3658,6 +3751,7 @@ toggle_splash_screen(scr_stat *scp)
|
||||
scp->mode = save_mode;
|
||||
scp->status &= ~UNKNOWN_MODE;
|
||||
set_mode(scp);
|
||||
load_palette(palette);
|
||||
toggle = 0;
|
||||
}
|
||||
else {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*-
|
||||
* Copyright (c) 1995-1996 Søren Schmidt
|
||||
* Copyright (c) 1995-1997 Søren Schmidt
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@ -192,6 +192,6 @@ typedef struct default_attr {
|
||||
void set_border(u_char color);
|
||||
void set_mode(scr_stat *scp);
|
||||
void copy_font(int operation, int font_type, char* font_image);
|
||||
void load_palette(void);
|
||||
void load_palette(char *palette);
|
||||
|
||||
#endif /* !_I386_ISA_SYSCONS_H_ */
|
||||
|
||||
845
sys/isa/kbdio.c
845
sys/isa/kbdio.c
File diff suppressed because it is too large
Load Diff
120
sys/isa/kbdio.h
120
sys/isa/kbdio.h
@ -39,15 +39,18 @@
|
||||
#define KBD_STATUS_PORT 2 /* status port, read */
|
||||
#define KBD_COMMAND_PORT 2 /* controller command port, write */
|
||||
#define KBD_DATA_PORT 0 /* data port, read/write
|
||||
also used as keyboard command
|
||||
and mouse command port */
|
||||
* also used as keyboard command
|
||||
* and mouse command port
|
||||
*/
|
||||
#else
|
||||
#define KBD_STATUS_PORT 4 /* status port, read */
|
||||
#define KBD_COMMAND_PORT 4 /* controller command port, write */
|
||||
#define KBD_DATA_PORT 0 /* data port, read/write
|
||||
also used as keyboard command
|
||||
and mouse command port */
|
||||
* also used as keyboard command
|
||||
* and mouse command port
|
||||
*/
|
||||
#endif /* PC98 */
|
||||
|
||||
/* FIXME: `IO_PSMSIZE' should really be in `isa.h'. */
|
||||
#define IO_PSMSIZE (KBD_COMMAND_PORT - KBD_DATA_PORT + 1) /* 5 */
|
||||
|
||||
@ -86,13 +89,14 @@
|
||||
#define KBDC_SEND_DEV_ID 0x00f2
|
||||
#define KBDC_SET_LEDS 0x00ed
|
||||
#define KBDC_ECHO 0x00ee
|
||||
#define KBDC_SET_SCAN_CODESET 0x00f0
|
||||
#define KBDC_SET_SCANCODE_SET 0x00f0
|
||||
#define KBDC_SET_TYPEMATIC 0x00f3
|
||||
|
||||
/* aux device commands (sent to KBD_DATA_PORT) */
|
||||
#define PSMC_RESET_DEV 0x00ff
|
||||
#define PSMC_ENABLE_DEV 0x00f4
|
||||
#define PSMC_DISABLE_DEV 0x00f5
|
||||
#define PSMC_SET_DEFAULTS 0x00f6
|
||||
#define PSMC_SEND_DEV_ID 0x00f2
|
||||
#define PSMC_SEND_DEV_STATUS 0x00e9
|
||||
#define PSMC_SEND_DEV_DATA 0x00eb
|
||||
@ -104,15 +108,11 @@
|
||||
#define PSMC_SET_SAMPLING_RATE 0x00f3
|
||||
|
||||
/* PSMC_SET_RESOLUTION argument */
|
||||
#define PSMD_RESOLUTION_25 0 /* 25ppi */
|
||||
#define PSMD_RESOLUTION_50 1 /* 50ppi */
|
||||
#define PSMD_RESOLUTION_100 2 /* 100ppi (default after reset) */
|
||||
#define PSMD_RESOLUTION_200 3 /* 200ppi */
|
||||
/* FIXME: I don't know if it's possible to go beyond 200ppi.
|
||||
The values below are of my wild guess. */
|
||||
#define PSMD_RESOLUTION_400 4 /* 400ppi */
|
||||
#define PSMD_RESOLUTION_800 5 /* 800ppi */
|
||||
#define PSMD_MAX_RESOLUTION PSMD_RESOLUTION_800
|
||||
#define PSMD_RES_LOW 0 /* typically 25ppi */
|
||||
#define PSMD_RES_MEDIUM_LOW 1 /* typically 50ppi */
|
||||
#define PSMD_RES_MEDIUM_HIGH 2 /* typically 100ppi (default) */
|
||||
#define PSMD_RES_HIGH 3 /* typically 200ppi */
|
||||
#define PSMD_MAX_RESOLUTION PSMD_RES_HIGH
|
||||
|
||||
/* PSMC_SET_SAMPLING_RATE */
|
||||
#define PSMD_MAX_RATE 255 /* FIXME: not sure if it's possible */
|
||||
@ -151,79 +151,57 @@
|
||||
|
||||
#ifdef KERNEL
|
||||
|
||||
/* driver specific options: the following options may be set by
|
||||
`options' statements in the kernel configuration file. */
|
||||
|
||||
/* retry count */
|
||||
#ifndef KBD_MAXRETRY
|
||||
#define KBD_MAXRETRY 3
|
||||
#endif
|
||||
|
||||
/* timing parameters */
|
||||
#ifndef KBD_RESETDELAY
|
||||
#define KBD_RESETDELAY 200 /* wait 200msec after kbd/mouse reset */
|
||||
#endif
|
||||
#ifndef KBD_MAXWAIT
|
||||
#define KBD_MAXWAIT 5 /* wait 5 times at most after reset */
|
||||
#endif
|
||||
|
||||
/* I/O recovery time */
|
||||
#ifdef PC98
|
||||
#define KBDC_DELAYTIME 37
|
||||
#define KBDD_DELAYTIME 37
|
||||
#else
|
||||
#define KBDC_DELAYTIME 20
|
||||
#define KBDD_DELAYTIME 7
|
||||
#endif
|
||||
|
||||
/* debugging */
|
||||
/* #define KBDIO_DEBUG produces debugging output */
|
||||
|
||||
/* end of driver specific options */
|
||||
|
||||
/* misc */
|
||||
#ifndef TRUE
|
||||
#define TRUE (-1)
|
||||
#define TRUE 1
|
||||
#endif
|
||||
#ifndef FALSE
|
||||
#define FALSE 0
|
||||
#endif
|
||||
|
||||
/* types/structures */
|
||||
|
||||
typedef caddr_t KBDC;
|
||||
|
||||
/* function prototypes */
|
||||
|
||||
int wait_while_controller_busy __P((int port));
|
||||
KBDC kbdc_open __P((int port));
|
||||
|
||||
int wait_for_data __P((int port));
|
||||
int wait_for_kbd_data __P((int port));
|
||||
int wait_for_aux_data __P((int port));
|
||||
int kbdc_lock __P((KBDC kbdc, int lock));
|
||||
|
||||
int write_controller_command __P((int port,int c));
|
||||
int write_controller_data __P((int port,int c));
|
||||
int kbdc_data_ready __P((KBDC kbdc));
|
||||
|
||||
int write_kbd_command __P((int port,int c));
|
||||
int write_aux_command __P((int port,int c));
|
||||
int send_kbd_command __P((int port,int c));
|
||||
int send_aux_command __P((int port,int c));
|
||||
int send_kbd_command_and_data __P((int port,int c,int d));
|
||||
int send_aux_command_and_data __P((int port,int c,int d));
|
||||
int write_controller_command __P((KBDC kbdc,int c));
|
||||
int write_controller_data __P((KBDC kbdc,int c));
|
||||
|
||||
int read_controller_data __P((int port));
|
||||
int read_kbd_data __P((int port));
|
||||
int read_kbd_data_no_wait __P((int port));
|
||||
int read_aux_data __P((int port));
|
||||
int write_kbd_command __P((KBDC kbdc,int c));
|
||||
int write_aux_command __P((KBDC kbdc,int c));
|
||||
int send_kbd_command __P((KBDC kbdc,int c));
|
||||
int send_aux_command __P((KBDC kbdc,int c));
|
||||
int send_kbd_command_and_data __P((KBDC kbdc,int c,int d));
|
||||
int send_aux_command_and_data __P((KBDC kbdc,int c,int d));
|
||||
|
||||
void empty_kbd_buffer __P((int port, int t));
|
||||
void empty_aux_buffer __P((int port, int t));
|
||||
void empty_both_buffers __P((int port, int t));
|
||||
int read_controller_data __P((KBDC kbdc));
|
||||
int read_kbd_data __P((KBDC kbdc));
|
||||
int read_kbd_data_no_wait __P((KBDC kbdc));
|
||||
int read_aux_data __P((KBDC kbdc));
|
||||
int read_aux_data_no_wait __P((KBDC kbdc));
|
||||
|
||||
int reset_kbd __P((int port));
|
||||
int reset_aux_dev __P((int port));
|
||||
void empty_kbd_buffer __P((KBDC kbdc, int t));
|
||||
void empty_aux_buffer __P((KBDC kbdc, int t));
|
||||
void empty_both_buffers __P((KBDC kbdc, int t));
|
||||
|
||||
int test_controller __P((int port));
|
||||
int test_kbd_port __P((int port));
|
||||
int test_aux_port __P((int port));
|
||||
int reset_kbd __P((KBDC kbdc));
|
||||
int reset_aux_dev __P((KBDC kbdc));
|
||||
|
||||
int set_controller_command_byte __P((int port,int command,int flag));
|
||||
int test_controller __P((KBDC kbdc));
|
||||
int test_kbd_port __P((KBDC kbdc));
|
||||
int test_aux_port __P((KBDC kbdc));
|
||||
|
||||
int kbdc_get_device_mask __P((KBDC kbdc));
|
||||
void kbdc_set_device_mask __P((KBDC kbdc, int mask));
|
||||
|
||||
int get_controller_command_byte __P((KBDC kbdc));
|
||||
int set_controller_command_byte __P((KBDC kbdc, int command, int flag));
|
||||
|
||||
#endif /* KERNEL */
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*-
|
||||
* Copyright (c) 1992-1996 Søren Schmidt
|
||||
* Copyright (c) 1992-1997 Søren Schmidt
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@ -103,6 +103,7 @@ static term_stat kernel_console;
|
||||
static default_attr *current_default;
|
||||
static int flags = 0;
|
||||
static int sc_port = IO_KBD;
|
||||
static KBDC sc_kbdc = NULL;
|
||||
static char init_done = COLD;
|
||||
static u_short sc_buffer[ROW*COL];
|
||||
static char switch_in_progress = FALSE;
|
||||
@ -113,9 +114,6 @@ static int blinkrate = 0;
|
||||
char crtc_vga = FALSE;
|
||||
static u_char shfts = 0, ctls = 0, alts = 0, agrs = 0, metas = 0;
|
||||
static u_char nlkcnt = 0, clkcnt = 0, slkcnt = 0, alkcnt = 0;
|
||||
char *font_8 = NULL, *font_14 = NULL, *font_16 = NULL;
|
||||
int fonts_loaded = 0;
|
||||
char *palette;
|
||||
static const u_int n_fkey_tab = sizeof(fkey_tab) / sizeof(*fkey_tab);
|
||||
static int delayed_next_scr = FALSE;
|
||||
static long scrn_blank_time = 0; /* screen saver timeout value */
|
||||
@ -124,6 +122,11 @@ static long scrn_time_stamp;
|
||||
u_char scr_map[256];
|
||||
u_char scr_rmap[256];
|
||||
char *video_mode_ptr = NULL;
|
||||
int fonts_loaded = 0;
|
||||
char font_8[256*8];
|
||||
char font_14[256*14];
|
||||
char font_16[256*16];
|
||||
char palette[256*3];
|
||||
static char *cut_buffer;
|
||||
static u_short mouse_and_mask[16] = {
|
||||
0xc000, 0xe000, 0xf000, 0xf800,
|
||||
@ -194,6 +197,7 @@ static void history_to_screen(scr_stat *scp);
|
||||
static int history_up_line(scr_stat *scp);
|
||||
static int history_down_line(scr_stat *scp);
|
||||
static int mask2attr(struct term_stat *term);
|
||||
static void set_keyboard(int command, int data);
|
||||
static void update_leds(int which);
|
||||
static void set_vgaregs(char *modetable);
|
||||
static void set_font_mode(void);
|
||||
@ -294,28 +298,34 @@ move_crsr(scr_stat *scp, int x, int y)
|
||||
static int
|
||||
scprobe(struct isa_device *dev)
|
||||
{
|
||||
int c;
|
||||
int codeset;
|
||||
int c = -1;
|
||||
int m;
|
||||
|
||||
sc_port = dev->id_iobase;
|
||||
sc_kbdc = kbdc_open(sc_port);
|
||||
|
||||
if (!kbdc_lock(sc_kbdc, TRUE)) {
|
||||
/* driver error? */
|
||||
printf("sc%d: unable to lock the controller.\n", dev->id_unit);
|
||||
return ((dev->id_flags & DETECT_KBD) ? 0 : IO_KBDSIZE);
|
||||
}
|
||||
|
||||
/* discard anything left after UserConfig */
|
||||
empty_both_buffers(sc_port, 10);
|
||||
empty_both_buffers(sc_kbdc, 10);
|
||||
|
||||
/* save the current keyboard controller command byte */
|
||||
c = -1;
|
||||
if (!write_controller_command(sc_port, KBDC_GET_COMMAND_BYTE)) {
|
||||
/* CONTROLLER ERROR */
|
||||
printf("sc%d: unable to get the current command byte value.\n",
|
||||
dev->id_unit);
|
||||
goto fail;
|
||||
}
|
||||
c = read_controller_data(sc_port);
|
||||
m = kbdc_get_device_mask(sc_kbdc) & ~KBD_KBD_CONTROL_BITS;
|
||||
c = get_controller_command_byte(sc_kbdc);
|
||||
if (c == -1) {
|
||||
/* CONTROLLER ERROR */
|
||||
printf("sc%d: unable to get the current command byte value.\n",
|
||||
dev->id_unit);
|
||||
goto fail;
|
||||
}
|
||||
if (bootverbose)
|
||||
printf("sc%d: the current keyboard controller command byte %04x\n",
|
||||
dev->id_unit, c);
|
||||
#if 0
|
||||
/* override the keyboard lock switch */
|
||||
c |= KBD_OVERRIDE_KBD_LOCK;
|
||||
@ -325,19 +335,40 @@ scprobe(struct isa_device *dev)
|
||||
* enable the keyboard port, but disable the keyboard intr.
|
||||
* the aux port (mouse port) is disabled too.
|
||||
*/
|
||||
if (!set_controller_command_byte(sc_port,
|
||||
c & ~(KBD_KBD_CONTROL_BITS | KBD_AUX_CONTROL_BITS),
|
||||
if (!set_controller_command_byte(sc_kbdc,
|
||||
KBD_KBD_CONTROL_BITS | KBD_AUX_CONTROL_BITS,
|
||||
KBD_ENABLE_KBD_PORT | KBD_DISABLE_KBD_INT
|
||||
| KBD_DISABLE_AUX_PORT | KBD_DISABLE_AUX_INT)) {
|
||||
| KBD_DISABLE_AUX_PORT | KBD_DISABLE_AUX_INT)) {
|
||||
/* CONTROLLER ERROR
|
||||
* there is very little we can do...
|
||||
*/
|
||||
printf("sc%d: unable to set the command byte.\n", dev->id_unit);
|
||||
goto fail;
|
||||
}
|
||||
|
||||
/*
|
||||
* Check if we have an XT keyboard before we attempt to reset it.
|
||||
* The procedure assumes that the keyboard and the controller have
|
||||
* been set up properly by BIOS and have not been messed up
|
||||
* during the boot process.
|
||||
*/
|
||||
codeset = -1;
|
||||
if (dev->id_flags & XT_KEYBD)
|
||||
/* the user says there is a XT keyboard */
|
||||
codeset = 1;
|
||||
#ifdef DETECT_XT_KEYBOARD
|
||||
else if ((c & KBD_TRANSLATION) == 0) {
|
||||
/* SET_SCANCODE_SET is not always supported; ignore error */
|
||||
if (send_kbd_command_and_data(sc_kbdc, KBDC_SET_SCANCODE_SET, 0)
|
||||
== KBD_ACK)
|
||||
codeset = read_kbd_data(sc_kbdc);
|
||||
}
|
||||
if (bootverbose)
|
||||
printf("sc%d: keyboard scancode set %d\n", dev->id_unit, codeset);
|
||||
#endif /* DETECT_XT_KEYBOARD */
|
||||
|
||||
/* reset keyboard hardware */
|
||||
if (!reset_kbd(sc_port)) {
|
||||
if (!reset_kbd(sc_kbdc)) {
|
||||
/* KEYBOARD ERROR
|
||||
* Keyboard reset may fail either because the keyboard doen't exist,
|
||||
* or because the keyboard doesn't pass the self-test, or the keyboard
|
||||
@ -347,14 +378,14 @@ scprobe(struct isa_device *dev)
|
||||
* test_controller() and test_kbd_port() appear to bring the keyboard
|
||||
* controller back (I don't know why and how, though.)
|
||||
*/
|
||||
empty_both_buffers(sc_port, 10);
|
||||
test_controller(sc_port);
|
||||
test_kbd_port(sc_port);
|
||||
empty_both_buffers(sc_kbdc, 10);
|
||||
test_controller(sc_kbdc);
|
||||
test_kbd_port(sc_kbdc);
|
||||
/* We could disable the keyboard port and interrupt... but,
|
||||
* the keyboard may still exist (see above).
|
||||
*/
|
||||
if (bootverbose)
|
||||
printf("sc%d: failed to reset the keyboard.\n", dev->id_unit);
|
||||
if (bootverbose)
|
||||
printf("sc%d: failed to reset the keyboard.\n", dev->id_unit);
|
||||
goto fail;
|
||||
}
|
||||
|
||||
@ -363,9 +394,9 @@ scprobe(struct isa_device *dev)
|
||||
* such as those on the IBM ThinkPad laptop computers can be used
|
||||
* with the standard console driver.
|
||||
*/
|
||||
if (dev->id_flags & XT_KEYBD) {
|
||||
if (codeset == 1) {
|
||||
if (send_kbd_command_and_data(
|
||||
sc_port, KBDC_SET_SCAN_CODESET, 1) == KBD_ACK) {
|
||||
sc_kbdc, KBDC_SET_SCANCODE_SET, codeset) == KBD_ACK) {
|
||||
/* XT kbd doesn't need scan code translation */
|
||||
c &= ~KBD_TRANSLATION;
|
||||
} else {
|
||||
@ -378,8 +409,10 @@ scprobe(struct isa_device *dev)
|
||||
}
|
||||
}
|
||||
/* enable the keyboard port and intr. */
|
||||
if (!set_controller_command_byte(sc_port, c & ~KBD_KBD_CONTROL_BITS,
|
||||
KBD_ENABLE_KBD_PORT | KBD_ENABLE_KBD_INT)) {
|
||||
if (!set_controller_command_byte(sc_kbdc,
|
||||
KBD_KBD_CONTROL_BITS | KBD_AUX_CONTROL_BITS | KBD_OVERRIDE_KBD_LOCK,
|
||||
(c & (KBD_AUX_CONTROL_BITS | KBD_OVERRIDE_KBD_LOCK))
|
||||
| KBD_ENABLE_KBD_PORT | KBD_ENABLE_KBD_INT)) {
|
||||
/* CONTROLLER ERROR
|
||||
* This is serious; we are left with the disabled keyboard intr.
|
||||
*/
|
||||
@ -389,12 +422,17 @@ scprobe(struct isa_device *dev)
|
||||
}
|
||||
|
||||
succeed:
|
||||
kbdc_set_device_mask(sc_kbdc, m | KBD_KBD_CONTROL_BITS),
|
||||
kbdc_lock(sc_kbdc, FALSE);
|
||||
return (IO_KBDSIZE);
|
||||
|
||||
fail:
|
||||
if (c != -1)
|
||||
/* try to restore the command byte as before, if possible */
|
||||
set_controller_command_byte(sc_port, c, 0);
|
||||
/* try to restore the command byte as before, if possible */
|
||||
set_controller_command_byte(sc_kbdc, 0xff, c);
|
||||
kbdc_set_device_mask(sc_kbdc,
|
||||
(dev->id_flags & DETECT_KBD) ? m : m | KBD_KBD_CONTROL_BITS);
|
||||
kbdc_lock(sc_kbdc, FALSE);
|
||||
return ((dev->id_flags & DETECT_KBD) ? 0 : IO_KBDSIZE);
|
||||
}
|
||||
|
||||
@ -423,14 +461,6 @@ scattach(struct isa_device *dev)
|
||||
|
||||
if (crtc_vga) {
|
||||
cut_buffer = (char *)malloc(scp->xsize*scp->ysize, M_DEVBUF, M_NOWAIT);
|
||||
font_8 = (char *)malloc(8*256, M_DEVBUF, M_NOWAIT);
|
||||
font_14 = (char *)malloc(14*256, M_DEVBUF, M_NOWAIT);
|
||||
font_16 = (char *)malloc(16*256, M_DEVBUF, M_NOWAIT);
|
||||
copy_font(SAVE, FONT_16, font_16);
|
||||
fonts_loaded = FONT_16;
|
||||
scp->font_size = FONT_16;
|
||||
palette = (char *)malloc(3*256, M_DEVBUF, M_NOWAIT);
|
||||
save_palette();
|
||||
}
|
||||
|
||||
scp->scr_buf = (u_short *)malloc(scp->xsize*scp->ysize*sizeof(u_short),
|
||||
@ -1106,7 +1136,7 @@ scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
|
||||
copy_font(LOAD, FONT_16, font_16);
|
||||
if (flags & CHAR_CURSOR)
|
||||
set_destructive_cursor(scp);
|
||||
load_palette();
|
||||
load_palette(palette);
|
||||
}
|
||||
/* FALL THROUGH */
|
||||
|
||||
@ -1155,9 +1185,8 @@ scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
|
||||
case KDSETRAD: /* set keyboard repeat & delay rates */
|
||||
if (*data & 0x80)
|
||||
return EINVAL;
|
||||
i = spltty();
|
||||
send_kbd_command_and_data(sc_port, KBDC_SET_TYPEMATIC, *data);
|
||||
splx(i);
|
||||
if (sc_kbdc != NULL)
|
||||
set_keyboard(KBDC_SET_TYPEMATIC, *data);
|
||||
return 0;
|
||||
|
||||
case KDSKBMODE: /* set keyboard mode */
|
||||
@ -1405,6 +1434,8 @@ sccnprobe(struct consdev *cp)
|
||||
/* initialize required fields */
|
||||
cp->cn_dev = makedev(CDEV_MAJOR, SC_CONSOLE);
|
||||
cp->cn_pri = CN_INTERNAL;
|
||||
|
||||
sc_kbdc = kbdc_open(sc_port);
|
||||
}
|
||||
|
||||
void
|
||||
@ -1499,8 +1530,21 @@ scrn_timer()
|
||||
* This ugly hack calls scintr if input is ready for the keyboard
|
||||
* and conveniently hides the problem. XXX
|
||||
*/
|
||||
if ((inb(sc_port+KBD_STATUS_PORT)&KBDS_BUFFER_FULL) == KBDS_KBD_BUFFER_FULL)
|
||||
scintr(0);
|
||||
/* Try removing anything stuck in the keyboard controller; whether
|
||||
* it's a keyboard scan code or mouse data. `scintr()' doesn't
|
||||
* read the mouse data directly, but `kbdio' routines will, as a
|
||||
* side effect.
|
||||
*/
|
||||
if (kbdc_lock(sc_kbdc, TRUE)) {
|
||||
/*
|
||||
* We have seen the lock flag is not set. Let's reset the flag early;
|
||||
* otherwise `update_led()' failes which may want the lock
|
||||
* during `scintr()'.
|
||||
*/
|
||||
kbdc_lock(sc_kbdc, FALSE);
|
||||
if (kbdc_data_ready(sc_kbdc))
|
||||
scintr(0);
|
||||
}
|
||||
|
||||
/* should we just return ? */
|
||||
if ((scp->status&UNKNOWN_MODE) || blink_in_progress || switch_in_progress) {
|
||||
@ -1659,7 +1703,7 @@ exchange_scr(void)
|
||||
if ((old_scp->status & UNKNOWN_MODE) && crtc_vga) {
|
||||
if (flags & CHAR_CURSOR)
|
||||
set_destructive_cursor(new_scp);
|
||||
load_palette();
|
||||
load_palette(palette);
|
||||
}
|
||||
if (old_scp->status & KBD_RAW_MODE || new_scp->status & KBD_RAW_MODE)
|
||||
shfts = ctls = alts = agrs = metas = 0;
|
||||
@ -2354,9 +2398,8 @@ scinit(void)
|
||||
u_long segoff;
|
||||
|
||||
crtc_vga = TRUE;
|
||||
/*
|
||||
* Get the BIOS video mode pointer.
|
||||
*/
|
||||
|
||||
/* Get the BIOS video mode pointer */
|
||||
segoff = *(u_long *)pa_to_va(0x4a8);
|
||||
pa = (((segoff & 0xffff0000) >> 12) + (segoff & 0xffff));
|
||||
if (ISMAPPED(pa, sizeof(u_long))) {
|
||||
@ -2374,6 +2417,13 @@ scinit(void)
|
||||
bcopyw(Crtat, sc_buffer,
|
||||
console[0]->xsize * console[0]->ysize * sizeof(u_short));
|
||||
|
||||
/* Save font and palette if VGA */
|
||||
if (crtc_vga) {
|
||||
copy_font(SAVE, FONT_16, font_16);
|
||||
fonts_loaded = FONT_16;
|
||||
save_palette();
|
||||
}
|
||||
|
||||
console[0]->scr_buf = console[0]->mouse_pos = sc_buffer;
|
||||
console[0]->cursor_pos = console[0]->cursor_oldpos = sc_buffer + hw_cursor;
|
||||
console[0]->xpos = hw_cursor % COL;
|
||||
@ -2387,6 +2437,7 @@ scinit(void)
|
||||
kernel_console.cur_color = kernel_console.std_color =
|
||||
kernel_default.std_color;
|
||||
kernel_console.rev_color = kernel_default.rev_color;
|
||||
|
||||
/* initialize mapscrn arrays to a one to one map */
|
||||
for (i=0; i<sizeof(scr_map); i++) {
|
||||
scr_map[i] = scr_rmap[i] = i;
|
||||
@ -2433,7 +2484,7 @@ init_scp(scr_stat *scp)
|
||||
if (crtc_addr == MONO_BASE)
|
||||
scp->mode = M_VGA_M80x25;
|
||||
else
|
||||
scp->mode = M_VGA_C80x25;
|
||||
scp->mode = M_VGA_C80x25;
|
||||
else
|
||||
if (crtc_addr == MONO_BASE)
|
||||
scp->mode = M_B80x25;
|
||||
@ -2542,12 +2593,12 @@ scgetc(u_int flags)
|
||||
next_code:
|
||||
/* first see if there is something in the keyboard port */
|
||||
if (flags & SCGETC_NONBLOCK) {
|
||||
c = read_kbd_data_no_wait(sc_port);
|
||||
c = read_kbd_data_no_wait(sc_kbdc);
|
||||
if (c == -1)
|
||||
return(NOKEY);
|
||||
} else {
|
||||
do {
|
||||
c = read_kbd_data(sc_port);
|
||||
c = read_kbd_data(sc_kbdc);
|
||||
} while(c == -1);
|
||||
}
|
||||
scancode = (u_char)c;
|
||||
@ -3001,9 +3052,54 @@ mask2attr(struct term_stat *term)
|
||||
}
|
||||
|
||||
static void
|
||||
update_leds(int which)
|
||||
set_keyboard(int command, int data)
|
||||
{
|
||||
int s;
|
||||
int c;
|
||||
|
||||
if (sc_kbdc == NULL)
|
||||
return;
|
||||
|
||||
/* prevent the timeout routine from polling the keyboard */
|
||||
if (!kbdc_lock(sc_kbdc, TRUE))
|
||||
return;
|
||||
|
||||
/* disable the keyboard and mouse interrupt */
|
||||
s = spltty();
|
||||
c = get_controller_command_byte(sc_kbdc);
|
||||
if ((c == -1)
|
||||
|| !set_controller_command_byte(sc_kbdc,
|
||||
kbdc_get_device_mask(sc_kbdc),
|
||||
KBD_ENABLE_KBD_PORT | KBD_DISABLE_KBD_INT
|
||||
| KBD_DISABLE_AUX_PORT | KBD_DISABLE_AUX_INT)) {
|
||||
/* CONTROLLER ERROR */
|
||||
kbdc_lock(sc_kbdc, FALSE);
|
||||
splx(s);
|
||||
return;
|
||||
}
|
||||
/*
|
||||
* Now that the keyboard controller is told not to generate
|
||||
* the keyboard and mouse interrupts, call `splx()' to allow
|
||||
* the other tty interrupts. The clock interrupt may also occur,
|
||||
* but the timeout routine (`scrn_timer()') will be blocked
|
||||
* by the lock flag set via `kbdc_lock()'
|
||||
*/
|
||||
splx(s);
|
||||
|
||||
send_kbd_command_and_data(sc_kbdc, command, data);
|
||||
|
||||
/* restore the interrupts */
|
||||
if (!set_controller_command_byte(sc_kbdc,
|
||||
kbdc_get_device_mask(sc_kbdc),
|
||||
c & (KBD_KBD_CONTROL_BITS | KBD_AUX_CONTROL_BITS))) {
|
||||
/* CONTROLLER ERROR */
|
||||
}
|
||||
kbdc_lock(sc_kbdc, FALSE);
|
||||
}
|
||||
|
||||
static void
|
||||
update_leds(int which)
|
||||
{
|
||||
static u_char xlate_leds[8] = { 0, 4, 2, 6, 1, 5, 3, 7 };
|
||||
|
||||
/* replace CAPS led with ALTGR led for ALTGR keyboards */
|
||||
@ -3014,10 +3110,7 @@ update_leds(int which)
|
||||
which &= ~CLKED;
|
||||
}
|
||||
|
||||
s = spltty();
|
||||
send_kbd_command_and_data(sc_port, KBDC_SET_LEDS,
|
||||
xlate_leds[which & LED_MASK]);
|
||||
splx(s);
|
||||
set_keyboard(KBDC_SET_LEDS, xlate_leds[which & LED_MASK]);
|
||||
}
|
||||
|
||||
void
|
||||
@ -3595,7 +3688,7 @@ save_palette(void)
|
||||
}
|
||||
|
||||
void
|
||||
load_palette(void)
|
||||
load_palette(char *palette)
|
||||
{
|
||||
int i;
|
||||
|
||||
@ -3658,6 +3751,7 @@ toggle_splash_screen(scr_stat *scp)
|
||||
scp->mode = save_mode;
|
||||
scp->status &= ~UNKNOWN_MODE;
|
||||
set_mode(scp);
|
||||
load_palette(palette);
|
||||
toggle = 0;
|
||||
}
|
||||
else {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*-
|
||||
* Copyright (c) 1995-1996 Søren Schmidt
|
||||
* Copyright (c) 1995-1997 Søren Schmidt
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@ -192,6 +192,6 @@ typedef struct default_attr {
|
||||
void set_border(u_char color);
|
||||
void set_mode(scr_stat *scp);
|
||||
void copy_font(int operation, int font_type, char* font_image);
|
||||
void load_palette(void);
|
||||
void load_palette(char *palette);
|
||||
|
||||
#endif /* !_I386_ISA_SYSCONS_H_ */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*-
|
||||
* Copyright (c) 1995 Søren Schmidt
|
||||
* Copyright (c) 1995-1997 Søren Schmidt
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@ -68,7 +68,7 @@ fade_saver(int blank)
|
||||
}
|
||||
}
|
||||
else {
|
||||
load_palette();
|
||||
load_palette(palette);
|
||||
count = scrn_blanked = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,4 +1,32 @@
|
||||
/* $FreeBSD$ */
|
||||
/*-
|
||||
* Copyright (c) 1995-1997 Søren Schmidt
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer
|
||||
* in this position and unchanged.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. The name of the author may not be used to endorse or promote products
|
||||
* derived from this software withough specific prior written permission
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
||||
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
@ -14,6 +42,10 @@
|
||||
extern scr_stat *cur_console;
|
||||
extern u_short *Crtat;
|
||||
extern u_int crtc_addr;
|
||||
extern char crtc_vga;
|
||||
extern char scr_map[];
|
||||
extern int scrn_blanked;
|
||||
extern char palette[];
|
||||
extern int fonts_loaded;
|
||||
extern char *font_8, *font_14, *font_16;
|
||||
extern char *palette;
|
||||
extern char *video_mode_ptr;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user