[src/trunk]: src/sys/arch/sh3 Remove redundant, static inline bus_space(9) de...

[dyoung <dyoung%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4904af56f355
branches:  trunk
changeset: 767524:4904af56f355
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Wed Jul 20 21:30:13 2011 +0000

description:
Remove redundant, static inline bus_space(9) declarations
from sh3/bus_funcs.h and move the non-inline definitions to
sh3/sh3_machdep.c.

diffstat:

 sys/arch/sh3/include/bus_funcs.h |  693 +--------------------------------------
 sys/arch/sh3/sh3/sh3_machdep.c   |  585 ++++++++++++++++++++++++++++++++-
 2 files changed, 584 insertions(+), 694 deletions(-)

diffs (truncated from 1317 to 300 lines):

diff -r 4ce1df811c66 -r 4904af56f355 sys/arch/sh3/include/bus_funcs.h
--- a/sys/arch/sh3/include/bus_funcs.h  Wed Jul 20 21:08:30 2011 +0000
+++ b/sys/arch/sh3/include/bus_funcs.h  Wed Jul 20 21:30:13 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_funcs.h,v 1.1 2011/07/01 17:10:01 dyoung Exp $     */
+/*     $NetBSD: bus_funcs.h,v 1.2 2011/07/20 21:30:13 dyoung Exp $     */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -64,9 +64,6 @@
 #ifndef _SH3_BUS_FUNCS_H_
 #define        _SH3_BUS_FUNCS_H_
 
-int bus_space_map(bus_space_tag_t, bus_addr_t, bus_size_t size,
-    int, bus_space_handle_t *);
-
 #ifdef SH4_PCMCIA
 int shpcmcia_memio_map(bus_space_tag_t, bus_addr_t, bus_size_t size,
     int, bus_space_handle_t *);
@@ -82,694 +79,6 @@
 #endif
 
 /*
- *     u_intN_t bus_space_read_N(bus_space_tag_t tag,
- *         bus_space_handle_t bsh, bus_size_t offset);
- *
- * Read a 1, 2, 4, or 8 byte quantity from bus space
- * described by tag/handle/offset.
- */
-static __inline uint8_t bus_space_read_1
-       (bus_space_tag_t, bus_space_handle_t, bus_size_t);
-static __inline uint16_t bus_space_read_2
-       (bus_space_tag_t, bus_space_handle_t, bus_size_t);
-static __inline uint32_t bus_space_read_4
-       (bus_space_tag_t, bus_space_handle_t, bus_size_t);
-
-uint8_t
-bus_space_read_1(bus_space_tag_t tag, bus_space_handle_t bsh,
-    bus_size_t offset)
-{
-
-       return *(volatile uint8_t *)(bsh + offset);
-}
-
-uint16_t
-bus_space_read_2(bus_space_tag_t tag, bus_space_handle_t bsh,
-    bus_size_t offset)
-{
-
-       return bswap16(*(volatile uint16_t *)(bsh + offset));
-}
-
-uint32_t
-bus_space_read_4(bus_space_tag_t tag, bus_space_handle_t bsh,
-    bus_size_t offset)
-{
-
-       return bswap32(*(volatile uint32_t *)(bsh + offset));
-}
-
-static __inline uint16_t bus_space_read_stream_2
-       (bus_space_tag_t, bus_space_handle_t, bus_size_t);
-
-static __inline uint32_t bus_space_read_stream_4
-       (bus_space_tag_t, bus_space_handle_t, bus_size_t);
-
-uint16_t
-bus_space_read_stream_2(bus_space_tag_t tag, bus_space_handle_t bsh,
-    bus_size_t offset)
-{
-
-       return *(volatile uint16_t *)(bsh + offset);
-}
-
-uint32_t
-bus_space_read_stream_4(bus_space_tag_t tag, bus_space_handle_t bsh,
-    bus_size_t offset)
-{
-
-       return *(volatile uint32_t *)(bsh + offset);
-}
-
-/*
- *     void bus_space_read_multi_N(bus_space_tag_t tag,
- *         bus_space_handle_t bsh, bus_size_t offset,
- *         u_intN_t *addr, size_t count);
- *
- * 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,
-    bus_space_handle_t, bus_size_t, uint8_t *, bus_size_t);
-static __inline void bus_space_read_multi_2(bus_space_tag_t,
-    bus_space_handle_t, bus_size_t, uint16_t *, bus_size_t);
-static __inline void bus_space_read_multi_4(bus_space_tag_t,
-    bus_space_handle_t, bus_size_t, uint32_t *, bus_size_t);
-
-void
-bus_space_read_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh,
-    bus_size_t offset, uint8_t *addr, bus_size_t count)
-{
-
-       while (count--)
-               *addr++ = bus_space_read_1(tag, bsh, offset);
-}
-
-void
-bus_space_read_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh,
-    bus_size_t offset, uint16_t *addr, bus_size_t count)
-{
-
-       while (count--)
-               *addr++ = bus_space_read_2(tag, bsh, offset);
-}
-
-void
-bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh,
-    bus_size_t offset, uint32_t *addr, bus_size_t count)
-{
-
-       while (count--)
-               *addr++ = bus_space_read_4(tag, bsh, offset);
-}
-
-static __inline void bus_space_read_multi_stream_2(bus_space_tag_t,
-    bus_space_handle_t, bus_size_t, uint16_t *, bus_size_t);
-static __inline void bus_space_read_multi_stream_4(bus_space_tag_t,
-    bus_space_handle_t, bus_size_t, uint32_t *, bus_size_t);
-
-void
-bus_space_read_multi_stream_2(bus_space_tag_t tag, bus_space_handle_t bsh,
-    bus_size_t offset, uint16_t *addr, bus_size_t count)
-{
-
-       while (count--)
-               *addr++ = *(volatile uint16_t *)(bsh + offset);
-}
-
-void
-bus_space_read_multi_stream_4(bus_space_tag_t tag, bus_space_handle_t bsh,
-    bus_size_t offset, uint32_t *addr, bus_size_t count)
-{
-
-       while (count--)
-               *addr++ = *(volatile uint32_t *)(bsh + offset);
-}
-
-/*
- *     int bus_space_alloc(bus_space_tag_t t, bus_addr_t rstart,
- *         bus_addr_t rend, bus_size_t size, bus_size_t align,
- *         bus_size_t boundary, int flags, bus_addr_t *addrp,
- *         bus_space_handle_t *bshp);
- *
- * Allocate a region of bus space.
- */
-int sh_memio_alloc(bus_space_tag_t, bus_addr_t, bus_addr_t, bus_size_t,
-    bus_size_t, bus_size_t, int, bus_addr_t *, bus_space_handle_t *);
-
-#define        bus_space_alloc(t, rs, re, s, a, b, f, ap, hp)                  \
-       sh_memio_alloc((t), (rs), (re), (s), (a), (b), (f), (ap), (hp))
-
-/*
- *     int bus_space_free(bus_space_tag_t t,
- *         bus_space_handle_t bsh, bus_size_t size);
- *
- * Free a region of bus space.
- */
-void sh_memio_free(bus_space_tag_t, bus_space_handle_t, bus_size_t);
-
-#define        bus_space_free(t, h, s)                                         \
-       sh_memio_free((t), (h), (s))
-
-/*
- *     int bus_space_unmap(bus_space_tag_t t,
- *         bus_space_handle_t bsh, bus_size_t size);
- *
- * Unmap a region of bus space.
- */
-void sh_memio_unmap(bus_space_tag_t, bus_space_handle_t, bus_size_t);
-
-#define        bus_space_unmap(t, h, s)                                        \
-       sh_memio_unmap((t), (h), (s))
-
-/*
- *     int bus_space_subregion(bus_space_tag_t t,
- *         bus_space_handle_t bsh, bus_size_t offset, bus_size_t size,
- *         bus_space_handle_t *nbshp);
- *
- * Get a new handle for a subregion of an already-mapped area of bus space.
- */
-int sh_memio_subregion(bus_space_tag_t, bus_space_handle_t,
-    bus_size_t, bus_size_t, bus_space_handle_t *);
-
-#define        bus_space_subregion(t, h, o, s, nhp)                            \
-       sh_memio_subregion((t), (h), (o), (s), (nhp))
-
-/*
- *     void bus_space_read_region_N(bus_space_tag_t tag,
- *         bus_space_handle_t bsh, bus_size_t offset,
- *         u_intN_t *addr, size_t count);
- *
- * 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,
-    bus_space_handle_t, bus_size_t, uint8_t *, bus_size_t);
-static __inline void bus_space_read_region_2(bus_space_tag_t,
-    bus_space_handle_t, bus_size_t, uint16_t *, bus_size_t);
-static __inline void bus_space_read_region_4(bus_space_tag_t,
-    bus_space_handle_t, bus_size_t, uint32_t *, bus_size_t);
-
-void
-bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh,
-    bus_size_t offset, uint8_t *addr, bus_size_t count)
-{
-       uint8_t *p = (uint8_t *)(bsh + offset);
-
-       while (count--)
-               *addr++ = *p++;
-}
-
-void
-bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh,
-    bus_size_t offset, uint16_t *addr, bus_size_t count)
-{
-       uint16_t *p = (uint16_t *)(bsh + offset);
-
-       while (count--)
-               *addr++ = bswap16(*p++);
-}
-
-void
-bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh,
-    bus_size_t offset, uint32_t *addr, bus_size_t count)
-{
-       uint32_t *p = (uint32_t *)(bsh + offset);
-
-       while (count--)
-               *addr++ = bswap32(*p++);
-}
-
-/*
- *     void bus_space_read_region_stream_N(bus_space_tag_t tag,
- *         bus_space_handle_t bsh, bus_size_t offset,
- *         u_intN_t *addr, size_t count);
- *
- * 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_stream_1(bus_space_tag_t,
-    bus_space_handle_t, bus_size_t, uint8_t *, bus_size_t);
-static __inline void bus_space_read_region_stream_2(bus_space_tag_t,
-    bus_space_handle_t, bus_size_t, uint16_t *, bus_size_t);
-static __inline void bus_space_read_region_stream_4(bus_space_tag_t,
-    bus_space_handle_t, bus_size_t, uint32_t *, bus_size_t);
-
-void
-bus_space_read_region_stream_1(bus_space_tag_t tag, bus_space_handle_t bsh,
-    bus_size_t offset, uint8_t *addr, bus_size_t count)
-{
-       uint8_t *p = (uint8_t *)(bsh + offset);
-
-       while (count--)
-               *addr++ = *p++;
-}
-
-void
-bus_space_read_region_stream_2(bus_space_tag_t tag, bus_space_handle_t bsh,
-    bus_size_t offset, uint16_t *addr, bus_size_t count)
-{
-       uint16_t *p = (uint16_t *)(bsh + offset);
-
-       while (count--)
-               *addr++ = *p++;
-}
-
-void
-bus_space_read_region_stream_4(bus_space_tag_t tag, bus_space_handle_t bsh,
-    bus_size_t offset, uint32_t *addr, bus_size_t count)
-{
-       uint32_t *p = (uint32_t *)(bsh + offset);
-
-       while (count--)
-               *addr++ = *p++;
-}
-
-/*
- *     void bus_space_write_region_N(bus_space_tag_t tag,
- *         bus_space_handle_t bsh, bus_size_t offset,
- *         const u_intN_t *addr, size_t count);
- *
- * 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,
-    bus_space_handle_t, bus_size_t, const uint8_t *, bus_size_t);
-static __inline void bus_space_write_region_2(bus_space_tag_t,
-    bus_space_handle_t, bus_size_t, const uint16_t *, bus_size_t);