From e49e8daf3d997f0196a67cfb8b9e86a88411e432 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 28 Jun 2023 11:05:20 -0500 Subject: Remove unused _IO_Relax The only use was in a test. --- cpukit/include/rtems/score/io.h | 8 --- cpukit/score/src/iorelax.c | 53 ----------------- spec/build/cpukit/librtemscpu.yml | 1 - spec/build/testsuites/validation/libvalidation.yml | 1 - testsuites/validation/tx-io-relax.c | 67 ---------------------- 5 files changed, 130 deletions(-) delete mode 100644 cpukit/score/src/iorelax.c delete mode 100644 testsuites/validation/tx-io-relax.c diff --git a/cpukit/include/rtems/score/io.h b/cpukit/include/rtems/score/io.h index 9cd401eb1d..7fe69841e8 100644 --- a/cpukit/include/rtems/score/io.h +++ b/cpukit/include/rtems/score/io.h @@ -133,14 +133,6 @@ int _IO_Base64url( int wordlen ); -/** - * @brief Issues a couple of no-operation instructions. - * - * This function may be used to burn a couple of processor cycles with minimum - * impact on the system bus. It may be used in busy wait loops. - */ -void _IO_Relax( void ); - /** @} */ #ifdef __cplusplus diff --git a/cpukit/score/src/iorelax.c b/cpukit/score/src/iorelax.c deleted file mode 100644 index 1b155377a9..0000000000 --- a/cpukit/score/src/iorelax.c +++ /dev/null @@ -1,53 +0,0 @@ -/* SPDX-License-Identifier: BSD-2-Clause */ - -/** - * @file - * - * @ingroup RTEMSScoreIO - * - * @brief This source file contains the implementation of _IO_Relax(). - */ - -/* - * Copyright (C) 2021 embedded brains GmbH & Co. KG - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -void _IO_Relax( void ) -{ - _CPU_Instruction_no_operation(); - _CPU_Instruction_no_operation(); - _CPU_Instruction_no_operation(); - _CPU_Instruction_no_operation(); - _CPU_Instruction_no_operation(); - _CPU_Instruction_no_operation(); - _CPU_Instruction_no_operation(); - _CPU_Instruction_no_operation(); -} diff --git a/spec/build/cpukit/librtemscpu.yml b/spec/build/cpukit/librtemscpu.yml index 3654e7f94a..a1f614a1d9 100644 --- a/spec/build/cpukit/librtemscpu.yml +++ b/spec/build/cpukit/librtemscpu.yml @@ -1434,7 +1434,6 @@ source: - cpukit/score/src/interr.c - cpukit/score/src/iobase64.c - cpukit/score/src/ioprintf.c -- cpukit/score/src/iorelax.c - cpukit/score/src/iovprintf.c - cpukit/score/src/isr.c - cpukit/score/src/isrisinprogress.c diff --git a/spec/build/testsuites/validation/libvalidation.yml b/spec/build/testsuites/validation/libvalidation.yml index f73b0f771a..9b326b89d2 100644 --- a/spec/build/testsuites/validation/libvalidation.yml +++ b/spec/build/testsuites/validation/libvalidation.yml @@ -14,7 +14,6 @@ source: - testsuites/validation/tx-call-within-isr.c - testsuites/validation/tx-default-task-config.c - testsuites/validation/tx-interrupt.c -- testsuites/validation/tx-io-relax.c - testsuites/validation/tx-memory-alloc.c - testsuites/validation/tx-preemption-intervention.c - testsuites/validation/tx-support.c diff --git a/testsuites/validation/tx-io-relax.c b/testsuites/validation/tx-io-relax.c deleted file mode 100644 index 30cc097b3a..0000000000 --- a/testsuites/validation/tx-io-relax.c +++ /dev/null @@ -1,67 +0,0 @@ -/* SPDX-License-Identifier: BSD-2-Clause */ - -/** - * @file - * - * @ingroup RTEMSTestSuitesValidation - * - * @brief This source file contains the implementation of SetIORelaxHandler(). - */ - -/* - * Copyright (C) 2021 embedded brains GmbH & Co. KG - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "tx-support.h" - -void __real__IO_Relax( void ); - -void __wrap__IO_Relax( void ); - -static void ( *io_relax_handler )( void * ); - -static void *io_relax_arg; - -void __wrap__IO_Relax( void ) -{ - void ( *handler )( void * ); - - handler = io_relax_handler; - - if ( handler != NULL ) { - ( *handler )( io_relax_arg ); - } - - __real__IO_Relax(); -} - -void SetIORelaxHandler( void ( *handler )( void * ), void *arg ) -{ - io_relax_handler = handler; - io_relax_arg = arg; -} -- cgit v1.2.3