#include "arm7_9_common.h"
-static int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last);
-static int str9xpec_set_address(struct flash_bank_s *bank, uint8_t sector);
-static int str9xpec_write_options(struct flash_bank_s *bank);
+static int str9xpec_erase_area(struct flash_bank *bank, int first, int last);
+static int str9xpec_set_address(struct flash_bank *bank, uint8_t sector);
+static int str9xpec_write_options(struct flash_bank *bank);
int str9xpec_set_instr(struct jtag_tap *tap, uint32_t new_instr, tap_state_t end_state)
{
return status;
}
-static int str9xpec_isc_enable(struct flash_bank_s *bank)
+static int str9xpec_isc_enable(struct flash_bank *bank)
{
uint8_t status;
struct jtag_tap *tap;
- str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
+ struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv;
tap = str9xpec_info->tap;
return ERROR_OK;
}
-static int str9xpec_isc_disable(struct flash_bank_s *bank)
+static int str9xpec_isc_disable(struct flash_bank *bank)
{
uint8_t status;
struct jtag_tap *tap;
- str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
+ struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv;
tap = str9xpec_info->tap;
return ERROR_OK;
}
-static int str9xpec_read_config(struct flash_bank_s *bank)
+static int str9xpec_read_config(struct flash_bank *bank)
{
struct scan_field field;
uint8_t status;
struct jtag_tap *tap;
- str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
+ struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv;
tap = str9xpec_info->tap;
return status;
}
-static int str9xpec_build_block_list(struct flash_bank_s *bank)
+static int str9xpec_build_block_list(struct flash_bank *bank)
{
- str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
+ struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv;
int i;
int num_sectors;
*/
FLASH_BANK_COMMAND_HANDLER(str9xpec_flash_bank_command)
{
- str9xpec_flash_controller_t *str9xpec_info;
- armv4_5_common_t *armv4_5 = NULL;
- arm7_9_common_t *arm7_9 = NULL;
- arm_jtag_t *jtag_info = NULL;
+ struct str9xpec_flash_controller *str9xpec_info;
+ struct arm *armv4_5 = NULL;
+ struct arm7_9_common *arm7_9 = NULL;
+ struct arm_jtag *jtag_info = NULL;
if (argc < 6)
{
return ERROR_FLASH_BANK_INVALID;
}
- str9xpec_info = malloc(sizeof(str9xpec_flash_controller_t));
+ str9xpec_info = malloc(sizeof(struct str9xpec_flash_controller));
bank->driver_priv = str9xpec_info;
/* REVISIT verify that the jtag position of flash controller is
return ERROR_OK;
}
-static int str9xpec_blank_check(struct flash_bank_s *bank, int first, int last)
+static int str9xpec_blank_check(struct flash_bank *bank, int first, int last)
{
struct scan_field field;
uint8_t status;
int i;
uint8_t *buffer = NULL;
- str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
+ struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv;
tap = str9xpec_info->tap;
return ERROR_OK;
}
-static int str9xpec_protect_check(struct flash_bank_s *bank)
+static int str9xpec_protect_check(struct flash_bank *bank)
{
uint8_t status;
int i;
- str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
+ struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv;
status = str9xpec_read_config(bank);
return ERROR_OK;
}
-static int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last)
+static int str9xpec_erase_area(struct flash_bank *bank, int first, int last)
{
struct scan_field field;
uint8_t status;
int i;
uint8_t *buffer = NULL;
- str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
+ struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv;
tap = str9xpec_info->tap;
return status;
}
-static int str9xpec_erase(struct flash_bank_s *bank, int first, int last)
+static int str9xpec_erase(struct flash_bank *bank, int first, int last)
{
int status;
return ERROR_OK;
}
-static int str9xpec_lock_device(struct flash_bank_s *bank)
+static int str9xpec_lock_device(struct flash_bank *bank)
{
struct scan_field field;
uint8_t status;
struct jtag_tap *tap;
- str9xpec_flash_controller_t *str9xpec_info = NULL;
+ struct str9xpec_flash_controller *str9xpec_info = NULL;
str9xpec_info = bank->driver_priv;
tap = str9xpec_info->tap;
return status;
}
-static int str9xpec_unlock_device(struct flash_bank_s *bank)
+static int str9xpec_unlock_device(struct flash_bank *bank)
{
uint8_t status;
return status;
}
-static int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int last)
+static int str9xpec_protect(struct flash_bank *bank, int set, int first, int last)
{
uint8_t status;
int i;
- str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
+ struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv;
status = str9xpec_read_config(bank);
return ERROR_OK;
}
-static int str9xpec_set_address(struct flash_bank_s *bank, uint8_t sector)
+static int str9xpec_set_address(struct flash_bank *bank, uint8_t sector)
{
struct jtag_tap *tap;
struct scan_field field;
- str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
+ struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv;
tap = str9xpec_info->tap;
return ERROR_OK;
}
-static int str9xpec_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
+static int str9xpec_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
{
- str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
+ struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv;
uint32_t dwords_remaining = (count / 8);
uint32_t bytes_remaining = (count & 0x00000007);
uint32_t bytes_written = 0;
return ERROR_OK;
}
-static int str9xpec_probe(struct flash_bank_s *bank)
+static int str9xpec_probe(struct flash_bank *bank)
{
return ERROR_OK;
}
uint8_t *buffer = NULL;
struct jtag_tap *tap;
uint32_t idcode;
- str9xpec_flash_controller_t *str9xpec_info = NULL;
+ struct str9xpec_flash_controller *str9xpec_info = NULL;
if (argc < 1)
return ERROR_COMMAND_SYNTAX_ERROR;
- flash_bank_t *bank;
- int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+ struct flash_bank *bank;
+ int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
if (ERROR_OK != retval)
return retval;
return ERROR_OK;
}
-static int str9xpec_erase_check(struct flash_bank_s *bank)
+static int str9xpec_erase_check(struct flash_bank *bank)
{
return str9xpec_blank_check(bank, 0, bank->num_sectors - 1);
}
-static int str9xpec_info(struct flash_bank_s *bank, char *buf, int buf_size)
+static int str9xpec_info(struct flash_bank *bank, char *buf, int buf_size)
{
snprintf(buf, buf_size, "str9xpec flash driver info");
return ERROR_OK;
COMMAND_HANDLER(str9xpec_handle_flash_options_read_command)
{
uint8_t status;
- str9xpec_flash_controller_t *str9xpec_info = NULL;
+ struct str9xpec_flash_controller *str9xpec_info = NULL;
if (argc < 1)
{
return ERROR_OK;
}
- flash_bank_t *bank;
- int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+ struct flash_bank *bank;
+ int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
if (ERROR_OK != retval)
return retval;
return ERROR_OK;
}
-static int str9xpec_write_options(struct flash_bank_s *bank)
+static int str9xpec_write_options(struct flash_bank *bank)
{
struct scan_field field;
uint8_t status;
struct jtag_tap *tap;
- str9xpec_flash_controller_t *str9xpec_info = NULL;
+ struct str9xpec_flash_controller *str9xpec_info = NULL;
str9xpec_info = bank->driver_priv;
tap = str9xpec_info->tap;
return ERROR_OK;
}
- flash_bank_t *bank;
- int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+ struct flash_bank *bank;
+ int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
if (ERROR_OK != retval)
return retval;
COMMAND_HANDLER(str9xpec_handle_flash_options_cmap_command)
{
- str9xpec_flash_controller_t *str9xpec_info = NULL;
+ struct str9xpec_flash_controller *str9xpec_info = NULL;
if (argc < 2)
{
return ERROR_OK;
}
- flash_bank_t *bank;
- int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+ struct flash_bank *bank;
+ int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
if (ERROR_OK != retval)
return retval;
COMMAND_HANDLER(str9xpec_handle_flash_options_lvdthd_command)
{
- str9xpec_flash_controller_t *str9xpec_info = NULL;
+ struct str9xpec_flash_controller *str9xpec_info = NULL;
if (argc < 2)
{
return ERROR_OK;
}
- flash_bank_t *bank;
- int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+ struct flash_bank *bank;
+ int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
if (ERROR_OK != retval)
return retval;
COMMAND_HANDLER(str9xpec_handle_flash_options_lvdsel_command)
{
- str9xpec_flash_controller_t *str9xpec_info = NULL;
+ struct str9xpec_flash_controller *str9xpec_info = NULL;
if (argc < 2)
{
return ERROR_OK;
}
- flash_bank_t *bank;
- int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+ struct flash_bank *bank;
+ int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
if (ERROR_OK != retval)
return retval;
COMMAND_HANDLER(str9xpec_handle_flash_options_lvdwarn_command)
{
- str9xpec_flash_controller_t *str9xpec_info = NULL;
+ struct str9xpec_flash_controller *str9xpec_info = NULL;
if (argc < 2)
{
return ERROR_OK;
}
- flash_bank_t *bank;
- int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+ struct flash_bank *bank;
+ int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
if (ERROR_OK != retval)
return retval;
return ERROR_OK;
}
- flash_bank_t *bank;
- int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+ struct flash_bank *bank;
+ int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
if (ERROR_OK != retval)
return retval;
return ERROR_OK;
}
- flash_bank_t *bank;
- int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+ struct flash_bank *bank;
+ int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
if (ERROR_OK != retval)
return retval;
struct jtag_tap *tap0;
struct jtag_tap *tap1;
struct jtag_tap *tap2;
- str9xpec_flash_controller_t *str9xpec_info = NULL;
+ struct str9xpec_flash_controller *str9xpec_info = NULL;
if (argc < 1)
{
return ERROR_OK;
}
- flash_bank_t *bank;
- int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+ struct flash_bank *bank;
+ int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
if (ERROR_OK != retval)
return retval;
COMMAND_HANDLER(str9xpec_handle_flash_disable_turbo_command)
{
struct jtag_tap *tap;
- str9xpec_flash_controller_t *str9xpec_info = NULL;
+ struct str9xpec_flash_controller *str9xpec_info = NULL;
if (argc < 1)
{
return ERROR_OK;
}
- flash_bank_t *bank;
- int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+ struct flash_bank *bank;
+ int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
if (ERROR_OK != retval)
return retval;
return ERROR_OK;
}
-static int str9xpec_register_commands(struct command_context_s *cmd_ctx)
+static int str9xpec_register_commands(struct command_context *cmd_ctx)
{
- command_t *str9xpec_cmd = register_command(cmd_ctx, NULL, "str9xpec",
+ struct command *str9xpec_cmd = register_command(cmd_ctx, NULL, "str9xpec",
NULL, COMMAND_ANY, "str9xpec flash specific commands");
register_command(cmd_ctx, str9xpec_cmd, "enable_turbo",
return ERROR_OK;
}
-flash_driver_t str9xpec_flash = {
+struct flash_driver str9xpec_flash = {
.name = "str9xpec",
.register_commands = &str9xpec_register_commands,
.flash_bank_command = &str9xpec_flash_bank_command,