summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arch/amd64/include/isa_machdep.h4
-rw-r--r--sys/arch/amd64/isa/isa_machdep.c20
-rw-r--r--sys/arch/i386/isa/isa_machdep.c20
-rw-r--r--sys/arch/i386/isa/isa_machdep.h4
4 files changed, 24 insertions, 24 deletions
diff --git a/sys/arch/amd64/include/isa_machdep.h b/sys/arch/amd64/include/isa_machdep.h
index 81c0f4d187a..0a094aa766a 100644
--- a/sys/arch/amd64/include/isa_machdep.h
+++ b/sys/arch/amd64/include/isa_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: isa_machdep.h,v 1.8 2008/12/03 15:46:06 oga Exp $ */
+/* $OpenBSD: isa_machdep.h,v 1.9 2008/12/11 17:07:14 oga Exp $ */
/* $NetBSD: isa_machdep.h,v 1.2 2003/05/09 23:51:28 fvdl Exp $ */
/*-
@@ -130,7 +130,7 @@ extern struct bus_dma_tag isa_bus_dma_tag;
* Cookie used by ISA dma. A pointer to one of these it stashed in
* the DMA map.
*/
-struct x86_isa_dma_cookie {
+struct isa_dma_cookie {
int id_flags; /* flags; see below */
void *id_origbuf; /* pointer to orig buffer if
diff --git a/sys/arch/amd64/isa/isa_machdep.c b/sys/arch/amd64/isa/isa_machdep.c
index d16f1444007..2861959eb62 100644
--- a/sys/arch/amd64/isa/isa_machdep.c
+++ b/sys/arch/amd64/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isa_machdep.c,v 1.18 2008/12/10 20:26:56 oga Exp $ */
+/* $OpenBSD: isa_machdep.c,v 1.19 2008/12/11 17:07:14 oga Exp $ */
/* $NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $ */
#define ISA_DMA_STATS
@@ -386,7 +386,7 @@ int
_isa_bus_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments,
bus_size_t maxsegsz, bus_size_t boundary, int flags, bus_dmamap_t *dmamp)
{
- struct x86_isa_dma_cookie *cookie;
+ struct isa_dma_cookie *cookie;
bus_dmamap_t map;
int error, cookieflags;
void *cookiestore;
@@ -401,7 +401,7 @@ _isa_bus_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments,
map = *dmamp;
map->_dm_cookie = NULL;
- cookiesize = sizeof(struct x86_isa_dma_cookie);
+ cookiesize = sizeof(struct isa_dma_cookie);
/*
* ISA only has 24-bits of address space. This means
@@ -442,7 +442,7 @@ _isa_bus_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments,
error = ENOMEM;
goto out;
}
- cookie = (struct x86_isa_dma_cookie *)cookiestore;
+ cookie = (struct isa_dma_cookie *)cookiestore;
cookie->id_flags = cookieflags;
map->_dm_cookie = cookie;
@@ -472,7 +472,7 @@ _isa_bus_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments,
void
_isa_bus_dmamap_destroy(bus_dma_tag_t t, bus_dmamap_t map)
{
- struct x86_isa_dma_cookie *cookie = map->_dm_cookie;
+ struct isa_dma_cookie *cookie = map->_dm_cookie;
/*
* Free any bounce pages this map might hold.
@@ -491,7 +491,7 @@ int
_isa_bus_dmamap_load(bus_dma_tag_t t, bus_dmamap_t map, void *buf,
bus_size_t buflen, struct proc *p, int flags)
{
- struct x86_isa_dma_cookie *cookie = map->_dm_cookie;
+ struct isa_dma_cookie *cookie = map->_dm_cookie;
int error;
STAT_INCR(isa_dma_stats_loads);
@@ -591,7 +591,7 @@ _isa_bus_dmamap_load_raw(bus_dma_tag_t t, bus_dmamap_t map,
void
_isa_bus_dmamap_unload(bus_dma_tag_t t, bus_dmamap_t map)
{
- struct x86_isa_dma_cookie *cookie = map->_dm_cookie;
+ struct isa_dma_cookie *cookie = map->_dm_cookie;
/*
* If we have bounce pages, free them, unless they're
@@ -616,7 +616,7 @@ void
_isa_bus_dmamap_sync(bus_dma_tag_t t, bus_dmamap_t map, bus_addr_t offset,
bus_size_t len, int op)
{
- struct x86_isa_dma_cookie *cookie = map->_dm_cookie;
+ struct isa_dma_cookie *cookie = map->_dm_cookie;
#ifdef DEBUG
if ((op & (BUS_DMASYNC_PREWRITE|BUS_DMASYNC_POSTREAD)) != 0) {
@@ -792,7 +792,7 @@ int
_isa_dma_alloc_bouncebuf(bus_dma_tag_t t, bus_dmamap_t map, bus_size_t size,
int flags)
{
- struct x86_isa_dma_cookie *cookie = map->_dm_cookie;
+ struct isa_dma_cookie *cookie = map->_dm_cookie;
int error = 0;
cookie->id_bouncebuflen = round_page(size);
@@ -822,7 +822,7 @@ _isa_dma_alloc_bouncebuf(bus_dma_tag_t t, bus_dmamap_t map, bus_size_t size,
void
_isa_dma_free_bouncebuf(bus_dma_tag_t t, bus_dmamap_t map)
{
- struct x86_isa_dma_cookie *cookie = map->_dm_cookie;
+ struct isa_dma_cookie *cookie = map->_dm_cookie;
STAT_DECR(isa_dma_stats_nbouncebufs);
diff --git a/sys/arch/i386/isa/isa_machdep.c b/sys/arch/i386/isa/isa_machdep.c
index fa7074aae44..65e728bfb98 100644
--- a/sys/arch/i386/isa/isa_machdep.c
+++ b/sys/arch/i386/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isa_machdep.c,v 1.65 2008/12/10 20:26:56 oga Exp $ */
+/* $OpenBSD: isa_machdep.c,v 1.66 2008/12/11 17:07:14 oga Exp $ */
/* $NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $ */
/*-
@@ -651,7 +651,7 @@ int
_isa_bus_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments,
bus_size_t maxsegsz, bus_size_t boundary, int flags, bus_dmamap_t *dmamp)
{
- struct i386_isa_dma_cookie *cookie;
+ struct isa_dma_cookie *cookie;
bus_dmamap_t map;
int error, cookieflags;
void *cookiestore;
@@ -666,7 +666,7 @@ _isa_bus_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments,
map = *dmamp;
map->_dm_cookie = NULL;
- cookiesize = sizeof(struct i386_isa_dma_cookie);
+ cookiesize = sizeof(struct isa_dma_cookie);
/*
* ISA only has 24-bits of address space. This means
@@ -706,7 +706,7 @@ _isa_bus_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments,
error = ENOMEM;
goto out;
}
- cookie = (struct i386_isa_dma_cookie *)cookiestore;
+ cookie = (struct isa_dma_cookie *)cookiestore;
cookie->id_flags = cookieflags;
map->_dm_cookie = cookie;
@@ -736,7 +736,7 @@ _isa_bus_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments,
void
_isa_bus_dmamap_destroy(bus_dma_tag_t t, bus_dmamap_t map)
{
- struct i386_isa_dma_cookie *cookie = map->_dm_cookie;
+ struct isa_dma_cookie *cookie = map->_dm_cookie;
/*
* Free any bounce pages this map might hold.
@@ -755,7 +755,7 @@ int
_isa_bus_dmamap_load(bus_dma_tag_t t, bus_dmamap_t map, void *buf,
bus_size_t buflen, struct proc *p, int flags)
{
- struct i386_isa_dma_cookie *cookie = map->_dm_cookie;
+ struct isa_dma_cookie *cookie = map->_dm_cookie;
int error;
STAT_INCR(isa_dma_stats_loads);
@@ -855,7 +855,7 @@ _isa_bus_dmamap_load_raw(bus_dma_tag_t t, bus_dmamap_t map,
void
_isa_bus_dmamap_unload(bus_dma_tag_t t, bus_dmamap_t map)
{
- struct i386_isa_dma_cookie *cookie = map->_dm_cookie;
+ struct isa_dma_cookie *cookie = map->_dm_cookie;
/*
* If we have bounce pages, free them, unless they're
@@ -880,7 +880,7 @@ void
_isa_bus_dmamap_sync(bus_dma_tag_t t, bus_dmamap_t map, bus_addr_t offset,
bus_size_t len, int op)
{
- struct i386_isa_dma_cookie *cookie = map->_dm_cookie;
+ struct isa_dma_cookie *cookie = map->_dm_cookie;
#ifdef DEBUG
if ((op & (BUS_DMASYNC_PREWRITE|BUS_DMASYNC_POSTREAD)) != 0) {
@@ -1052,7 +1052,7 @@ _isa_dma_check_buffer(void *buf, bus_size_t buflen, int segcnt,
int
_isa_dma_alloc_bouncebuf(bus_dma_tag_t t, bus_dmamap_t map, bus_size_t size, int flags)
{
- struct i386_isa_dma_cookie *cookie = map->_dm_cookie;
+ struct isa_dma_cookie *cookie = map->_dm_cookie;
int error = 0;
cookie->id_bouncebuflen = round_page(size);
@@ -1082,7 +1082,7 @@ _isa_dma_alloc_bouncebuf(bus_dma_tag_t t, bus_dmamap_t map, bus_size_t size, int
void
_isa_dma_free_bouncebuf(bus_dma_tag_t t, bus_dmamap_t map)
{
- struct i386_isa_dma_cookie *cookie = map->_dm_cookie;
+ struct isa_dma_cookie *cookie = map->_dm_cookie;
STAT_DECR(isa_dma_stats_nbouncebufs);
diff --git a/sys/arch/i386/isa/isa_machdep.h b/sys/arch/i386/isa/isa_machdep.h
index 7da886a15d6..6f3e04cb27e 100644
--- a/sys/arch/i386/isa/isa_machdep.h
+++ b/sys/arch/i386/isa/isa_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: isa_machdep.h,v 1.23 2008/12/03 15:46:07 oga Exp $ */
+/* $OpenBSD: isa_machdep.h,v 1.24 2008/12/11 17:07:14 oga Exp $ */
/* $NetBSD: isa_machdep.h,v 1.7 1997/06/06 23:28:42 thorpej Exp $ */
/*-
@@ -118,7 +118,7 @@ extern struct bus_dma_tag isa_bus_dma_tag;
* Cookie used by ISA dma. A pointer to one of these it stashed in
* the DMA map.
*/
-struct i386_isa_dma_cookie {
+struct isa_dma_cookie {
int id_flags; /* flags; see below */
void *id_origbuf; /* pointer to orig buffer if
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-25 09:30:09 +0000