Use rtems_task_exit()

18 files changed, 25 insertions, 41 deletions

diff --git a/dhcpcd/dhcpcd.c b/dhcpcd/dhcpcd.c
index b7839d49..93620727 100644
--- a/dhcpcd/dhcpcd.c
+++ b/dhcpcd/dhcpcd.c
@@ -1155,7 +1155,7 @@ dhcpcd_task(rtems_task_argument arg)
 		(*config->destroy)(config, exit_code);
 	}
 
-	rtems_task_delete(RTEMS_SELF);
+	rtems_task_exit();
 }
 
 rtems_status_code
diff --git a/rtemsbsd/nfsclient/nfs.c b/rtemsbsd/nfsclient/nfs.c
index baada6ce..e9e83abb 100644
--- a/rtemsbsd/nfsclient/nfs.c
+++ b/rtemsbsd/nfsclient/nfs.c
@@ -3114,7 +3114,7 @@ rtems_filesystem_location_info_t	old;
 		rtems_filesystem_current->location = old;
 	}
 	rtems_semaphore_release(rpa->sync);
-	rtems_task_delete(RTEMS_SELF);
+	rtems_task_exit();
 }
 
 
diff --git a/rtemsbsd/pppd/rtemspppd.c b/rtemsbsd/pppd/rtemspppd.c
index cf237a81..c001eff5 100644
--- a/rtemsbsd/pppd/rtemspppd.c
+++ b/rtemsbsd/pppd/rtemspppd.c
@@ -71,7 +71,7 @@ static rtems_task pppTask(rtems_task_argument arg)
 
   /* terminate myself */
   rtems_pppd_taskid = 0;
-  rtems_task_delete(RTEMS_SELF);
+  rtems_task_exit();
 }
 
 int rtems_pppd_initialize(void)
diff --git a/rtemsbsd/rtems/rtems-bsd-racoon.c b/rtemsbsd/rtems/rtems-bsd-racoon.c
index c7ea3594..e6e6205c 100644
--- a/rtemsbsd/rtems/rtems-bsd-racoon.c
+++ b/rtemsbsd/rtems/rtems-bsd-racoon.c
@@ -75,7 +75,7 @@ racoon_task(rtems_task_argument arg)
 	}
 
 	clean_up_args(args);
-	rtems_task_delete(RTEMS_SELF);
+	rtems_task_exit();
 }
 
 rtems_status_code
diff --git a/rtemsbsd/rtems/rtems-bsd-rc-conf.c b/rtemsbsd/rtems/rtems-bsd-rc-conf.c
index 36f90a1d..d559c256 100644
--- a/rtemsbsd/rtems/rtems-bsd-rc-conf.c
+++ b/rtemsbsd/rtems/rtems-bsd-rc-conf.c
@@ -763,7 +763,7 @@ rc_conf_worker(rtems_task_argument task_argument)
   if (rc_conf->verbose)
     printf("rc.conf: finished\n");
 
-  rtems_task_delete(RTEMS_SELF);
+  rtems_task_exit();
 }
 
 int
diff --git a/rtemsbsd/rtems/rtems-bsd-shell-wpa_supplicant_fork.c b/rtemsbsd/rtems/rtems-bsd-shell-wpa_supplicant_fork.c
index 4af789cc..3f705975 100644
--- a/rtemsbsd/rtems/rtems-bsd-shell-wpa_supplicant_fork.c
+++ b/rtemsbsd/rtems/rtems-bsd-shell-wpa_supplicant_fork.c
@@ -53,7 +53,7 @@ new_wpa_supplicant_task(rtems_task_argument arg)
 	free(params->argv);
 	free(params);
 
-	rtems_task_delete( RTEMS_SELF );
+	rtems_task_exit();
 }
 
 int rtems_bsd_command_wpa_supplicant_fork(int argc, char **argv)
diff --git a/rtemsbsd/rtems/rtems-kernel-thread.c b/rtemsbsd/rtems/rtems-kernel-thread.c
index 8e3344ef..f06999fb 100644
--- a/rtemsbsd/rtems/rtems-kernel-thread.c
+++ b/rtemsbsd/rtems/rtems-kernel-thread.c
@@ -280,13 +280,6 @@ rtems_bsd_thread_start(struct thread **td_ptr, void (*func)(void *), void *arg,
 	return eno;
 }
 
