From 9919946a826082275166ebfe37eee168672f7eca Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 30 Mar 2004 11:12:47 +0000 Subject: 2004-03-30 Ralf Corsepius * cpuuse/system.h, cpuuse/task1.c, cpuuse/tswitch.c, monitor/init.c, monitor/system.h, rtems++/System.h, rtems++/Task1.cc, rtems++/Task2.cc, rtems++/Task3.cc, rtmonuse/init.c, rtmonuse/system.h, rtmonuse/task1.c, stackchk/blow.c: Convert to using c99 fixed size types. --- testsuites/libtests/ChangeLog | 8 ++++++++ testsuites/libtests/cpuuse/system.h | 2 +- testsuites/libtests/cpuuse/task1.c | 8 ++++---- testsuites/libtests/cpuuse/tswitch.c | 2 +- testsuites/libtests/monitor/init.c | 4 ++-- testsuites/libtests/monitor/system.h | 2 +- testsuites/libtests/rtems++/System.h | 6 +++--- testsuites/libtests/rtems++/Task1.cc | 10 +++++----- testsuites/libtests/rtems++/Task2.cc | 2 +- testsuites/libtests/rtems++/Task3.cc | 4 ++-- testsuites/libtests/rtmonuse/init.c | 2 +- testsuites/libtests/rtmonuse/system.h | 2 +- testsuites/libtests/rtmonuse/task1.c | 12 ++++++------ testsuites/libtests/stackchk/blow.c | 6 +++--- 14 files changed, 39 insertions(+), 31 deletions(-) diff --git a/testsuites/libtests/ChangeLog b/testsuites/libtests/ChangeLog index 624047d19b..d05338cf0a 100644 --- a/testsuites/libtests/ChangeLog +++ b/testsuites/libtests/ChangeLog @@ -1,3 +1,11 @@ +2004-03-30 Ralf Corsepius + + * cpuuse/system.h, cpuuse/task1.c, cpuuse/tswitch.c, monitor/init.c, + monitor/system.h, rtems++/System.h, rtems++/Task1.cc, + rtems++/Task2.cc, rtems++/Task3.cc, rtmonuse/init.c, + rtmonuse/system.h, rtmonuse/task1.c, stackchk/blow.c: Convert to + using c99 fixed size types. + 2004-03-25 Ralf Corsepius * configure.ac: Add 2nd arg to RTEMS_TOP. diff --git a/testsuites/libtests/cpuuse/system.h b/testsuites/libtests/cpuuse/system.h index f1bb23150c..88155443f2 100644 --- a/testsuites/libtests/cpuuse/system.h +++ b/testsuites/libtests/cpuuse/system.h @@ -62,7 +62,7 @@ TEST_EXTERN rtems_id Extension_id[ 4 ]; TEST_EXTERN rtems_name Extension_name[ 4 ]; /* array of task names */ /* array of task run counts */ -TEST_EXTERN volatile rtems_unsigned32 Run_count[ 4 ]; +TEST_EXTERN volatile uint32_t Run_count[ 4 ]; /* * Keep track of task switches diff --git a/testsuites/libtests/cpuuse/task1.c b/testsuites/libtests/cpuuse/task1.c index 525a9db06c..8f41210c28 100644 --- a/testsuites/libtests/cpuuse/task1.c +++ b/testsuites/libtests/cpuuse/task1.c @@ -24,13 +24,13 @@ rtems_task Task_1( rtems_task_argument argument ) { - rtems_unsigned32 seconds; - rtems_unsigned32 old_seconds; + uint32_t seconds; + uint32_t old_seconds; rtems_mode previous_mode; rtems_time_of_day time; rtems_status_code status; - rtems_unsigned32 start_time; - rtems_unsigned32 end_time; + uint32_t start_time; + uint32_t end_time; puts( "TA1 - rtems_task_suspend - on Task 2" ); status = rtems_task_suspend( Task_id[ 2 ] ); diff --git a/testsuites/libtests/cpuuse/tswitch.c b/testsuites/libtests/cpuuse/tswitch.c index 1339194684..3f1e999c7f 100644 --- a/testsuites/libtests/cpuuse/tswitch.c +++ b/testsuites/libtests/cpuuse/tswitch.c @@ -31,7 +31,7 @@ rtems_extension Task_switch( rtems_tcb *heir ) { - rtems_unsigned32 index; + uint32_t index; rtems_time_of_day time; rtems_status_code status; diff --git a/testsuites/libtests/monitor/init.c b/testsuites/libtests/monitor/init.c index 8b7cbde7fe..88920e6c0d 100644 --- a/testsuites/libtests/monitor/init.c +++ b/testsuites/libtests/monitor/init.c @@ -21,7 +21,7 @@ rtems_task_priority Priorities[6] = { 0, 1, 1, 3, 4, 5 }; rtems_task Task_1_through_5( - rtems_unsigned32 argument + uint32_t argument ) { rtems_status_code status; @@ -38,7 +38,7 @@ rtems_task Init( rtems_task_argument argument ) { - rtems_unsigned32 index; + uint32_t index; rtems_status_code status; puts( "\n\n*** MONITOR TASK TEST ***" ); diff --git a/testsuites/libtests/monitor/system.h b/testsuites/libtests/monitor/system.h index 0be01a2070..d5175606e7 100644 --- a/testsuites/libtests/monitor/system.h +++ b/testsuites/libtests/monitor/system.h @@ -18,7 +18,7 @@ /* types */ struct counters { - rtems_unsigned32 count[6]; + uint32_t count[6]; }; /* functions */ diff --git a/testsuites/libtests/rtems++/System.h b/testsuites/libtests/rtems++/System.h index 0f3cbaa2e9..53ad2d24b0 100644 --- a/testsuites/libtests/rtems++/System.h +++ b/testsuites/libtests/rtems++/System.h @@ -62,7 +62,7 @@ protected: public: Task2(const char* name, const rtems_task_priority initial_priority, - const rtems_unsigned32 stack_size); + const uint32_t stack_size); }; class Task3 @@ -76,7 +76,7 @@ protected: public: Task3(const char* name, const rtems_task_priority initial_priority, - const rtems_unsigned32 stack_size); + const uint32_t stack_size); }; class EndTask @@ -88,7 +88,7 @@ protected: public: EndTask(const char* name, const rtems_task_priority initial_priority, - const rtems_unsigned32 stack_size); + const uint32_t stack_size); }; #if 0 diff --git a/testsuites/libtests/rtems++/Task1.cc b/testsuites/libtests/rtems++/Task1.cc index 394d9fe103..35c8ec34ea 100644 --- a/testsuites/libtests/rtems++/Task1.cc +++ b/testsuites/libtests/rtems++/Task1.cc @@ -240,8 +240,8 @@ void Task1::screen2(void) task_2.set_priority(current_priority, priority); printf("%s, priority was %i\n", task_2.last_status_string(), priority); - rtems_unsigned32 current_note; - rtems_unsigned32 note; + uint32_t current_note; + uint32_t note; // notepad registers for this object @@ -502,7 +502,7 @@ void Task1::screen6(void) char *u1 = "normal send"; char *u2 = "urgent send"; char in[100]; - rtems_unsigned32 size; + uint32_t size; printf("%s - send u1 to mq_2 - ", name_string()); mq_2.send(u1, strlen(u1) + 1); @@ -573,7 +573,7 @@ void Task1::screen6(void) wake_after(3000000); char *b1 = "broadcast message"; - rtems_unsigned32 count; + uint32_t count; printf("%s - broadcast send b1 ...\n", name_string()); mq_2.broadcast(b1, strlen(b1) + 1, count); @@ -668,7 +668,7 @@ void Task1::print_mode(rtems_mode mode, rtems_mode mask) EndTask::EndTask(const char* name, const rtems_task_priority initial_priority, - const rtems_unsigned32 stack_size) + const uint32_t stack_size) : rtemsTask(name, initial_priority, stack_size, RTEMS_NO_PREEMPT) { } diff --git a/testsuites/libtests/rtems++/Task2.cc b/testsuites/libtests/rtems++/Task2.cc index e5477a2c9c..3173905652 100644 --- a/testsuites/libtests/rtems++/Task2.cc +++ b/testsuites/libtests/rtems++/Task2.cc @@ -22,7 +22,7 @@ Task2::Task2(const char* name, const rtems_task_priority initial_priority, - const rtems_unsigned32 stack_size) + const uint32_t stack_size) : rtemsTask(name, initial_priority, stack_size, RTEMS_NO_PREEMPT) { } diff --git a/testsuites/libtests/rtems++/Task3.cc b/testsuites/libtests/rtems++/Task3.cc index 658b7fee66..9c94c59640 100644 --- a/testsuites/libtests/rtems++/Task3.cc +++ b/testsuites/libtests/rtems++/Task3.cc @@ -22,7 +22,7 @@ Task3::Task3(const char* name, const rtems_task_priority initial_priority, - const rtems_unsigned32 stack_size) + const uint32_t stack_size) : rtemsTask(name, initial_priority, stack_size, RTEMS_NO_PREEMPT) { } @@ -44,7 +44,7 @@ void Task3::screen6() { char in[100]; char out[100]; - rtems_unsigned32 size; + uint32_t size; bool loopback = true; while (loopback) diff --git a/testsuites/libtests/rtmonuse/init.c b/testsuites/libtests/rtmonuse/init.c index be2281f1c9..a634e3f897 100644 --- a/testsuites/libtests/rtmonuse/init.c +++ b/testsuites/libtests/rtmonuse/init.c @@ -30,7 +30,7 @@ rtems_task Init( rtems_task_argument argument ) { - rtems_unsigned32 index; + uint32_t index; rtems_status_code status; puts( "\n\n*** RATE MONOTONIC PERIOD STATISTICS TEST ***" ); diff --git a/testsuites/libtests/rtmonuse/system.h b/testsuites/libtests/rtmonuse/system.h index 9f01d2e2a0..214afec493 100644 --- a/testsuites/libtests/rtmonuse/system.h +++ b/testsuites/libtests/rtmonuse/system.h @@ -18,7 +18,7 @@ /* types */ struct counters { - rtems_unsigned32 count[6]; + uint32_t count[6]; }; /* functions */ diff --git a/testsuites/libtests/rtmonuse/task1.c b/testsuites/libtests/rtmonuse/task1.c index aae5cce94b..dcaf0376e6 100644 --- a/testsuites/libtests/rtmonuse/task1.c +++ b/testsuites/libtests/rtmonuse/task1.c @@ -23,19 +23,19 @@ #include #include -rtems_unsigned32 Periods[6] = { 0, 2, 2, 2, 2, 100 }; -rtems_unsigned32 Iterations[6] = { 0, 50, 50, 50, 50, 1 }; +uint32_t Periods[6] = { 0, 2, 2, 2, 2, 100 }; +uint32_t Iterations[6] = { 0, 50, 50, 50, 50, 1 }; rtems_task_priority Priorities[6] = { 0, 1, 1, 3, 4, 5 }; rtems_task Task_1_through_5( - rtems_unsigned32 argument + uint32_t argument ) { rtems_id rmid; rtems_id test_rmid; - rtems_unsigned32 index; - rtems_unsigned32 pass; - rtems_unsigned32 failed; + uint32_t index; + uint32_t pass; + uint32_t failed; rtems_status_code status; status = rtems_rate_monotonic_create( argument, &rmid ); diff --git a/testsuites/libtests/stackchk/blow.c b/testsuites/libtests/stackchk/blow.c index 5049266ea2..ca9b4052cd 100644 --- a/testsuites/libtests/stackchk/blow.c +++ b/testsuites/libtests/stackchk/blow.c @@ -19,7 +19,7 @@ void b() {} void blow_stack( void ) { - volatile unsigned32 *low, *high; + volatile uint32_t *low, *high; unsigned char *area; b(); @@ -30,8 +30,8 @@ b(); area = (unsigned char *)_Thread_Executing->Start.Initial_stack.area; - low = (volatile unsigned32 *) (area + HEAP_OVERHEAD); - high = (volatile unsigned32 *) + low = (volatile uint32_t *) (area + HEAP_OVERHEAD); + high = (volatile uint32_t *) (area + _Thread_Executing->Start.Initial_stack.size - 16); -- cgit v1.2.3