Module Name: src Committed By: matt Date: Mon Jul 11 15:59:57 UTC 2011
Modified Files: src/sys/arch/arm/xscale: ixp425_pci_space.c Log Message: Remove inline from global routines To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/xscale/ixp425_pci_space.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/arm/xscale/ixp425_pci_space.c diff -u src/sys/arch/arm/xscale/ixp425_pci_space.c:1.9 src/sys/arch/arm/xscale/ixp425_pci_space.c:1.10 --- src/sys/arch/arm/xscale/ixp425_pci_space.c:1.9 Fri Jul 1 20:32:51 2011 +++ src/sys/arch/arm/xscale/ixp425_pci_space.c Mon Jul 11 15:59:56 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ixp425_pci_space.c,v 1.9 2011/07/01 20:32:51 dyoung Exp $ */ +/* $NetBSD: ixp425_pci_space.c,v 1.10 2011/07/11 15:59:56 matt Exp $ */ /* * Copyright (c) 2003 @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ixp425_pci_space.c,v 1.9 2011/07/01 20:32:51 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixp425_pci_space.c,v 1.10 2011/07/11 15:59:56 matt Exp $"); /* * bus_space PCI functions for ixp425 @@ -61,13 +61,13 @@ /* special I/O functions */ #if 1 /* XXX */ -inline u_int8_t _pci_io_bs_r_1(void *, bus_space_handle_t, bus_size_t); -inline u_int16_t _pci_io_bs_r_2(void *, bus_space_handle_t, bus_size_t); -inline u_int32_t _pci_io_bs_r_4(void *, bus_space_handle_t, bus_size_t); - -inline void _pci_io_bs_w_1(void *, bus_space_handle_t, bus_size_t, u_int8_t); -inline void _pci_io_bs_w_2(void *, bus_space_handle_t, bus_size_t, u_int16_t); -inline void _pci_io_bs_w_4(void *, bus_space_handle_t, bus_size_t, u_int32_t); +u_int8_t _pci_io_bs_r_1(void *, bus_space_handle_t, bus_size_t); +u_int16_t _pci_io_bs_r_2(void *, bus_space_handle_t, bus_size_t); +u_int32_t _pci_io_bs_r_4(void *, bus_space_handle_t, bus_size_t); + +void _pci_io_bs_w_1(void *, bus_space_handle_t, bus_size_t, u_int8_t); +void _pci_io_bs_w_2(void *, bus_space_handle_t, bus_size_t, u_int16_t); +void _pci_io_bs_w_4(void *, bus_space_handle_t, bus_size_t, u_int32_t); #endif struct bus_space ixp425_pci_bs_tag_template = { @@ -257,7 +257,7 @@ /* special I/O functions */ #if 1 /* _pci_io_bs_{rw}_{124} */ -inline u_int8_t +u_int8_t _pci_io_bs_r_1(void *v, bus_space_handle_t ioh, bus_size_t off) { u_int32_t data, n, be; @@ -277,7 +277,7 @@ return data >> (8 * n); } -inline u_int16_t +u_int16_t _pci_io_bs_r_2(void *v, bus_space_handle_t ioh, bus_size_t off) { u_int32_t data, n, be; @@ -297,7 +297,7 @@ return data >> (8 * n); } -inline u_int32_t +u_int32_t _pci_io_bs_r_4(void *v, bus_space_handle_t ioh, bus_size_t off) { u_int32_t data; @@ -314,7 +314,7 @@ return data; } -inline void +void _pci_io_bs_w_1(void *v, bus_space_handle_t ioh, bus_size_t off, u_int8_t val) { @@ -334,7 +334,7 @@ PCI_CONF_UNLOCK(s); } -inline void +void _pci_io_bs_w_2(void *v, bus_space_handle_t ioh, bus_size_t off, u_int16_t val) { @@ -354,7 +354,7 @@ PCI_CONF_UNLOCK(s); } -inline void +void _pci_io_bs_w_4(void *v, bus_space_handle_t ioh, bus_size_t off, u_int32_t val) {