diff --git a/NxWidgets/libnxwidgets/src/cnxserver.cxx b/NxWidgets/libnxwidgets/src/cnxserver.cxx index 8dd448b..e87c0fd 100644 --- a/NxWidgets/libnxwidgets/src/cnxserver.cxx +++ b/NxWidgets/libnxwidgets/src/cnxserver.cxx @@ -217,7 +217,7 @@ bool CNxServer::connect(void) // Start the server task gvdbg("CNxServer::connect: Starting server task\n"); - pid_t serverId = TASK_CREATE("NX Server", CONFIG_NXWIDGETS_SERVERPRIO, + pid_t serverId = task_create("NX Server", CONFIG_NXWIDGETS_SERVERPRIO, CONFIG_NXWIDGETS_SERVERSTACK, server, (FAR char * const *)0); if (serverId < 0) diff --git a/NxWidgets/nxwm/src/cnxconsole.cxx b/NxWidgets/nxwm/src/cnxconsole.cxx index b8577b6..be0718a 100644 --- a/NxWidgets/nxwm/src/cnxconsole.cxx +++ b/NxWidgets/nxwm/src/cnxconsole.cxx @@ -250,7 +250,7 @@ bool CNxConsole::run(void) g_nxconvars.nxcon = 0; sched_lock(); - m_pid = TASK_CREATE("NxConsole", CONFIG_NXWM_NXCONSOLE_PRIO, + m_pid = task_create("NxConsole", CONFIG_NXWM_NXCONSOLE_PRIO, CONFIG_NXWM_NXCONSOLE_STACKSIZE, nxconsole, (FAR char * const *)0); diff --git a/apps/examples/cc3000/telnetd_daemon.c b/apps/examples/cc3000/telnetd_daemon.c index 2adadc6..2237741 100644 --- a/apps/examples/cc3000/telnetd_daemon.c +++ b/apps/examples/cc3000/telnetd_daemon.c @@ -239,7 +239,7 @@ static int telnetd_daemon(int argc, char *argv[]) */ nllvdbg("Starting the telnet session\n"); - pid = TASK_CREATE("Telnet session", daemon->priority, daemon->stacksize, + pid = task_create("Telnet session", daemon->priority, daemon->stacksize, daemon->entry, NULL); if (pid < 0) { @@ -319,7 +319,7 @@ int telnetd_start(FAR struct telnetd_config_s *config) /* Then start the new daemon */ g_telnetdcommon.daemon = daemon; - pid = TASK_CREATE("Telnet daemon", config->d_priority, config->d_stacksize, + pid = task_create("Telnet daemon", config->d_priority, config->d_stacksize, telnetd_daemon, NULL); if (pid < 0) { diff --git a/apps/examples/ftpd/ftpd_main.c b/apps/examples/ftpd/ftpd_main.c index 507d90e..8054c32 100644 --- a/apps/examples/ftpd/ftpd_main.c +++ b/apps/examples/ftpd/ftpd_main.c @@ -256,7 +256,7 @@ int ftpd_main(int s_argc, char **s_argv) if (!g_ftpdglob.running) { printf("Starting the FTP daemon\n"); - g_ftpdglob.pid = TASK_CREATE("FTP daemon", CONFIG_EXAMPLES_FTPD_PRIO, + g_ftpdglob.pid = task_create("FTP daemon", CONFIG_EXAMPLES_FTPD_PRIO, CONFIG_EXAMPLES_FTPD_STACKSIZE, ftpd_daemon, NULL); if (g_ftpdglob.pid < 0) diff --git a/apps/examples/hidkbd/hidkbd_main.c b/apps/examples/hidkbd/hidkbd_main.c index 67778f6..f188574 100644 --- a/apps/examples/hidkbd/hidkbd_main.c +++ b/apps/examples/hidkbd/hidkbd_main.c @@ -306,14 +306,9 @@ int hidkbd_main(int argc, char *argv[]) printf("hidkbd_main: Start hidkbd_waiter\n"); -#ifndef CONFIG_CUSTOM_STACK pid = task_create("usbhost", CONFIG_EXAMPLES_HIDKBD_DEFPRIO, CONFIG_EXAMPLES_HIDKBD_STACKSIZE, (main_t)hidkbd_waiter, (FAR char * const *)NULL); -#else - pid = task_create("usbhost", CONFIG_EXAMPLES_HIDKBD_DEFPRIO, - (main_t)hidkbd_waiter, (FAR char * const *)NULL); -#endif UNUSED(pid); /* Now just sleep. Eventually logic here will open the kbd device and diff --git a/apps/examples/nxconsole/nxcon_main.c b/apps/examples/nxconsole/nxcon_main.c index 45223dc..550ce49 100644 --- a/apps/examples/nxconsole/nxcon_main.c +++ b/apps/examples/nxconsole/nxcon_main.c @@ -389,7 +389,7 @@ int nxcon_main(int argc, char **argv) * from this task. */ - g_nxcon_vars.pid = TASK_CREATE("NxConsole", CONFIG_EXAMPLES_NXCONSOLE_PRIO, + g_nxcon_vars.pid = task_create("NxConsole", CONFIG_EXAMPLES_NXCONSOLE_PRIO, CONFIG_EXAMPLES_NXCONSOLE_STACKSIZE, nxcon_task, NULL); ASSERT(g_nxcon_vars.pid > 0); diff --git a/apps/examples/ostest/fpu.c b/apps/examples/ostest/fpu.c index 2729348..47b6685 100644 --- a/apps/examples/ostest/fpu.c +++ b/apps/examples/ostest/fpu.c @@ -308,7 +308,7 @@ void fpu_test(void) g_fpuno = 0; printf("Starting task FPU#1\n"); - task1 = TASK_CREATE("FPU#1", CONFIG_EXAMPLES_OSTEST_FPUPRIORITY, CONFIG_EXAMPLES_OSTEST_FPUSTACKSIZE, fpu_task, NULL); + task1 = task_create("FPU#1", CONFIG_EXAMPLES_OSTEST_FPUPRIORITY, CONFIG_EXAMPLES_OSTEST_FPUSTACKSIZE, fpu_task, NULL); if (task1 < 0) { printf("fpu_test: ERROR Failed to start task FPU#1\n"); @@ -321,7 +321,7 @@ void fpu_test(void) usleep(250); printf("Starting task FPU#2\n"); - task2 = TASK_CREATE("FPU#2", CONFIG_EXAMPLES_OSTEST_FPUPRIORITY, CONFIG_EXAMPLES_OSTEST_FPUSTACKSIZE, fpu_task, NULL); + task2 = task_create("FPU#2", CONFIG_EXAMPLES_OSTEST_FPUPRIORITY, CONFIG_EXAMPLES_OSTEST_FPUSTACKSIZE, fpu_task, NULL); if (task2 < 0) { printf("fpu_test: ERROR Failed to start task FPU#1\n"); diff --git a/apps/examples/ostest/ostest_main.c b/apps/examples/ostest/ostest_main.c index f7879ed..8e78e5d 100644 --- a/apps/examples/ostest/ostest_main.c +++ b/apps/examples/ostest/ostest_main.c @@ -552,13 +552,8 @@ int ostest_main(int argc, FAR char *argv[]) /* Verify that we can spawn a new task */ -#ifndef CONFIG_CUSTOM_STACK result = task_create("ostest", PRIORITY, STACKSIZE, user_main, (FAR char * const *)g_argv); -#else - result = task_create("ostest", PRIORITY, user_main, - (FAR char * const *)g_argv); -#endif if (result == ERROR) { printf("ostest_main: ERROR Failed to start user_main\n"); diff --git a/apps/examples/ostest/restart.c b/apps/examples/ostest/restart.c index 0d0f90d..703dbd9 100644 --- a/apps/examples/ostest/restart.c +++ b/apps/examples/ostest/restart.c @@ -166,7 +166,7 @@ void restart_test(void) /* Start the task */ - ret = TASK_CREATE("ostest", PRIORITY, STACKSIZE, restart_main, g_argv); + ret = task_create("ostest", PRIORITY, STACKSIZE, restart_main, g_argv); if (ret < 0) { printf("restart_main: ERROR Failed to start restart_main\n"); diff --git a/apps/examples/ostest/waitpid.c b/apps/examples/ostest/waitpid.c index 0649748..6b6de79 100644 --- a/apps/examples/ostest/waitpid.c +++ b/apps/examples/ostest/waitpid.c @@ -84,7 +84,7 @@ static void waitpid_start_children(void) for (i = 0; i < NCHILDREN; i++) { - ret = TASK_CREATE("waitpid", PRIORITY, STACKSIZE, waitpid_main, NULL); + ret = task_create("waitpid", PRIORITY, STACKSIZE, waitpid_main, NULL); if (ret < 0) { printf("waitpid_start_child: ERROR Failed to start waitpid_main\n"); diff --git a/apps/netutils/discover/discover.c b/apps/netutils/discover/discover.c index dcd008a..41e7ecd 100644 --- a/apps/netutils/discover/discover.c +++ b/apps/netutils/discover/discover.c @@ -452,7 +452,7 @@ int discover_start(struct discover_info_s *info) /* Then start the new daemon */ - pid = TASK_CREATE("Discover daemon", CONFIG_DISCOVER_PRIORITY, + pid = task_create("Discover daemon", CONFIG_DISCOVER_PRIORITY, CONFIG_DISCOVER_STACK_SIZE, discover_daemon, NULL); if (pid < 0) { diff --git a/apps/netutils/ntpclient/ntpclient.c b/apps/netutils/ntpclient/ntpclient.c index ea01606..a0d8d19 100644 --- a/apps/netutils/ntpclient/ntpclient.c +++ b/apps/netutils/ntpclient/ntpclient.c @@ -491,7 +491,7 @@ int ntpc_start(void) g_ntpc_daemon.state = NTP_STARTED; g_ntpc_daemon.pid = - TASK_CREATE("NTP daemon", CONFIG_NETUTILS_NTPCLIENT_SERVERPRIO, + task_create("NTP daemon", CONFIG_NETUTILS_NTPCLIENT_SERVERPRIO, CONFIG_NETUTILS_NTPCLIENT_STACKSIZE, ntpc_daemon, NULL); diff --git a/apps/netutils/telnetd/telnetd_daemon.c b/apps/netutils/telnetd/telnetd_daemon.c index 94b3402..e08d23d 100644 --- a/apps/netutils/telnetd/telnetd_daemon.c +++ b/apps/netutils/telnetd/telnetd_daemon.c @@ -239,7 +239,7 @@ static int telnetd_daemon(int argc, char *argv[]) */ nllvdbg("Starting the telnet session\n"); - pid = TASK_CREATE("Telnet session", daemon->priority, daemon->stacksize, + pid = task_create("Telnet session", daemon->priority, daemon->stacksize, daemon->entry, NULL); if (pid < 0) { @@ -319,7 +319,7 @@ int telnetd_start(FAR struct telnetd_config_s *config) /* Then start the new daemon */ g_telnetdcommon.daemon = daemon; - pid = TASK_CREATE("Telnet daemon", config->d_priority, config->d_stacksize, + pid = task_create("Telnet daemon", config->d_priority, config->d_stacksize, telnetd_daemon, NULL); if (pid < 0) { diff --git a/apps/netutils/thttpd/libhttpd.c b/apps/netutils/thttpd/libhttpd.c index 2b4b976..4abf947 100644 --- a/apps/netutils/thttpd/libhttpd.c +++ b/apps/netutils/thttpd/libhttpd.c @@ -1865,14 +1865,9 @@ static int ls(httpd_conn *hc) snprintf(arg, 16, "%p", hc); /* task_create doesn't handle binary arguments. */ argv[0] = arg; -#ifndef CONFIG_CUSTOM_STACK child = task_create("CGI child", CONFIG_THTTPD_CGI_PRIORITY, CONFIG_THTTPD_CGI_STACKSIZE, (main_t)ls_child, (FAR char * const *)argv); -#else - child = task_create("CGI child", CONFIG_THTTPD_CGI_PRIORITY, - (main_t)ls_child, (FAR char * const *)argv); -#endif if (child < 0) { ndbg("task_create: %d\n", errno); diff --git a/apps/netutils/thttpd/thttpd_cgi.c b/apps/netutils/thttpd/thttpd_cgi.c index 1c931bb..27eb470 100644 --- a/apps/netutils/thttpd/thttpd_cgi.c +++ b/apps/netutils/thttpd/thttpd_cgi.c @@ -1021,14 +1021,9 @@ int cgi(httpd_conn *hc) argv[0] = arg; argv[1] = NULL; -#ifndef CONFIG_CUSTOM_STACK child = task_create("CGI child", CONFIG_THTTPD_CGI_PRIORITY, CONFIG_THTTPD_CGI_STACKSIZE, (main_t)cgi_child, (FAR char * const *)argv); -#else - child = task_create("CGI child", CONFIG_THTTPD_CGI_PRIORITY, - (main_t)cgi_child, (FAR char * const *)argv); -#endif if (child < 0) { ndbg("task_create: %d\n", errno); diff --git a/apps/system/stackmonitor/stackmonitor.c b/apps/system/stackmonitor/stackmonitor.c index 2c912fc..8587fda 100644 --- a/apps/system/stackmonitor/stackmonitor.c +++ b/apps/system/stackmonitor/stackmonitor.c @@ -152,7 +152,7 @@ int stackmonitor_start(int argc, char **argv) g_stackmonitor.started = true; g_stackmonitor.stop = false; - ret = TASK_CREATE("Stack Monitor", CONFIG_SYSTEM_STACKMONITOR_PRIORITY, + ret = task_create("Stack Monitor", CONFIG_SYSTEM_STACKMONITOR_PRIORITY, CONFIG_SYSTEM_STACKMONITOR_STACKSIZE, (main_t)stackmonitor_daemon, (FAR char * const *)NULL); if (ret < 0) diff --git a/apps/system/usbmonitor/usbmonitor.c b/apps/system/usbmonitor/usbmonitor.c index 252a589..25bc681 100644 --- a/apps/system/usbmonitor/usbmonitor.c +++ b/apps/system/usbmonitor/usbmonitor.c @@ -197,7 +197,7 @@ int usbmonitor_start(int argc, char **argv) g_usbmonitor.started = true; g_usbmonitor.stop = false; - ret = TASK_CREATE("USB Monitor", CONFIG_SYSTEM_USBMONITOR_PRIORITY, + ret = task_create("USB Monitor", CONFIG_SYSTEM_USBMONITOR_PRIORITY, CONFIG_SYSTEM_USBMONITOR_STACKSIZE, (main_t)usbmonitor_daemon, (FAR char * const *)NULL); if (ret < 0) diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index 049d429..276ae22 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -8,7 +8,7 @@

