From 5d44355937fddc26485ac691a4ceba3f1c169ecf Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 2 Feb 2012 16:57:42 -0600 Subject: PR 1991/cpukit - attr.c (really mode code) warning rework This PR was about a warning for no previous prototype for rtems_interrupt_level_attribute. This method exists (like a few others) to have real bodies for Classic API services implemented as macros. These macros are not available from anything but C and C++. The most explicit use was in the Ada binding but these would be needed from assembly language or any other non-C based language. On top of needing a prototype, the methods were misnamed. They were related to modes. This renames them, moves the file, fixes test code, etc. --- testsuites/sptests/sp37/init.c | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) (limited to 'testsuites/sptests/sp37/init.c') diff --git a/testsuites/sptests/sp37/init.c b/testsuites/sptests/sp37/init.c index f62404a4fb..870316acfb 100644 --- a/testsuites/sptests/sp37/init.c +++ b/testsuites/sptests/sp37/init.c @@ -1,28 +1,26 @@ -/* +/** + * @brief Test for Bodies of Macros + * * Interrupt Disable/Enable Tests * Clock Tick from task level - * - * COPYRIGHT (c) 1989-2011. + */ + +/* + * COPYRIGHT (c) 1989-2012. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at * http://www.rtems.com/license/LICENSE. - * - * $Id$ */ #ifdef HAVE_CONFIG_H #include "config.h" #endif -#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__ #define CONFIGURE_INIT #include "system.h" -/* HACK: API visibilty violation */ -extern rtems_attribute rtems_interrupt_level_attribute(uint32_t level); - /* prototypes */ void test_interrupt_inline(void); void check_isr_in_progress_inline(void); @@ -48,9 +46,9 @@ rtems_timer_service_routine test_isr_in_progress( void test_interrupt_inline(void) { rtems_interrupt_level level; - rtems_attribute level_attribute; - rtems_attribute level_attribute_macro; - bool in_isr; + rtems_mode level_mode_body; + rtems_mode level_mode_macro; + bool in_isr; puts( "interrupt is in progress (use body)" ); in_isr = rtems_interrupt_is_in_progress(); @@ -68,10 +66,10 @@ void test_interrupt_inline(void) puts( "interrupt enable (use inline)" ); rtems_interrupt_enable( level ); - puts( "interrupt level attribute (use inline)" ); - level_attribute = rtems_interrupt_level_attribute( level ); - level_attribute_macro = RTEMS_INTERRUPT_LEVEL(level); - if ( level_attribute_macro == level_attribute ) { + puts( "interrupt level mode (use inline)" ); + level_mode_body = rtems_interrupt_level_body( level ); + level_mode_macro = RTEMS_INTERRUPT_LEVEL(level); + if ( level_mode_macro == level_mode_body ) { puts( "test case working.." ); } } @@ -189,7 +187,8 @@ rtems_task Init( rtems_time_of_day time; rtems_status_code status; rtems_interrupt_level level; - rtems_attribute level_attribute,level_attribute_macro; + rtems_mode level_mode_body; + rtems_mode level_mode_macro; bool in_isr; rtems_id timer; int i; @@ -296,10 +295,10 @@ rtems_task Init( puts( "interrupt enable (use body)" ); rtems_interrupt_enable( level ); - puts( "interrupt level attribute (use body)" ); - level_attribute = rtems_interrupt_level_attribute( level ); - level_attribute_macro = RTEMS_INTERRUPT_LEVEL(level); - if ( level_attribute_macro == level_attribute ) { + puts( "interrupt level mode (use body)" ); + level_mode_body = rtems_interrupt_level_body( level ); + level_mode_macro = RTEMS_INTERRUPT_LEVEL(level); + if ( level_mode_macro == level_mode_body ) { puts("test seems to work"); } -- cgit v1.2.3