diff --git a/arch/arm/src/arm/arm_tcbinfo.c b/arch/arm/src/arm/arm_tcbinfo.c index b715cc45fd8..cabc7ee6d6e 100644 --- a/arch/arm/src/arm/arm_tcbinfo.c +++ b/arch/arm/src/arm/arm_tcbinfo.c @@ -26,6 +26,7 @@ #include #include +#include /**************************************************************************** * Private Data @@ -66,7 +67,7 @@ const struct tcbinfo_s g_tcbinfo = .stack_size_off = TCB_STACK_SIZE_OFF, .regs_off = TCB_REGS_OFF, .basic_num = 17, - .total_num = sizeof(g_reg_offs) / sizeof(g_reg_offs[0]), + .total_num = nitems(g_reg_offs), { .p = g_reg_offs, }, diff --git a/arch/arm/src/armv6-m/arm_tcbinfo.c b/arch/arm/src/armv6-m/arm_tcbinfo.c index 8a66fd5accf..315bf2f703a 100644 --- a/arch/arm/src/armv6-m/arm_tcbinfo.c +++ b/arch/arm/src/armv6-m/arm_tcbinfo.c @@ -26,6 +26,7 @@ #include #include +#include /**************************************************************************** * Private Data @@ -73,7 +74,7 @@ const struct tcbinfo_s g_tcbinfo = .stack_size_off = TCB_STACK_SIZE_OFF, .regs_off = TCB_REGS_OFF, .basic_num = 17, - .total_num = sizeof(g_reg_offs) / sizeof(g_reg_offs[0]), + .total_num = nitems(g_reg_offs), { .p = g_reg_offs, }, diff --git a/arch/arm/src/armv7-a/arm_tcbinfo.c b/arch/arm/src/armv7-a/arm_tcbinfo.c index 1d23155e02d..87fd960cfe5 100644 --- a/arch/arm/src/armv7-a/arm_tcbinfo.c +++ b/arch/arm/src/armv7-a/arm_tcbinfo.c @@ -26,6 +26,7 @@ #include #include +#include /**************************************************************************** * Private Data @@ -108,7 +109,7 @@ const struct tcbinfo_s g_tcbinfo = .stack_size_off = TCB_STACK_SIZE_OFF, .regs_off = TCB_REGS_OFF, .basic_num = 17, - .total_num = sizeof(g_reg_offs) / sizeof(g_reg_offs[0]), + .total_num = nitems(g_reg_offs), { .p = g_reg_offs, }, diff --git a/arch/arm/src/armv7-m/arm_tcbinfo.c b/arch/arm/src/armv7-m/arm_tcbinfo.c index 2e9c58f9bd3..770ce9b809c 100644 --- a/arch/arm/src/armv7-m/arm_tcbinfo.c +++ b/arch/arm/src/armv7-m/arm_tcbinfo.c @@ -26,6 +26,7 @@ #include #include +#include /**************************************************************************** * Private Data @@ -114,7 +115,7 @@ const struct tcbinfo_s g_tcbinfo = .stack_size_off = TCB_STACK_SIZE_OFF, .regs_off = TCB_REGS_OFF, .basic_num = 17, - .total_num = sizeof(g_reg_offs) / sizeof(g_reg_offs[0]), + .total_num = nitems(g_reg_offs), { .p = g_reg_offs, }, diff --git a/arch/arm/src/armv7-r/arm_tcbinfo.c b/arch/arm/src/armv7-r/arm_tcbinfo.c index 17aa740fa2e..11d3e4777d0 100644 --- a/arch/arm/src/armv7-r/arm_tcbinfo.c +++ b/arch/arm/src/armv7-r/arm_tcbinfo.c @@ -26,6 +26,7 @@ #include #include +#include /**************************************************************************** * Private Data @@ -108,7 +109,7 @@ const struct tcbinfo_s g_tcbinfo = .stack_size_off = TCB_STACK_SIZE_OFF, .regs_off = TCB_REGS_OFF, .basic_num = 17, - .total_num = sizeof(g_reg_offs) / sizeof(g_reg_offs[0]), + .total_num = nitems(g_reg_offs), { .p = g_reg_offs, }, diff --git a/arch/arm/src/armv8-m/arm_tcbinfo.c b/arch/arm/src/armv8-m/arm_tcbinfo.c index 70b9f538a33..fc66312f2e3 100644 --- a/arch/arm/src/armv8-m/arm_tcbinfo.c +++ b/arch/arm/src/armv8-m/arm_tcbinfo.c @@ -26,6 +26,7 @@ #include #include +#include /**************************************************************************** * Private Data @@ -114,7 +115,7 @@ const struct tcbinfo_s g_tcbinfo = .stack_size_off = TCB_STACK_SIZE_OFF, .regs_off = TCB_REGS_OFF, .basic_num = 17, - .total_num = sizeof(g_reg_offs) / sizeof(g_reg_offs[0]), + .total_num = nitems(g_reg_offs), { .p = g_reg_offs, }, diff --git a/arch/arm/src/armv8-r/arm_tcbinfo.c b/arch/arm/src/armv8-r/arm_tcbinfo.c index f1fa7e63597..de81abbb4ae 100644 --- a/arch/arm/src/armv8-r/arm_tcbinfo.c +++ b/arch/arm/src/armv8-r/arm_tcbinfo.c @@ -26,6 +26,7 @@ #include #include +#include /**************************************************************************** * Private Data @@ -106,7 +107,7 @@ const struct tcbinfo_s g_tcbinfo = .name_off = TCB_NAME_OFF, .regs_off = TCB_REGS_OFF, .basic_num = 17, - .total_num = sizeof(g_reg_offs) / sizeof(g_reg_offs[0]), + .total_num = nitems(g_reg_offs), { .p = g_reg_offs, }, diff --git a/arch/arm64/src/common/arm64_tcbinfo.c b/arch/arm64/src/common/arm64_tcbinfo.c index 79049ca67e8..68c405eb371 100644 --- a/arch/arm64/src/common/arm64_tcbinfo.c +++ b/arch/arm64/src/common/arm64_tcbinfo.c @@ -26,6 +26,7 @@ #include #include +#include /**************************************************************************** * Private Data @@ -81,8 +82,8 @@ const struct tcbinfo_s g_tcbinfo = .stack_off = TCB_STACK_OFF, .stack_size_off = TCB_STACK_SIZE_OFF, .regs_off = TCB_REGS_OFF, - .basic_num = sizeof(g_reg_offs) / sizeof(g_reg_offs[0]), - .total_num = sizeof(g_reg_offs) / sizeof(g_reg_offs[0]), + .basic_num = nitems(g_reg_offs), + .total_num = nitems(g_reg_offs), { .p = g_reg_offs, }, diff --git a/arch/risc-v/src/common/riscv_tcbinfo.c b/arch/risc-v/src/common/riscv_tcbinfo.c index 05d9809ef98..de8c668c65c 100644 --- a/arch/risc-v/src/common/riscv_tcbinfo.c +++ b/arch/risc-v/src/common/riscv_tcbinfo.c @@ -26,6 +26,7 @@ #include #include +#include /**************************************************************************** * Private Data @@ -120,7 +121,7 @@ const struct tcbinfo_s g_tcbinfo = .stack_size_off = TCB_STACK_SIZE_OFF, .regs_off = TCB_REGS_OFF, .basic_num = 33, - .total_num = sizeof(g_reg_offs) / sizeof(g_reg_offs[0]), + .total_num = nitems(g_reg_offs), { .p = g_reg_offs, }, diff --git a/arch/sim/src/sim/sim_tcbinfo.c b/arch/sim/src/sim/sim_tcbinfo.c index 00cef7b3659..e811af12876 100644 --- a/arch/sim/src/sim/sim_tcbinfo.c +++ b/arch/sim/src/sim/sim_tcbinfo.c @@ -26,6 +26,7 @@ #include #include +#include /**************************************************************************** * Private Data @@ -92,8 +93,8 @@ const struct tcbinfo_s g_tcbinfo = .stack_off = TCB_STACK_OFF, .stack_size_off = TCB_STACK_SIZE_OFF, .regs_off = TCB_REGS_OFF, - .basic_num = sizeof(g_reg_offs) / sizeof(g_reg_offs[0]), - .total_num = sizeof(g_reg_offs) / sizeof(g_reg_offs[0]), + .basic_num = nitems(g_reg_offs), + .total_num = nitems(g_reg_offs), { .p = g_reg_offs, }, diff --git a/arch/sparc/src/common/sparc_tcbinfo.c b/arch/sparc/src/common/sparc_tcbinfo.c index aaf6dad9ed2..b54ca1e54d3 100644 --- a/arch/sparc/src/common/sparc_tcbinfo.c +++ b/arch/sparc/src/common/sparc_tcbinfo.c @@ -26,6 +26,7 @@ #include #include +#include /**************************************************************************** * Private Data @@ -80,8 +81,8 @@ const struct tcbinfo_s g_tcbinfo = .stack_off = TCB_STACK_OFF, .stack_size_off = TCB_STACK_SIZE_OFF, .regs_off = TCB_REGS_OFF, - .basic_num = sizeof(g_reg_offs) / sizeof(g_reg_offs[0]), - .total_num = sizeof(g_reg_offs) / sizeof(g_reg_offs[0]), + .basic_num = nitems(g_reg_offs), + .total_num = nitems(g_reg_offs), { .p = g_reg_offs, }, diff --git a/arch/x86/src/common/x86_tcbinfo.c b/arch/x86/src/common/x86_tcbinfo.c index 8fb56cb2e77..2a9e74cef0f 100644 --- a/arch/x86/src/common/x86_tcbinfo.c +++ b/arch/x86/src/common/x86_tcbinfo.c @@ -26,6 +26,7 @@ #include #include +#include /**************************************************************************** * Private Data @@ -63,8 +64,8 @@ const struct tcbinfo_s g_tcbinfo = .stack_off = TCB_STACK_OFF, .stack_size_off = TCB_STACK_SIZE_OFF, .regs_off = TCB_REGS_OFF, - .basic_num = sizeof(g_reg_offs) / sizeof(g_reg_offs[0]), - .total_num = sizeof(g_reg_offs) / sizeof(g_reg_offs[0]), + .basic_num = nitems(g_reg_offs), + .total_num = nitems(g_reg_offs), { .p = g_reg_offs, }, diff --git a/arch/x86_64/src/common/x86_64_tcbinfo.c b/arch/x86_64/src/common/x86_64_tcbinfo.c index 760a550c510..5ff713cff2e 100644 --- a/arch/x86_64/src/common/x86_64_tcbinfo.c +++ b/arch/x86_64/src/common/x86_64_tcbinfo.c @@ -26,6 +26,7 @@ #include #include +#include /**************************************************************************** * Private Data @@ -71,8 +72,8 @@ const struct tcbinfo_s g_tcbinfo = .stack_off = TCB_STACK_OFF, .stack_size_off = TCB_STACK_SIZE_OFF, .regs_off = TCB_REGS_OFF, - .basic_num = sizeof(g_reg_offs) / sizeof(g_reg_offs[0]), - .total_num = sizeof(g_reg_offs) / sizeof(g_reg_offs[0]), + .basic_num = nitems(g_reg_offs), + .total_num = nitems(g_reg_offs), { .p = g_reg_offs, }, diff --git a/arch/xtensa/src/common/xtensa_tcbinfo.c b/arch/xtensa/src/common/xtensa_tcbinfo.c index ddc80728a4a..a69e81ce9b7 100644 --- a/arch/xtensa/src/common/xtensa_tcbinfo.c +++ b/arch/xtensa/src/common/xtensa_tcbinfo.c @@ -26,6 +26,7 @@ #include #include +#include /**************************************************************************** * Private Data @@ -67,7 +68,7 @@ const struct tcbinfo_s g_tcbinfo = .stack_size_off = TCB_STACK_SIZE_OFF, .regs_off = TCB_REGS_OFF, .basic_num = COMMON_CTX_REGS, - .total_num = sizeof(g_reg_offs) / sizeof(g_reg_offs[0]), + .total_num = nitems(g_reg_offs), { .p = g_reg_offs, },