Use the macros from sys/param.h

builtin/builtin_list.c

@@ -25,6 +25,7 @@
 #include <nuttx/config.h>
 
 #include <nuttx/lib/builtin.h>
+#include <sys/param.h>
 
 #include <sys/stat.h>
 
@@ -40,11 +41,11 @@
  * Public Data
  ****************************************************************************/
 
 #include "builtin_proto.h"
 
 const struct builtin_s g_builtins[] =
 {
 #  include "builtin_list.h"
 #ifdef CONFIG_SCHED_USER_IDENTITY
   { NULL, 0, 0, 0, 0, 0, 0 }
 #else
@@ -52,7 +53,7 @@
 #endif
 };
 
-const int g_builtin_count = sizeof(g_builtins) / sizeof(g_builtins[0]);
+const int g_builtin_count = nitems(g_builtins);
 
 /****************************************************************************
  * Private Data

canutils/libcanutils/lib.c

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */
 /*
  * lib.c - library for command line tools
  *
  * Copyright (c) 2002-2007 Volkswagen Group Electronic Research
@@ -42,15 +42,16 @@
  *
  */
 
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
 
+#include <sys/param.h>
 #include <sys/socket.h> /* for sa_family_t */
 #include <nuttx/can.h>
 #include <netpacket/can.h>
 
 #include "lib.h"
 
 #define CANID_DELIM '#'
 #define DATA_SEPARATOR '.'
@@ -62,14 +63,14 @@
 
 static inline void put_hex_byte(char *buf, __u8 byte)
 {
 	buf[0] = hex_asc_upper_hi(byte);
 	buf[1] = hex_asc_upper_lo(byte);
 }
 
 static inline void _put_id(char *buf, int end_offset, canid_t id)
 {
 	/* build 3 (SFF) or 8 (EFF) digit CAN identifier */
 	while (end_offset >= 0) {
 		buf[end_offset--] = hex_asc_upper_lo(id);
 		id >>= 4;
 	}
@@ -80,13 +81,13 @@
 
 /* CAN DLC to real data length conversion helpers */
 
 static const unsigned char dlc2len[] = {0, 1, 2, 3, 4, 5, 6, 7,
 					8, 12, 16, 20, 24, 32, 48, 64};
 
 /* get data length from can_dlc with sanitized can_dlc */
 unsigned char can_dlc2len(unsigned char can_dlc)
 {
 	return dlc2len[can_dlc & 0x0F];
 }
 
 static const unsigned char len2dlc[] = {0, 1, 2, 3, 4, 5, 6, 7, 8,		/* 0 - 8 */
@@ -496,10 +497,6 @@
 	"unspecified",
 };
 
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
-#endif
-
 static int snprintf_error_data(char *buf, size_t len, uint8_t err,
 			       const char **arr, int arr_len)
 {
@@ -537,7 +534,7 @@
 	n += snprintf(buf + n, len - n, "{");
 	n += snprintf_error_data(buf + n, len - n, cf->data[1],
 				controller_problems,
-				ARRAY_SIZE(controller_problems));
+				nitems(controller_problems));
 	n += snprintf(buf + n, len - n, "}");
 
 	return n;
@@ -553,10 +550,10 @@
 	n += snprintf(buf + n, len - n, "{{");
 	n += snprintf_error_data(buf + n, len - n, cf->data[2],
 				protocol_violation_types,
-				ARRAY_SIZE(protocol_violation_types));
+				nitems(protocol_violation_types));
 	n += snprintf(buf + n, len - n, "}{");
 	if (cf->data[3] > 0 &&
-	    cf->data[3] < ARRAY_SIZE(protocol_violation_locations))
+	    cf->data[3] < nitems(protocol_violation_locations))
 		n += snprintf(buf + n, len - n, "%s",
 			      protocol_violation_locations[cf->data[3]]);
 	n += snprintf(buf + n, len - n, "}}");
@@ -575,15 +572,15 @@
 		return;
 
 	class = cf->can_id & CAN_EFF_MASK;
