aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGareth McMullin2015-04-04 19:18:05 -0700
committerGareth McMullin2015-04-11 16:05:41 -0700
commit09b781f1c1593025e6d3157573343f4431f5f5b6 (patch)
tree690ab79fdf4c3cc48e927e3dfbf6957684f5db10
parent3d8b34f180eaa9bfe021186b9e20a8a551b35515 (diff)
target: Remove old flash interface.
-rw-r--r--src/include/target.h7
-rw-r--r--src/target.c10
2 files changed, 0 insertions, 17 deletions
diff --git a/src/include/target.h b/src/include/target.h
index 96b5506..f86714b 100644
--- a/src/include/target.h
+++ b/src/include/target.h
@@ -182,17 +182,10 @@ struct target_s {
uint32_t idcode;
/* Target memory map */
- const char *xml_mem_map;
char *dyn_mem_map;
struct target_ram *ram;
struct target_flash *flash;
- /* DEPRECATED: Flash memory access functions */
- int (*flash_erase)(target *t, uint32_t addr, size_t len);
- int (*flash_write)(target *t, uint32_t dest,
- const uint8_t *src, size_t len);
- int (*flash_done)(target *t);
-
/* Host I/O support */
void (*hostio_reply)(target *t, int32_t retcode, uint32_t errcode);
diff --git a/src/target.c b/src/target.c
index 266c23e..8f33e70 100644
--- a/src/target.c
+++ b/src/target.c
@@ -131,10 +131,6 @@ static ssize_t map_flash(char *buf, size_t len, struct target_flash *f)
const char *target_mem_map(target *t)
{
- /* Deprecated static const memory map */
- if (t->xml_mem_map)
- return t->xml_mem_map;
-
if (t->dyn_mem_map)
return t->dyn_mem_map;
@@ -167,9 +163,6 @@ static struct target_flash *flash_for_addr(target *t, uint32_t addr)
int target_flash_erase(target *t, uint32_t addr, size_t len)
{
- if (t->flash_write)
- return t->flash_erase(t, addr, len);
-
int ret = 0;
while (len) {
struct target_flash *f = flash_for_addr(t, addr);
@@ -184,9 +177,6 @@ int target_flash_erase(target *t, uint32_t addr, size_t len)
int target_flash_write(target *t,
uint32_t dest, const void *src, size_t len)
{
- if (t->flash_write)
- return t->flash_write(t, dest, src, len);
-
int ret = 0;
while (len) {
struct target_flash *f = flash_for_addr(t, dest);