summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorkato <kato@FreeBSD.org>1997-04-11 07:41:22 +0000
committerkato <kato@FreeBSD.org>1997-04-11 07:41:22 +0000
commitb06bedf02d7fb2dcf5cddcfcefdd6d47f2d70268 (patch)
tree168c9646ac594f2d1b8097aec971fd58c771a2bb /sys
parent6a4df2f578e0359fbefc8a6bb085786db33eeef9 (diff)
downloadFreeBSD-src-b06bedf02d7fb2dcf5cddcfcefdd6d47f2d70268.zip
FreeBSD-src-b06bedf02d7fb2dcf5cddcfcefdd6d47f2d70268.tar.gz
Synchronize with sys/i386/isa/syscons.c revision 1.209.
Diffstat (limited to 'sys')
-rw-r--r--sys/pc98/pc98/syscons.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/sys/pc98/pc98/syscons.c b/sys/pc98/pc98/syscons.c
index d3420f4..4dd16d5 100644
--- a/sys/pc98/pc98/syscons.c
+++ b/sys/pc98/pc98/syscons.c
@@ -25,7 +25,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.c,v 1.32 1997/03/29 02:46:28 kato Exp $
+ * $Id: syscons.c,v 1.33 1997/04/04 15:23:55 kato Exp $
*/
#include "sc.h"
@@ -434,14 +434,10 @@ scprobe(struct isa_device *dev)
c |= KBD_OVERRIDE_KBD_LOCK;
#endif
- /*
- * enable the keyboard port, but disable the keyboard intr.
- * the aux port (mouse port) is disabled too.
- */
+ /* enable the keyboard port, but disable the keyboard intr. */
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_KBD_CONTROL_BITS,
+ KBD_ENABLE_KBD_PORT | KBD_DISABLE_KBD_INT)) {
/* CONTROLLER ERROR
* there is very little we can do...
*/
@@ -513,8 +509,8 @@ scprobe(struct isa_device *dev)
}
/* enable the keyboard port and intr. */
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_KBD_CONTROL_BITS | KBD_TRANSLATION | KBD_OVERRIDE_KBD_LOCK,
+ (c & (KBD_TRANSLATION | 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.
OpenPOWER on IntegriCloud