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

Undo last change: The "iomd" driver has its own bus_space tag, so it didn't

Browse Source 
rely on the brokenness of the mainbus one.
This commit is contained in:
bjh21 2003-12-06 22:31:16 +00:00
parent ed4b80b144
commit df8ccd8d1b
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/arch/arm/iomd/iomd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: iomd.c,v 1.11 2003/12/06 22:05:33 bjh21 Exp $ */
/* $NetBSD: iomd.c,v 1.12 2003/12/06 22:31:16 bjh21 Exp $ */
/*
* Copyright (c) 1996-1997 Mark Brinicombe.
@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: iomd.c,v 1.11 2003/12/06 22:05:33 bjh21 Exp $");
__KERNEL_RCSID(0, "$NetBSD: iomd.c,v 1.12 2003/12/06 22:31:16 bjh21 Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -264,8 +264,7 @@ iomdattach(parent, self, aux)
config_found(self, &ia, iomdprint);
/* Attach kbd device when configured */
if (bus_space_subregion(iot, ioh, IOMD_KBDDAT >> 2, 8,
&ia.ia_kbd.ka_ioh))
if (bus_space_subregion(iot, ioh, IOMD_KBDDAT, 8, &ia.ia_kbd.ka_ioh))
panic("%s: Cannot map kbd registers", self->dv_xname);
ia.ia_kbd.ka_name = "kbd";
ia.ia_kbd.ka_iot = iot;
@ -281,8 +280,7 @@ iomdattach(parent, self, aux)
/* Attach iic device */
if (bus_space_subregion(iot, ioh, IOMD_IOCR >> 2, 4,
&ia.ia_iic.ia_ioh))
if (bus_space_subregion(iot, ioh, IOMD_IOCR, 4, &ia.ia_iic.ia_ioh))
panic("%s: Cannot map iic registers", self->dv_xname);
ia.ia_iic.ia_name = "iic";
ia.ia_iic.ia_iot = iot;
@ -294,7 +292,7 @@ iomdattach(parent, self, aux)
case ARM7500FE_IOC_ID:
/* Attach opms device */
if (bus_space_subregion(iot, ioh, IOMD_MSDATA >> 2, 8,
if (bus_space_subregion(iot, ioh, IOMD_MSDATA, 8,
&ia.ia_opms.pa_ioh))
panic("%s: Cannot map opms registers", self->dv_xname);
ia.ia_opms.pa_name = "opms";
@ -305,7 +303,7 @@ iomdattach(parent, self, aux)
case RPC600_IOMD_ID:
/* Attach (ws)qms device */
if (bus_space_subregion(iot, ioh, IOMD_MOUSEX >> 2, 8,
if (bus_space_subregion(iot, ioh, IOMD_MOUSEX, 8,
&ia.ia_qms.qa_ioh))
panic("%s: Cannot map qms registers", self->dv_xname);