diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-08-30 20:13:50 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-08-30 20:13:50 +0000 |
| commit | 79c7065433ae27932ad8b781d38b8f7832b01581 (patch) | |
| tree | f770414832eeecb35adb70404b31d147afad7235 /apps | |
| parent | f9d19788072090be80b71ab0d0de14507a6e739b (diff) | |
| download | px4-nuttx-79c7065433ae27932ad8b781d38b8f7832b01581.tar.gz px4-nuttx-79c7065433ae27932ad8b781d38b8f7832b01581.tar.bz2 px4-nuttx-79c7065433ae27932ad8b781d38b8f7832b01581.zip | |
Add configurable application entry point
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5070 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps')
55 files changed, 376 insertions, 579 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index e5c0b33a5..1178c203c 100755 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -291,3 +291,7 @@ treads! * apps/nshlib/nsh.h: Both CONFIG_LIBC_STRERROR and CONFIG_NSH_STRERROR must be defined to use strerror() with NSH. + * apps/examples/*/*_main.c, system/i2c/i2c_main.c, and others: Added + configuration variable CONFIG_USER_ENTRYPOINT that may be used to change + the default entry from user_start to some other symbol. Contributed by + Kate. diff --git a/apps/README.txt b/apps/README.txt index 426658572..f9c9ececd 100644 --- a/apps/README.txt +++ b/apps/README.txt @@ -118,7 +118,7 @@ the NuttX configuration file: CONFIG_BUILTIN_APP_START=<application name> that application shall be invoked immediately after system starts -*instead* of the normal, default "user_start" entry point. +*instead* of the default "user_start" entry point. Note that <application name> must be provided as: "hello", will call: diff --git a/apps/examples/adc/adc_main.c b/apps/examples/adc/adc_main.c index b88032654..4797265db 100644 --- a/apps/examples/adc/adc_main.c +++ b/apps/examples/adc/adc_main.c @@ -57,14 +57,6 @@ * Pre-processor Definitions ****************************************************************************/ -#ifdef CONFIG_NSH_BUILTIN_APPS -# define MAIN_NAME adc_main -# define MAIN_STRING "adc_main: " -#else -# define MAIN_NAME user_start -# define MAIN_STRING "user_start: " -#endif - /**************************************************************************** * Private Types ****************************************************************************/ @@ -223,10 +215,10 @@ static void parse_args(FAR struct adc_state_s *adc, int argc, FAR char **argv) ****************************************************************************/ /**************************************************************************** - * Name: user_start/adc_main + * Name: adc_main ****************************************************************************/ -int MAIN_NAME(int argc, char *argv[]) +int adc_main(int argc, char *argv[]) { struct adc_msg_s sample[CONFIG_EXAMPLES_ADC_GROUPSIZE]; size_t readsize; @@ -244,11 +236,11 @@ int MAIN_NAME(int argc, char *argv[]) * this test. */ - message(MAIN_STRING "Initializing external ADC device\n"); + message("adc_main: Initializing external ADC device\n"); ret = adc_devinit(); if (ret != OK) { - message(MAIN_STRING "adc_devinit failed: %d\n", ret); + message("adc_main: adc_devinit failed: %d\n", ret); errval = 1; goto errout; } @@ -276,18 +268,18 @@ int MAIN_NAME(int argc, char *argv[]) */ #if defined(CONFIG_NSH_BUILTIN_APPS) || defined(CONFIG_EXAMPLES_ADC_NSAMPLES) - message(MAIN_STRING "g_adcstate.count: %d\n", g_adcstate.count); + message("adc_main: g_adcstate.count: %d\n", g_adcstate.count); #endif /* Open the ADC device for reading */ - message(MAIN_STRING "Hardware initialized. Opening the ADC device: %s\n", + message("adc_main: Hardware initialized. Opening the ADC device: %s\n", g_adcstate.devpath); fd = open(g_adcstate.devpath, O_RDONLY); if (fd < 0) { - message(MAIN_STRING "open %s failed: %d\n", g_adcstate.devpath, errno); + message("adc_main: open %s failed: %d\n", g_adcstate.devpath, errno); errval = 2; goto errout_with_dev; } @@ -322,17 +314,17 @@ int MAIN_NAME(int argc, char *argv[]) errval = errno; if (errval != EINTR) { - message(MAIN_STRING "read %s failed: %d\n", + message("adc_main: read %s failed: %d\n", g_adcstate.devpath, errval); errval = 3; goto errout_with_dev; } - message(MAIN_STRING "Interrupted read...\n"); + message("adc_main: Interrupted read...\n"); } else if (nbytes == 0) { - message(MAIN_STRING "No data read, Ignoring\n"); + message("adc_main: No data read, Ignoring\n"); } /* Print the sample data on successful return */ @@ -342,7 +334,7 @@ int MAIN_NAME(int argc, char *argv[]) int nsamples = nbytes / sizeof(struct adc_msg_s); if (nsamples * sizeof(struct adc_msg_s) != nbytes) { - message(MAIN_STRING "read size=%d is not a multiple of sample size=%d, Ignoring\n", + message("adc_main: read size=%d is not a multiple of sample size=%d, Ignoring\n", nbytes, sizeof(struct adc_msg_s)); } else diff --git a/apps/examples/buttons/main.c b/apps/examples/buttons/main.c index fe447ca6b..50124512c 100644 --- a/apps/examples/buttons/main.c +++ b/apps/examples/buttons/main.c @@ -130,16 +130,6 @@ #define NUM_BUTTONS (MAX_BUTTON - MIN_BUTTON + 1) #define BUTTON_INDEX(b) ((b)-MIN_BUTTON) -/* Is this being built as an NSH built-in application? */ - -#ifdef CONFIG_NSH_BUILTIN_APPS -# define MAIN_NAME buttons_main -# define MAIN_STRING "buttons_main: " -#else -# define MAIN_NAME user_start -# define MAIN_STRING "user_start: " -#endif - /**************************************************************************** * Private Types ****************************************************************************/ @@ -399,10 +389,10 @@ static int button7_handler(int irq, FAR void *context) ****************************************************************************/ /**************************************************************************** - * user_start/buttons_main + * buttons_main ****************************************************************************/ -int MAIN_NAME(int argc, char *argv[]) +int buttons_main(int argc, char *argv[]) { uint8_t newset; irqstate_t flags; diff --git a/apps/examples/can/can_main.c b/apps/examples/can/can_main.c index 0ea729e5e..d3ca24119 100644 --- a/apps/examples/can/can_main.c +++ b/apps/examples/can/can_main.c @@ -76,14 +76,6 @@ # define MAX_ID (1 << 11) #endif -#ifdef CONFIG_NSH_BUILTIN_APPS -# define MAIN_NAME can_main -# define MAIN_STRING "can_main: " -#else -# define MAIN_NAME user_start -# define MAIN_STRING "user_start: " -#endif - /**************************************************************************** * Private Types ****************************************************************************/ @@ -109,10 +101,10 @@ ****************************************************************************/ /**************************************************************************** - * Name: user_start/can_main + * Name: can_main ****************************************************************************/ -int MAIN_NAME(int argc, char *argv[]) +int can_main(int argc, char *argv[]) { #ifndef CONFIG_EXAMPLES_CAN_READONLY struct can_msg_s txmsg; @@ -150,31 +142,31 @@ int MAIN_NAME(int argc, char *argv[]) { nmsgs = strtol(argv[1], NULL, 10); } - message(MAIN_STRING "nmsgs: %d\n", nmsgs); + message("can_main: nmsgs: %d\n", nmsgs); #elif defined(CONFIG_EXAMPLES_CAN_NMSGS) - message(MAIN_STRING "nmsgs: %d\n", CONFIG_EXAMPLES_CAN_NMSGS); + message("can_main: nmsgs: %d\n", CONFIG_EXAMPLES_CAN_NMSGS); #endif /* Initialization of the CAN hardware is performed by logic external to * this test. */ - message(MAIN_STRING "Initializing external CAN device\n"); + message("can_main: Initializing external CAN device\n"); ret = can_devinit(); if (ret != OK) { - message(MAIN_STRING "can_devinit failed: %d\n", ret); + message("can_main: can_devinit failed: %d\n", ret); errval = 1; goto errout; } /* Open the CAN device for reading */ - message(MAIN_STRING "Hardware initialized. Opening the CAN device\n"); + message("can_main: Hardware initialized. Opening the CAN device\n"); fd = open(CONFIG_EXAMPLES_CAN_DEVPATH, CAN_OFLAGS); if (fd < 0) { - message(MAIN_STRING "open %s failed: %d\n", + message("can_main: open %s failed: %d\n", CONFIG_EXAMPLES_CAN_DEVPATH, errno); errval = 2; goto errout_with_dev; diff --git a/apps/examples/composite/composite.h b/apps/examples/composite/composite.h index fab498c9f..73a4453be 100644 --- a/apps/examples/composite/composite.h +++ b/apps/examples/composite/composite.h @@ -169,16 +169,6 @@ #define TRACE_BITSET (TRACE_INIT_BITS|TRACE_ERROR_BITS|TRACE_CLASS_BITS|\ TRACE_TRANSFER_BITS|TRACE_CONTROLLER_BITS|TRACE_INTERRUPT_BITS) -/* Entry point **************************************************************/ - -#ifdef CONFIG_NSH_BUILTIN_APPS -# define MAIN_NAME conn_main -# define MAIN_NAME_STRING "conn" -#else -# define MAIN_NAME user_start -# define MAIN_NAME_STRING "user_start" -#endif - /* Debug ********************************************************************/ #ifdef CONFIG_CPP_HAVE_VARARGS diff --git a/apps/examples/composite/composite_main.c b/apps/examples/composite/composite_main.c index 6c2a86287..b965eacb7 100644 --- a/apps/examples/composite/composite_main.c +++ b/apps/examples/composite/composite_main.c @@ -662,7 +662,7 @@ void board_cdcuninitialize(FAR struct usbdevclass_driver_s *classdev) } /**************************************************************************** - * user_start/conn_main + * conn_main * * Description: * This is the main program that configures the USB mass storage device @@ -672,7 +672,7 @@ void board_cdcuninitialize(FAR struct usbdevclass_driver_s *classdev) * ****************************************************************************/ -int MAIN_NAME(int argc, char *argv[]) +int conn_main(int argc, char *argv[]) { int ret; @@ -688,7 +688,7 @@ int MAIN_NAME(int argc, char *argv[]) if (g_composite.cmphandle) { - message(MAIN_NAME_STRING ": ERROR: Already connected\n"); + message("conn_main: ERROR: Already connected\n"); return 1; } #endif @@ -705,11 +705,11 @@ int MAIN_NAME(int argc, char *argv[]) /* Perform architecture-specific initialization */ - message(MAIN_NAME_STRING ": Performing architecture-specific intialization\n"); + message("conn_main: Performing architecture-specific intialization\n"); ret = composite_archinitialize(); if (ret < 0) { - message(MAIN_NAME_STRING ": composite_archinitialize failed: %d\n", -ret); + message("conn_main: composite_archinitialize failed: %d\n", -ret); return 1; } check_test_memory_usage("After composite_archinitialize()"); @@ -719,7 +719,7 @@ int MAIN_NAME(int argc, char *argv[]) g_composite.cmphandle = composite_initialize(); if (!g_composite.cmphandle) { - message(MAIN_NAME_STRING ": composite_initialize failed\n"); + message("conn_main: composite_initialize failed\n"); return 1; } check_test_memory_usage("After composite_initialize()"); @@ -774,7 +774,7 @@ int MAIN_NAME(int argc, char *argv[]) /* Dump trace data */ # ifdef CONFIG_USBDEV_TRACE - message("\n" MAIN_NAME_STRING ": USB TRACE DATA:\n"); + message("\n" "conn_main: USB TRACE DATA:\n"); ret = dumptrace(); if (ret < 0) { @@ -782,18 +782,18 @@ int MAIN_NAME(int argc, char *argv[]) } check_test_memory_usage("After usbtrace_enumerate()"); # else - message(MAIN_NAME_STRING ": Still alive\n"); + message("conn_main: Still alive\n"); # endif } #else - message(MAIN_NAME_STRING ": Connected\n"); + message("conn_main: Connected\n"); check_test_memory_usage("After composite device connection"); #endif /* Dump debug memory usage */ - message(MAIN_NAME_STRING ": Exiting\n"); + message("conn_main: Exiting\n"); #if !defined(CONFIG_NSH_BUILTIN_APPS) && !defined(CONFIG_DISABLE_SIGNALS) close(g_composite.infd); close(g_composite.outfd); diff --git a/apps/examples/dhcpd/target.c b/apps/examples/dhcpd/target.c index d43e86e94..9c554e8cd 100644 --- a/apps/examples/dhcpd/target.c +++ b/apps/examples/dhcpd/target.c @@ -81,27 +81,15 @@ # error "You must define CONFIG_NET_BROADCAST" #endif -/* If CONFIG_NSH_BUILTIN_APPS is defined, then it is assumed that you want - * to execute the DHCPD daemon as an NSH built-in task. - */ - -#ifdef CONFIG_NSH_BUILTIN_APPS -# define MAIN_NAME dhcpd_main -# define MAIN_NAME_STRING "dhcpd_main" -#else -# define MAIN_NAME user_start -# define MAIN_NAME_STRING "user_start" -#endif - /**************************************************************************** * Private Data ****************************************************************************/ /**************************************************************************** - * Name: user_start/dhcpd_main + * Name: dhcpd_main ****************************************************************************/ -int MAIN_NAME(int argc, char *argv[]) +int dhcpd_main(int argc, char *argv[]) { struct in_addr addr; #if defined(CONFIG_EXAMPLE_DHCPD_NOMAC) diff --git a/apps/examples/ftpd/ftpd.h b/apps/examples/ftpd/ftpd.h index 98ee3b3b6..6a439e818 100644 --- a/apps/examples/ftpd/ftpd.h +++ b/apps/examples/ftpd/ftpd.h @@ -107,16 +107,6 @@ # endif #endif -/* Is this being built as an NSH built-in application? */ - -#ifdef CONFIG_NSH_BUILTIN_APPS -# define MAIN_NAME ftpd_start -# define MAIN_STRING "ftpd_start: " -#else -# define MAIN_NAME user_start -# define MAIN_STRING "user_start: " -#endif - /**************************************************************************** * Public Types ****************************************************************************/ diff --git a/apps/examples/ftpd/ftpd_main.c b/apps/examples/ftpd/ftpd_main.c index 6ae0a11e5..6d19f952c 100644 --- a/apps/examples/ftpd/ftpd_main.c +++ b/apps/examples/ftpd/ftpd_main.c @@ -217,10 +217,10 @@ int ftpd_daemon(int s_argc, char **s_argv) * Public Functions ****************************************************************************/ /**************************************************************************** - * Name: user_start/ftpd_start + * Name: ftpd_main ****************************************************************************/ -int MAIN_NAME(int s_argc, char **s_argv) +int ftpd_main(int s_argc, char **s_argv) { /* Check if we have already initialized the network */ diff --git a/apps/examples/hello/main.c b/apps/examples/hello/main.c index 7934dc34b..7e07cffd1 100644 --- a/apps/examples/hello/main.c +++ b/apps/examples/hello/main.c @@ -53,16 +53,10 @@ ****************************************************************************/ /**************************************************************************** - * user_start/hello_main + * hello_main ****************************************************************************/ -#ifdef CONFIG_EXAMPLES_HELLO_BUILTIN -# define MAIN_NAME hello_main -#else -# define MAIN_NAME user_start -#endif - -int MAIN_NAME(int argc, char *argv[]) +int hello_main(int argc, char *argv[]) { printf("Hello, World!!\n"); return 0; diff --git a/apps/examples/helloxx/main.cxx b/apps/examples/helloxx/main.cxx index 8514fead2..fcec7c761 100644 --- a/apps/examples/helloxx/main.cxx +++ b/apps/examples/helloxx/main.cxx @@ -124,24 +124,11 @@ static CHelloWorld g_HelloWorld; // Public Functions //*************************************************************************** -//*************************************************************************** -// user_start -//*************************************************************************** - /**************************************************************************** - * Name: user_start/nxhello_main + * Name: helloxx_main ****************************************************************************/ -#ifdef CONFIG_EXAMPLES_HELLOXX_BUILTIN -extern "C" int helloxx_main(int argc, char *argv[]); -# define MAIN_NAME helloxx_main -# define MAIN_STRING "helloxx_main: " -#else -# define MAIN_NAME user_start -# define MAIN_STRING "user_start: " -#endif - -int MAIN_NAME(int argc, char *argv[]) +int helloxx_main(int argc, char *argv[]) { // If C++ initialization for static constructors is supported, then do // that first @@ -153,7 +140,7 @@ int MAIN_NAME(int argc, char *argv[]) // Exercise an explictly instantiated C++ object CHelloWorld *pHelloWorld = new CHelloWorld; - printf(MAIN_STRING "Saying hello from the dynamically constructed instance\n"); + printf("helloxx_main: Saying hello from the dynamically constructed instance\n"); pHelloWorld->HelloWorld(); // Exercise an C++ object instantiated on the stack @@ -161,14 +148,14 @@ int MAIN_NAME(int argc, char *argv[]) #ifndef CONFIG_EXAMPLES_HELLOXX_NOSTACKCONST CHelloWorld HelloWorld; - printf(MAIN_STRING "Saying hello from the instance constructed on the stack\n"); + printf("helloxx_main: Saying hello from the instance constructed on the stack\n"); HelloWorld.HelloWorld(); #endif // Exercise an statically constructed C++ object #ifdef CONFIG_HAVE_CXXINITIALIZE - printf(MAIN_STRING "Saying hello from the statically constructed instance\n"); + printf("helloxx_main: Saying hello from the statically constructed instance\n"); g_HelloWorld.HelloWorld(); #endif diff --git a/apps/examples/hidkbd/hidkbd_main.c b/apps/examples/hidkbd/hidkbd_main.c index 96864b9f9..51e927008 100644 --- a/apps/examples/hidkbd/hidkbd_main.c +++ b/apps/examples/hidkbd/hidkbd_main.c @@ -141,10 +141,10 @@ static int hidkbd_waiter(int argc, char *argv[]) } /**************************************************************************** - * Name: user_start + * Name: hidkbd_main ****************************************************************************/ -int user_start(int argc, char *argv[]) +int hidkbd_main(int argc, char *argv[]) { char buffer[256]; pid_t pid; @@ -154,22 +154,22 @@ int user_start(int argc, char *argv[]) /* First, register all of the USB host HID keyboard class driver */ - printf("user_start: Register class drivers\n"); + printf("hidkbd_main: Register class drivers\n"); ret = usbhost_kbdinit(); if (ret != OK) { - printf("user_start: Failed to register the KBD class\n"); + printf("hidkbd_main: Failed to register the KBD class\n"); } /* Then get an instance of the USB host interface */ - printf("user_start: Initialize USB host keyboard driver\n"); + printf("hidkbd_main: Initialize USB host keyboard driver\n"); g_drvr = usbhost_initialize(0); if (g_drvr) { /* Start a thread to handle device connection. */ - printf("user_start: Start hidkbd_waiter\n"); + printf("hidkbd_main: Start hidkbd_waiter\n"); #ifndef CONFIG_CUSTOM_STACK pid = task_create("usbhost", CONFIG_EXAMPLES_HIDKBD_DEFPRIO, diff --git a/apps/examples/igmp/igmp.c b/apps/examples/igmp/igmp.c index 4e3671a69..73ca8a3e6 100644 --- a/apps/examples/igmp/igmp.c +++ b/apps/examples/igmp/igmp.c @@ -78,10 +78,10 @@ ****************************************************************************/ /**************************************************************************** - * user_start + * igmp_main ****************************************************************************/ -int user_start(int argc, char *argv[]) +int igmp_main(int argc, char *argv[]) { struct in_addr addr; #if defined(CONFIG_EXAMPLE_IGMP_NOMAC) diff --git a/apps/examples/lcdrw/lcdrw_main.c b/apps/examples/lcdrw/lcdrw_main.c index c366743f4..f39e1849d 100644 --- a/apps/examples/lcdrw/lcdrw_main.c +++ b/apps/examples/lcdrw/lcdrw_main.c @@ -152,16 +152,10 @@ static inline int lcdrw_initialize(FAR struct lcdrw_instance_s *inst) ****************************************************************************/ /**************************************************************************** - * Name: lcdrw_main/user_start + * Name: lcdrw_main ****************************************************************************/ -#ifdef CONFIG_EXAMPLES_LCDRW_BUILTIN -# define MAIN_NAME lcdrw_main -#else -# define MAIN_NAME user_start -#endif - -int MAIN_NAME(int argc, char *argv[]) +int lcdrw_main(int argc, char *argv[]) { struct lcdrw_instance_s inst; nxgl_coord_t row; diff --git a/apps/examples/mm/mm_main.c b/apps/examples/mm/mm_main.c index 036c39047..5d45efdc5 100644 --- a/apps/examples/mm/mm_main.c +++ b/apps/examples/mm/mm_main.c @@ -267,10 +267,10 @@ static void do_frees(void **mem, const int *size, const int *seq, int n) ****************************************************************************/ /**************************************************************************** - * Name: user_start + * Name: mm_main ****************************************************************************/ -int user_start(int argc, char *argv[]) +int mm_main(int argc, char *argv[]) { mm_showmallinfo(); diff --git a/apps/examples/modbus/modbus_main.c b/apps/examples/modbus/modbus_main.c index bb89c6cbb..13967f6fd 100644 --- a/apps/examples/modbus/modbus_main.c +++ b/apps/examples/modbus/modbus_main.c @@ -104,14 +104,6 @@ # define CONFIG_EXAMPLES_MODBUS_REG_HOLDING_NREGS 130 #endif -#ifdef CONFIG_NSH_BUILTIN_APPS -# define MAIN_NAME modbus_main -# define MAIN_NAME_STRING "modbus_main: " -#else -# define MAIN_NAME user_start -# define MAIN_NAME_STRING "user_start: " -#endif - /**************************************************************************** * Private Types ****************************************************************************/ @@ -171,7 +163,7 @@ static inline int modbus_initialize(void) if (g_modbus.threadstate != STOPPED) { - fprintf(stderr, MAIN_NAME_STRING + fprintf(stderr, "modbus_main: " "ERROR: Bad state: %d\n", g_modbus.threadstate); return EINVAL; } @@ -181,7 +173,7 @@ static inline int modbus_initialize(void) status = pthread_mutex_init(&g_modbus.lock, NULL); if (status != 0) { - fprintf(stderr, MAIN_NAME_STRING + fprintf(stderr, "modbus_main: " "ERROR: pthread_mutex_init failed: %d\n", status); return status; } @@ -201,7 +193,7 @@ static inline int modbus_initialize(void) CONFIG_EXAMPLES_MODBUS_BAUD, CONFIG_EXAMPLES_MODBUS_PARITY); if (mberr != MB_ENOERR) { - fprintf(stderr, MAIN_NAME_STRING + fprintf(stderr, "modbus_main: " "ERROR: eMBInit failed: %d\n", mberr); goto errout_with_mutex; } @@ -217,7 +209,7 @@ static inline int modbus_initialize(void) mberr = eMBSetSlaveID(0x34, true, g_slaveid, 3); if (mberr != MB_ENOERR) { - fprintf(stderr, MAIN_NAME_STRING + fprintf(stderr, "modbus_main: " "ERROR: eMBSetSlaveID failed: %d\n", mberr); goto errout_with_modbus; } @@ -227,7 +219,7 @@ static inline int modbus_initialize(void) mberr = eMBEnable(); if (mberr == MB_ENOERR) { - fprintf(stderr, MAIN_NAME_STRING + fprintf(stderr, "modbus_main: " "ERROR: eMBEnable failed: %d\n", mberr); goto errout_with_modbus; } @@ -270,7 +262,7 @@ static void *modbus_pollthread(void *pvarg) ret = modbus_initialize(); if (ret != OK) { - fprintf(stderr, MAIN_NAME_STRING + fprintf(stderr, "modbus_main: " "ERROR: modbus_initialize failed: %d\n", ret); return NULL; } @@ -358,14 +350,14 @@ static void modbus_showusage(FAR const char *progname, int exitcode) ****************************************************************************/ /**************************************************************************** - * Name: user_start/modbus_main + * Name: modbus_main * * Description: * This is the main entry point to the demo program * ****************************************************************************/ -int MAIN_NAME(int argc, char *argv[]) +int modbus_main(int argc, char *argv[]) { int option; int ret; @@ -389,7 +381,7 @@ int MAIN_NAME(int argc, char *argv[]) ret = modbus_create_pollthread(); if (ret != OK) { - fprintf(stderr, MAIN_NAME_STRING + fprintf(stderr, "modbus_main: " "ERROR: modbus_create_pollthread failed: %d\n", ret); exit(EXIT_FAILURE); } @@ -400,19 +392,19 @@ int MAIN_NAME(int argc, char *argv[]) switch (g_modbus.threadstate) { case RUNNING: - printf(MAIN_NAME_STRING "Protocol stack is running\n"); + printf("modbus_main: Protocol stack is running\n"); break; case STOPPED: - printf(MAIN_NAME_STRING "Protocol stack is stopped\n"); + printf("modbus_main: Protocol stack is stopped\n"); break; case SHUTDOWN: - printf(MAIN_NAME_STRING "Protocol stack is shutting down\n"); + printf("modbus_main: Protocol stack is shutting down\n"); break; default: - fprintf(stderr, MAIN_NAME_STRING + fprintf(stderr, "modbus_main: " "ERROR: Invalid thread state: %d\n", g_modbus.threadstate); break; @@ -429,7 +421,7 @@ int MAIN_NAME(int argc, char *argv[]) break; default: - fprintf(stderr, MAIN_NAME_STRING + fprintf(stderr, "modbus_main: " "ERROR: Unrecognized option: '%c'\n", option); modbus_showusage(argv[0], EXIT_FAILURE); break; diff --git a/apps/examples/mount/mount_main.c b/apps/examples/mount/mount_main.c index 00070b94c..5f881e40c 100644 --- a/apps/examples/mount/mount_main.c +++ b/apps/examples/mount/mount_main.c @@ -567,10 +567,10 @@ static void succeed_stat(const char *path) ****************************************************************************/ /**************************************************************************** - * Name: user_start + * Name: mount_main ****************************************************************************/ -int user_start(int argc, char *argv[]) +int mount_main(int argc, char *argv[]) { int ret; @@ -580,18 +580,18 @@ int user_start(int argc, char *argv[]) ret = create_ramdisk(); if (ret < 0) { - printf("user_start: ERROR failed to create RAM disk\n"); + printf("mount_main: ERROR failed to create RAM disk\n"); return 1; } #endif /* Mount the test file system (see arch/sim/src/up_deviceimage.c */ - printf("user_start: mounting %s filesystem at target=%s with source=%s\n", + printf("mount_main: mounting %s filesystem at target=%s with source=%s\n", g_filesystemtype, g_target, g_source); ret = mount(g_source, g_target, g_filesystemtype, 0, NULL); - printf("user_start: mount() returned %d\n", ret); + printf("mount_main: mount() returned %d\n", ret); if (ret == 0) { @@ -737,16 +737,16 @@ int user_start(int argc, char *argv[]) /* Unmount the file system */ - printf("user_start: Try unmount(%s)\n", g_target); + printf("mount_main: Try unmount(%s)\n", g_target); ret = umount(g_target); if (ret != 0) { - printf("user_start: ERROR umount() failed, errno %d\n", errno); + printf("mount_main: ERROR umount() failed, errno %d\n", errno); g_nerrors++; } - printf("user_start: %d errors reported\n", g_nerrors); + printf("mount_main: %d errors reported\n", g_nerrors); } fflush(stdout); diff --git a/apps/examples/nettest/nettest.c b/apps/examples/nettest/nettest.c index d6d63eeef..b95d9da62 100644 --- a/apps/examples/nettest/nettest.c +++ b/apps/examples/nettest/nettest.c @@ -53,18 +53,6 @@ * Definitions ****************************************************************************/ -/* If CONFIG_NSH_BUILTIN_APPS is defined, then it is assumed that you want - * to execute the DHCPD daemon as an NSH built-in task. - */ - -#ifdef CONFIG_NSH_BUILTIN_APPS -# define MAIN_NAME nettest_main -# define MAIN_NAME_STRING "nettest_main" -#else -# define MAIN_NAME user_start -# define MAIN_NAME_STRING "user_start" -#endif - /**************************************************************************** * Private Data ****************************************************************************/ @@ -74,10 +62,10 @@ ****************************************************************************/ /**************************************************************************** - * user_start + * nettest_main ****************************************************************************/ -int MAIN_NAME(int argc, char *argv[]) +int nettest_main(int argc, char *argv[]) { struct in_addr addr; #ifdef CONFIG_EXAMPLE_NETTEST_NOMAC diff --git a/apps/examples/nsh/nsh_main.c b/apps/examples/nsh/nsh_main.c index c5b671ab1..97792cb2a 100644 --- a/apps/examples/nsh/nsh_main.c +++ b/apps/examples/nsh/nsh_main.c @@ -84,10 +84,10 @@ ****************************************************************************/ /**************************************************************************** - * Name: user_start + * Name: nsh_main ****************************************************************************/ -int user_start(int argc, char *argv[]) +int nsh_main(int argc, char *argv[]) { int exitval = 0; int ret; diff --git a/apps/examples/null/null_main.c b/apps/examples/null/null_main.c index 10fc1bf1e..63a14fcac 100644 --- a/apps/examples/null/null_main.c +++ b/apps/examples/null/null_main.c @@ -58,10 +58,10 @@ ****************************************************************************/ /**************************************************************************** - * Name: user_start + * Name: null_main ****************************************************************************/ -int user_start(int argc, char *argv[]) +int null_main(int argc, char *argv[]) { return 0; } diff --git a/apps/examples/nx/nx_main.c b/apps/examples/nx/nx_main.c index db17ea2f2..bcc4a9bbf 100644 --- a/apps/examples/nx/nx_main.c +++ b/apps/examples/nx/nx_main.c @@ -614,18 +614,10 @@ static int nxeg_initialize(void) ****************************************************************************/ /**************************************************************************** - * Name: user_start/nx_main + * Name: nx_main ****************************************************************************/ -#ifdef CONFIG_EXAMPLES_NX_BUILTIN -# define MAIN_NAME nx_main -# define MAIN_NAME_STRING "nx_main" -#else -# define MAIN_NAME user_start -# define MAIN_NAME_STRING "user_start" -#endif - -int MAIN_NAME(int argc, char *argv[]) +int nx_main(int argc, char *argv[]) { NXEGWINDOW hwnd1; NXEGWINDOW hwnd2; @@ -637,10 +629,10 @@ int MAIN_NAME(int argc, char *argv[]) /* Initialize */ ret = nxeg_initialize(); - message(MAIN_NAME_STRING ": NX handle=%p\n", g_hnx); + message("nx_main: NX handle=%p\n", g_hnx); if (!g_hnx || ret < 0) { - message(MAIN_NAME_STRING ": Failed to get NX handle: %d\n", errno); + message("nx_main: Failed to get NX handle: %d\n", errno); g_exitcode = NXEXIT_NXOPEN; goto errout; } @@ -650,29 +642,29 @@ int MAIN_NAME(int argc, char *argv[]) g_fonthandle = nxf_getfonthandle(CONFIG_EXAMPLES_NX_FONTID); if (!g_fonthandle) { - message(MAIN_NAME_STRING ": Failed to get font handle: %d\n", errno); + message("nx_main: Failed to get font handle: %d\n", errno); g_exitcode = NXEXIT_FONTOPEN; goto errout; } /* Set the background to the configured background color */ - message(MAIN_NAME_STRING ": Set background color=%d\n", CONFIG_EXAMPLES_NX_BGCOLOR); + message("nx_main: Set background color=%d\n", CONFIG_EXAMPLES_NX_BGCOLOR); color = CONFIG_EXAMPLES_NX_BGCOLOR; ret = nx_setbgcolor(g_hnx, &color); if (ret < 0) { - message(MAIN_NAME_STRING ": nx_setbgcolor failed: %d\n", errno); + message("nx_main: nx_setbgcolor failed: %d\n", errno); g_exitcode = NXEXIT_NXSETBGCOLOR; goto errout_with_nx; } /* Create window #1 */ - message(MAIN_NAME_STRING ": Create window #1\n"); + message("nx_main: Create window #1\n"); nxeg_initstate(&g_wstate[0], 1, CONFIG_EXAMPLES_NX_COLOR1); hwnd1 = nxeg_openwindow(&g_nxcb, &g_wstate[0]); - message(MAIN_NAME_STRING ": hwnd1=%p\n", hwnd1); + message("nx_main: hwnd1=%p\n", hwnd1); if (!hwnd1) { goto errout_with_nx; @@ -684,14 +676,14 @@ int MAIN_NAME(int argc, char *argv[]) { (void)sem_wait(&g_semevent); } - message(MAIN_NAME_STRING ": Screen resolution (%d,%d)\n", g_xres, g_yres); + message("nx_main: Screen resolution (%d,%d)\n", g_xres, g_yres); /* Set the size of the window 1 */ size.w = g_xres / 2; size.h = g_yres / 2; - message(MAIN_NAME_STRING ": Set window #1 size to (%d,%d)\n", size.w, size.h); + message("nx_main: Set window #1 size to (%d,%d)\n", size.w, size.h); ret = nxeg_setsize(hwnd1, &size); if (ret < 0) { @@ -703,7 +695,7 @@ int MAIN_NAME(int argc, char *argv[]) * actually do them! */ - message(MAIN_NAME_STRING ": Sleeping\n\n"); + message("nx_main: Sleeping\n\n"); sleep(1); /* Set the position of window #1 */ @@ -711,7 +703,7 @@ int MAIN_NAME(int argc, char *argv[]) pt.x = g_xres / 8; pt.y = g_yres / 8; - message(MAIN_NAME_STRING ": Set window #1 postion to (%d,%d)\n", pt.x, pt.y); + message("nx_main: Set window #1 postion to (%d,%d)\n", pt.x, pt.y); ret = nxeg_setposition(hwnd1, &pt); if (ret < 0) { @@ -720,13 +712,13 @@ int MAIN_NAME(int argc, char *argv[]) /* Sleep a bit */ - message(MAIN_NAME_STRING ": Sleeping\n\n"); + message("nx_main: Sleeping\n\n"); sleep(1); /* Open the toolbar */ #ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS - message(MAIN_NAME_STRING ": Add toolbar to window #1\n"); + message("nx_main: Add toolbar to window #1\n"); ret = nxeq_opentoolbar(hwnd1, CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT, &g_tbcb, &g_wstate[0]); if (ret < 0) { @@ -735,16 +727,16 @@ int MAIN_NAME(int argc, char *argv[]) /* Sleep a bit */ - message(MAIN_NAME_STRING ": Sleeping\n\n"); + message("nx_main: Sleeping\n\n"); sleep(1); #endif /* Create window #2 */ - message(MAIN_NAME_STRING ": Create window #2\n"); + message("nx_main: Create window #2\n"); nxeg_initstate(&g_wstate[1], 2, CONFIG_EXAMPLES_NX_COLOR2); hwnd2 = nxeg_openwindow(&g_nxcb, &g_wstate[1]); - message(MAIN_NAME_STRING ": hwnd2=%p\n", hwnd2); + message("nx_main: hwnd2=%p\n", hwnd2); if (!hwnd2) { goto errout_with_hwnd1; @@ -752,12 +744,12 @@ int MAIN_NAME(int argc, char *argv[]) /* Sleep a bit */ - message(MAIN_NAME_STRING ": Sleeping\n\n"); + message("nx_main: Sleeping\n\n"); sleep(1); /* Set the size of the window 2 == size of window 1*/ - message(MAIN_NAME_STRING ": Set hwnd2 size to (%d,%d)\n", size.w, size.h); + message("nx_main: Set hwnd2 size to (%d,%d)\n", size.w, size.h); ret = nxeg_setsize(hwnd2, &size); if (ret < 0) { @@ -766,7 +758,7 @@ int MAIN_NAME(int argc, char *argv[]) /* Sleep a bit */ - message(MAIN_NAME_STRING ": Sleeping\n\n"); + message("nx_main: Sleeping\n\n"); sleep(1); /* Set the position of window #2 */ @@ -774,7 +766,7 @@ int MAIN_NAME(int argc, char *argv[]) pt.x = g_xres - size.w - pt.x; pt.y = g_yres - size.h - pt.y; - message(MAIN_NAME_STRING ": Set hwnd2 postion to (%d,%d)\n", pt.x, pt.y); + message("nx_main: Set hwnd2 postion to (%d,%d)\n", pt.x, pt.y); ret = nxeg_setposition(hwnd2, &pt); if (ret < 0) { @@ -783,11 +775,11 @@ int MAIN_NAME(int argc, char *argv[]) /* Sleep a bit */ - message(MAIN_NAME_STRING ": Sleeping\n\n"); + message("nx_main: Sleeping\n\n"); sleep(1); #ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS - message(MAIN_NAME_STRING ": Add toolbar to window #2\n"); + message("nx_main: Add toolbar to window #2\n"); ret = nxeq_opentoolbar(hwnd2, CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT, &g_tbcb, &g_wstate[1]); if (ret < 0) { @@ -796,30 +788,30 @@ int MAIN_NAME(int argc, char *argv[]) /* Sleep a bit */ - message(MAIN_NAME_STRING ": Sleeping\n\n"); + message("nx_main: Sleeping\n\n"); sleep(1); #endif /* Give keyboard input to the top window -- should be window #2 */ #ifdef CONFIG_NX_KBD - message(MAIN_NAME_STRING ": Send keyboard input: %s\n", g_kbdmsg1); + message("nx_main: Send keyboard input: %s\n", g_kbdmsg1); ret = nx_kbdin(g_hnx, strlen((FAR const char *)g_kbdmsg1), g_kbdmsg1); if (ret < 0) { - message(MAIN_NAME_STRING ": nx_kbdin failed: %d\n", errno); + message("nx_main: nx_kbdin failed: %d\n", errno); goto errout_with_hwnd2; } /* Sleep a bit */ - message(MAIN_NAME_STRING ": Sleeping\n\n"); + message("nx_main: Sleeping\n\n"); sleep(1); #endif /* Lower window 2 */ - message(MAIN_NAME_STRING ": Lower window #2\n"); + message("nx_main: Lower window #2\n"); ret = nxeg_lower(hwnd2); if (ret < 0) { @@ -828,7 +820,7 @@ int MAIN_NAME(int argc, char *argv[]) /* Sleep a bit */ - message(MAIN_NAME_STRING ": Sleeping\n\n"); + message("nx_main: Sleeping\n\n"); sleep(1); /* Put mouse left-button clicks all over the screen and see who responds */ @@ -838,30 +830,30 @@ int MAIN_NAME(int argc, char *argv[]) /* Sleep a bit */ - message(MAIN_NAME_STRING ": Sleeping\n\n"); + message("nx_main: Sleeping\n\n"); sleep(1); #endif /* Give keyboard input to the top window -- should be window #1 */ #ifdef CONFIG_NX_KBD - message(MAIN_NAME_STRING ": Send keyboard input: %s\n", g_kbdmsg2); + message("nx_main: Send keyboard input: %s\n", g_kbdmsg2); ret = nx_kbdin(g_hnx, strlen((FAR const char *)g_kbdmsg2), g_kbdmsg2); if (ret < 0) { - message(MAIN_NAME_STRING ": nx_kbdin failed: %d\n", errno); + message("nx_main: nx_kbdin failed: %d\n", errno); goto errout_with_hwnd2; } /* Sleep a bit */ - message(MAIN_NAME_STRING ": Sleeping\n\n"); + message("nx_main: Sleeping\n\n"); sleep(1); #endif /* Raise window 2 */ - message(MAIN_NAME_STRING ": Raise window #2\n"); + message("nx_main: Raise window #2\n"); ret = nxeg_raise(hwnd2); if (ret < 0) { @@ -876,31 +868,31 @@ int MAIN_NAME(int argc, char *argv[]) /* Sleep a bit */ - message(MAIN_NAME_STRING ": Sleeping\n\n"); + message("nx_main: Sleeping\n\n"); sleep(2); /* Close the window 2 */ errout_with_hwnd2: - message(MAIN_NAME_STRING ": Close window #2\n"); + message("nx_main: Close window #2\n"); (void)nxeg_closewindow(hwnd2, &g_wstate[1]); /* Close the window1 */ errout_with_hwnd1: - message(MAIN_NAME_STRING ": Close window #1\n"); + message("nx_main: Close window #1\n"); (void)nxeg_closewindow(hwnd1, &g_wstate[0]); errout_with_nx: #ifdef CONFIG_NX_MULTIUSER /* Disconnect from the server */ - message(MAIN_NAME_STRING ": Disconnect from the server\n"); + message("nx_main: Disconnect from the server\n"); nx_disconnect(g_hnx); #else /* Close the server */ - message(MAIN_NAME_STRING ": Close NX\n"); + message("nx_main: Close NX\n"); nx_close(g_hnx); #endif errout: diff --git a/apps/examples/nxconsole/nxcon_main.c b/apps/examples/nxconsole/nxcon_main.c index 5a9d20307..41d8efd19 100644 --- a/apps/examples/nxconsole/nxcon_main.c +++ b/apps/examples/nxconsole/nxcon_main.c @@ -207,10 +207,10 @@ static int nxcon_task(int argc, char **argv) ****************************************************************************/ /**************************************************************************** - * Name: user_start + * Name: nxcon_main ****************************************************************************/ -int user_start(int argc, char **argv) +int nxcon_main(int argc, char **argv) { nxgl_mxpixel_t color; int fd; @@ -219,7 +219,7 @@ int user_start(int argc, char **argv) /* General Initialization *************************************************/ /* Reset all global data */ - message("user_start: Started\n"); + message("nxcon_main: Started\n"); memset(&g_nxcon_vars, 0, sizeof(struct nxcon_state_s)); /* Call all C++ static constructors */ @@ -231,7 +231,7 @@ int user_start(int argc, char **argv) /* NSH Initialization *****************************************************/ /* Initialize the NSH library */ - message("user_start: Initialize NSH\n"); + message("nxcon_main: Initialize NSH\n"); nsh_initialize(); /* If the Telnet console is selected as a front-end, then start the @@ -252,37 +252,37 @@ int user_start(int argc, char **argv) /* NX Initialization ******************************************************/ /* Initialize NX */ - message("user_start: Initialize NX\n"); + message("nxcon_main: Initialize NX\n"); ret = nxcon_initialize(); - message("user_start: NX handle=%p\n", g_nxcon_vars.hnx); + message("nxcon_main: NX handle=%p\n", g_nxcon_vars.hnx); if (!g_nxcon_vars.hnx || ret < 0) { - message("user_start: Failed to get NX handle: %d\n", errno); + message("nxcon_main: Failed to get NX handle: %d\n", errno); goto errout; } /* Set the background to the configured background color */ - message("user_start: Set background color=%d\n", CONFIG_EXAMPLES_NXCON_BGCOLOR); + message("nxcon_main: Set background color=%d\n", CONFIG_EXAMPLES_NXCON_BGCOLOR); color = CONFIG_EXAMPLES_NXCON_BGCOLOR; ret = nx_setbgcolor(g_nxcon_vars.hnx, &color); if (ret < 0) { - message("user_start: nx_setbgcolor failed: %d\n", errno); + message("nxcon_main: nx_setbgcolor failed: %d\n", errno); goto errout_with_nx; } /* Window Configuration ***************************************************/ /* Create a window */ - message("user_start: Create window\n"); + message("nxcon_main: Create window\n"); g_nxcon_vars.hwnd = nxtk_openwindow(g_nxcon_vars.hnx, &g_nxconcb, NULL); if (!g_nxcon_vars.hwnd) { - message("user_start: nxtk_openwindow failed: %d\n", errno); + message("nxcon_main: nxtk_openwindow failed: %d\n", errno); goto errout_with_nx; } - message("user_start: hwnd=%p\n", g_nxcon_vars.hwnd); + message("nxcon_main: hwnd=%p\n", g_nxcon_vars.hwnd); /* Wait until we have the screen resolution. We'll have this immediately * unless we are dealing with the NX server. @@ -292,7 +292,7 @@ int user_start(int argc, char **argv) { (void)sem_wait(&g_nxcon_vars.eventsem); } - message("user_start: Screen resolution (%d,%d)\n", g_nxcon_vars.xres, g_nxcon_vars.yres); + message("nxcon_main: Screen resolution (%d,%d)\n", g_nxcon_vars.xres, g_nxcon_vars.yres); /* Determine the size and position of the window */ @@ -304,35 +304,35 @@ int user_start(int argc, char **argv) /* Set the window position */ - message("user_start: Set window position to (%d,%d)\n", + message("nxcon_main: Set window position to (%d,%d)\n", g_nxcon_vars.wpos.x, g_nxcon_vars.wpos.y); ret = nxtk_setposition(g_nxcon_vars.hwnd, &g_nxcon_vars.wpos); if (ret < 0) { - message("user_start: nxtk_setposition failed: %d\n", errno); + message("nxcon_main: nxtk_setposition failed: %d\n", errno); goto errout_with_hwnd; } /* Set the window size */ - message("user_start: Set window size to (%d,%d)\n", + message("nxcon_main: Set window size to (%d,%d)\n", g_nxcon_vars.wndo.wsize.w, g_nxcon_vars.wndo.wsize.h); ret = nxtk_setsize(g_nxcon_vars.hwnd, &g_nxcon_vars.wndo.wsize); if (ret < 0) { - message("user_start: nxtk_setsize failed: %d\n", errno); + message("nxcon_main: nxtk_setsize failed: %d\n", errno); goto errout_with_hwnd; } /* Open the toolbar */ - message("user_start: Add toolbar to window\n"); + message("nxcon_main: Add toolbar to window\n"); ret = nxtk_opentoolbar(g_nxcon_vars.hwnd, CONFIG_EXAMPLES_NXCON_TOOLBAR_HEIGHT, &g_nxtoolcb, NULL); if (ret < 0) { - message("user_start: nxtk_opentoolbar failed: %d\n", errno); + message("nxcon_main: nxtk_opentoolbar failed: %d\n", errno); goto errout_with_hwnd; } @@ -350,7 +350,7 @@ int user_start(int argc, char **argv) g_nxcon_vars.hdrvr = nxtk_register(g_nxcon_vars.hwnd, &g_nxcon_vars.wndo, CONFIG_EXAMPLES_NXCON_MINOR); if (!g_nxcon_vars.hdrvr) { - message("user_start: nxtk_register failed: %d\n", errno); + message("nxcon_main: nxtk_register failed: %d\n", errno); goto errout_with_hwnd; } @@ -359,7 +359,7 @@ int user_start(int argc, char **argv) fd = open(CONFIG_EXAMPLES_NXCON_DEVNAME, O_WRONLY); if (fd < 0) { - message("user_start: open %s read-only failed: %d\n", + message("nxcon_main: open %s read-only failed: %d\n", CONFIG_EXAMPLES_NXCON_DEVNAME, errno); goto errout_with_driver; } @@ -369,7 +369,7 @@ int user_start(int argc, char **argv) * Note that stdin is retained (file descriptor 0, probably the the serial console). */ - message("user_start: Starting the console task\n"); + message("nxcon_main: Starting the console task\n"); msgflush(); (void)fflush(stdout); diff --git a/apps/examples/nxffs/nxffs_main.c b/apps/examples/nxffs/nxffs_main.c index bc28cfa73..5401fc932 100644 --- a/apps/examples/nxffs/nxffs_main.c +++ b/apps/examples/nxffs/nxffs_main.c @@ -789,10 +789,10 @@ static int nxffs_directory(void) ****************************************************************************/ /**************************************************************************** - * Name: user_start + * Name: nxffs_main ****************************************************************************/ -int user_start(int argc, char *argv[]) +int nxffs_main(int argc, char *argv[]) { FAR struct mtd_dev_s *mtd; unsigned int i; diff --git a/apps/examples/nxflat/nxflat_main.c b/apps/examples/nxflat/nxflat_main.c index 12d88c3d5..68c2979da 100644 --- a/apps/examples/nxflat/nxflat_main.c +++ b/apps/examples/nxflat/nxflat_main.c @@ -145,10 +145,10 @@ static inline void testheader(FAR const char *progname) ****************************************************************************/ /**************************************************************************** - * Name: user_start + * Name: nxflat_main ****************************************************************************/ -int user_start(int argc, char *argv[]) +int nxflat_main(int argc, char *argv[]) { struct binary_s bin; int ret; diff --git a/apps/examples/nxhello/nxhello_main.c b/apps/examples/nxhello/nxhello_main.c index cf8373856..02344a45e 100644 --- a/apps/examples/nxhello/nxhello_main.c +++ b/apps/examples/nxhello/nxhello_main.c @@ -203,18 +203,10 @@ static inline int nxhello_initialize(void) ****************************************************************************/ /**************************************************************************** - * Name: user_start/nxhello_main + * Name: nxhello_main ****************************************************************************/ -#ifdef CONFIG_EXAMPLES_NXHELLO_BUILTIN -# define MAIN_NAME nxhello_main -# define MAIN_NAME_STRING "nxhello_main" -#else -# define MAIN_NAME user_start -# define MAIN_NAME_STRING "user_start" -#endif - -int MAIN_NAME(int argc, char *argv[]) +int nxhello_main(int argc, char *argv[]) { nxgl_mxpixel_t color; int ret; @@ -222,10 +214,10 @@ int MAIN_NAME(int argc, char *argv[]) /* Initialize NX */ ret = nxhello_initialize(); - message(MAIN_NAME_STRING ": NX handle=%p\n", g_nxhello.hnx); + message("nxhello_main: NX handle=%p\n", g_nxhello.hnx); if (!g_nxhello.hnx || ret < 0) { - message(MAIN_NAME_STRING ": Failed to get NX handle: %d\n", errno); + message("nxhello_main: Failed to get NX handle: %d\n", errno); g_nxhello.code = NXEXIT_NXOPEN; goto errout; } @@ -235,21 +227,21 @@ int MAIN_NAME(int argc, char *argv[]) g_nxhello.hfont = nxf_getfonthandle(CONFIG_EXAMPLES_NXHELLO_FONTID); if (!g_nxhello.hfont) { - message(MAIN_NAME_STRING ": Failed to get font handle: %d\n", errno); + message("nxhello_main: Failed to get font handle: %d\n", errno); g_nxhello.code = NXEXIT_FONTOPEN; goto errout; } /* Set the background to the configured background color */ - message(MAIN_NAME_STRING ": Set background color=%d\n", + message("nxhello_main: Set background color=%d\n", CONFIG_EXAMPLES_NXHELLO_BGCOLOR); color = CONFIG_EXAMPLES_NXHELLO_BGCOLOR; ret = nx_setbgcolor(g_nxhello.hnx, &color); if (ret < 0) { - message(MAIN_NAME_STRING ": nx_setbgcolor failed: %d\n", errno); + message("nxhello_main: nx_setbgcolor failed: %d\n", errno); g_nxhello.code = NXEXIT_NXSETBGCOLOR; goto errout_with_nx; } @@ -259,7 +251,7 @@ int MAIN_NAME(int argc, char *argv[]) ret = nx_requestbkgd(g_nxhello.hnx, &g_nxhellocb, NULL); if (ret < 0) { - message(MAIN_NAME_STRING ": nx_setbgcolor failed: %d\n", errno); + message("nxhello_main: nx_setbgcolor failed: %d\n", errno); g_nxhello.code = NXEXIT_NXREQUESTBKGD; goto errout_with_nx; } @@ -272,7 +264,7 @@ int MAIN_NAME(int argc, char *argv[]) { (void)sem_wait(&g_nxhello.sem); } - message(MAIN_NAME_STRING ": Screen resolution (%d,%d)\n", g_nxhello.xres, g_nxhello.yres); + message("nxhello_main: Screen resolution (%d,%d)\n", g_nxhello.xres, g_nxhello.yres); /* Now, say hello and exit, sleeping a little before each. */ @@ -287,7 +279,7 @@ int MAIN_NAME(int argc, char *argv[]) /* Close NX */ errout_with_nx: - message(MAIN_NAME_STRING ": Close NX\n"); + message("nxhello_main: Close NX\n"); nx_close(g_nxhello.hnx); errout: return g_nxhello.code; diff --git a/apps/examples/nximage/nximage_main.c b/apps/examples/nximage/nximage_main.c index 861cf0e61..5b0249605 100644 --- a/apps/examples/nximage/nximage_main.c +++ b/apps/examples/nximage/nximage_main.c @@ -207,22 +207,14 @@ static inline int nximage_initialize(void) ****************************************************************************/ /**************************************************************************** - * Name: user_start/nximage_main + * Name: nximage_main * * Description: * Main entry pointer. Configures the basic display resources. * ****************************************************************************/ -#ifdef CONFIG_EXAMPLES_NXIMAGE_BUILTIN -# define MAIN_NAME nximage_main -# define MAIN_NAME_STRING "nximage_main" -#else -# define MAIN_NAME user_start -# define MAIN_NAME_STRING "user_start" -#endif - -int MAIN_NAME(int argc, char *argv[]) +int nximage_main(int argc, char *argv[]) { nxgl_mxpixel_t color; int ret; @@ -230,10 +222,10 @@ int MAIN_NAME(int argc, char *argv[]) /* Initialize NX */ ret = nximage_initialize(); - message(MAIN_NAME_STRING ": NX handle=%p\n", g_nximage.hnx); + message("nximage_main: NX handle=%p\n", g_nximage.hnx); if (!g_nximage.hnx || ret < 0) { - message(MAIN_NAME_STRING ": Failed to get NX handle: %d\n", errno); + message("nximage_main: Failed to get NX handle: %d\n", errno); g_nximage.code = NXEXIT_NXOPEN; goto errout; } @@ -241,12 +233,12 @@ int MAIN_NAME(int argc, char *argv[]) /* Set the background to the configured background color */ color = nximage_bgcolor(); - message(MAIN_NAME_STRING ": Set background color=%d\n", color); + message("nximage_main: Set background color=%d\n", color); ret = nx_setbgcolor(g_nximage.hnx, &color); if (ret < 0) { - message(MAIN_NAME_STRING ": nx_setbgcolor failed: %d\n", errno); + message("nximage_main: nx_setbgcolor failed: %d\n", errno); g_nximage.code = NXEXIT_NXSETBGCOLOR; goto errout_with_nx; } @@ -256,7 +248,7 @@ int MAIN_NAME(int argc, char *argv[]) ret = nx_requestbkgd(g_nximage.hnx, &g_nximagecb, NULL); if (ret < 0) { - message(MAIN_NAME_STRING ": nx_setbgcolor failed: %d\n", errno); + message("nximage_main: nx_setbgcolor failed: %d\n", errno); g_nximage.code = NXEXIT_NXREQUESTBKGD; goto errout_with_nx; } @@ -269,7 +261,7 @@ int MAIN_NAME(int argc, char *argv[]) { (void)sem_wait(&g_nximage.sem); } - message(MAIN_NAME_STRING ": Screen resolution (%d,%d)\n", g_nximage.xres, g_nximage.yres); + message("nximage_main: Screen resolution (%d,%d)\n", g_nximage.xres, g_nximage.yres); /* Now, put up the NuttX logo. */ @@ -282,7 +274,7 @@ int MAIN_NAME(int argc, char *argv[]) /* Close NX */ errout_with_nx: - message(MAIN_NAME_STRING ": Close NX\n"); + message("nximage_main: Close NX\n"); nx_close(g_nximage.hnx); errout: return g_nximage.code; diff --git a/apps/examples/nxlines/nxlines_main.c b/apps/examples/nxlines/nxlines_main.c index df946b868..331fab631 100644 --- a/apps/examples/nxlines/nxlines_main.c +++ b/apps/examples/nxlines/nxlines_main.c @@ -199,18 +199,10 @@ static inline int nxlines_initialize(void) ****************************************************************************/ /**************************************************************************** - * Name: user_start/nxlines_main + * Name: nxlines_main ****************************************************************************/ -#ifdef CONFIG_EXAMPLES_NXLINES_BUILTIN -# define MAIN_NAME nxlines_main -# define MAIN_NAME_STRING "nxlines_main" -#else -# define MAIN_NAME user_start -# define MAIN_NAME_STRING "user_start" -#endif - -int MAIN_NAME(int argc, char *argv[]) +int nxlines_main(int argc, char *argv[]) { nxgl_mxpixel_t color; int ret; @@ -218,24 +210,24 @@ int MAIN_NAME(int argc, char *argv[]) /* Initialize NX */ ret = nxlines_initialize(); - message(MAIN_NAME_STRING ": NX handle=%p\n", g_nxlines.hnx); + message("nxlines_main: NX handle=%p\n", g_nxlines.hnx); if (!g_nxlines.hnx || ret < 0) { - message(MAIN_NAME_STRING ": Failed to get NX handle: %d\n", errno); + message("nxlines_main: Failed to get NX handle: %d\n", errno); g_nxlines.code = NXEXIT_NXOPEN; goto errout; } /* Set the background to the configured background color */ - message(MAIN_NAME_STRING ": Set background color=%d\n", + message("nxlines_main: Set background color=%d\n", CONFIG_EXAMPLES_NXLINES_BGCOLOR); color = CONFIG_EXAMPLES_NXLINES_BGCOLOR; ret = nx_setbgcolor(g_nxlines.hnx, &color); if (ret < 0) { - message(MAIN_NAME_STRING ": nx_setbgcolor failed: %d\n", errno); + message("nxlines_main: nx_setbgcolor failed: %d\n", errno); g_nxlines.code = NXEXIT_NXSETBGCOLOR; goto errout_with_nx; } @@ -245,7 +237,7 @@ int MAIN_NAME(int argc, char *argv[]) ret = nx_requestbkgd(g_nxlines.hnx, &g_nxlinescb, NULL); if (ret < 0) { - message(MAIN_NAME_STRING ": nx_setbgcolor failed: %d\n", errno); + message("nxlines_main: nx_setbgcolor failed: %d\n", errno); g_nxlines.code = NXEXIT_NXREQUESTBKGD; goto errout_with_nx; } @@ -258,7 +250,7 @@ int MAIN_NAME(int argc, char *argv[]) { (void)sem_wait(&g_nxlines.sem); } - message(MAIN_NAME_STRING ": Screen resolution (%d,%d)\n", g_nxlines.xres, g_nxlines.yres); + message("nxlines_main: Screen resolution (%d,%d)\n", g_nxlines.xres, g_nxlines.yres); /* Now, say perform the lines (these test does not return so the remaining * logic is cosmetic). @@ -273,7 +265,7 @@ int MAIN_NAME(int argc, char *argv[]) /* Close NX */ errout_with_nx: - message(MAIN_NAME_STRING ": Close NX\n"); + message("nxlines_main: Close NX\n"); nx_close(g_nxlines.hnx); errout: return g_nxlines.code; diff --git a/apps/examples/nxtext/nxtext_main.c b/apps/examples/nxtext/nxtext_main.c index 437b03e5a..9a4b8eea4 100644 --- a/apps/examples/nxtext/nxtext_main.c +++ b/apps/examples/nxtext/nxtext_main.c @@ -345,18 +345,10 @@ static int nxtext_initialize(void) ****************************************************************************/ /**************************************************************************** - * Name: user_start/nxtext_main + * Name: nxtext_main ****************************************************************************/ -#ifdef CONFIG_EXAMPLES_NXTEXT_BUILTIN -# define MAIN_NAME nxtext_main -# define MAIN_NAME_STRING "nxtext_main" -#else -# define MAIN_NAME user_start -# define MAIN_NAME_STRING "user_start" -#endif - -int MAIN_NAME(int argc, char **argv) +int nxtext_main(int argc, char **argv) { FAR struct nxtext_state_s *bgstate; NXWINDOW hwnd = NULL; @@ -368,10 +360,10 @@ int MAIN_NAME(int argc, char **argv) /* Initialize NX */ ret = nxtext_initialize(); - message(MAIN_NAME_STRING ": NX handle=%p\n", g_hnx); + message("nxtext_main: NX handle=%p\n", g_hnx); if (!g_hnx || ret < 0) { - message(MAIN_NAME_STRING ": Failed to get NX handle: %d\n", errno); + message("nxtext_main: Failed to get NX handle: %d\n", errno); g_exitcode = NXEXIT_NXOPEN; goto errout; } @@ -381,7 +373,7 @@ int MAIN_NAME(int argc, char **argv) g_bghfont = nxf_getfonthandle(CONFIG_EXAMPLES_NXTEXT_BGFONTID); if (!g_bghfont) { - message(MAIN_NAME_STRING ": Failed to get background font handle: %d\n", errno); + message("nxtext_main: Failed to get background font handle: %d\n", errno); g_exitcode = NXEXIT_FONTOPEN; goto errout; } @@ -389,19 +381,19 @@ int MAIN_NAME(int argc, char **argv) g_puhfont = nxf_getfonthandle(CONFIG_EXAMPLES_NXTEXT_PUFONTID); if (!g_puhfont) { - message(MAIN_NAME_STRING ": Failed to get pop-up font handle: %d\n", errno); + message("nxtext_main: Failed to get pop-up font handle: %d\n", errno); g_exitcode = NXEXIT_FONTOPEN; goto errout; } /* Set the background to the configured background color */ - message(MAIN_NAME_STRING ": Set background color=%d\n", CONFIG_EXAMPLES_NXTEXT_BGCOLOR); + message("nxtext_main: Set background color=%d\n", CONFIG_EXAMPLES_NXTEXT_BGCOLOR); color = CONFIG_EXAMPLES_NXTEXT_BGCOLOR; ret = nx_setbgcolor(g_hnx, &color); if (ret < 0) { - message(MAIN_NAME_STRING ": nx_setbgcolor failed: %d\n", errno); + message("nxtext_main: nx_setbgcolor failed: %d\n", errno); g_exitcode = NXEXIT_NXSETBGCOLOR; goto errout_with_nx; } @@ -412,7 +404,7 @@ int MAIN_NAME(int argc, char **argv) ret = nx_requestbkgd(g_hnx, &g_nxtextcb, bgstate); if (ret < 0) { - message(MAIN_NAME_STRING ": nx_setbgcolor failed: %d\n", errno); + message("nxtext_main: nx_setbgcolor failed: %d\n", errno); g_exitcode = NXEXIT_NXREQUESTBKGD; goto errout_with_nx; } @@ -425,7 +417,7 @@ int MAIN_NAME(int argc, char **argv) { (void)sem_wait(&g_semevent); } - message(MAIN_NAME_STRING ": Screen resolution (%d,%d)\n", g_xres, g_yres); + message("nxtext_main: Screen resolution (%d,%d)\n", g_xres, g_yres); /* Now loop, adding text to the background and periodically presenting * a pop-up window. @@ -453,11 +445,11 @@ int MAIN_NAME(int argc, char **argv) /* Give keyboard input to the top window (which should be the pop-up) */ #ifdef CONFIG_NX_KBD - message(MAIN_NAME_STRING ": Send keyboard input: %s\n", g_pumsg); + message("nxtext_main: Send keyboard input: %s\n", g_pumsg); ret = nx_kbdin(g_hnx, strlen((FAR const char *)g_pumsg), g_pumsg); if (ret < 0) { - message(MAIN_NAME_STRING ": nx_kbdin failed: %d\n", errno); + message("nxtext_main: nx_kbdin failed: %d\n", errno); goto errout_with_hwnd; } #endif @@ -466,7 +458,7 @@ int MAIN_NAME(int argc, char **argv) { /* Destroy the pop-up window and restart the sequence */ - message(MAIN_NAME_STRING ": Close pop-up\n"); + message("nxtext_main: Close pop-up\n"); (void)nxpu_close(hwnd); popcnt = 0; } @@ -488,7 +480,7 @@ int MAIN_NAME(int argc, char **argv) errout_with_hwnd: if (popcnt >= 3) { - message(MAIN_NAME_STRING ": Close pop-up\n"); + message("nxtext_main: Close pop-up\n"); (void)nxpu_close(hwnd); } @@ -499,12 +491,12 @@ errout_with_nx: #ifdef CONFIG_NX_MULTIUSER /* Disconnect from the server */ - message(MAIN_NAME_STRING ": Disconnect from the server\n"); + message("nxtext_main: Disconnect from the server\n"); nx_disconnect(g_hnx); #else /* Close the server */ - message(MAIN_NAME_STRING ": Close NX\n"); + message("nxtext_main: Close NX\n"); nx_close(g_hnx); #endif errout: diff --git a/apps/examples/ostest/main.c b/apps/examples/ostest/main.c index 7d63c0ff4..61a2af19a 100644 --- a/apps/examples/ostest/main.c +++ b/apps/examples/ostest/main.c @@ -409,7 +409,7 @@ static int user_main(int argc, char *argv[]) check_test_memory_usage(); #endif /* CONFIG_PRIORITY_INHERITANCE && !CONFIG_DISABLE_SIGNALS && !CONFIG_DISABLE_PTHREAD */ - /* Compare memory usage at time user_start started until + /* Compare memory usage at time ostest_main started until * user_main exits. These should not be identical, but should * be similar enough that we can detect any serious OS memory * leaks. @@ -458,18 +458,10 @@ static void stdio_test(void) ****************************************************************************/ /**************************************************************************** - * user_start/ostest_main + * ostest_main ****************************************************************************/ -#ifdef CONFIG_EXAMPLES_OSTEST_BUILTIN -# define MAIN_NAME ostest_main -# define MAIN_STRING "ostest_main: " -#else -# define MAIN_NAME user_start -# define MAIN_STRING "user_start: " -#endif - -int MAIN_NAME(int argc, char *argv[]) +int ostest_main(int argc, char *argv[]) { int result; @@ -492,19 +484,19 @@ int MAIN_NAME(int argc, char *argv[]) /* Set up some environment variables */ #ifndef CONFIG_DISABLE_ENVIRON - printf(MAIN_STRING "putenv(%s)\n", g_putenv_value); + printf("ostest_main: putenv(%s)\n", g_putenv_value); putenv(g_putenv_value); /* Varaible1=BadValue3 */ - printf(MAIN_STRING "setenv(%s, %s, TRUE)\n", g_var1_name, g_var1_value); + printf("ostest_main: setenv(%s, %s, TRUE)\n", g_var1_name, g_var1_value); setenv(g_var1_name, g_var1_value, TRUE); /* Variable1=GoodValue1 */ - printf(MAIN_STRING "setenv(%s, %s, FALSE)\n", g_var2_name, g_bad_value1); + printf("ostest_main: setenv(%s, %s, FALSE)\n", g_var2_name, g_bad_value1); setenv(g_var2_name, g_bad_value1, FALSE); /* Variable2=BadValue1 */ - printf(MAIN_STRING "setenv(%s, %s, TRUE)\n", g_var2_name, g_var2_value); + printf("ostest_main: setenv(%s, %s, TRUE)\n", g_var2_name, g_var2_value); setenv(g_var2_name, g_var2_value, TRUE); /* Variable2=GoodValue2 */ - printf(MAIN_STRING "setenv(%s, %s, FALSE)\n", g_var3_name, g_var3_name); + printf("ostest_main: setenv(%s, %s, FALSE)\n", g_var3_name, g_var3_name); setenv(g_var3_name, g_var3_value, FALSE); /* Variable3=GoodValue3 */ - printf(MAIN_STRING "setenv(%s, %s, FALSE)\n", g_var3_name, g_var3_name); + printf("ostest_main: setenv(%s, %s, FALSE)\n", g_var3_name, g_var3_name); setenv(g_var3_name, g_bad_value2, FALSE); /* Variable3=GoodValue3 */ show_environment(true, true, true); #endif @@ -518,13 +510,13 @@ int MAIN_NAME(int argc, char *argv[]) #endif if (result == ERROR) { - printf(MAIN_STRING "ERROR Failed to start user_main\n"); + printf("ostest_main: ERROR Failed to start user_main\n"); } else { - printf(MAIN_STRING "Started user_main at PID=%d\n", result); + printf("ostest_main: Started user_main at PID=%d\n", result); } - printf(MAIN_STRING "Exitting\n"); + printf("ostest_main: Exitting\n"); return 0; } diff --git a/apps/examples/pashello/pashello.c b/apps/examples/pashello/pashello.c index ae19c94f5..5e2fe8bf3 100644 --- a/apps/examples/pashello/pashello.c +++ b/apps/examples/pashello/pashello.c @@ -99,10 +99,10 @@ static void prun(FAR struct pexec_s *st) ****************************************************************************/ /**************************************************************************** - * user_start + * pashello_main ****************************************************************************/ -int user_start(int argc, FAR char *argv[]) +int pashello_main(int argc, FAR char *argv[]) { FAR struct pexec_s *st; @@ -115,11 +115,11 @@ int user_start(int argc, FAR char *argv[]) st = pload("/dev/hello", CONFIG_PASHELLO_VARSTACKSIZE, CONFIG_PASHELLO_STRSTACKSIZE); if (!st) { - fprintf(stderr, "user_start: ERROR: Could not load /dev/hello\n"); + fprintf(stderr, "pashello_main: ERROR: Could not load /dev/hello\n"); exit(1); } - printf("user_start: /dev/hello Loaded\n"); - printf("user_start: Interpreter started:\n"); + printf("pashello_main: /dev/hello Loaded\n"); + printf("pashello_main: Interpreter started:\n"); /* And start program execution */ @@ -127,7 +127,7 @@ int user_start(int argc, FAR char *argv[]) /* Clean up resources used by the interpreter */ - printf("user_start: Interpreter terminated"); + printf("pashello_main: Interpreter terminated"); pexec_release(st); return 0; } diff --git a/apps/examples/pipe/pipe_main.c b/apps/examples/pipe/pipe_main.c index 1f0f73032..406832a98 100644 --- a/apps/examples/pipe/pipe_main.c +++ b/apps/examples/pipe/pipe_main.c @@ -69,21 +69,21 @@ ****************************************************************************/ /**************************************************************************** - * Name: user_start + * Name: pipe_main ****************************************************************************/ -int user_start(int argc, char *argv[]) +int pipe_main(int argc, char *argv[]) { int filedes[2]; int ret; /* Test FIFO logic */ - printf("\nuser_start: Performing FIFO test\n"); + printf("\npipe_main: Performing FIFO test\n"); ret = mkfifo(FIFO_PATH1, 0666); if (ret < 0) { - fprintf(stderr, "user_start: mkfifo failed with errno=%d\n", errno); + fprintf(stderr, "pipe_main: mkfifo failed with errno=%d\n", errno); return 1; } @@ -96,7 +96,7 @@ int user_start(int argc, char *argv[]) filedes[1] = open(FIFO_PATH1, O_WRONLY); if (filedes[1] < 0) { - fprintf(stderr, "user_start: Failed to open FIFO %s for writing, errno=%d\n", + fprintf(stderr, "pipe_main: Failed to open FIFO %s for writing, errno=%d\n", FIFO_PATH1, errno); return 2; } @@ -104,11 +104,11 @@ int user_start(int argc, char *argv[]) filedes[0] = open(FIFO_PATH1, O_RDONLY); if (filedes[0] < 0) { - fprintf(stderr, "user_start: Failed to open FIFO %s for reading, errno=%d\n", + fprintf(stderr, "pipe_main: Failed to open FIFO %s for reading, errno=%d\n", FIFO_PATH1, errno); if (close(filedes[1]) != 0) { - fprintf(stderr, "user_start: close failed: %d\n", errno); + fprintf(stderr, "pipe_main: close failed: %d\n", errno); } return 3; } @@ -118,28 +118,28 @@ int user_start(int argc, char *argv[]) ret = transfer_test(filedes[0], filedes[1]); if (close(filedes[0]) != 0) { - fprintf(stderr, "user_start: close failed: %d\n", errno); + fprintf(stderr, "pipe_main: close failed: %d\n", errno); } if (close(filedes[1]) != 0) { - fprintf(stderr, "user_start: close failed: %d\n", errno); + fprintf(stderr, "pipe_main: close failed: %d\n", errno); } /* unlink(FIFO_PATH1); fails */ if (ret != 0) { - fprintf(stderr, "user_start: FIFO test FAILED (%d)\n", ret); + fprintf(stderr, "pipe_main: FIFO test FAILED (%d)\n", ret); return 4; } - printf("user_start: FIFO test PASSED\n"); + printf("pipe_main: FIFO test PASSED\n"); /* Test PIPE logic */ - printf("\nuser_start: Performing pipe test\n"); + printf("\npipe_main: Performing pipe test\n"); ret = pipe(filedes); if (ret < 0) { - fprintf(stderr, "user_start: pipe failed with errno=%d\n", errno); + fprintf(stderr, "pipe_main: pipe failed with errno=%d\n", errno); return 5; } @@ -148,41 +148,41 @@ int user_start(int argc, char *argv[]) ret = transfer_test(filedes[0], filedes[1]); if (close(filedes[0]) != 0) { - fprintf(stderr, "user_start: close failed: %d\n", errno); + fprintf(stderr, "pipe_main: close failed: %d\n", errno); } if (close(filedes[1]) != 0) { - fprintf(stderr, "user_start: close failed: %d\n", errno); + fprintf(stderr, "pipe_main: close failed: %d\n", errno); } if (ret != 0) { - fprintf(stderr, "user_start: PIPE test FAILED (%d)\n", ret); + fprintf(stderr, "pipe_main: PIPE test FAILED (%d)\n", ret); return 6; } - printf("user_start: PIPE test PASSED\n"); + printf("pipe_main: PIPE test PASSED\n"); /* Perform the FIFO interlock test */ - printf("\nuser_start: Performing pipe interlock test\n"); + printf("\npipe_main: Performing pipe interlock test\n"); ret = interlock_test(); if (ret != 0) { - fprintf(stderr, "user_start: FIFO interlock test FAILED (%d)\n", ret); + fprintf(stderr, "pipe_main: FIFO interlock test FAILED (%d)\n", ret); return 7; } - printf("user_start: PIPE interlock test PASSED\n"); + printf("pipe_main: PIPE interlock test PASSED\n"); /* Perform the pipe redirection test */ - printf("\nuser_start: Performing redirection test\n"); + printf("\npipe_main: Performing redirection test\n"); ret = redirection_test(); if (ret != 0) { - fprintf(stderr, "user_start: FIFO redirection test FAILED (%d)\n", ret); + fprintf(stderr, "pipe_main: FIFO redirection test FAILED (%d)\n", ret); return 7; } - printf("user_start: PIPE redirection test PASSED\n"); + printf("pipe_main: PIPE redirection test PASSED\n"); fflush(stdout); return 0; diff --git a/apps/examples/pipe/redirect_test.c b/apps/examples/pipe/redirect_test.c index 45e86c356..db7c0b99a 100644 --- a/apps/examples/pipe/redirect_test.c +++ b/apps/examples/pipe/redirect_test.c @@ -301,16 +301,16 @@ int redirection_test(void) if (close(filedes[0]) != 0) { - fprintf(stderr, "user_start: close failed: %d\n", errno); + fprintf(stderr, "pipe_main: close failed: %d\n", errno); } if (close(filedes[1]) != 0) { - fprintf(stderr, "user_start: close failed: %d\n", errno); + fprintf(stderr, "pipe_main: close failed: %d\n", errno); } if (ret != 0) { - fprintf(stderr, "user_start: PIPE test FAILED (%d)\n", ret); + fprintf(stderr, "pipe_main: PIPE test FAILED (%d)\n", ret); return 6; } diff --git a/apps/examples/poll/poll_main.c b/apps/examples/poll/poll_main.c index 3db0150e7..9c3a096cb 100644 --- a/apps/examples/poll/poll_main.c +++ b/apps/examples/poll/poll_main.c @@ -74,10 +74,10 @@ ****************************************************************************/ /**************************************************************************** - * Name: user_start + * Name: poll_main ****************************************************************************/ -int user_start(int argc, char *argv[]) +int poll_main(int argc, char *argv[]) { char buffer[64]; ssize_t nbytes; @@ -94,20 +94,20 @@ int user_start(int argc, char *argv[]) /* Open FIFOs */ - message("\nuser_start: Creating FIFO %s\n", FIFO_PATH1); + message("\npoll_main: Creating FIFO %s\n", FIFO_PATH1); ret = mkfifo(FIFO_PATH1, 0666); if (ret < 0) { - message("user_start: mkfifo failed: %d\n", errno); + message("poll_main: mkfifo failed: %d\n", errno); exitcode = 1; goto errout; } - message("\nuser_start: Creating FIFO %s\n", FIFO_PATH2); + message("\npoll_main: Creating FIFO %s\n", FIFO_PATH2); ret = mkfifo(FIFO_PATH2, 0666); if (ret < 0) { - message("user_start: mkfifo failed: %d\n", errno); + message("poll_main: mkfifo failed: %d\n", errno); exitcode = 2; goto errout; } @@ -117,7 +117,7 @@ int user_start(int argc, char *argv[]) fd1 = open(FIFO_PATH1, O_WRONLY); if (fd1 < 0) { - message("user_start: Failed to open FIFO %s for writing, errno=%d\n", + message("poll_main: Failed to open FIFO %s for writing, errno=%d\n", FIFO_PATH1, errno); exitcode = 3; goto errout; @@ -126,7 +126,7 @@ int user_start(int argc, char *argv[]) fd2 = open(FIFO_PATH2, O_WRONLY); if (fd2 < 0) { - message("user_start: Failed to open FIFO %s for writing, errno=%d\n", + message("poll_main: Failed to open FIFO %s for writing, errno=%d\n", FIFO_PATH2, errno); exitcode = 4; goto errout; @@ -134,39 +134,39 @@ int user_start(int argc, char *argv[]) /* Start the listeners */ - message("user_start: Starting poll_listener thread\n"); + message("poll_main: Starting poll_listener thread\n"); ret = pthread_create(&tid1, NULL, poll_listener, NULL); if (ret != 0) { - message("user_start: Failed to create poll_listener thread: %d\n", ret); + message("poll_main: Failed to create poll_listener thread: %d\n", ret); exitcode = 5; goto errout; } - message("user_start: Starting select_listener thread\n"); + message("poll_main: Starting select_listener thread\n"); ret = pthread_create(&tid2, NULL, select_listener, NULL); if (ret != 0) { - message("user_start: Failed to create select_listener thread: %d\n", ret); + message("poll_main: Failed to create select_listener thread: %d\n", ret); exitcode = 6; goto errout; } #ifdef HAVE_NETPOLL #ifdef CONFIG_NET_TCPBACKLOG - message("user_start: Starting net_listener thread\n"); + message("poll_main: Starting net_listener thread\n"); ret = pthread_create(&tid3, NULL, net_listener, NULL); #else - message("user_start: Starting net_reader thread\n"); + message("poll_main: Starting net_reader thread\n"); ret = pthread_create(&tid3, NULL, net_reader, NULL); #endif if (ret != 0) { - message("user_start: Failed to create net_listener thread: %d\n", ret); + message("poll_main: Failed to create net_listener thread: %d\n", ret); } #endif @@ -182,7 +182,7 @@ int user_start(int argc, char *argv[]) nbytes = write(fd1, buffer, strlen(buffer)); if (nbytes < 0) { - message("user_start: Write to fd1 failed: %d\n", errno); + message("poll_main: Write to fd1 failed: %d\n", errno); exitcode = 7; goto errout; } @@ -190,12 +190,12 @@ int user_start(int argc, char *argv[]) nbytes = write(fd2, buffer, strlen(buffer)); if (nbytes < 0) { - message("user_start: Write fd2 failed: %d\n", errno); + message("poll_main: Write fd2 failed: %d\n", errno); exitcode = 8; goto errout; } - message("\nuser_start: Sent '%s' (%d bytes)\n", buffer, nbytes); + message("\npoll_main: Sent '%s' (%d bytes)\n", buffer, nbytes); msgflush(); /* Wait awhile. This delay should be long enough that the diff --git a/apps/examples/pwm/pwm_main.c b/apps/examples/pwm/pwm_main.c index 64c5dfb2c..775bdba6b 100644 --- a/apps/examples/pwm/pwm_main.c +++ b/apps/examples/pwm/pwm_main.c @@ -269,7 +269,7 @@ static void parse_args(FAR struct pwm_state_s *pwm, int argc, FAR char **argv) ****************************************************************************/ /**************************************************************************** - * Name: user_start/pwm_main + * Name: pwm_main ****************************************************************************/ int pwm_main(int argc, char *argv[]) diff --git a/apps/examples/qencoder/qe_main.c b/apps/examples/qencoder/qe_main.c index c58a2b0ad..8c185ea1b 100644 --- a/apps/examples/qencoder/qe_main.c +++ b/apps/examples/qencoder/qe_main.c @@ -59,14 +59,6 @@ * Pre-processor Definitions ****************************************************************************/ -#ifdef CONFIG_NSH_BUILTIN_APPS -# define MAIN_NAME qe_main -# define MAIN_STRING "qe_main: " -#else -# define MAIN_NAME user_start -# define MAIN_STRING "user_start: " -#endif - /**************************************************************************** * Private Types ****************************************************************************/ @@ -245,10 +237,10 @@ static void parse_args(int argc, FAR char **argv) ****************************************************************************/ /**************************************************************************** - * Name: user_start/qe_main + * Name: qe_main ****************************************************************************/ -int MAIN_NAME(int argc, char *argv[]) +int qe_main(int argc, char *argv[]) { int32_t position; int fd; @@ -266,11 +258,11 @@ int MAIN_NAME(int argc, char *argv[]) * this test. */ - message(MAIN_STRING "Initializing external encoder(s)\n"); + message("qe_main: Initializing external encoder(s)\n"); ret = qe_devinit(); if (ret != OK) { - message(MAIN_STRING "qe_devinit failed: %d\n", ret); + message("qe_main: qe_devinit failed: %d\n", ret); exitval = EXIT_FAILURE; goto errout; } @@ -289,13 +281,13 @@ int MAIN_NAME(int argc, char *argv[]) /* Open the encoder device for reading */ - message(MAIN_STRING "Hardware initialized. Opening the encoder device: %s\n", + message("qe_main: Hardware initialized. Opening the encoder device: %s\n", g_qeexample.devpath); fd = open(g_qeexample.devpath, O_RDONLY); if (fd < 0) { - message(MAIN_STRING "open %s failed: %d\n", g_qeexample.devpath, errno); + message("qe_main: open %s failed: %d\n", g_qeexample.devpath, errno); exitval = EXIT_FAILURE; goto errout_with_dev; } @@ -304,11 +296,11 @@ int MAIN_NAME(int argc, char *argv[]) if (g_qeexample.reset) { - message(MAIN_STRING "Resetting the count...\n"); + message("qe_main: Resetting the count...\n"); ret = ioctl(fd, QEIOC_RESET, 0); if (ret < 0) { - message(MAIN_STRING "ioctl(QEIOC_RESET) failed: %d\n", errno); + message("qe_main: ioctl(QEIOC_RESET) failed: %d\n", errno); exitval = EXIT_FAILURE; goto errout_with_dev; } @@ -319,10 +311,10 @@ int MAIN_NAME(int argc, char *argv[]) */ #if defined(CONFIG_NSH_BUILTIN_APPS) - message(MAIN_STRING "Number of samples: %d\n", g_qeexample.nloops); + message("qe_main: Number of samples: %d\n", g_qeexample.nloops); for (nloops = 0; nloops < g_qeexample.nloops; nloops++) #elif defined(CONFIG_EXAMPLES_QENCODER_NSAMPLES) - message(MAIN_STRING "Number of samples: %d\n", CONFIG_EXAMPLES_QENCODER_NSAMPLES); + message("qe_main: Number of samples: %d\n", CONFIG_EXAMPLES_QENCODER_NSAMPLES); for (nloops = 0; nloops < CONFIG_EXAMPLES_QENCODER_NSAMPLES; nloops++) #else for (;;) @@ -339,7 +331,7 @@ int MAIN_NAME(int argc, char *argv[]) ret = ioctl(fd, QEIOC_POSITION, (unsigned long)((uintptr_t)&position)); if (ret < 0) { - message(MAIN_STRING "ioctl(QEIOC_POSITION) failed: %d\n", errno); + message("qe_main: ioctl(QEIOC_POSITION) failed: %d\n", errno); exitval = EXIT_FAILURE; goto errout_with_dev; } @@ -348,7 +340,7 @@ int MAIN_NAME(int argc, char *argv[]) else { - message(MAIN_STRING "%3d. %d\n", nloops+1, position); + message("qe_main: %3d. %d\n", nloops+1, position); } /* Delay a little bit */ diff --git a/apps/examples/rgmp/main.c b/apps/examples/rgmp/main.c index ec6450c50..a1fa6cdc3 100644 --- a/apps/examples/rgmp/main.c +++ b/apps/examples/rgmp/main.c @@ -54,10 +54,10 @@ ****************************************************************************/ /**************************************************************************** - * user_start + * rgmp_main ****************************************************************************/ -int user_start(int argc, char *argv[]) +int rgmp_main(int argc, char *argv[]) { // TODO: add your code here diff --git a/apps/examples/romfs/romfs_main.c b/apps/examples/romfs/romfs_main.c index 32b3d2654..4870ff4f8 100644 --- a/apps/examples/romfs/romfs_main.c +++ b/apps/examples/romfs/romfs_main.c @@ -452,10 +452,10 @@ static void checkdirectories(struct node_s *entry) ****************************************************************************/ /**************************************************************************** - * Name: user_start + * Name: romfs_main ****************************************************************************/ -int user_start(int argc, char *argv[]) +int romfs_main(int argc, char *argv[]) { int ret; diff --git a/apps/examples/sendmail/target.c b/apps/examples/sendmail/target.c index a614c40cb..8440c7813 100644 --- a/apps/examples/sendmail/target.c +++ b/apps/examples/sendmail/target.c @@ -99,10 +99,10 @@ static const char g_msg_body[] = CONFIG_EXAMPLE_SENDMAIL_BODY "\r\n"; ****************************************************************************/ /**************************************************************************** - * user_start + * sendmail_main ****************************************************************************/ -int user_start(int argc, char *argv[]) +int sendmail_main(int argc, char *argv[]) { struct in_addr addr; #if defined(CONFIG_EXAMPLE_SENDMAIL_NOMAC) diff --git a/apps/examples/serloop/main.c b/apps/examples/serloop/main.c index 3c635fe88..f0e3ac238 100644 --- a/apps/examples/serloop/main.c +++ b/apps/examples/serloop/main.c @@ -56,10 +56,10 @@ ****************************************************************************/ /**************************************************************************** - * user_start + * serloop_main ****************************************************************************/ -int user_start(int argc, char *argv[]) +int serloop_main(int argc, char *argv[]) { #ifdef CONFIG_EXAMPLES_SERLOOP_BUFIO int ch; diff --git a/apps/examples/telnetd/shell.c b/apps/examples/telnetd/shell.c index 01c620e1e..3033698c5 100644 --- a/apps/examples/telnetd/shell.c +++ b/apps/examples/telnetd/shell.c @@ -222,14 +222,14 @@ static void shell_netinit(void) * Public Functions ****************************************************************************/ -int MAIN_NAME(int argc, char *argv[]) +int shell_main(int argc, char *argv[]) { struct telnetd_config_s config; int ret; /* Configure the network */ - printf(MAIN_STRING "Initializing the network\n"); + printf("shell_main: Initializing the network\n"); shell_netinit(); /* Configure the telnet daemon */ @@ -243,13 +243,13 @@ int MAIN_NAME(int argc, char *argv[]) /* Start the telnet daemon */ - printf(MAIN_STRING "Starting the Telnet daemon\n"); + printf("shell_main: Starting the Telnet daemon\n"); ret = telnetd_start(&config); if (ret < 0) { printf("Failed to tart the Telnet daemon\n"); } - printf(MAIN_STRING "Exiting\n"); + printf("shell_main: Exiting\n"); return 0; } diff --git a/apps/examples/telnetd/shell.h b/apps/examples/telnetd/shell.h index 23b30fda7..a5cec32b3 100644 --- a/apps/examples/telnetd/shell.h +++ b/apps/examples/telnetd/shell.h @@ -81,16 +81,6 @@ # define CONFIG_EXAMPLE_TELNETD_NETMASK 0xffffff00 #endif -/* Is this being built as an NSH built-in application? */ - -#ifdef CONFIG_NSH_BUILTIN_APPS -# define MAIN_NAME shell_main -# define MAIN_STRING "shell_main: " -#else -# define MAIN_NAME user_start -# define MAIN_STRING "user_start: " -#endif - /* Other definitions ********************************************************/ #define SHELL_PROMPT "uIP 1.0> " diff --git a/apps/examples/thttpd/main.c b/apps/examples/thttpd/main.c index ab69c60b2..4f8315d95 100644 --- a/apps/examples/thttpd/main.c +++ b/apps/examples/thttpd/main.c @@ -166,10 +166,10 @@ int g_thttpdnsymbols; ****************************************************************************/ /**************************************************************************** - * user_start + * thttp_main ****************************************************************************/ -int user_start(int argc, char *argv[]) +int thttp_main(int argc, char *argv[]) { struct in_addr addr; #ifdef CONFIG_EXAMPLE_THTTPD_NOMAC diff --git a/apps/examples/tiff/tiff_main.c b/apps/examples/tiff/tiff_main.c index d59f42cb4..1be2b09c5 100644 --- a/apps/examples/tiff/tiff_main.c +++ b/apps/examples/tiff/tiff_main.c @@ -98,20 +98,14 @@ ****************************************************************************/ /**************************************************************************** - * Name: tiff_main/user_start + * Name: tiff_main * * Description: * TIFF unit test. * ****************************************************************************/ -#ifdef CONFIG_EXAMPLES_TIFF_BUILTIN -# define MAIN_NAME tiff_main -#else -# define MAIN_NAME user_start -#endif - -int MAIN_NAME(int argc, char *argv[]) +int tiff_main(int argc, char *argv[]) { struct tiff_info_s info; uint8_t strip[3*256]; diff --git a/apps/examples/touchscreen/tc_main.c b/apps/examples/touchscreen/tc_main.c index 162025c79..76653bb8f 100644 --- a/apps/examples/touchscreen/tc_main.c +++ b/apps/examples/touchscreen/tc_main.c @@ -81,18 +81,10 @@ ****************************************************************************/ /**************************************************************************** - * Name: user_start/nxhello_main + * Name: tc_main ****************************************************************************/ -#ifdef CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN -# define MAIN_NAME tc_main -# define MAIN_STRING "tc_main: " -#else -# define MAIN_NAME user_start -# define MAIN_STRING "user_start: " -#endif - -int MAIN_NAME(int argc, char *argv[]) +int tc_main(int argc, char *argv[]) { struct touch_sample_s sample; ssize_t nbytes; @@ -113,31 +105,31 @@ int MAIN_NAME(int argc, char *argv[]) { nsamples = strtol(argv[1], NULL, 10); } - message(MAIN_STRING "nsamples: %d\n", nsamples); + message("tc_main: nsamples: %d\n", nsamples); #elif defined(CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES) - message(MAIN_STRING "nsamples: %d\n", CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES); + message("tc_main: nsamples: %d\n", CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES); #endif /* Initialization of the touchscreen hardware is performed by logic * external to this test. */ - message(MAIN_STRING "Initializing external touchscreen device\n"); + message("tc_main: Initializing external touchscreen device\n"); ret = arch_tcinitialize(CONFIG_EXAMPLES_TOUCHSCREEN_MINOR); if (ret != OK) { - message(MAIN_STRING "arch_tcinitialize failed: %d\n", ret); + message("tc_main: arch_tcinitialize failed: %d\n", ret); errval = 1; goto errout; } /* Open the touchscreen device for reading */ - message(MAIN_STRING "Opening %s\n", CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH); + message("tc_main: Opening %s\n", CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH); fd = open(CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH, O_RDONLY); if (fd < 0) { - message(MAIN_STRING "open %s failed: %d\n", + message("tc_main: open %s failed: %d\n", CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH, errno); errval = 2; goto errout_with_tc; @@ -174,17 +166,17 @@ int MAIN_NAME(int argc, char *argv[]) errval = errno; if (errval != EINTR) { - message(MAIN_STRING "read %s failed: %d\n", + message("tc_main: read %s failed: %d\n", CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH, errval); errval = 3; goto errout_with_dev; } - message(MAIN_STRING "Interrupted read...\n"); + message("tc_main: Interrupted read...\n"); } else if (nbytes != sizeof(struct touch_sample_s)) { - message(MAIN_STRING "Unexpected read size=%d, expected=%d, Ignoring\n", + message("tc_main: Unexpected read size=%d, expected=%d, Ignoring\n", nbytes, sizeof(struct touch_sample_s)); } diff --git a/apps/examples/udp/target.c b/apps/examples/udp/target.c index defbc7e05..ac3dc6ce8 100644 --- a/apps/examples/udp/target.c +++ b/apps/examples/udp/target.c @@ -59,10 +59,10 @@ ****************************************************************************/ /**************************************************************************** - * user_start + * udp_main ****************************************************************************/ -int user_start(int argc, char *argv[]) +int udp_main(int argc, char *argv[]) { struct in_addr addr; diff --git a/apps/examples/uip/main.c b/apps/examples/uip/main.c index 8712b9a28..9593d4d25 100644 --- a/apps/examples/uip/main.c +++ b/apps/examples/uip/main.c @@ -105,10 +105,10 @@ ****************************************************************************/ /**************************************************************************** - * user_start + * uip_main ****************************************************************************/ -int user_start(int argc, char *argv[]) +int uip_main(int argc, char *argv[]) { struct in_addr addr; #if defined(CONFIG_EXAMPLE_UIP_DHCPC) || defined(CONFIG_EXAMPLE_UIP_NOMAC) diff --git a/apps/examples/usbserial/main.c b/apps/examples/usbserial/main.c index 4e59c1ece..c73881a44 100644 --- a/apps/examples/usbserial/main.c +++ b/apps/examples/usbserial/main.c @@ -198,10 +198,10 @@ static void dumptrace(void) ****************************************************************************/ /**************************************************************************** - * user_start + * usbserial_main ****************************************************************************/ -int user_start(int argc, char *argv[]) +int usbserial_main(int argc, char *argv[]) { #ifndef CONFIG_EXAMPLES_USBSERIAL_INONLY int infd; @@ -220,7 +220,7 @@ int user_start(int argc, char *argv[]) /* Initialize the USB serial driver */ - message("user_start: Registering USB serial driver\n"); + message("usbserial_main: Registering USB serial driver\n"); #ifdef CONFIG_CDCACM ret = cdcacm_initialize(0, NULL); #else @@ -228,10 +228,10 @@ int user_start(int argc, char *argv[]) #endif if (ret < 0) { - message("user_start: ERROR: Failed to create the USB serial device: %d\n", -ret); + message("usbserial_main: ERROR: Failed to create the USB serial device: %d\n", -ret); return 1; } - message("user_start: Successfully registered the serial driver\n"); + message("usbserial_main: Successfully registered the serial driver\n"); #if CONFIG_USBDEV_TRACE && CONFIG_USBDEV_TRACE_INITIALIDSET != 0 /* If USB tracing is enabled and tracing of initial USB events is specified, @@ -251,25 +251,25 @@ int user_start(int argc, char *argv[]) #ifndef CONFIG_EXAMPLES_USBSERIAL_OUTONLY do { - message("user_start: Opening USB serial driver\n"); + message("usbserial_main: Opening USB serial driver\n"); outfd = open(USBSER_DEVNAME, O_WRONLY); if (outfd < 0) { int errcode = errno; - message("user_start: ERROR: Failed to open " USBSER_DEVNAME " for writing: %d\n", errcode); + message("usbserial_main: ERROR: Failed to open " USBSER_DEVNAME " for writing: %d\n", errcode); /* ENOTCONN means that the USB device is not yet connected */ if (errcode == ENOTCONN) { - message("user_start: Not connected. Wait and try again.\n"); + message("usbserial_main: Not connected. Wait and try again.\n"); sleep(5); } else { /* Give up on other errors */ - message("user_start: Aborting\n"); + message("usbserial_main: Aborting\n"); return 2; } } @@ -288,7 +288,7 @@ int user_start(int argc, char *argv[]) infd = open(USBSER_DEVNAME, O_RDONLY|O_NONBLOCK); if (infd < 0) { - message("user_start: ERROR: Failed to open " USBSER_DEVNAME " for reading: %d\n", errno); + message("usbserial_main: ERROR: Failed to open " USBSER_DEVNAME " for reading: %d\n", errno); close(outfd); return 3; } @@ -299,20 +299,20 @@ int user_start(int argc, char *argv[]) if (infd < 0) { int errcode = errno; - message("user_start: ERROR: Failed to open " USBSER_DEVNAME " for reading: %d\n", errno); + message("usbserial_main: ERROR: Failed to open " USBSER_DEVNAME " for reading: %d\n", errno); /* ENOTCONN means that the USB device is not yet connected */ if (errcode == ENOTCONN) { - message("user_start: Not connected. Wait and try again.\n"); + message("usbserial_main: Not connected. Wait and try again.\n"); sleep(5); } else { /* Give up on other errors */ - message("user_start: Aborting\n"); + message("usbserial_main: Aborting\n"); return 3; } } @@ -325,7 +325,7 @@ int user_start(int argc, char *argv[]) #endif #endif - message("user_start: Successfully opened the serial driver\n"); + message("usbserial_main: Successfully opened the serial driver\n"); /* Send messages and get responses -- forever */ @@ -337,21 +337,21 @@ int user_start(int argc, char *argv[]) #if !defined(CONFIG_EXAMPLES_USBSERIAL_ONLYBIG) && !defined(CONFIG_EXAMPLES_USBSERIAL_ONLYSMALL) if (count < 8) { - message("user_start: Saying hello\n"); + message("usbserial_main: Saying hello\n"); nbytes = write(outfd, g_shortmsg, sizeof(g_shortmsg)); count++; } else { - message("user_start: Reciting QEI's speech of 1588\n"); + message("usbserial_main: Reciting QEI's speech of 1588\n"); nbytes = write(outfd, g_longmsg, sizeof(g_longmsg)); count = 0; } #elif !defined(CONFIG_EXAMPLES_USBSERIAL_ONLYSMALL) - message("user_start: Reciting QEI's speech of 1588\n"); + message("usbserial_main: Reciting QEI's speech of 1588\n"); nbytes = write(outfd, g_longmsg, sizeof(g_longmsg)); #else /* !defined(CONFIG_EXAMPLES_USBSERIAL_ONLYBIG) */ - message("user_start: Saying hello\n"); + message("usbserial_main: Saying hello\n"); nbytes = write(outfd, g_shortmsg, sizeof(g_shortmsg)); #endif @@ -359,14 +359,14 @@ int user_start(int argc, char *argv[]) if (nbytes < 0) { - message("user_start: ERROR: write failed: %d\n", errno); + message("usbserial_main: ERROR: write failed: %d\n", errno); #ifndef CONFIG_EXAMPLES_USBSERIAL_INONLY close(infd); #endif close(outfd); return 4; } - message("user_start: %d bytes sent\n", nbytes); + message("usbserial_main: %d bytes sent\n", nbytes); #endif /* CONFIG_EXAMPLES_USBSERIAL_OUTONLY */ /* Test OUT (host-to-device) messages */ @@ -374,7 +374,7 @@ int user_start(int argc, char *argv[]) #ifndef CONFIG_EXAMPLES_USBSERIAL_INONLY /* Poll for incoming messages */ - message("user_start: Polling for OUT messages\n"); + message("usbserial_main: Polling for OUT messages\n"); for (i = 0; i < 5; i++) { memset(g_iobuffer, 'X', IOBUFFER_SIZE); @@ -384,7 +384,7 @@ int user_start(int argc, char *argv[]) int errorcode = errno; if (errorcode != EAGAIN) { - message("user_start: ERROR: read failed: %d\n", errno); + message("usbserial_main: ERROR: read failed: %d\n", errno); close(infd); #ifndef CONFIG_EXAMPLES_USBSERIAL_OUTONLY close(outfd); @@ -394,12 +394,12 @@ int user_start(int argc, char *argv[]) } else { - message("user_start: Received %d bytes:\n", nbytes); + message("usbserial_main: Received %d bytes:\n", nbytes); if (nbytes > 0) { for (j = 0; j < nbytes; j += 16) { - message("user_start: %03x: ", j); + message("usbserial_main: %03x: ", j); for (k = 0; k < 16; k++) { if (k == 8) @@ -445,7 +445,7 @@ int user_start(int argc, char *argv[]) sleep(1); } #else /* CONFIG_EXAMPLES_USBSERIAL_INONLY */ - message("user_start: Waiting\n"); + message("usbserial_main: Waiting\n"); sleep(5); #endif /* CONFIG_EXAMPLES_USBSERIAL_INONLY */ diff --git a/apps/examples/usbstorage/usbmsc_main.c b/apps/examples/usbstorage/usbmsc_main.c index 45feafc59..ac7b82d01 100644 --- a/apps/examples/usbstorage/usbmsc_main.c +++ b/apps/examples/usbstorage/usbmsc_main.c @@ -379,7 +379,7 @@ static int usbmsc_enumerate(struct usbtrace_s *trace, void *arg) ****************************************************************************/ /**************************************************************************** - * user_start/msconn_main + * msconn_main * * Description: * This is the main program that configures the USB mass storage device @@ -389,15 +389,7 @@ static int usbmsc_enumerate(struct usbtrace_s *trace, void *arg) * ****************************************************************************/ -#ifdef CONFIG_EXAMPLES_USBMSC_BUILTIN -# define MAIN_NAME msconn_main -# define MAIN_NAME_STRING "msconn" -#else -# define MAIN_NAME user_start -# define MAIN_NAME_STRING "user_start" -#endif - -int MAIN_NAME(int argc, char *argv[]) +int msconn_main(int argc, char *argv[]) { FAR void *handle; int ret; @@ -414,7 +406,7 @@ int MAIN_NAME(int argc, char *argv[]) if (g_usbmsc.mshandle) { - message(MAIN_NAME_STRING ": ERROR: Already connected\n"); + message("msconn_main: ERROR: Already connected\n"); return 1; } #endif @@ -436,33 +428,33 @@ int MAIN_NAME(int argc, char *argv[]) /* Register block drivers (architecture-specific) */ - message(MAIN_NAME_STRING ": Creating block drivers\n"); + message("msconn_main: Creating block drivers\n"); ret = usbmsc_archinitialize(); if (ret < 0) { - message(MAIN_NAME_STRING ": usbmsc_archinitialize failed: %d\n", -ret); + message("msconn_main: usbmsc_archinitialize failed: %d\n", -ret); return 2; } check_test_memory_usage("After usbmsc_archinitialize()"); /* Then exports the LUN(s) */ - message(MAIN_NAME_STRING ": Configuring with NLUNS=%d\n", CONFIG_EXAMPLES_USBMSC_NLUNS); + message("msconn_main: Configuring with NLUNS=%d\n", CONFIG_EXAMPLES_USBMSC_NLUNS); ret = usbmsc_configure(CONFIG_EXAMPLES_USBMSC_NLUNS, &handle); if (ret < 0) { - message(MAIN_NAME_STRING ": usbmsc_configure failed: %d\n", -ret); + message("msconn_main: usbmsc_configure failed: %d\n", -ret); usbmsc_uninitialize(handle); return 3; } - message(MAIN_NAME_STRING ": handle=%p\n", handle); + message("msconn_main: handle=%p\n", handle); check_test_memory_usage("After usbmsc_configure()"); - message(MAIN_NAME_STRING ": Bind LUN=0 to %s\n", CONFIG_EXAMPLES_USBMSC_DEVPATH1); + message("msconn_main: Bind LUN=0 to %s\n", CONFIG_EXAMPLES_USBMSC_DEVPATH1); ret = usbmsc_bindlun(handle, CONFIG_EXAMPLES_USBMSC_DEVPATH1, 0, 0, 0, false); if (ret < 0) { - message(MAIN_NAME_STRING ": usbmsc_bindlun failed for LUN 1 using %s: %d\n", + message("msconn_main: usbmsc_bindlun failed for LUN 1 using %s: %d\n", CONFIG_EXAMPLES_USBMSC_DEVPATH1, -ret); usbmsc_uninitialize(handle); return 4; @@ -471,11 +463,11 @@ int MAIN_NAME(int argc, char *argv[]) #if CONFIG_EXAMPLES_USBMSC_NLUNS > 1 - message(MAIN_NAME_STRING ": Bind LUN=1 to %s\n", CONFIG_EXAMPLES_USBMSC_DEVPATH2); + message("msconn_main: Bind LUN=1 to %s\n", CONFIG_EXAMPLES_USBMSC_DEVPATH2); ret = usbmsc_bindlun(handle, CONFIG_EXAMPLES_USBMSC_DEVPATH2, 1, 0, 0, false); if (ret < 0) { - message(MAIN_NAME_STRING ": usbmsc_bindlun failed for LUN 2 using %s: %d\n", + message("msconn_main: usbmsc_bindlun failed for LUN 2 using %s: %d\n", CONFIG_EXAMPLES_USBMSC_DEVPATH2, -ret); usbmsc_uninitialize(handle); return 5; @@ -484,11 +476,11 @@ int MAIN_NAME(int argc, char *argv[]) #if CONFIG_EXAMPLES_USBMSC_NLUNS > 2 - message(MAIN_NAME_STRING ": Bind LUN=2 to %s\n", CONFIG_EXAMPLES_USBMSC_DEVPATH3); + message("msconn_main: Bind LUN=2 to %s\n", CONFIG_EXAMPLES_USBMSC_DEVPATH3); ret = usbmsc_bindlun(handle, CONFIG_EXAMPLES_USBMSC_DEVPATH3, 2, 0, 0, false); if (ret < 0) { - message(MAIN_NAME_STRING ": usbmsc_bindlun failed for LUN 3 using %s: %d\n", + message("msconn_main: usbmsc_bindlun failed for LUN 3 using %s: %d\n", CONFIG_EXAMPLES_USBMSC_DEVPATH3, -ret); usbmsc_uninitialize(handle); return 6; @@ -501,7 +493,7 @@ int MAIN_NAME(int argc, char *argv[]) ret = usbmsc_exportluns(handle); if (ret < 0) { - message(MAIN_NAME_STRING ": usbmsc_exportluns failed: %d\n", -ret); + message("msconn_main: usbmsc_exportluns failed: %d\n", -ret); usbmsc_uninitialize(handle); return 7; } @@ -522,17 +514,17 @@ int MAIN_NAME(int argc, char *argv[]) sleep(5); # ifdef CONFIG_USBDEV_TRACE - message("\nuser_start: USB TRACE DATA:\n"); + message("\nmsconn_main: USB TRACE DATA:\n"); ret = usbtrace_enumerate(usbmsc_enumerate, NULL); if (ret < 0) { - message(MAIN_NAME_STRING ": usbtrace_enumerate failed: %d\n", -ret); + message("msconn_main: usbtrace_enumerate failed: %d\n", -ret); usbmsc_uninitialize(handle); return 8; } check_test_memory_usage("After usbtrace_enumerate()"); # else - message(MAIN_NAME_STRING ": Still alive\n"); + message("msconn_main: Still alive\n"); # endif } #elif defined(CONFIG_EXAMPLES_USBMSC_BUILTIN) @@ -541,7 +533,7 @@ int MAIN_NAME(int argc, char *argv[]) * command. */ - message(MAIN_NAME_STRING ": Connected\n"); + message("msconn_main: Connected\n"); g_usbmsc.mshandle = handle; check_test_memory_usage("After MS connection"); @@ -549,7 +541,7 @@ int MAIN_NAME(int argc, char *argv[]) /* Just exit */ - message(MAIN_NAME_STRING ": Exiting\n"); + message("msconn_main: Exiting\n"); /* Dump debug memory usage */ diff --git a/apps/examples/usbterm/usbterm_main.c b/apps/examples/usbterm/usbterm_main.c index 6e8e68412..69301dfcd 100644 --- a/apps/examples/usbterm/usbterm_main.c +++ b/apps/examples/usbterm/usbterm_main.c @@ -177,22 +177,14 @@ FAR void *usbterm_listener(FAR void *parameter) ****************************************************************************/ /**************************************************************************** - * Name: term_main/user_start + * Name: usbterm_main * * Description: * Main entry point for the USB serial terminal example. * ****************************************************************************/ -#ifdef CONFIG_EXAMPLES_USBTERM_BUILTIN -# define MAIN_NAME usbterm_main -# define MAIN_STRING "usbterm_main: " -#else -# define MAIN_NAME user_start -# define MAIN_STRING "user_start: " -#endif - -int MAIN_NAME(int argc, char *argv[]) +int usbterm_main(int argc, char *argv[]) { pthread_attr_t attr; int ret; @@ -206,18 +198,18 @@ int MAIN_NAME(int argc, char *argv[]) */ #ifdef CONFIG_EXAMPLES_USBTERM_DEVINIT - message(MAIN_STRING "Performing external device initialization\n"); + message("usbterm_main: Performing external device initialization\n"); ret = usbterm_devinit(); if (ret != OK) { - message(MAIN_STRING "usbterm_devinit failed: %d\n", ret); + message("usbterm_main: usbterm_devinit failed: %d\n", ret); goto errout; } #endif /* Initialize the USB serial driver */ - message(MAIN_STRING "Registering USB serial driver\n"); + message("usbterm_main: Registering USB serial driver\n"); #ifdef CONFIG_CDCACM ret = cdcacm_initialize(0, NULL); #else @@ -225,10 +217,10 @@ int MAIN_NAME(int argc, char *argv[]) #endif if (ret < 0) { - message(MAIN_STRING "ERROR: Failed to create the USB serial device: %d\n", -ret); + message("usbterm_main: ERROR: Failed to create the USB serial device: %d\n", -ret); goto errout_with_devinit; } - message(MAIN_STRING "Successfully registered the serial driver\n"); + message("usbterm_main: Successfully registered the serial driver\n"); #if CONFIG_USBDEV_TRACE && CONFIG_USBDEV_TRACE_INITIALIDSET != 0 /* If USB tracing is enabled and tracing of initial USB events is specified, @@ -247,20 +239,20 @@ int MAIN_NAME(int argc, char *argv[]) do { - message(MAIN_STRING "Opening USB serial driver\n"); + message("usbterm_main: Opening USB serial driver\n"); g_usbterm.outstream = fopen(USBTERM_DEVNAME, "w"); if (g_usbterm.outstream == NULL) { int errcode = errno; - message(MAIN_STRING "ERROR: Failed to open " USBTERM_DEVNAME " for writing: %d\n", + message("usbterm_main: ERROR: Failed to open " USBTERM_DEVNAME " for writing: %d\n", errcode); /* ENOTCONN means that the USB device is not yet connected */ if (errcode == ENOTCONN) { - message(MAIN_STRING " Not connected. Wait and try again.\n"); + message("usbterm_main: Not connected. Wait and try again.\n"); sleep(5); } else @@ -284,20 +276,20 @@ int MAIN_NAME(int argc, char *argv[]) g_usbterm.instream = fopen(USBTERM_DEVNAME, "r"); if (g_usbterm.instream == NULL) { - message(MAIN_STRING "ERROR: Failed to open " USBTERM_DEVNAME " for reading: %d\n", errno); + message("usbterm_main: ERROR: Failed to open " USBTERM_DEVNAME " for reading: %d\n", errno); goto errout_with_outstream; } - message(MAIN_STRING "Successfully opened the serial driver\n"); + message("usbterm_main: Successfully opened the serial driver\n"); /* Start the USB term listener thread */ - message(MAIN_STRING "Starting the listener thread\n"); + message("usbterm_main: Starting the listener thread\n"); ret = pthread_attr_init(&attr); if (ret != OK) { - message(MAIN_STRING "pthread_attr_init failed: %d\n", ret); + message("usbterm_main: pthread_attr_init failed: %d\n", ret); goto errout_with_streams; } @@ -305,13 +297,13 @@ int MAIN_NAME(int argc, char *argv[]) usbterm_listener, (pthread_addr_t)0); if (ret != 0) { - message(MAIN_STRING "Error in thread creation: %d\n", ret); + message("usbterm_main: Error in thread creation: %d\n", ret); goto errout_with_streams; } /* Send messages and get responses -- forever */ - message(MAIN_STRING "Waiting for local input\n"); + message("usbterm_main: Waiting for local input\n"); for (;;) { /* Display the prompt string on stdout */ @@ -378,7 +370,7 @@ errout_with_devinit: usbterm_devuninit(); errout: #endif - message(MAIN_STRING " Aborting\n"); + message("usbterm_main: Aborting\n"); return 1; } diff --git a/apps/examples/watchdog/watchdog_main.c b/apps/examples/watchdog/watchdog_main.c index c1341e0fb..53099d21a 100644 --- a/apps/examples/watchdog/watchdog_main.c +++ b/apps/examples/watchdog/watchdog_main.c @@ -217,7 +217,7 @@ static void parse_args(FAR struct wdog_example_s *wdog, int argc, FAR char **arg ****************************************************************************/ /**************************************************************************** - * Name: user_start/wdog_main + * Name: wdog_main ****************************************************************************/ int wdog_main(int argc, char *argv[]) diff --git a/apps/examples/wget/target.c b/apps/examples/wget/target.c index fa30e037b..5c5c65665 100644 --- a/apps/examples/wget/target.c +++ b/apps/examples/wget/target.c @@ -106,10 +106,10 @@ static void callback(FAR char **buffer, int offset, int datend, ****************************************************************************/ /**************************************************************************** - * user_start + * wget_main ****************************************************************************/ -int user_start(int argc, char *argv[]) +int wget_main(int argc, char *argv[]) { struct in_addr addr; #if defined(CONFIG_EXAMPLE_WGET_NOMAC) diff --git a/apps/examples/wlan/wlan_main.c b/apps/examples/wlan/wlan_main.c index d1fb44e94..dcb8c770a 100644 --- a/apps/examples/wlan/wlan_main.c +++ b/apps/examples/wlan/wlan_main.c @@ -258,32 +258,32 @@ static int wlan_waiter(int argc, char *argv[]) } /**************************************************************************** - * Name: user_start + * Name: wlan_main ****************************************************************************/ -int user_start(int argc, char *argv[]) +int wlan_main(int argc, char *argv[]) { pid_t pid; int ret; /* First, register all of the USB host Wireless LAN drivers */ - printf("user_start: Register drivers\n"); + printf("wlan_main: Register drivers\n"); ret = usbhost_wlaninit(); if (ret != OK) { - printf("user_start: Failed to register the WLAN driver\n"); + printf("wlan_main: Failed to register the WLAN driver\n"); } /* Then get an instance of the USB host interface */ - printf("user_start: Initialize USB host WLAN driver\n"); + printf("wlan_main: Initialize USB host WLAN driver\n"); g_drvr = usbhost_initialize(0); if (g_drvr) { /* Start a thread to handle device connection. */ - printf("user_start: Start wlan_waiter\n"); + printf("wlan_main: Start wlan_waiter\n"); #ifndef CONFIG_CUSTOM_STACK pid = task_create("usbhost", CONFIG_EXAMPLES_WLAN_DEFPRIO, diff --git a/apps/interpreters/README.txt b/apps/interpreters/README.txt index 8cf7ce321..f33c75df1 100644 --- a/apps/interpreters/README.txt +++ b/apps/interpreters/README.txt @@ -58,7 +58,7 @@ pcode Pascal P-Code at runtime. To use this example, place the following in your appconfig file" - # Path to example in apps/examples containing the user_start entry point + # Path to example in apps/examples containing the passhello_main entry point CONFIGURED_APPS += examples/pashello diff --git a/apps/system/i2c/i2c_main.c b/apps/system/i2c/i2c_main.c index 2a0e5d626..fbaf677aa 100644 --- a/apps/system/i2c/i2c_main.c +++ b/apps/system/i2c/i2c_main.c @@ -351,15 +351,7 @@ static void i2c_teardown(FAR struct i2ctool_s *i2ctool) * Name: i2c_main ****************************************************************************/ -#ifdef CONFIG_I2CTOOL_BUILTIN -# define MAIN_NAME i2c_main -# define MAIN_NAME_STRING "i2c_main" -#else -# define MAIN_NAME user_start -# define MAIN_NAME_STRING "user_start" -#endif - -int MAIN_NAME(int argc, char *argv[]) +int i2c_main(int argc, char *argv[]) { /* Verify settings */ |