diff options
Diffstat (limited to 'cpukit/libmisc/capture')
-rw-r--r-- | cpukit/libmisc/capture/capture-cli.c | 14 | ||||
-rw-r--r-- | cpukit/libmisc/capture/capture.c | 46 | ||||
-rw-r--r-- | cpukit/libmisc/capture/capture.h | 76 |
3 files changed, 68 insertions, 68 deletions
diff --git a/cpukit/libmisc/capture/capture-cli.c b/cpukit/libmisc/capture/capture-cli.c index 75195f6293..d587c2a3da 100644 --- a/cpukit/libmisc/capture/capture-cli.c +++ b/cpukit/libmisc/capture/capture-cli.c @@ -68,7 +68,7 @@ rtems_capture_cli_open ( rtems_monitor_command_arg_t *command_arg, boolean verbose ) { - rtems_unsigned32 size = 0; + uint32_t size = 0; rtems_boolean enable = 0; rtems_status_code sc; int arg; @@ -230,8 +230,8 @@ rtems_capture_cli_task_list ( rtems_task_priority ceiling = rtems_capture_watch_get_ceiling (); rtems_task_priority floor = rtems_capture_watch_get_floor (); rtems_capture_task_t* task = rtems_capture_get_task_list (); - rtems_unsigned32 ticks; - rtems_unsigned32 tick_offset; + uint32_t ticks; + uint32_t tick_offset; unsigned long long total_time; int count = rtems_capture_task_count (); @@ -606,7 +606,7 @@ rtems_capture_cli_get_name_id (char* arg, rtems_name* name, rtems_id* id) { - unsigned32 objclass; + uint32_t objclass; int l; int i; @@ -1166,7 +1166,7 @@ rtems_capture_cli_trace_records ( static int dump_total = 32; int total; int count; - rtems_unsigned32 read; + uint32_t read; rtems_capture_record_t* rec; int arg; @@ -1224,7 +1224,7 @@ rtems_capture_cli_trace_records ( { if (csv) printf ("%08x,%03d,%03d,%04x,%d,%d\n", - (rtems_unsigned32) rec->task, + (uint32_t ) rec->task, (rec->events >> RTEMS_CAPTURE_REAL_PRIORITY_EVENT) & 0xff, (rec->events >> RTEMS_CAPTURE_CURR_PRIORITY_EVENT) & 0xff, (rec->events >> RTEMS_CAPTURE_EVENT_START), @@ -1232,7 +1232,7 @@ rtems_capture_cli_trace_records ( else { unsigned long long t; - rtems_unsigned32 event; + uint32_t event; int e; event = rec->events >> RTEMS_CAPTURE_EVENT_START; diff --git a/cpukit/libmisc/capture/capture.c b/cpukit/libmisc/capture/capture.c index be52acecea..41937f62de 100644 --- a/cpukit/libmisc/capture/capture.c +++ b/cpukit/libmisc/capture/capture.c @@ -65,11 +65,11 @@ * RTEMS Capture Data. */ static rtems_capture_record_t* capture_records; -static rtems_unsigned32 capture_size; -static rtems_unsigned32 capture_count; +static uint32_t capture_size; +static uint32_t capture_count; static rtems_capture_record_t* capture_in; -static rtems_unsigned32 capture_out; -static rtems_unsigned32 capture_flags; +static uint32_t capture_out; +static uint32_t capture_flags; static rtems_capture_task_t* capture_tasks; static rtems_capture_control_t* capture_controls; static int capture_extension_index; @@ -77,7 +77,7 @@ static rtems_id capture_id; static rtems_capture_timestamp capture_timestamp; static rtems_task_priority capture_ceiling; static rtems_task_priority capture_floor; -static rtems_unsigned32 capture_tick_period; +static uint32_t capture_tick_period; static rtems_id capture_reader; /* @@ -108,8 +108,8 @@ static const char* capture_event_text[] = * This function returns the current time. If a handler is provided * by the user get the time from that. */ -static inline void rtems_capture_get_time (rtems_unsigned32* ticks, - rtems_unsigned32* tick_offset) +static inline void rtems_capture_get_time (uint32_t * ticks, + uint32_t * tick_offset) { if (capture_timestamp) capture_timestamp (ticks, tick_offset); @@ -211,8 +211,8 @@ rtems_capture_init_stack_usage (rtems_capture_task_t* task) { if (task->tcb) { - rtems_unsigned32* s; - rtems_unsigned32 i; + uint32_t * s; + uint32_t i; task->stack_size = task->tcb->Start.Initial_stack.size; task->stack_clean = task->stack_size; @@ -373,7 +373,7 @@ rtems_capture_create_capture_task (rtems_tcb* new_task) */ static inline void rtems_capture_record (rtems_capture_task_t* task, - rtems_unsigned32 events) + uint32_t events) { /* * Check the watch state if we have a task control, and @@ -669,8 +669,8 @@ rtems_capture_switch_task (rtems_tcb* current_task, */ if (capture_flags & RTEMS_CAPTURE_ON) { - rtems_unsigned32 ticks; - rtems_unsigned32 tick_offset; + uint32_t ticks; + uint32_t tick_offset; /* * Get the cpature task control block so we can update the @@ -810,7 +810,7 @@ triggered: * */ rtems_status_code -rtems_capture_open (rtems_unsigned32 size, rtems_capture_timestamp timestamp) +rtems_capture_open (uint32_t size, rtems_capture_timestamp timestamp) { rtems_extensions_table capture_extensions; rtems_name name; @@ -1349,14 +1349,14 @@ rtems_capture_set_trigger (rtems_name from, * */ rtems_status_code -rtems_capture_read (rtems_unsigned32 threshold, - rtems_unsigned32 timeout, - rtems_unsigned32* read, +rtems_capture_read (uint32_t threshold, + uint32_t timeout, + uint32_t * read, rtems_capture_record_t** recs) { rtems_interrupt_level level; rtems_status_code sc = RTEMS_SUCCESSFUL; - rtems_unsigned32 count; + uint32_t count; *read = 0; *recs = NULL; @@ -1456,7 +1456,7 @@ rtems_capture_read (rtems_unsigned32 threshold, * to the capture engine. The count must match the number read. */ rtems_status_code -rtems_capture_release (rtems_unsigned32 count) +rtems_capture_release (uint32_t count) { rtems_interrupt_level level; @@ -1481,7 +1481,7 @@ rtems_capture_release (rtems_unsigned32 count) * * This function returns the tick period in nano-seconds. */ -rtems_unsigned32 +uint32_t rtems_capture_tick_time () { return capture_tick_period; @@ -1526,13 +1526,13 @@ rtems_capture_get_task_list () * This function updates the stack usage. The task control block * is updated. */ -rtems_unsigned32 +uint32_t rtems_capture_task_stack_usage (rtems_capture_task_t* task) { if (task->tcb) { - rtems_unsigned32* st; - rtems_unsigned32* s; + uint32_t * st; + uint32_t * s; /* * @todo: Assumes all stacks move the same way. @@ -1548,7 +1548,7 @@ rtems_capture_task_stack_usage (rtems_capture_task_t* task) } task->stack_clean = - s - (rtems_unsigned32*) task->tcb->Start.Initial_stack.area; + s - (uint32_t *) task->tcb->Start.Initial_stack.area; } return task->stack_clean; diff --git a/cpukit/libmisc/capture/capture.h b/cpukit/libmisc/capture/capture.h index 7e5bfea9a8..836bb96916 100644 --- a/cpukit/libmisc/capture/capture.h +++ b/cpukit/libmisc/capture/capture.h @@ -49,7 +49,7 @@ typedef struct rtems_capture_control_s { rtems_name name; rtems_id id; - rtems_unsigned32 flags; + uint32_t flags; rtems_name from[RTEMS_CAPTURE_TRIGGER_TASKS]; rtems_id from_id[RTEMS_CAPTURE_TRIGGER_TASKS]; struct rtems_capture_control_s* next; @@ -85,19 +85,19 @@ typedef struct rtems_capture_task_s { rtems_name name; rtems_id id; - rtems_unsigned32 flags; + uint32_t flags; rtems_tcb* tcb; - rtems_unsigned32 in; - rtems_unsigned32 out; + uint32_t in; + uint32_t out; rtems_task_priority start_priority; - rtems_unsigned32 stack_size; - rtems_unsigned32 stack_clean; - rtems_unsigned32 ticks; - rtems_unsigned32 tick_offset; - rtems_unsigned32 ticks_in; - rtems_unsigned32 tick_offset_in; - rtems_unsigned32 last_ticks; - rtems_unsigned32 last_tick_offset; + uint32_t stack_size; + uint32_t stack_clean; + uint32_t ticks; + uint32_t tick_offset; + uint32_t ticks_in; + uint32_t tick_offset_in; + uint32_t last_ticks; + uint32_t last_tick_offset; rtems_capture_control_t* control; struct rtems_capture_task_s* next; } rtems_capture_task_t; @@ -119,9 +119,9 @@ typedef struct rtems_capture_task_s typedef struct rtems_capture_record_s { rtems_capture_task_t* task; - rtems_unsigned32 events; - rtems_unsigned32 ticks; - rtems_unsigned32 tick_offset; + uint32_t events; + uint32_t ticks; + uint32_t tick_offset; } rtems_capture_record_t; /* @@ -172,7 +172,7 @@ typedef enum rtems_capture_trigger_t */ typedef void (*rtems_capture_timestamp) - (rtems_unsigned32* ticks, rtems_unsigned32* micro); + (uint32_t * ticks, uint32_t * micro); /* * rtems_capture_open @@ -184,7 +184,7 @@ typedef void (*rtems_capture_timestamp) * */ rtems_status_code -rtems_capture_open (rtems_unsigned32 size, +rtems_capture_open (uint32_t size, rtems_capture_timestamp timestamp); /* @@ -384,9 +384,9 @@ rtems_capture_set_trigger (rtems_name from, * */ rtems_status_code -rtems_capture_read (rtems_unsigned32 threshold, - rtems_unsigned32 timeout, - rtems_unsigned32* read, +rtems_capture_read (uint32_t threshold, + uint32_t timeout, + uint32_t * read, rtems_capture_record_t** recs); /* @@ -398,7 +398,7 @@ rtems_capture_read (rtems_unsigned32 threshold, * to the capture engine. The count must match the number read. */ rtems_status_code -rtems_capture_release (rtems_unsigned32 count); +rtems_capture_release (uint32_t count); /* * rtems_capture_tick_time @@ -407,7 +407,7 @@ rtems_capture_release (rtems_unsigned32 count); * * This function returns the tick period in micro-seconds. */ -rtems_unsigned32 +uint32_t rtems_capture_tick_time (); /* @@ -417,7 +417,7 @@ rtems_capture_tick_time (); * * This function returns the tick period in micro-seconds. */ -rtems_unsigned32 +uint32_t rtems_capture_tick_time (); /* @@ -519,7 +519,7 @@ rtems_capture_task_name (rtems_capture_task_t* task) * * This function returns the task flags. */ -static inline rtems_unsigned32 +static inline uint32_t rtems_capture_task_flags (rtems_capture_task_t* task) { return task->flags; @@ -545,7 +545,7 @@ rtems_capture_task_control (rtems_capture_task_t* task) * * This function returns the task control flags if a control is present. */ -static inline rtems_unsigned32 +static inline uint32_t rtems_capture_task_control_flags (rtems_capture_task_t* task) { if (!task->control) @@ -561,7 +561,7 @@ rtems_capture_task_control_flags (rtems_capture_task_t* task) * This function returns the number of times the task has * been switched into context. */ -static inline rtems_unsigned32 +static inline uint32_t rtems_capture_task_switched_in (rtems_capture_task_t* task) { return task->in; @@ -575,7 +575,7 @@ rtems_capture_task_switched_in (rtems_capture_task_t* task) * This function returns the number of times the task has * been switched out of context. */ -static inline rtems_unsigned32 +static inline uint32_t rtems_capture_task_switched_out (rtems_capture_task_t* task) { return task->out; @@ -633,7 +633,7 @@ rtems_capture_task_curr_priority (rtems_capture_task_t* task) * This function updates the stack usage. The task control block * is updated. */ -rtems_unsigned32 +uint32_t rtems_capture_task_stack_usage (rtems_capture_task_t* task); /* @@ -643,7 +643,7 @@ rtems_capture_task_stack_usage (rtems_capture_task_t* task); * * This function returns the task's stack size. */ -static inline rtems_unsigned32 +static inline uint32_t rtems_capture_task_stack_size (rtems_capture_task_t* task) { return task->stack_size; @@ -656,7 +656,7 @@ rtems_capture_task_stack_size (rtems_capture_task_t* task) * * This function returns the amount of stack used. */ -static inline rtems_unsigned32 +static inline uint32_t rtems_capture_task_stack_used (rtems_capture_task_t* task) { return task->stack_size - task->stack_clean; @@ -669,7 +669,7 @@ rtems_capture_task_stack_used (rtems_capture_task_t* task) * * This function returns the current execution time as ticks. */ -static inline rtems_unsigned32 +static inline uint32_t rtems_capture_task_ticks (rtems_capture_task_t* task) { return task->ticks; @@ -682,7 +682,7 @@ rtems_capture_task_ticks (rtems_capture_task_t* task) * * This function returns the current execution time tick offset. */ -static inline rtems_unsigned32 +static inline uint32_t rtems_capture_task_tick_offset (rtems_capture_task_t* task) { return task->tick_offset; @@ -714,7 +714,7 @@ static inline unsigned long long rtems_capture_task_delta_time (rtems_capture_task_t* task) { unsigned long long t = task->ticks - task->last_ticks; - rtems_unsigned32 o = task->tick_offset - task->last_tick_offset; + uint32_t o = task->tick_offset - task->last_tick_offset; task->last_ticks = task->ticks; task->last_tick_offset = task->tick_offset; @@ -730,11 +730,11 @@ rtems_capture_task_delta_time (rtems_capture_task_t* task) * This function returns the number of tasks the capture * engine knows about. */ -static inline rtems_unsigned32 +static inline uint32_t rtems_capture_task_count () { rtems_capture_task_t* task = rtems_capture_get_task_list (); - rtems_unsigned32 count = 0; + uint32_t count = 0; while (task) { @@ -803,7 +803,7 @@ rtems_capture_control_name (rtems_capture_control_t* control) * * This function returns the control flags. */ -static inline rtems_unsigned32 +static inline uint32_t rtems_capture_control_flags (rtems_capture_control_t* control) { return control->flags; @@ -847,11 +847,11 @@ rtems_capture_control_from_id (rtems_capture_control_t* control, int from) * This function returns the number of controls the capture * engine has. */ -static inline rtems_unsigned32 +static inline uint32_t rtems_capture_control_count () { rtems_capture_control_t* control = rtems_capture_get_control_list (); - rtems_unsigned32 count = 0; + uint32_t count = 0; while (control) { |