Replace sys/io.h with rte_io.h, Get rid of ifdef X86 clutter Signed-off-by: Santosh Shukla <sshukla at mvista.com> --- drivers/net/virtio/virtio_pci.h | 4 --- lib/librte_eal/common/include/arch/x86/rte_io.h | 42 +++++++++++++++++++++++ lib/librte_eal/linuxapp/eal/eal.c | 4 +-- 3 files changed, 43 insertions(+), 7 deletions(-) create mode 100644 lib/librte_eal/common/include/arch/x86/rte_io.h
diff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h index f3e4178..c51d980 100644 --- a/drivers/net/virtio/virtio_pci.h +++ b/drivers/net/virtio/virtio_pci.h @@ -40,12 +40,8 @@ #include <sys/types.h> #include <machine/cpufunc.h> #else -#if defined(RTE_ARCH_X86_64) || defined(RTE_ARCH_I686) -#include <sys/io.h> -#else #include <rte_io.h> #endif -#endif #include <rte_ethdev.h> diff --git a/lib/librte_eal/common/include/arch/x86/rte_io.h b/lib/librte_eal/common/include/arch/x86/rte_io.h new file mode 100644 index 0000000..ffd6888 --- /dev/null +++ b/lib/librte_eal/common/include/arch/x86/rte_io.h @@ -0,0 +1,42 @@ +/* + * BSD LICENSE + * + * Copyright(c) 2015 Cavium Networks. All rights reserved. + * All rights reserved. + * + * Copyright(c) 2010-2015 Intel Corporation. All rights reserved. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _RTE_IO_X86_H_ +#define _RTE_IO_X86_H_ + +#include "generic/rte_io.h" + +#endif /* _RTE_IO_X86_H_ */ diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c index 2617037..29950f3 100644 --- a/lib/librte_eal/linuxapp/eal/eal.c +++ b/lib/librte_eal/linuxapp/eal/eal.c @@ -49,9 +49,7 @@ #include <errno.h> #include <sys/mman.h> #include <sys/queue.h> -#if defined(RTE_ARCH_X86_64) || defined(RTE_ARCH_I686) -#include <sys/io.h> -#endif +#include <rte_io.h> #include <rte_common.h> #include <rte_debug.h> -- 1.7.9.5