Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BUGFIX: PCKBD_LAYOUT had not been effective.

Browse Source
This commit is contained in:
takemura 2000-10-21 07:27:41 +00:00
parent 75b4280023
commit 9154a8ec27
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/arch/hpcmips/conf/GENERIC
View File

@ -2,11 +2,11 @@
# Distribution kernel (NEC VR based model) kernel config file
#
# $NetBSD: GENERIC,v 1.70 2000/10/03 03:13:04 sato Exp $
# $NetBSD: GENERIC,v 1.71 2000/10/21 07:27:41 takemura Exp $
#
include "arch/hpcmips/conf/std.hpcmips"
#ident "GENERIC-$Revision: 1.70 $"
#ident "GENERIC-$Revision: 1.71 $"
maxusers 8
@ -97,6 +97,11 @@ options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
options WSDISPLAY_COMPAT_USL # VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
#
# Hpckbd will set key board layout appropriately. You can use option
# 'PCKBD_LAYOUT' to overrite the default layout.
#
#options PCKBD_LAYOUT="(KB_US | KB_SWAPCTRLCAPS | KB_MACHDEP)"
# temporally power management
hpcapm0 at mainbus0 # power management

9
sys/arch/hpcmips/dev/hpckbd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hpckbd.c,v 1.2 2000/10/01 03:45:33 takemura Exp $ */
/* $NetBSD: hpckbd.c,v 1.3 2000/10/21 07:27:42 takemura Exp $ */
/*-
* Copyright (c) 1999, 2000 UCHIYAMA Yasushi. All rights reserved.
@ -41,6 +41,7 @@
#include <machine/platid_mask.h>
#include "opt_wsdisplay_compat.h"
#include "opt_pckbd_layout.h"
#include <dev/wscons/wsksymdef.h>
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wskbdvar.h>
@ -132,7 +133,11 @@ const struct wskbd_consops hpckbd_consops = {
struct wskbd_mapdata hpckbd_keymapdata = {
pckbd_keydesctab,
#ifdef PCKBD_LAYOUT
PCKBD_LAYOUT
#else
KB_US
#endif
};
int
@ -304,9 +309,7 @@ hpckbd_keymap_lookup(hc)
hpckbd_keymapdata.layout |= KB_MACHDEP;
#endif
} else {
#if defined(PCKBD_LAYOUT)
hpckbd_keymapdata.layout &= ~KB_MACHDEP;
#endif
}
return;
}