libphoenix: rename dirs in include/arch to match those in arch

JIRA: RTOS-664
phoenix-rtos · Dec 10, 2023 · 9694d0e · 9694d0e
1 parent ccd62fe
commit 9694d0e
Show file tree

Hide file tree

Showing 22 changed files with 51 additions and 51 deletions.
diff --git a/arch/armv7a/Makefile b/arch/armv7a/Makefile
@@ -1,5 +1,5 @@
 #
-# Makefile for libphoenix/arch/arm-imx
+# Makefile for libphoenix/arch/armv7a
 #
 # Copyright 2017, 2020 Phoenix Systems
 # Author: Pawel Pisarczyk

diff --git a/arch/armv7a/_start.S b/arch/armv7a/_start.S
@@ -3,7 +3,7 @@
  *
  * libphoenix
  *
- * Entrypoint (arm-imx)
+ * Entrypoint (armv7a)
  *
  * Copyright 2018 Phoenix Systems
  * Author; Aleksander Kaminski

diff --git a/arch/armv7a/signal.S b/arch/armv7a/signal.S
@@ -3,7 +3,7 @@
  *
  * libphoenix
  *
- * Signal trampoline (arm-imx)
+ * Signal trampoline (armv7a)
  *
  * Copyright 2019, 2023 Phoenix Systems
  * Author: Jan Sikorski

diff --git a/arch/armv7a/string.c b/arch/armv7a/string.c
@@ -1,9 +1,9 @@
 /*
  * Phoenix-RTOS
  *
- * Operating system kernel
+ * libphoenix
  *
- * arch/arm-imx
+ * arch/armv7a
  *
  * Copyright 2017, 2018 Phoenix Systems
  * Author: Aleksander Kaminski, Pawel Pisarczyk

diff --git a/arch/armv7a/syscalls.S b/arch/armv7a/syscalls.S
@@ -3,7 +3,7 @@
  *
  * libphoenix
  *
- * syscalls (arm-imx)
+ * syscalls (armv7a)
  *
  * Copyright 2017, 2018 Phoenix Systems
  * Author; Pawel Pisarczyk, Aleksander Kaminski

diff --git a/arch/armv7m/Makefile b/arch/armv7m/Makefile
@@ -1,5 +1,5 @@
 #
-# Makefile for libphoenix/arch/armv7
+# Makefile for libphoenix/arch/armv7m
 #
 # Copyright 2017, 2020 Phoenix Systems
 # Author: Pawel Pisarczyk

diff --git a/arch/armv7m/_start.S b/arch/armv7m/_start.S
@@ -3,7 +3,7 @@
  *
  * libphoenix
  *
- * Entrypoint (armv7)
+ * Entrypoint (armv7m)
  *
  * Copyright 2018 Phoenix Systems
  * Author; Aleksander Kaminski

diff --git a/arch/armv7m/signal.S b/arch/armv7m/signal.S
@@ -3,7 +3,7 @@
  *
  * libphoenix
  *
- * Signal trampoline (armv7)
+ * Signal trampoline (armv7m)
  *
  * Copyright 2019, 2023 Phoenix Systems
  * Author: Jan Sikorski

diff --git a/arch/armv7m/string.c b/arch/armv7m/string.c
@@ -1,9 +1,9 @@
 /*
  * Phoenix-RTOS
  *
- * Operating system kernel
+ * libphoenix
  *
- * arch/armv7
+ * arch/armv7m
  *
  * Copyright 2017 Phoenix Systems
  * Author: Aleksander Kaminski, Pawel Pisarczyk

diff --git a/arch/armv7m/syscalls.S b/arch/armv7m/syscalls.S
@@ -3,7 +3,7 @@
  *
  * libphoenix
  *
- * syscalls (armv7)
+ * syscalls (armv7m)
  *
  * Copyright 2017 Phoenix Systems
  * Author; Pawel Pisarczyk, Aleksander Kaminski

diff --git a/include/arch.h b/include/arch.h
@@ -1,11 +1,11 @@
 #if defined(__i386__) || defined(__x86_64__)
 #include <arch/ia32/arch.h>
 #elif defined(__ARM_ARCH_6M__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_8M_BASE__) || defined(__ARM_ARCH_8M_MAIN__)
-#include <arch/armv7/arch.h>
+#include <arch/armv7m/arch.h>
 #elif defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_8A__) || defined(__ARM_ARCH_7__)
-#include <arch/arm-imx/arch.h>
+#include <arch/armv7a/arch.h>
 #elif defined(__ARM_ARCH_4T__) || defined(__ARM_ARCH_5TE__) /* not currently supported, map to 7M for libgcc to compile */
