Add support for Cypress PSoC6 family of devices

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

diff --git a/src/flash/nor/virtual.c b/src/flash/nor/virtual.c
index 4908c0c89454494d1d8c79307d90588b8c3dd0eb..06981f4f4b762df21458777a01e3b82427146c5a 100644 (file)
--- a/src/flash/nor/virtual.c
+++ b/src/flash/nor/virtual.c
@@ -13,24 +13,22 @@
  *   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.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include "imp.h"
 
-static struct flash_bank* virtual_get_master_bank(struct flash_bank *bank)
+static struct flash_bank *virtual_get_master_bank(struct flash_bank *bank)
 {
-       struct flash_bank* master_bank;
+       struct flash_bank *master_bank;
 
-       master_bank = get_flash_bank_by_name(bank->driver_priv);
-       if (master_bank == NULL) {
-               LOG_ERROR("master flash bank '%s' does not exist", (char*)bank->driver_priv);
-       }
+       master_bank = get_flash_bank_by_name_noprobe(bank->driver_priv);
+       if (master_bank == NULL)
+               LOG_ERROR("master flash bank '%s' does not exist", (char *)bank->driver_priv);
 
        return master_bank;
 }
@@ -39,14 +37,15 @@ 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 == NULL)
                return;
-       }
 
        /* update the info we do not have */
        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->num_sectors = master_bank->num_sectors;
        bank->sectors = master_bank->sectors;
 }
@@ -54,17 +53,13 @@ static void virtual_update_bank_info(struct flash_bank *bank)
 FLASH_BANK_COMMAND_HANDLER(virtual_flash_bank_command)
 {
        if (CMD_ARGC < 7)
-       {
-               LOG_WARNING("incomplete flash_bank virtual configuration");
-               return ERROR_FLASH_OPERATION_FAILED;
-       }
+               return ERROR_COMMAND_SYNTAX_ERROR;
 
        /* get the master flash bank */
        const char *bank_name = CMD_ARGV[6];
-       struct flash_bank *master_bank = get_flash_bank_by_name(bank_name);
+       struct flash_bank *master_bank = get_flash_bank_by_name_noprobe(bank_name);
 
-       if (master_bank == NULL)
-       {
+       if (master_bank == NULL) {
                LOG_ERROR("master flash bank '%s' does not exist", bank_name);
                return ERROR_FLASH_OPERATION_FAILED;
        }
@@ -80,13 +75,12 @@ static int virtual_protect(struct flash_bank *bank, int set, int first, int last
        struct flash_bank *master_bank = virtual_get_master_bank(bank);
        int retval;
 
-       if (master_bank == NULL) {
+       if (master_bank == NULL)
                return ERROR_FLASH_OPERATION_FAILED;
-       }
 
        /* call master handler */
-       if ((retval = master_bank->driver->protect(master_bank, set,
-                       first, last)) != ERROR_OK)
+       retval = master_bank->driver->protect(master_bank, set, first, last);
+       if (retval != ERROR_OK)
                return retval;
 
        return ERROR_OK;
@@ -97,12 +91,12 @@ 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 == NULL)
                return ERROR_FLASH_OPERATION_FAILED;
-       }
 
        /* call master handler */
-       if ((retval = master_bank->driver->protect_check(master_bank)) != ERROR_OK)
+       retval = master_bank->driver->protect_check(master_bank);
+       if (retval != ERROR_OK)
                return retval;
 
        return ERROR_OK;
@@ -113,31 +107,29 @@ static int virtual_erase(struct flash_bank *bank, int first, int last)
        struct flash_bank *master_bank = virtual_get_master_bank(bank);
        int retval;
 
-       if (master_bank == NULL) {
+       if (master_bank == NULL)
                return ERROR_FLASH_OPERATION_FAILED;
-       }
 
        /* call master handler */
-       if ((retval = master_bank->driver->erase(master_bank,
-                       first, last)) != ERROR_OK)
+       retval = master_bank->driver->erase(master_bank, first, last);
+       if (retval != ERROR_OK)
                return retval;
 
        return ERROR_OK;
 }
 
-static int virtual_write(struct flash_bank *bank, uint8_t *buffer,
+static int virtual_write(struct flash_bank *bank, const uint8_t *buffer,
                uint32_t offset, uint32_t count)
 {
        struct flash_bank *master_bank = virtual_get_master_bank(bank);
        int retval;
 
-       if (master_bank == NULL) {
+       if (master_bank == NULL)
                return ERROR_FLASH_OPERATION_FAILED;
-       }
 
        /* call master handler */
-       if ((retval = master_bank->driver->write(master_bank, buffer,
-                       offset, count)) != ERROR_OK)
+       retval = master_bank->driver->write(master_bank, buffer, offset, count);
+       if (retval != ERROR_OK)
                return retval;
 
        return ERROR_OK;
@@ -148,12 +140,12 @@ 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 == NULL)
                return ERROR_FLASH_OPERATION_FAILED;
-       }
 
        /* call master handler */
-       if ((retval = master_bank->driver->probe(master_bank)) != ERROR_OK)
+       retval = master_bank->driver->probe(master_bank);
+       if (retval != ERROR_OK)
                return retval;
 
        /* update the info we do not have */
@@ -167,12 +159,12 @@ 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 == NULL)
                return ERROR_FLASH_OPERATION_FAILED;
-       }
 
        /* call master handler */
-       if ((retval = master_bank->driver->auto_probe(master_bank)) != ERROR_OK)
+       retval = master_bank->driver->auto_probe(master_bank);
+       if (retval != ERROR_OK)
                return retval;
 
        /* update the info we do not have */
@@ -185,9 +177,8 @@ static int virtual_info(struct flash_bank *bank, char *buf, int buf_size)
 {
        struct flash_bank *master_bank = virtual_get_master_bank(bank);
 
-       if (master_bank == NULL) {
+       if (master_bank == NULL)
                return ERROR_FLASH_OPERATION_FAILED;
-       }
 
        snprintf(buf, buf_size, "%s driver for flash bank %s at 0x%8.8" PRIx32 "",
                        bank->driver->name, master_bank->name, master_bank->base);
@@ -195,35 +186,34 @@ static int virtual_info(struct flash_bank *bank, char *buf, int buf_size)
        return ERROR_OK;
 }
 
-int virtual_blank_check(struct flash_bank *bank)
+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 == NULL)
                return ERROR_FLASH_OPERATION_FAILED;
-       }
 
        /* call master handler */
-       if ((retval = master_bank->driver->erase_check(master_bank)) != ERROR_OK)
+       retval = master_bank->driver->erase_check(master_bank);
+       if (retval != ERROR_OK)
                return retval;
 
        return ERROR_OK;
 }
 
-int virtual_flash_read(struct flash_bank *bank,
+static int virtual_flash_read(struct flash_bank *bank,
                uint8_t *buffer, uint32_t offset, uint32_t count)
 {
        struct flash_bank *master_bank = virtual_get_master_bank(bank);
        int retval;
 
-       if (master_bank == NULL) {
+       if (master_bank == NULL)
                return ERROR_FLASH_OPERATION_FAILED;
-       }
 
        /* call master handler */
-       if ((retval = master_bank->driver->read(master_bank, buffer,
-                       offset, count)) != ERROR_OK)
+       retval = master_bank->driver->read(master_bank, buffer, offset, count);
+       if (retval != ERROR_OK)
                return retval;
 
        return ERROR_OK;