imi415/openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stm32x_flash_bank_t -> struct stm32x_flash_bank

Browse Source 
Remove misleading typedef and redundant suffix from struct stm32x_flash_bank.
This commit is contained in:
Zachary T Welch 2009-11-13 07:39:01 -08:00
parent 40273967bf
commit c7b2cad52d
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/flash/stm32x.c
View File

@ -35,7 +35,7 @@ static int stm32x_mass_erase(struct flash_bank_s *bank);
*/ */
FLASH_BANK_COMMAND_HANDLER(stm32x_flash_bank_command) FLASH_BANK_COMMAND_HANDLER(stm32x_flash_bank_command)
{ {
stm32x_flash_bank_t *stm32x_info; struct stm32x_flash_bank *stm32x_info;
if (argc < 6) if (argc < 6)
{ {
@ -43,7 +43,7 @@ FLASH_BANK_COMMAND_HANDLER(stm32x_flash_bank_command)
return ERROR_FLASH_BANK_INVALID; return ERROR_FLASH_BANK_INVALID;
} }
stm32x_info = malloc(sizeof(stm32x_flash_bank_t)); stm32x_info = malloc(sizeof(struct stm32x_flash_bank));
bank->driver_priv = stm32x_info; bank->driver_priv = stm32x_info;
stm32x_info->write_algorithm = NULL; stm32x_info->write_algorithm = NULL;
@ -84,7 +84,7 @@ static uint32_t stm32x_wait_status_busy(flash_bank_t *bank, int timeout)
static int stm32x_read_options(struct flash_bank_s *bank) static int stm32x_read_options(struct flash_bank_s *bank)
{ {
uint32_t optiondata; uint32_t optiondata;
stm32x_flash_bank_t *stm32x_info = NULL; struct stm32x_flash_bank *stm32x_info = NULL;
target_t *target = bank->target; target_t *target = bank->target;
stm32x_info = bank->driver_priv; stm32x_info = bank->driver_priv;
@ -111,7 +111,7 @@ static int stm32x_read_options(struct flash_bank_s *bank)
static int stm32x_erase_options(struct flash_bank_s *bank) static int stm32x_erase_options(struct flash_bank_s *bank)
{ {
stm32x_flash_bank_t *stm32x_info = NULL; struct stm32x_flash_bank *stm32x_info = NULL;
target_t *target = bank->target; target_t *target = bank->target;
uint32_t status; uint32_t status;
@ -148,7 +148,7 @@ static int stm32x_erase_options(struct flash_bank_s *bank)
static int stm32x_write_options(struct flash_bank_s *bank) static int stm32x_write_options(struct flash_bank_s *bank)
{ {
stm32x_flash_bank_t *stm32x_info = NULL; struct stm32x_flash_bank *stm32x_info = NULL;
target_t *target = bank->target; target_t *target = bank->target;
uint32_t status; uint32_t status;
@ -233,7 +233,7 @@ static int stm32x_write_options(struct flash_bank_s *bank)
static int stm32x_protect_check(struct flash_bank_s *bank) static int stm32x_protect_check(struct flash_bank_s *bank)
{ {
target_t *target = bank->target; target_t *target = bank->target;
stm32x_flash_bank_t *stm32x_info = bank->driver_priv; struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
uint32_t protection; uint32_t protection;
int i, s; int i, s;
@ -345,7 +345,7 @@ static int stm32x_erase(struct flash_bank_s *bank, int first, int last)
static int stm32x_protect(struct flash_bank_s *bank, int set, int first, int last) static int stm32x_protect(struct flash_bank_s *bank, int set, int first, int last)
{ {
stm32x_flash_bank_t *stm32x_info = NULL; struct stm32x_flash_bank *stm32x_info = NULL;
target_t *target = bank->target; target_t *target = bank->target;
uint16_t prot_reg[4] = {0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF}; uint16_t prot_reg[4] = {0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF};
int i, reg, bit; int i, reg, bit;
@ -432,7 +432,7 @@ static int stm32x_protect(struct flash_bank_s *bank, int set, int first, int las
static int stm32x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count) static int stm32x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
{ {
stm32x_flash_bank_t *stm32x_info = bank->driver_priv; struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
target_t *target = bank->target; target_t *target = bank->target;
uint32_t buffer_size = 16384; uint32_t buffer_size = 16384;
working_area_t *source; working_area_t *source;
@ -657,7 +657,7 @@ static int stm32x_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t off
static int stm32x_probe(struct flash_bank_s *bank) static int stm32x_probe(struct flash_bank_s *bank)
{ {
target_t *target = bank->target; target_t *target = bank->target;
stm32x_flash_bank_t *stm32x_info = bank->driver_priv; struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
int i; int i;
uint16_t num_pages; uint16_t num_pages;
uint32_t device_id; uint32_t device_id;
@ -773,7 +773,7 @@ static int stm32x_probe(struct flash_bank_s *bank)
static int stm32x_auto_probe(struct flash_bank_s *bank) static int stm32x_auto_probe(struct flash_bank_s *bank)
{ {
stm32x_flash_bank_t *stm32x_info = bank->driver_priv; struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
if (stm32x_info->probed) if (stm32x_info->probed)
return ERROR_OK; return ERROR_OK;
return stm32x_probe(bank); return stm32x_probe(bank);
@ -895,7 +895,7 @@ static int stm32x_info(struct flash_bank_s *bank, char *buf, int buf_size)
COMMAND_HANDLER(stm32x_handle_lock_command) COMMAND_HANDLER(stm32x_handle_lock_command)
{ {
target_t *target = NULL; target_t *target = NULL;
stm32x_flash_bank_t *stm32x_info = NULL; struct stm32x_flash_bank *stm32x_info = NULL;
if (argc < 1) if (argc < 1)
{ {
@ -941,7 +941,7 @@ COMMAND_HANDLER(stm32x_handle_lock_command)
COMMAND_HANDLER(stm32x_handle_unlock_command) COMMAND_HANDLER(stm32x_handle_unlock_command)
{ {
target_t *target = NULL; target_t *target = NULL;
stm32x_flash_bank_t *stm32x_info = NULL; struct stm32x_flash_bank *stm32x_info = NULL;
if (argc < 1) if (argc < 1)
{ {
@ -985,7 +985,7 @@ COMMAND_HANDLER(stm32x_handle_options_read_command)
{ {
uint32_t optionbyte; uint32_t optionbyte;
target_t *target = NULL; target_t *target = NULL;
stm32x_flash_bank_t *stm32x_info = NULL; struct stm32x_flash_bank *stm32x_info = NULL;
if (argc < 1) if (argc < 1)
{ {
@ -1040,7 +1040,7 @@ COMMAND_HANDLER(stm32x_handle_options_read_command)
COMMAND_HANDLER(stm32x_handle_options_write_command) COMMAND_HANDLER(stm32x_handle_options_write_command)
{ {
target_t *target = NULL; target_t *target = NULL;
stm32x_flash_bank_t *stm32x_info = NULL; struct stm32x_flash_bank *stm32x_info = NULL;
uint16_t optionbyte = 0xF8; uint16_t optionbyte = 0xF8;
if (argc < 4) if (argc < 4)

4
src/flash/stm32x.h
View File

@ -32,13 +32,13 @@ struct stm32x_options
uint16_t protection[4]; uint16_t protection[4];
}; };
typedef struct stm32x_flash_bank_s struct stm32x_flash_bank
{ {
struct stm32x_options option_bytes; struct stm32x_options option_bytes;
working_area_t *write_algorithm; working_area_t *write_algorithm;
int ppage_size; int ppage_size;
int probed; int probed;
} stm32x_flash_bank_t; };
/* stm32x register locations */ /* stm32x register locations */