{Bp-2655} examples: fix noteprint compile error

examples/gpio/gpio_main.c

@@ -67,6 +67,12 @@ static void show_usage(FAR const char *progname)
   fprintf(stderr, "\t 8: GPIO_INTERRUPT_RISING_PIN\n");
   fprintf(stderr, "\t 9: GPIO_INTERRUPT_FALLING_PIN\n");
   fprintf(stderr, "\t10: GPIO_INTERRUPT_BOTH_PIN\n");
+  fprintf(stderr, "\t11: GPIO_INTERRUPT_PIN_WAKEUP\n");
+  fprintf(stderr, "\t12: GPIO_INTERRUPT_HIGH_PIN_WAKEUP\n");
+  fprintf(stderr, "\t13: GPIO_INTERRUPT_LOW_PIN_WAKEUP\n");
+  fprintf(stderr, "\t14: GPIO_INTERRUPT_RISING_PIN_WAKEUP\n");
+  fprintf(stderr, "\t15: GPIO_INTERRUPT_FALLING_PIN_WAKEUP\n");
+  fprintf(stderr, "\t16: GPIO_INTERRUPT_BOTH_PIN_WAKEUP\n");
 }
 
 /****************************************************************************
@@ -308,6 +314,12 @@ int main(int argc, FAR char *argv[])
       case GPIO_INTERRUPT_RISING_PIN:
       case GPIO_INTERRUPT_FALLING_PIN:
       case GPIO_INTERRUPT_BOTH_PIN:
+      case GPIO_INTERRUPT_PIN_WAKEUP:
+      case GPIO_INTERRUPT_HIGH_PIN_WAKEUP:
+      case GPIO_INTERRUPT_LOW_PIN_WAKEUP:
+      case GPIO_INTERRUPT_RISING_PIN_WAKEUP:
+      case GPIO_INTERRUPT_FALLING_PIN_WAKEUP:
+      case GPIO_INTERRUPT_BOTH_PIN_WAKEUP:
         {
           printf("  Interrupt pin: Value=%u\n", invalue);
 

examples/noteprintf/noteprintf_main.c

@@ -45,17 +45,7 @@
 
 int main(int argc, FAR char *argv[])
 {
-  struct binary
-    {
-      uint8_t val1;
-      uint8_t val2;
-    } binary =
-      {
-        .val1        = 0x01,
-        .val2        = 0x02
-      };
-
-  char *str      = "shced note test";
+  char *str      = "sched note test";
   int count      = 0;
   char c         = 1;
   short s        = 2;
@@ -80,31 +70,30 @@ int main(int argc, FAR char *argv[])
   while (1)
     {
       sched_note_printf(NOTE_TAG_ALWAYS,
-                        "shced note test count = %d.", count++);
-      sched_note_string(NOTE_TAG_ALWAYS, str);
-      sched_note_dump(NOTE_TAG_ALWAYS, 1, &binary, sizeof(struct binary));
-      sched_note_bprintf(NOTE_TAG_ALWAYS, 2, "%hhd", c);
-      sched_note_bprintf(NOTE_TAG_ALWAYS, 3, "%hd", s);
-      sched_note_bprintf(NOTE_TAG_ALWAYS, 4, "%d", i);
-      sched_note_bprintf(NOTE_TAG_ALWAYS, 5, "%ld", l);
+                        "sched note test count = %d.", count++);
+      sched_note_mark(NOTE_TAG_ALWAYS, str);
+      sched_note_printf(NOTE_TAG_ALWAYS, "%hhd", c);
+      sched_note_printf(NOTE_TAG_ALWAYS, "%hd", s);
+      sched_note_printf(NOTE_TAG_ALWAYS, "%d", i);
+      sched_note_printf(NOTE_TAG_ALWAYS, "%ld", l);
 #ifdef CONFIG_HAVE_LONG_LONG
-      sched_note_bprintf(NOTE_TAG_ALWAYS, 6, "%lld", ll);
+      sched_note_printf(NOTE_TAG_ALWAYS, "%lld", ll);
 #endif
-      sched_note_bprintf(NOTE_TAG_ALWAYS, 7, "%jd", im);
-      sched_note_bprintf(NOTE_TAG_ALWAYS, 8, "%zd", sz);
-      sched_note_bprintf(NOTE_TAG_ALWAYS, 9, "%td", ptr);
+      sched_note_printf(NOTE_TAG_ALWAYS, "%jd", im);
+      sched_note_printf(NOTE_TAG_ALWAYS, "%zd", sz);
+      sched_note_printf(NOTE_TAG_ALWAYS, "%td", ptr);
 #ifdef CONFIG_HAVE_FLOAT
-      sched_note_bprintf(NOTE_TAG_ALWAYS, 10, "%e", f);
+      sched_note_printf(NOTE_TAG_ALWAYS, "%e", f);
 #endif
 #ifdef CONFIG_HAVE_DOUBLE
-      sched_note_bprintf(NOTE_TAG_ALWAYS, 11, "%le", d);
+      sched_note_printf(NOTE_TAG_ALWAYS, "%le", d);
 #endif
 #ifdef CONFIG_HAVE_LONG_DOUBLE
-      sched_note_bprintf(NOTE_TAG_ALWAYS, 12, "%Le", ld);
+      sched_note_printf(NOTE_TAG_ALWAYS, "%Le", ld);
 #endif
-      sched_note_bprintf(NOTE_TAG_ALWAYS, 13,
-                         "%hhd  %hd  %d  %ld  %lld  %jd  %zd  %td",
-                          c,    s,   i,  l,    ll,  im,  sz,  ptr);
+      sched_note_printf(NOTE_TAG_ALWAYS,
+                        "%hhd  %hd  %d  %ld  %lld  %jd  %zd  %td",
+                        c,    s,   i,  l,    ll,  im,  sz,  ptr);
       usleep(10);
     }
 

nshlib/nsh_syscmds.c

@@ -25,6 +25,7 @@
 #include <nuttx/config.h>
 
 #include <nuttx/power/pm.h>
+#include <nuttx/rpmsg/rpmsg.h>
 #include <nuttx/rptun/rptun.h>
 #include <nuttx/streams.h>
 #include <sys/boardctl.h>
@@ -118,6 +119,7 @@ static FAR const char * const g_resetflag[] =
   "panic",
   "bootloader",
   "recovery",
+  "restore",
   "factory",
   NULL
 };
@@ -290,7 +292,7 @@ int cmd_pmconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
       if (argc == 4)
         {
           ctrl.domain = atoi(argv[3]);
-          if (ctrl.domain < 0 || ctrl.domain >= CONFIG_PM_NDOMAINS)
+          if (ctrl.domain >= CONFIG_PM_NDOMAINS)
             {
               nsh_error(vtbl, g_fmtargrange, argv[3]);
               return ERROR;
@@ -581,7 +583,7 @@ static int cmd_rpmsg_once(FAR struct nsh_vtbl_s *vtbl,
 
       ping.times = atoi(argv[3]);
       ping.len   = atoi(argv[4]);
-      ping.ack   = atoi(argv[5]);
+      ping.cmd   = atoi(argv[5]);
       ping.sleep = atoi(argv[6]);
 
       cmd = RPMSGIOC_PING;
@@ -640,15 +642,17 @@ static int cmd_rpmsg_help(FAR struct nsh_vtbl_s *vtbl, int argc,
 {
   nsh_output(vtbl, "%s <panic|dump> <path>\n", argv[0]);
 #ifdef CONFIG_RPMSG_PING
-  nsh_output(vtbl, "%s ping <path> <times> <length> <ack> "
+  nsh_output(vtbl, "%s ping <path> <times> <length> <cmd> "
              "<period(ms)>\n\n", argv[0]);
   nsh_output(vtbl, "<times>      Number of ping operations.\n");
   nsh_output(vtbl, "<length>     The length of each ping packet.\n");
-  nsh_output(vtbl, "<ack>        Whether the peer acknowlege or "
+  nsh_output(vtbl, "<cmd>        Whether the peer acknowlege or "
              "check data.\n");
-  nsh_output(vtbl, "             0 - No acknowledge and check.\n");
-  nsh_output(vtbl, "             1 - Acknowledge, no data check.\n");
-  nsh_output(vtbl, "             2 - Acknowledge and data check.\n");
+  nsh_output(vtbl, "             Bit0 - Request need ack or not.\n");
+  nsh_output(vtbl, "             Bit1 - Check the data or not.\n");
+  nsh_output(vtbl, "             Bit2 - Random length or not.\n");
+  nsh_output(vtbl, "             Bit4~7 - Request or response or other"
+                                          "command for future use.\n");
   nsh_output(vtbl, "<sleep(ms)>  Sleep interval between two operations.\n");
 #endif
   nsh_output(vtbl, "<path>       Rpmsg device path.\n\n");

testing/batterydump/Kconfig → system/batterydump/Kconfig

@@ -3,26 +3,26 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 #
-config TESTING_BATTERYDUMP
-	tristate "Battery dump for test"
+config SYSTEM_BATTERYDUMP
+	tristate "Battery dump system tool"
 	default n
 	---help---
 		Enable the battery dump
 
-if TESTING_BATTERYDUMP
+if SYSTEM_BATTERYDUMP
 
-config TESTING_BATTERYDUMP_PROGNAME
+config SYSTEM_BATTERYDUMP_PROGNAME
 	string "Program name"
 	default "batterydump"
 	---help---
 		This is the name of the program that will be used when the NSH ELF
 		program is installed.
 
-config TESTING_BATTERYDUMP_PRIORITY
+config SYSTEM_BATTERYDUMP_PRIORITY
 	int "Battery dump task priority"
 	default 100
 
-config TESTING_BATTERYDUMP_STACKSIZE
+config SYSTEM_BATTERYDUMP_STACKSIZE
 	int "Battery dump stack size"
 	default DEFAULT_TASK_STACKSIZE
 

testing/batterydump/Make.defs → system/batterydump/Make.defs

@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/batterydump/Make.defs
+# apps/system/batterydump/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -18,6 +18,6 @@
 #
 ############################################################################
 
-ifneq ($(CONFIG_TESTING_BATTERYDUMP),)
-CONFIGURED_APPS += $(APPDIR)/testing/batterydump
+ifneq ($(CONFIG_SYSTEM_BATTERYDUMP),)
+CONFIGURED_APPS += $(APPDIR)/system/batterydump
 endif

testing/batterydump/Makefile → system/batterydump/Makefile

@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/batterydump/Makefile
+# apps/system/batterydump/Makefile
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -20,10 +20,10 @@
 
 include $(APPDIR)/Make.defs
 
-PROGNAME  = $(CONFIG_TESTING_BATTERYDUMP_PROGNAME)
-PRIORITY  = $(CONFIG_TESTING_BATTERYDUMP_PRIORITY)
-STACKSIZE = $(CONFIG_TESTING_BATTERYDUMP_STACKSIZE)
-MODULE    = $(CONFIG_TESTING_BATTERYDUMP)
+PROGNAME  = $(CONFIG_SYSTEM_BATTERYDUMP_PROGNAME)
+PRIORITY  = $(CONFIG_SYSTEM_BATTERYDUMP_PRIORITY)
+STACKSIZE = $(CONFIG_SYSTEM_BATTERYDUMP_STACKSIZE)
+MODULE    = $(CONFIG_SYSTEM_BATTERYDUMP)
 
 MAINSRC = batterydump.c
 

testing/batterydump/batterydump.c → system/batterydump/batterydump.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/batterydump/batterydump.c
+ * apps/system/batterydump/batterydump.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

system/gcov/Kconfig

@@ -5,7 +5,7 @@
 
 config SYSTEM_GCOV
 	tristate "gcov tool"
-	depends on ARCH_COVERAGE
+	depends on SCHED_GCOV
 	---help---
 		Enable support for the 'gcov' command.
 

system/gcov/gcov.c

@@ -23,6 +23,7 @@
  ****************************************************************************/
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 /****************************************************************************
@@ -35,11 +36,13 @@
 
 static void show_usage(FAR const char *progname)
 {
-  printf("\nUsage: %s [-d] [-r] [-h]\n", progname);
+  printf("\nUsage: %s [-d path] [-t strip] [-r] [-h]\n", progname);
   printf("\nWhere:\n");
-  printf("  -d dump the coverage.\n");
+  printf("  -d dump the coverage, path is the path to the coverage file\n");
+  printf("  -t strip the path prefix number\n");
   printf("  -r reset the coverage\n");
   printf("  -h show this text and exits.\n");
+  exit(EXIT_FAILURE);
 }
 
 /****************************************************************************
@@ -49,25 +52,49 @@ static void show_usage(FAR const char *progname)
 void __gcov_dump(void);
 void __gcov_reset(void);
 
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void gcov_dump(FAR const char * path, FAR const char *strip)
+{
+  if (path == NULL || access(path, F_OK) != 0 || atoi(strip) <= 0)
+    {
+      fprintf(stderr, "ERROR: Invalid parameter\n");
+      return;
+    }
+
+  setenv("GCOV_PREFIX_STRIP", strip, 1);
+  setenv("GCOV_PREFIX", path, 1);
+  __gcov_dump();
+}
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
 
 int main(int argc, FAR char *argv[])
 {
+  FAR const char *strip = "99";
+  FAR const char *path = NULL;
   int option;
 
   if (argc < 2)
     {
       show_usage(argv[0]);
     }
 
-  while ((option = getopt(argc, argv, "drh")) != ERROR)
+  while ((option = getopt(argc, argv, "d:t:rh")) != ERROR)
     {
       switch (option)
         {
           case 'd':
-            __gcov_dump();
+            path = optarg;
+            break;
+
+          case 't':
+            strip = optarg;
+
             break;
 
           case 'r':
@@ -83,5 +110,6 @@ int main(int argc, FAR char *argv[])
         }
     }
 
+  gcov_dump(path, strip);
   return 0;
 }

testing/drivertest/drivertest_pm_runtime.c

@@ -28,8 +28,10 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <setjmp.h>
 #include <string.h>
-#include <pthread.h>
 #include <cmocka.h>
 #include <nuttx/power/pm_runtime.h>
 

testing/drivertest/drivertest_regulator.c

@@ -28,8 +28,10 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <setjmp.h>
 #include <string.h>
-#include <pthread.h>
 #include <cmocka.h>
 #include <nuttx/power/consumer.h>
 
@@ -446,18 +448,17 @@ static void test_regulator_supply_4(FAR void **state)
                                              &g_fake_regulator);
   assert_false(NULL == g_fake_regulator.rdev);
   test = regulator_get(REGULATOR_ID);
-  assert_false(NULL == test);
+  assert_true(NULL == test);
   g_fake_regulator_supply.state = 0;
-  ret = regulator_enable(test);
-  assert_true(ret < 0);
   g_fake_regulator_supply.rdev = regulator_register(
                                              &g_fake_regulator_supply_desc,
                                              &g_fake_regulator_ops,
                                              &g_fake_regulator_supply);
   assert_false(NULL == g_fake_regulator_supply.rdev);
   assert_int_equal(g_fake_regulator_supply.state, 0);
   assert_int_equal(g_fake_regulator.state, 0);
-
+  test = regulator_get(REGULATOR_ID);
+  assert_false(NULL == test);
   while (cnt--)
     {
       ret = regulator_enable(test);
@@ -499,6 +500,7 @@ static void test_regulator_mode(FAR void **state)
   int ret = 0;
 
   g_fake_regulator.lpmode = 0;
+  g_fake_regulator_desc.supply_name = NULL;
   g_fake_regulator.rdev = regulator_register(&g_fake_regulator_desc,
                                              &g_fake_regulator_ops,
                                              &g_fake_regulator);