Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-10-07 14:25:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

SH: Replace explict references to g_readytorun with indirect references via the this_task() macro

Browse source
This commit is contained in:
Gregory Nutt 2016-02-06 17:00:02 -06:00
parent 2dff5b27b7
commit edc51a14cd
6 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/sh/src/m16c/m16c_dumpstate.c
View file

@ -156,7 +156,7 @@ static inline void m16c_registerdump(void)
void up_dumpstate(void)
{
struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head;
struct tcb_s *rtcb = this_task();
uint16_t sp = m16c_getsp();
uint16_t ustackbase;
uint16_t ustacksize;

4
arch/sh/src/m16c/m16c_schedulesigaction.c
View file

@ -118,9 +118,9 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
* being delivered to the currently executing task.
*/
sdbg("rtcb=0x%p current_regs=0x%p\n", g_readytorun.head, current_regs);
sdbg("rtcb=0x%p current_regs=0x%p\n", this_task(), current_regs);
if (tcb == (struct tcb_s*)g_readytorun.head)
if (tcb == this_task())
{
/* CASE 1: We are not in an interrupt handler and
* a task is signalling itself for some reason.

2
arch/sh/src/m16c/m16c_sigdeliver.c
View file

@ -82,7 +82,7 @@
void up_sigdeliver(void)
{
#ifndef CONFIG_DISABLE_SIGNALS
struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head;
struct tcb_s *rtcb = this_task();
uint8_t regs[XCPTCONTEXT_SIZE];
sig_deliver_t sigdeliver;

4
arch/sh/src/sh1/sh1_dumpstate.c
View file

@ -145,8 +145,8 @@ static inline void sh1_registerdump(void)
void up_dumpstate(void)
{
struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head;
uint32_t sp = sh1_getsp();
struct tcb_s *rtcb = this_task();
uint32_t sp = sh1_getsp();
uint32_t ustackbase;
uint32_t ustacksize;
#if CONFIG_ARCH_INTERRUPTSTACK > 3

4
arch/sh/src/sh1/sh1_schedulesigaction.c
View file

@ -118,9 +118,9 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
* being delivered to the currently executing task.
*/
sdbg("rtcb=0x%p current_regs=0x%p\n", g_readytorun.head, current_regs);
sdbg("rtcb=0x%p current_regs=0x%p\n", this_task(), current_regs);
if (tcb == (struct tcb_s*)g_readytorun.head)
if (tcb == this_task())
{
/* CASE 1: We are not in an interrupt handler and
* a task is signalling itself for some reason.

2
arch/sh/src/sh1/sh1_sigdeliver.c
View file

@ -82,7 +82,7 @@
void up_sigdeliver(void)
{
#ifndef CONFIG_DISABLE_SIGNALS
struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head;
struct tcb_s *rtcb = this_task();
uint32_t regs[XCPTCONTEXT_REGS];
sig_deliver_t sigdeliver;