From c7e30854f284a17200892ce8e5405744e3c46c24 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 24 Jun 2020 13:54:23 +0200 Subject: rtems: Add _RTEMS_Name_to_id() Simplify object name to identifier directives. Using _RTEMS_Name_to_id() to implement the directives enables a tail call optimization. Change license to BSD-2-Clause according to file history. Update #3053. --- cpukit/rtems/src/taskident.c | 65 ++++++++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 26 deletions(-) (limited to 'cpukit/rtems/src/taskident.c') diff --git a/cpukit/rtems/src/taskident.c b/cpukit/rtems/src/taskident.c index d35a617c1f..501bd0b05f 100644 --- a/cpukit/rtems/src/taskident.c +++ b/cpukit/rtems/src/taskident.c @@ -1,53 +1,66 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + /** - * @file + * @file + * + * @ingroup ClassicTasksImpl * - * @brief RTEMS Task Name to Id - * @ingroup ClassicTasks + * @brief rtems_task_ident() Implementation */ /* - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). + * Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) + * Copyright (C) 1989 On-Line Applications Research Corporation (OAR). + * + * 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. * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. + * 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 -#include -#include #include -#include -#include +#include +#include rtems_status_code rtems_task_ident( - rtems_name name, - uint32_t node, - rtems_id *id + rtems_name name, + uint32_t node, + rtems_id *id ) { - Objects_Name_or_id_lookup_errors status; - - if ( !id ) + if ( id == NULL ) { return RTEMS_INVALID_ADDRESS; + } if ( name == OBJECTS_ID_OF_SELF ) { *id = _Thread_Get_executing()->Object.id; return RTEMS_SUCCESSFUL; - } + } - status = _Objects_Name_to_id_u32( - &_RTEMS_tasks_Information.Objects, + return _RTEMS_Name_to_id( name, node, - id + id, + &_RTEMS_tasks_Information.Objects ); - - return _Status_Object_name_errors_to_status[ status ]; } -- cgit v1.2.3