Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/sparc/include bus space methods should be "static _...



details:   https://anonhg.NetBSD.org/src/rev/fdaa8513072f
branches:  trunk
changeset: 526604:fdaa8513072f
user:      uwe <uwe%NetBSD.org@localhost>
date:      Tue May 07 00:37:47 2002 +0000

description:
bus space methods should be "static __inline__", not "extern __inline__".
Otherwise an unoptimized kernel cannot be linked.  Reviewed by pk.

diffstat:

 sys/arch/sparc/include/bus.h |  363 +++++++++++++++++++++---------------------
 1 files changed, 183 insertions(+), 180 deletions(-)

diffs (truncated from 624 to 300 lines):

diff -r 3d62500be68d -r fdaa8513072f sys/arch/sparc/include/bus.h
--- a/sys/arch/sparc/include/bus.h      Mon May 06 23:38:47 2002 +0000
+++ b/sys/arch/sparc/include/bus.h      Tue May 07 00:37:47 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus.h,v 1.30 2002/04/23 07:17:29 pk Exp $      */
+/*     $NetBSD: bus.h,v 1.31 2002/05/07 00:37:47 uwe Exp $     */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -211,7 +211,7 @@
                t = t->parent;          \
        return (*(t)->f)
 
-__inline__ int
+static __inline__ int
 bus_space_map(t, a, s, f, hp)
        bus_space_tag_t t;
        bus_addr_t      a;
@@ -222,7 +222,7 @@
        _BS_CALL(t, sparc_bus_map)(t, a, s, f, 0, hp);
 }
 
-__inline__ int
+static __inline__ int
 bus_space_map2(t, a, s, f, v, hp)
        bus_space_tag_t t;
        bus_addr_t      a;
@@ -234,7 +234,7 @@
        _BS_CALL(t, sparc_bus_map)(t, a, s, f, v, hp);
 }
 
-__inline__ int
+static __inline__ int
 bus_space_unmap(t, h, s)
        bus_space_tag_t t;
        bus_space_handle_t h;
@@ -243,7 +243,7 @@
        _BS_CALL(t, sparc_bus_unmap)(t, h, s);
 }
 
-__inline__ int
+static __inline__ int
 bus_space_subregion(t, h, o, s, hp)
        bus_space_tag_t t;
        bus_space_handle_t h;
@@ -254,7 +254,7 @@
        _BS_CALL(t, sparc_bus_subregion)(t, h, o, s, hp);
 }
 
-__inline__ paddr_t
+static __inline__ paddr_t
 bus_space_mmap(t, a, o, p, f)
        bus_space_tag_t t;
        bus_addr_t      a;
@@ -265,7 +265,7 @@
        _BS_CALL(t, sparc_bus_mmap)(t, a, o, p, f);
 }
 
-__inline__ void *
+static __inline__ void *
 bus_intr_establish(t, p, l, f, h, a)
        bus_space_tag_t t;
        int     p;
@@ -277,7 +277,7 @@
        _BS_CALL(t, sparc_intr_establish)(t, p, l, f, h, a);
 }
 
-__inline__ void
+static __inline__ void
 bus_space_barrier(t, h, o, s, f)
        bus_space_tag_t t;
        bus_space_handle_t h;
@@ -400,31 +400,31 @@
  * described by tag/handle/offset and copy into buffer provided.
  */
 
-void bus_space_read_multi_1 __P((bus_space_tag_t,
-                                bus_space_handle_t,
-                                bus_size_t,
-                                u_int8_t *,
-                                bus_size_t));
+static void bus_space_read_multi_1 __P((bus_space_tag_t,
+                                       bus_space_handle_t,
+                                       bus_size_t,
+                                       u_int8_t *,
+                                       bus_size_t));
 
-void bus_space_read_multi_2 __P((bus_space_tag_t,
-                                bus_space_handle_t,
-                                bus_size_t,
-                                u_int16_t *,
-                                bus_size_t));
+static void bus_space_read_multi_2 __P((bus_space_tag_t,
+                                       bus_space_handle_t,
+                                       bus_size_t,
+                                       u_int16_t *,
+                                       bus_size_t));
 
-void bus_space_read_multi_4 __P((bus_space_tag_t,
-                                bus_space_handle_t,
-                                bus_size_t,
-                                u_int32_t *,
-                                bus_size_t));
+static void bus_space_read_multi_4 __P((bus_space_tag_t,
+                                       bus_space_handle_t,
+                                       bus_size_t,
+                                       u_int32_t *,
+                                       bus_size_t));
 
-void bus_space_read_multi_8 __P((bus_space_tag_t,
-                                bus_space_handle_t,
-                                bus_size_t,
-                                u_int64_t *,
-                                bus_size_t));
+static void bus_space_read_multi_8 __P((bus_space_tag_t,
+                                       bus_space_handle_t,
+                                       bus_size_t,
+                                       u_int64_t *,
+                                       bus_size_t));
 
-extern __inline__ void
+static __inline__ void
 bus_space_read_multi_1(t, h, o, a, c)
        bus_space_tag_t         t;
        bus_space_handle_t      h;
@@ -435,7 +435,7 @@
                *a++ = bus_space_read_1(t, h, o);
 }
 
-extern __inline__ void
+static __inline__ void
 bus_space_read_multi_2(t, h, o, a, c)
        bus_space_tag_t         t;
        bus_space_handle_t      h;
@@ -446,7 +446,7 @@
                *a++ = bus_space_read_2(t, h, o);
 }
 
-extern __inline__ void
+static __inline__ void
 bus_space_read_multi_4(t, h, o, a, c)
        bus_space_tag_t         t;
        bus_space_handle_t      h;
