From 1fcff14ff1434ae53b5884d7ef8af76579ec5a2d Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sat, 14 Nov 2009 21:09:34 +0000 Subject: =?UTF-8?q?2009-11-14=09Ralf=20Cors=C3=A9pius=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * rtems++/Task1.cc, rtems++/Task2.cc: Spray PRI* macros to eliminate several dozens of warnings. --- testsuites/libtests/ChangeLog | 5 +++ testsuites/libtests/rtems++/Task1.cc | 66 +++++++++++++++++++++--------------- testsuites/libtests/rtems++/Task2.cc | 10 +++--- 3 files changed, 48 insertions(+), 33 deletions(-) diff --git a/testsuites/libtests/ChangeLog b/testsuites/libtests/ChangeLog index a7791f4d87..f469a19cfa 100644 --- a/testsuites/libtests/ChangeLog +++ b/testsuites/libtests/ChangeLog @@ -1,3 +1,8 @@ +2009-11-14 Ralf Corsépius + + * rtems++/Task1.cc, rtems++/Task2.cc: Spray PRI* macros to eliminate + several dozens of warnings. + 2009-11-13 Ralf Corsépius * block06/init.c: Add missing prototype. diff --git a/testsuites/libtests/rtems++/Task1.cc b/testsuites/libtests/rtems++/Task1.cc index c4dda82f75..c5ee2f28a4 100644 --- a/testsuites/libtests/rtems++/Task1.cc +++ b/testsuites/libtests/rtems++/Task1.cc @@ -26,6 +26,16 @@ #include #include "System.h" +/* c.f. cpukit/score/include/rtems/score/priority.h */ +#define PRIiPriority_Control PRIi32 +/* rtems_task_priority is a typedef to Priority_Control */ +#define PRIirtems_task_priority PRIiPriority_Control + +/* c.f. cpukit/rtems/include/rtems/rtems/modes.h */ +#define PRIXModes_Control PRIX32 +/* rtems_mode is a typedef to Modes_Control */ +#define PRIXrtems_mode PRIXModes_Control + void Task1::body(rtems_task_argument argument) { rtems_test_pause_and_screen_number(1); @@ -190,7 +200,7 @@ void Task1::screen2(void) printf("%s - get priority - ", name_string()); get_priority(current_priority); - printf("%s, priority is %i\n", last_status_string(), current_priority); + printf("%s, priority is %" PRIirtems_task_priority "\n", last_status_string(), current_priority); printf("%s - set priority to 512 - ", name_string()); set_priority(512); @@ -202,13 +212,13 @@ void Task1::screen2(void) printf("%s - set priority to original - ", name_string()); set_priority(current_priority, priority); - printf("%s, priority was %i\n", last_status_string(), priority); + printf("%s, priority was %" PRIirtems_task_priority "\n", last_status_string(), priority); // priorities with connected object printf("%s - connected object get priority - ", task_1.name_string()); task_1.get_priority(current_priority); - printf("%s, priority is %i\n", task_1.last_status_string(), current_priority); + printf("%s, priority is %" PRIirtems_task_priority "\n", task_1.last_status_string(), current_priority); printf("%s - connected object set priority to 512 - ", task_1.name_string()); task_1.set_priority(512); @@ -220,13 +230,13 @@ void Task1::screen2(void) printf("%s - connected object set priority to original - ", task_1.name_string()); task_1.set_priority(current_priority, priority); - printf("%s, priority was %i\n", task_1.last_status_string(), priority); + printf("%s, priority was %" PRIirtems_task_priority "\n", task_1.last_status_string(), priority); // priorities with self object printf("%s - self object get priority - ", task_2.name_string()); task_2.get_priority(current_priority); - printf("%s, priority is %i\n", task_2.last_status_string(), current_priority); + printf("%s, priority is %" PRIirtems_task_priority "\n", task_2.last_status_string(), current_priority); printf("%s - self object set priority to 512 - ", task_2.name_string()); task_2.set_priority(512); @@ -238,7 +248,7 @@ void Task1::screen2(void) printf("%s - self object set priority to original - ", task_2.name_string()); task_2.set_priority(current_priority, priority); - printf("%s, priority was %i\n", task_2.last_status_string(), priority); + printf("%s, priority was %" PRIirtems_task_priority "\n", task_2.last_status_string(), priority); uint32_t current_note; uint32_t note; @@ -247,11 +257,11 @@ void Task1::screen2(void) printf("%s - get note - ", name_string()); get_note(0, current_note); - printf("%s, note is %i\n", last_status_string(), current_note); + printf("%s, note is %" PRIi32 "\n", last_status_string(), current_note); printf("%s - get with bad notepad number - ", name_string()); get_note(100, current_note); - printf("%s, note is %i\n", last_status_string(), current_note); + printf("%s, note is %" PRIi32 "\n", last_status_string(), current_note); printf("%s - set note to 0xDEADBEEF - ", name_string()); set_note(0, 0xDEADBEEF); @@ -259,7 +269,7 @@ void Task1::screen2(void) printf("%s - get note - ", name_string()); get_note(0, note); - printf("%s, note is 0x%08X\n", last_status_string(), note); + printf("%s, note is 0x%08" PRIX32 "\n", last_status_string(), note); printf("%s - set note to original value - ", name_string()); set_note(0, current_note); @@ -269,11 +279,11 @@ void Task1::screen2(void) printf("%s - connected object get note - ", task_1.name_string()); task_1.get_note(0, current_note); - printf("%s, notepad is %i\n", task_1.last_status_string(), current_note); + printf("%s, notepad is %" PRIi32 "\n", task_1.last_status_string(), current_note); printf("%s - connected object get with bad notepad number - ", task_1.name_string()); task_1.get_note(100, current_note); - printf("%s, note is %i\n", task_1.last_status_string(), current_note); + printf("%s, note is %" PRIi32 "\n", task_1.last_status_string(), current_note); printf("%s - connected object set note to 0xDEADBEEF - ", task_1.name_string()); task_1.set_note(0, 0xDEADBEEF); @@ -281,7 +291,7 @@ void Task1::screen2(void) printf("%s - connected object get note - ", task_1.name_string()); task_1.get_note(0, note); - printf("%s, note is 0x%08X\n", task_1.last_status_string(), note); + printf("%s, note is 0x%08" PRIX32 "\n", task_1.last_status_string(), note); printf("%s - connected object set note to original value - ", task_1.name_string()); task_1.set_note(0, current_note); @@ -291,11 +301,11 @@ void Task1::screen2(void) printf("%s - self object get note - ", task_2.name_string()); task_2.get_note(0, current_note); - printf("%s, note is %i\n", task_2.last_status_string(), current_note); + printf("%s, note is %" PRIi32 "\n", task_2.last_status_string(), current_note); printf("%s - self object get with bad notepad number - ", task_2.name_string()); task_2.get_note(100, current_note); - printf("%s, note is %i\n", task_2.last_status_string(), current_note); + printf("%s, note is %" PRIi32 "\n", task_2.last_status_string(), current_note); printf("%s - self object set note to 0xDEADBEEF - ", task_2.name_string()); task_2.set_note(0, 0xDEADBEEF); @@ -303,7 +313,7 @@ void Task1::screen2(void) printf("%s - self object get note - ", task_2.name_string()); task_2.get_note(0, note); - printf("%s, notepad is 0x%08X\n", task_2.last_status_string(), note); + printf("%s, notepad is 0x%08" PRIX32 "\n", task_2.last_status_string(), note); printf("%s - self object set note to original value - ", task_2.name_string()); task_2.set_note(0, current_note); @@ -328,7 +338,7 @@ void Task1::screen3(void) printf("%s - get mode - ", self.name_string()); task_mode.get_mode(current_mode); - printf("%s,\n\t mode is 0x%08X, ", task_mode.last_status_string(), current_mode); + printf("%s,\n\t mode is 0x%08" PRIXrtems_mode ", ", task_mode.last_status_string(), current_mode); print_mode(current_mode, RTEMS_ALL_MODES); printf("\n"); @@ -336,21 +346,21 @@ void Task1::screen3(void) printf("%s - get preemption state - ", self.name_string()); task_mode.get_preemption_state(mode); - printf("%s,\n\t mode is 0x%08X, ", task_mode.last_status_string(), mode); + printf("%s,\n\t mode is 0x%08" PRIXrtems_mode ", ", task_mode.last_status_string(), mode); print_mode(mode, RTEMS_PREEMPT_MASK); printf("\n"); printf("%s - set preemption state to RTEMS_PREEMPT - ", self.name_string()); task_mode.set_preemption_state(RTEMS_PREEMPT); task_mode.get_mode(mode); - printf("%s,\n\t mode is 0x%08X, ", task_mode.last_status_string(), mode); + printf("%s,\n\t mode is 0x%08" PRIXrtems_mode ", ", task_mode.last_status_string(), mode); print_mode(mode, RTEMS_ALL_MODES); printf("\n"); printf("%s - set preemption state to RTEMS_NO_PREEMPT - ", self.name_string()); task_mode.set_preemption_state(RTEMS_NO_PREEMPT); task_mode.get_mode(mode); - printf("%s,\n\t mode is 0x%08X, ", task_mode.last_status_string(), mode); + printf("%s,\n\t mode is 0x%08" PRIXrtems_mode ", ", task_mode.last_status_string(), mode); print_mode(mode, RTEMS_ALL_MODES); printf("\n"); @@ -358,21 +368,21 @@ void Task1::screen3(void) printf("%s - get timeslice state - ", self.name_string()); task_mode.get_timeslice_state(mode); - printf("%s,\n\t mode is 0x%08X, ", task_mode.last_status_string(), mode); + printf("%s,\n\t mode is 0x%08" PRIXrtems_mode ", ", task_mode.last_status_string(), mode); print_mode(mode, RTEMS_TIMESLICE_MASK); printf("\n"); printf("%s - set timeslice state to RTEMS_TIMESLICE - ", self.name_string()); task_mode.set_timeslice_state(RTEMS_TIMESLICE); task_mode.get_mode(mode); - printf("%s,\n\t mode is 0x%08X, ", task_mode.last_status_string(), mode); + printf("%s,\n\t mode is 0x%08" PRIXrtems_mode ", ", task_mode.last_status_string(), mode); print_mode(mode, RTEMS_ALL_MODES); printf("\n"); printf("%s - set timeslice state to RTEMS_NO_TIMESLICE - ", self.name_string()); task_mode.set_timeslice_state(RTEMS_NO_TIMESLICE); task_mode.get_mode(mode); - printf("%s,\n\t mode is 0x%08X, ", task_mode.last_status_string(), mode); + printf("%s,\n\t mode is 0x%08" PRIXrtems_mode ", ", task_mode.last_status_string(), mode); print_mode(mode, RTEMS_ALL_MODES); printf("\n"); @@ -380,21 +390,21 @@ void Task1::screen3(void) printf("%s - get asr state - ", self.name_string()); task_mode.get_asr_state(mode); - printf("%s,\n\t mode is 0x%08X, ", task_mode.last_status_string(), mode); + printf("%s,\n\t mode is 0x%08" PRIXrtems_mode ", ", task_mode.last_status_string(), mode); print_mode(mode, RTEMS_ASR_MASK); printf("\n"); printf("%s - set asr state to RTEMS_ASR - ", self.name_string()); task_mode.set_asr_state(RTEMS_ASR); task_mode.get_mode(mode); - printf("%s,\n\t mode is 0x%08X, ", task_mode.last_status_string(), mode); + printf("%s,\n\t mode is 0x%08" PRIXrtems_mode ", ", task_mode.last_status_string(), mode); print_mode(mode, RTEMS_ALL_MODES); printf("\n"); printf("%s - set asr state to RTEMS_NO_ASR - ", self.name_string()); task_mode.set_asr_state(RTEMS_NO_ASR); task_mode.get_mode(mode); - printf("%s,\n\t mode is 0x%08X, ", task_mode.last_status_string(), mode); + printf("%s,\n\t mode is 0x%08" PRIXrtems_mode ", ", task_mode.last_status_string(), mode); print_mode(mode, RTEMS_ALL_MODES); printf("\n"); @@ -420,7 +430,7 @@ void Task1::screen3(void) RTEMS_PREEMPT_MASK | RTEMS_TIMESLICE_MASK | RTEMS_ASR_MASK | RTEMS_INTERRUPT_MASK); task_mode.get_mode(mode); - printf("%s,\n\t mode is 0x%08X, ", task_mode.last_status_string(), mode); + printf("%s,\n\t mode is 0x%08" PRIXrtems_mode ", ", task_mode.last_status_string(), mode); print_mode(mode, RTEMS_ALL_MODES); printf("\n"); @@ -577,7 +587,7 @@ void Task1::screen6(void) printf("%s - broadcast send b1 ...\n", name_string()); mq_2.broadcast(b1, strlen(b1) + 1, count); - printf("%s - mq_2 broadcast send - %s, count=%i\n", + printf("%s - mq_2 broadcast send - %s, count=%" PRIi32 "\n", name_string(), mq_2.last_status_string(), count); wake_after(1000000); @@ -644,7 +654,7 @@ void Task1::screen6(void) printf("%s - flush mq_2 - ", name_string()); mq_2.flush(count); - printf("%s, flushed=%i\n", mq_2.last_status_string(), count); + printf("%s, flushed=%" PRIi32 "\n", mq_2.last_status_string(), count); printf(" * END MessageQueue Class test *\n"); } diff --git a/testsuites/libtests/rtems++/Task2.cc b/testsuites/libtests/rtems++/Task2.cc index 3173905652..56a7348c7f 100644 --- a/testsuites/libtests/rtems++/Task2.cc +++ b/testsuites/libtests/rtems++/Task2.cc @@ -53,20 +53,20 @@ void Task2::screen4() // send using task id printf("%s - event wait forever for signal 0 from TA1 ....\n", name_string()); event.receive(RTEMS_SIGNAL_0, out); - printf("%s - %s, signals out are 0x%08X\n", name_string(), event.last_status_string(), out); + printf("%s - %s, signals out are 0x%08" PRIX32 "\n", name_string(), event.last_status_string(), out); // send using task object reference printf("%s - event wait forever for signal 0 from TA1 ....\n", name_string()); event.receive(RTEMS_SIGNAL_0, out); - printf("%s - %s, signals out are 0x%08X\n", name_string(), event.last_status_string(), out); + printf("%s - %s, signals out are 0x%08" PRIX32 "\n", name_string(), event.last_status_string(), out); printf("%s - event wait forever for signal 31 from TA1 ....\n", name_string()); event.receive(RTEMS_SIGNAL_31, out); - printf("%s - %s, signals out are 0x%08X\n", name_string(), event.last_status_string(), out); + printf("%s - %s, signals out are 0x%08" PRIX32 "\n", name_string(), event.last_status_string(), out); printf("%s - event wait forever for signal 0 and 31 from TA1 ....\n", name_string()); event.receive(RTEMS_SIGNAL_0 | RTEMS_SIGNAL_31, out, 0, rtemsEvent::wait, rtemsEvent::all); - printf("%s - %s, signals out are 0x%08X\n", name_string(), event.last_status_string(), out); + printf("%s - %s, signals out are 0x%08" PRIX32 "\n", name_string(), event.last_status_string(), out); printf("%s - send event signal 1 - ", name_string()); event.send(RTEMS_SIGNAL_1); @@ -74,7 +74,7 @@ void Task2::screen4() printf("%s - event wait forever for signal 1 from TA2 - ", name_string()); event.receive(RTEMS_SIGNAL_1, out, 0, rtemsEvent::wait, rtemsEvent::all); - printf("%s, signals out are 0x%08X\n", event.last_status_string(), out); + printf("%s, signals out are 0x%08" PRIX32 "\n", event.last_status_string(), out); } -- cgit v1.2.3