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

Back out CVS fallout from last commit. Really make this build again.

This commit is contained in:
fredb 2004-01-09 17:00:02 +00:00
parent ac1cc37221
commit d5fb378200
1 changed files with 2 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sys/arch/mac68k/obio/wdc_obio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wdc_obio.c,v 1.13 2004/01/06 18:46:07 he Exp $ */
/* $NetBSD: wdc_obio.c,v 1.14 2004/01/09 17:00:02 fredb Exp $ */
/*
* Copyright (c) 2002 Takeshi Shibagaki All rights reserved.
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.13 2004/01/06 18:46:07 he Exp $");
__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.14 2004/01/09 17:00:02 fredb Exp $");
#include <sys/types.h>
#include <sys/param.h>
@ -101,22 +101,11 @@ wdc_obio_match(parent, match, aux)
ch.cmd_iot = ch.ctl_iot = oa->oa_tag;
if (bus_space_map(ch.cmd_iot, IDEBase, WDC_OBIO_REG_NPORTS,
<<<<<<< wdc_obio.c
0, &ch.cmd_baseioh))
=======
0, &ch.cmd_baseioh))
>>>>>>> 1.12
return 0;
<<<<<<< wdc_obio.c
mac68k_bsh_wdc_set_stride(ch.cmd_iot, &ch.cmd_baseioh, 4);
=======
mac68k_bus_space_handle_swapped(ch.cmd_iot, &ch.cmd_baseioh);
>>>>>>> 1.12
<<<<<<< wdc_obio.c
if (bus_space_subregion(ch.cmd_iot, ch.cmd_baseioh,
=======
for (i = 0; i < WDC_NREG; i++) {
if (bus_space_subregion(ch.cmd_iot, ch.cmd_baseioh,
4 * i, 4, &ch.cmd_iohs[i]) != 0) {
@ -126,7 +115,6 @@ wdc_obio_match(parent, match, aux)
if (bus_space_subregion(ch.cmd_iot, ch.cmd_baseioh,
>>>>>>> 1.12
WDC_OBIO_AUXREG_OFFSET,
WDC_OBIO_AUXREG_NPORTS,
&ch.ctl_ioh))
@ -134,12 +122,7 @@ wdc_obio_match(parent, match, aux)
result = wdcprobe(&ch);
<<<<<<< wdc_obio.c
bus_space_unmap(ch.cmd_iot, ch.cmd_baseioh,
WDC_OBIO_REG_NPORTS);
=======
bus_space_unmap(ch.cmd_iot, ch.cmd_baseioh, WDC_OBIO_REG_NPORTS);
>>>>>>> 1.12
if (result)
wdc_matched = 1;
@ -182,21 +165,12 @@ wdc_obio_attach(parent, self, aux)
sc->wdc_channel.cmd_iot = sc->wdc_channel.ctl_iot = oa->oa_tag;
if (bus_space_map(sc->wdc_channel.cmd_iot, oa->oa_addr,
<<<<<<< wdc_obio.c
WDC_OBIO_REG_NPORTS, 0,
&sc->wdc_channel.cmd_baseioh)) {
=======
WDC_OBIO_REG_NPORTS, 0, &sc->wdc_channel.cmd_baseioh)) {
>>>>>>> 1.12
printf("%s: couldn't map registers\n",
sc->sc_wdcdev.sc_dev.dv_xname);
return;
}
<<<<<<< wdc_obio.c
mac68k_bsh_wdc_set_stride(sc->wdc_channel.cmd_iot,
&sc->wdc_channel.cmd_baseioh, 4);
=======
mac68k_bus_space_handle_swapped(sc->wdc_channel.cmd_iot,
&sc->wdc_channel.cmd_baseioh);
@ -209,21 +183,13 @@ wdc_obio_attach(parent, self, aux)
return;
}
}
>>>>>>> 1.12
if (bus_space_subregion(sc->wdc_channel.cmd_iot,
<<<<<<< wdc_obio.c
sc->wdc_channel.cmd_baseioh,
WDC_OBIO_AUXREG_OFFSET,
WDC_OBIO_AUXREG_NPORTS,
&sc->wdc_channel.ctl_ioh))
=======
sc->wdc_channel.cmd_baseioh,
WDC_OBIO_AUXREG_OFFSET, WDC_OBIO_AUXREG_NPORTS,
&sc->wdc_channel.ctl_ioh)) {
printf("%s: unable to subregion aux register\n",
sc->sc_wdcdev.sc_dev.dv_xname);
>>>>>>> 1.12
return;
}