jtagspi: fix build on MacOS

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

diff --git a/src/flash/nor/virtual.c b/src/flash/nor/virtual.c
index 15c4bffa7b987ca51f71d423df721d22b510ed75..01a92478fc7299d2b55fd47fb67c6fc1699e2190 100644 (file)
--- a/src/flash/nor/virtual.c
+++ b/src/flash/nor/virtual.c
@@ -27,7 +27,7 @@ static struct flash_bank *virtual_get_master_bank(struct flash_bank *bank)
        struct flash_bank *master_bank;
 
        master_bank = get_flash_bank_by_name_noprobe(bank->driver_priv);
-       if (master_bank == NULL)
+       if (!master_bank)
                LOG_ERROR("master flash bank '%s' does not exist", (char *)bank->driver_priv);
 
        return master_bank;
@@ -37,7 +37,7 @@ static void virtual_update_bank_info(struct flash_bank *bank)
 {
        struct flash_bank *master_bank = virtual_get_master_bank(bank);
 
-       if (master_bank == NULL)
+       if (!master_bank)
                return;
 
        /* update the info we do not have */
@@ -64,7 +64,7 @@ FLASH_BANK_COMMAND_HANDLER(virtual_flash_bank_command)
        const char *bank_name = CMD_ARGV[6];
        struct flash_bank *master_bank = get_flash_bank_by_name_noprobe(bank_name);
 
-       if (master_bank == NULL) {
+       if (!master_bank) {
                LOG_ERROR("master flash bank '%s' does not exist", bank_name);
                return ERROR_FLASH_OPERATION_FAILED;
        }
@@ -75,44 +75,38 @@ 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)
+       if (!master_bank)
                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)
+       if (!master_bank)
                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)
+               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;
 
-       if (master_bank == NULL)
+       if (!master_bank)
                return ERROR_FLASH_OPERATION_FAILED;
 
        /* call master handler */
@@ -129,7 +123,7 @@ static int virtual_write(struct flash_bank *bank, const uint8_t *buffer,
        struct flash_bank *master_bank = virtual_get_master_bank(bank);
        int retval;
 
-       if (master_bank == NULL)
+       if (!master_bank)
                return ERROR_FLASH_OPERATION_FAILED;
 
        /* call master handler */
@@ -145,7 +139,7 @@ static int virtual_probe(struct flash_bank *bank)
        struct flash_bank *master_bank = virtual_get_master_bank(bank);
        int retval;
 
-       if (master_bank == NULL)
+       if (!master_bank)
                return ERROR_FLASH_OPERATION_FAILED;
 
        /* call master handler */
@@ -164,7 +158,7 @@ static int virtual_auto_probe(struct flash_bank *bank)
        struct flash_bank *master_bank = virtual_get_master_bank(bank);
        int retval;
 
-       if (master_bank == NULL)
+       if (!master_bank)
                return ERROR_FLASH_OPERATION_FAILED;
 
        /* call master handler */
@@ -178,14 +172,14 @@ static int virtual_auto_probe(struct flash_bank *bank)
        return ERROR_OK;
 }
 
-static int virtual_info(struct flash_bank *bank, char *buf, int buf_size)
+static int virtual_info(struct flash_bank *bank, struct command_invocation *cmd)
 {
        struct flash_bank *master_bank = virtual_get_master_bank(bank);
 
-       if (master_bank == NULL)
+       if (!master_bank)
                return ERROR_FLASH_OPERATION_FAILED;
 
-       snprintf(buf, buf_size, "%s driver for flash bank %s at 0x%8.8" PRIx32 "",
+       command_print_sameline(cmd, "%s driver for flash bank %s at " TARGET_ADDR_FMT,
                        bank->driver->name, master_bank->name, master_bank->base);
 
        return ERROR_OK;
@@ -196,7 +190,7 @@ static int virtual_blank_check(struct flash_bank *bank)
        struct flash_bank *master_bank = virtual_get_master_bank(bank);
        int retval;
 
-       if (master_bank == NULL)
+       if (!master_bank)
                return ERROR_FLASH_OPERATION_FAILED;
 
        /* call master handler */
@@ -213,7 +207,7 @@ static int virtual_flash_read(struct flash_bank *bank,
        struct flash_bank *master_bank = virtual_get_master_bank(bank);
        int retval;
 
-       if (master_bank == NULL)
+       if (!master_bank)
                return ERROR_FLASH_OPERATION_FAILED;
 
        /* call master handler */
@@ -224,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,