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

Don't attempt to map the `delay port' (0x84). It's mapped and exported 

by the ISA bus attach code.
This commit is contained in:
thorpej 1996-05-05 01:41:53 +00:00
parent 0bc154b367
commit f857b38b11
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/arch/alpha/isa/pckbd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pckbd.c,v 1.6 1996/04/23 13:57:55 cgd Exp $ */ /* $NetBSD: pckbd.c,v 1.7 1996/05/05 01:41:53 thorpej Exp $ */
/*- /*-
* Copyright (c) 1993, 1994, 1995 Charles Hannum. All rights reserved. * Copyright (c) 1993, 1994, 1995 Charles Hannum. All rights reserved.
@ -293,10 +293,11 @@ pckbdprobe(parent, match, aux)
if (bus_io_map(pckbd_bc, KBDATAP, 1, &pckbd_data_ioh) || if (bus_io_map(pckbd_bc, KBDATAP, 1, &pckbd_data_ioh) ||
bus_io_map(pckbd_bc, KBSTATP, 1, &pckbd_status_ioh) || bus_io_map(pckbd_bc, KBSTATP, 1, &pckbd_status_ioh) ||
bus_io_map(pckbd_bc, IO_TIMER1, 4, &pckbd_timer_ioh) || bus_io_map(pckbd_bc, IO_TIMER1, 4, &pckbd_timer_ioh) ||
bus_io_map(pckbd_bc, PITAUX_PORT, 1, &pckbd_pitaux_ioh) || bus_io_map(pckbd_bc, PITAUX_PORT, 1, &pckbd_pitaux_ioh))
bus_io_map(pckbd_bc, 0x84, 1, &pckbd_delay_ioh))
return 0; return 0;
pckbd_delay_ioh = ia->ia_delayioh;
/* Enable interrupts and keyboard, etc. */ /* Enable interrupts and keyboard, etc. */
if (!kbc_put8042cmd(CMDBYTE)) { if (!kbc_put8042cmd(CMDBYTE)) {
printf("pcprobe: command error\n"); printf("pcprobe: command error\n");
@ -387,10 +388,11 @@ pckbdattach(parent, self, aux)
if (bus_io_map(pckbd_bc, KBDATAP, 1, &pckbd_data_ioh) || if (bus_io_map(pckbd_bc, KBDATAP, 1, &pckbd_data_ioh) ||
bus_io_map(pckbd_bc, KBSTATP, 1, &pckbd_status_ioh) || bus_io_map(pckbd_bc, KBSTATP, 1, &pckbd_status_ioh) ||
bus_io_map(pckbd_bc, IO_TIMER1, 4, &pckbd_timer_ioh) || bus_io_map(pckbd_bc, IO_TIMER1, 4, &pckbd_timer_ioh) ||
bus_io_map(pckbd_bc, PITAUX_PORT, 1, &pckbd_pitaux_ioh) || bus_io_map(pckbd_bc, PITAUX_PORT, 1, &pckbd_pitaux_ioh))
bus_io_map(pckbd_bc, 0x84, 1, &pckbd_delay_ioh))
panic("pckbdattach couldn't map"); panic("pckbdattach couldn't map");
pckbd_delay_ioh = ia->ia_delayioh;
sc->sc_ih = isa_intr_establish(pckbd_ic, ia->ia_irq, IST_EDGE, sc->sc_ih = isa_intr_establish(pckbd_ic, ia->ia_irq, IST_EDGE,
IPL_TTY, pckbdintr, sc); IPL_TTY, pckbdintr, sc);