-static __dead2 void
-rtems_bsd_thread_delete(void)
-{
-	rtems_task_delete(RTEMS_SELF);
-	BSD_PANIC("delete self failed");
-}
-
 void
 kproc_start(const void *udata)
 {
@@ -312,7 +305,7 @@ kproc_create(void (*func)(void *), void *arg, struct proc **newpp, int flags, in
 void
 kproc_exit(int ecode)
 {
-	rtems_bsd_thread_delete();
+	rtems_task_exit();
 }
 
 void
@@ -340,7 +333,7 @@ kthread_add(void (*func)(void *), void *arg, struct proc *p, struct thread **new
 void
 kthread_exit(void)
 {
-	rtems_bsd_thread_delete();
+	rtems_task_exit();
 }
 
 int
diff --git a/testsuite/evdev01/init.c b/testsuite/evdev01/init.c
index fe588ff4..5a8b0beb 100644
--- a/testsuite/evdev01/init.c
+++ b/testsuite/evdev01/init.c
@@ -341,7 +341,7 @@ evdev_scan_task(rtems_task_argument arg)
 		}
 	}
 	otask_active = false;
-	rtems_task_delete(RTEMS_SELF);
+	rtems_task_exit();
 }
 
 static void
@@ -401,7 +401,7 @@ err:
 		}
 	}
 	ktask_active = false;
-	rtems_task_delete(RTEMS_SELF);
+	rtems_task_exit();
 }
 
 static void
@@ -484,7 +484,7 @@ err:
 		}
 	}
 	mtask_active = false;
-	rtems_task_delete(RTEMS_SELF);
+	rtems_task_exit();
 }
 
 static void
@@ -561,7 +561,7 @@ err:
 		}
 	}
 	ttask_active = false;
-	rtems_task_delete(RTEMS_SELF);
+	rtems_task_exit();
 }
 
 static void
diff --git a/testsuite/foobarclient/test_main.c b/testsuite/foobarclient/test_main.c
index d55b55c6..71b4774d 100644
--- a/testsuite/foobarclient/test_main.c
+++ b/testsuite/foobarclient/test_main.c
@@ -272,8 +272,7 @@ test_main(void)
 
 	foobar_register(&question);
 
-	rtems_task_delete(RTEMS_SELF);
-	assert(0);
+	rtems_task_exit();
 }
 
 #define DEFAULT_NETWORK_DHCPCD_ENABLE
diff --git a/testsuite/ftpd01/test_main.c b/testsuite/ftpd01/test_main.c
index 7ec17b96..cc7e8a00 100644
--- a/testsuite/ftpd01/test_main.c
+++ b/testsuite/ftpd01/test_main.c
@@ -79,8 +79,7 @@ test_main(void)
 	rv = rtems_initialize_ftpd();
 	assert(rv == 0);
 
-	rtems_task_delete(RTEMS_SELF);
-	assert(0);
+	rtems_task_exit();
 }
 
 #define DEFAULT_NETWORK_DHCPCD_ENABLE
diff --git a/testsuite/loopback01/test_main.c b/testsuite/loopback01/test_main.c
index 1b5c0064..51d5e5b2 100644
--- a/testsuite/loopback01/test_main.c
+++ b/testsuite/loopback01/test_main.c
@@ -133,7 +133,7 @@ static rtems_task workerTask(rtems_task_argument arg)
     if (close(s) < 0)
         printf("Can't close worker task socket: %s\n", strerror(errno));
     printf("Worker task terminating.\n");
