RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2004-11-01 Ralf Corsepius <ralf_corsepius@rtems.org>

Browse Source 
* monitor/monitor.h: Let rtems_monitor_config_dump return int.
	* monitor/mon-config.c: Ditto. Use PRI*N macros.
	* monitor/mon-itask.c, monitor/mon-prmisc.c: Use PRI*N macros.
This commit is contained in:
Ralf Corsepius
2004-11-01 13:14:33 +00:00
parent e7ab8899cd
commit cbd849c0de
6 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cpukit/ChangeLog
View File

@@ -1,3 +1,9 @@
2004-11-01 Ralf Corsepius <ralf_corsepius@rtems.org>
* monitor/monitor.h: Let rtems_monitor_config_dump return int.
* monitor/mon-config.c: Ditto. Use PRI*N macros.
* monitor/mon-itask.c, monitor/mon-prmisc.c: Use PRI*N macros.
2004-11-01 Ralf Corsepius <ralf_corsepius@rtems.org> 2004-11-01 Ralf Corsepius <ralf_corsepius@rtems.org>
* configure.ac: Remove -ansi (Cygwin breaks with it). * configure.ac: Remove -ansi (Cygwin breaks with it).

14
cpukit/libmisc/monitor/mon-config.c
View File

@@ -14,6 +14,7 @@
#include <rtems.h> #include <rtems.h>
#include <rtems/monitor.h> #include <rtems/monitor.h>
#include <inttypes.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> /* strtoul() */ #include <stdlib.h> /* strtoul() */
@@ -92,25 +93,25 @@ INITIAL (startup) Configuration Info\n");
} }
void int
rtems_monitor_config_dump( rtems_monitor_config_dump(
rtems_monitor_config_t *monitor_config, rtems_monitor_config_t *monitor_config,
boolean verbose boolean verbose
) )
{ {
uint32_t length = 0; int length = 0;
length = 0; length = 0;
length += fprintf(stdout,"WORKSPACE"); length += fprintf(stdout,"WORKSPACE");
length += rtems_monitor_pad(DATACOL, length); length += rtems_monitor_pad(DATACOL, length);
length += fprintf(stdout,"start: %p; size: 0x%x\n", length += fprintf(stdout,"start: %p; size: 0x%" PRIx32 "\n",
monitor_config->work_space_start, monitor_config->work_space_start,
monitor_config->work_space_size); monitor_config->work_space_size);
length = 0; length = 0;
length += fprintf(stdout,"TIME"); length += fprintf(stdout,"TIME");
length += rtems_monitor_pad(DATACOL, length); length += rtems_monitor_pad(DATACOL, length);
length += fprintf(stdout,"usec/tick: %d; tick/timeslice: %d; tick/sec: %d\n", length += fprintf(stdout,"usec/tick: %" PRId32 "; tick/timeslice: %" PRId32 "; tick/sec: %" PRId32 "\n",
monitor_config->microseconds_per_tick, monitor_config->microseconds_per_tick,
monitor_config->ticks_per_timeslice, monitor_config->ticks_per_timeslice,
1000000 / monitor_config->microseconds_per_tick); 1000000 / monitor_config->microseconds_per_tick);
@@ -118,7 +119,7 @@ rtems_monitor_config_dump(
length = 0; length = 0;
length += fprintf(stdout,"MAXIMUMS"); length += fprintf(stdout,"MAXIMUMS");
length += rtems_monitor_pad(DATACOL, length); length += rtems_monitor_pad(DATACOL, length);
length += fprintf(stdout,"tasks: %d; timers: %d; sems: %d; que's: %d; ext's: %d\n", length += fprintf(stdout,"tasks: %" PRId32 "; timers: %" PRId32 "; sems: %" PRId32 "; que's: %" PRId32 "; ext's: %" PRId32 "\n",
monitor_config->maximum_tasks, monitor_config->maximum_tasks,
monitor_config->maximum_timers, monitor_config->maximum_timers,
monitor_config->maximum_semaphores, monitor_config->maximum_semaphores,
@@ -126,9 +127,10 @@ rtems_monitor_config_dump(
monitor_config->maximum_extensions); monitor_config->maximum_extensions);
length = 0; length = 0;
length += rtems_monitor_pad(CONTCOL, length); length += rtems_monitor_pad(CONTCOL, length);
length += fprintf(stdout,"partitions: %d; regions: %d; ports: %d; periods: %d\n", length += fprintf(stdout,"partitions: %" PRId32 "; regions: %" PRId32 "; ports: %" PRId32 "; periods: %" PRId32 "\n",
monitor_config->maximum_partitions, monitor_config->maximum_partitions,
monitor_config->maximum_regions, monitor_config->maximum_regions,
monitor_config->maximum_ports, monitor_config->maximum_ports,
monitor_config->maximum_periods); monitor_config->maximum_periods);
return length;
} }

7
cpukit/libmisc/monitor/mon-itask.c
View File

@@ -12,6 +12,7 @@
#include <rtems.h> #include <rtems.h>
#include <rtems/monitor.h> #include <rtems/monitor.h>
#include <inttypes.h>
#include <stdio.h> #include <stdio.h>
/* /*
@@ -101,7 +102,8 @@ rtems_monitor_init_task_dump(
length += rtems_monitor_symbol_dump(&monitor_itask->entry, verbose); length += rtems_monitor_symbol_dump(&monitor_itask->entry, verbose);
length += rtems_monitor_pad(25, length); length += rtems_monitor_pad(25, length);
length += fprintf(stdout,"%d [0x%x]", monitor_itask->argument, monitor_itask->argument); length += fprintf(stdout,"%" PRId32 " [0x%" PRIx32 "]",
monitor_itask->argument, monitor_itask->argument);
length += rtems_monitor_pad(39, length); length += rtems_monitor_pad(39, length);
length += rtems_monitor_dump_priority(monitor_itask->priority); length += rtems_monitor_dump_priority(monitor_itask->priority);
@@ -113,7 +115,8 @@ rtems_monitor_init_task_dump(
length += rtems_monitor_dump_attributes(monitor_itask->attributes); length += rtems_monitor_dump_attributes(monitor_itask->attributes);
length += rtems_monitor_pad(66, length); length += rtems_monitor_pad(66, length);
length += fprintf(stdout,"%d [0x%x]", monitor_itask->stack_size, monitor_itask->stack_size); length += fprintf(stdout,"%" PRId32 " [0x%" PRIx32 "]",
monitor_itask->stack_size, monitor_itask->stack_size);
fprintf(stdout,"\n"); fprintf(stdout,"\n");
} }

13
cpukit/libmisc/monitor/mon-prmisc.c
View File

@@ -18,6 +18,7 @@
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
#include <inttypes.h>
void void
rtems_monitor_separator(void) rtems_monitor_separator(void)
@@ -53,13 +54,13 @@ rtems_monitor_dump_char(char ch)
int int
rtems_monitor_dump_decimal(uint32_t num) rtems_monitor_dump_decimal(uint32_t num)
{ {
return fprintf(stdout,"%4d", num); return fprintf(stdout,"%4" PRId32, num);
} }
int int
rtems_monitor_dump_hex(uint32_t num) rtems_monitor_dump_hex(uint32_t num)
{ {
return fprintf(stdout,"0x%x", num); return fprintf(stdout,"0x%" PRIx32, num);
} }
int int
@@ -84,7 +85,7 @@ rtems_monitor_dump_assoc_bitfield(
if (name) if (name)
length += fprintf(stdout,"%s", name); length += fprintf(stdout,"%s", name);
else else
length += fprintf(stdout,"0x%x", b); length += fprintf(stdout,"0x%" PRIx32, b);
} }
return length; return length;
@@ -93,7 +94,7 @@ rtems_monitor_dump_assoc_bitfield(
int int
rtems_monitor_dump_id(rtems_id id) rtems_monitor_dump_id(rtems_id id)
{ {
return fprintf(stdout,"%08x", id); return fprintf(stdout,"%08" PRIx32, id);
} }
int int
@@ -121,7 +122,7 @@ rtems_monitor_dump_name(rtems_name name)
int int
rtems_monitor_dump_priority(rtems_task_priority priority) rtems_monitor_dump_priority(rtems_task_priority priority)
{ {
return fprintf(stdout,"%3d", priority); return fprintf(stdout,"%3" PRId32, priority);
} }
@@ -262,7 +263,7 @@ rtems_monitor_dump_notepad(uint32_t *notepad)
for (i=0; i < RTEMS_NUMBER_NOTEPADS; i++) for (i=0; i < RTEMS_NUMBER_NOTEPADS; i++)
if (notepad[i]) if (notepad[i])
length += fprintf(stdout,"%d: 0x%x ", i, notepad[i]); length += fprintf(stdout,"%d: 0x%" PRIx32, i, notepad[i]);
return length; return length;
} }

2
cpukit/libmisc/monitor/monitor.h
View File

@@ -386,7 +386,7 @@ void *rtems_monitor_manager_next(void *, void *, rtems_id *);
void rtems_monitor_config_canonical(rtems_monitor_config_t *, void *); void rtems_monitor_config_canonical(rtems_monitor_config_t *, void *);
void *rtems_monitor_config_next(void *, rtems_monitor_config_t *, rtems_id *); void *rtems_monitor_config_next(void *, rtems_monitor_config_t *, rtems_id *);
void rtems_monitor_config_dump_header(boolean); void rtems_monitor_config_dump_header(boolean);
void rtems_monitor_config_dump(rtems_monitor_config_t *, boolean verbose); int rtems_monitor_config_dump(rtems_monitor_config_t *, boolean verbose);
/* mpci.c */ /* mpci.c */
#if defined(RTEMS_MULTIPROCESSING) #if defined(RTEMS_MULTIPROCESSING)

2
cpukit/libmisc/stackchk/check.c
View File

@@ -143,7 +143,7 @@ stack_check_dope_stack(Stack_Control *stack)
* Stack_check_Initialize * Stack_check_Initialize
*/ */
uint32_t stack_check_initialized = 0; static int stack_check_initialized = 0;
void Stack_check_Initialize( void ) void Stack_check_Initialize( void )
{ {