2004-03-28 Ralf Corsepius <ralf_corsepius@rtems.org>

* include/timesys.h, tm01/task1.c, tm02/task1.c, tm03/task1.c,
	tm04/task1.c, tm05/task1.c, tm06/task1.c, tm07/task1.c,
	tm08/task1.c, tm09/task1.c, tm10/task1.c, tm11/task1.c,
	tm12/task1.c, tm13/task1.c, tm14/task1.c, tm15/task1.c,
	tm16/task1.c, tm17/task1.c, tm18/task1.c, tm20/task1.c,
	tm21/task1.c, tm22/task1.c, tm23/task1.c, tm24/task1.c,
	tm25/task1.c, tm26/task1.c, tm27/task1.c, tm28/task1.c,
	tm29/task1.c, tmck/task1.c, tmoverhd/testtask.c: Convert to using
	c99 fixed size types.
This commit is contained in:
Ralf Corsepius
2004-03-28 07:20:11 +00:00
parent 02c7c81471
commit 0720ff433e
32 changed files with 135 additions and 123 deletions

View File

@@ -1,3 +1,15 @@
2004-03-28 Ralf Corsepius <ralf_corsepius@rtems.org>
* include/timesys.h, tm01/task1.c, tm02/task1.c, tm03/task1.c,
tm04/task1.c, tm05/task1.c, tm06/task1.c, tm07/task1.c,
tm08/task1.c, tm09/task1.c, tm10/task1.c, tm11/task1.c,
tm12/task1.c, tm13/task1.c, tm14/task1.c, tm15/task1.c,
tm16/task1.c, tm17/task1.c, tm18/task1.c, tm20/task1.c,
tm21/task1.c, tm22/task1.c, tm23/task1.c, tm24/task1.c,
tm25/task1.c, tm26/task1.c, tm27/task1.c, tm28/task1.c,
tm29/task1.c, tmck/task1.c, tmoverhd/testtask.c: Convert to using
c99 fixed size types.
2004-03-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Add 2nd arg to RTEMS_TOP.

View File

@@ -57,8 +57,8 @@
/* variables */
TEST_EXTERN volatile rtems_unsigned32 end_time; /* ending time variable */
TEST_EXTERN volatile rtems_unsigned32 overhead; /* loop overhead variable */
TEST_EXTERN volatile uint32_t end_time; /* ending time variable */
TEST_EXTERN volatile uint32_t overhead; /* loop overhead variable */
TEST_EXTERN rtems_id Task_id[ OPERATION_COUNT+1 ]; /* array of task ids */
TEST_EXTERN rtems_id Task_name[ OPERATION_COUNT+1 ]; /* array of task names */

View File

