summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-10-27 08:24:10 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-10-27 08:24:10 +0000
commitc182e2dcabad7f8b17ba8a4289af1e93eb6b1a92 (patch)
tree6bf68ecb766ae2a50719ba6971aafc106eb66f84
parent2004-10-27 Ralf Corsepius <ralf_corsepius@rtems.org> (diff)
downloadrtems-c182e2dcabad7f8b17ba8a4289af1e93eb6b1a92.tar.bz2
2004-10-27 Ralf Corsepius <ralf_corsepius@rtems.org>
* monitor/mon-prmisc.c, monitor/monitor.h: Let rtems_monitor_dump return int's not uint32_t (They are printf return values).
-rw-r--r--cpukit/ChangeLog5
-rw-r--r--cpukit/libmisc/monitor/mon-prmisc.c32
-rw-r--r--cpukit/libmisc/monitor/monitor.h22
3 files changed, 32 insertions, 27 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index f486bf8fa8..a8079c0561 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,10 @@
2004-10-27 Ralf Corsepius <ralf_corsepius@rtems.org>
+ * monitor/mon-prmisc.c, monitor/monitor.h: Let rtems_monitor_dump
+ return int's not uint32_t (They are printf return values).
+
+2004-10-27 Ralf Corsepius <ralf_corsepius@rtems.org>
+
* configure.ac: Add score/cpu/no_cpu/Makefile.
2004-10-27 Ralf Corsepius <ralf_corsepius@rtems.org>
diff --git a/cpukit/libmisc/monitor/mon-prmisc.c b/cpukit/libmisc/monitor/mon-prmisc.c
index 79f9d21c72..30b00fb501 100644
--- a/cpukit/libmisc/monitor/mon-prmisc.c
+++ b/cpukit/libmisc/monitor/mon-prmisc.c
@@ -41,7 +41,7 @@ rtems_monitor_pad(
return fprintf(stdout,"%*s", pad_length, "");
}
-uint32_t
+int
rtems_monitor_dump_char(char ch)
{
if (isprint(ch))
@@ -50,19 +50,19 @@ rtems_monitor_dump_char(char ch)
return fprintf(stdout,"%02x", ch);
}
-uint32_t
+int
rtems_monitor_dump_decimal(uint32_t num)
{
return fprintf(stdout,"%4d", num);
}
-uint32_t
+int
rtems_monitor_dump_hex(uint32_t num)
{
return fprintf(stdout,"0x%x", num);
}
-uint32_t
+int
rtems_monitor_dump_assoc_bitfield(
rtems_assoc_t *ap,
char *separator,
@@ -90,17 +90,17 @@ rtems_monitor_dump_assoc_bitfield(
return length;
}
-uint32_t
+int
rtems_monitor_dump_id(rtems_id id)
{
return fprintf(stdout,"%08x", id);
}
-uint32_t
+int
rtems_monitor_dump_name(rtems_name name)
{
uint32_t i;
- uint32_t length = 0;
+ int length = 0;
union {
uint32_t ui;
char c[4];
@@ -118,7 +118,7 @@ rtems_monitor_dump_name(rtems_name name)
return length;
}
-uint32_t
+int
rtems_monitor_dump_priority(rtems_task_priority priority)
{
return fprintf(stdout,"%3d", priority);
@@ -146,10 +146,10 @@ rtems_assoc_t rtems_monitor_state_assoc[] = {
{ 0, 0, 0 },
};
-uint32_t
+int
rtems_monitor_dump_state(States_Control state)
{
- uint32_t length = 0;
+ int length = 0;
if (state == STATES_READY) /* assoc doesn't deal with this as it is 0 */
length += fprintf(stdout,"READY");
@@ -169,10 +169,10 @@ rtems_assoc_t rtems_monitor_attribute_assoc[] = {
{ 0, 0, 0 },
};
-uint32_t
+int
rtems_monitor_dump_attributes(rtems_attribute attributes)
{
- uint32_t length = 0;
+ int length = 0;
if (attributes == RTEMS_DEFAULT_ATTRIBUTES) /* value is 0 */
length += fprintf(stdout,"DEFAULT");
@@ -190,7 +190,7 @@ rtems_assoc_t rtems_monitor_modes_assoc[] = {
{ 0, 0, 0 },
};
-uint32_t
+int
rtems_monitor_dump_modes(rtems_mode modes)
{
uint32_t length = 0;
@@ -240,7 +240,7 @@ rtems_assoc_t rtems_monitor_events_assoc[] = {
{ 0, 0, 0 },
};
-uint32_t
+int
rtems_monitor_dump_events(rtems_event_set events)
{
uint32_t length = 0;
@@ -254,10 +254,10 @@ rtems_monitor_dump_events(rtems_event_set events)
return length;
}
-uint32_t
+int
rtems_monitor_dump_notepad(uint32_t *notepad)
{
- uint32_t length = 0;
+ int length = 0;
int i;
for (i=0; i < RTEMS_NUMBER_NOTEPADS; i++)
diff --git a/cpukit/libmisc/monitor/monitor.h b/cpukit/libmisc/monitor/monitor.h
index 4e501167c9..241daada96 100644
--- a/cpukit/libmisc/monitor/monitor.h
+++ b/cpukit/libmisc/monitor/monitor.h
@@ -359,17 +359,17 @@ void rtems_monitor_help_cmd(int, char **, rtems_monitor_command_arg_t *, bool
/* prmisc.c */
void rtems_monitor_separator(void);
uint32_t rtems_monitor_pad(uint32_t dest_col, uint32_t curr_col);
-uint32_t rtems_monitor_dump_char(char 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);
+int rtems_monitor_dump_char(char ch);
+int rtems_monitor_dump_decimal(uint32_t num);
+int rtems_monitor_dump_hex(uint32_t num);
+int rtems_monitor_dump_id(rtems_id id);
+int rtems_monitor_dump_name(rtems_name name);
+int rtems_monitor_dump_priority(rtems_task_priority priority);
+int rtems_monitor_dump_state(States_Control state);
+int rtems_monitor_dump_modes(rtems_mode modes);
+int rtems_monitor_dump_attributes(rtems_attribute attributes);
+int rtems_monitor_dump_events(rtems_event_set events);
+int rtems_monitor_dump_notepad(uint32_t *notepad);
/* object.c */
rtems_id rtems_monitor_id_fixup(rtems_id, uint32_t , rtems_monitor_object_type_t);