-#include <arch/armv7/arch.h>
+#include <arch/armv7m/arch.h>
 #elif defined(__riscv) && (__riscv_xlen == 64)
 #include <arch/riscv64/arch.h>
 #elif defined(__sparc__)

diff --git a/include/arch/arm-imx/arch.h → include/arch/armv7a/arch.h b/include/arch/arm-imx/arch.h → include/arch/armv7a/arch.h
@@ -3,7 +3,7 @@
  *
  * libphoenix
  *
- * Architecture dependent part (arch/arm-imx)
+ * Architecture dependent part (arch/armv7a)
  *
  * Copyright 2017, 2018 Phoenix Systems
  * Author: Pawel Pisarczyk, Aleksander Kaminski
@@ -13,12 +13,12 @@
  * %LICENSE%
  */
 
-#ifndef _LIBPHOENIX_ARCH_ARM_IMX_ARCH_H_
-#define _LIBPHOENIX_ARCH_ARM_IMX_ARCH_H_
+#ifndef _LIBPHOENIX_ARCH_ARMV7A_ARCH_H_
+#define _LIBPHOENIX_ARCH_ARMV7A_ARCH_H_
 
-#define __ARCH_STDINT <arch/arm-imx/stdint.h>
-#define __ARCH_LIMITS <arch/arm-imx/limits.h>
-#define __ARCH_SYS_TYPES <arch/arm-imx/types.h>
+#define __ARCH_STDINT    <arch/armv7a/stdint.h>
+#define __ARCH_LIMITS    <arch/armv7a/limits.h>
+#define __ARCH_SYS_TYPES <arch/armv7a/types.h>
 
 #define __MEMCPY
 #define __MEMCMP
@@ -59,7 +59,7 @@ static inline float __ieee754_sqrtf(float x)
 #endif
 
 #define _PAGE_SIZE 0x1000
-#define SIZE_PAGE _Pragma("GCC warning \"'SIZE_PAGE' is deprecated. Use _PAGE_SIZE from arch.h or PAGE_SIZE from limits.h (POSIX only)\"") _PAGE_SIZE
+#define SIZE_PAGE  _Pragma("GCC warning \"'SIZE_PAGE' is deprecated. Use _PAGE_SIZE from arch.h or PAGE_SIZE from limits.h (POSIX only)\"") _PAGE_SIZE
 
 #define __LIBPHOENIX_ARCH_TLS_SUPPORTED
 

diff --git a/include/arch/arm-imx/limits.h → include/arch/armv7a/limits.h b/include/arch/arm-imx/limits.h → include/arch/armv7a/limits.h
@@ -3,7 +3,7 @@
  *
  * libphoenix
  *
- * Architecture dependent part of limits (arch/arm-imx)
+ * Architecture dependent part of limits (arch/armv7a)
  *
  * Copyright 2017-2019 Phoenix Systems
  * Author: Pawel Pisarczyk, Aleksander Kaminski, Andrzej Glowinski, Marek Bialowas
@@ -13,8 +13,8 @@
  * %LICENSE%
  */
 
-#ifndef _LIBPHOENIX_ARCH_ARM_IMX_LIMITS_H_
-#define _LIBPHOENIX_ARCH_ARM_IMX_LIMITS_H_
+#ifndef _LIBPHOENIX_ARCH_ARMV7A_LIMITS_H_
+#define _LIBPHOENIX_ARCH_ARMV7A_LIMITS_H_
 
 #include "arch.h"
 