@@ -53,13 +53,13 @@ rtems_task Test_task(
rtems_task_argument argument
)
{
rtems_unsigned32 semaphore_obtain_time;
rtems_unsigned32 semaphore_release_time;
rtems_unsigned32 semaphore_obtain_no_wait_time;
rtems_unsigned32 semaphore_obtain_loop_time;
rtems_unsigned32 semaphore_release_loop_time;
rtems_unsigned32 index;
rtems_unsigned32 iterations;
uint32_t semaphore_obtain_time;
uint32_t semaphore_release_time;
uint32_t semaphore_obtain_no_wait_time;
uint32_t semaphore_obtain_loop_time;
uint32_t semaphore_release_loop_time;
uint32_t index;
uint32_t iterations;
rtems_name name;
rtems_id smid;
rtems_status_code status;

View File

@@ -51,7 +51,7 @@ rtems_task Init(
void test_init()
{
rtems_status_code status;
rtems_unsigned32 index;
uint32_t index;
rtems_task_priority priority;
priority = 5;

View File

@@ -59,7 +59,7 @@ rtems_task test_init(
)
{
rtems_status_code status;
rtems_unsigned32 index;
uint32_t index;
rtems_id task_id;
rtems_task_priority priority;

View File

@@ -15,7 +15,7 @@
rtems_id Semaphore_id;
rtems_id Task_id[OPERATION_COUNT+1];
rtems_unsigned32 task_count;
uint32_t task_count;
rtems_id Highest_id;
rtems_task Low_tasks(
@@ -51,7 +51,7 @@ rtems_task Init(
void test_init()
{
rtems_status_code status;
rtems_unsigned32 index;
uint32_t index;
task_count = OPERATION_COUNT;
@@ -136,7 +136,7 @@ rtems_task High_task(
)
{
rtems_status_code status;
rtems_unsigned32 index;
uint32_t index;
rtems_name name;
rtems_task_priority old_priority;

View File

@@ -14,7 +14,7 @@
#include "system.h"
rtems_id Task_id[OPERATION_COUNT+1];
rtems_unsigned32 Task_index;
uint32_t Task_index;
rtems_task High_task(
rtems_task_argument argument
@@ -51,7 +51,7 @@ void test_init()
rtems_status_code status;
rtems_task_entry task_entry;
rtems_task_priority priority;
rtems_unsigned32 index;
uint32_t index;
priority = 250;

View File

@@ -15,7 +15,7 @@
rtems_id Task_id[ OPERATION_COUNT + 1 ];
rtems_unsigned32 Task_restarted;
uint32_t Task_restarted;
rtems_task null_task(
rtems_task_argument argument
@@ -69,7 +69,7 @@ rtems_task Task_1(
)
{
rtems_status_code status;
rtems_unsigned32 index;
uint32_t index;
if ( Task_restarted == OPERATION_COUNT )
Timer_initialize();

View File

@@ -50,7 +50,7 @@ void test_init()
rtems_status_code status;
rtems_task_priority priority;
rtems_task_entry task_entry;
rtems_unsigned32 index;
uint32_t index;
priority = 250;

View File

@@ -75,11 +75,11 @@ rtems_task test_task(
)
{
rtems_status_code status;
rtems_unsigned32 index;
uint32_t index;
rtems_task_priority old_priority;
rtems_time_of_day time;
rtems_unsigned32 old_note;
rtems_unsigned32 old_mode;
uint32_t old_note;
uint32_t old_mode;
Timer_initialize();
for ( index=1 ; index <= OPERATION_COUNT ; index++ )

View File

@@ -91,21 +91,21 @@ rtems_task Test_task (
void queue_test()
{
rtems_unsigned32 send_loop_time;
rtems_unsigned32 urgent_loop_time;
rtems_unsigned32 receive_loop_time;
rtems_unsigned32 send_time;
rtems_unsigned32 urgent_time;
rtems_unsigned32 receive_time;
rtems_unsigned32 empty_flush_time;
rtems_unsigned32 flush_time;
rtems_unsigned32 empty_flush_count;
rtems_unsigned32 flush_count;
rtems_unsigned32 index;
rtems_unsigned32 iterations;
uint32_t send_loop_time;
uint32_t urgent_loop_time;
uint32_t receive_loop_time;
uint32_t send_time;
uint32_t urgent_time;
uint32_t receive_time;
uint32_t empty_flush_time;
uint32_t flush_time;
uint32_t empty_flush_count;
uint32_t flush_count;
uint32_t index;
uint32_t iterations;
long buffer[4];
rtems_status_code status;
rtems_unsigned32 size;
uint32_t size;
send_loop_time = 0;
urgent_loop_time = 0;

View File

@@ -48,8 +48,8 @@ rtems_task Init(
void test_init()
{
rtems_unsigned32 index;
rtems_unsigned32 size;
uint32_t index;
uint32_t size;
rtems_task_entry task_entry;
rtems_status_code status;
rtems_task_priority priority;
@@ -117,7 +117,7 @@ rtems_task High_task(
rtems_task_argument argument
)
{
rtems_unsigned32 size;
uint32_t size;
Timer_initialize();
(void) rtems_message_queue_receive(
@@ -133,7 +133,7 @@ rtems_task Middle_tasks(
rtems_task_argument argument
)
{
rtems_unsigned32 size;
uint32_t size;
(void) rtems_message_queue_receive(
Queue_id,

View File

@@ -64,7 +64,7 @@ rtems_task test_init(
rtems_task_argument argument
)
{
rtems_unsigned32 index;
uint32_t index;
rtems_task_entry task_entry;
rtems_task_priority priority;
rtems_id task_id;
@@ -114,7 +114,7 @@ rtems_task Middle_tasks(
rtems_task_argument argument
)
{
rtems_unsigned32 size;
uint32_t size;
(void) rtems_message_queue_receive(
Queue_id,
@@ -131,7 +131,7 @@ rtems_task High_task(
rtems_task_argument argument
)
{
rtems_unsigned32 size;
uint32_t size;
(void) rtems_message_queue_receive(
Queue_id,

View File

@@ -63,7 +63,7 @@ rtems_task test_init(
rtems_task_argument argument
)
{
rtems_unsigned32 index;
uint32_t index;
rtems_task_entry task_entry;
rtems_task_priority priority;
rtems_id task_id;
@@ -106,7 +106,7 @@ rtems_task High_task(
rtems_task_argument argument
)
{
rtems_unsigned32 index;
uint32_t index;
Timer_initialize();
for ( index=1 ; index <= OPERATION_COUNT ; index++ )
@@ -134,7 +134,7 @@ rtems_task Low_tasks(
rtems_task_argument argument
)
{
rtems_unsigned32 size;
uint32_t size;
(void) rtems_message_queue_receive(
Queue_id,

View File

@@ -63,7 +63,7 @@ rtems_task test_init(
rtems_task_argument argument
)
{
rtems_unsigned32 index;
uint32_t index;
rtems_task_entry task_entry;
rtems_task_priority priority;
rtems_id task_id;
@@ -113,7 +113,7 @@ rtems_task Middle_tasks(
rtems_task_argument argument
)
{
rtems_unsigned32 size;
uint32_t size;
(void) rtems_message_queue_receive(
Queue_id,
@@ -130,7 +130,7 @@ rtems_task High_task(
rtems_task_argument argument
)
{
rtems_unsigned32 size;
uint32_t size;
(void) rtems_message_queue_receive(
Queue_id,

View File

@@ -63,7 +63,7 @@ rtems_task test_init(
rtems_task_argument argument
)
{
rtems_unsigned32 index;
uint32_t index;
rtems_task_entry task_entry;
rtems_task_priority priority;
rtems_id task_id;
@@ -106,7 +106,7 @@ rtems_task High_task(
rtems_task_argument argument
)
{
rtems_unsigned32 index;
uint32_t index;
Timer_initialize();
for ( index=1 ; index <= OPERATION_COUNT ; index++ )
@@ -134,7 +134,7 @@ rtems_task Low_tasks(
rtems_task_argument argument
)
{
rtems_unsigned32 size;
uint32_t size;
(void) rtems_message_queue_receive(
Queue_id,

View File

@@ -13,7 +13,7 @@
#define TEST_INIT
#include "system.h"
rtems_unsigned32 time_set, eventout;
uint32_t time_set, eventout;
rtems_task High_tasks(
rtems_task_argument argument
@@ -44,7 +44,7 @@ rtems_task Init(
void test_init()
{
rtems_id id;
rtems_unsigned32 index;
uint32_t index;
rtems_event_set event_out;
rtems_status_code status;
@@ -130,7 +130,7 @@ rtems_task Low_task(
rtems_task_argument argument
)
{
rtems_unsigned32 index;
uint32_t index;
rtems_event_set event_out;
end_time = Read_timer();

View File

@@ -13,7 +13,7 @@
#define TEST_INIT
#include "system.h"
rtems_unsigned32 Task_count;
uint32_t Task_count;
rtems_task test_init(
rtems_task_argument argument
@@ -61,7 +61,7 @@ rtems_task test_init(
{
rtems_task_priority priority;
rtems_status_code status;
rtems_unsigned32 index;
uint32_t index;
rtems_task_entry task_entry;
/* As each task is started, it preempts this task and

View File

@@ -13,7 +13,7 @@
#define TEST_INIT
#include "system.h"
rtems_unsigned32 Task_count;
uint32_t Task_count;
rtems_task_priority Task_priority;
rtems_task First_task(
@@ -33,7 +33,7 @@ rtems_task Init(
)
{
rtems_task_entry task_entry;
rtems_unsigned32 index;
uint32_t index;
rtems_status_code status;
Print_Warning();
@@ -104,7 +104,7 @@ rtems_task Last_task(
rtems_task_argument argument
)
{
rtems_unsigned32 index;
uint32_t index;
end_time = Read_timer();

View File

@@ -13,7 +13,7 @@
#define TEST_INIT
#include "system.h"
rtems_unsigned32 taskcount;
uint32_t taskcount;
rtems_task_priority taskpri;
rtems_task First_task(
@@ -51,7 +51,7 @@ void test_init()
{
rtems_id id;
rtems_task_entry task_entry;
rtems_unsigned32 index;
uint32_t index;
rtems_status_code status;
for ( index = 0 ; index <= OPERATION_COUNT ; index++ ) {

View File

@@ -18,7 +18,7 @@ rtems_device_major_number _STUB_major = 1;
rtems_id Region_id;
rtems_name Region_name;
rtems_unsigned8 Region_area[ 2048 ] CPU_STRUCTURE_ALIGNMENT;
uint8_t Region_area[ 2048 ] CPU_STRUCTURE_ALIGNMENT;
#define PARTITION_SIZE 2048
#define PARTITION_ELEMENT_SIZE 128
@@ -27,14 +27,14 @@ rtems_unsigned8 Region_area[ 2048 ] CPU_STRUCTURE_ALIGNMENT;
rtems_id Partition_id;
rtems_name Partition_name;
rtems_unsigned8 Partition_area[ PARTITION_SIZE ] CPU_STRUCTURE_ALIGNMENT;
uint8_t Partition_area[ PARTITION_SIZE ] CPU_STRUCTURE_ALIGNMENT;
void *Buffer_address_1;
void *Buffer_address_2;
void *Buffer_address_3;
void *Buffer_address_4;
rtems_unsigned32 buffer_count;
uint32_t buffer_count;
void *Buffer_addresses[ PARTITION_BUFFER_POINTERS ];
@@ -90,7 +90,7 @@ rtems_task Task_1(
rtems_task_argument argument
)
{
rtems_unsigned32 index;
uint32_t index;
rtems_mode previous_mode;
rtems_task_priority previous_priority;
rtems_status_code status;

View File

@@ -13,8 +13,8 @@
#define TEST_INIT
#include "system.h"
rtems_unsigned8 Region_area[ 2048 ] CPU_STRUCTURE_ALIGNMENT;
rtems_unsigned8 Partition_area[ 2048 ] CPU_STRUCTURE_ALIGNMENT;
uint8_t Region_area[ 2048 ] CPU_STRUCTURE_ALIGNMENT;
uint8_t Partition_area[ 2048 ] CPU_STRUCTURE_ALIGNMENT;
rtems_task Task_1(
rtems_task_argument argument
@@ -54,7 +54,7 @@ rtems_task Task_1(
rtems_task_argument argument
)
{
rtems_unsigned32 index;
uint32_t index;
rtems_id id;
rtems_status_code status;

View File

@@ -85,7 +85,7 @@ rtems_task High_task(
rtems_task_argument argument
)
{
rtems_unsigned32 count;
uint32_t count;
rtems_status_code status;
Timer_initialize();
@@ -114,9 +114,9 @@ rtems_task Low_task(
)
{
rtems_id id;
rtems_unsigned32 index;
rtems_unsigned32 count;
rtems_unsigned32 size;
uint32_t index;
uint32_t count;
uint32_t size;
rtems_status_code status;
status = rtems_task_create(
@@ -187,7 +187,7 @@ rtems_task Preempt_task(
rtems_task_argument argument
)
{
rtems_unsigned32 count;
uint32_t count;
Timer_initialize();
(void) rtems_message_queue_broadcast(

View File

@@ -41,7 +41,7 @@ rtems_task Init(
{
rtems_task_priority priority;
rtems_unsigned32 index;
uint32_t index;
rtems_id id;
rtems_task_entry task_entry;
rtems_status_code status;
@@ -93,7 +93,7 @@ rtems_task High_task(
rtems_task_argument argument
)
{
rtems_unsigned32 index;
uint32_t index;
rtems_status_code status;
int i;

View File

@@ -13,7 +13,7 @@
#define TEST_INIT
#include "system.h"
rtems_unsigned32 Task_count;
uint32_t Task_count;
rtems_task Tasks(
rtems_task_argument argument
@@ -28,7 +28,7 @@ rtems_task Init(
)
{
rtems_id id;
rtems_unsigned32 index;
uint32_t index;
rtems_status_code status;
Print_Warning();
@@ -71,7 +71,7 @@ rtems_task High_task(
)
{
rtems_status_code status;
rtems_unsigned32 index;
uint32_t index;
Timer_initialize();
for ( index=1 ; index <= OPERATION_COUNT ; index++ )

View File

@@ -28,7 +28,7 @@ rtems_task Init(
)
{
rtems_id task_id;
rtems_unsigned32 index;
uint32_t index;
rtems_status_code status;
Print_Warning();

View File

@@ -34,26 +34,26 @@ Thread_Control *Low_tcb; /* uses internal RTEMS type */
* at the end of the test.
*/
rtems_unsigned32 isr_disable_time;
rtems_unsigned32 isr_flash_time;
rtems_unsigned32 isr_enable_time;
rtems_unsigned32 thread_disable_dispatch_time;
rtems_unsigned32 thread_enable_dispatch_time;
rtems_unsigned32 thread_set_state_time;
rtems_unsigned32 thread_dispatch_no_fp_time;
rtems_unsigned32 context_switch_no_fp_time;
rtems_unsigned32 context_switch_self_time;
rtems_unsigned32 context_switch_another_task_time;
rtems_unsigned32 context_switch_restore_1st_fp_time;
rtems_unsigned32 context_switch_save_idle_restore_initted_time;
rtems_unsigned32 context_switch_save_restore_idle_time;
rtems_unsigned32 context_switch_save_restore_initted_time;
rtems_unsigned32 thread_resume_time;
rtems_unsigned32 thread_unblock_time;
rtems_unsigned32 thread_ready_time;
rtems_unsigned32 thread_get_time;
rtems_unsigned32 semaphore_get_time;
rtems_unsigned32 thread_get_invalid_time;
uint32_t isr_disable_time;
uint32_t isr_flash_time;
uint32_t isr_enable_time;
uint32_t thread_disable_dispatch_time;
uint32_t thread_enable_dispatch_time;
uint32_t thread_set_state_time;
uint32_t thread_dispatch_no_fp_time;
uint32_t context_switch_no_fp_time;
uint32_t context_switch_self_time;
uint32_t context_switch_another_task_time;
uint32_t context_switch_restore_1st_fp_time;
uint32_t context_switch_save_idle_restore_initted_time;
uint32_t context_switch_save_restore_idle_time;
uint32_t context_switch_save_restore_initted_time;
uint32_t thread_resume_time;
uint32_t thread_unblock_time;
uint32_t thread_ready_time;
uint32_t thread_get_time;
uint32_t semaphore_get_time;
uint32_t thread_get_invalid_time;
rtems_task High_task(
rtems_task_argument argument
@@ -87,7 +87,7 @@ rtems_task Init(
rtems_task_argument argument
)
{
rtems_unsigned32 index;
uint32_t index;
rtems_id task_id;
rtems_status_code status;
@@ -376,7 +376,7 @@ rtems_task Floating_point_task_2(
void complete_test( void )
{
rtems_unsigned32 index;
uint32_t index;
rtems_id task_id;
Timer_initialize();

View File

@@ -30,11 +30,11 @@ rtems_task Task_2(
rtems_task_argument argument
);
volatile rtems_unsigned32 Interrupt_occurred;
volatile rtems_unsigned32 Interrupt_enter_time, Interrupt_enter_nested_time;
volatile rtems_unsigned32 Interrupt_return_time, Interrupt_return_nested_time;
rtems_unsigned32 Interrupt_nest;
rtems_unsigned32 timer_overhead;
volatile uint32_t Interrupt_occurred;
volatile uint32_t Interrupt_enter_time, Interrupt_enter_nested_time;
volatile uint32_t Interrupt_return_time, Interrupt_return_nested_time;
uint32_t Interrupt_nest;
uint32_t timer_overhead;
rtems_isr Isr_handler(
rtems_vector_number vector

View File

@@ -15,8 +15,8 @@
rtems_id Port_id;
rtems_unsigned8 Internal_area[ 256 ] CPU_STRUCTURE_ALIGNMENT;
rtems_unsigned8 External_area[ 256 ] CPU_STRUCTURE_ALIGNMENT;
uint8_t Internal_area[ 256 ] CPU_STRUCTURE_ALIGNMENT;
uint8_t External_area[ 256 ] CPU_STRUCTURE_ALIGNMENT;
rtems_task Test_task(
rtems_task_argument argument
@@ -54,7 +54,7 @@ rtems_task Test_task (
)
{
rtems_name name;
rtems_unsigned32 index;
uint32_t index;
void *converted;
Timer_initialize();

View File

@@ -23,14 +23,14 @@ rtems_task Low_task(
rtems_task_argument argument
);
rtems_unsigned32 Task_count;
uint32_t Task_count;
rtems_task Init(
rtems_task_argument argument
)
{
rtems_id id;
rtems_unsigned32 index;
uint32_t index;
rtems_status_code status;
Print_Warning();
@@ -184,7 +184,7 @@ rtems_task Low_task(
rtems_task_argument argument
)
{
rtems_unsigned32 index;
uint32_t index;
end_time = Read_timer();

View File

@@ -67,7 +67,7 @@ rtems_task Task_1(
rtems_task_argument argument
)
{
rtems_unsigned32 index;
uint32_t index;
check_read_timer();
rtems_test_pause();
@@ -141,8 +141,8 @@ rtems_test_pause();
void check_read_timer()
{
rtems_unsigned32 index;
rtems_unsigned32 time;
uint32_t index;
uint32_t time;
for ( index = 1 ; index <= MAXIMUM_DISTRIBUTION ; index++ )
Distribution[ index ] = 0;

View File

@@ -13,9 +13,9 @@
#define TEST_INIT
#include "system.h"
rtems_unsigned8 Memory_area[ 2048 ];
rtems_unsigned8 Internal_port_area[ 256 ];
rtems_unsigned8 External_port_area[ 256 ];
uint8_t Memory_area[ 2048 ];
uint8_t Internal_port_area[ 256 ];
uint8_t External_port_area[ 256 ];
rtems_task Task_1(
rtems_task_argument argument
@@ -58,7 +58,7 @@ rtems_task Task_1(
)
{
rtems_name name;
rtems_unsigned32 index;
uint32_t index;
rtems_cpu_table cpu_table;
rtems_id id;
rtems_task_priority in_priority;
@@ -66,18 +66,18 @@ rtems_task Task_1(
rtems_mode in_mode;
rtems_mode mask;
rtems_mode out_mode;
rtems_unsigned32 note;
uint32_t note;
rtems_time_of_day time;
rtems_interval timeout;
rtems_signal_set signals;
void *address_1;
rtems_event_set events;
long buffer[ 4 ];
rtems_unsigned32 count;
uint32_t count;
rtems_device_major_number major;
rtems_device_minor_number minor;
rtems_unsigned32 io_result;
rtems_unsigned32 error;
uint32_t io_result;
uint32_t error;
rtems_clock_get_options options;
name = rtems_build_name( 'N', 'A', 'M', 'E' );