forked from Imagelibrary/rtems
Remove stray white spaces.
This commit is contained in:
@@ -24,8 +24,8 @@
|
||||
|
||||
/*
|
||||
* 2001-01-30 KJO (vac4050@cae597.rsc.raytheon.com):
|
||||
* Fixed rtems_monitor_command_lookup() to accept partial
|
||||
* commands to uniqeness. Added support for setting
|
||||
* Fixed rtems_monitor_command_lookup() to accept partial
|
||||
* commands to uniqeness. Added support for setting
|
||||
* the monitor prompt via an environment variable:
|
||||
* RTEMS_MONITOR_PROMPT
|
||||
*
|
||||
@@ -47,9 +47,9 @@
|
||||
#define KEYS_LARROW (4)
|
||||
#define KEYS_RARROW (5)
|
||||
#define KEYS_HOME (6)
|
||||
#define KEYS_END (7)
|
||||
#define KEYS_F1 (8)
|
||||
#define KEYS_F2 (9)
|
||||
#define KEYS_END (7)
|
||||
#define KEYS_F1 (8)
|
||||
#define KEYS_F2 (9)
|
||||
#define KEYS_F3 (10)
|
||||
#define KEYS_F4 (11)
|
||||
#define KEYS_F5 (12)
|
||||
@@ -233,7 +233,7 @@ rtems_monitor_line_editor (
|
||||
memset (buffer, 0, RTEMS_COMMAND_BUFFER_SIZE);
|
||||
history = history_next;
|
||||
pos = 0;
|
||||
|
||||
|
||||
if (!logged_in)
|
||||
printf ("\nMonitor ready, press enter to login.\n\n");
|
||||
else
|
||||
@@ -248,7 +248,7 @@ rtems_monitor_line_editor (
|
||||
* Make the extended_key usable as a boolean.
|
||||
*/
|
||||
extended_key &= ~KEYS_NORMAL_MASK;
|
||||
|
||||
|
||||
if (!extended_key && !logged_in)
|
||||
{
|
||||
if (c == '\n')
|
||||
@@ -276,7 +276,7 @@ rtems_monitor_line_editor (
|
||||
printf ("\r%s $ ", monitor_prompt);
|
||||
pos = 0;
|
||||
break;
|
||||
|
||||
|
||||
case KEYS_LARROW:
|
||||
if (pos > 0)
|
||||
{
|
||||
@@ -319,7 +319,7 @@ rtems_monitor_line_editor (
|
||||
putchar ('\b');
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
case KEYS_DARROW:
|
||||
if (history < history_next)
|
||||
{
|
||||
@@ -493,14 +493,14 @@ rtems_monitor_command_read(char *command,
|
||||
* put node number in the prompt if we are multiprocessing
|
||||
*/
|
||||
if (!rtems_configuration_get_user_multiprocessing_table ())
|
||||
sprintf (monitor_prompt, "%s",
|
||||
sprintf (monitor_prompt, "%s",
|
||||
(env_prompt == NULL) ? MONITOR_PROMPT: env_prompt);
|
||||
else if (rtems_monitor_default_node != rtems_monitor_node)
|
||||
sprintf (monitor_prompt, "%d-%s-%d", rtems_monitor_node,
|
||||
(env_prompt == NULL) ? MONITOR_PROMPT : env_prompt,
|
||||
rtems_monitor_default_node);
|
||||
else
|
||||
sprintf (monitor_prompt, "%d-%s", rtems_monitor_node,
|
||||
sprintf (monitor_prompt, "%d-%s", rtems_monitor_node,
|
||||
(env_prompt == NULL) ? MONITOR_PROMPT : env_prompt);
|
||||
|
||||
#if defined(RTEMS_UNIX)
|
||||
@@ -535,7 +535,7 @@ rtems_monitor_command_lookup(
|
||||
|
||||
if ((table == 0) || (argv[0] == 0))
|
||||
return 0;
|
||||
|
||||
|
||||
while (table)
|
||||
{
|
||||
if (table->command)
|
||||
@@ -550,7 +550,7 @@ rtems_monitor_command_lookup(
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
else
|
||||
found_it = table;
|
||||
}
|
||||
@@ -596,11 +596,11 @@ rtems_monitor_show_help (
|
||||
printf (" - No help associated.\n");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
while (help_len)
|
||||
{
|
||||
printf ("%*c", spaces, ' ');
|
||||
|
||||
|
||||
if (line_one)
|
||||
printf (" - ");
|
||||
|
||||
@@ -611,11 +611,11 @@ rtems_monitor_show_help (
|
||||
* See if greater then the line length if so, work back
|
||||
* from the end for a space, tab or lf or cr.
|
||||
*/
|
||||
|
||||
|
||||
if (help_len > MAX_HELP_LINE_LENGTH)
|
||||
{
|
||||
for (show_this_line = MAX_HELP_LINE_LENGTH - 1;
|
||||
show_this_line;
|
||||
for (show_this_line = MAX_HELP_LINE_LENGTH - 1;
|
||||
show_this_line;
|
||||
show_this_line--)
|
||||
if ((help[show_this_line] == ' ') ||
|
||||
(help[show_this_line] == '\n') ||
|
||||
@@ -625,7 +625,7 @@ rtems_monitor_show_help (
|
||||
/*
|
||||
* If show_this_line is 0, it is a very long word !!
|
||||
*/
|
||||
|
||||
|
||||
if (show_this_line == 0)
|
||||
show_this_line = MAX_HELP_LINE_LENGTH - 1;
|
||||
}
|
||||
@@ -639,14 +639,14 @@ rtems_monitor_show_help (
|
||||
putchar (help[c]);
|
||||
|
||||
printf ("\n");
|
||||
|
||||
|
||||
help += show_this_line;
|
||||
help_len -= show_this_line;
|
||||
|
||||
/*
|
||||
* Move past the line feeds or what ever else is being skipped.
|
||||
*/
|
||||
|
||||
|
||||
while (help_len)
|
||||
{
|
||||
if ((*help != '\r') && (*help != '\n'))
|
||||
@@ -673,16 +673,16 @@ rtems_monitor_command_usage(
|
||||
{
|
||||
rtems_monitor_command_entry_t *command = table;
|
||||
int max_cmd_len = 0;
|
||||
|
||||
|
||||
/* if first entry in table is a usage, then print it out */
|
||||
|
||||
if (command_string && (*command_string != '\0'))
|
||||
{
|
||||
char *argv[2];
|
||||
|
||||
|
||||
argv[0] = command_string;
|
||||
argv[1] = 0;
|
||||
|
||||
|
||||
command = rtems_monitor_command_lookup (table, 1, argv);
|
||||
|
||||
if (command)
|
||||
@@ -691,11 +691,11 @@ rtems_monitor_command_usage(
|
||||
printf ("Unrecognised command; try just 'help'\n");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Find the largest command size.
|
||||
*/
|
||||
|
||||
|
||||
while (command)
|
||||
{
|
||||
int len = command->command ? strlen (command->command) : 0 ;
|
||||
@@ -734,7 +734,7 @@ rtems_monitor_help_cmd(
|
||||
rtems_monitor_command_entry_t *command;
|
||||
|
||||
command = command_arg->monitor_command_entry;
|
||||
|
||||
|
||||
if (argc == 1)
|
||||
rtems_monitor_command_usage(command, 0);
|
||||
else
|
||||
|
||||
@@ -48,7 +48,7 @@ rtems_monitor_config_canonical(
|
||||
canonical_config->microseconds_per_tick = c->microseconds_per_tick;
|
||||
canonical_config->ticks_per_timeslice = c->ticks_per_timeslice;
|
||||
canonical_config->number_of_initialization_tasks = r->number_of_initialization_tasks;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* This is easy, since there is only 1 (altho we could get them from
|
||||
@@ -67,7 +67,7 @@ rtems_monitor_config_next(
|
||||
|
||||
if (n >= 1)
|
||||
goto failed;
|
||||
|
||||
|
||||
_Thread_Disable_dispatch();
|
||||
|
||||
*next_id += 1;
|
||||
|
||||
@@ -46,7 +46,7 @@ rtems_monitor_dname_canonical(
|
||||
(void) strncpy(canonical_dname->name_string, np->device_name, sizeof(canonical_dname->name_string));
|
||||
canonical_dname->major = np->major;
|
||||
canonical_dname->minor = np->minor;
|
||||
}
|
||||
}
|
||||
|
||||
void *
|
||||
rtems_monitor_dname_next(
|
||||
@@ -63,7 +63,7 @@ rtems_monitor_dname_next(
|
||||
for (np = table + n ; n<_IO_Number_of_devices; n++, np++)
|
||||
if (np->device_name)
|
||||
goto done;
|
||||
|
||||
|
||||
*next_id = RTEMS_OBJECT_ID_FINAL;
|
||||
return 0;
|
||||
|
||||
@@ -79,7 +79,7 @@ done:
|
||||
|
||||
*next_id += 1;
|
||||
return np;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
rtems_monitor_dname_dump_header(
|
||||
|
||||
@@ -71,7 +71,7 @@ rtems_monitor_driver_next(
|
||||
|
||||
if (n >= c->number_of_device_drivers)
|
||||
goto failed;
|
||||
|
||||
|
||||
_Thread_Disable_dispatch();
|
||||
|
||||
/*
|
||||
|
||||
@@ -50,7 +50,7 @@ rtems_monitor_extension_dump_header(
|
||||
ID NAME\n");
|
||||
/*23456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789
|
||||
0 1 2 3 4 5 6 7 */
|
||||
|
||||
|
||||
rtems_monitor_separator();
|
||||
}
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ rtems_monitor_init_task_canonical(
|
||||
)
|
||||
{
|
||||
rtems_initialization_tasks_table *rtems_itask = itask_void;
|
||||
|
||||
|
||||
rtems_monitor_symbol_canonical_by_value(&canonical_itask->entry,
|
||||
(void *) rtems_itask->entry_point);
|
||||
|
||||
@@ -48,7 +48,7 @@ rtems_monitor_init_task_next(
|
||||
|
||||
if (n >= c->RTEMS_api_configuration->number_of_initialization_tasks)
|
||||
goto failed;
|
||||
|
||||
|
||||
_Thread_Disable_dispatch();
|
||||
|
||||
itask = c->RTEMS_api_configuration->User_initialization_tasks_table + n;
|
||||
@@ -111,7 +111,7 @@ rtems_monitor_init_task_dump(
|
||||
|
||||
length += rtems_monitor_pad(54, length);
|
||||
length += rtems_monitor_dump_attributes(monitor_itask->attributes);
|
||||
|
||||
|
||||
length += rtems_monitor_pad(66, length);
|
||||
length += printf("%d [0x%x]", monitor_itask->stack_size, monitor_itask->stack_size);
|
||||
|
||||
|
||||
@@ -33,10 +33,10 @@ rtems_monitor_manager_next(
|
||||
/*
|
||||
* When we are called, it must be local
|
||||
*/
|
||||
|
||||
|
||||
if ( ! _Objects_Is_local_id(*next_id))
|
||||
goto done;
|
||||
|
||||
|
||||
object = _Objects_Get_next(table, *next_id, &location, next_id);
|
||||
|
||||
if (object)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* RTEMS monitor main body
|
||||
*
|
||||
*
|
||||
* TODO:
|
||||
* add stuff to RTEMS api
|
||||
* rtems_get_name(id)
|
||||
@@ -84,7 +84,7 @@ rtems_monitor_command_entry_t rtems_monitor_commands[] = {
|
||||
rtems_monitor_object_cmd,
|
||||
{ RTEMS_MONITOR_OBJECT_INIT_TASK },
|
||||
&rtems_monitor_commands[2],
|
||||
},
|
||||
},
|
||||
{ "mpci",
|
||||
"Show the MPCI system configuration, if configured.",
|
||||
0,
|
||||
@@ -227,7 +227,7 @@ rtems_monitor_command_entry_t rtems_monitor_commands[] = {
|
||||
{ 0 },
|
||||
&rtems_monitor_commands[19],
|
||||
},
|
||||
#endif
|
||||
#endif
|
||||
{ 0, 0, 0, 0, { 0 }, &rtems_registered_commands },
|
||||
};
|
||||
|
||||
@@ -237,7 +237,7 @@ rtems_monitor_suspend(rtems_interval timeout)
|
||||
{
|
||||
rtems_event_set event_set;
|
||||
rtems_status_code status;
|
||||
|
||||
|
||||
status = rtems_event_receive(MONITOR_WAKEUP_EVENT,
|
||||
RTEMS_DEFAULT_OPTIONS,
|
||||
timeout,
|
||||
@@ -249,7 +249,7 @@ void
|
||||
rtems_monitor_wakeup(void)
|
||||
{
|
||||
rtems_status_code status;
|
||||
|
||||
|
||||
status = rtems_event_send(rtems_monitor_task_id, MONITOR_WAKEUP_EVENT);
|
||||
}
|
||||
|
||||
@@ -314,7 +314,7 @@ rtems_monitor_node_cmd(
|
||||
)
|
||||
{
|
||||
uint32_t new_node = rtems_monitor_default_node;
|
||||
|
||||
|
||||
switch (argc)
|
||||
{
|
||||
case 1: /* no node, just set back to ours */
|
||||
@@ -370,13 +370,13 @@ rtems_monitor_symbols_loadup(void)
|
||||
|
||||
if (rtems_monitor_symbols)
|
||||
rtems_symbol_table_destroy(rtems_monitor_symbols);
|
||||
|
||||
|
||||
rtems_monitor_symbols = rtems_symbol_table_create(10);
|
||||
if (rtems_monitor_symbols == 0)
|
||||
return;
|
||||
|
||||
fp = fopen("symbols", "r");
|
||||
|
||||
|
||||
if (fp == 0)
|
||||
return;
|
||||
|
||||
@@ -441,7 +441,7 @@ rtems_monitor_erase_cmd (
|
||||
)
|
||||
{
|
||||
rtems_monitor_command_entry_t **p = & rtems_registered_commands.next;
|
||||
|
||||
|
||||
while (*p) {
|
||||
if ( STREQ(command->command, (*p)->command) ) {
|
||||
*p = (*p)->next;
|
||||
@@ -468,14 +468,14 @@ rtems_monitor_task(
|
||||
rtems_context_fp *fp;
|
||||
char command_buffer[513];
|
||||
int argc;
|
||||
char *argv[64];
|
||||
char *argv[64];
|
||||
boolean verbose = FALSE;
|
||||
struct termios term;
|
||||
|
||||
/*
|
||||
* Make the stdin stream characte not line based.
|
||||
*/
|
||||
|
||||
|
||||
if (tcgetattr (STDIN_FILENO, &term) < 0)
|
||||
{
|
||||
printf("rtems-monitor: cannot get terminal attributes.\n");
|
||||
@@ -487,7 +487,7 @@ rtems_monitor_task(
|
||||
*/
|
||||
|
||||
term.c_lflag &= ~(ECHO | ICANON | IEXTEN);
|
||||
|
||||
|
||||
/*
|
||||
* No sigint on BREAK, CR-to-NL off, input parity off,
|
||||
* don't strip 8th bit on input, output flow control off
|
||||
@@ -502,7 +502,7 @@ rtems_monitor_task(
|
||||
printf("cannot set terminal attributes\n");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (monitor_flags & RTEMS_MONITOR_SUSPEND)
|
||||
(void) rtems_monitor_suspend(RTEMS_NO_TIMEOUT);
|
||||
|
||||
@@ -543,7 +543,7 @@ rtems_monitor_kill(void)
|
||||
if (rtems_monitor_task_id)
|
||||
rtems_task_delete(rtems_monitor_task_id);
|
||||
rtems_monitor_task_id = 0;
|
||||
|
||||
|
||||
rtems_monitor_server_kill();
|
||||
}
|
||||
|
||||
@@ -553,7 +553,7 @@ rtems_monitor_init(
|
||||
)
|
||||
{
|
||||
rtems_status_code status;
|
||||
|
||||
|
||||
rtems_monitor_kill();
|
||||
|
||||
status = rtems_task_create(RTEMS_MONITOR_NAME,
|
||||
@@ -579,7 +579,7 @@ rtems_monitor_init(
|
||||
/*
|
||||
* Start the monitor task itself
|
||||
*/
|
||||
|
||||
|
||||
status = rtems_task_start(rtems_monitor_task_id,
|
||||
rtems_monitor_task,
|
||||
monitor_flags);
|
||||
|
||||
@@ -38,7 +38,7 @@ rtems_monitor_mpci_canonical(
|
||||
if (m == 0)
|
||||
return;
|
||||
mt = m->User_mpci_table;
|
||||
|
||||
|
||||
canonical_mpci->node = m->node;
|
||||
canonical_mpci->maximum_nodes = m->maximum_nodes;
|
||||
canonical_mpci->maximum_global_objects = m->maximum_global_objects;
|
||||
@@ -58,7 +58,7 @@ rtems_monitor_mpci_canonical(
|
||||
(void *) mt->send_packet);
|
||||
rtems_monitor_symbol_canonical_by_value(&canonical_mpci->receive_packet,
|
||||
(void *) mt->receive_packet);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* This is easy, since there is only 1 (altho we could get them from
|
||||
@@ -77,10 +77,10 @@ rtems_monitor_mpci_next(
|
||||
|
||||
if (n >= 1)
|
||||
goto failed;
|
||||
|
||||
|
||||
if ( ! c->User_multiprocessing_table)
|
||||
goto failed;
|
||||
|
||||
|
||||
_Thread_Disable_dispatch();
|
||||
|
||||
*next_id += 1;
|
||||
@@ -102,7 +102,7 @@ rtems_monitor_mpci_dump_header(
|
||||
node nodes globals proxies timeout pktsize\n");
|
||||
/*23456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789
|
||||
0 1 2 3 4 5 6 7 */
|
||||
|
||||
|
||||
rtems_monitor_separator();
|
||||
}
|
||||
|
||||
@@ -119,10 +119,10 @@ rtems_monitor_mpci_dump(
|
||||
length += printf(" %d", monitor_mpci->node);
|
||||
length += rtems_monitor_pad(11, length);
|
||||
length += printf("%d", monitor_mpci->maximum_nodes);
|
||||
|
||||
|
||||
length += rtems_monitor_pad(18, length);
|
||||
length += rtems_monitor_dump_decimal(monitor_mpci->maximum_global_objects);
|
||||
|
||||
|
||||
length += rtems_monitor_pad(28, length);
|
||||
length += rtems_monitor_dump_decimal(monitor_mpci->maximum_proxies);
|
||||
|
||||
|
||||
@@ -126,7 +126,7 @@ rtems_monitor_id_fixup(
|
||||
)
|
||||
{
|
||||
uint32_t node;
|
||||
|
||||
|
||||
node = rtems_get_node(id);
|
||||
if (node == 0)
|
||||
{
|
||||
@@ -171,7 +171,7 @@ rtems_monitor_object_canonical_next_remote(
|
||||
/*
|
||||
* Send request
|
||||
*/
|
||||
|
||||
|
||||
request.command = RTEMS_MONITOR_SERVER_CANONICAL;
|
||||
request.argument0 = (uint32_t ) type;
|
||||
request.argument1 = (uint32_t ) id;
|
||||
@@ -183,7 +183,7 @@ rtems_monitor_object_canonical_next_remote(
|
||||
/*
|
||||
* process response
|
||||
*/
|
||||
|
||||
|
||||
next_id = (rtems_id) response.result0;
|
||||
if (next_id != RTEMS_OBJECT_ID_FINAL)
|
||||
(void) memcpy(canonical, &response.payload, response.result1);
|
||||
@@ -213,7 +213,7 @@ rtems_monitor_object_canonical_next(
|
||||
else
|
||||
{
|
||||
next_id = id;
|
||||
|
||||
|
||||
raw_item = (void *) info->next(info->object_information,
|
||||
canonical,
|
||||
&next_id);
|
||||
@@ -222,8 +222,8 @@ rtems_monitor_object_canonical_next(
|
||||
{
|
||||
info->canonical(canonical, raw_item);
|
||||
_Thread_Enable_dispatch();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return next_id;
|
||||
}
|
||||
|
||||
@@ -284,7 +284,7 @@ rtems_monitor_object_dump_1(
|
||||
* of the canonical structures are almost too big for shared
|
||||
* memory driver (eg: mpci)
|
||||
*/
|
||||
|
||||
|
||||
if ((info->next != rtems_monitor_manager_next) ||
|
||||
(id == canonical.generic.id))
|
||||
info->dump(&canonical, verbose);
|
||||
@@ -322,7 +322,7 @@ rtems_monitor_object_cmd(
|
||||
int arg;
|
||||
rtems_monitor_object_info_t *info = 0;
|
||||
rtems_monitor_object_type_t type ;
|
||||
|
||||
|
||||
/* what is the default type? */
|
||||
type = command_arg->monitor_object;
|
||||
|
||||
@@ -333,7 +333,7 @@ rtems_monitor_object_cmd(
|
||||
printf("A type must be specified to \"dump all\"\n");
|
||||
goto done;
|
||||
}
|
||||
|
||||
|
||||
info = rtems_monitor_object_lookup(type);
|
||||
if (info == 0)
|
||||
goto not_found;
|
||||
@@ -364,7 +364,7 @@ rtems_monitor_object_cmd(
|
||||
info = rtems_monitor_object_lookup(type);
|
||||
if (info == 0)
|
||||
goto not_found;
|
||||
|
||||
|
||||
if (info->dump_header)
|
||||
info->dump_header(verbose);
|
||||
}
|
||||
@@ -378,7 +378,7 @@ not_found: printf("Invalid or unsupported type %d\n", type);
|
||||
rtems_monitor_object_dump_1(info, id, verbose);
|
||||
|
||||
default_node = rtems_get_node(id);
|
||||
|
||||
|
||||
last_type = type;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,14 +25,14 @@ rtems_monitor_separator(void)
|
||||
printf("------------------------------------------------------------------------------\n");
|
||||
}
|
||||
|
||||
uint32_t
|
||||
uint32_t
|
||||
rtems_monitor_pad(
|
||||
uint32_t destination_column,
|
||||
uint32_t current_column
|
||||
)
|
||||
{
|
||||
int pad_length;
|
||||
|
||||
|
||||
if (destination_column <= current_column)
|
||||
pad_length = 1;
|
||||
else
|
||||
@@ -41,7 +41,7 @@ rtems_monitor_pad(
|
||||
return printf("%*s", pad_length, "");
|
||||
}
|
||||
|
||||
uint32_t
|
||||
uint32_t
|
||||
rtems_monitor_dump_char(uint8_t ch)
|
||||
{
|
||||
if (isprint(ch))
|
||||
@@ -50,25 +50,25 @@ rtems_monitor_dump_char(uint8_t ch)
|
||||
return printf("%02x", ch);
|
||||
}
|
||||
|
||||
uint32_t
|
||||
uint32_t
|
||||
rtems_monitor_dump_decimal(uint32_t num)
|
||||
{
|
||||
return printf("%4d", num);
|
||||
}
|
||||
|
||||
uint32_t
|
||||
uint32_t
|
||||
rtems_monitor_dump_hex(uint32_t num)
|
||||
{
|
||||
return printf("0x%x", num);
|
||||
}
|
||||
|
||||
uint32_t
|
||||
uint32_t
|
||||
rtems_monitor_dump_assoc_bitfield(
|
||||
rtems_assoc_t *ap,
|
||||
char *separator,
|
||||
uint32_t value
|
||||
)
|
||||
{
|
||||
{
|
||||
uint32_t b;
|
||||
uint32_t length = 0;
|
||||
const char *name;
|
||||
@@ -80,23 +80,23 @@ rtems_monitor_dump_assoc_bitfield(
|
||||
length += printf("%s", separator);
|
||||
|
||||
name = rtems_assoc_name_by_local(ap, b);
|
||||
|
||||
|
||||
if (name)
|
||||
length += printf("%s", name);
|
||||
else
|
||||
length += printf("0x%x", b);
|
||||
}
|
||||
|
||||
|
||||
return length;
|
||||
}
|
||||
|
||||
uint32_t
|
||||
uint32_t
|
||||
rtems_monitor_dump_id(rtems_id id)
|
||||
{
|
||||
return printf("%08x", id);
|
||||
}
|
||||
|
||||
uint32_t
|
||||
uint32_t
|
||||
rtems_monitor_dump_name(rtems_name name)
|
||||
{
|
||||
uint32_t i;
|
||||
@@ -105,9 +105,9 @@ rtems_monitor_dump_name(rtems_name name)
|
||||
uint32_t ui;
|
||||
char c[4];
|
||||
} u;
|
||||
|
||||
|
||||
u.ui = (uint32_t ) name;
|
||||
|
||||
|
||||
#if (CPU_BIG_ENDIAN == TRUE)
|
||||
for (i=0; i<sizeof(u.c); i++)
|
||||
length += rtems_monitor_dump_char(u.c[i]);
|
||||
@@ -118,7 +118,7 @@ rtems_monitor_dump_name(rtems_name name)
|
||||
return length;
|
||||
}
|
||||
|
||||
uint32_t
|
||||
uint32_t
|
||||
rtems_monitor_dump_priority(rtems_task_priority priority)
|
||||
{
|
||||
return printf("%3d", priority);
|
||||
@@ -146,14 +146,14 @@ rtems_assoc_t rtems_monitor_state_assoc[] = {
|
||||
{ 0, 0, 0 },
|
||||
};
|
||||
|
||||
uint32_t
|
||||
uint32_t
|
||||
rtems_monitor_dump_state(States_Control state)
|
||||
{
|
||||
uint32_t length = 0;
|
||||
|
||||
if (state == STATES_READY) /* assoc doesn't deal with this as it is 0 */
|
||||
length += printf("READY");
|
||||
|
||||
|
||||
length += rtems_monitor_dump_assoc_bitfield(rtems_monitor_state_assoc,
|
||||
":",
|
||||
state);
|
||||
@@ -169,14 +169,14 @@ rtems_assoc_t rtems_monitor_attribute_assoc[] = {
|
||||
{ 0, 0, 0 },
|
||||
};
|
||||
|
||||
uint32_t
|
||||
uint32_t
|
||||
rtems_monitor_dump_attributes(rtems_attribute attributes)
|
||||
{
|
||||
uint32_t length = 0;
|
||||
|
||||
if (attributes == RTEMS_DEFAULT_ATTRIBUTES) /* value is 0 */
|
||||
length += printf("DEFAULT");
|
||||
|
||||
|
||||
length += rtems_monitor_dump_assoc_bitfield(rtems_monitor_attribute_assoc,
|
||||
":",
|
||||
attributes);
|
||||
@@ -190,14 +190,14 @@ rtems_assoc_t rtems_monitor_modes_assoc[] = {
|
||||
{ 0, 0, 0 },
|
||||
};
|
||||
|
||||
uint32_t
|
||||
uint32_t
|
||||
rtems_monitor_dump_modes(rtems_mode modes)
|
||||
{
|
||||
uint32_t length = 0;
|
||||
|
||||
if (modes == RTEMS_DEFAULT_MODES) /* value is 0 */
|
||||
length += printf("P:T:nA");
|
||||
|
||||
|
||||
length += rtems_monitor_dump_assoc_bitfield(rtems_monitor_modes_assoc,
|
||||
":",
|
||||
modes);
|
||||
@@ -240,21 +240,21 @@ rtems_assoc_t rtems_monitor_events_assoc[] = {
|
||||
{ 0, 0, 0 },
|
||||
};
|
||||
|
||||
uint32_t
|
||||
uint32_t
|
||||
rtems_monitor_dump_events(rtems_event_set events)
|
||||
{
|
||||
uint32_t length = 0;
|
||||
|
||||
if (events == EVENT_SETS_NONE_PENDING) /* value is 0 */
|
||||
length += printf("NONE");
|
||||
|
||||
|
||||
length += rtems_monitor_dump_assoc_bitfield(rtems_monitor_events_assoc,
|
||||
":",
|
||||
events);
|
||||
return length;
|
||||
}
|
||||
|
||||
uint32_t
|
||||
uint32_t
|
||||
rtems_monitor_dump_notepad(uint32_t *notepad)
|
||||
{
|
||||
uint32_t length = 0;
|
||||
|
||||
@@ -47,7 +47,7 @@ rtems_monitor_server_request(
|
||||
* What is id of monitor on target node?
|
||||
* Look it up if we don't know it yet.
|
||||
*/
|
||||
|
||||
|
||||
server_id = rtems_monitor_server_request_queue_ids[server_node];
|
||||
if (server_id == 0)
|
||||
{
|
||||
@@ -59,7 +59,7 @@ rtems_monitor_server_request(
|
||||
rtems_error(status, "ident of remote server failed");
|
||||
goto done;
|
||||
}
|
||||
|
||||
|
||||
rtems_monitor_server_request_queue_ids[server_node] = server_id;
|
||||
}
|
||||
|
||||
@@ -71,7 +71,7 @@ rtems_monitor_server_request(
|
||||
rtems_error(status, "monitor server request send failed");
|
||||
goto done;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Await response, if requested
|
||||
*/
|
||||
@@ -97,9 +97,9 @@ rtems_monitor_server_request(
|
||||
{
|
||||
status = RTEMS_INCORRECT_STATE;
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
done:
|
||||
return status;
|
||||
}
|
||||
@@ -134,13 +134,13 @@ rtems_monitor_server_task(
|
||||
rtems_error(status, "monitor server msg queue receive error");
|
||||
goto failed;
|
||||
}
|
||||
|
||||
|
||||
if (size != sizeof(request))
|
||||
{
|
||||
rtems_error(0, "monitor server bad size on receive");
|
||||
goto failed;
|
||||
}
|
||||
|
||||
|
||||
switch (request.command)
|
||||
{
|
||||
case RTEMS_MONITOR_SERVER_CANONICAL:
|
||||
@@ -162,7 +162,7 @@ rtems_monitor_server_task(
|
||||
|
||||
#define SERVER_OVERHEAD (RTEMS_offsetof(rtems_monitor_server_response_t, \
|
||||
payload))
|
||||
|
||||
|
||||
status = rtems_message_queue_send(request.return_id,
|
||||
&response,
|
||||
size + SERVER_OVERHEAD);
|
||||
@@ -186,7 +186,7 @@ failed:
|
||||
rtems_task_delete(RTEMS_SELF);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* Kill off any old server
|
||||
* Not sure if this is useful, but it doesn't help
|
||||
@@ -219,12 +219,12 @@ rtems_monitor_server_init(
|
||||
)
|
||||
{
|
||||
rtems_status_code status;
|
||||
|
||||
|
||||
if (_System_state_Is_multiprocessing &&
|
||||
(_Configuration_MP_table->maximum_nodes > 1))
|
||||
{
|
||||
uint32_t maximum_nodes = _Configuration_MP_table->maximum_nodes;
|
||||
|
||||
|
||||
/*
|
||||
* create the msg que our server will listen
|
||||
* Since we only get msgs from other RTEMS monitors, we just
|
||||
@@ -237,32 +237,32 @@ rtems_monitor_server_init(
|
||||
sizeof(rtems_monitor_server_request_t),
|
||||
RTEMS_GLOBAL,
|
||||
&rtems_monitor_server_request_queue_id);
|
||||
|
||||
|
||||
if (status != RTEMS_SUCCESSFUL)
|
||||
{
|
||||
rtems_error(status, "could not create monitor server message queue");
|
||||
goto done;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* create the msg que our responses will come on
|
||||
* Since monitor just does one thing at a time, we only need 1 item
|
||||
* message queue.
|
||||
*/
|
||||
|
||||
|
||||
status = rtems_message_queue_create(
|
||||
RTEMS_MONITOR_RESPONSE_QUEUE_NAME,
|
||||
1, /* depth */
|
||||
sizeof(rtems_monitor_server_response_t),
|
||||
RTEMS_GLOBAL,
|
||||
&rtems_monitor_server_response_queue_id);
|
||||
|
||||
|
||||
if (status != RTEMS_SUCCESSFUL)
|
||||
{
|
||||
rtems_error(status, "could not create monitor response message queue");
|
||||
goto done;
|
||||
}
|
||||
|
||||
|
||||
/* need an id for queue of each other server we might talk to */
|
||||
/* indexed by node, so add 1 to maximum_nodes */
|
||||
rtems_monitor_server_request_queue_ids =
|
||||
|
||||
@@ -245,7 +245,7 @@ rtems_symbol_value_lookup_exact(
|
||||
if (table == 0)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
if (table->sorted)
|
||||
{
|
||||
sp = rtems_symbol_value_lookup(table, value);
|
||||
@@ -254,7 +254,7 @@ rtems_symbol_value_lookup_exact(
|
||||
else
|
||||
return NULL; /* not an exact match */
|
||||
}
|
||||
|
||||
|
||||
for (s = 0, sp = table->addresses; s < table->next; s++, sp++)
|
||||
{
|
||||
if ( sp->value == value )
|
||||
@@ -285,7 +285,7 @@ rtems_symbol_name_lookup(
|
||||
if (table == 0)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
for (s = 0, sp = table->addresses; s < table->next; s++, sp++)
|
||||
{
|
||||
if ( strcasecmp(sp->name, name) == 0 )
|
||||
@@ -313,7 +313,7 @@ rtems_monitor_symbol_next(
|
||||
goto failed;
|
||||
|
||||
/* NOTE: symbols do not have id and name fields */
|
||||
|
||||
|
||||
if (table->sorted == 0)
|
||||
rtems_symbol_sort(table);
|
||||
|
||||
@@ -380,7 +380,7 @@ rtems_monitor_symbol_canonical_by_value(
|
||||
}
|
||||
|
||||
|
||||
uint32_t
|
||||
uint32_t
|
||||
rtems_monitor_symbol_dump(
|
||||
rtems_monitor_symbol_t *canonical_symbol,
|
||||
boolean verbose
|
||||
|
||||
@@ -24,7 +24,7 @@ rtems_monitor_task_canonical(
|
||||
RTEMS_API_Control *api;
|
||||
|
||||
api = rtems_thread->API_Extensions[ THREAD_API_RTEMS ];
|
||||
|
||||
|
||||
canonical_task->entry = rtems_thread->Start.entry_point;
|
||||
canonical_task->argument = rtems_thread->Start.numeric_argument;
|
||||
canonical_task->stack = rtems_thread->Start.Initial_stack.area;
|
||||
@@ -56,7 +56,7 @@ rtems_monitor_task_dump_header(
|
||||
ID NAME PRIO STAT MODES EVENTS WAITID WAITARG NOTES\n");
|
||||
/*23456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789
|
||||
0 1 2 3 4 5 6 7 */
|
||||
|
||||
|
||||
rtems_monitor_separator();
|
||||
}
|
||||
|
||||
|
||||
@@ -38,7 +38,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_RTEMS_CLASSES_LAST+1,
|
||||
RTEMS_MONITOR_OBJECT_DNAME,
|
||||
RTEMS_MONITOR_OBJECT_CONFIG,
|
||||
@@ -71,19 +71,19 @@ typedef enum {
|
||||
/*
|
||||
* Type of a pointer that may be a symbol
|
||||
*/
|
||||
|
||||
|
||||
#define MONITOR_SYMBOL_LEN 20
|
||||
typedef struct {
|
||||
char name[MONITOR_SYMBOL_LEN];
|
||||
uint32_t value;
|
||||
uint32_t offset;
|
||||
} rtems_monitor_symbol_t;
|
||||
} rtems_monitor_symbol_t;
|
||||
|
||||
typedef struct {
|
||||
rtems_id id;
|
||||
rtems_name name;
|
||||
/* end of common portion */
|
||||
} rtems_monitor_generic_t;
|
||||
} rtems_monitor_generic_t;
|
||||
|
||||
/*
|
||||
* Task
|
||||
@@ -347,7 +347,7 @@ void rtems_monitor_server_kill(void);
|
||||
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(uint32_t );
|
||||
|
||||
|
||||
/* command.c */
|
||||
int rtems_monitor_make_argv(char *, int *, char **);
|
||||
int rtems_monitor_command_read(char *, int *, char **);
|
||||
|
||||
Reference in New Issue
Block a user