From: <zw...@ma...> - 2009-05-31 13:31:36
|
Author: zwelch Date: 2009-05-31 13:31:27 +0200 (Sun, 31 May 2009) New Revision: 1966 Modified: trunk/src/server/gdb_server.c trunk/src/target/arm11.c trunk/src/target/embeddedice.c trunk/src/target/target.c trunk/src/target/target.h Log: Add target_get_name wrapper: - replaces all accesses to target->type->name. - add documentation in target_s to warn not to access field directly. Modified: trunk/src/server/gdb_server.c =================================================================== --- trunk/src/server/gdb_server.c 2009-05-31 11:31:11 UTC (rev 1965) +++ trunk/src/server/gdb_server.c 2009-05-31 11:31:27 UTC (rev 1966) @@ -2211,7 +2211,8 @@ add_service("gdb", CONNECTION_PIPE, 0, 1, gdb_new_connection, gdb_input, gdb_connection_closed, gdb_service); - LOG_DEBUG("gdb service for target %s using pipes", target->type->name); + LOG_DEBUG("gdb service for target %s using pipes", + target_get_name(target)); } else { @@ -2222,7 +2223,9 @@ add_service("gdb", CONNECTION_TCP, gdb_port + target->target_number, 1, gdb_new_connection, gdb_input, gdb_connection_closed, gdb_service); - LOG_DEBUG("gdb service for target %s at port %i", target->type->name, gdb_port + target->target_number); + LOG_DEBUG("gdb service for target %s at port %i", + target_get_name(target), + gdb_port + target->target_number); target = target->next; } } Modified: trunk/src/target/arm11.c =================================================================== --- trunk/src/target/arm11.c 2009-05-31 11:31:11 UTC (rev 1965) +++ trunk/src/target/arm11.c 2009-05-31 11:31:27 UTC (rev 1966) @@ -1847,7 +1847,7 @@ continue; /* if (t->type == arm11_target) */ - if (0 == strcmp(t->type->name, "arm11")) + if (0 == strcmp(target_get_name(t), "arm11")) return t->arch_info; } Modified: trunk/src/target/embeddedice.c =================================================================== --- trunk/src/target/embeddedice.c 2009-05-31 11:31:11 UTC (rev 1965) +++ trunk/src/target/embeddedice.c 2009-05-31 11:31:27 UTC (rev 1966) @@ -184,7 +184,7 @@ * in some unusual bits. Let feroceon.c validate it * and do the appropriate setup itself. */ - if (strcmp(target->type->name, "feroceon") == 0) + if (strcmp(target_get_name(target), "feroceon") == 0) break; LOG_ERROR("unknown EmbeddedICE version (comms ctrl: 0x%8.8x)", buf_get_u32(reg_list[EICE_COMMS_CTRL].value, 0, 32)); } Modified: trunk/src/target/target.c =================================================================== --- trunk/src/target/target.c 2009-05-31 11:31:11 UTC (rev 1965) +++ trunk/src/target/target.c 2009-05-31 11:31:27 UTC (rev 1966) @@ -484,6 +484,10 @@ } return retval; } +const char *target_get_name(struct target_s *target) +{ + return target->type->name; +} static int target_write_memory_imp(struct target_s *target, u32 address, u32 size, u32 count, u8 *buffer) { @@ -598,7 +602,7 @@ if ((retval = target->type->init_target(cmd_ctx, target)) != ERROR_OK) { - LOG_ERROR("target '%s' init failed", target->type->name); + LOG_ERROR("target '%s' init failed", target_get_name(target)); return retval; } @@ -1451,7 +1455,7 @@ command_print(cmd_ctx, "%2d: %-10s %-10s %-10s %10d %14s %s", target->target_number, target->cmd_name, - target->type->name, + target_get_name(target), Jim_Nvp_value2name_simple( nvp_target_endian, target->endianness )->name, target->tap->abs_chain_position, target->tap->dotted_name, @@ -3131,7 +3135,7 @@ LOG_DEBUG( "target: (%d) %s (%s) event: %d (%s) action: %s\n", target->target_number, target->cmd_name, - target->type->name, + target_get_name(target), e, Jim_Nvp_value2name_simple( nvp_target_event, e )->name, Jim_GetString( teap->body, NULL ) ); @@ -3220,7 +3224,7 @@ return JIM_ERR; } } - Jim_SetResultString( goi->interp, target->type->name, -1 ); + Jim_SetResultString( goi->interp, target_get_name(target), -1 ); /* loop for more */ break; case TCFG_EVENT: Modified: trunk/src/target/target.h =================================================================== --- trunk/src/target/target.h 2009-05-31 11:31:11 UTC (rev 1965) +++ trunk/src/target/target.h 2009-05-31 11:31:27 UTC (rev 1966) @@ -107,6 +107,10 @@ typedef struct target_type_s { + /** + * Name of the target. Do @b not access this field directly, use + * target_get_name() instead. + */ char *name; /** @@ -395,6 +399,13 @@ extern int get_num_by_target(target_t *query_target); extern target_t *get_target(const char *id); +/** + * Get the target name. + * + * This routine is a wrapper for the target->type->name field. + */ +extern const char *target_get_name(struct target_s *target); + /// @returns @c true if the target has been examined. extern bool target_was_examined(struct target_s *target); /// Sets the @c examined flag for the given target. |