projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
flash_bank_t -> struct flash_bank
[fw/openocd]
/
src
/
flash
/
at91sam3.c
diff --git
a/src/flash/at91sam3.c
b/src/flash/at91sam3.c
index 714e8b8b888d42542c6cbb780f64e3ece62b52ce..b756e48f64a01f3c3a829007b1e69791ea82d61e 100644
(file)
--- a/
src/flash/at91sam3.c
+++ b/
src/flash/at91sam3.c
@@
-175,7
+175,7
@@
struct sam3_bank_private {
// so we can find the chip we belong to
struct sam3_chip *pChip;
// so we can find the orginal bank pointer
// so we can find the chip we belong to
struct sam3_chip *pChip;
// so we can find the orginal bank pointer
-
flash_bank_t
*pBank;
+
struct flash_bank
*pBank;
unsigned bank_number;
uint32_t controller_address;
uint32_t base_address;
unsigned bank_number;
uint32_t controller_address;
uint32_t base_address;
@@
-215,7
+215,7
@@
struct sam3_chip {
// this is "initialized" from the global const structure
struct sam3_chip_details details;
// this is "initialized" from the global const structure
struct sam3_chip_details details;
-
target_
t *target;
+
struct targe
t *target;
struct sam3_cfg cfg;
struct membuf *mbuf;
struct sam3_cfg cfg;
struct membuf *mbuf;
@@
-233,7
+233,7
@@
static struct sam3_chip *all_sam3_chips;
static struct sam3_chip *
get_current_sam3(struct command_context_s *cmd_ctx)
{
static struct sam3_chip *
get_current_sam3(struct command_context_s *cmd_ctx)
{
-
target_
t *t;
+
struct targe
t *t;
static struct sam3_chip *p;
t = get_current_target(cmd_ctx);
static struct sam3_chip *p;
t = get_current_target(cmd_ctx);
@@
-1393,7
+1393,7
@@
sam3_explain_mckr(struct sam3_chip *pChip)
#if 0
static struct sam3_chip *
#if 0
static struct sam3_chip *
-target2sam3(
target_
t *pTarget)
+target2sam3(
struct targe
t *pTarget)
{
struct sam3_chip *pChip;
{
struct sam3_chip *pChip;
@@
-1456,7
+1456,7
@@
static const struct sam3_reg_list sam3_all_regs[] = {
static struct sam3_bank_private *
static struct sam3_bank_private *
-get_sam3_bank_private(
flash_bank_t
*bank)
+get_sam3_bank_private(
struct flash_bank
*bank)
{
return (struct sam3_bank_private *)(bank->driver_priv);
}
{
return (struct sam3_bank_private *)(bank->driver_priv);
}
@@
-1582,7
+1582,7
@@
sam3_GetInfo(struct sam3_chip *pChip)
static int
static int
-sam3_erase_check(struct flash_bank
_s
*bank)
+sam3_erase_check(struct flash_bank *bank)
{
int x;
{
int x;
@@
-1606,7
+1606,7
@@
sam3_erase_check(struct flash_bank_s *bank)
}
static int
}
static int
-sam3_protect_check(struct flash_bank
_s
*bank)
+sam3_protect_check(struct flash_bank *bank)
{
int r;
uint32_t v=0;
{
int r;
uint32_t v=0;
@@
-1641,12
+1641,7
@@
sam3_protect_check(struct flash_bank_s *bank)
return ERROR_OK;
}
return ERROR_OK;
}
-static int
-sam3_flash_bank_command(struct command_context_s *cmd_ctx,
- char *cmd,
- char **args,
- int argc,
- struct flash_bank_s *bank)
+FLASH_BANK_COMMAND_HANDLER(sam3_flash_bank_command)
{
struct sam3_chip *pChip;
{
struct sam3_chip *pChip;
@@
-1714,7
+1709,7
@@
sam3_GetDetails(struct sam3_bank_private *pPrivate)
const struct sam3_chip_details *pDetails;
struct sam3_chip *pChip;
void *vp;
const struct sam3_chip_details *pDetails;
struct sam3_chip *pChip;
void *vp;
-
flash_bank_t
*saved_banks[SAM3_MAX_FLASH_BANKS];
+
struct flash_bank
*saved_banks[SAM3_MAX_FLASH_BANKS];
unsigned x;
const char *cp;
unsigned x;
const char *cp;
@@
-1782,7
+1777,7
@@
sam3_GetDetails(struct sam3_bank_private *pPrivate)
static int
static int
-_sam3_probe(struct flash_bank
_s
*bank, int noise)
+_sam3_probe(struct flash_bank *bank, int noise)
{
unsigned x;
int r;
{
unsigned x;
int r;
@@
-1866,13
+1861,13
@@
_sam3_probe(struct flash_bank_s *bank, int noise)
}
static int
}
static int
-sam3_probe(struct flash_bank
_s
*bank)
+sam3_probe(struct flash_bank *bank)
{
return _sam3_probe(bank, 1);
}
static int
{
return _sam3_probe(bank, 1);
}
static int
-sam3_auto_probe(struct flash_bank
_s
*bank)
+sam3_auto_probe(struct flash_bank *bank)
{
return _sam3_probe(bank, 0);
}
{
return _sam3_probe(bank, 0);
}
@@
-1880,7
+1875,7
@@
sam3_auto_probe(struct flash_bank_s *bank)
static int
static int
-sam3_erase(struct flash_bank
_s
*bank, int first, int last)
+sam3_erase(struct flash_bank *bank, int first, int last)
{
struct sam3_bank_private *pPrivate;
int r;
{
struct sam3_bank_private *pPrivate;
int r;
@@
-1912,7
+1907,7
@@
sam3_erase(struct flash_bank_s *bank, int first, int last)
}
static int
}
static int
-sam3_protect(struct flash_bank
_s
*bank, int set, int first, int last)
+sam3_protect(struct flash_bank *bank, int set, int first, int last)
{
struct sam3_bank_private *pPrivate;
int r;
{
struct sam3_bank_private *pPrivate;
int r;
@@
-1941,7
+1936,7
@@
sam3_protect(struct flash_bank_s *bank, int set, int first, int last)
static int
static int
-sam3_info(
flash_bank_t
*bank, char *buf, int buf_size)
+sam3_info(
struct flash_bank
*bank, char *buf, int buf_size)
{
if (bank->target->state != TARGET_HALTED) {
LOG_ERROR("Target not halted");
{
if (bank->target->state != TARGET_HALTED) {
LOG_ERROR("Target not halted");
@@
-2109,7
+2104,7
@@
sam3_page_write(struct sam3_bank_private *pPrivate, unsigned pagenum, uint8_t *b
static int
static int
-sam3_write(struct flash_bank
_s
*bank,
+sam3_write(struct flash_bank *bank,
uint8_t *buffer,
uint32_t offset,
uint32_t count)
uint8_t *buffer,
uint32_t offset,
uint32_t count)
@@
-2266,8
+2261,7
@@
sam3_write(struct flash_bank_s *bank,
return r;
}
return r;
}
-static int
-sam3_handle_info_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(sam3_handle_info_command)
{
struct sam3_chip *pChip;
void *vp;
{
struct sam3_chip *pChip;
void *vp;
@@
-2343,8
+2337,7
@@
sam3_handle_info_command(struct command_context_s *cmd_ctx, char *cmd, char **ar
return ERROR_OK;
}
return ERROR_OK;
}
-static int
-sam3_handle_gpnvm_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(sam3_handle_gpnvm_command)
{
unsigned x,v;
int r,who;
{
unsigned x,v;
int r,who;
@@
-2437,8
+2430,7
@@
sam3_handle_gpnvm_command(struct command_context_s *cmd_ctx, char *cmd, char **a
return r;
}
return r;
}
-static int
-sam3_handle_slowclk_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(sam3_handle_slowclk_command)
{
struct sam3_chip *pChip;
{
struct sam3_chip *pChip;
@@
-2508,7
+2500,7
@@
sam3_register_commands(struct command_context_s *cmd_ctx)
return ERROR_OK;
}
return ERROR_OK;
}
-
flash_driver_t
at91sam3_flash = {
+
struct flash_driver
at91sam3_flash = {
.name = "at91sam3",
.register_commands = &sam3_register_commands,
.flash_bank_command = &sam3_flash_bank_command,
.name = "at91sam3",
.register_commands = &sam3_register_commands,
.flash_bank_command = &sam3_flash_bank_command,