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>
This commit is contained in:
@@ -86,11 +86,6 @@ FLASH_BANK_COMMAND_HANDLER(mdr_flash_bank_command)
|
||||
return ERROR_OK;
|
||||
}
|
||||
|
||||
static int mdr_protect_check(struct flash_bank *bank)
|
||||
{
|
||||
return ERROR_OK;
|
||||
}
|
||||
|
||||
static int mdr_mass_erase(struct flash_bank *bank)
|
||||
{
|
||||
struct target *target = bank->target;
|
||||
@@ -217,11 +212,6 @@ reset_pg_and_lock:
|
||||
return retval;
|
||||
}
|
||||
|
||||
static int mdr_protect(struct flash_bank *bank, int set, int first, int last)
|
||||
{
|
||||
return ERROR_OK;
|
||||
}
|
||||
|
||||
static int mdr_write_block(struct flash_bank *bank, const uint8_t *buffer,
|
||||
uint32_t offset, uint32_t count)
|
||||
{
|
||||
@@ -625,13 +615,11 @@ struct flash_driver mdr_flash = {
|
||||
"<type>: 0 for main memory, 1 for info memory",
|
||||
.flash_bank_command = mdr_flash_bank_command,
|
||||
.erase = mdr_erase,
|
||||
.protect = mdr_protect,
|
||||
.write = mdr_write,
|
||||
.read = mdr_read,
|
||||
.probe = mdr_probe,
|
||||
.auto_probe = mdr_auto_probe,
|
||||
.erase_check = default_flash_blank_check,
|
||||
.protect_check = mdr_protect_check,
|
||||
.info = get_mdr_info,
|
||||
.free_driver_priv = default_flash_free_driver_priv,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user