Skip to content

Replace macros with config options #8106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 22, 2018
Merged

Replace macros with config options #8106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions platform/mbed_lib.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,31 @@
"help": "Enable tracing of each memory call by invoking a callback on each memory operation. See mbed_mem_trace.h in the HAL API for more information",
"value": false
},
"sys-stats-enabled": {
"macro_name": "MBED_SYS_STATS_ENABLED",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Setting this as macro name will set the macro? Wow I didn't knew we can actually rename long MBED_CONF parameters using this..

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah it's super helpful but not a really well known feature.

"help": "Set to 1 to enable system stats. When enabled the function mbed_stats_sys_get returns non-zero data. See mbed_stats.h for more information",
"value": null
},
"stack-stats-enabled": {
"macro_name": "MBED_STACK_STATS_ENABLED",
"help": "Set to 1 to enable stack stats. When enabled the functions mbed_stats_stack_get and mbed_stats_stack_get_each return non-zero data. See mbed_stats.h for more information",
"value": null
},
"cpu-stats-enabled": {
"macro_name": "MBED_CPU_STATS_ENABLED",
"help": "Set to 1 to enable cpu stats. When enabled the function mbed_stats_cpu_get returns non-zero data. See mbed_stats.h for more information",
"value": null
},
"heap-stats-enabled": {
"macro_name": "MBED_HEAP_STATS_ENABLED",
"help": "Set to 1 to enable heap stats. When enabled the function mbed_stats_heap_get returns non-zero data. See mbed_stats.h for more information",
"value": null
},
"thread-stats-enabled": {
"macro_name": "MBED_THREAD_STATS_ENABLED",
"help": "Set to 1 to enable thread stats. When enabled the function mbed_stats_thread_get_each returns non-zero data. See mbed_stats.h for more information",
"value": null
},
"error-decode-http-url-str": {
"help": "HTTP URL string for ARM Mbed-OS Error Decode microsite",
"value": "\"\\nFor more info, visit: https:/\\/armmbed.github.io/mbedos-error/?error=0x%08X\""
Expand Down
3 changes: 1 addition & 2 deletions rtos/TARGET_CORTEX/mbed_rtos_rtx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@

osThreadAttr_t _main_thread_attr;

/** The main thread's stack size can be configured by the application, if not explicitly specified it'll default to 4K */
#ifndef MBED_CONF_APP_MAIN_STACK_SIZE
#define MBED_CONF_APP_MAIN_STACK_SIZE 4096
#define MBED_CONF_APP_MAIN_STACK_SIZE MBED_CONF_RTOS_MAIN_THREAD_STACK_SIZE
#endif
MBED_ALIGN(8) char _main_stack[MBED_CONF_APP_MAIN_STACK_SIZE];
mbed_rtos_storage_thread_t _main_obj;
Expand Down
23 changes: 10 additions & 13 deletions rtos/TARGET_CORTEX/mbed_rtx_conf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,26 +27,23 @@
/** Any access to RTX5 specific data structures used in common code should be wrapped in ifdef MBED_OS_BACKEND_RTX5 */
#define MBED_OS_BACKEND_RTX5

/** The thread's stack size can be configured by the application, if not explicitly specified it'll default to 4K */
#ifndef MBED_CONF_APP_THREAD_STACK_SIZE
#define MBED_CONF_APP_THREAD_STACK_SIZE 4096
#endif

#if defined(MBED_CONF_APP_THREAD_STACK_SIZE)
#define OS_STACK_SIZE MBED_CONF_APP_THREAD_STACK_SIZE

/** The timer thread's stack size can be configured by the application, if not explicitly specified, it'll default to 768 */
#ifndef MBED_CONF_APP_TIMER_THREAD_STACK_SIZE
#define MBED_CONF_APP_TIMER_THREAD_STACK_SIZE 768
#else
#define OS_STACK_SIZE MBED_CONF_RTOS_THREAD_STACK_SIZE
#endif

#ifdef MBED_CONF_APP_TIMER_THREAD_STACK_SIZE
#define OS_TIMER_THREAD_STACK_SIZE MBED_CONF_APP_TIMER_THREAD_STACK_SIZE

/** The idle thread's stack size can be configured by the application, if not explicitly specified, it'll default to 512 */
#ifndef MBED_CONF_APP_IDLE_THREAD_STACK_SIZE
#define MBED_CONF_APP_IDLE_THREAD_STACK_SIZE 512
#else
#define OS_TIMER_THREAD_STACK_SIZE MBED_CONF_RTOS_TIMER_THREAD_STACK_SIZE
#endif

#ifdef MBED_CONF_APP_IDLE_THREAD_STACK_SIZE
#define OS_IDLE_THREAD_STACK_SIZE MBED_CONF_APP_IDLE_THREAD_STACK_SIZE
#else
#define OS_IDLE_THREAD_STACK_SIZE MBED_CONF_RTOS_IDLE_THREAD_STACK_SIZE
#endif

#define OS_DYNAMIC_MEM_SIZE 0

Expand Down
18 changes: 17 additions & 1 deletion rtos/mbed_lib.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,23 @@
{
"name": "rtos",
"config": {
"present": 1
"present": 1,
"main-thread-stack-size": {
"help": "The size of the main thread's stack",
"value": 4096
},
"timer-thread-stack-size": {
"help": "The size of the timer thread's stack",
"value": 768
},
"idle-thread-stack-size": {
"help": "The size of the idle thread's stack",
"value": 512
},
"thread-stack-size": {
"help": "The default stack size of new threads",
"value": 4096
}
},
"macros": ["_RTE_"]
}