diff options
Diffstat (limited to 'cpukit')
31 files changed, 320 insertions, 268 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 70333b2ecb..075a5d4b67 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,21 @@ +2004-03-26 Ralf Corsepius <ralf_corsepius@rtems.org> + + * libmisc/capture/capture-cli.c, libmisc/capture/capture.c, + libmisc/capture/capture.h, libmisc/cpuuse/cpuuse.c, + libmisc/devnull/devnull.c, libmisc/fsmount/fsmount.h, + libmisc/monitor/mon-config.c, libmisc/monitor/mon-dname.c, + libmisc/monitor/mon-driver.c, libmisc/monitor/mon-extension.c, + libmisc/monitor/mon-itask.c, libmisc/monitor/mon-monitor.c, + libmisc/monitor/mon-mpci.c, libmisc/monitor/mon-object.c, + libmisc/monitor/mon-prmisc.c, libmisc/monitor/mon-queue.c, + libmisc/monitor/mon-server.c, libmisc/monitor/mon-symbols.c, + libmisc/monitor/monitor.h, libmisc/monitor/symbols.h, + libmisc/mw-fb/mw_uid.c, libmisc/rtmonuse/rtmonuse.c, + libmisc/serdbg/serdbg.h, libmisc/serdbg/serdbgio.c, + libmisc/serdbg/termios_printk.c, libmisc/serdbg/termios_printk.h, + libmisc/shell/shell.c, libmisc/shell/shell.h, libmisc/stackchk/check.c, + libmisc/stackchk/internal.h: Convert to using c99 fixed size types. + 2004-03-23 Ralf Corsepius <ralf_corsepius@rtems.org> * itron/include/itronsys/mbox.h, itron/include/itronsys/types.h, 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) { diff --git a/cpukit/libmisc/cpuuse/cpuuse.c b/cpukit/libmisc/cpuuse/cpuuse.c index bf4f674fce..d86d4e6468 100644 --- a/cpukit/libmisc/cpuuse/cpuuse.c +++ b/cpukit/libmisc/cpuuse/cpuuse.c @@ -26,7 +26,7 @@ #include <rtems/cpuuse.h> -unsigned32 CPU_usage_Ticks_at_last_reset; +uint32_t CPU_usage_Ticks_at_last_reset; /*PAGE * @@ -35,14 +35,14 @@ unsigned32 CPU_usage_Ticks_at_last_reset; void CPU_usage_Dump( void ) { - unsigned32 i; - unsigned32 api_index; + uint32_t i; + uint32_t api_index; Thread_Control *the_thread; Objects_Information *information; - unsigned32 u32_name; + uint32_t u32_name; char *cname; char name[5]; - unsigned32 total_units = 0; + uint32_t total_units = 0; for ( api_index = 1 ; api_index <= OBJECTS_APIS_LAST ; @@ -88,7 +88,7 @@ void CPU_usage_Dump( void ) name[ 3 ] = cname[3]; name[ 4 ] = '\0'; } else { - u32_name = (unsigned32)the_thread->Object.name; + u32_name = (uint32_t )the_thread->Object.name; name[ 0 ] = (u32_name >> 24) & 0xff; name[ 1 ] = (u32_name >> 16) & 0xff; name[ 2 ] = (u32_name >> 8) & 0xff; diff --git a/cpukit/libmisc/devnull/devnull.c b/cpukit/libmisc/devnull/devnull.c index 135e1d9acb..56fb89f9a7 100644 --- a/cpukit/libmisc/devnull/devnull.c +++ b/cpukit/libmisc/devnull/devnull.c @@ -35,7 +35,7 @@ * rval - NULL_SUCCESSFUL */ -rtems_unsigned32 NULL_major; +uint32_t NULL_major; static char initialized; rtems_device_driver null_initialize( diff --git a/cpukit/libmisc/fsmount/fsmount.h b/cpukit/libmisc/fsmount/fsmount.h index 18192df3ef..84b718d1ef 100644 --- a/cpukit/libmisc/fsmount/fsmount.h +++ b/cpukit/libmisc/fsmount/fsmount.h @@ -42,8 +42,8 @@ typedef struct { char *mount_point; rtems_filesystem_operations_table *fs_ops; rtems_filesystem_options_t mount_options; - unsigned16 report_reasons; - unsigned16 abort_reasons; + uint16_t report_reasons; + uint16_t abort_reasons; } fstab_t; diff --git a/cpukit/libmisc/monitor/mon-config.c b/cpukit/libmisc/monitor/mon-config.c index 5a36f16c77..0f1f4dafc4 100644 --- a/cpukit/libmisc/monitor/mon-config.c +++ b/cpukit/libmisc/monitor/mon-config.c @@ -98,7 +98,7 @@ rtems_monitor_config_dump( boolean verbose ) { - unsigned32 length = 0; + uint32_t length = 0; length = 0; length += printf("WORKSPACE"); diff --git a/cpukit/libmisc/monitor/mon-dname.c b/cpukit/libmisc/monitor/mon-dname.c index b1ddc85856..a8705c095d 100644 --- a/cpukit/libmisc/monitor/mon-dname.c +++ b/cpukit/libmisc/monitor/mon-dname.c @@ -55,7 +55,7 @@ rtems_monitor_dname_next( rtems_id *next_id ) { - rtems_unsigned32 n = rtems_get_index(*next_id); + uint32_t n = rtems_get_index(*next_id); rtems_driver_name_t *table = _IO_Driver_name_table; rtems_driver_name_t *np = 0; @@ -99,7 +99,7 @@ rtems_monitor_dname_dump( boolean verbose ) { - unsigned32 length = 0; + uint32_t length = 0; length += rtems_monitor_pad(6, length); length += rtems_monitor_dump_hex(monitor_dname->major); diff --git a/cpukit/libmisc/monitor/mon-driver.c b/cpukit/libmisc/monitor/mon-driver.c index 658d984564..da18d8badf 100644 --- a/cpukit/libmisc/monitor/mon-driver.c +++ b/cpukit/libmisc/monitor/mon-driver.c @@ -67,7 +67,7 @@ rtems_monitor_driver_next( ) { rtems_configuration_table *c = _Configuration_Table; - rtems_unsigned32 n = rtems_get_index(*next_id); + uint32_t n = rtems_get_index(*next_id); if (n >= c->number_of_device_drivers) goto failed; @@ -108,7 +108,7 @@ rtems_monitor_driver_dump( boolean verbose ) { - unsigned32 length = 0; + uint32_t length = 0; length += printf(" %d", monitor_driver->id); diff --git a/cpukit/libmisc/monitor/mon-extension.c b/cpukit/libmisc/monitor/mon-extension.c index 782dc0a979..9ffb3781a6 100644 --- a/cpukit/libmisc/monitor/mon-extension.c +++ b/cpukit/libmisc/monitor/mon-extension.c @@ -65,7 +65,7 @@ rtems_monitor_extension_dump( boolean verbose ) { - unsigned32 length = 0; + uint32_t length = 0; length += rtems_monitor_dump_id(monitor_extension->id); length += rtems_monitor_pad(11, length); diff --git a/cpukit/libmisc/monitor/mon-itask.c b/cpukit/libmisc/monitor/mon-itask.c index 9f96a76eaa..d549c9621c 100644 --- a/cpukit/libmisc/monitor/mon-itask.c +++ b/cpukit/libmisc/monitor/mon-itask.c @@ -44,7 +44,7 @@ rtems_monitor_init_task_next( { rtems_configuration_table *c = _Configuration_Table; rtems_initialization_tasks_table *itask; - rtems_unsigned32 n = rtems_get_index(*next_id); + uint32_t n = rtems_get_index(*next_id); if (n >= c->RTEMS_api_configuration->number_of_initialization_tasks) goto failed; diff --git a/cpukit/libmisc/monitor/mon-monitor.c b/cpukit/libmisc/monitor/mon-monitor.c index 7c9088aeb2..9445f94d58 100644 --- a/cpukit/libmisc/monitor/mon-monitor.c +++ b/cpukit/libmisc/monitor/mon-monitor.c @@ -41,7 +41,7 @@ /* set by trap handler */ extern rtems_tcb *debugger_interrupted_task; extern rtems_context *debugger_interrupted_task_context; -extern rtems_unsigned32 debugger_trap; +extern uint32_t debugger_trap; /* * Various id's for the monitor @@ -51,8 +51,8 @@ extern rtems_unsigned32 debugger_trap; rtems_id rtems_monitor_task_id; -unsigned32 rtems_monitor_node; /* our node number */ -unsigned32 rtems_monitor_default_node; /* current default for commands */ +uint32_t rtems_monitor_node; /* our node number */ +uint32_t rtems_monitor_default_node; /* current default for commands */ /* * The rtems symbol table @@ -313,7 +313,7 @@ rtems_monitor_node_cmd( boolean verbose ) { - unsigned32 new_node = rtems_monitor_default_node; + uint32_t new_node = rtems_monitor_default_node; switch (argc) { @@ -395,7 +395,7 @@ rtems_monitor_symbols_loadup(void) rtems_symbol_t *sp; sp = rtems_symbol_create(rtems_monitor_symbols, symbol, - (rtems_unsigned32) strtoul(value, 0, 16)); + (uint32_t ) strtoul(value, 0, 16)); if (sp == 0) { printf("could not define symbol '%s'\n", symbol); @@ -549,7 +549,7 @@ rtems_monitor_kill(void) void rtems_monitor_init( - unsigned32 monitor_flags + uint32_t monitor_flags ) { rtems_status_code status; diff --git a/cpukit/libmisc/monitor/mon-mpci.c b/cpukit/libmisc/monitor/mon-mpci.c index 071d45acb6..1157d8a1f1 100644 --- a/cpukit/libmisc/monitor/mon-mpci.c +++ b/cpukit/libmisc/monitor/mon-mpci.c @@ -113,7 +113,7 @@ rtems_monitor_mpci_dump( boolean verbose ) { - unsigned32 length = 0; + uint32_t length = 0; length += rtems_monitor_pad(2, length); length += printf(" %d", monitor_mpci->node); diff --git a/cpukit/libmisc/monitor/mon-object.c b/cpukit/libmisc/monitor/mon-object.c index 0e36e26b5e..2d99a287d8 100644 --- a/cpukit/libmisc/monitor/mon-object.c +++ b/cpukit/libmisc/monitor/mon-object.c @@ -121,11 +121,11 @@ rtems_monitor_object_info_t rtems_monitor_object_info[] = rtems_id rtems_monitor_id_fixup( rtems_id id, - unsigned32 default_node, + uint32_t default_node, rtems_monitor_object_type_t type ) { - unsigned32 node; + uint32_t node; node = rtems_get_node(id); if (node == 0) @@ -173,8 +173,8 @@ rtems_monitor_object_canonical_next_remote( */ request.command = RTEMS_MONITOR_SERVER_CANONICAL; - request.argument0 = (unsigned32) type; - request.argument1 = (unsigned32) id; + request.argument0 = (uint32_t ) type; + request.argument1 = (uint32_t ) id; status = rtems_monitor_server_request(rtems_get_node(id), &request, &response); if (status != RTEMS_SUCCESSFUL) @@ -237,7 +237,7 @@ rtems_monitor_object_canonical_get( rtems_monitor_object_type_t type, rtems_id id, void *canonical, - unsigned32 *size_p + uint32_t *size_p ) { rtems_monitor_object_info_t *info; @@ -344,7 +344,7 @@ rtems_monitor_object_cmd( } else { - unsigned32 default_node = rtems_monitor_default_node; + uint32_t default_node = rtems_monitor_default_node; rtems_monitor_object_type_t last_type = RTEMS_MONITOR_OBJECT_INVALID; rtems_id id; diff --git a/cpukit/libmisc/monitor/mon-prmisc.c b/cpukit/libmisc/monitor/mon-prmisc.c index 74d3a5095d..58881c4541 100644 --- a/cpukit/libmisc/monitor/mon-prmisc.c +++ b/cpukit/libmisc/monitor/mon-prmisc.c @@ -25,10 +25,10 @@ rtems_monitor_separator(void) printf("------------------------------------------------------------------------------\n"); } -unsigned32 +uint32_t rtems_monitor_pad( - unsigned32 destination_column, - unsigned32 current_column + uint32_t destination_column, + uint32_t current_column ) { int pad_length; @@ -41,8 +41,8 @@ rtems_monitor_pad( return printf("%*s", pad_length, ""); } -unsigned32 -rtems_monitor_dump_char(rtems_unsigned8 ch) +uint32_t +rtems_monitor_dump_char(uint8_t ch) { if (isprint(ch)) return printf("%c", ch); @@ -50,27 +50,27 @@ rtems_monitor_dump_char(rtems_unsigned8 ch) return printf("%02x", ch); } -unsigned32 -rtems_monitor_dump_decimal(unsigned32 num) +uint32_t +rtems_monitor_dump_decimal(uint32_t num) { return printf("%4d", num); } -unsigned32 -rtems_monitor_dump_hex(unsigned32 num) +uint32_t +rtems_monitor_dump_hex(uint32_t num) { return printf("0x%x", num); } -unsigned32 +uint32_t rtems_monitor_dump_assoc_bitfield( rtems_assoc_t *ap, char *separator, - unsigned32 value + uint32_t value ) { - unsigned32 b; - unsigned32 length = 0; + uint32_t b; + uint32_t length = 0; const char *name; for (b = 1; b; b <<= 1) @@ -90,23 +90,23 @@ rtems_monitor_dump_assoc_bitfield( return length; } -unsigned32 +uint32_t rtems_monitor_dump_id(rtems_id id) { return printf("%08x", id); } -unsigned32 +uint32_t rtems_monitor_dump_name(rtems_name name) { - unsigned32 i; - unsigned32 length = 0; + uint32_t i; + uint32_t length = 0; union { - unsigned32 ui; + uint32_t ui; char c[4]; } u; - u.ui = (rtems_unsigned32) name; + u.ui = (uint32_t ) name; #if (CPU_BIG_ENDIAN == TRUE) for (i=0; i<sizeof(u.c); i++) @@ -118,7 +118,7 @@ rtems_monitor_dump_name(rtems_name name) return length; } -unsigned32 +uint32_t rtems_monitor_dump_priority(rtems_task_priority priority) { return printf("%3d", priority); @@ -146,10 +146,10 @@ rtems_assoc_t rtems_monitor_state_assoc[] = { { 0, 0, 0 }, }; -unsigned32 +uint32_t rtems_monitor_dump_state(States_Control state) { - unsigned32 length = 0; + uint32_t length = 0; if (state == STATES_READY) /* assoc doesn't deal with this as it is 0 */ length += printf("READY"); @@ -169,10 +169,10 @@ rtems_assoc_t rtems_monitor_attribute_assoc[] = { { 0, 0, 0 }, }; -unsigned32 +uint32_t rtems_monitor_dump_attributes(rtems_attribute attributes) { - unsigned32 length = 0; + uint32_t length = 0; if (attributes == RTEMS_DEFAULT_ATTRIBUTES) /* value is 0 */ length += printf("DEFAULT"); @@ -190,10 +190,10 @@ rtems_assoc_t rtems_monitor_modes_assoc[] = { { 0, 0, 0 }, }; -unsigned32 +uint32_t rtems_monitor_dump_modes(rtems_mode modes) { - unsigned32 length = 0; + uint32_t length = 0; if (modes == RTEMS_DEFAULT_MODES) /* value is 0 */ length += printf("P:T:nA"); @@ -240,10 +240,10 @@ rtems_assoc_t rtems_monitor_events_assoc[] = { { 0, 0, 0 }, }; -unsigned32 +uint32_t rtems_monitor_dump_events(rtems_event_set events) { - unsigned32 length = 0; + uint32_t length = 0; if (events == EVENT_SETS_NONE_PENDING) /* value is 0 */ length += printf("NONE"); @@ -254,10 +254,10 @@ rtems_monitor_dump_events(rtems_event_set events) return length; } -unsigned32 -rtems_monitor_dump_notepad(unsigned32 *notepad) +uint32_t +rtems_monitor_dump_notepad(uint32_t *notepad) { - unsigned32 length = 0; + uint32_t length = 0; int i; for (i=0; i < RTEMS_NUMBER_NOTEPADS; i++) diff --git a/cpukit/libmisc/monitor/mon-queue.c b/cpukit/libmisc/monitor/mon-queue.c index b43eab4e83..455f0cf376 100644 --- a/cpukit/libmisc/monitor/mon-queue.c +++ b/cpukit/libmisc/monitor/mon-queue.c @@ -50,7 +50,7 @@ rtems_monitor_queue_dump( boolean verbose ) { - unsigned32 length = 0; + uint32_t length = 0; length += rtems_monitor_dump_id(monitor_queue->id); length += rtems_monitor_pad(11, length); diff --git a/cpukit/libmisc/monitor/mon-server.c b/cpukit/libmisc/monitor/mon-server.c index 318efc9975..2c5e292cc7 100644 --- a/cpukit/libmisc/monitor/mon-server.c +++ b/cpukit/libmisc/monitor/mon-server.c @@ -34,14 +34,14 @@ rtems_id rtems_monitor_server_response_queue_id; /* our server */ rtems_status_code rtems_monitor_server_request( - unsigned32 server_node, + uint32_t server_node, rtems_monitor_server_request_t *request, rtems_monitor_server_response_t *response ) { rtems_id server_id; rtems_status_code status; - unsigned32 size; + uint32_t size; /* * What is id of monitor on target node? @@ -118,7 +118,7 @@ rtems_monitor_server_task( rtems_monitor_server_request_t request; rtems_monitor_server_response_t response; rtems_status_code status; - unsigned32 size; + uint32_t size; for (;;) { @@ -215,7 +215,7 @@ rtems_monitor_server_kill(void) void rtems_monitor_server_init( - unsigned32 monitor_flags + uint32_t monitor_flags ) { rtems_status_code status; @@ -223,7 +223,7 @@ rtems_monitor_server_init( if (_System_state_Is_multiprocessing && (_Configuration_MP_table->maximum_nodes > 1)) { - unsigned32 maximum_nodes = _Configuration_MP_table->maximum_nodes; + uint32_t maximum_nodes = _Configuration_MP_table->maximum_nodes; /* * create the msg que our server will listen diff --git a/cpukit/libmisc/monitor/mon-symbols.c b/cpukit/libmisc/monitor/mon-symbols.c index ab953d8628..fcad6603f2 100644 --- a/cpukit/libmisc/monitor/mon-symbols.c +++ b/cpukit/libmisc/monitor/mon-symbols.c @@ -67,7 +67,7 @@ rtems_symbol_t * rtems_symbol_create( rtems_symbol_table_t *table, char *name, - rtems_unsigned32 value + uint32_t value ) { int symbol_length; @@ -171,15 +171,15 @@ rtems_symbol_sort(rtems_symbol_table_t *table) rtems_symbol_t * rtems_symbol_value_lookup( rtems_symbol_table_t *table, - rtems_unsigned32 value + uint32_t value ) { rtems_symbol_t *sp; rtems_symbol_t *base; rtems_symbol_t *best = 0; - rtems_unsigned32 distance; - rtems_unsigned32 best_distance = ~0; - rtems_unsigned32 elements; + uint32_t distance; + uint32_t best_distance = ~0; + uint32_t elements; if (table == 0) table = rtems_monitor_symbols; @@ -233,10 +233,10 @@ rtems_symbol_value_lookup( const rtems_symbol_t * rtems_symbol_value_lookup_exact( rtems_symbol_table_t *table, - rtems_unsigned32 value + uint32_t value ) { - rtems_unsigned32 s; + uint32_t s; rtems_symbol_t *sp; if (table == 0) @@ -276,7 +276,7 @@ rtems_symbol_name_lookup( char *name ) { - rtems_unsigned32 s; + uint32_t s; rtems_symbol_t *sp; if (table == 0) @@ -303,7 +303,7 @@ rtems_monitor_symbol_next( ) { rtems_symbol_table_t *table; - rtems_unsigned32 n = rtems_get_index(*next_id); + uint32_t n = rtems_get_index(*next_id); table = *(rtems_symbol_table_t **) object_info; if (table == 0) @@ -361,7 +361,7 @@ rtems_monitor_symbol_canonical_by_value( void *value_void_p ) { - unsigned32 value = (unsigned32) value_void_p; + uint32_t value = (uint32_t ) value_void_p; rtems_symbol_t *sp; sp = rtems_symbol_value_lookup(0, value); @@ -380,13 +380,13 @@ rtems_monitor_symbol_canonical_by_value( } -unsigned32 +uint32_t rtems_monitor_symbol_dump( rtems_monitor_symbol_t *canonical_symbol, boolean verbose ) { - unsigned32 length = 0; + uint32_t length = 0; /* * print the name if it exists AND if value is non-zero @@ -420,7 +420,7 @@ rtems_monitor_symbol_dump_all( boolean verbose ) { - rtems_unsigned32 s; + uint32_t s; rtems_symbol_t *sp; if (table == 0) diff --git a/cpukit/libmisc/monitor/monitor.h b/cpukit/libmisc/monitor/monitor.h index 4edc799ddf..ca10397e39 100644 --- a/cpukit/libmisc/monitor/monitor.h +++ b/cpukit/libmisc/monitor/monitor.h @@ -75,8 +75,8 @@ typedef enum { #define MONITOR_SYMBOL_LEN 20 typedef struct { char name[MONITOR_SYMBOL_LEN]; - unsigned32 value; - unsigned32 offset; + uint32_t value; + uint32_t offset; } rtems_monitor_symbol_t; typedef struct { @@ -93,17 +93,17 @@ typedef struct { rtems_name name; /* end of common portion */ Thread_Entry entry; - unsigned32 argument; + uint32_t argument; void *stack; - unsigned32 stack_size; + uint32_t stack_size; rtems_task_priority priority; States_Control state; rtems_event_set events; rtems_mode modes; rtems_attribute attributes; - unsigned32 notepad[RTEMS_NUMBER_NOTEPADS]; + uint32_t notepad[RTEMS_NUMBER_NOTEPADS]; rtems_id wait_id; - unsigned32 wait_args; + uint32_t wait_args; } rtems_monitor_task_t; /* @@ -115,8 +115,8 @@ typedef struct { rtems_name name; /* end of common portion */ rtems_monitor_symbol_t entry; - unsigned32 argument; - unsigned32 stack_size; + uint32_t argument; + uint32_t stack_size; rtems_task_priority priority; rtems_mode modes; rtems_attribute attributes; @@ -131,9 +131,9 @@ typedef struct { rtems_name name; /* end of common portion */ rtems_attribute attributes; - unsigned32 number_of_pending_messages; - unsigned32 maximum_pending_messages; - unsigned32 maximum_message_size; + uint32_t number_of_pending_messages; + uint32_t maximum_pending_messages; + uint32_t maximum_message_size; } rtems_monitor_queue_t; /* @@ -173,8 +173,8 @@ typedef struct { rtems_id id; /* not used for drivers (yet) */ rtems_name name; /* not used for drivers (yet) */ /* end of common portion */ - unsigned32 major; - unsigned32 minor; + uint32_t major; + uint32_t minor; char name_string[64]; } rtems_monitor_dname_t; @@ -184,19 +184,19 @@ typedef struct { typedef struct { void *work_space_start; - unsigned32 work_space_size; - unsigned32 maximum_tasks; - unsigned32 maximum_timers; - unsigned32 maximum_semaphores; - unsigned32 maximum_message_queues; - unsigned32 maximum_partitions; - unsigned32 maximum_regions; - unsigned32 maximum_ports; - unsigned32 maximum_periods; - unsigned32 maximum_extensions; - unsigned32 microseconds_per_tick; - unsigned32 ticks_per_timeslice; - unsigned32 number_of_initialization_tasks; + uint32_t work_space_size; + uint32_t maximum_tasks; + uint32_t maximum_timers; + uint32_t maximum_semaphores; + uint32_t maximum_message_queues; + uint32_t maximum_partitions; + uint32_t maximum_regions; + uint32_t maximum_ports; + uint32_t maximum_periods; + uint32_t maximum_extensions; + uint32_t microseconds_per_tick; + uint32_t ticks_per_timeslice; + uint32_t number_of_initialization_tasks; } rtems_monitor_config_t; /* @@ -205,13 +205,13 @@ typedef struct { #if defined(RTEMS_MULTIPROCESSING) typedef struct { - unsigned32 node; /* local node number */ - unsigned32 maximum_nodes; /* maximum # nodes in system */ - unsigned32 maximum_global_objects; /* maximum # global objects */ - unsigned32 maximum_proxies; /* maximum # proxies */ + uint32_t node; /* local node number */ + uint32_t maximum_nodes; /* maximum # nodes in system */ + uint32_t maximum_global_objects; /* maximum # global objects */ + uint32_t maximum_proxies; /* maximum # proxies */ - unsigned32 default_timeout; /* in ticks */ - unsigned32 maximum_packet_size; + uint32_t default_timeout; /* in ticks */ + uint32_t maximum_packet_size; rtems_monitor_symbol_t initialization; rtems_monitor_symbol_t get_packet; rtems_monitor_symbol_t return_packet; @@ -256,28 +256,28 @@ typedef union { typedef struct { - unsigned32 command; + uint32_t command; rtems_id return_id; - unsigned32 argument0; - unsigned32 argument1; - unsigned32 argument2; - unsigned32 argument3; - unsigned32 argument4; - unsigned32 argument5; + uint32_t argument0; + uint32_t argument1; + uint32_t argument2; + uint32_t argument3; + uint32_t argument4; + uint32_t argument5; } rtems_monitor_server_request_t; typedef struct { - unsigned32 command; - unsigned32 result0; - unsigned32 result1; + uint32_t command; + uint32_t result0; + uint32_t result1; rtems_monitor_union_t payload; } rtems_monitor_server_response_t; extern rtems_id rtems_monitor_task_id; -extern unsigned32 rtems_monitor_node; /* our node number */ -extern unsigned32 rtems_monitor_default_node; /* current default for commands */ +extern uint32_t rtems_monitor_node; /* our node number */ +extern uint32_t rtems_monitor_default_node; /* current default for commands */ /* * Monitor command function and table entry @@ -303,7 +303,7 @@ union _rtems_monitor_command_arg_t { struct rtems_monitor_command_entry_s { char *command; /* command name */ char *usage; /* usage string for the command */ - unsigned32 arguments_required; /* # of required args */ + uint32_t arguments_required; /* # of required args */ rtems_monitor_command_function_t command_function; /* Some argument for the command */ rtems_monitor_command_arg_t command_arg; @@ -329,7 +329,7 @@ typedef struct { /* monitor.c */ void rtems_monitor_kill(void); -void rtems_monitor_init(unsigned32); +void rtems_monitor_init(uint32_t ); void rtems_monitor_wakeup(void); void rtems_monitor_pause_cmd(int, char **, rtems_monitor_command_arg_t*, boolean); void rtems_monitor_fatal_cmd(int, char **, rtems_monitor_command_arg_t*, boolean); @@ -344,9 +344,9 @@ void rtems_monitor_task(rtems_task_argument); /* server.c */ void rtems_monitor_server_kill(void); -rtems_status_code rtems_monitor_server_request(unsigned32, rtems_monitor_server_request_t *, rtems_monitor_server_response_t *); +rtems_status_code rtems_monitor_server_request(uint32_t , rtems_monitor_server_request_t *, rtems_monitor_server_response_t *); void rtems_monitor_server_task(rtems_task_argument); -void rtems_monitor_server_init(unsigned32); +void rtems_monitor_server_init(uint32_t ); /* command.c */ int rtems_monitor_make_argv(char *, int *, char **); @@ -358,22 +358,22 @@ void rtems_monitor_help_cmd(int, char **, rtems_monitor_command_arg_t *, bool /* prmisc.c */ void rtems_monitor_separator(void); -unsigned32 rtems_monitor_pad(unsigned32 dest_col, unsigned32 curr_col); -unsigned32 rtems_monitor_dump_char(unsigned8 ch); -unsigned32 rtems_monitor_dump_decimal(unsigned32 num); -unsigned32 rtems_monitor_dump_hex(unsigned32 num); -unsigned32 rtems_monitor_dump_id(rtems_id id); -unsigned32 rtems_monitor_dump_name(rtems_name name); -unsigned32 rtems_monitor_dump_priority(rtems_task_priority priority); -unsigned32 rtems_monitor_dump_state(States_Control state); -unsigned32 rtems_monitor_dump_modes(rtems_mode modes); -unsigned32 rtems_monitor_dump_attributes(rtems_attribute attributes); -unsigned32 rtems_monitor_dump_events(rtems_event_set events); -unsigned32 rtems_monitor_dump_notepad(unsigned32 *notepad); +uint32_t rtems_monitor_pad(uint32_t dest_col, uint32_t curr_col); +uint32_t rtems_monitor_dump_char(uint8_t ch); +uint32_t rtems_monitor_dump_decimal(uint32_t num); +uint32_t rtems_monitor_dump_hex(uint32_t num); +uint32_t rtems_monitor_dump_id(rtems_id id); +uint32_t rtems_monitor_dump_name(rtems_name name); +uint32_t rtems_monitor_dump_priority(rtems_task_priority priority); +uint32_t rtems_monitor_dump_state(States_Control state); +uint32_t rtems_monitor_dump_modes(rtems_mode modes); +uint32_t rtems_monitor_dump_attributes(rtems_attribute attributes); +uint32_t rtems_monitor_dump_events(rtems_event_set events); +uint32_t rtems_monitor_dump_notepad(uint32_t *notepad); /* object.c */ -rtems_id rtems_monitor_id_fixup(rtems_id, unsigned32, rtems_monitor_object_type_t); -rtems_id rtems_monitor_object_canonical_get(rtems_monitor_object_type_t, rtems_id, void *, unsigned32 *size_p); +rtems_id rtems_monitor_id_fixup(rtems_id, uint32_t , rtems_monitor_object_type_t); +rtems_id rtems_monitor_object_canonical_get(rtems_monitor_object_type_t, rtems_id, void *, uint32_t *size_p); rtems_id rtems_monitor_object_canonical_next(rtems_monitor_object_info_t *, rtems_id, void *); void *rtems_monitor_object_next(void *, void *, rtems_id, rtems_id *); rtems_id rtems_monitor_object_canonical(rtems_id, void *); @@ -433,15 +433,15 @@ void rtems_monitor_dname_dump(rtems_monitor_dname_t *, boolean); rtems_symbol_table_t *rtems_symbol_table_create(); void rtems_symbol_table_destroy(rtems_symbol_table_t *table); -rtems_symbol_t *rtems_symbol_create(rtems_symbol_table_t *, char *, unsigned32); -rtems_symbol_t *rtems_symbol_value_lookup(rtems_symbol_table_t *, unsigned32); -const rtems_symbol_t *rtems_symbol_value_lookup_exact(rtems_symbol_table_t *, unsigned32); +rtems_symbol_t *rtems_symbol_create(rtems_symbol_table_t *, char *, uint32_t ); +rtems_symbol_t *rtems_symbol_value_lookup(rtems_symbol_table_t *, uint32_t ); +const rtems_symbol_t *rtems_symbol_value_lookup_exact(rtems_symbol_table_t *, uint32_t ); rtems_symbol_t *rtems_symbol_name_lookup(rtems_symbol_table_t *, char *); void *rtems_monitor_symbol_next(void *object_info, rtems_monitor_symbol_t *, rtems_id *); void rtems_monitor_symbol_canonical(rtems_monitor_symbol_t *, rtems_symbol_t *); void rtems_monitor_symbol_canonical_by_name(rtems_monitor_symbol_t *, char *); void rtems_monitor_symbol_canonical_by_value(rtems_monitor_symbol_t *, void *); -unsigned32 rtems_monitor_symbol_dump(rtems_monitor_symbol_t *, boolean); +uint32_t rtems_monitor_symbol_dump(rtems_monitor_symbol_t *, boolean); void rtems_monitor_symbol_cmd(int, char **, rtems_monitor_command_arg_t*, boolean); diff --git a/cpukit/libmisc/monitor/symbols.h b/cpukit/libmisc/monitor/symbols.h index 978b2eb4ff..6246379a94 100644 --- a/cpukit/libmisc/monitor/symbols.h +++ b/cpukit/libmisc/monitor/symbols.h @@ -21,7 +21,7 @@ extern "C" { #endif struct _rtems_symbol_t { - rtems_unsigned32 value; + uint32_t value; char *name; } ; @@ -33,10 +33,10 @@ typedef struct rtems_symbol_string_block_s { struct _rtems_symbol_table_t { - rtems_unsigned32 sorted; /* are symbols sorted right now? */ - rtems_unsigned32 growth_factor; /* % to grow by when needed */ - rtems_unsigned32 next; /* next symbol slot to use when adding */ - rtems_unsigned32 size; /* max # of symbols */ + uint32_t sorted; /* are symbols sorted right now? */ + uint32_t growth_factor; /* % to grow by when needed */ + uint32_t next; /* next symbol slot to use when adding */ + uint32_t size; /* max # of symbols */ /* * Symbol list -- sorted by address (when we do a lookup) @@ -50,7 +50,7 @@ struct _rtems_symbol_table_t { rtems_symbol_string_block_t *string_buffer_head; rtems_symbol_string_block_t *string_buffer_current; - rtems_unsigned32 strings_next; /* next byte to use in this block */ + uint32_t strings_next; /* next byte to use in this block */ } ; diff --git a/cpukit/libmisc/mw-fb/mw_uid.c b/cpukit/libmisc/mw-fb/mw_uid.c index 216f8a5ad1..c75ecd36e5 100644 --- a/cpukit/libmisc/mw-fb/mw_uid.c +++ b/cpukit/libmisc/mw-fb/mw_uid.c @@ -13,6 +13,40 @@ // MODIFICATION/HISTORY: // // $Log$ +// Revision 1.5 2003/07/08 08:38:48 ralf +// 2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> +// +// * capture/capture-cli.c: Add config-header support. +// * capture/capture.c: Add config-header support. +// * cpuuse/cpuuse.c: Add config-header support. +// * devnull/devnull.c: Add config-header support. +// * dummy/dummy.c: Add config-header support. +// * dumpbuf/dumpbuf.c: Add config-header support. +// * monitor/mon-command.c: Add config-header support. +// * monitor/mon-config.c: Add config-header support. +// * monitor/mon-dname.c: Add config-header support. +// * monitor/mon-driver.c: Add config-header support. +// * monitor/mon-extension.c: Add config-header support. +// * monitor/mon-itask.c: Add config-header support. +// * monitor/mon-manager.c: Add config-header support. +// * monitor/mon-monitor.c: Add config-header support. +// * monitor/mon-mpci.c: Add config-header support. +// * monitor/mon-object.c: Add config-header support. +// * monitor/mon-prmisc.c: Add config-header support. +// * monitor/mon-queue.c: Add config-header support. +// * monitor/mon-server.c: Add config-header support. +// * monitor/mon-symbols.c: Add config-header support. +// * monitor/mon-task.c: Add config-header support. +// * mw-fb/mw_fb.c: Add config-header support. +// * mw-fb/mw_uid.c: Add config-header support. +// * rtmonuse/rtmonuse.c: Add config-header support. +// * serdbg/serdbg.c: Add config-header support. +// * serdbg/serdbgio.c: Add config-header support. +// * serdbg/termios_printk.c: Add config-header support. +// * shell/cmds.c: Add config-header support. +// * stackchk/check.c: Add config-header support. +// * untar/untar.c: Add config-header support. +// // Revision 1.4 2002/01/04 18:32:48 joel // 2002-01-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de> // @@ -125,7 +159,7 @@ int uid_close_queue( void ) int uid_read_message( struct MW_UID_MESSAGE *m, unsigned long timeout ) { rtems_status_code status; - rtems_unsigned32 size = 0; + uint32_t size = 0; unsigned long micro_secs = timeout*1000; int wait = ( timeout != 0 ); diff --git a/cpukit/libmisc/rtmonuse/rtmonuse.c b/cpukit/libmisc/rtmonuse/rtmonuse.c index bd1d4b38b0..70ba259489 100644 --- a/cpukit/libmisc/rtmonuse/rtmonuse.c +++ b/cpukit/libmisc/rtmonuse/rtmonuse.c @@ -16,14 +16,14 @@ typedef struct { rtems_id id; - unsigned32 count; - unsigned32 missed_count; - unsigned32 min_cpu_time; - unsigned32 max_cpu_time; - unsigned32 total_cpu_time; - unsigned32 min_wall_time; - unsigned32 max_wall_time; - unsigned32 total_wall_time; + uint32_t count; + uint32_t missed_count; + uint32_t min_cpu_time; + uint32_t max_cpu_time; + uint32_t total_cpu_time; + uint32_t min_wall_time; + uint32_t max_wall_time; + uint32_t total_wall_time; } Period_usage_t; Period_usage_t *Period_usage_Information; @@ -51,7 +51,7 @@ void Period_usage_Initialize( void ) void Period_usage_Reset( void ) { - unsigned32 i; + uint32_t i; Period_usage_t *the_usage; for ( i=0 ; @@ -127,13 +127,13 @@ void Period_usage_Update( void Period_usage_Dump( void ) { - unsigned32 i; + uint32_t i; Period_usage_t *the_usage; Rate_monotonic_Control *the_period; - unsigned32 u32_name; + uint32_t u32_name; char *cname; char name[5]; - unsigned32 api_index; + uint32_t api_index; Objects_Information *information; if ( !Period_usage_Information ) { @@ -176,7 +176,7 @@ void Period_usage_Dump( void ) name[ 3 ] = cname[3]; name[ 4 ] = '\0'; } else { - u32_name = (unsigned32)the_period->owner->Object.name; + u32_name = (uint32_t )the_period->owner->Object.name; name[ 0 ] = (u32_name >> 24) & 0xff; name[ 1 ] = (u32_name >> 16) & 0xff; name[ 2 ] = (u32_name >> 8) & 0xff; diff --git a/cpukit/libmisc/serdbg/serdbg.h b/cpukit/libmisc/serdbg/serdbg.h index 3cc95b5b96..b70033f4f9 100644 --- a/cpukit/libmisc/serdbg/serdbg.h +++ b/cpukit/libmisc/serdbg/serdbg.h @@ -26,11 +26,11 @@ #include <termios.h> typedef struct { - unsigned32 baudrate; /* debug baud rate, e.g. 57600 */ + uint32_t baudrate; /* debug baud rate, e.g. 57600 */ void (*callout)(void); /* callout pointer during polling */ - int (*open_io)(const char *dev_name,unsigned32 baudrate); /* I/O open fnc */ + int (*open_io)(const char *dev_name,uint32_t baudrate); /* I/O open fnc */ const char *devname; /* debug device, e.g. "/dev/tty01" */ - unsigned8 skip_init_bkpt; /* if TRUE, do not stop when initializing */ + uint8_t skip_init_bkpt; /* if TRUE, do not stop when initializing */ } serdbg_conf_t; /* @@ -128,7 +128,7 @@ int serdbg_open \*-------------------------------------------------------------------------*/ ( const char *dev_name, /* name of device to open */ - unsigned32 baudrate /* baud rate to use */ + uint32_t baudrate /* baud rate to use */ ); /*-------------------------------------------------------------------------*\ | Return Value: | diff --git a/cpukit/libmisc/serdbg/serdbgio.c b/cpukit/libmisc/serdbg/serdbgio.c index 44b38ac540..6581bf88e5 100644 --- a/cpukit/libmisc/serdbg/serdbgio.c +++ b/cpukit/libmisc/serdbg/serdbgio.c @@ -60,7 +60,7 @@ int serdbg_open \*-------------------------------------------------------------------------*/ ( const char *dev_name, /* name of device to open */ - unsigned32 baudrate /* baud rate to use */ + uint32_t baudrate /* baud rate to use */ ) /*-------------------------------------------------------------------------*\ | Return Value: | diff --git a/cpukit/libmisc/serdbg/termios_printk.c b/cpukit/libmisc/serdbg/termios_printk.c index 06fd3c6c01..c924498c95 100644 --- a/cpukit/libmisc/serdbg/termios_printk.c +++ b/cpukit/libmisc/serdbg/termios_printk.c @@ -145,7 +145,7 @@ int termios_printk_open \*-------------------------------------------------------------------------*/ ( const char *dev_name, /* name of device to open */ - unsigned32 baudrate /* baud rate to use */ + uint32_t baudrate /* baud rate to use */ ) /*-------------------------------------------------------------------------*\ | Return Value: | diff --git a/cpukit/libmisc/serdbg/termios_printk.h b/cpukit/libmisc/serdbg/termios_printk.h index 51446aca4b..184ec77162 100644 --- a/cpukit/libmisc/serdbg/termios_printk.h +++ b/cpukit/libmisc/serdbg/termios_printk.h @@ -26,7 +26,7 @@ #include <termios.h> typedef struct { - unsigned32 baudrate; /* debug baud rate, e.g. 57600 */ + uint32_t baudrate; /* debug baud rate, e.g. 57600 */ void (*callout)(void); /* callout pointer during polling */ const char *devname; /* debug device, e.g. "/dev/tty01" */ } termios_printk_conf_t; @@ -86,7 +86,7 @@ int termios_printk_open \*-------------------------------------------------------------------------*/ ( const char *dev_name, /* name of device to open */ - unsigned32 baudrate /* baud rate to use */ + uint32_t baudrate /* baud rate to use */ ); /*-------------------------------------------------------------------------*\ | Return Value: | diff --git a/cpukit/libmisc/shell/shell.c b/cpukit/libmisc/shell/shell.c index 4a31186700..048de82c29 100644 --- a/cpukit/libmisc/shell/shell.c +++ b/cpukit/libmisc/shell/shell.c @@ -38,7 +38,7 @@ /* ----------------------------------------------- * * This is a stupidity but is cute. * ----------------------------------------------- */ -rtems_unsigned32 new_rtems_name(char * rtems_name) { +uint32_t new_rtems_name(char * rtems_name) { static char b[5]; sprintf(b,"%-4.4s",rtems_name); return rtems_build_name(b[0],b[1],b[2],b[3]); @@ -639,7 +639,7 @@ rtems_task shell_shell(rtems_task_argument task_argument) { } /* ----------------------------------------------- */ rtems_status_code shell_init (char * task_name, - rtems_unsigned32 task_stacksize, + uint32_t task_stacksize, rtems_task_priority task_priority, char * devname, tcflag_t tcflag, diff --git a/cpukit/libmisc/shell/shell.h b/cpukit/libmisc/shell/shell.h index 6c8cbc6771..ba57d7ca2a 100644 --- a/cpukit/libmisc/shell/shell.h +++ b/cpukit/libmisc/shell/shell.h @@ -38,7 +38,7 @@ struct shell_cmd_tt { shell_cmd_t * next; }; -rtems_unsigned32 new_rtems_name(char * rtems_name); +uint32_t new_rtems_name(char * rtems_name); shell_cmd_t * shell_lookup_cmd(char * cmd); shell_cmd_t * shell_add_cmd(char * cmd, char * topic, @@ -67,7 +67,7 @@ void cat_file(FILE * out,char *name); void write_file(char *name,char * content); rtems_status_code shell_init(char * task_name , - rtems_unsigned32 task_stacksize,/*0 default*/ + uint32_t task_stacksize,/*0 default*/ rtems_task_priority task_priority , char * devname , tcflag_t tcflag , diff --git a/cpukit/libmisc/stackchk/check.c b/cpukit/libmisc/stackchk/check.c index 88cf1990bd..4a5dfa960e 100644 --- a/cpukit/libmisc/stackchk/check.c +++ b/cpukit/libmisc/stackchk/check.c @@ -143,7 +143,7 @@ stack_check_dope_stack(Stack_Control *stack) * Stack_check_Initialize */ -unsigned32 stack_check_initialized = 0; +uint32_t stack_check_initialized = 0; void Stack_check_Initialize( void ) { @@ -151,10 +151,10 @@ void Stack_check_Initialize( void ) rtems_status_code status; Objects_Id id_ignored; #endif - unsigned32 *p; + uint32_t *p; #if 0 - unsigned32 i; - unsigned32 api_index; + uint32_t i; + uint32_t api_index; Thread_Control *the_thread; Objects_Information *information; #endif @@ -318,7 +318,7 @@ void Stack_check_report_blown_task(void) "BLOWN STACK!!! Offending task(%p): id=0x%08x; name=0x%08x", running, running->Object.id, - (unsigned32)running->Object.name + (uint32_t )running->Object.name ); fflush(stderr); @@ -335,9 +335,9 @@ void Stack_check_report_blown_task(void) fprintf( stderr, " stack covers range 0x%08x - 0x%08x (%d bytes)\n", - (unsigned32) stack->area, - (unsigned32) stack->area + stack->size - 1, - (unsigned32) stack->size); + (uint32_t ) stack->area, + (uint32_t ) stack->area + stack->size - 1, + (uint32_t ) stack->size); fflush(stderr); fprintf( @@ -347,7 +347,7 @@ void Stack_check_report_blown_task(void) (long) PATTERN_SIZE_BYTES); fflush(stderr); - rtems_fatal_error_occurred( (unsigned32) "STACK BLOWN" ); + rtems_fatal_error_occurred( (uint32_t ) "STACK BLOWN" ); } /*PAGE @@ -377,8 +377,8 @@ void *Stack_check_find_high_water_mark( size_t n ) { - const unsigned32 *base, *ebase; - unsigned32 length; + const uint32_t *base, *ebase; + uint32_t length; base = s; length = n/4; @@ -419,11 +419,11 @@ void Stack_check_Dump_threads_usage( Thread_Control *the_thread ) { - unsigned32 size, used; + uint32_t size, used; void *low; void *high_water_mark; Stack_Control *stack; - unsigned32 u32_name; + uint32_t u32_name; char name_str[5]; char *name; Objects_Information *info; @@ -464,7 +464,7 @@ void Stack_check_Dump_threads_usage( if ( info->is_string ) { name = (char *) the_thread->Object.name; } else { - u32_name = (unsigned32)the_thread->Object.name; + u32_name = (uint32_t )the_thread->Object.name; name[ 0 ] = (u32_name >> 24) & 0xff; name[ 1 ] = (u32_name >> 16) & 0xff; name[ 2 ] = (u32_name >> 8) & 0xff; @@ -483,8 +483,8 @@ void Stack_check_Dump_threads_usage( printf( "0x%08x %4s 0x%08x 0x%08x %8d %8d\n", the_thread ? the_thread->Object.id : ~0, name, - (unsigned32) stack->area, - (unsigned32) stack->area + (unsigned32) stack->size - 1, + (uint32_t ) stack->area, + (uint32_t ) stack->area + (uint32_t ) stack->size - 1, size, used ); @@ -498,7 +498,7 @@ void Stack_check_Dump_threads_usage( void Stack_check_Fatal_extension( Internal_errors_Source source, boolean is_internal, - unsigned32 status + uint32_t status ) { #ifndef DONT_USE_FATAL_EXTENSION @@ -515,10 +515,10 @@ void Stack_check_Fatal_extension( void Stack_check_Dump_usage( void ) { - unsigned32 i; - unsigned32 api_index; + uint32_t i; + uint32_t api_index; Thread_Control *the_thread; - unsigned32 hit_running = 0; + uint32_t hit_running = 0; Objects_Information *information; if (stack_check_initialized == 0) diff --git a/cpukit/libmisc/stackchk/internal.h b/cpukit/libmisc/stackchk/internal.h index 9e64d6e4de..c437eb94c1 100644 --- a/cpukit/libmisc/stackchk/internal.h +++ b/cpukit/libmisc/stackchk/internal.h @@ -32,10 +32,10 @@ extern "C" { #define PATTERN_SIZE_WORDS (4) #endif -#define PATTERN_SIZE_BYTES (PATTERN_SIZE_WORDS * sizeof(unsigned32)) +#define PATTERN_SIZE_BYTES (PATTERN_SIZE_WORDS * sizeof(uint32_t )) typedef struct { - unsigned32 pattern[ PATTERN_SIZE_WORDS ]; + uint32_t pattern[ PATTERN_SIZE_WORDS ]; } Stack_check_Control; /* @@ -78,7 +78,7 @@ void Stack_check_Switch_extension( void Stack_check_Fatal_extension( Internal_errors_Source source, boolean is_internal, - unsigned32 status + uint32_t status ); /* |