diff --git a/include/arch/armv7/stdint.h → include/arch/armv7a/stdint.h b/include/arch/armv7/stdint.h → include/arch/armv7a/stdint.h
@@ -3,7 +3,7 @@
  *
  * libphoenix
  *
- * Architecture dependent part of stdint (arch/armv7)
+ * Architecture dependent part of stdint (arch/armv7a)
  *
  * Copyright 2019-2021 Phoenix Systems
  * Author: Andrzej Glowinski, Daniel Sawka
@@ -13,8 +13,8 @@
  * %LICENSE%
  */
 
-#ifndef _LIBPHOENIX_ARCH_ARMV7_STDINT_H_
-#define _LIBPHOENIX_ARCH_ARMV7_STDINT_H_
+#ifndef _LIBPHOENIX_ARCH_ARMV7A_STDINT_H_
+#define _LIBPHOENIX_ARCH_ARMV7A_STDINT_H_
 
 /* The following sections refer to ISO/IEC 9899:1999 */
 

diff --git a/include/arch/arm-imx/types.h → include/arch/armv7a/types.h b/include/arch/arm-imx/types.h → include/arch/armv7a/types.h
@@ -3,7 +3,7 @@
  *
  * libphoenix
  *
- * Architecture dependent part of types (arch/arm-imx)
+ * Architecture dependent part of types (arch/armv7a)
  *
  * Copyright 2019 Phoenix Systems
  * Author: Andrzej Glowinski
@@ -13,8 +13,8 @@
  * %LICENSE%
  */
 
-#ifndef _LIBPHOENIX_ARCH_ARM_IMX_TYPES_H_
-#define _LIBPHOENIX_ARCH_ARM_IMX_TYPES_H_
+#ifndef _LIBPHOENIX_ARCH_ARMV7A_TYPES_H_
+#define _LIBPHOENIX_ARCH_ARMV7A_TYPES_H_
 
 typedef unsigned int addr_t;
 typedef long long offs_t;

diff --git a/include/arch/armv7/arch.h → include/arch/armv7m/arch.h b/include/arch/armv7/arch.h → include/arch/armv7m/arch.h
@@ -3,7 +3,7 @@
  *
  * libphoenix
  *
- * Architecture dependent part (arch/armv7)
+ * Architecture dependent part (arch/armv7m)
  *
  * Copyright 2017 Phoenix Systems
  * Author: Pawel Pisarczyk
@@ -13,12 +13,12 @@
  * %LICENSE%
  */
 
-#ifndef _LIBPHOENIX_ARCH_ARMV7_ARCH_H_
-#define _LIBPHOENIX_ARCH_ARMV7_ARCH_H_
+#ifndef _LIBPHOENIX_ARCH_ARMV7M_ARCH_H_
+#define _LIBPHOENIX_ARCH_ARMV7M_ARCH_H_
 
-#define __ARCH_STDINT <arch/armv7/stdint.h>
-#define __ARCH_LIMITS <arch/armv7/limits.h>
-#define __ARCH_SYS_TYPES <arch/armv7/types.h>
+#define __ARCH_STDINT    <arch/armv7m/stdint.h>
+#define __ARCH_LIMITS    <arch/armv7m/limits.h>
+#define __ARCH_SYS_TYPES <arch/armv7m/types.h>
 
 #define __MEMCPY
 #define __MEMCMP
@@ -58,13 +58,13 @@ static inline float __ieee754_sqrtf(float x)
 #endif
 
 #define _PAGE_SIZE 0x200
-#define SIZE_PAGE _Pragma("GCC warning \"'SIZE_PAGE' is deprecated. Use _PAGE_SIZE from arch.h or PAGE_SIZE from limits.h (POSIX only)\"") _PAGE_SIZE
+#define SIZE_PAGE  _Pragma("GCC warning \"'SIZE_PAGE' is deprecated. Use _PAGE_SIZE from arch.h or PAGE_SIZE from limits.h (POSIX only)\"") _PAGE_SIZE
 
 /* FIXME provide libphoenix config to be able to
  * selectively disable/enable features on per
  * project basis.
  * Disabled for now as TLS consumes too much
  * memory to be advantageous on some targets. */
