monitor: Add const qualifier

This commit is contained in:
Sebastian Huber
2012-11-06 13:46:03 +01:00
parent 682b819e96
commit ed8be1aeea
14 changed files with 60 additions and 59 deletions

View File

@@ -27,10 +27,11 @@
void void
rtems_monitor_config_canonical( rtems_monitor_config_canonical(
rtems_monitor_config_t *canonical_config, rtems_monitor_config_t *canonical_config,
void *config_void const void *config_void
) )
{ {
rtems_configuration_table *c = (rtems_configuration_table *) config_void; const rtems_configuration_table *c =
(const rtems_configuration_table *) config_void;
rtems_api_configuration_table *r = &Configuration_RTEMS_API; rtems_api_configuration_table *r = &Configuration_RTEMS_API;
canonical_config->work_space_size = c->work_space_size; canonical_config->work_space_size = c->work_space_size;
@@ -53,14 +54,14 @@ rtems_monitor_config_canonical(
* other nodes...) * other nodes...)
*/ */
void * const void *
rtems_monitor_config_next( rtems_monitor_config_next(
void *object_info __attribute__((unused)), void *object_info __attribute__((unused)),
rtems_monitor_config_t *canonical_config __attribute__((unused)), rtems_monitor_config_t *canonical_config __attribute__((unused)),
rtems_id *next_id rtems_id *next_id
) )
{ {
rtems_configuration_table *c = &Configuration; const rtems_configuration_table *c = &Configuration;
int n = rtems_object_id_get_index(*next_id); int n = rtems_object_id_get_index(*next_id);
if (n >= 1) if (n >= 1)
@@ -69,7 +70,7 @@ rtems_monitor_config_next(
_Thread_Disable_dispatch(); _Thread_Disable_dispatch();
*next_id += 1; *next_id += 1;
return (void *) c; return (const void *) c;
failed: failed:
*next_id = RTEMS_OBJECT_ID_FINAL; *next_id = RTEMS_OBJECT_ID_FINAL;

View File

@@ -37,10 +37,10 @@
void void
rtems_monitor_driver_canonical( rtems_monitor_driver_canonical(
rtems_monitor_driver_t *canonical_driver, rtems_monitor_driver_t *canonical_driver,
void *driver_void const void *driver_void
) )
{ {
rtems_driver_address_table *d = (rtems_driver_address_table *) driver_void; const rtems_driver_address_table *d = (const rtems_driver_address_table *) driver_void;
rtems_monitor_symbol_canonical_by_value(&canonical_driver->initialization, rtems_monitor_symbol_canonical_by_value(&canonical_driver->initialization,
(void *) d->initialization_entry); (void *) d->initialization_entry);
@@ -58,14 +58,14 @@ rtems_monitor_driver_canonical(
} }
void * const void *
rtems_monitor_driver_next( rtems_monitor_driver_next(
void *object_info __attribute__((unused)), void *object_info __attribute__((unused)),
rtems_monitor_driver_t *canonical_driver, rtems_monitor_driver_t *canonical_driver,
rtems_id *next_id rtems_id *next_id
) )
{ {
rtems_configuration_table *c = &Configuration; const rtems_configuration_table *c = &Configuration;
uint32_t n = rtems_object_id_get_index(*next_id); uint32_t n = rtems_object_id_get_index(*next_id);
if (n >= c->number_of_device_drivers) if (n >= c->number_of_device_drivers)
@@ -81,7 +81,7 @@ rtems_monitor_driver_next(
canonical_driver->name = rtems_build_name('-', '-', '-', '-'); canonical_driver->name = rtems_build_name('-', '-', '-', '-');
*next_id += 1; *next_id += 1;
return (void *) (c->Device_driver_table + n); return (const void *) (c->Device_driver_table + n);
failed: failed:
*next_id = RTEMS_OBJECT_ID_FINAL; *next_id = RTEMS_OBJECT_ID_FINAL;

View File

@@ -14,11 +14,11 @@
void void
rtems_monitor_extension_canonical( rtems_monitor_extension_canonical(
rtems_monitor_extension_t *canonical_extension, rtems_monitor_extension_t *canonical_extension,
void *extension_void const void *extension_void
) )
{ {
Extension_Control *rtems_extension = (Extension_Control *) extension_void; const Extension_Control *rtems_extension = (const Extension_Control *) extension_void;
rtems_extensions_table *e = &rtems_extension->Extension.Callouts; const rtems_extensions_table *e = &rtems_extension->Extension.Callouts;
rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_create, rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_create,
(void *) e->thread_create); (void *) e->thread_create);

View File

@@ -19,10 +19,10 @@
void void
rtems_monitor_init_task_canonical( rtems_monitor_init_task_canonical(
rtems_monitor_init_task_t *canonical_itask, rtems_monitor_init_task_t *canonical_itask,
void *itask_void const void *itask_void
) )
{ {
rtems_initialization_tasks_table *rtems_itask = itask_void; const rtems_initialization_tasks_table *rtems_itask = itask_void;
rtems_monitor_symbol_canonical_by_value(&canonical_itask->entry, rtems_monitor_symbol_canonical_by_value(&canonical_itask->entry,
(void *) rtems_itask->entry_point); (void *) rtems_itask->entry_point);
@@ -34,7 +34,7 @@ rtems_monitor_init_task_canonical(
canonical_itask->attributes = rtems_itask->attribute_set; canonical_itask->attributes = rtems_itask->attribute_set;
} }
void * const void *
rtems_monitor_init_task_next( rtems_monitor_init_task_next(
void *object_info __attribute__((unused)), void *object_info __attribute__((unused)),
rtems_monitor_init_task_t *canonical_init_task, rtems_monitor_init_task_t *canonical_init_task,
@@ -59,7 +59,7 @@ rtems_monitor_init_task_next(
canonical_init_task->name = itask->name; canonical_init_task->name = itask->name;
*next_id += 1; *next_id += 1;
return (void *) itask; return (const void *) itask;
failed: failed:
*next_id = RTEMS_OBJECT_ID_FINAL; *next_id = RTEMS_OBJECT_ID_FINAL;

View File

@@ -16,7 +16,7 @@
* "next" routine for all objects that are RTEMS manager objects * "next" routine for all objects that are RTEMS manager objects
*/ */
void * const void *
rtems_monitor_manager_next( rtems_monitor_manager_next(
void *table_void, void *table_void,
void *canonical, void *canonical,

View File

@@ -29,7 +29,7 @@ rtems_monitor_mpci_canonical(
void *config_void void *config_void
) )
{ {
rtems_configuration_table *c = &Configuration; const rtems_configuration_table *c = &Configuration;
rtems_multiprocessing_table *m; rtems_multiprocessing_table *m;
rtems_mpci_table *mt; rtems_mpci_table *mt;
@@ -64,14 +64,14 @@ rtems_monitor_mpci_canonical(
* other nodes...) * other nodes...)
*/ */
void * const void *
rtems_monitor_mpci_next( rtems_monitor_mpci_next(
void *object_info, void *object_info,
rtems_monitor_mpci_t *canonical_mpci, rtems_monitor_mpci_t *canonical_mpci,
rtems_id *next_id rtems_id *next_id
) )
{ {
rtems_configuration_table *c = &Configuration; const rtems_configuration_table *c = &Configuration;
int n = rtems_object_id_get_index(*next_id); int n = rtems_object_id_get_index(*next_id);
if (n >= 1) if (n >= 1)

View File

@@ -234,8 +234,8 @@ rtems_monitor_object_canonical_next(
void *canonical void *canonical
) )
{ {
rtems_id next_id; rtems_id next_id;
void *raw_item; const void *raw_item;
#if defined(RTEMS_MULTIPROCESSING) #if defined(RTEMS_MULTIPROCESSING)
if ( ! _Objects_Is_local_id(id) ) { if ( ! _Objects_Is_local_id(id) ) {
@@ -249,7 +249,7 @@ rtems_monitor_object_canonical_next(
{ {
next_id = id; next_id = id;
raw_item = (void *) info->next( raw_item = info->next(
info->object_information, info->object_information,
canonical, canonical,
&next_id &next_id

View File

@@ -15,10 +15,10 @@
void void
rtems_monitor_part_canonical( rtems_monitor_part_canonical(
rtems_monitor_part_t *canonical_part, rtems_monitor_part_t *canonical_part,
void *part_void const void *part_void
) )
{ {
Partition_Control *rtems_part = (Partition_Control *) part_void; const Partition_Control *rtems_part = (const Partition_Control *) part_void;
canonical_part->attribute = rtems_part->attribute_set; canonical_part->attribute = rtems_part->attribute_set;
canonical_part->start_addr = rtems_part->starting_address; canonical_part->start_addr = rtems_part->starting_address;

View File

@@ -10,10 +10,10 @@
void void
rtems_monitor_queue_canonical( rtems_monitor_queue_canonical(
rtems_monitor_queue_t *canonical_queue, rtems_monitor_queue_t *canonical_queue,
void *queue_void const void *queue_void
) )
{ {
Message_queue_Control *rtems_queue = (Message_queue_Control *) queue_void; const Message_queue_Control *rtems_queue = (const Message_queue_Control *) queue_void;
canonical_queue->attributes = rtems_queue->attribute_set; canonical_queue->attributes = rtems_queue->attribute_set;
canonical_queue->maximum_message_size = rtems_queue->message_queue.maximum_message_size; canonical_queue->maximum_message_size = rtems_queue->message_queue.maximum_message_size;

View File

@@ -15,10 +15,10 @@
void void
rtems_monitor_region_canonical( rtems_monitor_region_canonical(
rtems_monitor_region_t *canonical_region, rtems_monitor_region_t *canonical_region,
void *region_void const void *region_void
) )
{ {
Region_Control *rtems_region = (Region_Control *) region_void; const Region_Control *rtems_region = (const Region_Control *) region_void;
canonical_region->attribute = rtems_region->attribute_set; canonical_region->attribute = rtems_region->attribute_set;
canonical_region->start_addr = rtems_region->starting_address; canonical_region->start_addr = rtems_region->starting_address;

View File

@@ -15,10 +15,10 @@
void void
rtems_monitor_sema_canonical( rtems_monitor_sema_canonical(
rtems_monitor_sema_t *canonical_sema, rtems_monitor_sema_t *canonical_sema,
void *sema_void const void *sema_void
) )
{ {
Semaphore_Control *rtems_sema = (Semaphore_Control *) sema_void; const Semaphore_Control *rtems_sema = (const Semaphore_Control *) sema_void;
canonical_sema->attribute = rtems_sema->attribute_set; canonical_sema->attribute = rtems_sema->attribute_set;
canonical_sema->priority_ceiling = canonical_sema->priority_ceiling =

View File

@@ -139,9 +139,9 @@ static int
rtems_symbol_compare(const void *e1, rtems_symbol_compare(const void *e1,
const void *e2) const void *e2)
{ {
rtems_symbol_t *s1, *s2; const rtems_symbol_t *s1, *s2;
s1 = (rtems_symbol_t *) e1; s1 = (const rtems_symbol_t *) e1;
s2 = (rtems_symbol_t *) e2; s2 = (const rtems_symbol_t *) e2;
if (s1->value < s2->value) if (s1->value < s2->value)
return -1; return -1;
@@ -297,7 +297,7 @@ rtems_symbol_name_lookup(
return NULL; return NULL;
} }
void * const void *
rtems_monitor_symbol_next( rtems_monitor_symbol_next(
void *object_info, void *object_info,
rtems_monitor_symbol_t *canonical __attribute__((unused)), rtems_monitor_symbol_t *canonical __attribute__((unused)),
@@ -322,7 +322,7 @@ rtems_monitor_symbol_next(
_Thread_Disable_dispatch(); _Thread_Disable_dispatch();
*next_id += 1; *next_id += 1;
return (void *) (table->addresses + n); return (const void *) (table->addresses + n);
failed: failed:
*next_id = RTEMS_OBJECT_ID_FINAL; *next_id = RTEMS_OBJECT_ID_FINAL;

View File

@@ -15,10 +15,10 @@
void void
rtems_monitor_task_canonical( rtems_monitor_task_canonical(
rtems_monitor_task_t *canonical_task, rtems_monitor_task_t *canonical_task,
void *thread_void const void *thread_void
) )
{ {
Thread_Control *rtems_thread = (Thread_Control *) thread_void; const Thread_Control *rtems_thread = (const Thread_Control *) thread_void;
RTEMS_API_Control *api; RTEMS_API_Control *api;
api = rtems_thread->API_Extensions[ THREAD_API_RTEMS ]; api = rtems_thread->API_Extensions[ THREAD_API_RTEMS ];

View File

@@ -350,8 +350,8 @@ struct rtems_monitor_command_entry_s {
}; };
typedef void *(*rtems_monitor_object_next_fn)(void *, void *, rtems_id *); typedef const void *(*rtems_monitor_object_next_fn)(void *, void *, rtems_id *);
typedef void (*rtems_monitor_object_canonical_fn)(void *, void *); typedef void (*rtems_monitor_object_canonical_fn)(void *, const void *);
typedef void (*rtems_monitor_object_dump_header_fn)(bool); typedef void (*rtems_monitor_object_dump_header_fn)(bool);
typedef void (*rtems_monitor_object_dump_fn)(void *, bool); typedef void (*rtems_monitor_object_dump_fn)(void *, bool);
@@ -418,66 +418,66 @@ rtems_id rtems_monitor_id_fixup(rtems_id, uint32_t , rtems_monitor_object_typ
const rtems_monitor_object_info_t *rtems_monitor_object_lookup(rtems_monitor_object_type_t type); const rtems_monitor_object_info_t *rtems_monitor_object_lookup(rtems_monitor_object_type_t type);
rtems_id rtems_monitor_object_canonical_get(rtems_monitor_object_type_t, rtems_id, void *, size_t *size_p); rtems_id rtems_monitor_object_canonical_get(rtems_monitor_object_type_t, rtems_id, void *, size_t *size_p);
rtems_id rtems_monitor_object_canonical_next(const rtems_monitor_object_info_t *, rtems_id, void *); rtems_id rtems_monitor_object_canonical_next(const rtems_monitor_object_info_t *, rtems_id, void *);
void *rtems_monitor_object_next(void *, void *, rtems_id, rtems_id *); const void *rtems_monitor_object_next(void *, void *, rtems_id, rtems_id *);
rtems_id rtems_monitor_object_canonical(rtems_id, void *); rtems_id rtems_monitor_object_canonical(rtems_id, const void *);
void rtems_monitor_object_cmd(int, char **, const rtems_monitor_command_arg_t*, bool); void rtems_monitor_object_cmd(int, char **, const rtems_monitor_command_arg_t*, bool);
/* manager.c */ /* manager.c */
void *rtems_monitor_manager_next(void *, void *, rtems_id *); const void *rtems_monitor_manager_next(void *, void *, rtems_id *);
/* config.c */ /* config.c */
void rtems_monitor_config_canonical(rtems_monitor_config_t *, void *); void rtems_monitor_config_canonical(rtems_monitor_config_t *, const void *);
void *rtems_monitor_config_next(void *, rtems_monitor_config_t *, rtems_id *); const void *rtems_monitor_config_next(void *, rtems_monitor_config_t *, rtems_id *);
void rtems_monitor_config_dump_header(bool); void rtems_monitor_config_dump_header(bool);
int rtems_monitor_config_dump(rtems_monitor_config_t *, bool verbose); int rtems_monitor_config_dump(rtems_monitor_config_t *, bool verbose);
/* mpci.c */ /* mpci.c */
#if defined(RTEMS_MULTIPROCESSING) #if defined(RTEMS_MULTIPROCESSING)
void rtems_monitor_mpci_canonical(rtems_monitor_mpci_t *, void *); void rtems_monitor_mpci_canonical(rtems_monitor_mpci_t *, const void *);
void *rtems_monitor_mpci_next(void *, rtems_monitor_mpci_t *, rtems_id *); const void *rtems_monitor_mpci_next(void *, rtems_monitor_mpci_t *, rtems_id *);
void rtems_monitor_mpci_dump_header(bool); void rtems_monitor_mpci_dump_header(bool);
void rtems_monitor_mpci_dump(rtems_monitor_mpci_t *, bool verbose); void rtems_monitor_mpci_dump(rtems_monitor_mpci_t *, bool verbose);
#endif #endif
/* itask.c */ /* itask.c */
void rtems_monitor_init_task_canonical(rtems_monitor_init_task_t *, void *); void rtems_monitor_init_task_canonical(rtems_monitor_init_task_t *, const void *);
void *rtems_monitor_init_task_next(void *, rtems_monitor_init_task_t *, rtems_id *); const void *rtems_monitor_init_task_next(void *, rtems_monitor_init_task_t *, rtems_id *);
void rtems_monitor_init_task_dump_header(bool); void rtems_monitor_init_task_dump_header(bool);
void rtems_monitor_init_task_dump(rtems_monitor_init_task_t *, bool verbose); void rtems_monitor_init_task_dump(rtems_monitor_init_task_t *, bool verbose);
/* extension.c */ /* extension.c */
void rtems_monitor_extension_canonical(rtems_monitor_extension_t *, void *); void rtems_monitor_extension_canonical(rtems_monitor_extension_t *, const void *);
void rtems_monitor_extension_dump_header(bool verbose); void rtems_monitor_extension_dump_header(bool verbose);
void rtems_monitor_extension_dump(rtems_monitor_extension_t *, bool); void rtems_monitor_extension_dump(rtems_monitor_extension_t *, bool);
/* task.c */ /* task.c */
void rtems_monitor_task_canonical(rtems_monitor_task_t *, void *); void rtems_monitor_task_canonical(rtems_monitor_task_t *, const void *);
void rtems_monitor_task_dump_header(bool verbose); void rtems_monitor_task_dump_header(bool verbose);
void rtems_monitor_task_dump(rtems_monitor_task_t *, bool); void rtems_monitor_task_dump(rtems_monitor_task_t *, bool);
/* sema.c */ /* sema.c */
void rtems_monitor_sema_canonical(rtems_monitor_sema_t *, void *); void rtems_monitor_sema_canonical(rtems_monitor_sema_t *, const void *);
void rtems_monitor_sema_dump_header(bool verbose); void rtems_monitor_sema_dump_header(bool verbose);
void rtems_monitor_sema_dump(rtems_monitor_sema_t *, bool); void rtems_monitor_sema_dump(rtems_monitor_sema_t *, bool);
/* queue.c */ /* queue.c */
void rtems_monitor_queue_canonical(rtems_monitor_queue_t *, void *); void rtems_monitor_queue_canonical(rtems_monitor_queue_t *, const void *);
void rtems_monitor_queue_dump_header(bool verbose); void rtems_monitor_queue_dump_header(bool verbose);
void rtems_monitor_queue_dump(rtems_monitor_queue_t *, bool); void rtems_monitor_queue_dump(rtems_monitor_queue_t *, bool);
/* region.c */ /* region.c */
void rtems_monitor_region_canonical(rtems_monitor_region_t *, void *); void rtems_monitor_region_canonical(rtems_monitor_region_t *, const void *);
void rtems_monitor_region_dump_header(bool verbose); void rtems_monitor_region_dump_header(bool verbose);
void rtems_monitor_region_dump(rtems_monitor_region_t *, bool); void rtems_monitor_region_dump(rtems_monitor_region_t *, bool);
/* partition.c */ /* partition.c */
void rtems_monitor_part_canonical(rtems_monitor_part_t *, void *); void rtems_monitor_part_canonical(rtems_monitor_part_t *, const void *);
void rtems_monitor_part_dump_header(bool verbose); void rtems_monitor_part_dump_header(bool verbose);
void rtems_monitor_part_dump(rtems_monitor_part_t *, bool); void rtems_monitor_part_dump(rtems_monitor_part_t *, bool);
/* driver.c */ /* driver.c */
void *rtems_monitor_driver_next(void *, rtems_monitor_driver_t *, rtems_id *); const void *rtems_monitor_driver_next(void *, rtems_monitor_driver_t *, rtems_id *);
void rtems_monitor_driver_canonical(rtems_monitor_driver_t *, void *); void rtems_monitor_driver_canonical(rtems_monitor_driver_t *, const void *);
void rtems_monitor_driver_dump_header(bool); void rtems_monitor_driver_dump_header(bool);
void rtems_monitor_driver_dump(rtems_monitor_driver_t *, bool); void rtems_monitor_driver_dump(rtems_monitor_driver_t *, bool);
@@ -489,7 +489,7 @@ rtems_symbol_t *rtems_symbol_create(rtems_symbol_table_t *, const char *, uint32
rtems_symbol_t *rtems_symbol_value_lookup(rtems_symbol_table_t *, uint32_t); rtems_symbol_t *rtems_symbol_value_lookup(rtems_symbol_table_t *, uint32_t);
const rtems_symbol_t *rtems_symbol_value_lookup_exact(rtems_symbol_table_t *, uint32_t); const rtems_symbol_t *rtems_symbol_value_lookup_exact(rtems_symbol_table_t *, uint32_t);
rtems_symbol_t *rtems_symbol_name_lookup(rtems_symbol_table_t *, const char *); rtems_symbol_t *rtems_symbol_name_lookup(rtems_symbol_table_t *, const char *);
void *rtems_monitor_symbol_next(void *object_info, rtems_monitor_symbol_t *, rtems_id *); const void *rtems_monitor_symbol_next(void *object_info, rtems_monitor_symbol_t *, rtems_id *);
void rtems_monitor_symbol_canonical(rtems_monitor_symbol_t *, rtems_symbol_t *); void rtems_monitor_symbol_canonical(rtems_monitor_symbol_t *, rtems_symbol_t *);
void rtems_monitor_symbol_canonical_by_name(rtems_monitor_symbol_t *, const char *); void rtems_monitor_symbol_canonical_by_name(rtems_monitor_symbol_t *, const char *);
void rtems_monitor_symbol_canonical_by_value(rtems_monitor_symbol_t *, void *); void rtems_monitor_symbol_canonical_by_value(rtems_monitor_symbol_t *, void *);