Remove final traces of the 8015 from the NuttX source tree

This commit is contained in:
Gregory Nutt
2014-09-01 13:21:15 -06:00
parent 01bf45788e
commit dd8d40dabd
15 changed files with 14 additions and 34 deletions

View File

@@ -239,7 +239,7 @@ static int telnetd_daemon(int argc, char *argv[])
*/ */
nllvdbg("Starting the telnet session\n"); 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); daemon->entry, NULL);
if (pid < 0) if (pid < 0)
{ {
@@ -319,7 +319,7 @@ int telnetd_start(FAR struct telnetd_config_s *config)
/* Then start the new daemon */ /* Then start the new daemon */
g_telnetdcommon.daemon = 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); telnetd_daemon, NULL);
if (pid < 0) if (pid < 0)
{ {

View File

@@ -256,7 +256,7 @@ int ftpd_main(int s_argc, char **s_argv)
if (!g_ftpdglob.running) if (!g_ftpdglob.running)
{ {
printf("Starting the FTP daemon\n"); 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, CONFIG_EXAMPLES_FTPD_STACKSIZE,
ftpd_daemon, NULL); ftpd_daemon, NULL);
if (g_ftpdglob.pid < 0) if (g_ftpdglob.pid < 0)

View File

@@ -306,14 +306,9 @@ int hidkbd_main(int argc, char *argv[])
printf("hidkbd_main: Start hidkbd_waiter\n"); printf("hidkbd_main: Start hidkbd_waiter\n");
#ifndef CONFIG_CUSTOM_STACK
pid = task_create("usbhost", CONFIG_EXAMPLES_HIDKBD_DEFPRIO, pid = task_create("usbhost", CONFIG_EXAMPLES_HIDKBD_DEFPRIO,
CONFIG_EXAMPLES_HIDKBD_STACKSIZE, CONFIG_EXAMPLES_HIDKBD_STACKSIZE,
(main_t)hidkbd_waiter, (FAR char * const *)NULL); (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); UNUSED(pid);
/* Now just sleep. Eventually logic here will open the kbd device and /* Now just sleep. Eventually logic here will open the kbd device and

View File

@@ -389,7 +389,7 @@ int nxcon_main(int argc, char **argv)
* from this task. * 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, CONFIG_EXAMPLES_NXCONSOLE_STACKSIZE,
nxcon_task, NULL); nxcon_task, NULL);
ASSERT(g_nxcon_vars.pid > 0); ASSERT(g_nxcon_vars.pid > 0);

View File

@@ -308,7 +308,7 @@ void fpu_test(void)
g_fpuno = 0; g_fpuno = 0;
printf("Starting task FPU#1\n"); 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) if (task1 < 0)
{ {
printf("fpu_test: ERROR Failed to start task FPU#1\n"); printf("fpu_test: ERROR Failed to start task FPU#1\n");
@@ -321,7 +321,7 @@ void fpu_test(void)
usleep(250); usleep(250);
printf("Starting task FPU#2\n"); 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) if (task2 < 0)
{ {
printf("fpu_test: ERROR Failed to start task FPU#1\n"); printf("fpu_test: ERROR Failed to start task FPU#1\n");

View File

@@ -552,13 +552,8 @@ int ostest_main(int argc, FAR char *argv[])
/* Verify that we can spawn a new task */ /* Verify that we can spawn a new task */
#ifndef CONFIG_CUSTOM_STACK
result = task_create("ostest", PRIORITY, STACKSIZE, user_main, result = task_create("ostest", PRIORITY, STACKSIZE, user_main,
(FAR char * const *)g_argv); (FAR char * const *)g_argv);
#else
result = task_create("ostest", PRIORITY, user_main,
(FAR char * const *)g_argv);
#endif
if (result == ERROR) if (result == ERROR)
{ {
printf("ostest_main: ERROR Failed to start user_main\n"); printf("ostest_main: ERROR Failed to start user_main\n");

View File

@@ -166,7 +166,7 @@ void restart_test(void)
/* Start the task */ /* 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) if (ret < 0)
{ {
printf("restart_main: ERROR Failed to start restart_main\n"); printf("restart_main: ERROR Failed to start restart_main\n");

View File

@@ -84,7 +84,7 @@ static void waitpid_start_children(void)
for (i = 0; i < NCHILDREN; i++) 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) if (ret < 0)
{ {
printf("waitpid_start_child: ERROR Failed to start waitpid_main\n"); printf("waitpid_start_child: ERROR Failed to start waitpid_main\n");

View File

@@ -452,7 +452,7 @@ int discover_start(struct discover_info_s *info)
/* Then start the new daemon */ /* 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); CONFIG_DISCOVER_STACK_SIZE, discover_daemon, NULL);
if (pid < 0) if (pid < 0)
{ {

View File

@@ -491,7 +491,7 @@ int ntpc_start(void)
g_ntpc_daemon.state = NTP_STARTED; g_ntpc_daemon.state = NTP_STARTED;
g_ntpc_daemon.pid = 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, CONFIG_NETUTILS_NTPCLIENT_STACKSIZE, ntpc_daemon,
NULL); NULL);

View File

@@ -239,7 +239,7 @@ static int telnetd_daemon(int argc, char *argv[])
*/ */
nllvdbg("Starting the telnet session\n"); 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); daemon->entry, NULL);
if (pid < 0) if (pid < 0)
{ {
@@ -319,7 +319,7 @@ int telnetd_start(FAR struct telnetd_config_s *config)
/* Then start the new daemon */ /* Then start the new daemon */
g_telnetdcommon.daemon = 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); telnetd_daemon, NULL);
if (pid < 0) if (pid < 0)
{ {

View File

@@ -1865,14 +1865,9 @@ static int ls(httpd_conn *hc)
snprintf(arg, 16, "%p", hc); /* task_create doesn't handle binary arguments. */ snprintf(arg, 16, "%p", hc); /* task_create doesn't handle binary arguments. */
argv[0] = arg; argv[0] = arg;
#ifndef CONFIG_CUSTOM_STACK
child = task_create("CGI child", CONFIG_THTTPD_CGI_PRIORITY, child = task_create("CGI child", CONFIG_THTTPD_CGI_PRIORITY,
CONFIG_THTTPD_CGI_STACKSIZE, CONFIG_THTTPD_CGI_STACKSIZE,
(main_t)ls_child, (FAR char * const *)argv); (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) if (child < 0)
{ {
ndbg("task_create: %d\n", errno); ndbg("task_create: %d\n", errno);

View File

@@ -1021,14 +1021,9 @@ int cgi(httpd_conn *hc)
argv[0] = arg; argv[0] = arg;
argv[1] = NULL; argv[1] = NULL;
#ifndef CONFIG_CUSTOM_STACK
child = task_create("CGI child", CONFIG_THTTPD_CGI_PRIORITY, child = task_create("CGI child", CONFIG_THTTPD_CGI_PRIORITY,
CONFIG_THTTPD_CGI_STACKSIZE, CONFIG_THTTPD_CGI_STACKSIZE,
(main_t)cgi_child, (FAR char * const *)argv); (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) if (child < 0)
{ {
ndbg("task_create: %d\n", errno); ndbg("task_create: %d\n", errno);

View File

@@ -152,7 +152,7 @@ int stackmonitor_start(int argc, char **argv)
g_stackmonitor.started = true; g_stackmonitor.started = true;
g_stackmonitor.stop = false; 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, CONFIG_SYSTEM_STACKMONITOR_STACKSIZE,
(main_t)stackmonitor_daemon, (FAR char * const *)NULL); (main_t)stackmonitor_daemon, (FAR char * const *)NULL);
if (ret < 0) if (ret < 0)

View File

@@ -197,7 +197,7 @@ int usbmonitor_start(int argc, char **argv)
g_usbmonitor.started = true; g_usbmonitor.started = true;
g_usbmonitor.stop = false; 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, CONFIG_SYSTEM_USBMONITOR_STACKSIZE,
(main_t)usbmonitor_daemon, (FAR char * const *)NULL); (main_t)usbmonitor_daemon, (FAR char * const *)NULL);
if (ret < 0) if (ret < 0)