[src/trunk]: src/sys/arch/sh3 Move the sh_memio_*() declarations back to sh3/...

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

details:   https://anonhg.NetBSD.org/src/rev/2d88ce80b693
branches:  trunk
changeset: 767636:2d88ce80b693
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Mon Jul 25 16:06:58 2011 +0000

description:
Move the sh_memio_*() declarations back to sh3/include/bus_funcs.h.
Should fix the mmeye build.

diffstat:

 sys/arch/sh3/include/bus_funcs.h |   9 ++++++++-
 sys/arch/sh3/sh3/sh3_machdep.c   |  10 ++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diffs (75 lines):

diff -r a4e86d3f68a5 -r 2d88ce80b693 sys/arch/sh3/include/bus_funcs.h
--- a/sys/arch/sh3/include/bus_funcs.h  Mon Jul 25 16:02:25 2011 +0000
+++ b/sys/arch/sh3/include/bus_funcs.h  Mon Jul 25 16:06:58 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_funcs.h,v 1.2 2011/07/20 21:30:13 dyoung Exp $     */
+/*     $NetBSD: bus_funcs.h,v 1.3 2011/07/25 16:06:58 dyoung Exp $     */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -78,6 +78,13 @@
     bus_size_t, bus_size_t, bus_space_handle_t *);
 #endif
 
+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 *);
+void sh_memio_free(bus_space_tag_t, bus_space_handle_t, bus_size_t);
+void sh_memio_unmap(bus_space_tag_t, bus_space_handle_t, bus_size_t);
+int sh_memio_subregion(bus_space_tag_t, bus_space_handle_t,
+    bus_size_t, bus_size_t, bus_space_handle_t *);
+
 /*
  * Bus read/write barrier methods.
  *
diff -r a4e86d3f68a5 -r 2d88ce80b693 sys/arch/sh3/sh3/sh3_machdep.c
--- a/sys/arch/sh3/sh3/sh3_machdep.c    Mon Jul 25 16:02:25 2011 +0000
+++ b/sys/arch/sh3/sh3/sh3_machdep.c    Mon Jul 25 16:06:58 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sh3_machdep.c,v 1.94 2011/07/25 16:02:25 dyoung Exp $  */
+/*     $NetBSD: sh3_machdep.c,v 1.95 2011/07/25 16:06:58 dyoung Exp $  */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sh3_machdep.c,v 1.94 2011/07/25 16:02:25 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sh3_machdep.c,v 1.95 2011/07/25 16:06:58 dyoung Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -708,8 +708,6 @@
  *
  * 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))
@@ -720,7 +718,6 @@
  *
  * 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))
@@ -731,7 +728,6 @@
  *
  * 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))
@@ -743,8 +739,6 @@
  *
  * 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))