From a5e94e98c7cdb7f7b8406bf7ada8d90b80a05d84 Mon Sep 17 00:00:00 2001 From: phk Date: Thu, 27 Oct 1994 05:47:09 +0000 Subject: The other half of patch011, read Numlck state from bios. --- sys/dev/syscons/syscons.c | 8 ++------ sys/i386/isa/syscons.c | 8 ++------ sys/isa/syscons.c | 8 ++------ 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index d8e5f34..9f91fd8 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: syscons.c,v 1.72 1994/10/24 21:36:38 wollman Exp $ + * $Id: syscons.c,v 1.73 1994/10/26 21:51:22 bde Exp $ */ #include "sc.h" @@ -2154,11 +2154,7 @@ scinit(void) scp->ysize = ROW; scp->bell_pitch = BELL_PITCH; scp->bell_duration = BELL_DURATION; -#ifndef LAPTOP - scp->status = NLKED; -#else - scp->status = 0; -#endif + scp->status = *(char *)(KERNBASE + 0x417) & 0x20 ? NLKED : 0; scp->pid = 0; scp->proc = NULL; scp->smode.mode = VT_AUTO; diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c index d8e5f34..9f91fd8 100644 --- a/sys/i386/isa/syscons.c +++ b/sys/i386/isa/syscons.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: syscons.c,v 1.72 1994/10/24 21:36:38 wollman Exp $ + * $Id: syscons.c,v 1.73 1994/10/26 21:51:22 bde Exp $ */ #include "sc.h" @@ -2154,11 +2154,7 @@ scinit(void) scp->ysize = ROW; scp->bell_pitch = BELL_PITCH; scp->bell_duration = BELL_DURATION; -#ifndef LAPTOP - scp->status = NLKED; -#else - scp->status = 0; -#endif + scp->status = *(char *)(KERNBASE + 0x417) & 0x20 ? NLKED : 0; scp->pid = 0; scp->proc = NULL; scp->smode.mode = VT_AUTO; diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c index d8e5f34..9f91fd8 100644 --- a/sys/isa/syscons.c +++ b/sys/isa/syscons.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: syscons.c,v 1.72 1994/10/24 21:36:38 wollman Exp $ + * $Id: syscons.c,v 1.73 1994/10/26 21:51:22 bde Exp $ */ #include "sc.h" @@ -2154,11 +2154,7 @@ scinit(void) scp->ysize = ROW; scp->bell_pitch = BELL_PITCH; scp->bell_duration = BELL_DURATION; -#ifndef LAPTOP - scp->status = NLKED; -#else - scp->status = 0; -#endif + scp->status = *(char *)(KERNBASE + 0x417) & 0x20 ? NLKED : 0; scp->pid = 0; scp->proc = NULL; scp->smode.mode = VT_AUTO; -- cgit v1.1