Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/playstation2/include Fix incorrect ## usage.



details:   https://anonhg.NetBSD.org/src/rev/828d9e2e4d83
branches:  trunk
changeset: 535311:828d9e2e4d83
user:      kent <kent%NetBSD.org@localhost>
date:      Wed Aug 14 17:02:07 2002 +0000

description:
Fix incorrect ## usage.

diffstat:

 sys/arch/playstation2/include/bus.h |  26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diffs (99 lines):

diff -r 7f9d8309e7dd -r 828d9e2e4d83 sys/arch/playstation2/include/bus.h
--- a/sys/arch/playstation2/include/bus.h       Wed Aug 14 16:28:16 2002 +0000
+++ b/sys/arch/playstation2/include/bus.h       Wed Aug 14 17:02:07 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus.h,v 1.2 2002/03/17 21:45:08 simonb Exp $   */
+/*     $NetBSD: bus.h,v 1.3 2002/08/14 17:02:07 kent Exp $     */
 
 /*-
  * Copyright (c) 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -329,7 +329,7 @@
 PREFIX##_read_##BYTES(void *tag, bus_space_handle_t bsh,               \
     bus_size_t offset)                                                 \
 {                                                                      \
-       return __read_##BYTES##(VADDR(bsh, offset));                    \
+       return __read_##BYTES(VADDR(bsh, offset));                      \
 }
 
 #define _BUS_SPACE_READ_MULTI(PREFIX, BYTES, BITS)                     \
@@ -342,7 +342,7 @@
 {                                                                      \
        bus_addr_t a = VADDR(bsh, offset);                              \
        while (count--)                                                 \
-               *addr++ = __read_##BYTES##(a);                          \
+               *addr++ = __read_##BYTES(a);                            \
 }
 
 #define _BUS_SPACE_READ_REGION(PREFIX, BYTES, BITS)                    \
@@ -354,7 +354,7 @@
     bus_size_t offset, __TYPENAME(BITS) *addr, bus_size_t count)       \
 {                                                                      \
        while (count--) {                                               \
-               *addr++ = __read_##BYTES##(VADDR(bsh, offset));         \
+               *addr++ = __read_##BYTES(VADDR(bsh, offset));           \
                offset += BYTES;                                        \
        }                                                               \
 }
@@ -367,7 +367,7 @@
 PREFIX##_write_##BYTES(void *tag, bus_space_handle_t bsh,              \
     bus_size_t offset, __TYPENAME(BITS) value)                         \
 {                                                                      \
-       __write_##BYTES##(VADDR(bsh, offset), value);                   \
+       __write_##BYTES(VADDR(bsh, offset), value);                     \
 }
 
 #define _BUS_SPACE_WRITE_MULTI(PREFIX, BYTES, BITS)                    \
@@ -380,7 +380,7 @@
 {                                                                      \
        bus_addr_t a = VADDR(bsh, offset);                              \
        while (count--) {                                               \
-               __write_##BYTES##(a, *addr++);                          \
+               __write_##BYTES(a, *addr++);                            \
        }                                                               \
 }
 
@@ -393,7 +393,7 @@
     bus_size_t offset, const __TYPENAME(BITS) *addr, bus_size_t count) \
 {                                                                      \
        while (count--) {                                               \
-               __write_##BYTES##(VADDR(bsh, offset), *addr++);         \
+               __write_##BYTES(VADDR(bsh, offset), *addr++);           \
                offset += BYTES;                                        \
        }                                                               \
 }
@@ -408,7 +408,7 @@
 {                                                                      \
        bus_addr_t a = VADDR(bsh, offset);                              \
        while (count--) {                                               \
-               __write_##BYTES##(a, value);                            \
+               __write_##BYTES(a, value);                              \
        }                                                               \
 }
 
@@ -421,7 +421,7 @@
     bus_size_t offset, __TYPENAME(BITS) value, bus_size_t count)       \
 {                                                                      \
        while (count--) {                                               \
-               __write_##BYTES##(VADDR(bsh, offset), value);           \
+               __write_##BYTES(VADDR(bsh, offset), value);             \
                offset += BYTES;                                        \
        }                                                               \
 }
@@ -438,13 +438,13 @@
        if ((h1 + o1) >= (h2 + o2)) {                                   \
                /* src after dest: copy forward */                      \
                for (o = 0; c != 0; c--, o += BYTES)                    \
-                       __write_##BYTES##(VADDR(h2, o2 + o),            \
-                           __read_##BYTES##(VADDR(h1, o1 + o)));       \
+                       __write_##BYTES(VADDR(h2, o2 + o),              \
+                           __read_##BYTES(VADDR(h1, o1 + o))); \
        } else {                                                        \
                /* dest after src: copy backwards */                    \
                for (o = (c - 1) * BYTES; c != 0; c--, o -= BYTES)      \
-                       __write_##BYTES##(VADDR(h2, o2 + o),            \
-                           __read_##BYTES##(VADDR(h1, o1 + o)));       \
+                       __write_##BYTES(VADDR(h2, o2 + o),              \
+                           __read_##BYTES(VADDR(h1, o1 + o))); \
        }                                                               \
 }
 



Home | Main Index | Thread Index | Old Index