diff options
author | Tomas Vanek <vanekt@fbl.cz> | 2018-11-15 12:19:25 +0100 |
---|---|---|
committer | Tomas Vanek <vanekt@fbl.cz> | 2018-11-26 09:31:35 +0000 |
commit | 9542cb7c3d9f4b66d2df3d8412a73d008077ab86 (patch) | |
tree | 5bdcd193b5b2a2e06d5e2e03fbf85dca53eddbf8 /src/flash/nor/ocl.c | |
parent | ff555afc02d50ca57fc6e71787d34a8e985cf115 (diff) | |
download | riscv-openocd-9542cb7c3d9f4b66d2df3d8412a73d008077ab86.zip riscv-openocd-9542cb7c3d9f4b66d2df3d8412a73d008077ab86.tar.gz riscv-openocd-9542cb7c3d9f4b66d2df3d8412a73d008077ab86.tar.bz2 |
flash/nor: consolidate flash protect/protect_check
Make flash_driver methods protect() and protect_check()
optional.
Remove dummy definitions of these methods from the drivers
which do not implement protection handling.
Some drivers did not define protect method. It raised segfault
before this change and now it is handled properly.
Lot of drivers returned ERROR_OK from dummy protect()
- now flash_driver_protect() returns an error if not handled by the driver.
Change-Id: I2d4a0da316bf03c6379791b1b1c6198fbf22e66c
Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-on: http://openocd.zylin.com/4765
Tested-by: jenkins
Reviewed-by: Andreas Bolsch <hyphen0break@gmail.com>
Reviewed-by: Christopher Head <chead@zaber.com>
Diffstat (limited to 'src/flash/nor/ocl.c')
-rw-r--r-- | src/flash/nor/ocl.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/flash/nor/ocl.c b/src/flash/nor/ocl.c index 895c4af..f8913c0 100644 --- a/src/flash/nor/ocl.c +++ b/src/flash/nor/ocl.c @@ -35,11 +35,6 @@ static int ocl_erase_check(struct flash_bank *bank) return ERROR_OK; } -static int ocl_protect_check(struct flash_bank *bank) -{ - return ERROR_OK; -} - /* flash_bank ocl 0 0 0 0 <target#> */ FLASH_BANK_COMMAND_HANDLER(ocl_flash_bank_command) { @@ -111,11 +106,6 @@ static int ocl_erase(struct flash_bank *bank, int first, int last) return ERROR_OK; } -static int ocl_protect(struct flash_bank *bank, int set, int first, int last) -{ - return ERROR_OK; -} - static int ocl_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t offset, uint32_t count) { struct ocl_priv *ocl = bank->driver_priv; @@ -333,12 +323,10 @@ struct flash_driver ocl_flash = { .name = "ocl", .flash_bank_command = ocl_flash_bank_command, .erase = ocl_erase, - .protect = ocl_protect, .write = ocl_write, .read = default_flash_read, .probe = ocl_probe, .erase_check = ocl_erase_check, - .protect_check = ocl_protect_check, .auto_probe = ocl_auto_probe, .free_driver_priv = default_flash_free_driver_priv, }; |