Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/alpha change inline to static inline to appease gcc...
details: https://anonhg.NetBSD.org/src/rev/f7d29776b5fa
branches: trunk
changeset: 769882:f7d29776b5fa
user: chs <chs%NetBSD.org@localhost>
date: Sun Sep 25 13:36:53 2011 +0000
description:
change inline to static inline to appease gcc 4.5.
diffstat:
sys/arch/alpha/jensenio/jensenio_bus_intio.c | 16 +++++-----
sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c | 40 ++++++++++++------------
sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c | 40 ++++++++++++------------
sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c | 40 ++++++++++++------------
sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c | 42 +++++++++++++-------------
sys/arch/alpha/tc/tc_bus_mem.c | 40 ++++++++++++------------
6 files changed, 109 insertions(+), 109 deletions(-)
diffs (truncated from 774 to 300 lines):
diff -r fe70956128de -r f7d29776b5fa sys/arch/alpha/jensenio/jensenio_bus_intio.c
--- a/sys/arch/alpha/jensenio/jensenio_bus_intio.c Sun Sep 25 13:34:54 2011 +0000
+++ b/sys/arch/alpha/jensenio/jensenio_bus_intio.c Sun Sep 25 13:36:53 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: jensenio_bus_intio.c,v 1.3 2011/07/01 19:22:35 dyoung Exp $ */
+/* $NetBSD: jensenio_bus_intio.c,v 1.4 2011/09/25 13:36:53 chs Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: jensenio_bus_intio.c,v 1.3 2011/07/01 19:22:35 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jensenio_bus_intio.c,v 1.4 2011/09/25 13:36:53 chs Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -60,11 +60,11 @@
/* Not supported for Internal space */
/* barrier */
-inline void jensenio_intio_barrier(void *, bus_space_handle_t,
+static inline void jensenio_intio_barrier(void *, bus_space_handle_t,
bus_size_t, bus_size_t, int);
/* read (single) */
-inline u_int8_t jensenio_intio_read_1(void *, bus_space_handle_t, bus_size_t);
+static inline u_int8_t jensenio_intio_read_1(void *, bus_space_handle_t, bus_size_t);
/* read multiple */
void jensenio_intio_read_multi_1(void *, bus_space_handle_t,
@@ -74,7 +74,7 @@
/* Not supported for Internal space */
/* write (single) */
-inline void jensenio_intio_write_1(void *, bus_space_handle_t,
+static inline void jensenio_intio_write_1(void *, bus_space_handle_t,
bus_size_t, u_int8_t);
/* write multiple */
@@ -211,7 +211,7 @@
return (0);
}
-inline void
+static inline void
jensenio_intio_barrier(void *v, bus_space_handle_t h, bus_size_t o,
bus_size_t l, int f)
{
@@ -222,7 +222,7 @@
alpha_wmb();
}
-inline u_int8_t
+static inline u_int8_t
jensenio_intio_read_1(void *v, bus_space_handle_t ioh, bus_size_t off)
{
register u_int32_t *port;
@@ -245,7 +245,7 @@
}
}
-inline void
+static inline void
jensenio_intio_write_1(void *v, bus_space_handle_t ioh, bus_size_t off,
u_int8_t val)
{
diff -r fe70956128de -r f7d29776b5fa sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c
--- a/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c Sun Sep 25 13:34:54 2011 +0000
+++ b/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c Sun Sep 25 13:36:53 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_bwx_bus_io_chipdep.c,v 1.18 2009/03/14 14:45:53 dsl Exp $ */
+/* $NetBSD: pci_bwx_bus_io_chipdep.c,v 1.19 2011/09/25 13:36:53 chs Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: pci_bwx_bus_io_chipdep.c,v 1.18 2009/03/14 14:45:53 dsl Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pci_bwx_bus_io_chipdep.c,v 1.19 2011/09/25 13:36:53 chs Exp $");
#include <sys/extent.h>
@@ -112,17 +112,17 @@
paddr_t __C(CHIP,_io_mmap)(void *, bus_addr_t, off_t, int, int);
/* barrier */
-inline void __C(CHIP,_io_barrier)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_io_barrier)(void *, bus_space_handle_t,
bus_size_t, bus_size_t, int);
/* read (single) */
-inline u_int8_t __C(CHIP,_io_read_1)(void *, bus_space_handle_t,
+static inline u_int8_t __C(CHIP,_io_read_1)(void *, bus_space_handle_t,
bus_size_t);
-inline u_int16_t __C(CHIP,_io_read_2)(void *, bus_space_handle_t,
+static inline u_int16_t __C(CHIP,_io_read_2)(void *, bus_space_handle_t,
bus_size_t);
-inline u_int32_t __C(CHIP,_io_read_4)(void *, bus_space_handle_t,
+static inline u_int32_t __C(CHIP,_io_read_4)(void *, bus_space_handle_t,
bus_size_t);
-inline u_int64_t __C(CHIP,_io_read_8)(void *, bus_space_handle_t,
+static inline u_int64_t __C(CHIP,_io_read_8)(void *, bus_space_handle_t,
bus_size_t);
/* read multiple */
@@ -146,13 +146,13 @@
bus_size_t, u_int64_t *, bus_size_t);
/* write (single) */
-inline void __C(CHIP,_io_write_1)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_io_write_1)(void *, bus_space_handle_t,
bus_size_t, u_int8_t);
-inline void __C(CHIP,_io_write_2)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_io_write_2)(void *, bus_space_handle_t,
bus_size_t, u_int16_t);
-inline void __C(CHIP,_io_write_4)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_io_write_4)(void *, bus_space_handle_t,
bus_size_t, u_int32_t);
-inline void __C(CHIP,_io_write_8)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_io_write_8)(void *, bus_space_handle_t,
bus_size_t, u_int64_t);
/* write multiple */
@@ -530,7 +530,7 @@
return (-1);
}
-inline void
+static inline void
__C(CHIP,_io_barrier)(v, h, o, l, f)
void *v;
bus_space_handle_t h;
@@ -544,7 +544,7 @@
alpha_wmb();
}
-inline u_int8_t
+static inline u_int8_t
__C(CHIP,_io_read_1)(v, ioh, off)
void *v;
bus_space_handle_t ioh;
@@ -557,7 +557,7 @@
return (alpha_ldbu((u_int8_t *)addr));
}
-inline u_int16_t
+static inline u_int16_t
__C(CHIP,_io_read_2)(v, ioh, off)
void *v;
bus_space_handle_t ioh;
@@ -575,7 +575,7 @@
return (alpha_ldwu((u_int16_t *)addr));
}
-inline u_int32_t
+static inline u_int32_t
__C(CHIP,_io_read_4)(v, ioh, off)
void *v;
bus_space_handle_t ioh;
@@ -593,7 +593,7 @@
return (*(u_int32_t *)addr);
}
-inline u_int64_t
+static inline u_int64_t
__C(CHIP,_io_read_8)(v, ioh, off)
void *v;
bus_space_handle_t ioh;
@@ -643,7 +643,7 @@
CHIP_io_read_region_N(4,u_int32_t)
CHIP_io_read_region_N(8,u_int64_t)
-inline void
+static inline void
__C(CHIP,_io_write_1)(v, ioh, off, val)
void *v;
bus_space_handle_t ioh;
@@ -657,7 +657,7 @@
alpha_mb();
}
-inline void
+static inline void
__C(CHIP,_io_write_2)(v, ioh, off, val)
void *v;
bus_space_handle_t ioh;
@@ -676,7 +676,7 @@
alpha_mb();
}
-inline void
+static inline void
__C(CHIP,_io_write_4)(v, ioh, off, val)
void *v;
bus_space_handle_t ioh;
@@ -695,7 +695,7 @@
alpha_mb();
}
-inline void
+static inline void
__C(CHIP,_io_write_8)(v, ioh, off, val)
void *v;
bus_space_handle_t ioh;
diff -r fe70956128de -r f7d29776b5fa sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c
--- a/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c Sun Sep 25 13:34:54 2011 +0000
+++ b/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c Sun Sep 25 13:36:53 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_bwx_bus_mem_chipdep.c,v 1.22 2009/03/14 14:45:53 dsl Exp $ */
+/* $NetBSD: pci_bwx_bus_mem_chipdep.c,v 1.23 2011/09/25 13:36:53 chs Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: pci_bwx_bus_mem_chipdep.c,v 1.22 2009/03/14 14:45:53 dsl Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pci_bwx_bus_mem_chipdep.c,v 1.23 2011/09/25 13:36:53 chs Exp $");
#include <sys/extent.h>
@@ -112,17 +112,17 @@
paddr_t __C(CHIP,_mem_mmap)(void *, bus_addr_t, off_t, int, int);
/* barrier */
-inline void __C(CHIP,_mem_barrier)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_mem_barrier)(void *, bus_space_handle_t,
bus_size_t, bus_size_t, int);
/* read (single) */
-inline u_int8_t __C(CHIP,_mem_read_1)(void *, bus_space_handle_t,
+static inline u_int8_t __C(CHIP,_mem_read_1)(void *, bus_space_handle_t,
bus_size_t);
-inline u_int16_t __C(CHIP,_mem_read_2)(void *, bus_space_handle_t,
+static inline u_int16_t __C(CHIP,_mem_read_2)(void *, bus_space_handle_t,
bus_size_t);
-inline u_int32_t __C(CHIP,_mem_read_4)(void *, bus_space_handle_t,
+static inline u_int32_t __C(CHIP,_mem_read_4)(void *, bus_space_handle_t,
bus_size_t);
-inline u_int64_t __C(CHIP,_mem_read_8)(void *, bus_space_handle_t,
+static inline u_int64_t __C(CHIP,_mem_read_8)(void *, bus_space_handle_t,
bus_size_t);
/* read multiple */
@@ -146,13 +146,13 @@
bus_size_t, u_int64_t *, bus_size_t);
/* write (single) */
-inline void __C(CHIP,_mem_write_1)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_mem_write_1)(void *, bus_space_handle_t,
bus_size_t, u_int8_t);
-inline void __C(CHIP,_mem_write_2)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_mem_write_2)(void *, bus_space_handle_t,
bus_size_t, u_int16_t);
-inline void __C(CHIP,_mem_write_4)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_mem_write_4)(void *, bus_space_handle_t,
bus_size_t, u_int32_t);
-inline void __C(CHIP,_mem_write_8)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_mem_write_8)(void *, bus_space_handle_t,
bus_size_t, u_int64_t);
/* write multiple */
@@ -498,7 +498,7 @@
return (alpha_btop(CHIP_MEM_SYS_START(v) + addr + off));
}
-inline void
+static inline void
__C(CHIP,_mem_barrier)(v, h, o, l, f)
void *v;
bus_space_handle_t h;
@@ -512,7 +512,7 @@
alpha_wmb();
}
-inline u_int8_t
+static inline u_int8_t
__C(CHIP,_mem_read_1)(v, memh, off)
void *v;
bus_space_handle_t memh;
@@ -525,7 +525,7 @@
return (alpha_ldbu((u_int8_t *)addr));
}
-inline u_int16_t
+static inline u_int16_t
__C(CHIP,_mem_read_2)(v, memh, off)
void *v;
bus_space_handle_t memh;
@@ -543,7 +543,7 @@
return (alpha_ldwu((u_int16_t *)addr));
}
-inline u_int32_t
+static inline u_int32_t
Home |
Main Index |
Thread Index |
Old Index