#include "at91sam7.h"
#include "binarybuffer.h"
-static int at91sam7_protect_check(struct flash_bank_s *bank);
-static int at91sam7_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count);
+static int at91sam7_protect_check(struct flash_bank *bank);
+static int at91sam7_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count);
-static uint32_t at91sam7_get_flash_status(target_t *target, int bank_number);
-static void at91sam7_set_flash_mode(flash_bank_t *bank, int mode);
-static uint32_t at91sam7_wait_status_busy(flash_bank_t *bank, uint32_t waitbits, int timeout);
-static int at91sam7_flash_command(struct flash_bank_s *bank, uint8_t cmd, uint16_t pagen);
+static uint32_t at91sam7_get_flash_status(struct target *target, int bank_number);
+static void at91sam7_set_flash_mode(struct flash_bank *bank, int mode);
+static uint32_t at91sam7_wait_status_busy(struct flash_bank *bank, uint32_t waitbits, int timeout);
+static int at91sam7_flash_command(struct flash_bank *bank, uint8_t cmd, uint16_t pagen);
static uint32_t MC_FMR[4] = { 0xFFFFFF60, 0xFFFFFF70, 0xFFFFFF80, 0xFFFFFF90 };
static uint32_t MC_FCR[4] = { 0xFFFFFF64, 0xFFFFFF74, 0xFFFFFF84, 0xFFFFFF94 };
#endif
-static uint32_t at91sam7_get_flash_status(target_t *target, int bank_number)
+static uint32_t at91sam7_get_flash_status(struct target *target, int bank_number)
{
uint32_t fsr;
target_read_u32(target, MC_FSR[bank_number], &fsr);
}
/* Read clock configuration and set at91sam7_info->mck_freq */
-static void at91sam7_read_clock_info(flash_bank_t *bank)
+static void at91sam7_read_clock_info(struct flash_bank *bank)
{
struct at91sam7_flash_bank *at91sam7_info = bank->driver_priv;
- target_t *target = bank->target;
+ struct target *target = bank->target;
uint32_t mckr, mcfr, pllr, mor;
unsigned long tmp = 0, mainfreq;
}
/* Setup the timimg registers for nvbits or normal flash */
-static void at91sam7_set_flash_mode(flash_bank_t *bank, int mode)
+static void at91sam7_set_flash_mode(struct flash_bank *bank, int mode)
{
uint32_t fmr, fmcn = 0, fws = 0;
struct at91sam7_flash_bank *at91sam7_info = bank->driver_priv;
- target_t *target = bank->target;
+ struct target *target = bank->target;
if (mode && (mode != at91sam7_info->flashmode))
{
at91sam7_info->flashmode = mode;
}
-static uint32_t at91sam7_wait_status_busy(flash_bank_t *bank, uint32_t waitbits, int timeout)
+static uint32_t at91sam7_wait_status_busy(struct flash_bank *bank, uint32_t waitbits, int timeout)
{
uint32_t status;
}
/* Send one command to the AT91SAM flash controller */
-static int at91sam7_flash_command(struct flash_bank_s *bank, uint8_t cmd, uint16_t pagen)
+static int at91sam7_flash_command(struct flash_bank *bank, uint8_t cmd, uint16_t pagen)
{
uint32_t fcr;
struct at91sam7_flash_bank *at91sam7_info = bank->driver_priv;
- target_t *target = bank->target;
+ struct target *target = bank->target;
fcr = (0x5A << 24) | ((pagen&0x3FF) << 8) | cmd;
target_write_u32(target, MC_FCR[bank->bank_number], fcr);
}
/* Read device id register, main clock frequency register and fill in driver info structure */
-static int at91sam7_read_part_info(struct flash_bank_s *bank)
+static int at91sam7_read_part_info(struct flash_bank *bank)
{
- flash_bank_t *t_bank = bank;
+ struct flash_bank *t_bank = bank;
struct at91sam7_flash_bank *at91sam7_info;
- target_t *target = t_bank->target;
+ struct target *target = t_bank->target;
uint16_t bnk, sec;
uint16_t arch;
if (at91sam7_info->cidr != 0)
{
/* flash already configured, update clock and check for protected sectors */
- flash_bank_t *fb = bank;
+ struct flash_bank *fb = bank;
t_bank = fb;
while (t_bank)
if (at91sam7_info->flash_autodetection == 0)
{
/* banks and sectors are already created, based on data from input file */
- flash_bank_t *fb = bank;
+ struct flash_bank *fb = bank;
t_bank = fb;
while (t_bank)
{
if (bnk > 0)
{
/* create a new flash bank element */
- flash_bank_t *fb = malloc(sizeof(flash_bank_t));
+ struct flash_bank *fb = malloc(sizeof(struct flash_bank));
fb->target = target;
fb->driver = bank->driver;
fb->driver_priv = malloc(sizeof(struct at91sam7_flash_bank));
return ERROR_OK;
}
-static int at91sam7_erase_check(struct flash_bank_s *bank)
+static int at91sam7_erase_check(struct flash_bank *bank)
{
- target_t *target = bank->target;
+ struct target *target = bank->target;
uint16_t retval;
uint32_t blank;
uint16_t fast_check;
return ERROR_OK;
}
-static int at91sam7_protect_check(struct flash_bank_s *bank)
+static int at91sam7_protect_check(struct flash_bank *bank)
{
uint8_t lock_pos, gpnvm_pos;
uint32_t status;
FLASH_BANK_COMMAND_HANDLER(at91sam7_flash_bank_command)
{
- flash_bank_t *t_bank = bank;
+ struct flash_bank *t_bank = bank;
struct at91sam7_flash_bank *at91sam7_info;
- target_t *target = t_bank->target;
+ struct target *target = t_bank->target;
uint32_t base_address;
uint32_t bank_size;
at91sam7_info->ext_freq = 0;
at91sam7_info->flash_autodetection = 0;
- if (argc < 13)
+ if (CMD_ARGC < 13)
{
at91sam7_info->flash_autodetection = 1;
return ERROR_OK;
}
- COMMAND_PARSE_NUMBER(u32, args[1], base_address);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], base_address);
- COMMAND_PARSE_NUMBER(int, args[3], chip_width);
- COMMAND_PARSE_NUMBER(int, args[4], bus_width);
+ COMMAND_PARSE_NUMBER(int, CMD_ARGV[3], chip_width);
+ COMMAND_PARSE_NUMBER(int, CMD_ARGV[4], bus_width);
- COMMAND_PARSE_NUMBER(int, args[8], banks_num);
- COMMAND_PARSE_NUMBER(int, args[9], num_sectors);
- COMMAND_PARSE_NUMBER(u16, args[10], pages_per_sector);
- COMMAND_PARSE_NUMBER(u16, args[11], page_size);
- COMMAND_PARSE_NUMBER(u16, args[12], num_nvmbits);
+ COMMAND_PARSE_NUMBER(int, CMD_ARGV[8], banks_num);
+ COMMAND_PARSE_NUMBER(int, CMD_ARGV[9], num_sectors);
+ COMMAND_PARSE_NUMBER(u16, CMD_ARGV[10], pages_per_sector);
+ COMMAND_PARSE_NUMBER(u16, CMD_ARGV[11], page_size);
+ COMMAND_PARSE_NUMBER(u16, CMD_ARGV[12], num_nvmbits);
- if (argc == 14) {
+ if (CMD_ARGC == 14) {
unsigned long freq;
- COMMAND_PARSE_NUMBER(ulong, args[13], freq);
+ COMMAND_PARSE_NUMBER(ulong, CMD_ARGV[13], freq);
ext_freq = freq * 1000;
at91sam7_info->ext_freq = ext_freq;
}
return ERROR_OK;
}
- target_name = calloc(strlen(args[7]) + 1, sizeof(char));
- strcpy(target_name, args[7]);
+ target_name = calloc(strlen(CMD_ARGV[7]) + 1, sizeof(char));
+ strcpy(target_name, CMD_ARGV[7]);
/* calculate bank size */
bank_size = num_sectors * pages_per_sector * page_size;
if (bnk > 0)
{
/* create a new bank element */
- flash_bank_t *fb = malloc(sizeof(flash_bank_t));
+ struct flash_bank *fb = malloc(sizeof(struct flash_bank));
fb->target = target;
fb->driver = bank->driver;
fb->driver_priv = malloc(sizeof(struct at91sam7_flash_bank));
return ERROR_OK;
}
-static int at91sam7_erase(struct flash_bank_s *bank, int first, int last)
+static int at91sam7_erase(struct flash_bank *bank, int first, int last)
{
struct at91sam7_flash_bank *at91sam7_info = bank->driver_priv;
int sec;
return ERROR_OK;
}
-static int at91sam7_protect(struct flash_bank_s *bank, int set, int first, int last)
+static int at91sam7_protect(struct flash_bank *bank, int set, int first, int last)
{
uint32_t cmd;
int sector;
return ERROR_OK;
}
-static int at91sam7_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
+static int at91sam7_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
{
int retval;
struct at91sam7_flash_bank *at91sam7_info = bank->driver_priv;
- target_t *target = bank->target;
+ struct target *target = bank->target;
uint32_t dst_min_alignment, wcount, bytes_remaining = count;
uint32_t first_page, last_page, pagen, buffer_pos;
return ERROR_FLASH_BANK_NOT_PROBED;
first_page = offset/dst_min_alignment;
- last_page = CEIL(offset + count, dst_min_alignment);
+ last_page = DIV_ROUND_UP(offset + count, dst_min_alignment);
LOG_DEBUG("first_page: %i, last_page: %i, count %i", (int)first_page, (int)last_page, (int)count);
/* Write one block to the PageWriteBuffer */
buffer_pos = (pagen-first_page)*dst_min_alignment;
- wcount = CEIL(count,4);
+ wcount = DIV_ROUND_UP(count,4);
if ((retval = target_write_memory(target, bank->base + pagen*dst_min_alignment, 4, wcount, buffer + buffer_pos)) != ERROR_OK)
{
return retval;
return ERROR_OK;
}
-static int at91sam7_probe(struct flash_bank_s *bank)
+static int at91sam7_probe(struct flash_bank *bank)
{
/* we can't probe on an at91sam7
* if this is an at91sam7, it has the configured flash */
return ERROR_OK;
}
-static int at91sam7_info(struct flash_bank_s *bank, char *buf, int buf_size)
+static int at91sam7_info(struct flash_bank *bank, char *buf, int buf_size)
{
int printed;
struct at91sam7_flash_bank *at91sam7_info = bank->driver_priv;
*/
COMMAND_HANDLER(at91sam7_handle_gpnvm_command)
{
- flash_bank_t *bank;
+ struct flash_bank *bank;
int bit;
uint8_t flashcmd;
uint32_t status;
struct at91sam7_flash_bank *at91sam7_info;
int retval;
- if (argc != 2)
+ if (CMD_ARGC != 2)
{
- command_print(cmd_ctx, "at91sam7 gpnvm <bit> <set | clear>");
+ command_print(CMD_CTX, "at91sam7 gpnvm <bit> <set | clear>");
return ERROR_OK;
}
}
if (strcmp(bank->driver->name, "at91sam7"))
{
- command_print(cmd_ctx, "not an at91sam7 flash bank '%s'", args[0]);
+ command_print(CMD_CTX, "not an at91sam7 flash bank '%s'", CMD_ARGV[0]);
return ERROR_FLASH_BANK_INVALID;
}
if (bank->target->state != TARGET_HALTED)
return ERROR_TARGET_NOT_HALTED;
}
- if (strcmp(args[1], "set") == 0)
+ if (strcmp(CMD_ARGV[1], "set") == 0)
{
flashcmd = SGPB;
}
- else if (strcmp(args[1], "clear") == 0)
+ else if (strcmp(CMD_ARGV[1], "clear") == 0)
{
flashcmd = CGPB;
}
}
}
- COMMAND_PARSE_NUMBER(int, args[0], bit);
+ COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], bit);
if ((bit < 0) || (bit >= at91sam7_info->num_nvmbits))
{
- command_print(cmd_ctx, "gpnvm bit '#%s' is out of bounds for target %s", args[0], at91sam7_info->target_name);
+ command_print(CMD_CTX, "gpnvm bit '#%s' is out of bounds for target %s", CMD_ARGV[0], at91sam7_info->target_name);
return ERROR_OK;
}
return ERROR_OK;
}
-static int at91sam7_register_commands(struct command_context_s *cmd_ctx)
-{
- command_t *at91sam7_cmd = register_command(cmd_ctx, NULL, "at91sam7",
- NULL, COMMAND_ANY, NULL);
-
- register_command(cmd_ctx, at91sam7_cmd, "gpnvm",
- at91sam7_handle_gpnvm_command, COMMAND_EXEC,
- "at91sam7 gpnvm <bit> set | clear, "
- "set or clear one gpnvm bit");
+static const struct command_registration at91sam7_exec_command_handlers[] = {
+ {
+ .name = "gpnvm",
+ .handler = &at91sam7_handle_gpnvm_command,
+ .mode = COMMAND_EXEC,
+ .usage = "gpnvm <bit> set | clear, "
+ "set or clear one gpnvm bit",
+ },
+ COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration at91sam7_command_handlers[] = {
+ {
+ .name = "at91sam7",
+ .mode = COMMAND_ANY,
+ .help = "at91sam7 flash command group",
+ .chain = at91sam7_exec_command_handlers,
+ },
+ COMMAND_REGISTRATION_DONE
+};
- return ERROR_OK;
+static int at91sam7_register_commands(struct command_context *cmd_ctx)
+{
+ return register_commands(cmd_ctx, NULL, at91sam7_command_handlers);
}
-flash_driver_t at91sam7_flash = {
+struct flash_driver at91sam7_flash = {
.name = "at91sam7",
.register_commands = &at91sam7_register_commands,
.flash_bank_command = &at91sam7_flash_bank_command,