nuttx: replace all ARRAY_SIZE()/ARRAYSIZE() to nitems()

Signed-off-by: chao an <[email protected]>

Author: anchao

arch/arm/include/cxd56xx/crashdump.h

@@ -29,6 +29,8 @@
 
 #include <stdint.h>
 
+#include <sys/param.h>
+
 #include <nuttx/irq.h>
 
 /****************************************************************************
@@ -54,8 +56,6 @@
 #define CONFIG_USTACK_SIZE (CRASHLOG_LEFTOVER / NUMBER_STACKS / \
                             sizeof(stack_word_t))
 
-#define ARRAYSIZE(a) (sizeof((a))/sizeof(a[0]))
-
 /* For Assert keep this much of the file name */
 
 #define MAX_FILE_PATH_LENGTH 40

arch/arm/src/cxd56xx/cxd56_pinconfig.h

@@ -28,6 +28,7 @@
 #include <nuttx/config.h>
 
 #include <sys/types.h>
+#include <sys/param.h>
 #include <stdint.h>
 #include <stdbool.h>
 
@@ -119,7 +120,7 @@
 
 #define CXD56_PIN_CONFIGS(pin) do { \
   uint32_t p[] = pin; \
-  cxd56_pin_configs((p), sizeof(p) / sizeof((p)[0])); \
+  cxd56_pin_configs((p), nitems(p)); \
 } while (0)
 
 /****************************************************************************

arch/arm/src/rtl8720c/chip.h

@@ -29,15 +29,15 @@
 #  include <stdint.h>
 #  include <sys/types.h>
 #endif
+
+#include <sys/param.h>
+
 #include <arch/chip/chip.h>
 
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
 
-#ifndef ARRAY_SIZE
-#  define ARRAY_SIZE(x)               (sizeof(x) / sizeof((x)[0]))
-#endif
 /* If the common ARMv7-M vector handling logic is used,
  * then it expects the following
  * definition in this file that provides the number of

arch/arm/src/stm32h7/stm32_fmc.c

@@ -31,11 +31,11 @@
 #include <assert.h>
 #include <debug.h>
 
+#include <sys/param.h>
+
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-
 /****************************************************************************
  * To use FMC, you must first enable it in configuration:
  *
@@ -265,7 +265,7 @@ void stm32_fmc_init(void)
 
   /* Set up FMC GPIOs */
 
-  for (regval = 0; regval < ARRAY_SIZE(fmc_gpios); regval++)
+  for (regval = 0; regval < nitems(fmc_gpios); regval++)
     stm32_configgpio(fmc_gpios[regval]);
 
   /* Set up FMC registers */

arch/arm64/src/a64/a64_boot.c

@@ -62,7 +62,7 @@ static const struct arm_mmu_region mmu_regions[] =
 
 const struct arm_mmu_config mmu_config =
 {
-  .num_regions = ARRAY_SIZE(mmu_regions),
+  .num_regions = nitems(mmu_regions),
   .mmu_regions = mmu_regions,
 };
 

arch/arm64/src/common/arm64_arch.h

@@ -145,10 +145,6 @@
 
 #define STRINGIFY(x)    #x
 
-#ifndef ARRAY_SIZE
-#  define ARRAY_SIZE(x)   (sizeof(x) / sizeof((x)[0]))
-#endif
-
 #define GET_EL(mode)  (((mode) >> MODE_EL_SHIFT) & MODE_EL_MASK)
 
 /* MPIDR_EL1, Multiprocessor Affinity Register */

arch/arm64/src/common/arm64_mmu.c

@@ -186,7 +186,7 @@ static const struct arm_mmu_region mmu_nxrt_regions[] =
 
 static const struct arm_mmu_config mmu_nxrt_config =
 {
-  .num_regions = ARRAY_SIZE(mmu_nxrt_regions),
+  .num_regions = nitems(mmu_nxrt_regions),
   .mmu_regions = mmu_nxrt_regions,
 };
 

arch/arm64/src/qemu/qemu_boot.c

@@ -62,7 +62,7 @@ static const struct arm_mmu_region mmu_regions[] =
 
 const struct arm_mmu_config mmu_config =
 {
-  .num_regions = ARRAY_SIZE(mmu_regions),
+  .num_regions = nitems(mmu_regions),
   .mmu_regions = mmu_regions,
 };
 

arch/sim/src/sim/posix/sim_hostusrsock.c

@@ -26,6 +26,7 @@
 #include <sys/uio.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
+#include <sys/param.h>
 
 #include <stdbool.h>
 #include <stdio.h>
@@ -39,12 +40,6 @@
 
 #include "sim_hostusrsock.h"
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-
 /****************************************************************************
  * Private Data
  ****************************************************************************/

binfmt/libelf/libelf_coredump.c

@@ -25,6 +25,7 @@
 #include <nuttx/config.h>
 
 #include <sys/stat.h>
+#include <sys/param.h>
 
 #include <stdio.h>
 #include <stdint.h>
@@ -44,7 +45,6 @@
 
 #define ELF_PAGESIZE    4096
 
-#define ARRAY_SIZE(x)   (sizeof(x) / sizeof((x)[0]))
 #define ROUNDUP(x, y)   ((x + (y - 1)) / (y)) * (y)
 
 /****************************************************************************
@@ -244,7 +244,7 @@ static void elf_emit_note_info(FAR struct elf_dumpinfo_s *cinfo)
 
       status.pr_pid = tcb->pid;
 
-      for (j = 0; j < ARRAY_SIZE(status.pr_regs); j++)
+      for (j = 0; j < nitems(status.pr_regs); j++)
         {
           status.pr_regs[j] = *(uintptr_t *)((uint8_t *)tcb +
                                              g_tcbinfo.reg_off.p[j]);