-	if (class > (1 << ARRAY_SIZE(error_classes))) {
+	if (class > (1 << nitems(error_classes))) {
 		fprintf(stderr, "Error class %#jx is invalid\n", (uintmax_t)class);
 		return;
 	}
 
 	if (!sep)
 		sep = defsep;
 
-	for (i = 0; i < (int)ARRAY_SIZE(error_classes); i++) {
+	for (i = 0; i < (int)nitems(error_classes); i++) {
 		mask = 1 << i;
 		if (class & mask) {
 			if (classes)

examples/adxl372_test/adxl372_test_main.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <fcntl.h>
-#include <nuttx/fs/fs.h>
+#include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -41,7 +41,6 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#define ARRAYSIZE(x) (sizeof((x)) / sizeof((x)[0]))
 #define PASSED        0
 
 #define SUB_PROMPT   "stst >"
@@ -394,7 +393,7 @@ int main(int argc, FAR char *argv[])
       adxl372_test,   /* ADXL372 accelerometer tests */
     };
 
-  FAR char *test_path[ARRAYSIZE(test_ptr_array)];
+  FAR char *test_path[nitems(test_ptr_array)];
 
   if (argc < 1 || *argv[1] == 0 || *(argv[1] + 1) == 0)
     {
@@ -490,7 +489,7 @@ int main(int argc, FAR char *argv[])
                   printf("Set to batch mode.\n");
                 }
             }
-          else if (ui >= ARRAYSIZE(test_ptr_array))
+          else if (ui >= nitems(test_ptr_array))
             {
               printf("Huh?\n");
             }
@@ -511,7 +510,7 @@ int main(int argc, FAR char *argv[])
     {
       printf("ADXL372 sensor diagnostic started in batch mode...\n");
 
-      for (ui = 0; ui < ARRAYSIZE(test_ptr_array); ui++)
+      for (ui = 0; ui < nitems(test_ptr_array); ui++)
         {
           step_rc = 0;
           if (test_ptr_array[ui] != 0)

examples/dac/dac_main.c

@@ -32,6 +32,7 @@
 #include <unistd.h>
 
 #include <sys/ioctl.h>
+#include <sys/param.h>
 #include <nuttx/analog/dac.h>
 #include <nuttx/arch.h>
 
@@ -47,10 +48,6 @@
 #  define CONFIG_EXAMPLES_DAC_DEVPATH "/dev/dac0"
 #endif
 
-#ifndef ARRAY_SIZE
-#  define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-#endif
-
 /****************************************************************************
  * Private Types
  ****************************************************************************/
@@ -226,7 +223,7 @@ static int cmd_dac_put(int argc, FAR const char *argv[])
     {
       msgs[0].am_channel = g_dacstate.channel;
       msgs[0].am_data = data;
-      ret = dac_put(g_dacstate.devpath, msgs, ARRAY_SIZE(msgs), delay);
+      ret = dac_put(g_dacstate.devpath, msgs, nitems(msgs), delay);
       printf("ret=%d\n", ret);
     }
 
@@ -277,7 +274,7 @@ static void dac_help(void)
          "Default: %s Current: %s\n",
          CONFIG_EXAMPLES_DAC_DEVPATH,
          g_dacstate.devpath ? g_dacstate.devpath : "NONE");
-  print_cmds("\nCommands:\n", commands, ARRAY_SIZE(commands), "\n");
+  print_cmds("\nCommands:\n", commands, nitems(commands), "\n");
 }
 
 static int arg_string(FAR const char **arg, FAR const char **value)
@@ -422,7 +419,7 @@ int main(int argc, FAR const char *argv[])
     }
   else
     {
-      ret = execute_cmd(argc, argv, commands, ARRAY_SIZE(commands));
+      ret = execute_cmd(argc, argv, commands, nitems(commands));
     }
 
   return (ret >= 0) ? EXIT_SUCCESS : EXIT_FAILURE;

examples/ft80x/ft80x_main.c

@@ -30,6 +30,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
+#include <sys/param.h>
 #include <nuttx/lcd/ft80x.h>
 
 #include "graphics/ft80x.h"
@@ -60,13 +61,13 @@ struct ft80x_exampleinfo_s
  *  ft80x_prim_lines       LINES           Line drawing primitive
  *  ft80x_prim_linestrip   LINE_STRIP      Line strip drawing primitive
  *  ft80x_prim_edgestrip_r EDGE_STRIP_R    Edge strip right side drawing
-                                           primitive
+ *                                         primitive
  *  (To be provided)       EDGE_STRIP_L    Edge strip left side drawing
-                                           primitive
+ *                                         primitive
  *  (To be provided)       EDGE_STRIP_A    Edge strip above side drawing
-                                           primitive
+ *                                         primitive
  *  (To be provided)       EDGE_STRIP_B    Edge strip below side drawing
-                                           primitive
+ *                                         primitive
  *  ft80x_prim_rectangles  RECTS           Rectangle drawing primitive
  *  ft80x_prim_scissor     SCISSOR         Scissor primitive
  *  ft80x_prim_stencil     STENCIL         Stencil primitives
@@ -88,15 +89,14 @@ static const struct ft80x_exampleinfo_s g_primitives[] =
   { "Alpha Blend",  ft80x_prim_alphablend }
 };
 
