diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a88a52cb58d..075021ea956 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -22450,7 +22450,6 @@ sched/sched/sched_removeblocked.c alin.jerpelea@sony.com masayuki.ishikawa@gmail sched/sched/sched_removereadytorun.c hujun5@xiaomi.com jukka.laitinen@tii.ae masayuki.ishikawa@gmail.com alin.jerpelea@sony.com sched/sched/sched_reprioritize.c petro.karashchenko@gmail.com alin.jerpelea@sony.com sched/sched/sched_reprioritizertr.c zhangyuan21@xiaomi.com hujun5@xiaomi.com alin.jerpelea@sony.com anchao@lixiang.com -sched/sched/sched_resumescheduler.c Masayuki.Ishikawa@jp.sony.com alin.jerpelea@sony.com liguiding1@xiaomi.com walker.zeng@transtekcorp.com sched/sched/sched_roundrobin.c hujun5@xiaomi.com gustavo.nihei@espressif.com jukka.laitinen@tii.ae zhangyuan21@xiaomi.com sched/sched/sched_rrgetinterval.c alin.jerpelea@sony.com yamamoto@midokura.com sched/sched/sched_self.c alin.jerpelea@sony.com diff --git a/boards/xtensa/esp32s3/common/scripts/esp32s3_sections.ld b/boards/xtensa/esp32s3/common/scripts/esp32s3_sections.ld index 5ecf431c2f5..8136c08f6ec 100644 --- a/boards/xtensa/esp32s3/common/scripts/esp32s3_sections.ld +++ b/boards/xtensa/esp32s3/common/scripts/esp32s3_sections.ld @@ -212,7 +212,6 @@ SECTIONS *libsched.a:sched_addreadytorun.*(.literal.nxsched_add_readytorun .text.nxsched_add_readytorun) *libsched.a:sched_addprioritized.*(.literal.nxsched_add_prioritized .text.nxsched_add_prioritized) *libsched.a:sched_mergepending.*(.literal.nxsched_merge_pending .text.nxsched_merge_pending) - *libsched.a:sched_resumescheduler.*(.literal.nxsched_resume_scheduler .text.nxsched_resume_scheduler) *libc.a:sq_remfirst.*(.literal.sq_remfirst .text.sq_remfirst) #endif diff --git a/boards/xtensa/esp32s3/common/scripts/legacy_sections.ld b/boards/xtensa/esp32s3/common/scripts/legacy_sections.ld index 5ed2b6532af..6665cd6461f 100644 --- a/boards/xtensa/esp32s3/common/scripts/legacy_sections.ld +++ b/boards/xtensa/esp32s3/common/scripts/legacy_sections.ld @@ -128,7 +128,6 @@ SECTIONS *libsched.a:sched_addreadytorun.*(.literal.nxsched_add_readytorun .text.nxsched_add_readytorun) *libsched.a:sched_addprioritized.*(.literal.nxsched_add_prioritized .text.nxsched_add_prioritized) *libsched.a:sched_mergepending.*(.literal.nxsched_merge_pending .text.nxsched_merge_pending) - *libsched.a:sched_resumescheduler.*(.literal.nxsched_resume_scheduler .text.nxsched_resume_scheduler) *libc.a:sq_remfirst.*(.literal.sq_remfirst .text.sq_remfirst) #endif diff --git a/boards/xtensa/esp32s3/common/scripts/mcuboot_sections.ld b/boards/xtensa/esp32s3/common/scripts/mcuboot_sections.ld index 4924fdec5b7..a66814df183 100644 --- a/boards/xtensa/esp32s3/common/scripts/mcuboot_sections.ld +++ b/boards/xtensa/esp32s3/common/scripts/mcuboot_sections.ld @@ -233,7 +233,6 @@ SECTIONS *libsched.a:sched_addreadytorun.*(.literal.nxsched_add_readytorun .text.nxsched_add_readytorun) *libsched.a:sched_addprioritized.*(.literal.nxsched_add_prioritized .text.nxsched_add_prioritized) *libsched.a:sched_mergepending.*(.literal.nxsched_merge_pending .text.nxsched_merge_pending) - *libsched.a:sched_resumescheduler.*(.literal.nxsched_resume_scheduler .text.nxsched_resume_scheduler) *libc.a:sq_remfirst.*(.literal.sq_remfirst .text.sq_remfirst) #endif diff --git a/sched/sched/sched_resumescheduler.c b/sched/sched/sched_resumescheduler.c deleted file mode 100644 index 71c57392447..00000000000 --- a/sched/sched/sched_resumescheduler.c +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************** - * sched/sched/sched_resumescheduler.c - * - * SPDX-License-Identifier: Apache-2.0 - * - * 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 - -#include - -#include -#include -#include - -#include "irq/irq.h" -#include "sched/sched.h" - -#if defined(CONFIG_SCHED_RESUMESCHEDULER) - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -/**************************************************************************** - * Name: nxsched_resume_scheduler - * - * Description: - * Called by architecture specific implementations that block task - * execution. This function prepares the scheduler for the thread that is - * about to be restarted. - * - * Input Parameters: - * tcb - The TCB of the thread to be restarted. - * - * Returned Value: - * None - * - ****************************************************************************/ - -void nxsched_resume_scheduler(FAR struct tcb_s *tcb) -{ -#ifdef CONFIG_SCHED_SPORADIC - if ((tcb->flags & TCB_FLAG_POLICY_MASK) == TCB_FLAG_SCHED_SPORADIC) - { - /* Reset the replenishment cycle if it is appropriate to do so */ - - DEBUGVERIFY(nxsched_resume_sporadic(tcb)); - } -#endif - - /* Indicate the task has been resumed */ - -#ifdef CONFIG_SCHED_CRITMONITOR - nxsched_resume_critmon(tcb); -#endif -#ifdef CONFIG_SCHED_INSTRUMENTATION - sched_note_resume(tcb); -#endif -} - -#endif /* CONFIG_SCHED_RESUMESCHEDULER */