src/flash/nor/virtual: handle null pointers

[openocd.git] / src / flash / nor / virtual.c

diff --git a/src/flash/nor/virtual.c b/src/flash/nor/virtual.c
index 599a9c09d739e84d344d4405f7bb115bae20dc38..1aa12fecdd9e1455fcff34cc19604f6179d9f836 100644 (file)
--- a/src/flash/nor/virtual.c
+++ b/src/flash/nor/virtual.c
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -46,9 +44,15 @@ static void virtual_update_bank_info(struct flash_bank *bank)
        bank->size = master_bank->size;
        bank->chip_width = master_bank->chip_width;
        bank->bus_width = master_bank->bus_width;
+       bank->erased_value = master_bank->erased_value;
        bank->default_padded_value = master_bank->default_padded_value;
+       bank->write_start_alignment = master_bank->write_start_alignment;
+       bank->write_end_alignment = master_bank->write_end_alignment;
+       bank->minimal_write_gap = master_bank->minimal_write_gap;
        bank->num_sectors = master_bank->num_sectors;
        bank->sectors = master_bank->sectors;
+       bank->num_prot_blocks = master_bank->num_prot_blocks;
+       bank->prot_blocks = master_bank->prot_blocks;
 }
 
 FLASH_BANK_COMMAND_HANDLER(virtual_flash_bank_command)
@@ -71,39 +75,33 @@ FLASH_BANK_COMMAND_HANDLER(virtual_flash_bank_command)
        return ERROR_OK;
 }
 
-static int virtual_protect(struct flash_bank *bank, int set, int first, int last)
+static int virtual_protect(struct flash_bank *bank, int set, unsigned int first,
+               unsigned int last)
 {
        struct flash_bank *master_bank = virtual_get_master_bank(bank);
-       int retval;
 
        if (master_bank == NULL)
                return ERROR_FLASH_OPERATION_FAILED;
 
-       /* call master handler */
-       retval = master_bank->driver->protect(master_bank, set, first, last);
-       if (retval != ERROR_OK)
-               return retval;
-
-       return ERROR_OK;
+       return flash_driver_protect(master_bank, set, first, last);
 }
 
 static int virtual_protect_check(struct flash_bank *bank)
 {
        struct flash_bank *master_bank = virtual_get_master_bank(bank);
-       int retval;
 
        if (master_bank == NULL)
                return ERROR_FLASH_OPERATION_FAILED;
 
-       /* call master handler */
-       retval = master_bank->driver->protect_check(master_bank);
-       if (retval != ERROR_OK)
-               return retval;
+       if (master_bank->driver->protect_check == NULL)
+               return ERROR_FLASH_OPER_UNSUPPORTED;
 
-       return ERROR_OK;
+       /* call master handler */
+       return master_bank->driver->protect_check(master_bank);
 }
 
-static int virtual_erase(struct flash_bank *bank, int first, int last)
+static int virtual_erase(struct flash_bank *bank, unsigned int first,
+               unsigned int last)
 {
        struct flash_bank *master_bank = virtual_get_master_bank(bank);
        int retval;
@@ -181,7 +179,7 @@ static int virtual_info(struct flash_bank *bank, char *buf, int buf_size)
        if (master_bank == NULL)
                return ERROR_FLASH_OPERATION_FAILED;
 
-       snprintf(buf, buf_size, "%s driver for flash bank %s at 0x%8.8" PRIx32 "",
+       snprintf(buf, buf_size, "%s driver for flash bank %s at " TARGET_ADDR_FMT,
                        bank->driver->name, master_bank->name, master_bank->base);
 
        return ERROR_OK;
@@ -220,7 +218,7 @@ static int virtual_flash_read(struct flash_bank *bank,
        return ERROR_OK;
 }
 
-struct flash_driver virtual_flash = {
+const struct flash_driver virtual_flash = {
        .name = "virtual",
        .flash_bank_command = virtual_flash_bank_command,
        .erase = virtual_erase,
@@ -232,4 +230,5 @@ struct flash_driver virtual_flash = {
        .erase_check = virtual_blank_check,
        .protect_check = virtual_protect_check,
        .info = virtual_info,
+       .free_driver_priv = default_flash_free_driver_priv,
 };