NuttX RTOS

-

Last Updated: August 15, 2014

+

Last Updated: September 1, 2014

@@ -1254,7 +1254,7 @@
  • Intel
    • @@ -1330,7 +1330,7 @@
  • Intel
    • @@ -3622,8 +3622,7 @@ Mem: 29232 5920 23312 23312

    PJRC 87C52 Development Board. - This port uses the PJRC 87C52 development system - and the SDCC toolchain under Linux or Cygwin. + This port uses the PJRC 87C52 development system and the SDCC toolchain under Linux or Cygwin.

    diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html index 7bbadfa..07996d5 100644 --- a/nuttx/Documentation/NuttxPortingGuide.html +++ b/nuttx/Documentation/NuttxPortingGuide.html @@ -607,10 +607,6 @@ This is a work in progress. -
  • arch/8051: - 8051 Microcontroller. This port is not quite ready for prime time. -
    • -
  • arch/z16f: Zilog z16f Microcontroller. This port uses the Zilog z16f2800100zcog Development Kit. @@ -950,12 +946,6 @@ (PICkit 2 does not work with the PIC32).
    • -
  • configs/pjrc-8051: - 8051 Microcontroller. This port uses the PJRC 87C52 development system - and the SDCC toolchain under Linux or Cygwin. - This port is not quite ready for prime time. -
    • -
  • configs/qemu-i486: Port of NuttX to QEMU in i486 mode. This port will also run on real i486 hardware (Google the Bifferboard). @@ -1806,9 +1796,6 @@ The system can be re-made subsequently by just typing make.
  • adj_stack_ptr: Adjusted stack_alloc_ptr for HW. The initial value of the stack pointer. -

    - This API is NOT required if CONFIG_CUSTOM_STACK is defined. -

    Input Parameters:

    -

    - This API is NOT required if CONFIG_CUSTOM_STACK is defined. -

    Input Parameters:

    - This API is NOT required if CONFIG_BUILD_PROTECTED and CONFIG_BUILD_KERNEL are undefined or if CONFIG_CUSTOM_STACK is defined. + This API is NOT required if CONFIG_BUILD_PROTECTED and CONFIG_BUILD_KERNEL are undefined.

    Input Parameters: