diff options
| author | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-01-09 15:58:01 +0000 |
|---|---|---|
| committer | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-01-09 15:58:01 +0000 |
| commit | 0160320060cab521f66ea100d67a31b0b906d35f (patch) | |
| tree | 84e6d208afe665c7d0091b942144bf67d43d5518 /src/flash/flash.c | |
| parent | 2e01a1ad1930aabb9e3bc7a0e3eb98b2b3331b1c (diff) | |
| download | openocd_libswd-0160320060cab521f66ea100d67a31b0b906d35f.tar.gz openocd_libswd-0160320060cab521f66ea100d67a31b0b906d35f.tar.bz2 openocd_libswd-0160320060cab521f66ea100d67a31b0b906d35f.tar.xz openocd_libswd-0160320060cab521f66ea100d67a31b0b906d35f.zip | |
- rename flash_init and flash_erase to flash_init_drivers and flash_erase_address_range - stops conflicts with redboot. Thanks Øyvind Harboe
- gdb connection not dropped if we fail to allocate memory in query packets
git-svn-id: svn://svn.berlios.de/openocd/trunk@249 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/flash/flash.c')
| -rw-r--r-- | src/flash/flash.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/flash/flash.c b/src/flash/flash.c index de42fcde..7336bbd7 100644 --- a/src/flash/flash.c +++ b/src/flash/flash.c @@ -90,7 +90,7 @@ int flash_register_commands(struct command_context_s *cmd_ctx) return ERROR_OK; } -int flash_init(struct command_context_s *cmd_ctx) +int flash_init_drivers(struct command_context_s *cmd_ctx) { if (flash_banks) { @@ -398,7 +398,7 @@ int handle_flash_erase_address_command(struct command_context_s *cmd_ctx, char * duration_start_measure(&duration); - if ((retval = flash_erase(target, address, length)) != ERROR_OK) + if ((retval = flash_erase_address_range(target, address, length)) != ERROR_OK) { switch (retval) { @@ -801,7 +801,7 @@ flash_bank_t *get_flash_bank_by_addr(target_t *target, u32 addr) } /* erase given flash region, selects proper bank according to target and address */ -int flash_erase(target_t *target, u32 addr, u32 length) +int flash_erase_address_range(target_t *target, u32 addr, u32 length) { flash_bank_t *c; int first = -1; @@ -977,7 +977,7 @@ int flash_write(target_t *target, image_t *image, u32 *written, char **error_str if (erase) { /* calculate and erase sectors */ - retval = flash_erase( target, run_address, run_size ); + retval = flash_erase_address_range( target, run_address, run_size ); } if (retval == ERROR_OK) |