-//#define __LIBPHOENIX_ARCH_TLS_SUPPORTED
+// #define __LIBPHOENIX_ARCH_TLS_SUPPORTED
 
 #endif
diff --git a/include/arch/armv7/limits.h → include/arch/armv7m/limits.h b/include/arch/armv7/limits.h → include/arch/armv7m/limits.h
@@ -3,7 +3,7 @@
  *
  * libphoenix
  *
- * Architecture dependent part of limits (arch/armv7)
+ * Architecture dependent part of limits (arch/armv7m)
  *
  * Copyright 2017-2019 Phoenix Systems
  * Author: Pawel Pisarczyk, Aleksander Kaminski, Andrzej Glowinski, Marek Bialowas
@@ -13,8 +13,8 @@
  * %LICENSE%
  */
 
-#ifndef _LIBPHOENIX_ARCH_ARMV7_LIMITS_H_
-#define _LIBPHOENIX_ARCH_ARMV7_LIMITS_H_
+#ifndef _LIBPHOENIX_ARCH_ARMV7M_LIMITS_H_
+#define _LIBPHOENIX_ARCH_ARMV7M_LIMITS_H_
 
 #include "arch.h"
 

diff --git a/include/arch/arm-imx/stdint.h → include/arch/armv7m/stdint.h b/include/arch/arm-imx/stdint.h → include/arch/armv7m/stdint.h
@@ -3,7 +3,7 @@
  *
  * libphoenix
  *
- * Architecture dependent part of stdint (arch/arm-imx)
+ * Architecture dependent part of stdint (arch/armv7m)
  *
  * Copyright 2019-2021 Phoenix Systems
  * Author: Andrzej Glowinski, Daniel Sawka
@@ -13,8 +13,8 @@
  * %LICENSE%
  */
 
-#ifndef _LIBPHOENIX_ARCH_ARM_IMX_STDINT_H_
-#define _LIBPHOENIX_ARCH_ARM_IMX_STDINT_H_
+#ifndef _LIBPHOENIX_ARCH_ARMV7M_STDINT_H_
+#define _LIBPHOENIX_ARCH_ARMV7M_STDINT_H_
 
 /* The following sections refer to ISO/IEC 9899:1999 */
 

diff --git a/include/arch/armv7/types.h → include/arch/armv7m/types.h b/include/arch/armv7/types.h → include/arch/armv7m/types.h
@@ -3,7 +3,7 @@
  *
  * libphoenix
  *
- * Architecture dependent part of types (arch/armv7)
+ * Architecture dependent part of types (arch/armv7m)
  *
  * Copyright 2019 Phoenix Systems
  * Author: Andrzej Glowinski
@@ -13,8 +13,8 @@
  * %LICENSE%
  */
 
-#ifndef _LIBPHOENIX_ARCH_ARMV7_TYPES_H_
-#define _LIBPHOENIX_ARCH_ARMV7_TYPES_H_
+#ifndef _LIBPHOENIX_ARCH_ARMV7M_TYPES_H_
+#define _LIBPHOENIX_ARCH_ARMV7M_TYPES_H_
 
 typedef unsigned int addr_t;
 typedef long long offs_t;

diff --git a/include/arch/riscv64/io.h b/include/arch/riscv64/io.h
@@ -1,7 +1,7 @@
 /*
  * Phoenix-RTOS
  *
- * Operating system kernel
+ * libphoenix
  *
  * SBI routines (RISCV64)
  *

diff --git a/stdlib/bsearch.c b/stdlib/bsearch.c
@@ -1,7 +1,7 @@
 /*
  * Phoenix-RTOS
  *
- * Operating system kernel
+ * libphoenix
  *
  * Binary search
  *

diff --git a/stdlib/qsort.c b/stdlib/qsort.c
@@ -1,7 +1,7 @@
 /*
  * Phoenix-RTOS
  *
- * Operating system kernel
+ * libphoenix
  *
  * Quicksort
  *