nuttx/sched: merge up_block_task and up_unblock_task

arch/sparc/src/sparc_v8/Make.defs

@@ -23,11 +23,11 @@
 include common/Make.defs
 
 CMN_ASRCS += sparc_v8_syscall.S
-CMN_CSRCS += sparc_v8_blocktask.c sparc_v8_copystate.c sparc_v8_doirq.c
+CMN_CSRCS += sparc_v8_copystate.c sparc_v8_doirq.c
 CMN_CSRCS += sparc_v8_initialstate.c sparc_v8_irq.c
 CMN_CSRCS += sparc_v8_releasepending.c sparc_v8_schedulesigaction.c
 CMN_CSRCS += sparc_v8_sigdeliver.c sparc_v8_swint1.c sparc_v8_systemreset.c
-CMN_CSRCS += sparc_v8_unblocktask.c
+CMN_CSRCS += sparc_v8_switchcontext.c
 
 # Configuration-dependent common files
 

arch/sparc/src/sparc_v8/sparc_v8_blocktask.c

@@ -1,115 +0,0 @@
-/****************************************************************************
- * arch/sparc/src/sparc_v8/sparc_v8_blocktask.c
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <stdbool.h>
-#include <sched.h>
-#include <syscall.h>
-#include <assert.h>
-#include <debug.h>
-
-#include <nuttx/arch.h>
-#include <nuttx/sched.h>
-
-#include "sched/sched.h"
-#include "group/group.h"
-#include "sparc_internal.h"
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: up_block_task
- *
- * Description:
- *   The currently executing task has already removed from ready-to-run list.
- *   Save its context and switch to the next running task at the head of the
- *   ready-to-run list.
- *
- * Input Parameters:
- *   rtcb: Reference to the running task which is different to the
- *     task (next running task) at the head of the list.
- *
- ****************************************************************************/
-
-void up_block_task(struct tcb_s *rtcb)
-{
-  /* Update scheduler parameters */
-
-  nxsched_suspend_scheduler(rtcb);
-
-  /* Are we in an interrupt handler? */
-
-  if (CURRENT_REGS)
-    {
-      /* Yes, then we have to do things differently.
-       * Just copy the CURRENT_REGS into the OLD rtcb.
-       */
-
-      sparc_savestate(rtcb->xcp.regs);
-
-      /* Restore the exception context of the rtcb at the (new) head
-       * of the ready-to-run task list.
-       */
-
-      rtcb = this_task();
-
-      /* Reset scheduler parameters */
-
-      nxsched_resume_scheduler(rtcb);
-
-      /* Then switch contexts.  Any necessary address environment
-       * changes will be made when the interrupt returns.
-       */
-
-      sparc_restorestate(rtcb->xcp.regs);
-    }
-
-  /* No, then we will need to perform the user context switch */
-
-  else
-    {
-      /* Get the context of the task at the head of the ready to
-       * run list.
-       */
-
-      struct tcb_s *nexttcb = this_task();
-
-      /* Reset scheduler parameters */
-
-      nxsched_resume_scheduler(nexttcb);
-
-      /* Then switch contexts */
-
-      sparc_switchcontext(rtcb->xcp.regs, nexttcb->xcp.regs);
-
-      /* sparc_switchcontext forces a context switch to the task at the
-       * head of the ready-to-run list.  It does not 'return' in the
-       * normal sense.  When it does return, it is because the blocked
-       * task is again ready to run and has execution priority.
-       */
-    }
-}

arch/sparc/src/sparc_v8/sparc_v8_switchcontext.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/sparc/src/sparc_v8/sparc_v8_unblocktask.c
+ * arch/sparc/src/sparc_v8/sparc_v8_switchcontext.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -42,7 +42,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: up_unblock_task
+ * Name: up_switch_context
  *
  * Description:
  *   A task is currently in the ready-to-run list but has been prepped
@@ -55,7 +55,7 @@
  *
  ****************************************************************************/
 
-void up_unblock_task(struct tcb_s *tcb, struct tcb_s *rtcb)
+void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
 {
   /* Update scheduler parameters */