@@ -457,7 +457,7 @@
                *a++ = bus_space_read_4(t, h, o);
 }
 
-extern __inline__ void
+static __inline__ void
 bus_space_read_multi_8(t, h, o, a, c)
        bus_space_tag_t         t;
        bus_space_handle_t      h;
@@ -482,27 +482,27 @@
  * Write `count' 1, 2, 4, or 8 byte quantities from the buffer
  * provided to bus space described by tag/handle/offset.
  */
-void bus_space_write_multi_1 __P((bus_space_tag_t,
-                                 bus_space_handle_t,
-                                 bus_size_t,
-                                 const u_int8_t *,
-                                 bus_size_t));
-void bus_space_write_multi_2 __P((bus_space_tag_t,
-                                 bus_space_handle_t,
-                                 bus_size_t,
-                                 const u_int16_t *,
-                                 bus_size_t));
-void bus_space_write_multi_4 __P((bus_space_tag_t,
-                                 bus_space_handle_t,
-                                 bus_size_t,
-                                 const u_int32_t *,
-                                 bus_size_t));
-void bus_space_write_multi_8 __P((bus_space_tag_t,
-                                 bus_space_handle_t,
-                                 bus_size_t,
-                                 const u_int64_t *,
-                                 bus_size_t));
-extern __inline__ void
+static void bus_space_write_multi_1 __P((bus_space_tag_t,
+                                        bus_space_handle_t,
+                                        bus_size_t,
+                                        const u_int8_t *,
+                                        bus_size_t));
+static void bus_space_write_multi_2 __P((bus_space_tag_t,
+                                        bus_space_handle_t,
+                                        bus_size_t,
+                                        const u_int16_t *,
+                                        bus_size_t));
+static void bus_space_write_multi_4 __P((bus_space_tag_t,
+                                        bus_space_handle_t,
+                                        bus_size_t,
+                                        const u_int32_t *,
+                                        bus_size_t));
+static void bus_space_write_multi_8 __P((bus_space_tag_t,
+                                        bus_space_handle_t,
+                                        bus_size_t,
+                                        const u_int64_t *,
+                                        bus_size_t));
+static __inline__ void
 bus_space_write_multi_1(t, h, o, a, c)
        bus_space_tag_t         t;
        bus_space_handle_t      h;
@@ -513,7 +513,7 @@
                bus_space_write_1(t, h, o, *a++);
 }
 
-extern __inline__ void
+static __inline__ void
 bus_space_write_multi_2(t, h, o, a, c)
        bus_space_tag_t         t;
        bus_space_handle_t      h;
@@ -524,7 +524,7 @@
                bus_space_write_2(t, h, o, *a++);
 }
 
-extern __inline__ void
+static __inline__ void
 bus_space_write_multi_4(t, h, o, a, c)
        bus_space_tag_t         t;
        bus_space_handle_t      h;
@@ -535,7 +535,7 @@
                bus_space_write_4(t, h, o, *a++);
 }
 
-extern __inline__ void
+static __inline__ void
 bus_space_write_multi_8(t, h, o, a, c)
        bus_space_tag_t         t;
        bus_space_handle_t      h;
@@ -560,28 +560,28 @@
  * Write the 1, 2, 4, or 8 byte value `val' to bus space described
  * by tag/handle/offset `count' times.
  */
-void bus_space_set_multi_1 __P((bus_space_tag_t,
-                               bus_space_handle_t,
-                               bus_size_t,
-                               const u_int8_t,
-                               bus_size_t));
-void bus_space_set_multi_2 __P((bus_space_tag_t,
-                               bus_space_handle_t,
-                               bus_size_t,
-                               const u_int16_t,
-                               bus_size_t));
-void bus_space_set_multi_4 __P((bus_space_tag_t,
-                               bus_space_handle_t,
-                               bus_size_t,
-                               const u_int32_t,
-                               bus_size_t));
-void bus_space_set_multi_8 __P((bus_space_tag_t,
-                               bus_space_handle_t,
-                               bus_size_t,
-                               const u_int64_t,
-                               bus_size_t));
+static void bus_space_set_multi_1 __P((bus_space_tag_t,
+                                      bus_space_handle_t,
+                                      bus_size_t,
+                                      const u_int8_t,
+                                      bus_size_t));
+static void bus_space_set_multi_2 __P((bus_space_tag_t,
+                                      bus_space_handle_t,
+                                      bus_size_t,
+                                      const u_int16_t,
+                                      bus_size_t));
+static void bus_space_set_multi_4 __P((bus_space_tag_t,
+                                      bus_space_handle_t,
+                                      bus_size_t,
+                                      const u_int32_t,
+                                      bus_size_t));
+static void bus_space_set_multi_8 __P((bus_space_tag_t,
+                                      bus_space_handle_t,
+                                      bus_size_t,
+                                      const u_int64_t,
+                                      bus_size_t));
 
-extern __inline__ void
+static __inline__ void
 bus_space_set_multi_1(t, h, o, v, c)
        bus_space_tag_t         t;
        bus_space_handle_t      h;
@@ -592,7 +592,7 @@
                bus_space_write_1(t, h, o, v);
 }
 
-extern __inline__ void
+static __inline__ void
 bus_space_set_multi_2(t, h, o, v, c)
        bus_space_tag_t         t;
        bus_space_handle_t      h;
@@ -603,7 +603,7 @@
                bus_space_write_2(t, h, o, v);
 }
 
-extern __inline__ void
+static __inline__ void
 bus_space_set_multi_4(t, h, o, v, c)
        bus_space_tag_t         t;
        bus_space_handle_t      h;
@@ -614,7 +614,7 @@
                bus_space_write_4(t, h, o, v);
 }
 



Home | Main Index | Thread Index | Old Index