X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fstellaris.c;h=cdeccbe102bf7d70afd02ddaeda467752c2d7b8d;hb=4bc80e5a65dde09ca795e50e77bcfe77b8dd444f;hp=d66b9a8a880a68697b4fc6ccea9622a2a73521fa;hpb=0796dfff89bf00f82a780d7719767bcffe881d67;p=openocd.git

diff --git a/src/flash/stellaris.c b/src/flash/stellaris.c
index d66b9a8a88..cdeccbe102 100644
--- a/src/flash/stellaris.c
+++ b/src/flash/stellaris.c
@@ -215,7 +215,7 @@ static char * StellarisClassname[5] =
  */
 FLASH_BANK_COMMAND_HANDLER(stellaris_flash_bank_command)
 {
-	stellaris_flash_bank_t *stellaris_info;
+	struct stellaris_flash_bank *stellaris_info;
 
 	if (argc < 6)
 	{
@@ -223,7 +223,7 @@ FLASH_BANK_COMMAND_HANDLER(stellaris_flash_bank_command)
 		return ERROR_FLASH_BANK_INVALID;
 	}
 
-	stellaris_info = calloc(sizeof(stellaris_flash_bank_t), 1);
+	stellaris_info = calloc(sizeof(struct stellaris_flash_bank), 1);
 	bank->base = 0x0;
 	bank->driver_priv = stellaris_info;
 
@@ -242,7 +242,7 @@ FLASH_BANK_COMMAND_HANDLER(stellaris_flash_bank_command)
 static int stellaris_info(struct flash_bank_s *bank, char *buf, int buf_size)
 {
 	int printed, device_class;
-	stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
+	struct stellaris_flash_bank *stellaris_info = bank->driver_priv;
 
 	stellaris_read_part_info(bank);
 
@@ -363,7 +363,7 @@ static const unsigned rcc_xtal[32] = {
 
 static void stellaris_read_clock_info(flash_bank_t *bank)
 {
-	stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
+	struct stellaris_flash_bank *stellaris_info = bank->driver_priv;
 	target_t *target = bank->target;
 	uint32_t rcc, rcc2, pllcfg, sysdiv, usesysdiv, bypass, oscsrc;
 	unsigned xtal;
@@ -450,7 +450,7 @@ static void stellaris_read_clock_info(flash_bank_t *bank)
 /* Setup the timimg registers */
 static void stellaris_set_flash_mode(flash_bank_t *bank,int mode)
 {
-	stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
+	struct stellaris_flash_bank *stellaris_info = bank->driver_priv;
 	target_t *target = bank->target;
 
 	uint32_t usecrl = (stellaris_info->mck_freq/1000000ul-1);
@@ -497,7 +497,7 @@ static int stellaris_flash_command(struct flash_bank_s *bank,uint8_t cmd,uint16_
 /* Read device id register, main clock frequency register and fill in driver info structure */
 static int stellaris_read_part_info(struct flash_bank_s *bank)
 {
-	stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
+	struct stellaris_flash_bank *stellaris_info = bank->driver_priv;
 	target_t *target = bank->target;
 	uint32_t did0, did1, ver, fam, status;
 	int i;
@@ -592,7 +592,7 @@ static int stellaris_read_part_info(struct flash_bank_s *bank)
 
 	/* provide this for the benefit of the higher flash driver layers */
 	bank->num_sectors = stellaris_info->num_pages;
-	bank->sectors = malloc(sizeof(flash_sector_t) * bank->num_sectors);
+	bank->sectors = malloc(sizeof(struct flash_sector) * bank->num_sectors);
 	for (i = 0; i < bank->num_sectors; i++)
 	{
 		bank->sectors[i].offset = i * stellaris_info->pagesize;
@@ -617,7 +617,7 @@ static int stellaris_protect_check(struct flash_bank_s *bank)
 {
 	uint32_t status;
 
-	stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
+	struct stellaris_flash_bank *stellaris_info = bank->driver_priv;
 
 	if (bank->target->state != TARGET_HALTED)
 	{
@@ -646,7 +646,7 @@ static int stellaris_erase(struct flash_bank_s *bank, int first, int last)
 {
 	int banknr;
 	uint32_t flash_fmc, flash_cris;
-	stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
+	struct stellaris_flash_bank *stellaris_info = bank->driver_priv;
 	target_t *target = bank->target;
 
 	if (bank->target->state != TARGET_HALTED)
@@ -717,7 +717,7 @@ static int stellaris_protect(struct flash_bank_s *bank, int set, int first, int
 	uint32_t fmppe, flash_fmc, flash_cris;
 	int lockregion;
 
-	stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
+	struct stellaris_flash_bank *stellaris_info = bank->driver_priv;
 	target_t *target = bank->target;
 
 	if (bank->target->state != TARGET_HALTED)
@@ -835,8 +835,8 @@ static int stellaris_write_block(struct flash_bank_s *bank, uint8_t *buffer, uin
 	working_area_t *source;
 	working_area_t *write_algorithm;
 	uint32_t address = bank->base + offset;
-	reg_param_t reg_params[3];
-	armv7m_algorithm_t armv7m_info;
+	struct reg_param reg_params[3];
+	struct armv7m_algorithm armv7m_info;
 	int retval = ERROR_OK;
 
 	LOG_DEBUG("(bank=%p buffer=%p offset=%08" PRIx32 " wcount=%08" PRIx32 "",
@@ -910,7 +910,7 @@ static int stellaris_write_block(struct flash_bank_s *bank, uint8_t *buffer, uin
 
 static int stellaris_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
-	stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
+	struct stellaris_flash_bank *stellaris_info = bank->driver_priv;
 	target_t *target = bank->target;
 	uint32_t address = offset;
 	uint32_t flash_cris, flash_fmc;
@@ -1061,7 +1061,7 @@ static int stellaris_probe(struct flash_bank_s *bank)
 
 static int stellaris_auto_probe(struct flash_bank_s *bank)
 {
-	stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
+	struct stellaris_flash_bank *stellaris_info = bank->driver_priv;
 	if (stellaris_info->did1)
 		return ERROR_OK;
 	return stellaris_probe(bank);
@@ -1070,7 +1070,7 @@ static int stellaris_auto_probe(struct flash_bank_s *bank)
 static int stellaris_mass_erase(struct flash_bank_s *bank)
 {
 	target_t *target = NULL;
-	stellaris_flash_bank_t *stellaris_info = NULL;
+	struct stellaris_flash_bank *stellaris_info = NULL;
 	uint32_t flash_fmc;
 
 	stellaris_info = bank->driver_priv;
@@ -1172,7 +1172,7 @@ static int stellaris_register_commands(struct command_context_s *cmd_ctx)
 }
 
 
-flash_driver_t stellaris_flash = {
+struct flash_driver stellaris_flash = {
 		.name = "stellaris",
 		.register_commands = &stellaris_register_commands,
 		.flash_bank_command = &stellaris_flash_bank_command,