sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers/note: fix build break by note rename change

Browse Source 
Regression by:

| commit 4e6041a46c536e602c30d7f2cf4cc079eae626c7 (HEAD, origin/master, origin/HEAD)
| Author: Xiang Xiao <xiaoxiang@xiaomi.com>
| Date:   Tue Feb 14 01:17:13 2023 +0800
|
|     system: Change DRIVER_NOTExxx to DRIVERS_NOTExxx
|
|     follow the kernel side change: https://github.com/apache/nuttx/pull/8531
|
|     Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>

Signed-off-by: chao an <anchao@xiaomi.com>
This commit is contained in:
chao an 2023-02-20 15:23:39 +08:00 committed by Xiang Xiao
parent 4e6041a46c
commit cf4db3f62d
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/README.md
View File

@ -2031,7 +2031,7 @@ specific watchdog hardware settings might require additional settings).
- `CONFIG_WATCHDOG` – Enables watchdog timer support. - `CONFIG_WATCHDOG` – Enables watchdog timer support.
- `CONFIG_NSH_BUILTIN_APPS` – Build this example an NSH built-in - `CONFIG_NSH_BUILTIN_APPS` – Build this example an NSH built-in
function. function.
- `CONFIG_DRIVER_NOTE` and `CONFIG_SCHED_INSTRUMENTATION` – Allows the watcher - `CONFIG_DRIVERS_NOTE` and `CONFIG_SCHED_INSTRUMENTATION` – Allows the watcher
to get the tasks' names. to get the tasks' names.
- `CONFIG_FS_FAT` – Allows the creation of a FAT filesystem on the ramdisk - `CONFIG_FS_FAT` – Allows the creation of a FAT filesystem on the ramdisk
to create a file with all the necessary info for the watched tasks. to create a file with all the necessary info for the watched tasks.

2
system/trace/Makefile
View File

@ -27,7 +27,7 @@ PRIORITY = $(CONFIG_SYSTEM_TRACE_PRIORITY)
STACKSIZE = $(CONFIG_SYSTEM_TRACE_STACKSIZE) STACKSIZE = $(CONFIG_SYSTEM_TRACE_STACKSIZE)
MODULE = $(CONFIG_SYSTEM_TRACE) MODULE = $(CONFIG_SYSTEM_TRACE)
ifeq ($(CONFIG_DRIVER_NOTERAM),y) ifeq ($(CONFIG_DRIVERS_NOTERAM),y)
CSRCS = trace_dump.c CSRCS = trace_dump.c
endif endif

10
system/trace/trace.c
View File

@ -138,7 +138,7 @@ static int trace_cmd_start(int index, int argc, FAR char **argv,
* Name: trace_cmd_dump * Name: trace_cmd_dump
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_DRIVER_NOTERAM #ifdef CONFIG_DRIVERS_NOTERAM
static int trace_cmd_dump(int index, int argc, FAR char **argv, static int trace_cmd_dump(int index, int argc, FAR char **argv,
int notectlfd) int notectlfd)
{ {
@ -335,7 +335,7 @@ static int trace_cmd_mode(int index, int argc, FAR char **argv,
switch (argv[index][1]) switch (argv[index][1])
{ {
#ifdef CONFIG_DRIVER_NOTERAM #ifdef CONFIG_DRIVERS_NOTERAM
case 'o': /* Overwrite mode */ case 'o': /* Overwrite mode */
owmode = enable; owmode = enable;
break; break;
@ -431,7 +431,7 @@ static int trace_cmd_mode(int index, int argc, FAR char **argv,
(mode.flag & NOTE_FILTER_MODE_FLAG_ENABLE) ? (mode.flag & NOTE_FILTER_MODE_FLAG_ENABLE) ?
"enabled" : "disabled"); "enabled" : "disabled");
#ifdef CONFIG_DRIVER_NOTERAM #ifdef CONFIG_DRIVERS_NOTERAM
printf(" Overwrite : %s\n", printf(" Overwrite : %s\n",
owmode ? "on (+o)" : "off (-o)"); owmode ? "on (+o)" : "off (-o)");
#endif #endif
@ -799,7 +799,7 @@ static void show_usage(void)
" cmd [-c] <command> [<args>...] :" " cmd [-c] <command> [<args>...] :"
" Get the trace while running <command>\n" " Get the trace while running <command>\n"
#endif #endif
#ifdef CONFIG_DRIVER_NOTERAM #ifdef CONFIG_DRIVERS_NOTERAM
" dump [-a][-c][<filename>] :" " dump [-a][-c][<filename>] :"
" Output the trace result\n" " Output the trace result\n"
" [-a] <Android SysTrace>\n" " [-a] <Android SysTrace>\n"
@ -869,7 +869,7 @@ int main(int argc, FAR char *argv[])
i++; i++;
notectl_enable(false, notectlfd); notectl_enable(false, notectlfd);
} }
#ifdef CONFIG_DRIVER_NOTERAM #ifdef CONFIG_DRIVERS_NOTERAM
else if (strcmp(argv[i], "dump") == 0) else if (strcmp(argv[i], "dump") == 0)
{ {
i = trace_cmd_dump(i + 1, argc, argv, notectlfd); i = trace_cmd_dump(i + 1, argc, argv, notectlfd);

6
system/trace/trace.h
View File

@ -55,7 +55,7 @@ typedef enum
* Public Function Prototypes * Public Function Prototypes
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_DRIVER_NOTERAM #ifdef CONFIG_DRIVERS_NOTERAM
/**************************************************************************** /****************************************************************************
* Name: trace_dump * Name: trace_dump
@ -97,14 +97,14 @@ bool trace_dump_get_overwrite(void);
void trace_dump_set_overwrite(bool mode); void trace_dump_set_overwrite(bool mode);
#else /* CONFIG_DRIVER_NOTERAM */ #else /* CONFIG_DRIVERS_NOTERAM */
#define trace_dump(type,out) #define trace_dump(type,out)
#define trace_dump_clear() #define trace_dump_clear()
#define trace_dump_get_overwrite() 0 #define trace_dump_get_overwrite() 0
#define trace_dump_set_overwrite(mode) (void)(mode) #define trace_dump_set_overwrite(mode) (void)(mode)
#endif /* CONFIG_DRIVER_NOTERAM */ #endif /* CONFIG_DRIVERS_NOTERAM */
#undef EXTERN #undef EXTERN
#ifdef __cplusplus #ifdef __cplusplus