diff options
Diffstat (limited to 'sys/arch/sh')
| -rw-r--r-- | sys/arch/sh/dev/shpcic.c | 14 | ||||
| -rw-r--r-- | sys/arch/sh/dev/shpcicvar.h | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/sys/arch/sh/dev/shpcic.c b/sys/arch/sh/dev/shpcic.c index 93e46f21191..6bb9f8487ce 100644 --- a/sys/arch/sh/dev/shpcic.c +++ b/sys/arch/sh/dev/shpcic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: shpcic.c,v 1.10 2009/12/25 20:52:57 miod Exp $ */ +/* $OpenBSD: shpcic.c,v 1.11 2010/04/04 12:49:30 miod Exp $ */ /* $NetBSD: shpcic.c,v 1.10 2005/12/24 20:07:32 perry Exp $ */ /* @@ -1192,7 +1192,7 @@ shpcic_mem_set_region_4(void *v, bus_space_handle_t bsh, * copy region */ void -shpcic_io_copy_region_1(void *v, bus_space_handle_t bsh1, +shpcic_io_copy_1(void *v, bus_space_handle_t bsh1, bus_size_t off1, bus_space_handle_t bsh2, bus_size_t off2, bus_size_t count) { u_long addr1 = bsh1 + off1; @@ -1219,7 +1219,7 @@ shpcic_io_copy_region_1(void *v, bus_space_handle_t bsh1, } void -shpcic_io_copy_region_2(void *v, bus_space_handle_t bsh1, +shpcic_io_copy_2(void *v, bus_space_handle_t bsh1, bus_size_t off1, bus_space_handle_t bsh2, bus_size_t off2, bus_size_t count) { u_long addr1 = bsh1 + off1; @@ -1246,7 +1246,7 @@ shpcic_io_copy_region_2(void *v, bus_space_handle_t bsh1, } void -shpcic_io_copy_region_4(void *v, bus_space_handle_t bsh1, +shpcic_io_copy_4(void *v, bus_space_handle_t bsh1, bus_size_t off1, bus_space_handle_t bsh2, bus_size_t off2, bus_size_t count) { u_long addr1 = bsh1 + off1; @@ -1273,7 +1273,7 @@ shpcic_io_copy_region_4(void *v, bus_space_handle_t bsh1, } void -shpcic_mem_copy_region_1(void *v, bus_space_handle_t bsh1, +shpcic_mem_copy_1(void *v, bus_space_handle_t bsh1, bus_size_t off1, bus_space_handle_t bsh2, bus_size_t off2, bus_size_t count) { u_long addr1 = bsh1 + off1; @@ -1300,7 +1300,7 @@ shpcic_mem_copy_region_1(void *v, bus_space_handle_t bsh1, } void -shpcic_mem_copy_region_2(void *v, bus_space_handle_t bsh1, +shpcic_mem_copy_2(void *v, bus_space_handle_t bsh1, bus_size_t off1, bus_space_handle_t bsh2, bus_size_t off2, bus_size_t count) { u_long addr1 = bsh1 + off1; @@ -1327,7 +1327,7 @@ shpcic_mem_copy_region_2(void *v, bus_space_handle_t bsh1, } void -shpcic_mem_copy_region_4(void *v, bus_space_handle_t bsh1, +shpcic_mem_copy_4(void *v, bus_space_handle_t bsh1, bus_size_t off1, bus_space_handle_t bsh2, bus_size_t off2, bus_size_t count) { u_long addr1 = bsh1 + off1; diff --git a/sys/arch/sh/dev/shpcicvar.h b/sys/arch/sh/dev/shpcicvar.h index a260c3d89e5..90c85702d21 100644 --- a/sys/arch/sh/dev/shpcicvar.h +++ b/sys/arch/sh/dev/shpcicvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: shpcicvar.h,v 1.4 2009/12/25 20:52:57 miod Exp $ */ +/* $OpenBSD: shpcicvar.h,v 1.5 2010/04/04 12:49:30 miod Exp $ */ /* $NetBSD: shpcicvar.h,v 1.6 2005/12/11 12:18:58 christos Exp $ */ /*- @@ -229,22 +229,22 @@ void shpcic_mem_set_region_4(void *v, bus_space_handle_t bsh, bus_size_t offset, uint32_t val, bus_size_t count); /* copy region */ -void shpcic_io_copy_region_1(void *v, bus_space_handle_t bsh1, +void shpcic_io_copy_1(void *v, bus_space_handle_t bsh1, bus_size_t off1, bus_space_handle_t bsh2, bus_size_t off2, bus_size_t count); -void shpcic_io_copy_region_2(void *v, bus_space_handle_t bsh1, +void shpcic_io_copy_2(void *v, bus_space_handle_t bsh1, bus_size_t off1, bus_space_handle_t bsh2, bus_size_t off2, bus_size_t count); -void shpcic_io_copy_region_4(void *v, bus_space_handle_t bsh1, +void shpcic_io_copy_4(void *v, bus_space_handle_t bsh1, bus_size_t off1, bus_space_handle_t bsh2, bus_size_t off2, bus_size_t count); -void shpcic_mem_copy_region_1(void *v, bus_space_handle_t bsh1, +void shpcic_mem_copy_1(void *v, bus_space_handle_t bsh1, bus_size_t off1, bus_space_handle_t bsh2, bus_size_t off2, bus_size_t count); -void shpcic_mem_copy_region_2(void *v, bus_space_handle_t bsh1, +void shpcic_mem_copy_2(void *v, bus_space_handle_t bsh1, bus_size_t off1, bus_space_handle_t bsh2, bus_size_t off2, bus_size_t count); -void shpcic_mem_copy_region_4(void *v, bus_space_handle_t bsh1, +void shpcic_mem_copy_4(void *v, bus_space_handle_t bsh1, bus_size_t off1, bus_space_handle_t bsh2, bus_size_t off2, bus_size_t count); #endif /* SH_DEV_PCICVAR_H */ |