auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

working_area_t -> struct working_area

Browse Source 
Remove misleading typedef and redundant suffix from struct working_area.
This commit is contained in:
Zachary T Welch
2009-11-13 08:44:30 -08:00
parent c2b5d8a6fa
commit 46fc1d57ac
23 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/target/arm7_9_common.c
View File

@@ -2723,7 +2723,7 @@ int arm7_9_bulk_write_memory(target_t *target, uint32_t address, uint32_t count,
int arm7_9_checksum_memory(struct target_s *target, uint32_t address, uint32_t count, uint32_t* checksum)
{
working_area_t *crc_algorithm;
struct working_area *crc_algorithm;
struct armv4_5_algorithm armv4_5_info;
struct reg_param reg_params[2];
int retval;
@@ -2807,7 +2807,7 @@ int arm7_9_checksum_memory(struct target_s *target, uint32_t address, uint32_t c
int arm7_9_blank_check_memory(struct target_s *target, uint32_t address, uint32_t count, uint32_t* blank)
{
working_area_t *erase_check_algorithm;
struct working_area *erase_check_algorithm;
struct reg_param reg_params[3];
struct armv4_5_algorithm armv4_5_info;
int retval;

2
src/target/arm7_9_common.h
View File

@@ -69,7 +69,7 @@ struct arm7_9_common
bool fast_memory_access;
bool dcc_downloads;
struct working_area_s *dcc_working_area;
struct working_area *dcc_working_area;
int (*examine_debug_reason)(target_t *target); /**< Function for determining why debug state was entered */

4
src/target/armv7m.c
View File

@@ -588,7 +588,7 @@ int armv7m_init_arch_info(target_t *target, struct armv7m_common *armv7m)
int armv7m_checksum_memory(struct target_s *target,
uint32_t address, uint32_t count, uint32_t* checksum)
{
working_area_t *crc_algorithm;
struct working_area *crc_algorithm;
struct armv7m_algorithm armv7m_info;
struct reg_param reg_params[2];
int retval;
@@ -671,7 +671,7 @@ int armv7m_checksum_memory(struct target_s *target,
int armv7m_blank_check_memory(struct target_s *target,
uint32_t address, uint32_t count, uint32_t* blank)
{
working_area_t *erase_check_algorithm;
struct working_area *erase_check_algorithm;
struct reg_param reg_params[3];
struct armv7m_algorithm armv7m_info;
int retval;

2
src/target/cortex_a8.c
View File

@@ -564,7 +564,7 @@ static int cortex_a8_debug_entry(target_t *target)
int i;
uint32_t regfile[16], pc, cpsr, dscr;
int retval = ERROR_OK;
working_area_t *regfile_working_area = NULL;
struct working_area *regfile_working_area = NULL;
struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target);
struct armv7a_common *armv7a = target_to_armv7a(target);
struct armv4_5_common_s *armv4_5 = &armv7a->armv4_5_common;

18
src/target/target.c
View File

@@ -1082,10 +1082,10 @@ int target_call_timer_callbacks_now(void)
return target_call_timer_callbacks_check_time(0);
}
int target_alloc_working_area(struct target_s *target, uint32_t size, working_area_t **area)
int target_alloc_working_area(struct target_s *target, uint32_t size, struct working_area **area)
{
working_area_t *c = target->working_areas;
working_area_t *new_wa = NULL;
struct working_area *c = target->working_areas;
struct working_area *new_wa = NULL;
/* Reevaluate working area address based on MMU state*/
if (target->working_areas == NULL)
@@ -1145,7 +1145,7 @@ int target_alloc_working_area(struct target_s *target, uint32_t size, working_ar
/* if not, allocate a new one */
if (!new_wa)
{
working_area_t **p = &target->working_areas;
struct working_area **p = &target->working_areas;
uint32_t first_free = target->working_area;
uint32_t free_size = target->working_area_size;
@@ -1167,7 +1167,7 @@ int target_alloc_working_area(struct target_s *target, uint32_t size, working_ar
LOG_DEBUG("allocated new working area at address 0x%08x", (unsigned)first_free);
new_wa = malloc(sizeof(working_area_t));
new_wa = malloc(sizeof(struct working_area));
new_wa->next = NULL;
new_wa->size = size;
new_wa->address = first_free;
@@ -1202,7 +1202,7 @@ int target_alloc_working_area(struct target_s *target, uint32_t size, working_ar
return ERROR_OK;
}
int target_free_working_area_restore(struct target_s *target, working_area_t *area, int restore)
int target_free_working_area_restore(struct target_s *target, struct working_area *area, int restore)
{
if (area->free)
return ERROR_OK;
@@ -1223,7 +1223,7 @@ int target_free_working_area_restore(struct target_s *target, working_area_t *ar
return ERROR_OK;
}
int target_free_working_area(struct target_s *target, working_area_t *area)
int target_free_working_area(struct target_s *target, struct working_area *area)
{
return target_free_working_area_restore(target, area, 1);
}
@@ -1233,11 +1233,11 @@ int target_free_working_area(struct target_s *target, working_area_t *area)
*/
void target_free_all_working_areas_restore(struct target_s *target, int restore)
{
working_area_t *c = target->working_areas;
struct working_area *c = target->working_areas;
while (c)
{
working_area_t *next = c->next;
struct working_area *next = c->next;
target_free_working_area_restore(target, c, restore);
if (c->backup)

16
src/target/target.h
View File

@@ -114,15 +114,15 @@ extern const Jim_Nvp nvp_target_endian[];
struct target_s;
typedef struct working_area_s
struct working_area
{
uint32_t address;
uint32_t size;
int free;
uint8_t *backup;
struct working_area_s **user;
struct working_area_s *next;
} working_area_t;
struct working_area **user;
struct working_area *next;
};
// target_type.h contains the full definitionof struct target_type_s
struct target_type_s;
@@ -149,7 +149,7 @@ typedef struct target_s
uint32_t working_area_phys; /* physical address */
uint32_t working_area_size; /* size in bytes */
uint32_t backup_working_area; /* whether the content of the working area has to be preserved */
struct working_area_s *working_areas;/* list of allocated working areas */
struct working_area *working_areas;/* list of allocated working areas */
enum target_debug_reason debug_reason;/* reason why the target entered debug state */
enum target_endianess endianness; /* target endianess */
// also see: target_state_name()
@@ -441,10 +441,10 @@ const char *target_state_name( target_t *target );
*
*/
int target_alloc_working_area(struct target_s *target,
uint32_t size, working_area_t **area);
int target_free_working_area(struct target_s *target, working_area_t *area);
uint32_t size, struct working_area **area);
int target_free_working_area(struct target_s *target, struct working_area *area);
int target_free_working_area_restore(struct target_s *target,
working_area_t *area, int restore);
struct working_area *area, int restore);
void target_free_all_working_areas(struct target_s *target);
void target_free_all_working_areas_restore(struct target_s *target, int restore);