-    rtems_task_delete(RTEMS_SELF);
+    rtems_task_exit();
 }
 
 /*
@@ -230,7 +230,7 @@ static rtems_task clientTask(rtems_task_argument arg)
     clientWorker(arg);
     sendClientEventToMasterTask(arg);
     printf("Client task terminating.\n");
-    rtems_task_delete( RTEMS_SELF );
+    rtems_task_exit();
 }
 
 /*
diff --git a/testsuite/nfs01/test_main.c b/testsuite/nfs01/test_main.c
index 2312040a..21d744d1 100644
--- a/testsuite/nfs01/test_main.c
+++ b/testsuite/nfs01/test_main.c
@@ -63,8 +63,7 @@ test_main(void)
 		    NULL);
 	} while (rv != 0);
 
-	rtems_task_delete(RTEMS_SELF);
-	assert(0);
+	rtems_task_exit();
 }
 
 #define DEFAULT_NETWORK_SHELL
diff --git a/testsuite/ppp01/test_main.c b/testsuite/ppp01/test_main.c
index d4baf5db..b6e9d4d7 100644
--- a/testsuite/ppp01/test_main.c
+++ b/testsuite/ppp01/test_main.c
@@ -272,8 +272,7 @@ test_main(void)
 	rv = rtems_pppd_connect();
 	assert(rv == 0);
 
-	rtems_task_delete(RTEMS_SELF);
-	assert(0);
+	rtems_task_exit();
 }
 
 RTEMS_BSD_DEFINE_NEXUS_DEVICE(ppp, 0, 0, NULL);
diff --git a/testsuite/telnetd01/test_main.c b/testsuite/telnetd01/test_main.c
index 73d19c4e..d7e50a97 100644
--- a/testsuite/telnetd01/test_main.c
+++ b/testsuite/telnetd01/test_main.c
@@ -75,8 +75,7 @@ test_main(void)
 	rtems_status_code sc = rtems_telnetd_initialize();
 	assert(sc == RTEMS_SUCCESSFUL);
 
-	rtems_task_delete(RTEMS_SELF);
-	assert(0);
+	rtems_task_exit();
 }
 
 #define DEFAULT_NETWORK_SHELL
diff --git a/testsuite/thread01/test_main.c b/testsuite/thread01/test_main.c
index 9d5e5bba..48b21452 100644
--- a/testsuite/thread01/test_main.c
+++ b/testsuite/thread01/test_main.c
@@ -109,13 +109,10 @@ wait_for_worker_thread(void)
 static void
 non_bsd_thread(rtems_task_argument arg)
 {
-	rtems_status_code sc;
 
 	test_curthread("");
 	wake_up_main_thread();
-
-	sc = rtems_task_delete(RTEMS_SELF);
-	assert(sc == RTEMS_SUCCESSFUL);
+	rtems_task_exit();
 }
 
 static void
diff --git a/testsuite/usbkbd01/init.c b/testsuite/usbkbd01/init.c
index 0ea2d2b7..9800b871 100644
--- a/testsuite/usbkbd01/init.c
+++ b/testsuite/usbkbd01/init.c
@@ -101,7 +101,7 @@ usb_keyboard_read_task(rtems_task_argument arg)
 	  rtems_message_queue_send(omid, &msg, sizeof(msg));
 	}
 	rtask_active = false;
-	rtems_task_delete(RTEMS_SELF);
+	rtems_task_exit();
 }
 
 static void
@@ -141,7 +141,7 @@ usb_keyboard_open_task(rtems_task_argument arg)
 		printf("keyboard device closed\n");
 	}
 	otask_active = false;
-	rtems_task_delete(RTEMS_SELF);
+	rtems_task_exit();
 }
 
 static void
diff --git a/testsuite/usbmouse01/init.c b/testsuite/usbmouse01/init.c
index 5bf732d8..56518d67 100644
--- a/testsuite/usbmouse01/init.c
+++ b/testsuite/usbmouse01/init.c
@@ -103,7 +103,7 @@ usb_mouse_read_task(rtems_task_argument arg)
 	}
 
 	rtask_active = false;
-	rtems_task_delete(RTEMS_SELF);
+	rtems_task_exit();
 }
 
 static void
@@ -143,7 +143,7 @@ usb_mouse_open_task(rtems_task_argument arg)
 		printf("mouse device closed\n");
 	}
 	otask_active = false;
-	rtems_task_delete(RTEMS_SELF);
+	rtems_task_exit();
 }
 
 static void
diff --git a/testsuite/zerocopy01/test_main.c b/testsuite/zerocopy01/test_main.c
index 1be546e4..3a03c12c 100644
--- a/testsuite/zerocopy01/test_main.c
+++ b/testsuite/zerocopy01/test_main.c
@@ -240,8 +240,7 @@ test_main(void)
 	sc = rtems_task_start(id, network_flood_task, (rtems_task_argument) bc);
 	assert(sc == RTEMS_SUCCESSFUL);
 
-	rtems_task_delete(RTEMS_SELF);
-	assert(0);
+	rtems_task_exit();
 }
 
 #define DEFAULT_NETWORK_DHCPCD_ENABLE