Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
flash/nor/virtual: copy missing fields from master flash_bank structure
[openocd.git] / src / flash / nor / virtual.c
diff --git a/src/flash/nor/virtual.c b/src/flash/nor/virtual.c
index f1e84c29e0204b03a349063f74ba58f763702eae..15c4bffa7b987ca51f71d423df721d22b510ed75 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_noprobe(bank->driver_priv);
-       if (master_bank == NULL) {
-               LOG_ERROR("master flash bank '%s' does not exist", (char*)bank->driver_priv);
-       }
+       if (master_bank == NULL)
+               LOG_ERROR("master flash bank '%s' does not exist", (char *)bank->driver_priv);
 
        return master_bank;
 }
@@ -39,31 +37,34 @@ 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->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)
 {
        if (CMD_ARGC < 7)
-       {
                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_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;
        }
@@ -79,13 +80,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;
@@ -96,12 +96,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;
@@ -112,31 +112,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;
@@ -147,12 +145,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 */
@@ -166,12 +164,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 */
@@ -184,9 +182,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);
@@ -199,12 +196,12 @@ 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;
@@ -216,13 +213,12 @@ 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 == 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;
@@ -240,4 +236,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,
 };
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)