From 7190005abb07d1142802edde357cfbe0fe07cc54 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 2 Jan 2018 11:42:48 +0100 Subject: sparc: Move Update #3254. Update #3260. --- c/src/lib/libcpu/sparc/Makefile.am | 1 - c/src/lib/libcpu/sparc/include/libcpu/byteorder.h | 66 ----------------------- c/src/lib/libcpu/sparc/preinstall.am | 4 -- cpukit/score/cpu/sparc/Makefile.am | 3 ++ cpukit/score/cpu/sparc/include/libcpu/byteorder.h | 66 +++++++++++++++++++++++ cpukit/score/cpu/sparc/preinstall.am | 9 ++++ 6 files changed, 78 insertions(+), 71 deletions(-) delete mode 100644 c/src/lib/libcpu/sparc/include/libcpu/byteorder.h create mode 100644 cpukit/score/cpu/sparc/include/libcpu/byteorder.h diff --git a/c/src/lib/libcpu/sparc/Makefile.am b/c/src/lib/libcpu/sparc/Makefile.am index f9872214f4..67a35ee4b8 100644 --- a/c/src/lib/libcpu/sparc/Makefile.am +++ b/c/src/lib/libcpu/sparc/Makefile.am @@ -6,7 +6,6 @@ noinst_PROGRAMS = include_libcpudir = $(includedir)/libcpu include_libcpu_HEADERS = -include_libcpu_HEADERS += include/libcpu/byteorder.h include_libcpu_HEADERS += include/libcpu/access.h noinst_PROGRAMS += cache.rel diff --git a/c/src/lib/libcpu/sparc/include/libcpu/byteorder.h b/c/src/lib/libcpu/sparc/include/libcpu/byteorder.h deleted file mode 100644 index 10b4239480..0000000000 --- a/c/src/lib/libcpu/sparc/include/libcpu/byteorder.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * byteorder.h - Endian conversion for SPARC. SPARC is big endian only. - * - * COPYRIGHT (c) 2011 - * Aeroflex Gaisler. - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ - -#ifndef _LIBCPU_BYTEORDER_H -#define _LIBCPU_BYTEORDER_H - -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -RTEMS_INLINE_ROUTINE uint16_t ld_le16(volatile uint16_t *addr) -{ - return CPU_swap_u16(*addr); -} - -RTEMS_INLINE_ROUTINE void st_le16(volatile uint16_t *addr, uint16_t val) -{ - *addr = CPU_swap_u16(val); -} - -RTEMS_INLINE_ROUTINE uint32_t ld_le32(volatile uint32_t *addr) -{ - return CPU_swap_u32(*addr); -} - -RTEMS_INLINE_ROUTINE void st_le32(volatile uint32_t *addr, uint32_t val) -{ - *addr = CPU_swap_u32(val); -} - -RTEMS_INLINE_ROUTINE uint16_t ld_be16(volatile uint16_t *addr) -{ - return *addr; -} - -RTEMS_INLINE_ROUTINE void st_be16(volatile uint16_t *addr, uint16_t val) -{ - *addr = val; -} - -RTEMS_INLINE_ROUTINE uint32_t ld_be32(volatile uint32_t *addr) -{ - return *addr; -} - -RTEMS_INLINE_ROUTINE void st_be32(volatile uint32_t *addr, uint32_t val) -{ - *addr = val; -} - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/c/src/lib/libcpu/sparc/preinstall.am b/c/src/lib/libcpu/sparc/preinstall.am index 3e4a2a3c88..ec35254581 100644 --- a/c/src/lib/libcpu/sparc/preinstall.am +++ b/c/src/lib/libcpu/sparc/preinstall.am @@ -18,10 +18,6 @@ $(PROJECT_INCLUDE)/libcpu/$(dirstamp): @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) -$(PROJECT_INCLUDE)/libcpu/byteorder.h: include/libcpu/byteorder.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/byteorder.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/byteorder.h - $(PROJECT_INCLUDE)/libcpu/access.h: include/libcpu/access.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/access.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/access.h diff --git a/cpukit/score/cpu/sparc/Makefile.am b/cpukit/score/cpu/sparc/Makefile.am index 96d29e0e11..e03aabc0ff 100644 --- a/cpukit/score/cpu/sparc/Makefile.am +++ b/cpukit/score/cpu/sparc/Makefile.am @@ -1,5 +1,8 @@ include $(top_srcdir)/automake/compile.am +include_libcpudir = $(includedir)/libcpu +include_libcpu_HEADERS = include/libcpu/byteorder.h + include_rtemsdir = $(includedir)/rtems include_rtems_HEADERS = rtems/asm.h diff --git a/cpukit/score/cpu/sparc/include/libcpu/byteorder.h b/cpukit/score/cpu/sparc/include/libcpu/byteorder.h new file mode 100644 index 0000000000..10b4239480 --- /dev/null +++ b/cpukit/score/cpu/sparc/include/libcpu/byteorder.h @@ -0,0 +1,66 @@ +/* + * byteorder.h - Endian conversion for SPARC. SPARC is big endian only. + * + * COPYRIGHT (c) 2011 + * Aeroflex Gaisler. + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.org/license/LICENSE. + */ + +#ifndef _LIBCPU_BYTEORDER_H +#define _LIBCPU_BYTEORDER_H + +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +RTEMS_INLINE_ROUTINE uint16_t ld_le16(volatile uint16_t *addr) +{ + return CPU_swap_u16(*addr); +} + +RTEMS_INLINE_ROUTINE void st_le16(volatile uint16_t *addr, uint16_t val) +{ + *addr = CPU_swap_u16(val); +} + +RTEMS_INLINE_ROUTINE uint32_t ld_le32(volatile uint32_t *addr) +{ + return CPU_swap_u32(*addr); +} + +RTEMS_INLINE_ROUTINE void st_le32(volatile uint32_t *addr, uint32_t val) +{ + *addr = CPU_swap_u32(val); +} + +RTEMS_INLINE_ROUTINE uint16_t ld_be16(volatile uint16_t *addr) +{ + return *addr; +} + +RTEMS_INLINE_ROUTINE void st_be16(volatile uint16_t *addr, uint16_t val) +{ + *addr = val; +} + +RTEMS_INLINE_ROUTINE uint32_t ld_be32(volatile uint32_t *addr) +{ + return *addr; +} + +RTEMS_INLINE_ROUTINE void st_be32(volatile uint32_t *addr, uint32_t val) +{ + *addr = val; +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/cpukit/score/cpu/sparc/preinstall.am b/cpukit/score/cpu/sparc/preinstall.am index 6bae48c717..13caf27e22 100644 --- a/cpukit/score/cpu/sparc/preinstall.am +++ b/cpukit/score/cpu/sparc/preinstall.am @@ -13,6 +13,15 @@ all-am: $(PREINSTALL_FILES) PREINSTALL_FILES = CLEANFILES = $(PREINSTALL_FILES) +$(PROJECT_INCLUDE)/libcpu/$(dirstamp): + @$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu + @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) + +$(PROJECT_INCLUDE)/libcpu/byteorder.h: include/libcpu/byteorder.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/byteorder.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/byteorder.h + $(PROJECT_INCLUDE)/rtems/$(dirstamp): @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp) -- cgit v1.2.3