X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fflash%2Ftms470.c;h=9f45b4710a803a0f6c990678011e0da7aac7afee;hb=056fcdb540f0ab9a404f3b5de72fd707eb146603;hp=1348697ae286a9b6730dcdc9df0940b809903389;hpb=712d3fc0fb3ed69342a649d8bbb0d6d901a64720;p=openocd

diff --git a/src/flash/tms470.c b/src/flash/tms470.c
index 1348697a..9f45b471 100644
--- a/src/flash/tms470.c
+++ b/src/flash/tms470.c
@@ -28,7 +28,7 @@
                       Internal Support, Helpers
    ---------------------------------------------------------------------- */
 
-const flash_sector_t TMS470R1A256_SECTORS[] = {
+const struct flash_sector TMS470R1A256_SECTORS[] = {
 	{0x00000000, 0x00002000, -1, -1},
 	{0x00002000, 0x00002000, -1, -1},
 	{0x00004000, 0x00002000, -1, -1},
@@ -48,7 +48,7 @@ const flash_sector_t TMS470R1A256_SECTORS[] = {
 #define TMS470R1A256_NUM_SECTORS \
 	(sizeof(TMS470R1A256_SECTORS)/sizeof(TMS470R1A256_SECTORS[0]))
 
-const flash_sector_t TMS470R1A288_BANK0_SECTORS[] = {
+const struct flash_sector TMS470R1A288_BANK0_SECTORS[] = {
 	{0x00000000, 0x00002000, -1, -1},
 	{0x00002000, 0x00002000, -1, -1},
 	{0x00004000, 0x00002000, -1, -1},
@@ -58,7 +58,7 @@ const flash_sector_t TMS470R1A288_BANK0_SECTORS[] = {
 #define TMS470R1A288_BANK0_NUM_SECTORS \
 	(sizeof(TMS470R1A288_BANK0_SECTORS)/sizeof(TMS470R1A288_BANK0_SECTORS[0]))
 
-const flash_sector_t TMS470R1A288_BANK1_SECTORS[] = {
+const struct flash_sector TMS470R1A288_BANK1_SECTORS[] = {
 	{0x00040000, 0x00010000, -1, -1},
 	{0x00050000, 0x00010000, -1, -1},
 	{0x00060000, 0x00010000, -1, -1},
@@ -68,7 +68,7 @@ const flash_sector_t TMS470R1A288_BANK1_SECTORS[] = {
 #define TMS470R1A288_BANK1_NUM_SECTORS \
 	(sizeof(TMS470R1A288_BANK1_SECTORS)/sizeof(TMS470R1A288_BANK1_SECTORS[0]))
 
-const flash_sector_t TMS470R1A384_BANK0_SECTORS[] = {
+const struct flash_sector TMS470R1A384_BANK0_SECTORS[] = {
 	{0x00000000, 0x00002000, -1, -1},
 	{0x00002000, 0x00002000, -1, -1},
 	{0x00004000, 0x00004000, -1, -1},
@@ -84,7 +84,7 @@ const flash_sector_t TMS470R1A384_BANK0_SECTORS[] = {
 #define TMS470R1A384_BANK0_NUM_SECTORS \
 	(sizeof(TMS470R1A384_BANK0_SECTORS)/sizeof(TMS470R1A384_BANK0_SECTORS[0]))
 
-const flash_sector_t TMS470R1A384_BANK1_SECTORS[] = {
+const struct flash_sector TMS470R1A384_BANK1_SECTORS[] = {
 	{0x00020000, 0x00008000, -1, -1},
 	{0x00028000, 0x00008000, -1, -1},
 	{0x00030000, 0x00008000, -1, -1},
@@ -94,7 +94,7 @@ const flash_sector_t TMS470R1A384_BANK1_SECTORS[] = {
 #define TMS470R1A384_BANK1_NUM_SECTORS \
 	(sizeof(TMS470R1A384_BANK1_SECTORS)/sizeof(TMS470R1A384_BANK1_SECTORS[0]))
 
-const flash_sector_t TMS470R1A384_BANK2_SECTORS[] = {
+const struct flash_sector TMS470R1A384_BANK2_SECTORS[] = {
 	{0x00040000, 0x00008000, -1, -1},
 	{0x00048000, 0x00008000, -1, -1},
 	{0x00050000, 0x00008000, -1, -1},
@@ -108,7 +108,7 @@ const flash_sector_t TMS470R1A384_BANK2_SECTORS[] = {
 
 static int tms470_read_part_info(struct flash_bank_s *bank)
 {
-	tms470_flash_bank_t *tms470_info = bank->driver_priv;
+	struct tms470_flash_bank *tms470_info = bank->driver_priv;
 	target_t *target = bank->target;
 	uint32_t device_ident_reg;
 	uint32_t silicon_version;
@@ -289,7 +289,7 @@ static int tms470_read_part_info(struct flash_bank_s *bank)
 static uint32_t keysSet = 0;
 static uint32_t flashKeys[4];
 
-static int tms470_handle_flash_keyset_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(tms470_handle_flash_keyset_command)
 {
 	if (argc > 4)
 	{
@@ -353,7 +353,7 @@ static const uint32_t FLASH_KEYS_MIX2[] = { 0x0000ffff, 0x0000ffff,
 
 static int oscMHz = 12;
 
-static int tms470_handle_osc_megahertz_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(tms470_handle_osc_megahertz_command)
 {
 	if (argc > 1)
 	{
@@ -382,7 +382,7 @@ static int tms470_handle_osc_megahertz_command(struct command_context_s *cmd_ctx
 
 static int plldis = 0;
 
-static int tms470_handle_plldis_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(tms470_handle_plldis_command)
 {
 	if (argc > 1)
 	{
@@ -534,7 +534,7 @@ static int tms470_flash_initialize_internal_state_machine(struct flash_bank_s *b
 {
 	uint32_t fmmac2, fmmac1, fmmaxep, k, delay, glbctrl, sysclk;
 	target_t *target = bank->target;
-	tms470_flash_bank_t *tms470_info = bank->driver_priv;
+	struct tms470_flash_bank *tms470_info = bank->driver_priv;
 	int result = ERROR_OK;
 
 	/*
@@ -832,7 +832,7 @@ static int tms470_register_commands(struct command_context_s *cmd_ctx)
 
 static int tms470_erase(struct flash_bank_s *bank, int first, int last)
 {
-	tms470_flash_bank_t *tms470_info = bank->driver_priv;
+	struct tms470_flash_bank *tms470_info = bank->driver_priv;
 	int sector, result = ERROR_OK;
 
 	if (bank->target->state != TARGET_HALTED)
@@ -879,7 +879,7 @@ static int tms470_erase(struct flash_bank_s *bank, int first, int last)
 
 static int tms470_protect(struct flash_bank_s *bank, int set, int first, int last)
 {
-	tms470_flash_bank_t *tms470_info = bank->driver_priv;
+	struct tms470_flash_bank *tms470_info = bank->driver_priv;
 	target_t *target = bank->target;
 	uint32_t fmmac2, fmbsea, fmbseb;
 	int sector;
@@ -1040,7 +1040,7 @@ static int tms470_probe(struct flash_bank_s *bank)
 
 static int tms470_auto_probe(struct flash_bank_s *bank)
 {
-	tms470_flash_bank_t *tms470_info = bank->driver_priv;
+	struct tms470_flash_bank *tms470_info = bank->driver_priv;
 
 	if (tms470_info->device_ident_reg)
 		return ERROR_OK;
@@ -1052,7 +1052,7 @@ static int tms470_auto_probe(struct flash_bank_s *bank)
 static int tms470_erase_check(struct flash_bank_s *bank)
 {
 	target_t *target = bank->target;
-	tms470_flash_bank_t *tms470_info = bank->driver_priv;
+	struct tms470_flash_bank *tms470_info = bank->driver_priv;
 	int sector, result = ERROR_OK;
 	uint32_t fmmac2, fmbac2, glbctrl, orig_fmregopt;
 	static uint8_t buffer[64 * 1024];
@@ -1143,7 +1143,7 @@ static int tms470_erase_check(struct flash_bank_s *bank)
 static int tms470_protect_check(struct flash_bank_s *bank)
 {
 	target_t *target = bank->target;
-	tms470_flash_bank_t *tms470_info = bank->driver_priv;
+	struct tms470_flash_bank *tms470_info = bank->driver_priv;
 	int sector, result = ERROR_OK;
 	uint32_t fmmac2, fmbsea, fmbseb;
 
@@ -1191,7 +1191,7 @@ static int tms470_protect_check(struct flash_bank_s *bank)
 static int tms470_info(struct flash_bank_s *bank, char *buf, int buf_size)
 {
 	int used = 0;
-	tms470_flash_bank_t *tms470_info = bank->driver_priv;
+	struct tms470_flash_bank *tms470_info = bank->driver_priv;
 
 	if (!tms470_info->device_ident_reg)
 	{
@@ -1222,21 +1222,21 @@ static int tms470_info(struct flash_bank_s *bank, char *buf, int buf_size)
  * [options...]
  */
 
-static int tms470_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank)
+FLASH_BANK_COMMAND_HANDLER(tms470_flash_bank_command)
 {
-	bank->driver_priv = malloc(sizeof(tms470_flash_bank_t));
+	bank->driver_priv = malloc(sizeof(struct tms470_flash_bank));
 
 	if (!bank->driver_priv)
 	{
 		return ERROR_FLASH_OPERATION_FAILED;
 	}
 
-	(void)memset(bank->driver_priv, 0, sizeof(tms470_flash_bank_t));
+	(void)memset(bank->driver_priv, 0, sizeof(struct tms470_flash_bank));
 
 	return ERROR_OK;
 }
 
-flash_driver_t tms470_flash = {
+struct flash_driver tms470_flash = {
 		.name = "tms470",
 		.register_commands = &tms470_register_commands,
 		.flash_bank_command = &tms470_flash_bank_command,