From cd7a8f73ebc952f41628f9875c87d567cf6199d8 Mon Sep 17 00:00:00 2001 From: buxiasen Date: Fri, 9 May 2025 10:43:24 +0800 Subject: [PATCH] comments: update text typo pre-empted to preempted Or will be catch by codespell, when do checkpatch.sh Also fix the relative comment file changed. include/nuttx/scsi.h drivers/syslog/ramlog.c excluded as we have to modify field name in struct Signed-off-by: buxiasen --- arch/arm/src/armv7-a/arm_cache.c | 10 +++++----- arch/arm/src/armv7-m/arm_cache.c | 10 +++++----- arch/arm/src/armv7-r/arm_cache.c | 10 +++++----- arch/arm/src/armv8-m/arm_cache.c | 10 +++++----- arch/arm/src/armv8-r/arm_cache.c | 10 +++++----- arch/arm64/src/common/arm64_cache.c | 10 +++++----- arch/xtensa/src/common/xtensa_cache.c | 10 +++++----- arch/z16/src/z16f/z16f_serial.c | 4 ++-- graphics/nxterm/nxterm_kbdin.c | 2 +- libs/libc/stdio/lib_vfprintf.c | 2 +- libs/libc/stdio/lib_vfscanf.c | 2 +- sched/sched/sched_addreadytorun.c | 6 +++--- sched/signal/sig_default.c | 4 ++-- 13 files changed, 45 insertions(+), 45 deletions(-) diff --git a/arch/arm/src/armv7-a/arm_cache.c b/arch/arm/src/armv7-a/arm_cache.c index 9a13da48b7..b242bac095 100644 --- a/arch/arm/src/armv7-a/arm_cache.c +++ b/arch/arm/src/armv7-a/arm_cache.c @@ -244,7 +244,7 @@ size_t up_get_dcache_size(void) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -298,7 +298,7 @@ void up_invalidate_dcache_all(void) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -339,7 +339,7 @@ void up_clean_dcache(uintptr_t start, uintptr_t end) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -366,7 +366,7 @@ void up_clean_dcache_all(void) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -406,7 +406,7 @@ void up_flush_dcache(uintptr_t start, uintptr_t end) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ diff --git a/arch/arm/src/armv7-m/arm_cache.c b/arch/arm/src/armv7-m/arm_cache.c index 254ad0b9e9..c9894f9654 100644 --- a/arch/arm/src/armv7-m/arm_cache.c +++ b/arch/arm/src/armv7-m/arm_cache.c @@ -640,7 +640,7 @@ void up_disable_dcache(void) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -775,7 +775,7 @@ void up_invalidate_dcache_all(void) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -851,7 +851,7 @@ void up_clean_dcache(uintptr_t start, uintptr_t end) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -928,7 +928,7 @@ void up_clean_dcache_all(void) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -1005,7 +1005,7 @@ void up_flush_dcache(uintptr_t start, uintptr_t end) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ diff --git a/arch/arm/src/armv7-r/arm_cache.c b/arch/arm/src/armv7-r/arm_cache.c index 759af8d999..dcae618773 100644 --- a/arch/arm/src/armv7-r/arm_cache.c +++ b/arch/arm/src/armv7-r/arm_cache.c @@ -244,7 +244,7 @@ size_t up_get_dcache_size(void) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -298,7 +298,7 @@ void up_invalidate_dcache_all(void) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -339,7 +339,7 @@ void up_clean_dcache(uintptr_t start, uintptr_t end) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -366,7 +366,7 @@ void up_clean_dcache_all(void) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -406,7 +406,7 @@ void up_flush_dcache(uintptr_t start, uintptr_t end) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ diff --git a/arch/arm/src/armv8-m/arm_cache.c b/arch/arm/src/armv8-m/arm_cache.c index c5229d65aa..4b723cccc2 100644 --- a/arch/arm/src/armv8-m/arm_cache.c +++ b/arch/arm/src/armv8-m/arm_cache.c @@ -640,7 +640,7 @@ void up_disable_dcache(void) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -775,7 +775,7 @@ void up_invalidate_dcache_all(void) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -851,7 +851,7 @@ void up_clean_dcache(uintptr_t start, uintptr_t end) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -928,7 +928,7 @@ void up_clean_dcache_all(void) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -1005,7 +1005,7 @@ void up_flush_dcache(uintptr_t start, uintptr_t end) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ diff --git a/arch/arm/src/armv8-r/arm_cache.c b/arch/arm/src/armv8-r/arm_cache.c index 1f7066af75..65e6a9e06a 100644 --- a/arch/arm/src/armv8-r/arm_cache.c +++ b/arch/arm/src/armv8-r/arm_cache.c @@ -248,7 +248,7 @@ size_t up_get_dcache_size(void) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -302,7 +302,7 @@ void up_invalidate_dcache_all(void) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -343,7 +343,7 @@ void up_clean_dcache(uintptr_t start, uintptr_t end) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -370,7 +370,7 @@ void up_clean_dcache_all(void) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -410,7 +410,7 @@ void up_flush_dcache(uintptr_t start, uintptr_t end) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ diff --git a/arch/arm64/src/common/arm64_cache.c b/arch/arm64/src/common/arm64_cache.c index 97d12c52d6..e5c17ab0b6 100644 --- a/arch/arm64/src/common/arm64_cache.c +++ b/arch/arm64/src/common/arm64_cache.c @@ -501,7 +501,7 @@ void up_disable_icache(void) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -601,7 +601,7 @@ size_t up_get_dcache_size(void) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -629,7 +629,7 @@ void up_clean_dcache(uintptr_t start, uintptr_t end) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -708,7 +708,7 @@ void up_disable_dcache(void) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -735,7 +735,7 @@ void up_flush_dcache(uintptr_t start, uintptr_t end) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ diff --git a/arch/xtensa/src/common/xtensa_cache.c b/arch/xtensa/src/common/xtensa_cache.c index 16e4610354..f9803a6b81 100644 --- a/arch/xtensa/src/common/xtensa_cache.c +++ b/arch/xtensa/src/common/xtensa_cache.c @@ -419,7 +419,7 @@ void up_disable_dcache(void) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -498,7 +498,7 @@ void up_invalidate_dcache_all(void) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -544,7 +544,7 @@ void up_clean_dcache(uintptr_t start, uintptr_t end) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -582,7 +582,7 @@ void up_clean_dcache_all(void) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ @@ -627,7 +627,7 @@ void up_flush_dcache(uintptr_t start, uintptr_t end) * Assumptions: * This operation is not atomic. This function assumes that the caller * has exclusive access to the address range so that no harm is done if - * the operation is pre-empted. + * the operation is preempted. * ****************************************************************************/ diff --git a/arch/z16/src/z16f/z16f_serial.c b/arch/z16/src/z16f/z16f_serial.c index e432a76bd5..2bd41173ab 100644 --- a/arch/z16/src/z16f/z16f_serial.c +++ b/arch/z16/src/z16f/z16f_serial.c @@ -649,7 +649,7 @@ static bool z16f_txempty(struct uart_dev_s *dev) * * Description: * Performs the low level UART initialization early in debug so that the - * serial console will be available during bootup. This must be called + * serial console will be available during boot-up. This must be called * before z16f_serialinit. * ****************************************************************************/ @@ -769,7 +769,7 @@ void up_putc(int ch) /* Keep interrupts disabled so that we do not interfere with normal * driver operation. * - * REVISIT: I can imagine scenarios where the follow logic gets pre-empted + * REVISIT: I can imagine scenarios where the follow logic gets preempted * and the UART interrupts get left in a bad state. */ diff --git a/graphics/nxterm/nxterm_kbdin.c b/graphics/nxterm/nxterm_kbdin.c index 2f6684c611..8021d77900 100644 --- a/graphics/nxterm/nxterm_kbdin.c +++ b/graphics/nxterm/nxterm_kbdin.c @@ -129,7 +129,7 @@ ssize_t nxterm_read(FAR struct file *filep, FAR char *buffer, size_t len) priv->nwaiters++; nxmutex_unlock(&priv->lock); - /* We may now be pre-empted! But that should be okay because we + /* We may now be preempted! But that should be okay because we * have already incremented nwaiters. Pre-emption is disabled * but will be re-enabled while we are waiting. */ diff --git a/libs/libc/stdio/lib_vfprintf.c b/libs/libc/stdio/lib_vfprintf.c index a9963d2acb..7736a9be88 100644 --- a/libs/libc/stdio/lib_vfprintf.c +++ b/libs/libc/stdio/lib_vfprintf.c @@ -43,7 +43,7 @@ int vfprintf(FAR FILE *stream, FAR const IPTR char *fmt, va_list ap) /* Hold the stream semaphore throughout the lib_vsprintf * call so that this thread can get its entire message out - * before being pre-empted by the next thread. + * before being preempted by the next thread. */ flockfile(stream); diff --git a/libs/libc/stdio/lib_vfscanf.c b/libs/libc/stdio/lib_vfscanf.c index 8ecd148225..e7bb57281c 100644 --- a/libs/libc/stdio/lib_vfscanf.c +++ b/libs/libc/stdio/lib_vfscanf.c @@ -47,7 +47,7 @@ int vfscanf(FAR FILE *stream, FAR const IPTR char *fmt, va_list ap) lib_stdinstream(&stdinstream, stream); /* Hold the stream semaphore throughout the lib_vscanf call so that - * this thread can get its entire message out before being pre-empted + * this thread can get its entire message out before being preempted * by the next thread. */ diff --git a/sched/sched/sched_addreadytorun.c b/sched/sched/sched_addreadytorun.c index 3e9fe5676e..ffcfcc9ae0 100644 --- a/sched/sched/sched_addreadytorun.c +++ b/sched/sched/sched_addreadytorun.c @@ -43,7 +43,7 @@ * Description: * This function adds a TCB to the ready to run list. If the currently * active task has preemption disabled and the new TCB would cause this - * task to be pre-empted, the new task is added to the g_pendingtasks list + * task to be preempted, the new task is added to the g_pendingtasks list * instead. The pending tasks will be made ready-to-run when preemption is * unlocked. * @@ -73,7 +73,7 @@ bool nxsched_add_readytorun(FAR struct tcb_s *btcb) /* Check if pre-emption is disabled for the current running task and if * the new ready-to-run task would cause the current running task to be - * pre-empted. NOTE that IRQs disabled implies that pre-emption is + * preempted. NOTE that IRQs disabled implies that pre-emption is * also disabled. */ @@ -129,7 +129,7 @@ bool nxsched_add_readytorun(FAR struct tcb_s *btcb) * assigned to a CPU. * * If the currently active task has preemption disabled and the new TCB - * would cause this task to be pre-empted, the new task is added to the + * would cause this task to be preempted, the new task is added to the * g_pendingtasks list instead. The pending tasks will be made * ready-to-run when preemption isunlocked. * diff --git a/sched/signal/sig_default.c b/sched/signal/sig_default.c index f70e01e2ee..0d1547c064 100644 --- a/sched/signal/sig_default.c +++ b/sched/signal/sig_default.c @@ -289,7 +289,7 @@ static void nxsig_stop_task(int signo) group_suspend_children(rtcb); #endif - /* Lock the scheduler so this thread is not pre-empted until after we + /* Lock the scheduler so this thread is not preempted until after we * call nxsched_suspend(). */ @@ -511,7 +511,7 @@ bool nxsig_iscatchable(int signo) * defaction - True: the default action is in place * * Returned Value: - * The address of the default signal action handler is returne on success. + * The address of the default signal action handler is return on success. * SIG_IGN is returned if there is no default action. * ****************************************************************************/