[examples-v2 commit] Miscellaneous clean up and warning removal
Joel Sherrill
joel at rtems.org
Fri Aug 29 18:24:58 UTC 2014
Module: examples-v2
Branch: master
Commit: 61d2a1f2e8ddb992f98e80cd503879226730eeec
Changeset: http://git.rtems.org/examples-v2/commit/?id=61d2a1f2e8ddb992f98e80cd503879226730eeec
Author: Joel Sherrill <joel.sherrill at oarcorp.com>
Date: Fri Aug 29 13:17:40 2014 -0500
Miscellaneous clean up and warning removal
---
cxx/cxx_throw/init.cc | 6 ++++++
hello/hello_world_c/test.c | 7 +++++--
hello/wscript | 1 +
led/event_server/init.c | 13 ++++++-------
led/msg_server/init.c | 33 +++++++++++++++------------------
led/ratemon1/init.c | 7 +++----
led/ratemon2/init.c | 19 ++++++++-----------
led/timeout_event/init.c | 14 ++++++++------
led/timer/init.c | 22 ++++++----------------
led/timer_server/init.c | 25 +++++++------------------
ticker/ticker/init.c | 36 +++++++++++++++---------------------
11 files changed, 80 insertions(+), 103 deletions(-)
diff --git a/cxx/cxx_throw/init.cc b/cxx/cxx_throw/init.cc
index 041a73f..b001015 100644
--- a/cxx/cxx_throw/init.cc
+++ b/cxx/cxx_throw/init.cc
@@ -164,6 +164,12 @@ rtems_task Init(
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
#define CONFIGURE_MAXIMUM_TASKS 1
+/*
+ * GCC C++ support requires Classic Semaphores but this could change to
+ * POSIX mutexes at some point in the future. When that happens, this will
+ * need to change.
+ */
+#define CONFIGURE_MAXIMUM_SEMAPHORES 1
#define CONFIGURE_INIT
diff --git a/hello/hello_world_c/test.c b/hello/hello_world_c/test.c
index 67ca6b1..04a55fe 100644
--- a/hello/hello_world_c/test.c
+++ b/hello/hello_world_c/test.c
@@ -1,8 +1,8 @@
/*
- * Simple test program -- simplified version of sample test hello.
+ * Classic API Hello World
*/
-#include <bsp.h>
+#include <rtems.h>
#include <stdlib.h>
#include <stdio.h>
@@ -18,9 +18,12 @@ rtems_task Init(
/* configuration information */
+#include <bsp.h>
+
/* NOTICE: the clock driver is explicitly disabled */
#define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
#define CONFIGURE_MAXIMUM_TASKS 1
diff --git a/hello/wscript b/hello/wscript
index ca09158..d03283e 100644
--- a/hello/wscript
+++ b/hello/wscript
@@ -7,6 +7,7 @@ import rtems_waf.rtems as rtems
def build(bld):
bld.recurse('hello_world_c')
+ bld.recurse('main')
if rtems.check_posix(bld):
bld.recurse('posix_hello_world')
bld.recurse('both_hello')
diff --git a/led/event_server/init.c b/led/event_server/init.c
index 5aa82df..90b0360 100644
--- a/led/event_server/init.c
+++ b/led/event_server/init.c
@@ -17,12 +17,11 @@ rtems_task Test_task(
rtems_task_argument unused
)
{
- rtems_event_set events;
- rtems_status_code status;
+ rtems_event_set events;
for ( ; ; ) {
events = 0;
- status = rtems_event_receive(
+ (void) rtems_event_receive(
(RTEMS_EVENT_1 | RTEMS_EVENT_2),
RTEMS_EVENT_ANY,
RTEMS_NO_TIMEOUT,
@@ -55,12 +54,12 @@ rtems_task Init(
task_name = rtems_build_name( 'T', 'A', '1', ' ' );
- status = rtems_task_create(
+ (void) rtems_task_create(
task_name, 1, RTEMS_MINIMUM_STACK_SIZE * 2, RTEMS_DEFAULT_MODES,
RTEMS_DEFAULT_ATTRIBUTES, &task_id
);
- status = rtems_task_start( task_id, Test_task, 1 );
+ (void) rtems_task_start( task_id, Test_task, 1 );
for (count=0; ; count++) {
@@ -69,10 +68,10 @@ rtems_task Init(
if ( status != RTEMS_SUCCESSFUL )
fputs( "send did not work\n", stderr );
- status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() );
+ (void) rtems_task_wake_after( rtems_clock_get_ticks_per_second() );
}
- status = rtems_task_delete( RTEMS_SELF );
+ (void) rtems_task_delete( RTEMS_SELF );
}
/**************** START OF CONFIGURATION INFORMATION ****************/
diff --git a/led/msg_server/init.c b/led/msg_server/init.c
index 5389d93..4974dea 100644
--- a/led/msg_server/init.c
+++ b/led/msg_server/init.c
@@ -20,11 +20,10 @@ rtems_task Test_task(
{
uint32_t count;
size_t received;
- rtems_status_code status;
for ( ; ; ) {
count = 0xFFFFFFFF;
- status = rtems_message_queue_receive(
+ (void) rtems_message_queue_receive(
Queue_id,
(void *) &count,
&received,
@@ -44,16 +43,15 @@ rtems_task Init(
rtems_task_argument argument
)
{
- uint32_t count = 0;
- rtems_status_code status;
+ uint32_t count;
rtems_id task_id;
- rtems_name task_name;
+ rtems_status_code status;
puts( "\n\n*** LED BLINKER -- message receive server ***" );
LED_INIT();
- status = rtems_message_queue_create(
+ (void) rtems_message_queue_create(
rtems_build_name( 'Q', '1', ' ', ' ' ),
1,
sizeof(uint32_t),
@@ -61,14 +59,16 @@ rtems_task Init(
&Queue_id
);
- task_name = rtems_build_name( 'T', 'A', '1', ' ' );
-
- status = rtems_task_create(
- task_name, 1, RTEMS_MINIMUM_STACK_SIZE * 2, RTEMS_DEFAULT_MODES,
- RTEMS_DEFAULT_ATTRIBUTES, &task_id
+ (void) rtems_task_create(
+ rtems_build_name( 'T', 'A', '1', ' ' ),
+ 1,
+ RTEMS_MINIMUM_STACK_SIZE,
+ RTEMS_DEFAULT_MODES,
+ RTEMS_DEFAULT_ATTRIBUTES,
+ &task_id
);
- status = rtems_task_start( task_id, Test_task, 1 );
+ (void) rtems_task_start( task_id, Test_task, 1 );
for (count=0; ; count++) {
@@ -77,16 +77,14 @@ rtems_task Init(
if ( status != RTEMS_SUCCESSFUL )
fputs( "send did not work\n", stderr );
- status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() );
+ (void) rtems_task_wake_after( rtems_clock_get_ticks_per_second() );
}
- status = rtems_task_delete( RTEMS_SELF );
+ (void) rtems_task_delete( RTEMS_SELF );
}
/**************** START OF CONFIGURATION INFORMATION ****************/
-#define CONFIGURE_INIT
-
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
@@ -95,8 +93,7 @@ rtems_task Init(
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-#define CONFIGURE_EXTRA_TASK_STACKS (3 * RTEMS_MINIMUM_STACK_SIZE)
-
+#define CONFIGURE_INIT
#include <rtems/confdefs.h>
/**************** END OF CONFIGURATION INFORMATION ****************/
diff --git a/led/ratemon1/init.c b/led/ratemon1/init.c
index 13d977c..4e587f4 100644
--- a/led/ratemon1/init.c
+++ b/led/ratemon1/init.c
@@ -16,7 +16,6 @@ rtems_task Init(
rtems_task_argument argument
)
{
- rtems_status_code status;
rtems_id period_id;
rtems_interval ticks;
uint32_t count;
@@ -25,7 +24,7 @@ rtems_task Init(
LED_INIT();
- status = rtems_rate_monotonic_create(
+ (void) rtems_rate_monotonic_create(
rtems_build_name( 'P', 'E', 'R', '1' ),
&period_id
);
@@ -33,14 +32,14 @@ rtems_task Init(
ticks = rtems_clock_get_ticks_per_second();
for (count=0; ; count++) {
- status = rtems_rate_monotonic_period( period_id, ticks );
+ (void) rtems_rate_monotonic_period( period_id, ticks );
if ( (count % 2) == 0 )
LED_OFF();
else
LED_ON();
}
- status = rtems_task_delete( RTEMS_SELF );
+ (void) rtems_task_delete( RTEMS_SELF );
}
/**************** START OF CONFIGURATION INFORMATION ****************/
diff --git a/led/ratemon2/init.c b/led/ratemon2/init.c
index c27150b..33aa542 100644
--- a/led/ratemon2/init.c
+++ b/led/ratemon2/init.c
@@ -16,7 +16,6 @@ rtems_task Init(
rtems_task_argument argument
)
{
- rtems_status_code status;
rtems_id period_id1;
rtems_id period_id2;
rtems_interval ticks;
@@ -25,39 +24,38 @@ rtems_task Init(
LED_INIT();
- status = rtems_rate_monotonic_create(
+ (void) rtems_rate_monotonic_create(
rtems_build_name( 'P', 'E', 'R', '1' ),
&period_id1
);
- status = rtems_rate_monotonic_create(
+ (void) rtems_rate_monotonic_create(
rtems_build_name( 'P', 'E', 'R', '2' ),
&period_id2
);
ticks = rtems_clock_get_ticks_per_second();
- status = rtems_rate_monotonic_period( period_id1, 2 * ticks );
+ (void) rtems_rate_monotonic_period( period_id1, 2 * ticks );
LED_OFF();
(void) rtems_task_wake_after( ticks );
- status = rtems_rate_monotonic_period( period_id2, 2 * ticks );
+ (void) rtems_rate_monotonic_period( period_id2, 2 * ticks );
LED_ON();
while (1) {
- status = rtems_rate_monotonic_period( period_id1, 2 * ticks );
+ (void) rtems_rate_monotonic_period( period_id1, 2 * ticks );
LED_OFF();
- status = rtems_rate_monotonic_period( period_id2, 2 * ticks );
+ (void) rtems_rate_monotonic_period( period_id2, 2 * ticks );
LED_ON();
}
- status = rtems_task_delete( RTEMS_SELF );
+ (void) rtems_task_delete( RTEMS_SELF );
}
/**************** START OF CONFIGURATION INFORMATION ****************/
-#define CONFIGURE_INIT
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
@@ -66,8 +64,7 @@ rtems_task Init(
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-#define CONFIGURE_EXTRA_TASK_STACKS (3 * RTEMS_MINIMUM_STACK_SIZE)
-
+#define CONFIGURE_INIT
#include <rtems/confdefs.h>
/**************** END OF CONFIGURATION INFORMATION ****************/
diff --git a/led/timeout_event/init.c b/led/timeout_event/init.c
index b7c35f7..b9e2c77 100644
--- a/led/timeout_event/init.c
+++ b/led/timeout_event/init.c
@@ -27,8 +27,12 @@ rtems_task Init(
for (count=0; ; count++) {
- status = rtems_event_receive( RTEMS_EVENT_1,
- RTEMS_DEFAULT_OPTIONS, rtems_clock_get_ticks_per_second(), &events );
+ status = rtems_event_receive(
+ RTEMS_EVENT_1,
+ RTEMS_DEFAULT_OPTIONS,
+ rtems_clock_get_ticks_per_second(),
+ &events
+ );
if ( status != RTEMS_TIMEOUT )
fputs( "receive did not timeout\n", stderr );
@@ -39,12 +43,11 @@ rtems_task Init(
}
- status = rtems_task_delete( RTEMS_SELF );
+ (void) rtems_task_delete( RTEMS_SELF );
}
/**************** START OF CONFIGURATION INFORMATION ****************/
-#define CONFIGURE_INIT
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
@@ -52,8 +55,7 @@ rtems_task Init(
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-#define CONFIGURE_EXTRA_TASK_STACKS (3 * RTEMS_MINIMUM_STACK_SIZE)
-
+#define CONFIGURE_INIT
#include <rtems/confdefs.h>
/**************** END OF CONFIGURATION INFORMATION ****************/
diff --git a/led/timer/init.c b/led/timer/init.c
index cc44dae..70364ad 100644
--- a/led/timer/init.c
+++ b/led/timer/init.c
@@ -37,15 +37,13 @@ void LED_Change_Routine( void ) {
rtems_timer_service_routine Timer_Routine( rtems_id id, void *ignored )
{
- rtems_status_code status;
-
if ( id == Timer1 )
led_value = 1;
else
led_value = 2;
led_do_print = 1;
- status = rtems_timer_fire_after(
+ (void) rtems_timer_fire_after(
id,
2 * rtems_clock_get_ticks_per_second(),
Timer_Routine,
@@ -57,34 +55,28 @@ rtems_task Init(
rtems_task_argument argument
)
{
- rtems_status_code status;
-
puts( "\n\n*** LED BLINKER -- timer ***" );
LED_INIT();
- status = rtems_timer_create(rtems_build_name( 'T', 'M', 'R', '1' ), &Timer1);
- if ( status != RTEMS_SUCCESSFUL )
- fputs( "Timer1 create failed\n", stderr );
+ (void) rtems_timer_create(rtems_build_name( 'T', 'M', 'R', '1' ), &Timer1);
- status = rtems_timer_create(rtems_build_name( 'T', 'M', 'R', '2' ), &Timer2);
- if ( status != RTEMS_SUCCESSFUL )
- fputs( "Timer2 create failed\n", stderr );
+ (void) rtems_timer_create(rtems_build_name( 'T', 'M', 'R', '2' ), &Timer2);
Timer_Routine(Timer1, NULL);
LED_Change_Routine();
- status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() );
+ (void) rtems_task_wake_after( rtems_clock_get_ticks_per_second() );
Timer_Routine(Timer2, NULL);
LED_Change_Routine();
while (1) {
- status = rtems_task_wake_after( 10 );
+ (void) rtems_task_wake_after( 10 );
LED_Change_Routine();
}
- status = rtems_task_delete( RTEMS_SELF );
+ (void) rtems_task_delete( RTEMS_SELF );
}
@@ -98,8 +90,6 @@ rtems_task Init(
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-#define CONFIGURE_EXTRA_TASK_STACKS (3 * RTEMS_MINIMUM_STACK_SIZE)
-
#define CONFIGURE_INIT
#include <rtems/confdefs.h>
/**************** END OF CONFIGURATION INFORMATION ****************/
diff --git a/led/timer_server/init.c b/led/timer_server/init.c
index 29d63af..69ec0cb 100644
--- a/led/timer_server/init.c
+++ b/led/timer_server/init.c
@@ -17,14 +17,12 @@ rtems_id Timer2;
rtems_timer_service_routine Timer_Routine( rtems_id id, void *ignored )
{
- rtems_status_code status;
-
if ( id == Timer1 )
LED_OFF();
else
LED_ON();
- status = rtems_timer_server_fire_after(
+ (void) rtems_timer_server_fire_after(
id,
2 * rtems_clock_get_ticks_per_second(),
Timer_Routine,
@@ -36,36 +34,27 @@ rtems_task Init(
rtems_task_argument argument
)
{
- rtems_status_code status;
-
puts( "\n\n*** LED BLINKER -- timer_server ***" );
LED_INIT();
- status = rtems_timer_initiate_server(
+ (void) rtems_timer_initiate_server(
1,
RTEMS_MINIMUM_STACK_SIZE * 2,
RTEMS_DEFAULT_ATTRIBUTES
);
- if ( status != RTEMS_SUCCESSFUL )
- fputs( "timer create server failed\n", stderr );
-
- status = rtems_timer_create(rtems_build_name( 'T', 'M', 'R', '1' ), &Timer1);
- if ( status != RTEMS_SUCCESSFUL )
- fputs( "Timer1 create failed\n", stderr );
+ (void) rtems_timer_create(rtems_build_name( 'T', 'M', 'R', '1' ), &Timer1);
- status = rtems_timer_create(rtems_build_name( 'T', 'M', 'R', '2' ), &Timer2);
- if ( status != RTEMS_SUCCESSFUL )
- fputs( "Timer2 create failed\n", stderr );
+ (void) rtems_timer_create(rtems_build_name( 'T', 'M', 'R', '2' ), &Timer2);
Timer_Routine(Timer1, NULL);
- status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() );
+ (void) rtems_task_wake_after( rtems_clock_get_ticks_per_second() );
Timer_Routine(Timer2, NULL);
- status = rtems_task_delete( RTEMS_SELF );
+ (void) rtems_task_delete( RTEMS_SELF );
}
@@ -79,7 +68,7 @@ rtems_task Init(
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-#define CONFIGURE_EXTRA_TASK_STACKS (3 * RTEMS_MINIMUM_STACK_SIZE)
+#define CONFIGURE_EXTRA_TASK_STACKS (RTEMS_MINIMUM_STACK_SIZE)
#define CONFIGURE_INIT
#include <rtems/confdefs.h>
diff --git a/ticker/ticker/init.c b/ticker/ticker/init.c
index 4d3d129..4d86cf6 100644
--- a/ticker/ticker/init.c
+++ b/ticker/ticker/init.c
@@ -18,27 +18,23 @@ rtems_id Task_id[ 4 ]; /* array of task ids */
rtems_name Task_name[ 4 ]; /* array of task names */
rtems_task Test_task(
- rtems_task_argument unused
+ rtems_task_argument task_index
)
{
- rtems_id tid;
rtems_time_of_day time;
- uint32_t task_index;
- rtems_status_code status;
+ rtems_interval ticks;
+
+ ticks = task_index * 5 * rtems_clock_get_ticks_per_second();
- status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &tid );
- task_index = task_number( tid );
for ( ; ; ) {
- status = rtems_clock_get_tod( &time );
+ (void) rtems_clock_get_tod( &time );
if ( time.second >= 35 ) {
puts( "*** END OF CLOCK TICK TEST ***" );
exit( 0 );
}
put_name( Task_name[ task_index ], FALSE );
print_time( " - rtems_clock_get_tod - ", &time, "\n" );
- status = rtems_task_wake_after(
- task_index * 5 * rtems_clock_get_ticks_per_second()
- );
+ (void) rtems_task_wake_after( ticks );
}
}
@@ -46,7 +42,6 @@ rtems_task Init(
rtems_task_argument argument
)
{
- rtems_status_code status;
rtems_time_of_day time;
puts( "\n\n*** CLOCK TICK TEST ***" );
@@ -59,36 +54,34 @@ rtems_task Init(
time.second = 0;
time.ticks = 0;
- status = rtems_clock_set( &time );
+ (void) rtems_clock_set( &time );
Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
Task_name[ 3 ] = rtems_build_name( 'T', 'A', '3', ' ' );
- status = rtems_task_create(
+ (void) rtems_task_create(
Task_name[ 1 ], 1, RTEMS_MINIMUM_STACK_SIZE * 2, RTEMS_DEFAULT_MODES,
RTEMS_DEFAULT_ATTRIBUTES, &Task_id[ 1 ]
);
- status = rtems_task_create(
+ (void) rtems_task_create(
Task_name[ 2 ], 1, RTEMS_MINIMUM_STACK_SIZE * 2, RTEMS_DEFAULT_MODES,
RTEMS_DEFAULT_ATTRIBUTES, &Task_id[ 2 ]
);
- status = rtems_task_create(
+ (void) rtems_task_create(
Task_name[ 3 ], 1, RTEMS_MINIMUM_STACK_SIZE * 2, RTEMS_DEFAULT_MODES,
RTEMS_DEFAULT_ATTRIBUTES, &Task_id[ 3 ]
);
- status = rtems_task_start( Task_id[ 1 ], Test_task, 1 );
- status = rtems_task_start( Task_id[ 2 ], Test_task, 2 );
- status = rtems_task_start( Task_id[ 3 ], Test_task, 3 );
+ (void) rtems_task_start( Task_id[ 1 ], Test_task, 1 );
+ (void) rtems_task_start( Task_id[ 2 ], Test_task, 2 );
+ (void) rtems_task_start( Task_id[ 3 ], Test_task, 3 );
- status = rtems_task_delete( RTEMS_SELF );
+ (void) rtems_task_delete( RTEMS_SELF );
}
/**************** START OF CONFIGURATION INFORMATION ****************/
-#define CONFIGURE_INIT
-
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
@@ -99,6 +92,7 @@ rtems_task Init(
#define CONFIGURE_EXTRA_TASK_STACKS (4 * RTEMS_MINIMUM_STACK_SIZE)
+#define CONFIGURE_INIT
#include <rtems/confdefs.h>
/**************** END OF CONFIGURATION INFORMATION ****************/
More information about the vc
mailing list