diff --git a/drivers/note/note_driver.c b/drivers/note/note_driver.c index a6be1ca29d..8bef2b1575 100644 --- a/drivers/note/note_driver.c +++ b/drivers/note/note_driver.c @@ -1841,7 +1841,7 @@ void sched_note_filter_mode(FAR struct note_filter_named_mode_s *oldm, irqstate_t irq_mask; FAR struct note_driver_s **driver; - irq_mask = spin_lock_irqsave_wo_note(&g_note_lock); + irq_mask = raw_spin_lock_irqsave(&g_note_lock); if (oldm != NULL) { @@ -1877,7 +1877,7 @@ void sched_note_filter_mode(FAR struct note_filter_named_mode_s *oldm, } } - spin_unlock_irqrestore_wo_note(&g_note_lock, irq_mask); + raw_spin_unlock_irqrestore(&g_note_lock, irq_mask); } /**************************************************************************** @@ -1907,7 +1907,7 @@ void sched_note_filter_syscall(FAR struct note_filter_named_syscall_s *oldf, irqstate_t irq_mask; FAR struct note_driver_s **driver; - irq_mask = spin_lock_irqsave_wo_note(&g_note_lock); + irq_mask = raw_spin_lock_irqsave(&g_note_lock); if (oldf != NULL) { @@ -1943,7 +1943,7 @@ void sched_note_filter_syscall(FAR struct note_filter_named_syscall_s *oldf, } } - spin_unlock_irqrestore_wo_note(&g_note_lock, irq_mask); + raw_spin_unlock_irqrestore(&g_note_lock, irq_mask); } #endif @@ -1974,7 +1974,7 @@ void sched_note_filter_irq(FAR struct note_filter_named_irq_s *oldf, irqstate_t irq_mask; FAR struct note_driver_s **driver; - irq_mask = spin_lock_irqsave_wo_note(&g_note_lock); + irq_mask = raw_spin_lock_irqsave(&g_note_lock); if (oldf != NULL) { @@ -2010,7 +2010,7 @@ void sched_note_filter_irq(FAR struct note_filter_named_irq_s *oldf, } } - spin_unlock_irqrestore_wo_note(&g_note_lock, irq_mask); + raw_spin_unlock_irqrestore(&g_note_lock, irq_mask); } #endif @@ -2041,7 +2041,7 @@ void sched_note_filter_tag(FAR struct note_filter_named_tag_s *oldf, FAR struct note_driver_s **driver; irqstate_t irq_mask; - irq_mask = spin_lock_irqsave_wo_note(&g_note_lock); + irq_mask = raw_spin_lock_irqsave(&g_note_lock); if (oldf != NULL) { @@ -2077,7 +2077,7 @@ void sched_note_filter_tag(FAR struct note_filter_named_tag_s *oldf, } } - spin_unlock_irqrestore_wo_note(&g_note_lock, irq_mask); + raw_spin_unlock_irqrestore(&g_note_lock, irq_mask); } #endif diff --git a/drivers/note/noteram_driver.c b/drivers/note/noteram_driver.c index d41d74a2d4..a099558341 100644 --- a/drivers/note/noteram_driver.c +++ b/drivers/note/noteram_driver.c @@ -467,9 +467,9 @@ static ssize_t noteram_read(FAR struct file *filep, FAR char *buffer, if (ctx->mode == NOTERAM_MODE_READ_BINARY) { - flags = spin_lock_irqsave_wo_note(&drv->lock); + flags = raw_spin_lock_irqsave(&drv->lock); ret = noteram_get(drv, (FAR uint8_t *)buffer, buflen); - spin_unlock_irqrestore_wo_note(&drv->lock, flags); + raw_spin_unlock_irqrestore(&drv->lock, flags); } else { @@ -481,9 +481,9 @@ static ssize_t noteram_read(FAR struct file *filep, FAR char *buffer, /* Get the next note (removing it from the buffer) */ - flags = spin_lock_irqsave_wo_note(&drv->lock); + flags = raw_spin_lock_irqsave(&drv->lock); ret = noteram_get(drv, note, sizeof(note)); - spin_unlock_irqrestore_wo_note(&drv->lock, flags); + raw_spin_unlock_irqrestore(&drv->lock, flags); if (ret <= 0) { return ret; @@ -508,7 +508,7 @@ static int noteram_ioctl(FAR struct file *filep, int cmd, unsigned long arg) { int ret = -ENOSYS; FAR struct noteram_driver_s *drv = filep->f_inode->i_private; - irqstate_t flags = spin_lock_irqsave_wo_note(&drv->lock); + irqstate_t flags = raw_spin_lock_irqsave(&drv->lock); /* Handle the ioctl commands */ @@ -600,7 +600,7 @@ static int noteram_ioctl(FAR struct file *filep, int cmd, unsigned long arg) break; } - spin_unlock_irqrestore_wo_note(&drv->lock, flags); + raw_spin_unlock_irqrestore(&drv->lock, flags); return ret; } @@ -622,7 +622,7 @@ static int noteram_poll(FAR struct file *filep, FAR struct pollfd *fds, DEBUGASSERT(inode != NULL && inode->i_private != NULL); drv = inode->i_private; - flags = spin_lock_irqsave_wo_note(&drv->lock); + flags = raw_spin_lock_irqsave(&drv->lock); /* Ignore waits that do not include POLLIN */ @@ -655,7 +655,7 @@ static int noteram_poll(FAR struct file *filep, FAR struct pollfd *fds, if (noteram_unread_length(drv) > 0) { - spin_unlock_irqrestore_wo_note(&drv->lock, flags); + raw_spin_unlock_irqrestore(&drv->lock, flags); poll_notify(&drv->pfd, 1, POLLIN); return ret; } @@ -666,7 +666,7 @@ static int noteram_poll(FAR struct file *filep, FAR struct pollfd *fds, } errout: - spin_unlock_irqrestore_wo_note(&drv->lock, flags); + raw_spin_unlock_irqrestore(&drv->lock, flags); return ret; } @@ -698,11 +698,11 @@ static void noteram_add(FAR struct note_driver_s *driver, unsigned int space; irqstate_t flags; - flags = spin_lock_irqsave_wo_note(&drv->lock); + flags = raw_spin_lock_irqsave(&drv->lock); if (drv->ni_overwrite == NOTERAM_MODE_OVERWRITE_OVERFLOW) { - spin_unlock_irqrestore_wo_note(&drv->lock, flags); + raw_spin_unlock_irqrestore(&drv->lock, flags); return; } @@ -716,7 +716,7 @@ static void noteram_add(FAR struct note_driver_s *driver, /* Stop recording if not in overwrite mode */ drv->ni_overwrite = NOTERAM_MODE_OVERWRITE_OVERFLOW; - spin_unlock_irqrestore_wo_note(&drv->lock, flags); + raw_spin_unlock_irqrestore(&drv->lock, flags); return; } @@ -737,7 +737,7 @@ static void noteram_add(FAR struct note_driver_s *driver, memcpy(drv->ni_buffer + head, note, space); memcpy(drv->ni_buffer, buf + space, notelen - space); drv->ni_head = noteram_next(drv, head, NOTE_ALIGN(notelen)); - spin_unlock_irqrestore_wo_note(&drv->lock, flags); + raw_spin_unlock_irqrestore(&drv->lock, flags); poll_notify(&drv->pfd, 1, POLLIN); } diff --git a/drivers/note/noterpmsg_driver.c b/drivers/note/noterpmsg_driver.c index 2db84478f7..1d86619826 100644 --- a/drivers/note/noterpmsg_driver.c +++ b/drivers/note/noterpmsg_driver.c @@ -180,7 +180,7 @@ static bool noterpmsg_transfer(FAR struct noterpmsg_driver_s *drv, static void noterpmsg_work(FAR void *priv) { FAR struct noterpmsg_driver_s *drv = priv; - irqstate_t flags = spin_lock_irqsave_wo_note(&drv->lock); + irqstate_t flags = raw_spin_lock_irqsave(&drv->lock); if (!noterpmsg_transfer(drv, false)) { @@ -188,7 +188,7 @@ static void noterpmsg_work(FAR void *priv) NOTE_RPMSG_WORK_DELAY); } - spin_unlock_irqrestore_wo_note(&drv->lock, flags); + raw_spin_unlock_irqrestore(&drv->lock, flags); } static void noterpmsg_add(FAR struct note_driver_s *driver, @@ -199,7 +199,7 @@ static void noterpmsg_add(FAR struct note_driver_s *driver, irqstate_t flags; size_t space; - flags = spin_lock_irqsave_wo_note(&drv->lock); + flags = raw_spin_lock_irqsave(&drv->lock); space = CONFIG_DRIVERS_NOTERPMSG_BUFSIZE - noterpmsg_length(drv); if (space < notelen) @@ -236,7 +236,7 @@ static void noterpmsg_add(FAR struct note_driver_s *driver, NOTE_RPMSG_WORK_DELAY); } - spin_unlock_irqrestore_wo_note(&drv->lock, flags); + raw_spin_unlock_irqrestore(&drv->lock, flags); } static int noterpmsg_ept_cb(FAR struct rpmsg_endpoint *ept, diff --git a/drivers/segger/config/SEGGER_RTT_Conf.h b/drivers/segger/config/SEGGER_RTT_Conf.h index aa19a89390..bdcfc23c58 100644 --- a/drivers/segger/config/SEGGER_RTT_Conf.h +++ b/drivers/segger/config/SEGGER_RTT_Conf.h @@ -89,11 +89,11 @@ extern spinlock_t g_segger_lock; /* Lock RTT (nestable) (i.e. disable interrupts) */ -#define SEGGER_RTT_LOCK() irqstate_t __flags = spin_lock_irqsave_wo_note(&g_segger_lock) +#define SEGGER_RTT_LOCK() irqstate_t __flags = raw_spin_lock_irqsave(&g_segger_lock) /* Unlock RTT (nestable) (i.e. enable previous interrupt lock state) */ -#define SEGGER_RTT_UNLOCK() spin_unlock_irqrestore_wo_note(&g_segger_lock, __flags) +#define SEGGER_RTT_UNLOCK() raw_spin_unlock_irqrestore(&g_segger_lock, __flags) /* Disable RTT SEGGER_RTT_WriteSkipNoLock */ diff --git a/drivers/syslog/syslog_intbuffer.c b/drivers/syslog/syslog_intbuffer.c index 49ff740939..02adf2b494 100644 --- a/drivers/syslog/syslog_intbuffer.c +++ b/drivers/syslog/syslog_intbuffer.c @@ -150,7 +150,7 @@ void syslog_add_intbuffer(FAR const char *buffer, size_t buflen) /* Disable concurrent modification from interrupt handling logic */ - flags = spin_lock_irqsave_wo_note(&g_syslog_intbuffer.splock); + flags = raw_spin_lock_irqsave(&g_syslog_intbuffer.splock); space = circbuf_space(&g_syslog_intbuffer.circ); @@ -172,7 +172,7 @@ void syslog_add_intbuffer(FAR const char *buffer, size_t buflen) buffer + space, buflen - space); } - spin_unlock_irqrestore_wo_note(&g_syslog_intbuffer.splock, flags); + raw_spin_unlock_irqrestore(&g_syslog_intbuffer.splock, flags); } /**************************************************************************** @@ -198,9 +198,9 @@ void syslog_flush_intbuffer(bool force) { irqstate_t flags; - flags = spin_lock_irqsave_wo_note(&g_syslog_intbuffer.splock); + flags = raw_spin_lock_irqsave(&g_syslog_intbuffer.splock); syslog_flush_internal(force, sizeof(g_syslog_intbuffer.buffer)); - spin_unlock_irqrestore_wo_note(&g_syslog_intbuffer.splock, flags); + raw_spin_unlock_irqrestore(&g_syslog_intbuffer.splock, flags); } #endif /* CONFIG_SYSLOG_INTBUFFER */ diff --git a/include/nuttx/irq.h b/include/nuttx/irq.h index ea4de3faf8..6f2dbb6cb4 100644 --- a/include/nuttx/irq.h +++ b/include/nuttx/irq.h @@ -80,7 +80,7 @@ do \ { \ g_cpu_irqset = 0; \ - spin_unlock_wo_note(&g_cpu_irqlock); \ + raw_spin_unlock(&g_cpu_irqlock); \ } \ while (0) #endif diff --git a/include/nuttx/spinlock.h b/include/nuttx/spinlock.h index 01abb24fd3..ca55d19bf6 100644 --- a/include/nuttx/spinlock.h +++ b/include/nuttx/spinlock.h @@ -168,7 +168,7 @@ static inline spinlock_t up_testset(FAR volatile spinlock_t *lock) #define spin_lock_init(l) do { *(l) = SP_UNLOCKED; } while (0) /**************************************************************************** - * Name: spin_lock_wo_note + * Name: raw_spin_lock * * Description: * If this CPU does not already hold the spinlock, then loop until the @@ -190,7 +190,7 @@ static inline spinlock_t up_testset(FAR volatile spinlock_t *lock) ****************************************************************************/ #ifdef CONFIG_SPINLOCK -static inline_function void spin_lock_wo_note(FAR volatile spinlock_t *lock) +static inline_function void raw_spin_lock(FAR volatile spinlock_t *lock) { #ifdef CONFIG_TICKET_SPINLOCK int ticket = atomic_fetch_add(&lock->next, 1); @@ -239,7 +239,7 @@ static inline_function void spin_lock(FAR volatile spinlock_t *lock) /* Lock without trace note */ - spin_lock_wo_note(lock); + raw_spin_lock(lock); /* Notify that we have the spinlock */ @@ -248,7 +248,7 @@ static inline_function void spin_lock(FAR volatile spinlock_t *lock) #endif /* CONFIG_SPINLOCK */ /**************************************************************************** - * Name: spin_trylock_wo_note + * Name: raw_spin_trylock * * Description: * Try once to lock the spinlock. Do not wait if the spinlock is already @@ -271,7 +271,7 @@ static inline_function void spin_lock(FAR volatile spinlock_t *lock) #ifdef CONFIG_SPINLOCK static inline_function bool -spin_trylock_wo_note(FAR volatile spinlock_t *lock) +raw_spin_trylock(FAR volatile spinlock_t *lock) { #ifdef CONFIG_TICKET_SPINLOCK if (!atomic_cmpxchg(&lock->next, &lock->owner, @@ -319,7 +319,7 @@ static inline_function bool spin_trylock(FAR volatile spinlock_t *lock) /* Try lock without trace note */ - locked = spin_trylock_wo_note(lock); + locked = raw_spin_trylock(lock); if (locked) { /* Notify that we have the spinlock */ @@ -338,7 +338,7 @@ static inline_function bool spin_trylock(FAR volatile spinlock_t *lock) #endif /* CONFIG_SPINLOCK */ /**************************************************************************** - * Name: spin_unlock_wo_note + * Name: raw_spin_unlock * * Description: * Release one count on a non-reentrant spinlock. @@ -359,7 +359,7 @@ static inline_function bool spin_trylock(FAR volatile spinlock_t *lock) #ifdef CONFIG_SPINLOCK static inline_function void -spin_unlock_wo_note(FAR volatile spinlock_t *lock) +raw_spin_unlock(FAR volatile spinlock_t *lock) { UP_DMB(); #ifdef CONFIG_TICKET_SPINLOCK @@ -395,7 +395,7 @@ static inline_function void spin_unlock(FAR volatile spinlock_t *lock) { /* Unlock without trace note */ - spin_unlock_wo_note(lock); + raw_spin_unlock(lock); /* Notify that we are unlocking the spinlock */ @@ -429,7 +429,7 @@ static inline_function void spin_unlock(FAR volatile spinlock_t *lock) #endif /**************************************************************************** - * Name: spin_lock_irqsave_wo_note + * Name: raw_spin_lock_irqsave * * Description: * This function is no trace version of spin_lock_irqsave() @@ -438,17 +438,17 @@ static inline_function void spin_unlock(FAR volatile spinlock_t *lock) #ifdef CONFIG_SPINLOCK static inline_function -irqstate_t spin_lock_irqsave_wo_note(FAR volatile spinlock_t *lock) +irqstate_t raw_spin_lock_irqsave(FAR volatile spinlock_t *lock) { irqstate_t flags; flags = up_irq_save(); - spin_lock_wo_note(lock); + raw_spin_lock(lock); return flags; } #else -# define spin_lock_irqsave_wo_note(l) ((void)(l), up_irq_save()) +# define raw_spin_lock_irqsave(l) ((void)(l), up_irq_save()) #endif /**************************************************************************** @@ -487,7 +487,7 @@ irqstate_t spin_lock_irqsave(FAR volatile spinlock_t *lock) /* Lock without trace note */ - flags = spin_lock_irqsave_wo_note(lock); + flags = raw_spin_lock_irqsave(lock); /* Notify that we have the spinlock */ @@ -500,7 +500,7 @@ irqstate_t spin_lock_irqsave(FAR volatile spinlock_t *lock) #endif /**************************************************************************** - * Name: spin_trylock_irqsave_wo_note + * Name: raw_spin_trylock_irqsave * * Description: * Try once to lock the spinlock. Do not wait if the spinlock is already @@ -523,14 +523,14 @@ irqstate_t spin_lock_irqsave(FAR volatile spinlock_t *lock) ****************************************************************************/ #ifdef CONFIG_SPINLOCK -# define spin_trylock_irqsave_wo_note(l, f) \ +# define raw_spin_trylock_irqsave(l, f) \ ({ \ f = up_irq_save(); \ - spin_trylock_wo_note(l) ? \ + raw_spin_trylock(l) ? \ true : ({ up_irq_restore(f); false; }); \ }) #else -# define spin_trylock_irqsave_wo_note(l, f) \ +# define raw_spin_trylock_irqsave(l, f) \ ({ \ (void)(l); \ f = up_irq_save(); \ @@ -575,7 +575,7 @@ irqstate_t spin_lock_irqsave(FAR volatile spinlock_t *lock) #endif /* CONFIG_SPINLOCK */ /**************************************************************************** - * Name: spin_unlock_irqrestore_wo_note + * Name: raw_spin_unlock_irqrestore * * Description: * This function is no trace version of spin_unlock_irqrestore() @@ -584,15 +584,15 @@ irqstate_t spin_lock_irqsave(FAR volatile spinlock_t *lock) #ifdef CONFIG_SPINLOCK static inline_function -void spin_unlock_irqrestore_wo_note(FAR volatile spinlock_t *lock, - irqstate_t flags) +void raw_spin_unlock_irqrestore(FAR volatile spinlock_t *lock, + irqstate_t flags) { - spin_unlock_wo_note(lock); + raw_spin_unlock(lock); up_irq_restore(flags); } #else -# define spin_unlock_irqrestore_wo_note(l, f) ((void)(l), up_irq_restore(f)) +# define raw_spin_unlock_irqrestore(l, f) ((void)(l), up_irq_restore(f)) #endif /**************************************************************************** @@ -619,12 +619,11 @@ void spin_unlock_irqrestore_wo_note(FAR volatile spinlock_t *lock, #ifdef CONFIG_SPINLOCK static inline_function -void spin_unlock_irqrestore(FAR volatile spinlock_t *lock, - irqstate_t flags) +void spin_unlock_irqrestore(FAR volatile spinlock_t *lock, irqstate_t flags) { /* Unlock without trace note */ - spin_unlock_irqrestore_wo_note(lock, flags); + raw_spin_unlock_irqrestore(lock, flags); /* Notify that we are unlocking the spinlock */ diff --git a/libs/libc/machine/arch_atomic.c b/libs/libc/machine/arch_atomic.c index 8d7e7f4877..cb37673976 100644 --- a/libs/libc/machine/arch_atomic.c +++ b/libs/libc/machine/arch_atomic.c @@ -46,11 +46,11 @@ static spinlock_t g_atomic_lock = SP_UNLOCKED; void weak_function CONCATENATE(fn, n)(FAR volatile void *ptr, \ type value, int memorder) \ { \ - irqstate_t irqstate = spin_lock_irqsave_wo_note(&g_atomic_lock); \ + irqstate_t irqstate = raw_spin_lock_irqsave(&g_atomic_lock); \ \ *(FAR type *)ptr = value; \ \ - spin_unlock_irqrestore_wo_note(&g_atomic_lock, irqstate); \ + raw_spin_unlock_irqrestore(&g_atomic_lock, irqstate); \ } #define LOAD(fn, n, type) \ @@ -58,11 +58,11 @@ static spinlock_t g_atomic_lock = SP_UNLOCKED; type weak_function CONCATENATE(fn, n)(FAR const volatile void *ptr, \ int memorder) \ { \ - irqstate_t irqstate = spin_lock_irqsave_wo_note(&g_atomic_lock); \ + irqstate_t irqstate = raw_spin_lock_irqsave(&g_atomic_lock); \ \ type ret = *(FAR type *)ptr; \ \ - spin_unlock_irqrestore_wo_note(&g_atomic_lock, irqstate); \ + raw_spin_unlock_irqrestore(&g_atomic_lock, irqstate); \ return ret; \ } @@ -71,13 +71,13 @@ static spinlock_t g_atomic_lock = SP_UNLOCKED; type weak_function CONCATENATE(fn, n)(FAR volatile void *ptr, \ type value, int memorder) \ { \ - irqstate_t irqstate = spin_lock_irqsave_wo_note(&g_atomic_lock); \ + irqstate_t irqstate = raw_spin_lock_irqsave(&g_atomic_lock); \ FAR type *tmp = (FAR type *)ptr; \ \ type ret = *tmp; \ *tmp = value; \ \ - spin_unlock_irqrestore_wo_note(&g_atomic_lock, irqstate); \ + raw_spin_unlock_irqrestore(&g_atomic_lock, irqstate); \ return ret; \ } @@ -89,7 +89,7 @@ static spinlock_t g_atomic_lock = SP_UNLOCKED; int success, int failure) \ { \ bool ret = false; \ - irqstate_t irqstate = spin_lock_irqsave_wo_note(&g_atomic_lock); \ + irqstate_t irqstate = raw_spin_lock_irqsave(&g_atomic_lock); \ FAR type *tmpmem = (FAR type *)mem; \ FAR type *tmpexp = (FAR type *)expect; \ \ @@ -103,7 +103,7 @@ static spinlock_t g_atomic_lock = SP_UNLOCKED; *tmpexp = *tmpmem; \ } \ \ - spin_unlock_irqrestore_wo_note(&g_atomic_lock, irqstate); \ + raw_spin_unlock_irqrestore(&g_atomic_lock, irqstate); \ return ret; \ } @@ -112,13 +112,13 @@ static spinlock_t g_atomic_lock = SP_UNLOCKED; type weak_function CONCATENATE(fn, n)(FAR volatile void *ptr, \ int memorder) \ { \ - irqstate_t irqstate = spin_lock_irqsave_wo_note(&g_atomic_lock); \ + irqstate_t irqstate = raw_spin_lock_irqsave(&g_atomic_lock); \ FAR type *tmp = (FAR type *)ptr; \ type ret = *tmp; \ \ *(FAR type *)ptr = 1; \ \ - spin_unlock_irqrestore_wo_note(&g_atomic_lock, irqstate); \ + raw_spin_unlock_irqrestore(&g_atomic_lock, irqstate); \ return ret; \ } @@ -127,13 +127,13 @@ static spinlock_t g_atomic_lock = SP_UNLOCKED; type weak_function CONCATENATE(fn, n)(FAR volatile void *ptr, \ type value, int memorder) \ { \ - irqstate_t irqstate = spin_lock_irqsave_wo_note(&g_atomic_lock); \ + irqstate_t irqstate = raw_spin_lock_irqsave(&g_atomic_lock); \ FAR type *tmp = (FAR type *)ptr; \ type ret = *tmp; \ \ *tmp = *tmp + value; \ \ - spin_unlock_irqrestore_wo_note(&g_atomic_lock, irqstate); \ + raw_spin_unlock_irqrestore(&g_atomic_lock, irqstate); \ return ret; \ } @@ -142,13 +142,13 @@ static spinlock_t g_atomic_lock = SP_UNLOCKED; type weak_function CONCATENATE(fn, n)(FAR volatile void *ptr, \ type value, int memorder) \ { \ - irqstate_t irqstate = spin_lock_irqsave_wo_note(&g_atomic_lock); \ + irqstate_t irqstate = raw_spin_lock_irqsave(&g_atomic_lock); \ FAR type *tmp = (FAR type *)ptr; \ type ret = *tmp; \ \ *tmp = *tmp - value; \ \ - spin_unlock_irqrestore_wo_note(&g_atomic_lock, irqstate); \ + raw_spin_unlock_irqrestore(&g_atomic_lock, irqstate); \ return ret; \ } @@ -157,13 +157,13 @@ static spinlock_t g_atomic_lock = SP_UNLOCKED; type weak_function CONCATENATE(fn, n)(FAR volatile void *ptr, \ type value, int memorder) \ { \ - irqstate_t irqstate = spin_lock_irqsave_wo_note(&g_atomic_lock); \ + irqstate_t irqstate = raw_spin_lock_irqsave(&g_atomic_lock); \ FAR type *tmp = (FAR type *)ptr; \ type ret = *tmp; \ \ *tmp = *tmp & value; \ \ - spin_unlock_irqrestore_wo_note(&g_atomic_lock, irqstate); \ + raw_spin_unlock_irqrestore(&g_atomic_lock, irqstate); \ return ret; \ } @@ -172,13 +172,13 @@ static spinlock_t g_atomic_lock = SP_UNLOCKED; type weak_function CONCATENATE(fn, n)(FAR volatile void *ptr, \ type value, int memorder) \ { \ - irqstate_t irqstate = spin_lock_irqsave_wo_note(&g_atomic_lock); \ + irqstate_t irqstate = raw_spin_lock_irqsave(&g_atomic_lock); \ FAR type *tmp = (FAR type *)ptr; \ type ret = *tmp; \ \ *tmp = *tmp | value; \ \ - spin_unlock_irqrestore_wo_note(&g_atomic_lock, irqstate); \ + raw_spin_unlock_irqrestore(&g_atomic_lock, irqstate); \ return ret; \ } @@ -187,13 +187,13 @@ static spinlock_t g_atomic_lock = SP_UNLOCKED; type weak_function CONCATENATE(fn, n)(FAR volatile void *ptr, \ type value, int memorder) \ { \ - irqstate_t irqstate = spin_lock_irqsave_wo_note(&g_atomic_lock); \ + irqstate_t irqstate = raw_spin_lock_irqsave(&g_atomic_lock); \ FAR type *tmp = (FAR type *)ptr; \ type ret = *tmp; \ \ *tmp = *tmp ^ value; \ \ - spin_unlock_irqrestore_wo_note(&g_atomic_lock, irqstate); \ + raw_spin_unlock_irqrestore(&g_atomic_lock, irqstate); \ return ret; \ } @@ -202,12 +202,12 @@ static spinlock_t g_atomic_lock = SP_UNLOCKED; type weak_function CONCATENATE(fn, n)(FAR volatile void *ptr, \ type value) \ { \ - irqstate_t irqstate = spin_lock_irqsave_wo_note(&g_atomic_lock); \ + irqstate_t irqstate = raw_spin_lock_irqsave(&g_atomic_lock); \ FAR type *tmp = (FAR type *)ptr; \ \ *tmp = *tmp + value; \ \ - spin_unlock_irqrestore_wo_note(&g_atomic_lock, irqstate); \ + raw_spin_unlock_irqrestore(&g_atomic_lock, irqstate); \ return *tmp; \ } @@ -216,12 +216,12 @@ static spinlock_t g_atomic_lock = SP_UNLOCKED; type weak_function CONCATENATE(fn, n)(FAR volatile void *ptr, \ type value) \ { \ - irqstate_t irqstate = spin_lock_irqsave_wo_note(&g_atomic_lock); \ + irqstate_t irqstate = raw_spin_lock_irqsave(&g_atomic_lock); \ FAR type *tmp = (FAR type *)ptr; \ \ *tmp = *tmp - value; \ \ - spin_unlock_irqrestore_wo_note(&g_atomic_lock, irqstate); \ + raw_spin_unlock_irqrestore(&g_atomic_lock, irqstate); \ return *tmp; \ } @@ -230,12 +230,12 @@ static spinlock_t g_atomic_lock = SP_UNLOCKED; type weak_function CONCATENATE(fn, n)(FAR volatile void *ptr, \ type value) \ { \ - irqstate_t irqstate = spin_lock_irqsave_wo_note(&g_atomic_lock); \ + irqstate_t irqstate = raw_spin_lock_irqsave(&g_atomic_lock); \ FAR type *tmp = (FAR type *)ptr; \ \ *tmp = *tmp | value; \ \ - spin_unlock_irqrestore_wo_note(&g_atomic_lock, irqstate); \ + raw_spin_unlock_irqrestore(&g_atomic_lock, irqstate); \ return *tmp; \ } @@ -244,12 +244,12 @@ static spinlock_t g_atomic_lock = SP_UNLOCKED; type weak_function CONCATENATE(fn, n)(FAR volatile void *ptr, \ type value) \ { \ - irqstate_t irqstate = spin_lock_irqsave_wo_note(&g_atomic_lock); \ + irqstate_t irqstate = raw_spin_lock_irqsave(&g_atomic_lock); \ FAR type *tmp = (FAR type *)ptr; \ \ *tmp = *tmp & value; \ \ - spin_unlock_irqrestore_wo_note(&g_atomic_lock, irqstate); \ + raw_spin_unlock_irqrestore(&g_atomic_lock, irqstate); \ return *tmp; \ } @@ -258,12 +258,12 @@ static spinlock_t g_atomic_lock = SP_UNLOCKED; type weak_function CONCATENATE(fn, n)(FAR volatile void *ptr, \ type value) \ { \ - irqstate_t irqstate = spin_lock_irqsave_wo_note(&g_atomic_lock); \ + irqstate_t irqstate = raw_spin_lock_irqsave(&g_atomic_lock); \ FAR type *tmp = (FAR type *)ptr; \ \ *tmp = *tmp ^ value; \ \ - spin_unlock_irqrestore_wo_note(&g_atomic_lock, irqstate); \ + raw_spin_unlock_irqrestore(&g_atomic_lock, irqstate); \ return *tmp; \ } @@ -272,12 +272,12 @@ static spinlock_t g_atomic_lock = SP_UNLOCKED; type weak_function CONCATENATE(fn, n)(FAR volatile void *ptr, \ type value) \ { \ - irqstate_t irqstate = spin_lock_irqsave_wo_note(&g_atomic_lock); \ + irqstate_t irqstate = raw_spin_lock_irqsave(&g_atomic_lock); \ FAR type *tmp = (FAR type *)ptr; \ \ *tmp = ~(*tmp & value); \ \ - spin_unlock_irqrestore_wo_note(&g_atomic_lock, irqstate); \ + raw_spin_unlock_irqrestore(&g_atomic_lock, irqstate); \ return *tmp; \ } @@ -288,7 +288,7 @@ static spinlock_t g_atomic_lock = SP_UNLOCKED; type newvalue) \ { \ bool ret = false; \ - irqstate_t irqstate = spin_lock_irqsave_wo_note(&g_atomic_lock); \ + irqstate_t irqstate = raw_spin_lock_irqsave(&g_atomic_lock); \ FAR type *tmp = (FAR type *)ptr; \ \ if (*tmp == oldvalue) \ @@ -297,7 +297,7 @@ static spinlock_t g_atomic_lock = SP_UNLOCKED; *tmp = newvalue; \ } \ \ - spin_unlock_irqrestore_wo_note(&g_atomic_lock, irqstate); \ + raw_spin_unlock_irqrestore(&g_atomic_lock, irqstate); \ return ret; \ } @@ -307,7 +307,7 @@ static spinlock_t g_atomic_lock = SP_UNLOCKED; type oldvalue, \ type newvalue) \ { \ - irqstate_t irqstate = spin_lock_irqsave_wo_note(&g_atomic_lock); \ + irqstate_t irqstate = raw_spin_lock_irqsave(&g_atomic_lock); \ FAR type *tmp = (FAR type *)ptr; \ type ret = *tmp; \ \ @@ -316,7 +316,7 @@ static spinlock_t g_atomic_lock = SP_UNLOCKED; *tmp = newvalue; \ } \ \ - spin_unlock_irqrestore_wo_note(&g_atomic_lock, irqstate); \ + raw_spin_unlock_irqrestore(&g_atomic_lock, irqstate); \ return ret; \ } diff --git a/sched/irq/irq_csection.c b/sched/irq/irq_csection.c index 30e7f8820f..1e4763e750 100644 --- a/sched/irq/irq_csection.c +++ b/sched/irq/irq_csection.c @@ -180,7 +180,7 @@ irqstate_t enter_critical_section_wo_note(void) * no longer blocked by the critical section). */ - spin_lock_wo_note(&g_cpu_irqlock); + raw_spin_lock(&g_cpu_irqlock); cpu_irqlock_set(cpu); } @@ -231,7 +231,7 @@ irqstate_t enter_critical_section_wo_note(void) DEBUGASSERT((g_cpu_irqset & (1 << cpu)) == 0); - spin_lock_wo_note(&g_cpu_irqlock); + raw_spin_lock(&g_cpu_irqlock); /* Then set the lock count to 1. * diff --git a/sched/sched/sched_process_delivered.c b/sched/sched/sched_process_delivered.c index 016f730712..32e2987d7d 100644 --- a/sched/sched/sched_process_delivered.c +++ b/sched/sched/sched_process_delivered.c @@ -73,7 +73,7 @@ void nxsched_process_delivered(int cpu) if ((g_cpu_irqset & (1 << cpu)) == 0) { - spin_lock_wo_note(&g_cpu_irqlock); + raw_spin_lock(&g_cpu_irqlock); g_cpu_irqset |= (1 << cpu); }