-#define NPRIMITIVES (sizeof(g_primitives) / sizeof(struct ft80x_exampleinfo_s))
 #endif /* CONFIG_EXAMPLES_FT80X_PRIMITIVES */
 
 /* Co-processor display examples.  Only a small, but interesting, subset
  * here co-processor command are exercised and these with only a few of the
  * possible options.
  *
  *  FUNCTION                 CoProc CMD USED DESCRIPTION
- *  ------------------------ --------------- ----------------------------------
+ *  ------------------------ --------------- --------------------------------
  *  ft80x_coproc_button      CMD_BUTTON      Draw a button
  *  ft80x_coproc_clock       CMD_CLOCK       Draw an analog clock
  *  ft80x_coproc_gauge       CMD_GAUGE       Draw a gauge
@@ -109,12 +109,12 @@ static const struct ft80x_exampleinfo_s g_primitives[] =
  *  ft80x_coproc_toggle      CMD_TOGGLE      Draw a toggle switch
  *  ft80x_coproc_number      CMD_NUMBER      Draw a decimal number
  *  ft80x_coproc_calibrate   CMD_CALIBRATE   Execute the touch screen
-                                             calibration routine
+ *                                           calibration routine
  *  ft80x_coproc_spinner     CMD_SPINNER     Start an animated spinner
  *  ft80x_coproc_screensaver CMD_SCREENSAVER Start an animated screensaver
  *  (To be provided)         CMD_SKETCH      Start a continuous sketch update
  *  (To be provided)         CMD_SNAPSHOT    Take a snapshot of the current
-                                             screen
+ *                                           screen
  *  ft80x_coproc_logo        CMD_LOGO        Play device log animation
  */
 
@@ -139,8 +139,6 @@ static const struct ft80x_exampleinfo_s g_coproc[] =
   { "Logo",           ft80x_coproc_logo }
 };
 
-#define NCOPROC (sizeof(g_coproc) / sizeof(struct ft80x_exampleinfo_s))
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -182,7 +180,7 @@ static int ft80x_showname(int fd, FAR struct ft80x_dlbuffer_s *buffer,
   /* Clear the display */
 
   cmds.clearrgb.cmd = FT80X_CLEAR_COLOR_RGB(0, 0, 0x80);
-  cmds.clear.cmd    = FT80X_CLEAR(1 ,1, 1);
+  cmds.clear.cmd    = FT80X_CLEAR(1, 1, 1);
   cmds.colorrgb.cmd = FT80X_COLOR_RGB(0xff, 0xff, 0xff);
 
   /* Use the CMD_TEXT co-processor command to show the name of the next
@@ -308,7 +306,7 @@ int main(int argc, FAR char *argv[])
 
   ft80x_info("FT80x Primitive Functions\n");
 
-  for (i = 0; i < NPRIMITIVES; i++)
+  for (i = 0; i < nitems(g_primitives); i++)
     {
       ft80x_example(fd, buffer, &g_primitives[i]);
     }
@@ -318,7 +316,7 @@ int main(int argc, FAR char *argv[])
 
   ft80x_info("FT80x Co-processor Functions\n");
 
-  for (i = 0; i < NCOPROC; i++)
+  for (i = 0; i < nitems(g_coproc); i++)
     {
       ft80x_example(fd, buffer, &g_coproc[i]);
     }

examples/ftpd/ftpd_main.c

@@ -33,6 +33,7 @@
 #include <errno.h>
 #include <debug.h>
 
+#include <sys/param.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
@@ -65,7 +66,6 @@ static const struct fptd_account_s g_ftpdaccounts[] =
   { FTPD_ACCOUNTFLAG_GUEST,  "ftp",       NULL,     NULL },
   { FTPD_ACCOUNTFLAG_GUEST,  "anonymous", NULL,     NULL },
 };
-#define NACCOUNTS (sizeof(g_ftpdaccounts) / sizeof(struct fptd_account_s))
 
 /****************************************************************************
  * Public Data
@@ -139,7 +139,7 @@ static void ftpd_accounts(FTPD_SESSION handle)
   int i;
 
   printf("Adding accounts:\n");
-  for (i = 0; i < NACCOUNTS; i++)
+  for (i = 0; i < nitems(g_ftpdaccounts); i++)
     {
       account = &g_ftpdaccounts[i];
 

examples/lsm330spi_test/lsm330spi_test_main.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <fcntl.h>
-#include <nuttx/fs/fs.h>
+#include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -41,7 +41,6 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#define ARRAYSIZE(x)  (sizeof((x)) / sizeof((x)[0]))
 #define PASSED        0
 
 #define SUB_PROMPT    "stst >"
@@ -631,7 +630,7 @@ int main(int argc, FAR char *argv[])
       lsm330gyro_test,  /* LSM330 gyroscope tests */
     };
 
-  FAR char *test_path[ARRAYSIZE(test_ptr_array)];
+  FAR char *test_path[nitems(test_ptr_array)];
 
   if (argc < 2 || *argv[1] == 0 || *(argv[1] + 1) == 0)
     {
@@ -737,7 +736,7 @@ int main(int argc, FAR char *argv[])
                   printf("Set to batch mode.\n");
                 }
             }
-          else if (ui >= ARRAYSIZE(test_ptr_array))
+          else if (ui >= nitems(test_ptr_array))
             {
               printf("Huh?\n");
             }
@@ -757,7 +756,7 @@ int main(int argc, FAR char *argv[])
   else /* not interactive mode */
     {
       printf("LSM330 sensor diagnostic started in batch mode...\n");
-      for (ui = 0; ui < ARRAYSIZE(test_ptr_array); ui++)
+      for (ui = 0; ui < nitems(test_ptr_array); ui++)
         {
           step_rc = 0;
           if (test_ptr_array[ui] != 0)