From 975e19187d5772f18a242c535b8f0e43f2c33dce Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 22 Jul 2015 07:37:19 +0200 Subject: monitor: Remove notepad support --- cpukit/libmisc/monitor/mon-prmisc.c | 16 ---------------- cpukit/libmisc/monitor/mon-task.c | 23 +---------------------- cpukit/libmisc/monitor/monitor.h | 3 --- 3 files changed, 1 insertion(+), 41 deletions(-) diff --git a/cpukit/libmisc/monitor/mon-prmisc.c b/cpukit/libmisc/monitor/mon-prmisc.c index 9140f927f6..1b3a4df64a 100644 --- a/cpukit/libmisc/monitor/mon-prmisc.c +++ b/cpukit/libmisc/monitor/mon-prmisc.c @@ -248,19 +248,3 @@ rtems_monitor_dump_events(rtems_event_set events) return fprintf(stdout,"%08" PRIx32, events); } - -int -rtems_monitor_dump_notepad(uint32_t *notepad) -{ - int length = 0; - - if (rtems_configuration_get_notepads_enabled()) { - int i; - - for (i=0; i < RTEMS_NUMBER_NOTEPADS; i++) - if (notepad[i]) - length += fprintf(stdout,"%d: 0x%" PRIx32, i, notepad[i]); - } - - return length; -} diff --git a/cpukit/libmisc/monitor/mon-task.c b/cpukit/libmisc/monitor/mon-task.c index c08f1d2e75..851c593a99 100644 --- a/cpukit/libmisc/monitor/mon-task.c +++ b/cpukit/libmisc/monitor/mon-task.c @@ -46,17 +46,6 @@ rtems_monitor_task_canonical( canonical_task->modes = 0; /* XXX FIX ME.... rtems_thread->current_modes; */ canonical_task->attributes = 0 /* XXX FIX ME rtems_thread->API_Extensions[ THREAD_API_RTEMS ]->attribute_set */; - /* - * We know this is deprecated and don't want a warning on every BSP built. - */ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - if ( rtems_configuration_get_notepads_enabled() ) { - (void) memcpy( - canonical_task->notepad, api ->Notepads, sizeof(canonical_task->notepad)); - } - #pragma GCC diagnostic pop - /* XXX more to fix */ /* (void) memcpy(&canonical_task->wait_args, &rtems_thread->Wait.Extra, sizeof(canonical_task->wait_args)); @@ -70,7 +59,7 @@ rtems_monitor_task_dump_header( ) { fprintf(stdout,"\ - ID NAME PRI STATE MODES EVENTS WAITID WAITARG NOTES\n\ + ID NAME PRI STATE MODES EVENTS WAITID WAITARG\n\ "); /*23456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 0 1 2 3 4 5 6 7 */ @@ -108,15 +97,5 @@ rtems_monitor_task_dump( length += rtems_monitor_dump_hex(monitor_task->wait_args); } - length += rtems_monitor_pad(72, length); - - /* - * We know this is deprecated and don't want a warning on every BSP built. - */ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - length += rtems_monitor_dump_notepad(monitor_task->notepad); - #pragma GCC diagnostic pop - fprintf(stdout,"\n"); } diff --git a/cpukit/libmisc/monitor/monitor.h b/cpukit/libmisc/monitor/monitor.h index 799df353a7..2f6cb71538 100644 --- a/cpukit/libmisc/monitor/monitor.h +++ b/cpukit/libmisc/monitor/monitor.h @@ -104,8 +104,6 @@ typedef struct { rtems_event_set events; rtems_mode modes; rtems_attribute attributes; - uint32_t notepad[RTEMS_NUMBER_NOTEPADS] - RTEMS_COMPILER_DEPRECATED_ATTRIBUTE; rtems_id wait_id; uint32_t wait_args; uint32_t ticks; @@ -413,7 +411,6 @@ 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); -- cgit v1.2.3