diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-07-01 22:19:33 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-07-01 22:19:33 +0000 |
commit | 63977bb4d3d7dc0d556d63a386ac74c21ec4ebd3 (patch) | |
tree | 4c3a4ea9678d027e769f0e5ab2d3a48f5c52b625 /cpukit/libmisc/monitor | |
parent | 2002-07-01 Joel Sherrill <joel@OARcorp.com> (diff) | |
download | rtems-63977bb4d3d7dc0d556d63a386ac74c21ec4ebd3.tar.bz2 |
2002-07-01 Joel Sherrill <joel@OARcorp.com>
* capture/capture-cli.c, cpuuse/cpuuse.c, monitor/mon-monitor.c,
monitor/mon-object.c, monitor/monitor.h: Corrected use of
_Objects_Information_table now that it is a two dimensional
array based upon API and class. In addition, in the monitor,
corrected an error which occured when a target has 64 bit pointers.
Diffstat (limited to 'cpukit/libmisc/monitor')
-rw-r--r-- | cpukit/libmisc/monitor/mon-monitor.c | 28 | ||||
-rw-r--r-- | cpukit/libmisc/monitor/mon-object.c | 5 | ||||
-rw-r--r-- | cpukit/libmisc/monitor/monitor.h | 10 |
3 files changed, 25 insertions, 18 deletions
diff --git a/cpukit/libmisc/monitor/mon-monitor.c b/cpukit/libmisc/monitor/mon-monitor.c index c1b5794430..c63ae52be2 100644 --- a/cpukit/libmisc/monitor/mon-monitor.c +++ b/cpukit/libmisc/monitor/mon-monitor.c @@ -69,21 +69,21 @@ rtems_monitor_command_entry_t rtems_monitor_commands[] = { "Show the system configuration.", 0, rtems_monitor_object_cmd, - RTEMS_MONITOR_OBJECT_CONFIG, + (rtems_monitor_command_arg_t) RTEMS_MONITOR_OBJECT_CONFIG, &rtems_monitor_commands[1], }, { "itask", "List init tasks for the system", 0, rtems_monitor_object_cmd, - RTEMS_MONITOR_OBJECT_INIT_TASK, + (rtems_monitor_command_arg_t) RTEMS_MONITOR_OBJECT_INIT_TASK, &rtems_monitor_commands[2], }, { "mpci", "Show the MPCI system configuration, if configured.", 0, rtems_monitor_object_cmd, - RTEMS_MONITOR_OBJECT_MPCI, + (rtems_monitor_command_arg_t) RTEMS_MONITOR_OBJECT_MPCI, &rtems_monitor_commands[3], }, { "pause", @@ -127,7 +127,7 @@ rtems_monitor_command_entry_t rtems_monitor_commands[] = { #if defined(RTEMS_CPU_HAS_16_BIT_ADDRESSES) 0, /* XXX find a way to fix the compile time error on h8 */ #else - (unsigned32) &rtems_monitor_symbols, + (rtems_monitor_command_arg_t) &rtems_monitor_symbols, #endif &rtems_monitor_commands[8], }, @@ -137,7 +137,7 @@ rtems_monitor_command_entry_t rtems_monitor_commands[] = { " extension [id [id ...] ]", 0, rtems_monitor_object_cmd, - RTEMS_MONITOR_OBJECT_EXTENSION, + (rtems_monitor_command_arg_t) RTEMS_MONITOR_OBJECT_EXTENSION, &rtems_monitor_commands[9], }, { "task", @@ -146,7 +146,7 @@ rtems_monitor_command_entry_t rtems_monitor_commands[] = { " task [id [id ...] ]", 0, rtems_monitor_object_cmd, - RTEMS_MONITOR_OBJECT_TASK, + (rtems_monitor_command_arg_t) RTEMS_MONITOR_OBJECT_TASK, &rtems_monitor_commands[10], }, { "queue", @@ -155,7 +155,7 @@ rtems_monitor_command_entry_t rtems_monitor_commands[] = { " queue [id [id ... ] ]", 0, rtems_monitor_object_cmd, - RTEMS_MONITOR_OBJECT_QUEUE, + (rtems_monitor_command_arg_t) RTEMS_MONITOR_OBJECT_QUEUE, &rtems_monitor_commands[11], }, { "object", @@ -165,7 +165,7 @@ rtems_monitor_command_entry_t rtems_monitor_commands[] = { " object [id [id ...] ]", 0, rtems_monitor_object_cmd, - RTEMS_MONITOR_OBJECT_INVALID, + (rtems_monitor_command_arg_t) RTEMS_MONITOR_OBJECT_INVALID, &rtems_monitor_commands[12], }, { "driver", @@ -173,14 +173,14 @@ rtems_monitor_command_entry_t rtems_monitor_commands[] = { " driver [ major [ major ... ] ]", 0, rtems_monitor_object_cmd, - RTEMS_MONITOR_OBJECT_DRIVER, + (rtems_monitor_command_arg_t) RTEMS_MONITOR_OBJECT_DRIVER, &rtems_monitor_commands[13], }, { "dname", "Displays information about named drivers.\n", 0, rtems_monitor_object_cmd, - RTEMS_MONITOR_OBJECT_DNAME, + (rtems_monitor_command_arg_t) RTEMS_MONITOR_OBJECT_DNAME, &rtems_monitor_commands[14], }, { "exit", @@ -189,7 +189,7 @@ rtems_monitor_command_entry_t rtems_monitor_commands[] = { " exit [status]", 0, rtems_monitor_fatal_cmd, - RTEMS_SUCCESSFUL, + (rtems_monitor_command_arg_t) RTEMS_SUCCESSFUL, &rtems_monitor_commands[15], }, { "fatal", @@ -197,14 +197,14 @@ rtems_monitor_command_entry_t rtems_monitor_commands[] = { " fatal [status]", 0, rtems_monitor_fatal_cmd, - RTEMS_TASK_EXITTED, /* exit value */ + (rtems_monitor_command_arg_t) RTEMS_TASK_EXITTED, /* exit value */ &rtems_monitor_commands[16], }, { "quit", "Alias for 'exit'\n", 0, rtems_monitor_fatal_cmd, - RTEMS_SUCCESSFUL, /* exit value */ + (rtems_monitor_command_arg_t) RTEMS_SUCCESSFUL, /* exit value */ &rtems_monitor_commands[17], }, { "help", @@ -216,7 +216,7 @@ rtems_monitor_command_entry_t rtems_monitor_commands[] = { #if defined(RTEMS_CPU_HAS_16_BIT_ADDRESSES) 0, /* XXX find a way to fix the compile time error on h8 */ #else - (unsigned32) rtems_monitor_commands, + (rtems_monitor_command_arg_t) rtems_monitor_commands, #endif &rtems_monitor_commands[18], }, diff --git a/cpukit/libmisc/monitor/mon-object.c b/cpukit/libmisc/monitor/mon-object.c index 8112372d86..73a5979da5 100644 --- a/cpukit/libmisc/monitor/mon-object.c +++ b/cpukit/libmisc/monitor/mon-object.c @@ -129,7 +129,8 @@ rtems_monitor_id_fixup( if (rtems_get_class(id) != OBJECTS_NO_CLASS) type = rtems_get_class(id); - id = _Objects_Build_id(type, default_node, rtems_get_index(id)); + id = _Objects_Build_id( + OBJECTS_CLASSIC_API, type, default_node, rtems_get_index(id)); } return id; } @@ -295,7 +296,7 @@ rtems_monitor_object_dump_all( rtems_id next_id; rtems_monitor_union_t canonical; - next_id = RTEMS_OBJECT_ID_INITIAL(info->type, rtems_monitor_default_node); + next_id = RTEMS_OBJECT_ID_INITIAL(OBJECTS_CLASSIC_API, info->type, rtems_monitor_default_node); while ((next_id = rtems_monitor_object_canonical_next( info, diff --git a/cpukit/libmisc/monitor/monitor.h b/cpukit/libmisc/monitor/monitor.h index ef0e099ac7..c6eb3c5cfe 100644 --- a/cpukit/libmisc/monitor/monitor.h +++ b/cpukit/libmisc/monitor/monitor.h @@ -36,7 +36,7 @@ typedef enum { /* following monitor objects are not known to RTEMS, but * we like to have "types" for them anyway */ - RTEMS_MONITOR_OBJECT_DRIVER = OBJECTS_CLASSES_LAST+1, + RTEMS_MONITOR_OBJECT_DRIVER = OBJECTS_RTEMS_CLASSES_LAST+1, RTEMS_MONITOR_OBJECT_DNAME, RTEMS_MONITOR_OBJECT_CONFIG, RTEMS_MONITOR_OBJECT_INIT_TASK, @@ -289,13 +289,19 @@ typedef void ( *rtems_monitor_command_function_t )( boolean verbose ); +#if defined(__mips64) + typedef unsigned64 rtems_monitor_command_arg_t; +#else + typedef unsigned32 rtems_monitor_command_arg_t; +#endif + struct rtems_monitor_command_entry_s { char *command; /* command name */ char *usage; /* usage string for the command */ unsigned32 arguments_required; /* # of required args */ rtems_monitor_command_function_t command_function; /* Some argument for the command */ - unsigned32 command_arg; + rtems_monitor_command_arg_t command_arg; struct rtems_monitor_command_entry_s *next; }; |