Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/i386 Adapt for i386/x86 change.
details: https://anonhg.NetBSD.org/src/rev/f14af95b9bb8
branches: trunk
changeset: 543518:f14af95b9bb8
user: fvdl <fvdl%NetBSD.org@localhost>
date: Wed Feb 26 22:21:19 2003 +0000
description:
Adapt for i386/x86 change.
diffstat:
sys/arch/i386/Makefile | 4 ++--
sys/arch/i386/bios/vesa_raster8.c | 6 +++---
sys/arch/i386/eisa/eisa_machdep.c | 8 ++++----
sys/arch/i386/isa/clock.c | 6 +++---
sys/arch/i386/isa/isa_machdep.c | 32 ++++++++++++++++----------------
sys/arch/i386/isa/isapnp_machdep.c | 8 ++++----
sys/arch/i386/isa/npx.c | 8 ++++----
sys/arch/i386/isa/pccons.c | 6 +++---
sys/arch/i386/mca/mca_machdep.c | 22 +++++++++++-----------
sys/arch/i386/pci/ali1543.c | 6 +++---
sys/arch/i386/pci/amd756.c | 6 +++---
sys/arch/i386/pci/opti82c558.c | 6 +++---
sys/arch/i386/pci/opti82c700.c | 6 +++---
sys/arch/i386/pci/pceb.c | 12 ++++++------
sys/arch/i386/pci/pci_addr_fixup.c | 6 +++---
sys/arch/i386/pci/pci_intr_fixup.c | 28 ++++++++++++++--------------
sys/arch/i386/pci/pci_machdep.c | 10 +++++-----
sys/arch/i386/pci/pcib.c | 8 ++++----
sys/arch/i386/pci/pcibios.c | 6 +++---
sys/arch/i386/pci/pcmb.c | 8 ++++----
sys/arch/i386/pci/piix.c | 6 +++---
sys/arch/i386/pci/sis85c503.c | 6 +++---
sys/arch/i386/pci/via82c586.c | 6 +++---
sys/arch/i386/pnpbios/pnpbios.c | 16 ++++++++--------
24 files changed, 118 insertions(+), 118 deletions(-)
diffs (truncated from 1001 to 300 lines):
diff -r 3dccb175a25f -r f14af95b9bb8 sys/arch/i386/Makefile
--- a/sys/arch/i386/Makefile Wed Feb 26 22:05:02 2003 +0000
+++ b/sys/arch/i386/Makefile Wed Feb 26 22:21:19 2003 +0000
@@ -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 @@
(cd $$i && rm -f tags; ln -s ../tags tags); done
-SUBDIR= compile include stand
+SUBDIR= compile include stand ../x86/include
.include <bsd.subdir.mk>
diff -r 3dccb175a25f -r f14af95b9bb8 sys/arch/i386/bios/vesa_raster8.c
--- a/sys/arch/i386/bios/vesa_raster8.c Wed Feb 26 22:05:02 2003 +0000
+++ b/sys/arch/i386/bios/vesa_raster8.c Wed Feb 26 22:21:19 2003 +0000
@@ -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 @@
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);
diff -r 3dccb175a25f -r f14af95b9bb8 sys/arch/i386/eisa/eisa_machdep.c
--- a/sys/arch/i386/eisa/eisa_machdep.c Wed Feb 26 22:05:02 2003 +0000
+++ b/sys/arch/i386/eisa/eisa_machdep.c Wed Feb 26 22:21:19 2003 +0000
@@ -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 @@
#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 @@
* 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,
diff -r 3dccb175a25f -r f14af95b9bb8 sys/arch/i386/isa/clock.c
--- a/sys/arch/i386/isa/clock.c Wed Feb 26 22:05:02 2003 +0000
+++ b/sys/arch/i386/isa/clock.c Wed Feb 26 22:21:19 2003 +0000
@@ -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 @@
*/
#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 @@
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);
}
diff -r 3dccb175a25f -r f14af95b9bb8 sys/arch/i386/isa/isa_machdep.c
--- a/sys/arch/i386/isa/isa_machdep.c Wed Feb 26 22:05:02 2003 +0000
+++ b/sys/arch/i386/isa/isa_machdep.c Wed Feb 26 22:21:19 2003 +0000
@@ -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 @@
#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 @@
* 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 @@
* 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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);
diff -r 3dccb175a25f -r f14af95b9bb8 sys/arch/i386/isa/isapnp_machdep.c
--- a/sys/arch/i386/isa/isapnp_machdep.c Wed Feb 26 22:05:02 2003 +0000
+++ b/sys/arch/i386/isa/isapnp_machdep.c Wed Feb 26 22:21:19 2003 +0000
@@ -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 @@
{
#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 @@
#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
diff -r 3dccb175a25f -r f14af95b9bb8 sys/arch/i386/isa/npx.c
--- a/sys/arch/i386/isa/npx.c Wed Feb 26 22:05:02 2003 +0000
+++ b/sys/arch/i386/isa/npx.c Wed Feb 26 22:21:19 2003 +0000
@@ -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 $");
Home |
Main Index |
Thread Index |
Old Index