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

Adapt for i386/x86 change.

This commit is contained in:
fvdl 2003-02-26 22:21:19 +00:00
parent 4edae6c16a
commit ab4edb55ec
24 changed files with 118 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/i386/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.20 2003/01/06 17:40:35 lukem Exp $
# $NetBSD: Makefile,v 1.21 2003/02/26 22:22:59 fvdl Exp $
# Makefile for i386 tags file and boot blocks
@ -26,6 +26,6 @@ links:
(cd $$i && rm -f tags; ln -s ../tags tags); done
SUBDIR= compile include stand
SUBDIR= compile include stand ../x86/include
.include <bsd.subdir.mk>

6
sys/arch/i386/bios/vesa_raster8.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vesa_raster8.c,v 1.5 2002/10/02 05:47:11 thorpej Exp $ */
/* $NetBSD: vesa_raster8.c,v 1.6 2003/02/26 22:21:19 fvdl Exp $ */
#include <sys/param.h>
#include <sys/systm.h>
@ -82,14 +82,14 @@ vesaraster8_attach(parent, dev, aux)
ri->ri_height = mi->YResolution;
ri->ri_stride = mi->BytesPerScanLine;
res = _i386_memio_map(I386_BUS_SPACE_MEM, mi->PhysBasePtr,
res = _x86_memio_map(X86_BUS_SPACE_MEM, mi->PhysBasePtr,
ri->ri_height * ri->ri_stride,
BUS_SPACE_MAP_LINEAR, &h);
if (res) {
printf("framebuffer mapping failed\n");
goto out;
}
ri->ri_bits = bus_space_vaddr(I386_BUS_SPACE_MEM, h);
ri->ri_bits = bus_space_vaddr(X86_BUS_SPACE_MEM, h);
printf(": fb %dx%d @%x\n", ri->ri_width, ri->ri_height,
mi->PhysBasePtr);

8
sys/arch/i386/eisa/eisa_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: eisa_machdep.c,v 1.17 2002/11/22 15:23:37 fvdl Exp $ */
/* $NetBSD: eisa_machdep.c,v 1.18 2003/02/26 22:21:36 fvdl Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: eisa_machdep.c,v 1.17 2002/11/22 15:23:37 fvdl Exp $");
__KERNEL_RCSID(0, "$NetBSD: eisa_machdep.c,v 1.18 2003/02/26 22:21:36 fvdl Exp $");
#include "ioapic.h"
@ -84,7 +84,7 @@ __KERNEL_RCSID(0, "$NetBSD: eisa_machdep.c,v 1.17 2002/11/22 15:23:37 fvdl Exp $
#include <sys/device.h>
#include <sys/extent.h>
#define _I386_BUS_DMA_PRIVATE
#define _X86_BUS_DMA_PRIVATE
#include <machine/bus.h>
#include <dev/isa/isareg.h>
@ -100,7 +100,7 @@ __KERNEL_RCSID(0, "$NetBSD: eisa_machdep.c,v 1.17 2002/11/22 15:23:37 fvdl Exp $
* EISA doesn't have any special needs; just use the generic versions
* of these funcions.
*/
struct i386_bus_dma_tag eisa_bus_dma_tag = {
struct x86_bus_dma_tag eisa_bus_dma_tag = {
0, /* _bounce_thresh */
_bus_dmamap_create,
_bus_dmamap_destroy,

6
sys/arch/i386/isa/clock.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: clock.c,v 1.78 2003/02/05 12:18:04 nakayama Exp $ */
/* $NetBSD: clock.c,v 1.79 2003/02/26 22:23:01 fvdl Exp $ */
/*-
* Copyright (c) 1993, 1994 Charles M. Hannum.
@ -90,7 +90,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.78 2003/02/05 12:18:04 nakayama Exp $");
__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.79 2003/02/26 22:23:01 fvdl Exp $");
/* #define CLOCKDEBUG */
/* #define CLOCK_PARANOIA */
@ -405,7 +405,7 @@ clockintr(void *arg, struct intrframe frame)
cc_microset_time = time;
microset_iter = hz - 1;
#if defined(MULTIPROCESSOR)
i386_broadcast_ipi(I386_IPI_MICROSET);
x86_broadcast_ipi(X86_IPI_MICROSET);
#endif
cc_microset(ci);
}

32
sys/arch/i386/isa/isa_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: isa_machdep.c,v 1.58 2002/11/22 15:23:49 fvdl Exp $ */
/* $NetBSD: isa_machdep.c,v 1.59 2003/02/26 22:23:02 fvdl Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.58 2002/11/22 15:23:49 fvdl Exp $");
__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.59 2003/02/26 22:23:02 fvdl Exp $");
#define ISA_DMA_STATS
@ -89,7 +89,7 @@ __KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.58 2002/11/22 15:23:49 fvdl Exp $"
#include <sys/proc.h>
#include <sys/mbuf.h>
#define _I386_BUS_DMA_PRIVATE
#define _X86_BUS_DMA_PRIVATE
#include <machine/bus.h>
#include <machine/pio.h>
@ -129,7 +129,7 @@ extern vector *IDTVEC(intr)[];
* Cookie used by ISA dma. A pointer to one of these it stashed in
* the DMA map.
*/
struct i386_isa_dma_cookie {
struct x86_isa_dma_cookie {
int id_flags; /* flags; see below */
/*
@ -188,7 +188,7 @@ void _isa_dma_free_bouncebuf __P((bus_dma_tag_t, bus_dmamap_t));
* the generic functions that understand how to deal with bounce
* buffers, if necessary.
*/
struct i386_bus_dma_tag isa_bus_dma_tag = {
struct x86_bus_dma_tag isa_bus_dma_tag = {
ISA_DMA_BOUNCE_THRESHOLD,
_isa_bus_dmamap_create,
_isa_bus_dmamap_destroy,
@ -355,7 +355,7 @@ isa_attach_hook(parent, self, iba)
struct device *parent, *self;
struct isabus_attach_args *iba;
{
extern struct i386_isa_chipset i386_isa_chipset;
extern struct x86_isa_chipset i386_isa_chipset;
extern int isa_has_been_seen;
/*
@ -434,7 +434,7 @@ _isa_bus_dmamap_create(t, size, nsegments, maxsegsz, boundary, flags, dmamp)
int flags;
bus_dmamap_t *dmamp;
{
struct i386_isa_dma_cookie *cookie;
struct x86_isa_dma_cookie *cookie;
bus_dmamap_t map;
int error, cookieflags;
void *cookiestore;
@ -449,7 +449,7 @@ _isa_bus_dmamap_create(t, size, nsegments, maxsegsz, boundary, flags, dmamp)
map = *dmamp;
map->_dm_cookie = NULL;
cookiesize = sizeof(struct i386_isa_dma_cookie);
cookiesize = sizeof(struct x86_isa_dma_cookie);
/*
* ISA only has 24-bits of address space. This means
@ -494,7 +494,7 @@ _isa_bus_dmamap_create(t, size, nsegments, maxsegsz, boundary, flags, dmamp)
goto out;
}
memset(cookiestore, 0, cookiesize);
cookie = (struct i386_isa_dma_cookie *)cookiestore;
cookie = (struct x86_isa_dma_cookie *)cookiestore;
cookie->id_flags = cookieflags;
map->_dm_cookie = cookie;
@ -526,7 +526,7 @@ _isa_bus_dmamap_destroy(t, map)
bus_dma_tag_t t;
bus_dmamap_t map;
{
struct i386_isa_dma_cookie *cookie = map->_dm_cookie;
struct x86_isa_dma_cookie *cookie = map->_dm_cookie;
/*
* Free any bounce pages this map might hold.
@ -550,7 +550,7 @@ _isa_bus_dmamap_load(t, map, buf, buflen, p, flags)
struct proc *p;
int flags;
{
struct i386_isa_dma_cookie *cookie = map->_dm_cookie;
struct x86_isa_dma_cookie *cookie = map->_dm_cookie;
int error;
STAT_INCR(isa_dma_stats_loads);
@ -619,7 +619,7 @@ _isa_bus_dmamap_load_mbuf(t, map, m0, flags)
struct mbuf *m0;
int flags;
{
struct i386_isa_dma_cookie *cookie = map->_dm_cookie;
struct x86_isa_dma_cookie *cookie = map->_dm_cookie;
int error;
/*
@ -724,7 +724,7 @@ _isa_bus_dmamap_unload(t, map)
bus_dma_tag_t t;
bus_dmamap_t map;
{
struct i386_isa_dma_cookie *cookie = map->_dm_cookie;
struct x86_isa_dma_cookie *cookie = map->_dm_cookie;
/*
* If we have bounce pages, free them, unless they're
@ -754,7 +754,7 @@ _isa_bus_dmamap_sync(t, map, offset, len, ops)
bus_size_t len;
int ops;
{
struct i386_isa_dma_cookie *cookie = map->_dm_cookie;
struct x86_isa_dma_cookie *cookie = map->_dm_cookie;
/*
* Mixing PRE and POST operations is not allowed.
@ -910,7 +910,7 @@ _isa_dma_alloc_bouncebuf(t, map, size, flags)
bus_size_t size;
int flags;
{
struct i386_isa_dma_cookie *cookie = map->_dm_cookie;
struct x86_isa_dma_cookie *cookie = map->_dm_cookie;
int error = 0;
cookie->id_bouncebuflen = round_page(size);
@ -942,7 +942,7 @@ _isa_dma_free_bouncebuf(t, map)
bus_dma_tag_t t;
bus_dmamap_t map;
{
struct i386_isa_dma_cookie *cookie = map->_dm_cookie;
struct x86_isa_dma_cookie *cookie = map->_dm_cookie;
STAT_DECR(isa_dma_stats_nbouncebufs);

8
sys/arch/i386/isa/isapnp_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: isapnp_machdep.c,v 1.7 2001/11/15 07:03:32 lukem Exp $ */
/* $NetBSD: isapnp_machdep.c,v 1.8 2003/02/26 22:23:03 fvdl Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.7 2001/11/15 07:03:32 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.8 2003/02/26 22:23:03 fvdl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -75,7 +75,7 @@ isapnp_map(sc)
{
#ifdef DIAGNOSTIC
if (sc->sc_iot != I386_BUS_SPACE_IO)
if (sc->sc_iot != X86_BUS_SPACE_IO)
panic("isapnp_map: bogus bus space tag");
#endif
@ -110,7 +110,7 @@ isapnp_map_readport(sc)
#endif
#ifdef DIAGNOSTIC
if (sc->sc_iot != I386_BUS_SPACE_IO)
if (sc->sc_iot != X86_BUS_SPACE_IO)
panic("isapnp_map_readport: bogus bus space tag");
#endif

8
sys/arch/i386/isa/npx.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: npx.c,v 1.90 2003/01/17 23:10:33 thorpej Exp $ */
/* $NetBSD: npx.c,v 1.91 2003/02/26 22:23:03 fvdl Exp $ */
/*-
* Copyright (c) 1994, 1995, 1998 Charles M. Hannum. All rights reserved.
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: npx.c,v 1.90 2003/01/17 23:10:33 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: npx.c,v 1.91 2003/02/26 22:23:03 fvdl Exp $");
#if 0
#define IPRINTF(x) printf x
@ -686,8 +686,8 @@ npxsave_lwp(struct lwp *l, int save)
oci->ci_dev->dv_xname,
save? "save" : "flush", p));
i386_send_ipi(oci,
save ? I386_IPI_SYNCH_FPU : I386_IPI_FLUSH_FPU);
x86_send_ipi(oci,
save ? X86_IPI_SYNCH_FPU : X86_IPI_FLUSH_FPU);
#ifdef DIAGNOSTIC
spincount = 0;

6
sys/arch/i386/isa/pccons.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pccons.c,v 1.161 2003/02/19 04:07:56 gson Exp $ */
/* $NetBSD: pccons.c,v 1.162 2003/02/26 22:23:04 fvdl Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pccons.c,v 1.161 2003/02/19 04:07:56 gson Exp $");
__KERNEL_RCSID(0, "$NetBSD: pccons.c,v 1.162 2003/02/26 22:23:04 fvdl Exp $");
#include "opt_ddb.h"
#include "opt_xserver.h"
@ -2729,7 +2729,7 @@ pcmmap(dev, offset, nprot)
if (offset > 0x20000)
return (-1);
return (i386_btop(0xa0000 + offset));
return (x86_btop(0xa0000 + offset));
}
#ifdef XSERVER

22
sys/arch/i386/mca/mca_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mca_machdep.c,v 1.18 2002/11/22 15:23:51 fvdl Exp $ */
/* $NetBSD: mca_machdep.c,v 1.19 2003/02/26 22:23:05 fvdl Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mca_machdep.c,v 1.18 2002/11/22 15:23:51 fvdl Exp $");
__KERNEL_RCSID(0, "$NetBSD: mca_machdep.c,v 1.19 2003/02/26 22:23:05 fvdl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: mca_machdep.c,v 1.18 2002/11/22 15:23:51 fvdl Exp $"
#include <machine/bioscall.h>
#include <machine/psl.h>
#define _I386_BUS_DMA_PRIVATE
#define _X86_BUS_DMA_PRIVATE
#include <machine/bus.h>
#include <dev/isa/isavar.h>
@ -91,7 +91,7 @@ struct bios_config {
* Used to encode DMA channel into ISA DMA cookie. We use upper 4 bits of
* ISA DMA cookie id_flags, it's unused.
*/
struct i386_isa_dma_cookie {
struct x86_isa_dma_cookie {
int id_flags;
/* We don't care about rest */
};
@ -124,7 +124,7 @@ static int _mca_bus_dmamap_load_raw __P((bus_dma_tag_t, bus_dmamap_t,
*/
#define MCA_DMA_BOUNCE_THRESHOLD (16 * 1024 * 1024)
struct i386_bus_dma_tag mca_bus_dma_tag = {
struct x86_bus_dma_tag mca_bus_dma_tag = {
MCA_DMA_BOUNCE_THRESHOLD, /* _bounce_thresh */
_isa_bus_dmamap_create,
_isa_bus_dmamap_destroy,
@ -274,7 +274,7 @@ mca_nmi()
int slot, mcanmi=0;
/* if there is no MCA bus, call i386_nmi() */
/* if there is no MCA bus, call x86_nmi() */
if (!MCA_system)
goto out;
@ -300,7 +300,7 @@ mca_nmi()
out:
if (!mcanmi) {
/* no CHCK bits asserted, assume ISA NMI */
return (i386_nmi());
return (x86_nmi());
} else
return(0);
}
@ -444,7 +444,7 @@ _mca_bus_dmamap_sync(t, map, offset, len, ops)
bus_size_t len;
int ops;
{
struct i386_isa_dma_cookie *cookie;
struct x86_isa_dma_cookie *cookie;
bus_addr_t phys;
bus_size_t cnt;
int dmach, mode;
@ -464,7 +464,7 @@ _mca_bus_dmamap_sync(t, map, offset, len, ops)
if (ops != BUS_DMASYNC_PREREAD && ops != BUS_DMASYNC_PREWRITE)
return;
cookie = (struct i386_isa_dma_cookie *)map->_dm_cookie;
cookie = (struct x86_isa_dma_cookie *)map->_dm_cookie;
dmach = (cookie->id_flags & 0xf0) >> 4;
phys = map->dm_segs[0].ds_addr;
@ -532,7 +532,7 @@ mca_dmamap_create(t, size, flags, dmamp, dmach)
int dmach;
{
int error;
struct i386_isa_dma_cookie *cookie;
struct x86_isa_dma_cookie *cookie;
#ifdef DEBUG
/* Sanity check */
@ -556,7 +556,7 @@ mca_dmamap_create(t, size, flags, dmamp, dmach)
return (error);
/* Encode DMA channel */
cookie = (struct i386_isa_dma_cookie *) (*dmamp)->_dm_cookie;
cookie = (struct x86_isa_dma_cookie *) (*dmamp)->_dm_cookie;
cookie->id_flags &= 0x0f;
cookie->id_flags |= dmach << 4;

6
sys/arch/i386/pci/ali1543.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ali1543.c,v 1.4 2003/01/20 01:25:04 simonb Exp $ */
/* $NetBSD: ali1543.c,v 1.5 2003/02/26 22:23:06 fvdl Exp $ */
/*
* Copyright (c) 2001
@ -94,7 +94,7 @@
/* HAYAKAWA Koichi wrote ALi 1543 PCI ICU code basing on VIA82C586 driver */
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ali1543.c,v 1.4 2003/01/20 01:25:04 simonb Exp $");
__KERNEL_RCSID(0, "$NetBSD: ali1543.c,v 1.5 2003/02/26 22:23:06 fvdl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -204,7 +204,7 @@ ali1543_get_intr(pciintr_icu_handle_t v, int clink, int *irqp)
#endif /* DEBUG_1543 */
val = ALI1543_PIRQ(reg, clink);
*irqp = (val == 0) ?
I386_PCI_INTERRUPT_LINE_NO_CONNECTION : val;
X86_PCI_INTERRUPT_LINE_NO_CONNECTION : val;
return (0);
}

6
sys/arch/i386/pci/amd756.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: amd756.c,v 1.2 2001/11/15 07:03:33 lukem Exp $ */
/* $NetBSD: amd756.c,v 1.3 2003/02/26 22:23:06 fvdl Exp $ */
/*-
* Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: amd756.c,v 1.2 2001/11/15 07:03:33 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: amd756.c,v 1.3 2003/02/26 22:23:06 fvdl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -165,7 +165,7 @@ amd756_get_intr(v, clink, irqp)
reg = AMD756_GET_PIIRQSEL(ph);
val = (reg >> (4 * clink)) & 0x0f;
*irqp = (val == 0) ?
I386_PCI_INTERRUPT_LINE_NO_CONNECTION : val;
X86_PCI_INTERRUPT_LINE_NO_CONNECTION : val;
return (0);
}

6
sys/arch/i386/pci/opti82c558.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: opti82c558.c,v 1.3 2001/11/15 07:03:33 lukem Exp $ */
/* $NetBSD: opti82c558.c,v 1.4 2003/02/26 22:23:06 fvdl Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: opti82c558.c,v 1.3 2001/11/15 07:03:33 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: opti82c558.c,v 1.4 2003/02/26 22:23:06 fvdl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -177,7 +177,7 @@ opti82c558_get_intr(v, clink, irqp)
reg = pci_conf_read(ph->ph_pc, ph->ph_tag, VIPER_CFG_PIRQ);
val = VIPER_PIRQ(reg, clink);
*irqp = (val == VIPER_PIRQ_NONE) ?
I386_PCI_INTERRUPT_LINE_NO_CONNECTION : viper_pirq_decode[val];
X86_PCI_INTERRUPT_LINE_NO_CONNECTION : viper_pirq_decode[val];
return (0);
}

6
sys/arch/i386/pci/opti82c700.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: opti82c700.c,v 1.3 2001/11/15 07:03:33 lukem Exp $ */
/* $NetBSD: opti82c700.c,v 1.4 2003/02/26 22:23:07 fvdl Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: opti82c700.c,v 1.3 2001/11/15 07:03:33 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: opti82c700.c,v 1.4 2003/02/26 22:23:07 fvdl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -221,7 +221,7 @@ opti82c700_get_intr(v, clink, irqp)
val = (reg >> ofs) & FIRESTAR_CFG_PIRQ_MASK;
*irqp = (val == FIRESTAR_PIRQ_NONE) ?
I386_PCI_INTERRUPT_LINE_NO_CONNECTION : val;
X86_PCI_INTERRUPT_LINE_NO_CONNECTION : val;
return (0);
}

12
sys/arch/i386/pci/pceb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pceb.c,v 1.11 2003/02/08 12:00:36 jdolecek Exp $ */
/* $NetBSD: pceb.c,v 1.12 2003/02/26 22:23:07 fvdl Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pceb.c,v 1.11 2003/02/08 12:00:36 jdolecek Exp $");
__KERNEL_RCSID(0, "$NetBSD: pceb.c,v 1.12 2003/02/26 22:23:07 fvdl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@ -136,8 +136,8 @@ pceb_callback(self)
*/
memset(&ea, 0, sizeof(ea));
ea.ea_eba.eba_busname = "eisa";
ea.ea_eba.eba_iot = I386_BUS_SPACE_IO;
ea.ea_eba.eba_memt = I386_BUS_SPACE_MEM;
ea.ea_eba.eba_iot = X86_BUS_SPACE_IO;
ea.ea_eba.eba_memt = X86_BUS_SPACE_MEM;
#if NEISA > 0
ea.ea_eba.eba_dmat = &eisa_bus_dma_tag;
#endif
@ -148,8 +148,8 @@ pceb_callback(self)
*/
memset(&ea, 0, sizeof(ea));
ea.ea_iba.iba_busname = "isa";
ea.ea_iba.iba_iot = I386_BUS_SPACE_IO;
ea.ea_iba.iba_memt = I386_BUS_SPACE_MEM;
ea.ea_iba.iba_iot = X86_BUS_SPACE_IO;
ea.ea_iba.iba_memt = X86_BUS_SPACE_MEM;
#if NISA > 0
ea.ea_iba.iba_dmat = &isa_bus_dma_tag;
#endif

6
sys/arch/i386/pci/pci_addr_fixup.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pci_addr_fixup.c,v 1.11 2001/11/15 07:03:34 lukem Exp $ */
/* $NetBSD: pci_addr_fixup.c,v 1.12 2003/02/26 22:23:07 fvdl Exp $ */
/*-
* Copyright (c) 2000 UCHIYAMA Yasushi. All rights reserved.
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pci_addr_fixup.c,v 1.11 2001/11/15 07:03:34 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: pci_addr_fixup.c,v 1.12 2003/02/26 22:23:07 fvdl Exp $");
#include "opt_pcibios.h"
@ -134,7 +134,7 @@ pci_addr_fixup(pc, maxbus)
/*
* 3. determine allocation space
*/
start = i386_round_page(avail_end + 1);
start = x86_round_page(avail_end + 1);
if (start < PCIADDR_ISAMEM_RESERVE)
start = PCIADDR_ISAMEM_RESERVE;
pciaddr.mem_alloc_start = (start + 0x100000 + 1) & ~(0x100000 - 1);

28
sys/arch/i386/pci/pci_intr_fixup.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pci_intr_fixup.c,v 1.22 2002/11/22 15:23:52 fvdl Exp $ */
/* $NetBSD: pci_intr_fixup.c,v 1.23 2003/02/26 22:23:08 fvdl Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pci_intr_fixup.c,v 1.22 2002/11/22 15:23:52 fvdl Exp $");
__KERNEL_RCSID(0, "$NetBSD: pci_intr_fixup.c,v 1.23 2003/02/26 22:23:08 fvdl Exp $");
#include "opt_pcibios.h"
@ -258,10 +258,10 @@ pciintr_link_alloc(pir, pin)
l->bitmap = pir->linkmap[pin].bitmap;
if (pciintr_icu_tag != NULL) { /* compatible PCI ICU found */
l->clink = clink;
l->irq = irq; /* maybe I386_PCI_INTERRUPT_LINE_NO_CONNECTION */
l->irq = irq; /* maybe X86_PCI_INTERRUPT_LINE_NO_CONNECTION */
} else {
l->clink = link; /* only for PCIBIOSVERBOSE diagnostic */
l->irq = I386_PCI_INTERRUPT_LINE_NO_CONNECTION;
l->irq = X86_PCI_INTERRUPT_LINE_NO_CONNECTION;
}
lstart = SIMPLEQ_FIRST(&pciintr_link_map_list);
@ -297,7 +297,7 @@ static int
pciintr_bitmap_count_irq(irq_bitmap, irqp)
int irq_bitmap, *irqp;
{
int i, bit, count = 0, irq = I386_PCI_INTERRUPT_LINE_NO_CONNECTION;
int i, bit, count = 0, irq = X86_PCI_INTERRUPT_LINE_NO_CONNECTION;
if (irq_bitmap != 0) {
for (i = 0, bit = 1; i < 16; i++, bit <<= 1) {
@ -397,7 +397,7 @@ pciintr_guess_irq()
* Stage 1: If only one IRQ is available for the link, use it.
*/
SIMPLEQ_FOREACH(l, &pciintr_link_map_list, list) {
if (l->irq != I386_PCI_INTERRUPT_LINE_NO_CONNECTION)
if (l->irq != X86_PCI_INTERRUPT_LINE_NO_CONNECTION)
continue;
if (pciintr_bitmap_count_irq(l->bitmap, &irq) == 1) {
l->irq = irq;
@ -427,7 +427,7 @@ pciintr_link_fixup()
* yet connected.
*/
SIMPLEQ_FOREACH(l, &pciintr_link_map_list, list) {
if (l->irq != I386_PCI_INTERRUPT_LINE_NO_CONNECTION) {
if (l->irq != X86_PCI_INTERRUPT_LINE_NO_CONNECTION) {
/*
* Interrupt is already connected. Don't do
* anything to it.
@ -469,7 +469,7 @@ pciintr_link_fixup()
* connect in Stage 1.
*/
SIMPLEQ_FOREACH(l, &pciintr_link_map_list, list) {
if (l->irq != I386_PCI_INTERRUPT_LINE_NO_CONNECTION)
if (l->irq != X86_PCI_INTERRUPT_LINE_NO_CONNECTION)
continue;
if (pciintr_bitmap_find_lowest_irq(l->bitmap & pciirq,
&l->irq)) {
@ -493,7 +493,7 @@ pciintr_link_fixup()
* user supplied a mask for the PCI irqs
*/
SIMPLEQ_FOREACH(l, &pciintr_link_map_list, list) {
if (l->irq != I386_PCI_INTERRUPT_LINE_NO_CONNECTION)
if (l->irq != X86_PCI_INTERRUPT_LINE_NO_CONNECTION)
continue;
if (pciintr_bitmap_find_lowest_irq(
l->bitmap & pcibios_irqs_hint, &l->irq)) {
@ -521,7 +521,7 @@ pciintr_link_route(pciirq)
SIMPLEQ_FOREACH(l, &pciintr_link_map_list, list) {
if (l->fixup_stage == 0) {
if (l->irq == I386_PCI_INTERRUPT_LINE_NO_CONNECTION) {
if (l->irq == X86_PCI_INTERRUPT_LINE_NO_CONNECTION) {
/* Appropriate interrupt was not found. */
#ifdef DIAGNOSTIC
printf("pciintr_link_route: "
@ -650,7 +650,7 @@ pciintr_do_header_fixup(pc, tag, context)
printf("%03d:%02d:%d 0x%04x 0x%04x %c 0x%02x",
bus, device, function, PCI_VENDOR(id), PCI_PRODUCT(id),
'@' + pin, l->clink);
if (l->irq == I386_PCI_INTERRUPT_LINE_NO_CONNECTION)
if (l->irq == X86_PCI_INTERRUPT_LINE_NO_CONNECTION)
printf(" -");
else
printf(" %3d", l->irq);
@ -667,10 +667,10 @@ pciintr_do_header_fixup(pc, tag, context)
return;
}
if (l->irq == I386_PCI_INTERRUPT_LINE_NO_CONNECTION) {
if (l->irq == X86_PCI_INTERRUPT_LINE_NO_CONNECTION) {
/* Appropriate interrupt was not found. */
if (pciintr_icu_tag == NULL &&
irq != 0 && irq != I386_PCI_INTERRUPT_LINE_NO_CONNECTION) {
irq != 0 && irq != X86_PCI_INTERRUPT_LINE_NO_CONNECTION) {
/*
* Do not print warning,
* if no compatible PCI ICU found,
@ -689,7 +689,7 @@ pciintr_do_header_fixup(pc, tag, context)
return;
}
if (irq == 0 || irq == I386_PCI_INTERRUPT_LINE_NO_CONNECTION) {
if (irq == 0 || irq == X86_PCI_INTERRUPT_LINE_NO_CONNECTION) {
PCIBIOS_PRINTV((" fixed up\n"));
} else {
/* routed by BIOS, but inconsistent */

10
sys/arch/i386/pci/pci_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pci_machdep.c,v 1.50 2002/11/22 15:23:52 fvdl Exp $ */
/* $NetBSD: pci_machdep.c,v 1.51 2003/02/26 22:23:08 fvdl Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.50 2002/11/22 15:23:52 fvdl Exp $");
__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.51 2003/02/26 22:23:08 fvdl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@ -92,7 +92,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.50 2002/11/22 15:23:52 fvdl Exp $"
#include <uvm/uvm_extern.h>
#define _I386_BUS_DMA_PRIVATE
#define _X86_BUS_DMA_PRIVATE
#include <machine/bus.h>
#include <machine/pio.h>
@ -161,7 +161,7 @@ struct {
* PCI doesn't have any special needs; just use the generic versions
* of these functions.
*/
struct i386_bus_dma_tag pci_bus_dma_tag = {
struct x86_bus_dma_tag pci_bus_dma_tag = {
0, /* _bounce_thresh */
_bus_dmamap_create,
_bus_dmamap_destroy,
@ -524,7 +524,7 @@ pci_intr_map(pa, ihp)
* that the BIOS did its job, we also recognize that as meaning that
* the BIOS has not configured the device.
*/
if (line == 0 || line == I386_PCI_INTERRUPT_LINE_NO_CONNECTION) {
if (line == 0 || line == X86_PCI_INTERRUPT_LINE_NO_CONNECTION) {
printf("pci_intr_map: no mapping for pin %c (line=%02x)\n",
'@' + pin, line);
goto bad;

8
sys/arch/i386/pci/pcib.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcib.c,v 1.31 2003/01/01 01:24:20 thorpej Exp $ */
/* $NetBSD: pcib.c,v 1.32 2003/02/26 22:23:09 fvdl Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.31 2003/01/01 01:24:20 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.32 2003/02/26 22:23:09 fvdl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@ -202,8 +202,8 @@ pcib_callback(self)
*/
memset(&iba, 0, sizeof(iba));
iba.iba_busname = "isa";
iba.iba_iot = I386_BUS_SPACE_IO;
iba.iba_memt = I386_BUS_SPACE_MEM;
iba.iba_iot = X86_BUS_SPACE_IO;
iba.iba_memt = X86_BUS_SPACE_MEM;
#if NISA > 0
iba.iba_dmat = &isa_bus_dma_tag;
#endif

6
sys/arch/i386/pci/pcibios.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcibios.c,v 1.10 2002/10/01 12:57:17 fvdl Exp $ */
/* $NetBSD: pcibios.c,v 1.11 2003/02/26 22:23:09 fvdl Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pcibios.c,v 1.10 2002/10/01 12:57:17 fvdl Exp $");
__KERNEL_RCSID(0, "$NetBSD: pcibios.c,v 1.11 2003/02/26 22:23:09 fvdl Exp $");
#include "opt_pcibios.h"
@ -194,7 +194,7 @@ pcibios_init()
/*
* Fixup interrupt routing.
*/
rv = pci_intr_fixup(NULL, I386_BUS_SPACE_IO, &pciirq);
rv = pci_intr_fixup(NULL, X86_BUS_SPACE_IO, &pciirq);
switch (rv) {
case -1:
/* Non-fatal error. */

8
sys/arch/i386/pci/pcmb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcmb.c,v 1.7 2003/01/01 01:24:20 thorpej Exp $ */
/* $NetBSD: pcmb.c,v 1.8 2003/02/26 22:23:09 fvdl Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pcmb.c,v 1.7 2003/01/01 01:24:20 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: pcmb.c,v 1.8 2003/02/26 22:23:09 fvdl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@ -122,8 +122,8 @@ pcmb_callback(self)
* Attach MCA bus behind this bridge.
*/
ma.ma_mba.mba_busname = "mca";
ma.ma_mba.mba_iot = I386_BUS_SPACE_IO;
ma.ma_mba.mba_memt = I386_BUS_SPACE_MEM;
ma.ma_mba.mba_iot = X86_BUS_SPACE_IO;
ma.ma_mba.mba_memt = X86_BUS_SPACE_MEM;
#if NMCA > 0
ma.ma_mba.mba_dmat = &mca_bus_dma_tag;
#endif

6
sys/arch/i386/pci/piix.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: piix.c,v 1.4 2002/12/30 21:55:05 explorer Exp $ */
/* $NetBSD: piix.c,v 1.5 2003/02/26 22:23:10 fvdl Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: piix.c,v 1.4 2002/12/30 21:55:05 explorer Exp $");
__KERNEL_RCSID(0, "$NetBSD: piix.c,v 1.5 2003/02/26 22:23:10 fvdl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -188,7 +188,7 @@ piix_get_intr(v, clink, irqp)
reg = pci_conf_read(ph->ph_pc, ph->ph_tag, PIIX_CFG_PIRQ);
shift = clink << 3;
if ((reg >> shift) & PIIX_CFG_PIRQ_NONE)
*irqp = I386_PCI_INTERRUPT_LINE_NO_CONNECTION;
*irqp = X86_PCI_INTERRUPT_LINE_NO_CONNECTION;
else
*irqp = PIIX_PIRQ(reg, clink);

6
sys/arch/i386/pci/sis85c503.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sis85c503.c,v 1.3 2001/11/15 07:03:35 lukem Exp $ */
/* $NetBSD: sis85c503.c,v 1.4 2003/02/26 22:23:10 fvdl Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sis85c503.c,v 1.3 2001/11/15 07:03:35 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: sis85c503.c,v 1.4 2003/02/26 22:23:10 fvdl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -151,7 +151,7 @@ sis85c503_get_intr(v, clink, irqp)
reg = SIS85C503_CFG_PIRQ_REG(reg, clink);
if (reg & SIS85C503_CFG_PIRQ_ROUTE_DISABLE)
*irqp = I386_PCI_INTERRUPT_LINE_NO_CONNECTION;
*irqp = X86_PCI_INTERRUPT_LINE_NO_CONNECTION;
else
*irqp = reg & SIS85C503_CFG_PIRQ_INTR_MASK;

6
sys/arch/i386/pci/via82c586.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: via82c586.c,v 1.4 2001/11/15 07:03:35 lukem Exp $ */
/* $NetBSD: via82c586.c,v 1.5 2003/02/26 22:23:10 fvdl Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: via82c586.c,v 1.4 2001/11/15 07:03:35 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: via82c586.c,v 1.5 2003/02/26 22:23:10 fvdl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -174,7 +174,7 @@ via82c586_get_intr(v, clink, irqp)
reg = pci_conf_read(ph->ph_pc, ph->ph_tag, VP3_CFG_PIRQ_REG);
val = VP3_PIRQ(reg, clink);
*irqp = (val == VP3_PIRQ_NONE) ?
I386_PCI_INTERRUPT_LINE_NO_CONNECTION : val;
X86_PCI_INTERRUPT_LINE_NO_CONNECTION : val;
return (0);
}

16
sys/arch/i386/pnpbios/pnpbios.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pnpbios.c,v 1.34 2003/01/28 22:19:26 wiz Exp $ */
/* $NetBSD: pnpbios.c,v 1.35 2003/02/26 22:23:11 fvdl Exp $ */
/*
* Copyright (c) 2000 Jason R. Thorpe. All rights reserved.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pnpbios.c,v 1.34 2003/01/28 22:19:26 wiz Exp $");
__KERNEL_RCSID(0, "$NetBSD: pnpbios.c,v 1.35 2003/02/26 22:23:11 fvdl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -269,8 +269,8 @@ pnpbios_mapit(addr, len, prot)
u_long startpa, pa, endpa;
vaddr_t startva, va;
pa = startpa = i386_trunc_page(addr);
endpa = i386_round_page(addr + len);
pa = startpa = x86_trunc_page(addr);
endpa = x86_round_page(addr + len);
va = startva = uvm_km_valloc(kernel_map, endpa - startpa);
if (!startva)
@ -1335,8 +1335,8 @@ pnpbios_io_map(pbt, resc, idx, tagp, hdlp)
while (idx--)
io = SIMPLEQ_NEXT(io, next);
*tagp = I386_BUS_SPACE_IO;
return (i386_memio_map(I386_BUS_SPACE_IO, io->minbase, io->len,
*tagp = X86_BUS_SPACE_IO;
return (x86_memio_map(X86_BUS_SPACE_IO, io->minbase, io->len,
0, hdlp));
}
@ -1357,7 +1357,7 @@ pnpbios_io_unmap(pbt, resc, idx, tag, hdl)
while (idx--)
io = SIMPLEQ_NEXT(io, next);
i386_memio_unmap(tag, hdl, io->len);
x86_memio_unmap(tag, hdl, io->len);
}
int
@ -1378,7 +1378,7 @@ pnpbios_getiobase(pbt, resc, idx, tagp, basep)
io = SIMPLEQ_NEXT(io, next);
if (tagp)
*tagp = I386_BUS_SPACE_IO;
*tagp = X86_BUS_SPACE_IO;
if (basep)
*basep = io->minbase;
return (0);