From e9c7df47694b241154722e38f035ad64edf665ce Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Wed, 1 Jul 2020 01:47:06 +0800 Subject: [PATCH] sched: Rename task_startup to nxtask_startup to follow the naming convention Signed-off-by: Xiang Xiao Change-Id: I3594d12a65e8cacea99bc295d622628304c3f9f8 --- .../imxrt/imxrt1050-evk/kernel/imxrt_userspace.c | 6 +++--- .../imxrt/imxrt1060-evk/kernel/imxrt_userspace.c | 6 +++--- .../lc823450-xgevk/kernel/lc823450_userspace.c | 12 ++++++------ .../lpc4088-devkit/kernel/lpc17_40_userspace.c | 2 +- .../lpc4088-quickstart/kernel/lpc17_40_userspace.c | 2 +- .../open1788/kernel/lpc17_40_userspace.c | 8 ++++---- .../pnev5180b/kernel/lpc17_40_userspace.c | 8 ++++---- .../lpc43xx/bambino-200e/kernel/lpc43_userspace.c | 8 ++++---- boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c | 6 +++--- .../samv7/same70-xplained/kernel/sam_userspace.c | 6 +++--- boards/arm/samv7/samv71-xult/kernel/sam_userspace.c | 13 +++++++------ .../stm32/clicker2-stm32/kernel/stm32_userspace.c | 12 ++++++------ .../stm32/mikroe-stm32f4/kernel/stm32_userspace.c | 13 +++++++------ .../olimex-stm32-p407/kernel/stm32_userspace.c | 13 +++++++------ boards/arm/stm32/omnibusf4/kernel/stm32_userspace.c | 6 +++--- .../stm32/stm3240g-eval/kernel/stm32_userspace.c | 13 +++++++------ .../stm32/stm32f4discovery/kernel/stm32_userspace.c | 13 +++++++------ .../stm32f746g-disco/kernel/stm32_userspace.c | 12 ++++++------ .../stm32f769i-disco/kernel/stm32_userspace.c | 12 ++++++------ .../stm32h7/nucleo-h743zi/kernel/stm32_userspace.c | 12 ++++++------ .../stm32h747i-disco/kernel/stm32_userspace.c | 12 ++++++------ .../stm32l476vg-disco/kernel/stm32l4_userspace.c | 12 ++++++------ .../stm32l4r9ai-disco/kernel/stm32l4_userspace.c | 6 +++--- boards/arm/tiva/lm3s6965-ek/kernel/lm_userspace.c | 12 ++++++------ boards/risc-v/k210/maix-bit/kernel/k210_userspace.c | 2 +- include/nuttx/userspace.h | 4 ++-- libs/libc/sched/task_startup.c | 4 ++-- 27 files changed, 120 insertions(+), 115 deletions(-) diff --git a/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c b/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c index 8336bae6ae..013dfc86dc 100644 --- a/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c +++ b/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c @@ -71,8 +71,8 @@ * * - The linker script defines, for example, the symbol_sdata. * - The declareion extern uint32_t _sdata; makes C happy. C will believe - * that the value _sdata is the address of a uint32_t variable _data (it is - * not!). + * that the value _sdata is the address of a uint32_t variable _data (it + * is not!). * - We can recoved the linker value then by simply taking the address of * of _data. like: uint32_t *pdata = &_sdata; */ @@ -108,7 +108,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = /* Task/thread startup routines */ - .task_startup = task_startup, + .task_startup = nxtask_startup, #ifndef CONFIG_DISABLE_PTHREAD .pthread_startup = pthread_startup, #endif diff --git a/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c b/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c index b730f66115..aa979a6120 100644 --- a/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c +++ b/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c @@ -71,8 +71,8 @@ * * - The linker script defines, for example, the symbol_sdata. * - The declareion extern uint32_t _sdata; makes C happy. C will believe - * that the value _sdata is the address of a uint32_t variable _data (it is - * not!). + * that the value _sdata is the address of a uint32_t variable _data (it + * is not!). * - We can recoved the linker value then by simply taking the address of * of _data. like: uint32_t *pdata = &_sdata; */ @@ -108,7 +108,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = /* Task/thread startup routines */ - .task_startup = task_startup, + .task_startup = nxtask_startup, #ifndef CONFIG_DISABLE_PTHREAD .pthread_startup = pthread_startup, #endif diff --git a/boards/arm/lc823450/lc823450-xgevk/kernel/lc823450_userspace.c b/boards/arm/lc823450/lc823450-xgevk/kernel/lc823450_userspace.c index b42fc785c7..007e6ad269 100644 --- a/boards/arm/lc823450/lc823450-xgevk/kernel/lc823450_userspace.c +++ b/boards/arm/lc823450/lc823450-xgevk/kernel/lc823450_userspace.c @@ -68,14 +68,14 @@ * Public Data ****************************************************************************/ -/* These 'addresses' of these values are setup by the linker script. They are - * not actual uint32_t storage locations! They are only used meaningfully in the - * following way: +/* These 'addresses' of these values are setup by the linker script. They are + * not actual uint32_t storage locations! They are only used meaningfully in + * the following way: * * - The linker script defines, for example, the symbol_sdata. * - The declaration extern uint32_t _sdata; makes C happy. C will believe - * that the value _sdata is the address of a uint32_t variable _data (it is - * not!). + * that the value _sdata is the address of a uint32_t variable _data (it + * is not!). * - We can recover the linker value then by simply taking the address of * of _data. like: uint32_t *pdata = &_sdata; */ @@ -111,7 +111,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = /* Task/thread startup routines */ - .task_startup = task_startup, + .task_startup = nxtask_startup, #ifndef CONFIG_DISABLE_PTHREAD .pthread_startup = pthread_startup, #endif diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c index 30204a06d5..89a4f6e6b0 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c +++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c @@ -108,7 +108,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = /* Task/thread startup routines */ - .task_startup = task_startup, + .task_startup = nxtask_startup, #ifndef CONFIG_DISABLE_PTHREAD .pthread_startup = pthread_startup, #endif diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c index f0ba0b6cf5..37a090ee87 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c +++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c @@ -108,7 +108,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = /* Task/thread startup routines */ - .task_startup = task_startup, + .task_startup = nxtask_startup, #ifndef CONFIG_DISABLE_PTHREAD .pthread_startup = pthread_startup, #endif diff --git a/boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c index 0489e31e9a..497f70a1f7 100644 --- a/boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c +++ b/boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c @@ -65,14 +65,14 @@ * Public Data ****************************************************************************/ -/* These 'addresses' of these values are setup by the linker script. They are +/* These 'addresses' of these values are setup by the linker script. They are * not actual uint32_t storage locations! They are only used meaningfully in * the following way: * * - The linker script defines, for example, the symbol_sdata. * - The declareion extern uint32_t _sdata; makes C happy. C will believe - * that the value _sdata is the address of a uint32_t variable _data (it is - * not!). + * that the value _sdata is the address of a uint32_t variable _data (it + * is not!). * - We can recoved the linker value then by simply taking the address of * of _data. like: uint32_t *pdata = &_sdata; */ @@ -108,7 +108,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = /* Task/thread startup routines */ - .task_startup = task_startup, + .task_startup = nxtask_startup, #ifndef CONFIG_DISABLE_PTHREAD .pthread_startup = pthread_startup, #endif diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c index eb611b4343..8dd5ba6963 100644 --- a/boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c +++ b/boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c @@ -70,14 +70,14 @@ * Public Data ****************************************************************************/ -/* These 'addresses' of these values are setup by the linker script. They are +/* These 'addresses' of these values are setup by the linker script. They are * not actual uint32_t storage locations! They are only used meaningfully in * the following way: * * - The linker script defines, for example, the symbol_sdata. * - The declareion extern uint32_t _sdata; makes C happy. C will believe - * that the value _sdata is the address of a uint32_t variable _data (it is - * not!). + * that the value _sdata is the address of a uint32_t variable _data (it + * is not!). * - We can recoved the linker value then by simply taking the address of * of _data. like: uint32_t *pdata = &_sdata; */ @@ -113,7 +113,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = /* Task/thread startup routines */ - .task_startup = task_startup, + .task_startup = nxtask_startup, #ifndef CONFIG_DISABLE_PTHREAD .pthread_startup = pthread_startup, #endif diff --git a/boards/arm/lpc43xx/bambino-200e/kernel/lpc43_userspace.c b/boards/arm/lpc43xx/bambino-200e/kernel/lpc43_userspace.c index eb6d6793b8..098b5e9527 100644 --- a/boards/arm/lpc43xx/bambino-200e/kernel/lpc43_userspace.c +++ b/boards/arm/lpc43xx/bambino-200e/kernel/lpc43_userspace.c @@ -66,14 +66,14 @@ * Public Data ****************************************************************************/ -/* These 'addresses' of these values are setup by the linker script. They are +/* These 'addresses' of these values are setup by the linker script. They are * not actual uint32_t storage locations! They are only used meaningfully in * the following way: * * - The linker script defines, for example, the symbol_sdata. * - The declaration extern uint32_t _sdata; makes C happy. C will believe - * that the value _sdata is the address of a uint32_t variable _data (it is - * not!). + * that the value _sdata is the address of a uint32_t variable _data (it + * is not!). * - We can recover the linker value then by simply taking the address of * of _data. like: uint32_t *pdata = &_sdata; */ @@ -109,7 +109,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = /* Task/thread startup routines */ - .task_startup = task_startup, + .task_startup = nxtask_startup, #ifndef CONFIG_DISABLE_PTHREAD .pthread_startup = pthread_startup, #endif diff --git a/boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c b/boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c index 38a31b51d3..389efe01a3 100644 --- a/boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c +++ b/boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c @@ -71,8 +71,8 @@ * * - The linker script defines, for example, the symbol_sdata. * - The declareion extern uint32_t _sdata; makes C happy. C will believe - * that the value _sdata is the address of a uint32_t variable _data (it is - * not!). + * that the value _sdata is the address of a uint32_t variable _data (it + * is not!). * - We can recoved the linker value then by simply taking the address of * of _data. like: uint32_t *pdata = &_sdata; */ @@ -108,7 +108,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = /* Task/thread startup routines */ - .task_startup = task_startup, + .task_startup = nxtask_startup, #ifndef CONFIG_DISABLE_PTHREAD .pthread_startup = pthread_startup, #endif diff --git a/boards/arm/samv7/same70-xplained/kernel/sam_userspace.c b/boards/arm/samv7/same70-xplained/kernel/sam_userspace.c index c4a92d1916..52a14cddc1 100644 --- a/boards/arm/samv7/same70-xplained/kernel/sam_userspace.c +++ b/boards/arm/samv7/same70-xplained/kernel/sam_userspace.c @@ -71,8 +71,8 @@ * * - The linker script defines, for example, the symbol_sdata. * - The declareion extern uint32_t _sdata; makes C happy. C will believe - * that the value _sdata is the address of a uint32_t variable _data (it is - * not!). + * that the value _sdata is the address of a uint32_t variable _data (it + * is not!). * - We can recoved the linker value then by simply taking the address of * of _data. like: uint32_t *pdata = &_sdata; */ @@ -108,7 +108,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = /* Task/thread startup routines */ - .task_startup = task_startup, + .task_startup = nxtask_startup, #ifndef CONFIG_DISABLE_PTHREAD .pthread_startup = pthread_startup, #endif diff --git a/boards/arm/samv7/samv71-xult/kernel/sam_userspace.c b/boards/arm/samv7/samv71-xult/kernel/sam_userspace.c index 458397e232..9453ebd0d9 100644 --- a/boards/arm/samv7/samv71-xult/kernel/sam_userspace.c +++ b/boards/arm/samv7/samv71-xult/kernel/sam_userspace.c @@ -50,6 +50,7 @@ /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ + /* Configuration ************************************************************/ #ifndef CONFIG_NUTTX_USERSPACE @@ -64,14 +65,14 @@ * Public Data ****************************************************************************/ -/* These 'addresses' of these values are setup by the linker script. They are - * not actual uint32_t storage locations! They are only used meaningfully in the - * following way: +/* These 'addresses' of these values are setup by the linker script. They are + * not actual uint32_t storage locations! They are only used meaningfully in + * the following way: * * - The linker script defines, for example, the symbol_sdata. * - The declareion extern uint32_t _sdata; makes C happy. C will believe - * that the value _sdata is the address of a uint32_t variable _data (it is - * not!). + * that the value _sdata is the address of a uint32_t variable _data (it + * is not!). * - We can recoved the linker value then by simply taking the address of * of _data. like: uint32_t *pdata = &_sdata; */ @@ -107,7 +108,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = /* Task/thread startup routines */ - .task_startup = task_startup, + .task_startup = nxtask_startup, #ifndef CONFIG_DISABLE_PTHREAD .pthread_startup = pthread_startup, #endif diff --git a/boards/arm/stm32/clicker2-stm32/kernel/stm32_userspace.c b/boards/arm/stm32/clicker2-stm32/kernel/stm32_userspace.c index d2fa4cd79d..c8d649d0dd 100644 --- a/boards/arm/stm32/clicker2-stm32/kernel/stm32_userspace.c +++ b/boards/arm/stm32/clicker2-stm32/kernel/stm32_userspace.c @@ -66,14 +66,14 @@ * Public Data ****************************************************************************/ -/* These 'addresses' of these values are setup by the linker script. They are - * not actual uint32_t storage locations! They are only used meaningfully in the - * following way: +/* These 'addresses' of these values are setup by the linker script. They are + * not actual uint32_t storage locations! They are only used meaningfully in + * the following way: * * - The linker script defines, for example, the symbol_sdata. * - The declaration extern uint32_t _sdata; makes C happy. C will believe - * that the value _sdata is the address of a uint32_t variable _data (it is - * not!). + * that the value _sdata is the address of a uint32_t variable _data (it + * is not!). * - We can recover the linker value then by simply taking the address of * of _data. like: uint32_t *pdata = &_sdata; */ @@ -109,7 +109,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = /* Task/thread startup routines */ - .task_startup = task_startup, + .task_startup = nxtask_startup, #ifndef CONFIG_DISABLE_PTHREAD .pthread_startup = pthread_startup, #endif diff --git a/boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c b/boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c index d4a4f101f1..30c433fecc 100644 --- a/boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c +++ b/boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c @@ -50,6 +50,7 @@ /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ + /* Configuration ************************************************************/ #ifndef CONFIG_NUTTX_USERSPACE @@ -64,14 +65,14 @@ * Public Data ****************************************************************************/ -/* These 'addresses' of these values are setup by the linker script. They are - * not actual uint32_t storage locations! They are only used meaningfully in the - * following way: +/* These 'addresses' of these values are setup by the linker script. They are + * not actual uint32_t storage locations! They are only used meaningfully in + * the following way: * * - The linker script defines, for example, the symbol_sdata. * - The declareion extern uint32_t _sdata; makes C happy. C will believe - * that the value _sdata is the address of a uint32_t variable _data (it is - * not!). + * that the value _sdata is the address of a uint32_t variable _data (it + * is not!). * - We can recoved the linker value then by simply taking the address of * of _data. like: uint32_t *pdata = &_sdata; */ @@ -107,7 +108,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = /* Task/thread startup routines */ - .task_startup = task_startup, + .task_startup = nxtask_startup, #ifndef CONFIG_DISABLE_PTHREAD .pthread_startup = pthread_startup, #endif diff --git a/boards/arm/stm32/olimex-stm32-p407/kernel/stm32_userspace.c b/boards/arm/stm32/olimex-stm32-p407/kernel/stm32_userspace.c index 8fd68d8d52..7a5f60fc12 100644 --- a/boards/arm/stm32/olimex-stm32-p407/kernel/stm32_userspace.c +++ b/boards/arm/stm32/olimex-stm32-p407/kernel/stm32_userspace.c @@ -51,6 +51,7 @@ /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ + /* Configuration ************************************************************/ #ifndef CONFIG_NUTTX_USERSPACE @@ -65,14 +66,14 @@ * Public Data ****************************************************************************/ -/* These 'addresses' of these values are setup by the linker script. They are - * not actual uint32_t storage locations! They are only used meaningfully in the - * following way: +/* These 'addresses' of these values are setup by the linker script. They are + * not actual uint32_t storage locations! They are only used meaningfully in + * the following way: * * - The linker script defines, for example, the symbol_sdata. * - The declaration extern uint32_t _sdata; makes C happy. C will believe - * that the value _sdata is the address of a uint32_t variable _data (it is - * not!). + * that the value _sdata is the address of a uint32_t variable _data (it + * is not!). * - We can recover the linker value then by simply taking the address of * of _data. like: uint32_t *pdata = &_sdata; */ @@ -108,7 +109,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = /* Task/thread startup routines */ - .task_startup = task_startup, + .task_startup = nxtask_startup, #ifndef CONFIG_DISABLE_PTHREAD .pthread_startup = pthread_startup, #endif diff --git a/boards/arm/stm32/omnibusf4/kernel/stm32_userspace.c b/boards/arm/stm32/omnibusf4/kernel/stm32_userspace.c index 3a4c31ec41..a3ffc8d745 100644 --- a/boards/arm/stm32/omnibusf4/kernel/stm32_userspace.c +++ b/boards/arm/stm32/omnibusf4/kernel/stm32_userspace.c @@ -74,8 +74,8 @@ * * - The linker script defines, for example, the symbol_sdata. * - The declaration extern uint32_t _sdata; makes C happy. C will believe - * that the value _sdata is the address of a uint32_t variable _data (it is - * not!). + * that the value _sdata is the address of a uint32_t variable _data (it + * is not!). * - We can recover the linker value then by simply taking the address of * of _data. like: uint32_t *pdata = &_sdata; */ @@ -111,7 +111,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = /* Task/thread startup routines */ - .task_startup = task_startup, + .task_startup = nxtask_startup, #ifndef CONFIG_DISABLE_PTHREAD .pthread_startup = pthread_startup, #endif diff --git a/boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c b/boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c index 778c29c047..31b6559f25 100644 --- a/boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c +++ b/boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c @@ -50,6 +50,7 @@ /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ + /* Configuration ************************************************************/ #ifndef CONFIG_NUTTX_USERSPACE @@ -64,14 +65,14 @@ * Public Data ****************************************************************************/ -/* These 'addresses' of these values are setup by the linker script. They are - * not actual uint32_t storage locations! They are only used meaningfully in the - * following way: +/* These 'addresses' of these values are setup by the linker script. They are + * not actual uint32_t storage locations! They are only used meaningfully in + * the following way: * * - The linker script defines, for example, the symbol_sdata. * - The declareion extern uint32_t _sdata; makes C happy. C will believe - * that the value _sdata is the address of a uint32_t variable _data (it is - * not!). + * that the value _sdata is the address of a uint32_t variable _data (it + * is not!). * - We can recoved the linker value then by simply taking the address of * of _data. like: uint32_t *pdata = &_sdata; */ @@ -107,7 +108,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = /* Task/thread startup routines */ - .task_startup = task_startup, + .task_startup = nxtask_startup, #ifndef CONFIG_DISABLE_PTHREAD .pthread_startup = pthread_startup, #endif diff --git a/boards/arm/stm32/stm32f4discovery/kernel/stm32_userspace.c b/boards/arm/stm32/stm32f4discovery/kernel/stm32_userspace.c index 0d02797165..5544a3a330 100644 --- a/boards/arm/stm32/stm32f4discovery/kernel/stm32_userspace.c +++ b/boards/arm/stm32/stm32f4discovery/kernel/stm32_userspace.c @@ -51,6 +51,7 @@ /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ + /* Configuration ************************************************************/ #ifndef CONFIG_NUTTX_USERSPACE @@ -65,14 +66,14 @@ * Public Data ****************************************************************************/ -/* These 'addresses' of these values are setup by the linker script. They are - * not actual uint32_t storage locations! They are only used meaningfully in the - * following way: +/* These 'addresses' of these values are setup by the linker script. They are + * not actual uint32_t storage locations! They are only used meaningfully in + * the following way: * * - The linker script defines, for example, the symbol_sdata. * - The declaration extern uint32_t _sdata; makes C happy. C will believe - * that the value _sdata is the address of a uint32_t variable _data (it is - * not!). + * that the value _sdata is the address of a uint32_t variable _data (it + * is not!). * - We can recover the linker value then by simply taking the address of * of _data. like: uint32_t *pdata = &_sdata; */ @@ -108,7 +109,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = /* Task/thread startup routines */ - .task_startup = task_startup, + .task_startup = nxtask_startup, #ifndef CONFIG_DISABLE_PTHREAD .pthread_startup = pthread_startup, #endif diff --git a/boards/arm/stm32f7/stm32f746g-disco/kernel/stm32_userspace.c b/boards/arm/stm32f7/stm32f746g-disco/kernel/stm32_userspace.c index 8d3b81ea36..a7c1c4689f 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/kernel/stm32_userspace.c +++ b/boards/arm/stm32f7/stm32f746g-disco/kernel/stm32_userspace.c @@ -66,14 +66,14 @@ * Public Data ****************************************************************************/ -/* These 'addresses' of these values are setup by the linker script. They are - * not actual uint32_t storage locations! They are only used meaningfully in the - * following way: +/* These 'addresses' of these values are setup by the linker script. They are + * not actual uint32_t storage locations! They are only used meaningfully in + * the following way: * * - The linker script defines, for example, the symbol_sdata. * - The declaration extern uint32_t _sdata; makes C happy. C will believe - * that the value _sdata is the address of a uint32_t variable _data (it is - * not!). + * that the value _sdata is the address of a uint32_t variable _data (it + * is not!). * - We can recover the linker value then by simply taking the address of * of _data. like: uint32_t *pdata = &_sdata; */ @@ -109,7 +109,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = /* Task/thread startup routines */ - .task_startup = task_startup, + .task_startup = nxtask_startup, #ifndef CONFIG_DISABLE_PTHREAD .pthread_startup = pthread_startup, #endif diff --git a/boards/arm/stm32f7/stm32f769i-disco/kernel/stm32_userspace.c b/boards/arm/stm32f7/stm32f769i-disco/kernel/stm32_userspace.c index bc33ab4af3..a7c60c0b79 100644 --- a/boards/arm/stm32f7/stm32f769i-disco/kernel/stm32_userspace.c +++ b/boards/arm/stm32f7/stm32f769i-disco/kernel/stm32_userspace.c @@ -66,14 +66,14 @@ * Public Data ****************************************************************************/ -/* These 'addresses' of these values are setup by the linker script. They are - * not actual uint32_t storage locations! They are only used meaningfully in the - * following way: +/* These 'addresses' of these values are setup by the linker script. They are + * not actual uint32_t storage locations! They are only used meaningfully in + * the following way: * * - The linker script defines, for example, the symbol_sdata. * - The declaration extern uint32_t _sdata; makes C happy. C will believe - * that the value _sdata is the address of a uint32_t variable _data (it is - * not!). + * that the value _sdata is the address of a uint32_t variable _data (it + * is not!). * - We can recover the linker value then by simply taking the address of * of _data. like: uint32_t *pdata = &_sdata; */ @@ -109,7 +109,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = /* Task/thread startup routines */ - .task_startup = task_startup, + .task_startup = nxtask_startup, #ifndef CONFIG_DISABLE_PTHREAD .pthread_startup = pthread_startup, #endif diff --git a/boards/arm/stm32h7/nucleo-h743zi/kernel/stm32_userspace.c b/boards/arm/stm32h7/nucleo-h743zi/kernel/stm32_userspace.c index 216773ff65..308a436901 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/kernel/stm32_userspace.c +++ b/boards/arm/stm32h7/nucleo-h743zi/kernel/stm32_userspace.c @@ -66,14 +66,14 @@ * Public Data ****************************************************************************/ -/* These 'addresses' of these values are setup by the linker script. They are - * not actual uint32_t storage locations! They are only used meaningfully in the - * following way: +/* These 'addresses' of these values are setup by the linker script. They are + * not actual uint32_t storage locations! They are only used meaningfully in + * the following way: * * - The linker script defines, for example, the symbol_sdata. * - The declaration extern uint32_t _sdata; makes C happy. C will believe - * that the value _sdata is the address of a uint32_t variable _data (it is - * not!). + * that the value _sdata is the address of a uint32_t variable _data (it + * is not!). * - We can recover the linker value then by simply taking the address of * of _data. like: uint32_t *pdata = &_sdata; */ @@ -109,7 +109,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = /* Task/thread startup routines */ - .task_startup = task_startup, + .task_startup = nxtask_startup, #ifndef CONFIG_DISABLE_PTHREAD .pthread_startup = pthread_startup, #endif diff --git a/boards/arm/stm32h7/stm32h747i-disco/kernel/stm32_userspace.c b/boards/arm/stm32h7/stm32h747i-disco/kernel/stm32_userspace.c index 1b50b8e006..c606734984 100644 --- a/boards/arm/stm32h7/stm32h747i-disco/kernel/stm32_userspace.c +++ b/boards/arm/stm32h7/stm32h747i-disco/kernel/stm32_userspace.c @@ -66,14 +66,14 @@ * Public Data ****************************************************************************/ -/* These 'addresses' of these values are setup by the linker script. They are - * not actual uint32_t storage locations! They are only used meaningfully in the - * following way: +/* These 'addresses' of these values are setup by the linker script. They are + * not actual uint32_t storage locations! They are only used meaningfully in + * the following way: * * - The linker script defines, for example, the symbol_sdata. * - The declaration extern uint32_t _sdata; makes C happy. C will believe - * that the value _sdata is the address of a uint32_t variable _data (it is - * not!). + * that the value _sdata is the address of a uint32_t variable _data (it + * is not!). * - We can recover the linker value then by simply taking the address of * of _data. like: uint32_t *pdata = &_sdata; */ @@ -109,7 +109,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = /* Task/thread startup routines */ - .task_startup = task_startup, + .task_startup = nxtask_startup, #ifndef CONFIG_DISABLE_PTHREAD .pthread_startup = pthread_startup, #endif diff --git a/boards/arm/stm32l4/stm32l476vg-disco/kernel/stm32l4_userspace.c b/boards/arm/stm32l4/stm32l476vg-disco/kernel/stm32l4_userspace.c index 5c2f957aca..31d8517957 100644 --- a/boards/arm/stm32l4/stm32l476vg-disco/kernel/stm32l4_userspace.c +++ b/boards/arm/stm32l4/stm32l476vg-disco/kernel/stm32l4_userspace.c @@ -66,14 +66,14 @@ * Public Data ****************************************************************************/ -/* These 'addresses' of these values are setup by the linker script. They are - * not actual uint32_t storage locations! They are only used meaningfully in the - * following way: +/* These 'addresses' of these values are setup by the linker script. They are + * not actual uint32_t storage locations! They are only used meaningfully in + * the following way: * * - The linker script defines, for example, the symbol_sdata. * - The declaration extern uint32_t _sdata; makes C happy. C will believe - * that the value _sdata is the address of a uint32_t variable _data (it is - * not!). + * that the value _sdata is the address of a uint32_t variable _data (it + * is not!). * - We can recover the linker value then by simply taking the address of * of _data. like: uint32_t *pdata = &_sdata; */ @@ -109,7 +109,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = /* Task/thread startup routines */ - .task_startup = task_startup, + .task_startup = nxtask_startup, #ifndef CONFIG_DISABLE_PTHREAD .pthread_startup = pthread_startup, #endif diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/kernel/stm32l4_userspace.c b/boards/arm/stm32l4/stm32l4r9ai-disco/kernel/stm32l4_userspace.c index aa5ae46fd1..32f52bb272 100644 --- a/boards/arm/stm32l4/stm32l4r9ai-disco/kernel/stm32l4_userspace.c +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/kernel/stm32l4_userspace.c @@ -72,8 +72,8 @@ * * - The linker script defines, for example, the symbol_sdata. * - The declaration extern uint32_t _sdata; makes C happy. C will believe - * that the value _sdata is the address of a uint32_t variable _data (it is - * not!). + * that the value _sdata is the address of a uint32_t variable _data (it + * is not!). * - We can recover the linker value then by simply taking the address of * of _data. like: uint32_t *pdata = &_sdata; */ @@ -109,7 +109,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = /* Task/thread startup routines */ - .task_startup = task_startup, + .task_startup = nxtask_startup, #ifndef CONFIG_DISABLE_PTHREAD .pthread_startup = pthread_startup, #endif diff --git a/boards/arm/tiva/lm3s6965-ek/kernel/lm_userspace.c b/boards/arm/tiva/lm3s6965-ek/kernel/lm_userspace.c index 8a81fd5f85..6873dc10bd 100644 --- a/boards/arm/tiva/lm3s6965-ek/kernel/lm_userspace.c +++ b/boards/arm/tiva/lm3s6965-ek/kernel/lm_userspace.c @@ -51,14 +51,14 @@ * Public Data ****************************************************************************/ -/* These 'addresses' of these values are setup by the linker script. They are - * not actual uint32_t storage locations! They are only used meaningfully in the - * following way: +/* These 'addresses' of these values are setup by the linker script. They are + * not actual uint32_t storage locations! They are only used meaningfully in + * the following way: * * - The linker script defines, for example, the symbol_sdata. * - The declaration extern uint32_t _sdata; makes C happy. C will believe - * that the value _sdata is the address of a uint32_t variable _data (it is - * not!). + * that the value _sdata is the address of a uint32_t variable _data (it + * is not!). * - We can recover the linker value then by simply taking the address of * of _data. like: uint32_t *pdata = &_sdata; */ @@ -94,7 +94,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = /* Task/thread startup routines */ - .task_startup = task_startup, + .task_startup = nxtask_startup, #ifndef CONFIG_DISABLE_PTHREAD .pthread_startup = pthread_startup, #endif diff --git a/boards/risc-v/k210/maix-bit/kernel/k210_userspace.c b/boards/risc-v/k210/maix-bit/kernel/k210_userspace.c index 70657c7b6d..09335202b3 100644 --- a/boards/risc-v/k210/maix-bit/kernel/k210_userspace.c +++ b/boards/risc-v/k210/maix-bit/kernel/k210_userspace.c @@ -94,7 +94,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = /* Task/thread startup routines */ - .task_startup = task_startup, + .task_startup = nxtask_startup, #ifndef CONFIG_DISABLE_PTHREAD .pthread_startup = pthread_startup, #endif diff --git a/include/nuttx/userspace.h b/include/nuttx/userspace.h index c849b8ab5a..09ca6579a2 100644 --- a/include/nuttx/userspace.h +++ b/include/nuttx/userspace.h @@ -153,7 +153,7 @@ extern "C" ****************************************************************************/ /**************************************************************************** - * Name: task_startup + * Name: nxtask_startup * * Description: * This function is the user-space, task startup function. It is called @@ -169,7 +169,7 @@ extern "C" ****************************************************************************/ #ifndef __KERNEL__ -void task_startup(main_t entrypt, int argc, FAR char *argv[]) +void nxtask_startup(main_t entrypt, int argc, FAR char *argv[]) noreturn_function; #endif diff --git a/libs/libc/sched/task_startup.c b/libs/libc/sched/task_startup.c index a604a5ff96..e9305558fa 100644 --- a/libs/libc/sched/task_startup.c +++ b/libs/libc/sched/task_startup.c @@ -51,7 +51,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: task_startup + * Name: nxtask_startup * * Description: * This function is the user-space, task startup function. It is called @@ -66,7 +66,7 @@ * ****************************************************************************/ -void task_startup(main_t entrypt, int argc, FAR char *argv[]) +void nxtask_startup(main_t entrypt, int argc, FAR char *argv[]) { DEBUGASSERT(entrypt);