PERFORCE change 103401 for review
Oleksandr Tymoshenko
gonzo at FreeBSD.org
Mon Aug 7 21:47:36 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=103401
Change 103401 by gonzo at gonzo_hq on 2006/08/07 21:47:00
o Implement all access functions from bus_space family:
read(multi/region), write(multi/region),
set(multi/region), copy(region).
Affected files ...
.. //depot/projects/mips2/src/sys/mips/include/bus.h#5 edit
Differences ...
==== //depot/projects/mips2/src/sys/mips/include/bus.h#5 (text+ko) ====
@@ -1,4 +1,5 @@
/*-
+ * Copyright (c) 2006 Oleksandr Tymoshenko.
* Copyright (c) KATO Takenori, 1999.
*
* All rights reserved. Unpublished rights reserved under the copyright
@@ -239,209 +240,106 @@
* Read `count' 1, 2, 4, or 8 byte quantities from bus space
* described by tag/handle/offset and copy into buffer provided.
*/
-static __inline void bus_space_read_multi_1(bus_space_tag_t tag,
+static __inline void bus_space_read_region_1(bus_space_tag_t tag,
bus_space_handle_t bsh,
bus_size_t offset, u_int8_t *addr,
size_t count);
-static __inline void bus_space_read_multi_2(bus_space_tag_t tag,
+static __inline void bus_space_read_region_2(bus_space_tag_t tag,
bus_space_handle_t bsh,
bus_size_t offset, u_int16_t *addr,
size_t count);
-static __inline void bus_space_read_multi_4(bus_space_tag_t tag,
+static __inline void bus_space_read_region_4(bus_space_tag_t tag,
bus_space_handle_t bsh,
bus_size_t offset, u_int32_t *addr,
size_t count);
static __inline void
-bus_space_read_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh,
+bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, u_int8_t *addr, size_t count)
{
-#if 0
- if (tag == MIPS_BUS_SPACE_IO)
- insb(bsh + offset, addr, count);
- else {
-#ifdef __GNUCLIKE_ASM
- __asm __volatile(" \n\
- cld \n\
- 1: movb (%2),%%al \n\
- stosb \n\
- loop 1b" :
- "=D" (addr), "=c" (count) :
- "r" (bsh + offset), "0" (addr), "1" (count) :
- "%eax", "memory");
-#endif
+ volatile u_int8_t * ptr = (volatile u_int8_t *)(bsh + offset);
+
+ for(; count > 0; count--, addr++, ptr++) {
+ *addr = *ptr;
}
-#endif
}
static __inline void
-bus_space_read_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh,
+bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, u_int16_t *addr, size_t count)
{
-#if 0
- if (tag == MIPS_BUS_SPACE_IO)
- insw(bsh + offset, addr, count);
- else {
-#ifdef __GNUCLIKE_ASM
- __asm __volatile(" \n\
- cld \n\
- 1: movw (%2),%%ax \n\
- stosw \n\
- loop 1b" :
- "=D" (addr), "=c" (count) :
- "r" (bsh + offset), "0" (addr), "1" (count) :
- "%eax", "memory");
-#endif
+ volatile u_int16_t * ptr = (volatile u_int16_t *)(bsh + offset);
+
+ for(; count > 0; count--, addr++, ptr++) {
+ *addr = *ptr;
}
-#endif
}
static __inline void
-bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh,
+bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, u_int32_t *addr, size_t count)
{
-#if 0
- if (tag == MIPS_BUS_SPACE_IO)
- insl(bsh + offset, addr, count);
- else {
-#ifdef __GNUCLIKE_ASM
- __asm __volatile(" \n\
- cld \n\
- 1: movl (%2),%%eax \n\
- stosl \n\
- loop 1b" :
- "=D" (addr), "=c" (count) :
- "r" (bsh + offset), "0" (addr), "1" (count) :
- "%eax", "memory");
-#endif
+ volatile u_int32_t * ptr = (volatile u_int32_t *)(bsh + offset);
+
+ for(; count > 0; count--, addr++, ptr++) {
+ *addr = *ptr;
}
-#endif
}
-#if 0 /* Cause a link error for bus_space_read_multi_8 */
-#define bus_space_read_multi_8 !!! bus_space_read_multi_8 unimplemented !!!
-#endif
-
/*
* Read `count' 1, 2, 4, or 8 byte quantities from bus space
* described by tag/handle and starting at `offset' and copy into
* buffer provided.
*/
-static __inline void bus_space_read_region_1(bus_space_tag_t tag,
+static __inline void bus_space_read_multi_1(bus_space_tag_t tag,
bus_space_handle_t bsh,
bus_size_t offset, u_int8_t *addr,
size_t count);
-static __inline void bus_space_read_region_2(bus_space_tag_t tag,
+static __inline void bus_space_read_multi_2(bus_space_tag_t tag,
bus_space_handle_t bsh,
bus_size_t offset, u_int16_t *addr,
size_t count);
-static __inline void bus_space_read_region_4(bus_space_tag_t tag,
+static __inline void bus_space_read_multi_4(bus_space_tag_t tag,
bus_space_handle_t bsh,
bus_size_t offset, u_int32_t *addr,
size_t count);
static __inline void
-bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh,
+bus_space_read_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, u_int8_t *addr, size_t count)
{
-#if 0
- if (tag == MIPS_BUS_SPACE_IO) {
- int _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
- __asm __volatile(" \n\
- cld \n\
- 1: inb %w2,%%al \n\
- stosb \n\
- incl %2 \n\
- loop 1b" :
- "=D" (addr), "=c" (count), "=d" (_port_) :
- "0" (addr), "1" (count), "2" (_port_) :
- "%eax", "memory", "cc");
-#endif
- } else {
- bus_space_handle_t _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
- __asm __volatile(" \n\
- cld \n\
- repne \n\
- movsb" :
- "=D" (addr), "=c" (count), "=S" (_port_) :
- "0" (addr), "1" (count), "2" (_port_) :
- "memory", "cc");
-#endif
+ volatile u_int8_t * ptr = (volatile u_int8_t *)(bsh + offset);
+
+ for(; count > 0; count--, addr++) {
+ *addr = *ptr;
}
-#endif
}
static __inline void
-bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh,
+bus_space_read_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, u_int16_t *addr, size_t count)
{
-#if 0
- if (tag == MIPS_BUS_SPACE_IO) {
- int _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
- __asm __volatile(" \n\
- cld \n\
- 1: inw %w2,%%ax \n\
- stosw \n\
- addl $2,%2 \n\
- loop 1b" :
- "=D" (addr), "=c" (count), "=d" (_port_) :
- "0" (addr), "1" (count), "2" (_port_) :
- "%eax", "memory", "cc");
-#endif
- } else {
- bus_space_handle_t _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
- __asm __volatile(" \n\
- cld \n\
- repne \n\
- movsw" :
- "=D" (addr), "=c" (count), "=S" (_port_) :
- "0" (addr), "1" (count), "2" (_port_) :
- "memory", "cc");
-#endif
+ volatile u_int16_t * ptr = (volatile u_int16_t *)(bsh + offset);
+
+ for(; count > 0; count--, addr++) {
+ *addr = *ptr;
}
-#endif
}
static __inline void
-bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh,
+bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, u_int32_t *addr, size_t count)
{
-#if 0
- if (tag == MIPS_BUS_SPACE_IO) {
- int _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
- __asm __volatile(" \n\
- cld \n\
- 1: inl %w2,%%eax \n\
- stosl \n\
- addl $4,%2 \n\
- loop 1b" :
- "=D" (addr), "=c" (count), "=d" (_port_) :
- "0" (addr), "1" (count), "2" (_port_) :
- "%eax", "memory", "cc");
-#endif
- } else {
- bus_space_handle_t _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
- __asm __volatile(" \n\
- cld \n\
- repne \n\
- movsl" :
- "=D" (addr), "=c" (count), "=S" (_port_) :
- "0" (addr), "1" (count), "2" (_port_) :
- "memory", "cc");
-#endif
+ volatile u_int32_t * ptr = (volatile u_int32_t *)(bsh + offset);
+
+ for(; count > 0; count--, addr++) {
+ *addr = *ptr;
}
-#endif
}
#if 0 /* Cause a link error for bus_space_read_region_8 */
@@ -486,232 +384,115 @@
*(volatile u_int32_t *)(bsh + offset) = value;
}
-#if 0 /* Cause a link error for bus_space_write_8 */
-#define bus_space_write_8 !!! bus_space_write_8 not implemented !!!
-#endif
-
/*
* Write `count' 1, 2, 4, or 8 byte quantities from the buffer
* provided to bus space described by tag/handle/offset.
*/
-static __inline void bus_space_write_multi_1(bus_space_tag_t tag,
+static __inline void bus_space_write_region_1(bus_space_tag_t tag,
bus_space_handle_t bsh,
bus_size_t offset,
const u_int8_t *addr,
size_t count);
-static __inline void bus_space_write_multi_2(bus_space_tag_t tag,
+static __inline void bus_space_write_region_2(bus_space_tag_t tag,
bus_space_handle_t bsh,
bus_size_t offset,
const u_int16_t *addr,
size_t count);
-static __inline void bus_space_write_multi_4(bus_space_tag_t tag,
+static __inline void bus_space_write_region_4(bus_space_tag_t tag,
bus_space_handle_t bsh,
bus_size_t offset,
const u_int32_t *addr,
size_t count);
static __inline void
-bus_space_write_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh,
+bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, const u_int8_t *addr, size_t count)
{
-#if 0
- if (tag == MIPS_BUS_SPACE_IO)
- outsb(bsh + offset, addr, count);
- else {
-#ifdef __GNUCLIKE_ASM
- __asm __volatile(" \n\
- cld \n\
- 1: lodsb \n\
- movb %%al,(%2) \n\
- loop 1b" :
- "=S" (addr), "=c" (count) :
- "r" (bsh + offset), "0" (addr), "1" (count) :
- "%eax", "memory", "cc");
-#endif
+ volatile u_int8_t * ptr = (volatile u_int8_t *)(bsh + offset);
+
+ for(; count > 0; count--, addr++, ptr++) {
+ *ptr = *addr;
}
-#endif
}
static __inline void
-bus_space_write_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh,
+bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, const u_int16_t *addr, size_t count)
{
-#if 0
- if (tag == MIPS_BUS_SPACE_IO)
- outsw(bsh + offset, addr, count);
- else {
-#ifdef __GNUCLIKE_ASM
- __asm __volatile(" \n\
- cld \n\
- 1: lodsw \n\
- movw %%ax,(%2) \n\
- loop 1b" :
- "=S" (addr), "=c" (count) :
- "r" (bsh + offset), "0" (addr), "1" (count) :
- "%eax", "memory", "cc");
-#endif
+ volatile u_int16_t * ptr = (volatile u_int16_t *)(bsh + offset);
+
+ for(; count > 0; count--, addr++, ptr++) {
+ *ptr = *addr;
}
-#endif
}
static __inline void
-bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh,
+bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, const u_int32_t *addr, size_t count)
{
-#if 0
+ volatile u_int32_t * ptr = (volatile u_int32_t *)(bsh + offset);
- if (tag == MIPS_BUS_SPACE_IO)
- outsl(bsh + offset, addr, count);
- else {
-#ifdef __GNUCLIKE_ASM
- __asm __volatile(" \n\
- cld \n\
- 1: lodsl \n\
- movl %%eax,(%2) \n\
- loop 1b" :
- "=S" (addr), "=c" (count) :
- "r" (bsh + offset), "0" (addr), "1" (count) :
- "%eax", "memory", "cc");
-#endif
+ for(; count > 0; count--, addr++, ptr++) {
+ *ptr = *addr;
}
-#endif
}
-#if 0 /* Cause a link error for bus_space_write_multi_8 */
-#define bus_space_write_multi_8(t, h, o, a, c) \
- !!! bus_space_write_multi_8 unimplemented !!!
-#endif
-
/*
* Write `count' 1, 2, 4, or 8 byte quantities from the buffer provided
* to bus space described by tag/handle starting at `offset'.
*/
-static __inline void bus_space_write_region_1(bus_space_tag_t tag,
+static __inline void bus_space_write_multi_1(bus_space_tag_t tag,
bus_space_handle_t bsh,
bus_size_t offset,
const u_int8_t *addr,
size_t count);
-static __inline void bus_space_write_region_2(bus_space_tag_t tag,
+static __inline void bus_space_write_multi_2(bus_space_tag_t tag,
bus_space_handle_t bsh,
bus_size_t offset,
const u_int16_t *addr,
size_t count);
-static __inline void bus_space_write_region_4(bus_space_tag_t tag,
+static __inline void bus_space_write_multi_4(bus_space_tag_t tag,
bus_space_handle_t bsh,
bus_size_t offset,
const u_int32_t *addr,
size_t count);
static __inline void
-bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh,
+bus_space_write_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, const u_int8_t *addr, size_t count)
{
-#if 0
+ volatile u_int8_t * ptr = (volatile u_int8_t *)(bsh + offset);
- if (tag == MIPS_BUS_SPACE_IO) {
- int _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
- __asm __volatile(" \n\
- cld \n\
- 1: lodsb \n\
- outb %%al,%w0 \n\
- incl %0 \n\
- loop 1b" :
- "=d" (_port_), "=S" (addr), "=c" (count) :
- "0" (_port_), "1" (addr), "2" (count) :
- "%eax", "memory", "cc");
-#endif
- } else {
- bus_space_handle_t _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
- __asm __volatile(" \n\
- cld \n\
- repne \n\
- movsb" :
- "=D" (_port_), "=S" (addr), "=c" (count) :
- "0" (_port_), "1" (addr), "2" (count) :
- "memory", "cc");
-#endif
+ for(; count > 0; count--, addr++) {
+ *ptr = *addr;
}
-#endif
}
static __inline void
-bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh,
+bus_space_write_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, const u_int16_t *addr, size_t count)
{
-#if 0
+ volatile u_int16_t * ptr = (volatile u_int16_t *)(bsh + offset);
- if (tag == MIPS_BUS_SPACE_IO) {
- int _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
- __asm __volatile(" \n\
- cld \n\
- 1: lodsw \n\
- outw %%ax,%w0 \n\
- addl $2,%0 \n\
- loop 1b" :
- "=d" (_port_), "=S" (addr), "=c" (count) :
- "0" (_port_), "1" (addr), "2" (count) :
- "%eax", "memory", "cc");
-#endif
- } else {
- bus_space_handle_t _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
- __asm __volatile(" \n\
- cld \n\
- repne \n\
- movsw" :
- "=D" (_port_), "=S" (addr), "=c" (count) :
- "0" (_port_), "1" (addr), "2" (count) :
- "memory", "cc");
-#endif
+ for(; count > 0; count--, addr++) {
+ *ptr = *addr;
}
-#endif
}
static __inline void
-bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh,
+bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, const u_int32_t *addr, size_t count)
{
-#if 0
+ volatile u_int32_t * ptr = (volatile u_int32_t *)(bsh + offset);
- if (tag == MIPS_BUS_SPACE_IO) {
- int _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
- __asm __volatile(" \n\
- cld \n\
- 1: lodsl \n\
- outl %%eax,%w0 \n\
- addl $4,%0 \n\
- loop 1b" :
- "=d" (_port_), "=S" (addr), "=c" (count) :
- "0" (_port_), "1" (addr), "2" (count) :
- "%eax", "memory", "cc");
-#endif
- } else {
- bus_space_handle_t _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
- __asm __volatile(" \n\
- cld \n\
- repne \n\
- movsl" :
- "=D" (_port_), "=S" (addr), "=c" (count) :
- "0" (_port_), "1" (addr), "2" (count) :
- "memory", "cc");
-#endif
+ for(; count > 0; count--, addr++) {
+ *ptr = *addr;
}
-#endif
}
-#if 0 /* Cause a link error for bus_space_write_region_8 */
-#define bus_space_write_region_8 \
- !!! bus_space_write_region_8 unimplemented !!!
-#endif
-
/*
* Write the 1, 2, 4, or 8 byte value `val' to bus space described
* by tag/handle/offset `count' times.
@@ -734,54 +515,35 @@
bus_space_set_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, u_int8_t value, size_t count)
{
-#if 0
- bus_space_handle_t addr = bsh + offset;
+ volatile u_int8_t * ptr = (volatile u_int8_t *)(bsh + offset);
- if (tag == MIPS_BUS_SPACE_IO)
- while (count--)
- outb(addr, value);
- else
- while (count--)
- *(volatile u_int8_t *)(addr) = value;
-#endif
+ for(; count > 0; count--) {
+ *ptr = value;
+ }
}
static __inline void
bus_space_set_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, u_int16_t value, size_t count)
{
-#if 0
- bus_space_handle_t addr = bsh + offset;
+ volatile u_int16_t * ptr = (volatile u_int16_t *)(bsh + offset);
- if (tag == MIPS_BUS_SPACE_IO)
- while (count--)
- outw(addr, value);
- else
- while (count--)
- *(volatile u_int16_t *)(addr) = value;
-#endif
+ for(; count > 0; count--) {
+ *ptr = value;
+ }
}
static __inline void
bus_space_set_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, u_int32_t value, size_t count)
{
-#if 0
- bus_space_handle_t addr = bsh + offset;
+ volatile u_int32_t * ptr = (volatile u_int32_t *)(bsh + offset);
- if (tag == MIPS_BUS_SPACE_IO)
- while (count--)
- outl(addr, value);
- else
- while (count--)
- *(volatile u_int32_t *)(addr) = value;
-#endif
+ for(; count > 0; count--) {
+ *ptr = value;
+ }
}
-#if 0 /* Cause a link error for bus_space_set_multi_8 */
-#define bus_space_set_multi_8 !!! bus_space_set_multi_8 unimplemented !!!
-#endif
-
/*
* Write `count' 1, 2, 4, or 8 byte value `val' to bus space described
* by tag/handle starting at `offset'.
@@ -804,54 +566,35 @@
bus_space_set_region_1(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, u_int8_t value, size_t count)
{
-#if 0
- bus_space_handle_t addr = bsh + offset;
+ volatile u_int8_t * ptr = (volatile u_int8_t *)(bsh + offset);
- if (tag == MIPS_BUS_SPACE_IO)
- for (; count != 0; count--, addr++)
- outb(addr, value);
- else
- for (; count != 0; count--, addr++)
- *(volatile u_int8_t *)(addr) = value;
-#endif
+ for(; count > 0; count--, ptr++) {
+ *ptr = value;
+ }
}
static __inline void
bus_space_set_region_2(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, u_int16_t value, size_t count)
{
-#if 0
- bus_space_handle_t addr = bsh + offset;
+ volatile u_int16_t * ptr = (volatile u_int16_t *)(bsh + offset);
- if (tag == MIPS_BUS_SPACE_IO)
- for (; count != 0; count--, addr += 2)
- outw(addr, value);
- else
- for (; count != 0; count--, addr += 2)
- *(volatile u_int16_t *)(addr) = value;
-#endif
+ for(; count > 0; count--, ptr++) {
+ *ptr = value;
+ }
}
static __inline void
bus_space_set_region_4(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, u_int32_t value, size_t count)
{
-#if 0
- bus_space_handle_t addr = bsh + offset;
+ volatile u_int32_t * ptr = (volatile u_int32_t *)(bsh + offset);
- if (tag == MIPS_BUS_SPACE_IO)
- for (; count != 0; count--, addr += 4)
- outl(addr, value);
- else
- for (; count != 0; count--, addr += 4)
- *(volatile u_int32_t *)(addr) = value;
-#endif
+ for(; count > 0; count--, ptr++) {
+ *ptr = value;
+ }
}
-#if 0 /* Cause a link error for bus_space_set_region_8 */
-#define bus_space_set_region_8 !!! bus_space_set_region_8 unimplemented !!!
-#endif
-
/*
* Copy `count' 1, 2, 4, or 8 byte values from bus space starting
* at tag/bsh1/off1 to bus space starting at tag/bsh2/off2.
@@ -880,36 +623,12 @@
bus_size_t off1, bus_space_handle_t bsh2,
bus_size_t off2, size_t count)
{
-#if 0
- bus_space_handle_t addr1 = bsh1 + off1;
- bus_space_handle_t addr2 = bsh2 + off2;
+ volatile u_int8_t * ptr1 = (volatile u_int8_t *)(bsh1 + off1);
+ volatile u_int8_t * ptr2 = (volatile u_int8_t *)(bsh2 + off2);
- if (tag == MIPS_BUS_SPACE_IO) {
- if (addr1 >= addr2) {
- /* src after dest: copy forward */
- for (; count != 0; count--, addr1++, addr2++)
- outb(addr2, inb(addr1));
- } else {
- /* dest after src: copy backwards */
- for (addr1 += (count - 1), addr2 += (count - 1);
- count != 0; count--, addr1--, addr2--)
- outb(addr2, inb(addr1));
- }
- } else {
- if (addr1 >= addr2) {
- /* src after dest: copy forward */
- for (; count != 0; count--, addr1++, addr2++)
- *(volatile u_int8_t *)(addr2) =
- *(volatile u_int8_t *)(addr1);
- } else {
- /* dest after src: copy backwards */
- for (addr1 += (count - 1), addr2 += (count - 1);
- count != 0; count--, addr1--, addr2--)
- *(volatile u_int8_t *)(addr2) =
- *(volatile u_int8_t *)(addr1);
- }
+ for(; count > 0; count--, ptr1++, ptr2++) {
+ *ptr2 = *ptr1;
}
-#endif
}
static __inline void
@@ -917,36 +636,12 @@
bus_size_t off1, bus_space_handle_t bsh2,
bus_size_t off2, size_t count)
{
-#if 0
- bus_space_handle_t addr1 = bsh1 + off1;
- bus_space_handle_t addr2 = bsh2 + off2;
+ volatile u_int16_t * ptr1 = (volatile u_int16_t *)(bsh1 + off1);
+ volatile u_int16_t * ptr2 = (volatile u_int16_t *)(bsh2 + off2);
- if (tag == MIPS_BUS_SPACE_IO) {
- if (addr1 >= addr2) {
- /* src after dest: copy forward */
- for (; count != 0; count--, addr1 += 2, addr2 += 2)
- outw(addr2, inw(addr1));
- } else {
- /* dest after src: copy backwards */
- for (addr1 += 2 * (count - 1), addr2 += 2 * (count - 1);
- count != 0; count--, addr1 -= 2, addr2 -= 2)
- outw(addr2, inw(addr1));
- }
- } else {
- if (addr1 >= addr2) {
- /* src after dest: copy forward */
- for (; count != 0; count--, addr1 += 2, addr2 += 2)
- *(volatile u_int16_t *)(addr2) =
- *(volatile u_int16_t *)(addr1);
- } else {
- /* dest after src: copy backwards */
- for (addr1 += 2 * (count - 1), addr2 += 2 * (count - 1);
- count != 0; count--, addr1 -= 2, addr2 -= 2)
- *(volatile u_int16_t *)(addr2) =
- *(volatile u_int16_t *)(addr1);
- }
+ for(; count > 0; count--, ptr1++, ptr2++) {
+ *ptr2 = *ptr1;
}
-#endif
}
static __inline void
@@ -954,36 +649,12 @@
bus_size_t off1, bus_space_handle_t bsh2,
bus_size_t off2, size_t count)
{
-#if 0
- bus_space_handle_t addr1 = bsh1 + off1;
- bus_space_handle_t addr2 = bsh2 + off2;
+ volatile u_int32_t * ptr1 = (volatile u_int32_t *)(bsh1 + off1);
+ volatile u_int32_t * ptr2 = (volatile u_int32_t *)(bsh2 + off2);
- if (tag == MIPS_BUS_SPACE_IO) {
- if (addr1 >= addr2) {
- /* src after dest: copy forward */
- for (; count != 0; count--, addr1 += 4, addr2 += 4)
- outl(addr2, inl(addr1));
- } else {
- /* dest after src: copy backwards */
- for (addr1 += 4 * (count - 1), addr2 += 4 * (count - 1);
- count != 0; count--, addr1 -= 4, addr2 -= 4)
- outl(addr2, inl(addr1));
- }
- } else {
- if (addr1 >= addr2) {
- /* src after dest: copy forward */
- for (; count != 0; count--, addr1 += 4, addr2 += 4)
- *(volatile u_int32_t *)(addr2) =
- *(volatile u_int32_t *)(addr1);
- } else {
- /* dest after src: copy backwards */
- for (addr1 += 4 * (count - 1), addr2 += 4 * (count - 1);
- count != 0; count--, addr1 -= 4, addr2 -= 4)
- *(volatile u_int32_t *)(addr2) =
- *(volatile u_int32_t *)(addr1);
- }
+ for(; count > 0; count--, ptr1++, ptr2++) {
+ *ptr2 = *ptr1;
}
-#endif
}
#if 0 /* Cause a link error for bus_space_copy_8 */
More information about the p4-projects
mailing list