jtag: linuxgpiod: drop extra parenthesis
[openocd.git] / src / flash / nor / dsp5680xx_flash.c
index 38649ff0409ddc857b9bcfb9956f92d5ae1cc952..b1625f11f04a890d8a4dece53424c5593abc4e91 100644 (file)
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2011 by Rodrigo L. Rosa                                 *
  *   rodrigorosa.LG@gmail.com                                              *
@@ -6,19 +8,6 @@
  *   Kevin McGuire                                                         *
  *   Marcel Wijlaars                                                       *
  *   Michael Ashton                                                        *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   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, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 /**
 
 static int dsp5680xx_build_sector_list(struct flash_bank *bank)
 {
-       uint32_t offset = HFM_FLASH_BASE_ADDR;
-
        bank->sectors = malloc(sizeof(struct flash_sector) * bank->num_sectors);
-       int i;
 
-       for (i = 0; i < bank->num_sectors; ++i) {
+       for (unsigned int i = 0; i < bank->num_sectors; ++i) {
                bank->sectors[i].offset = i * HFM_SECTOR_SIZE;
                bank->sectors[i].size = HFM_SECTOR_SIZE;
-               offset += bank->sectors[i].size;
                bank->sectors[i].is_erased = -1;
                bank->sectors[i].is_protected = -1;
        }
@@ -108,7 +93,7 @@ static int dsp5680xx_flash_protect_check(struct flash_bank *bank)
 }
 
 /**
- * Protection funcionality is not implemented.
+ * Protection functionality is not implemented.
  * The current implementation applies/removes security on the chip.
  * The chip is effectively secured/unsecured after the first reset
  * following the execution of this function.
@@ -120,8 +105,8 @@ static int dsp5680xx_flash_protect_check(struct flash_bank *bank)
  *
  * @return
  */
-static int dsp5680xx_flash_protect(struct flash_bank *bank, int set, int first,
-                                  int last)
+static int dsp5680xx_flash_protect(struct flash_bank *bank, int set,
+               unsigned int first, unsigned int last)
 {
 /**
  * This applies security to flash module after next reset, it does
@@ -131,15 +116,9 @@ static int dsp5680xx_flash_protect(struct flash_bank *bank, int set, int first,
 
        if (set)
                retval = dsp5680xx_f_lock(bank->target);
-       else {
+       else
                retval = dsp5680xx_f_unlock(bank->target);
-               if (retval == ERROR_OK) {
-                       /* mark all as erased */
-                       for (int i = 0; i <= (HFM_SECTOR_COUNT - 1); i++)
-                               /* FM does not recognize it as erased if erased via JTAG. */
-                               bank->sectors[i].is_erased = 1;
-               }
-       }
+
        return retval;
 }
 
@@ -154,11 +133,9 @@ static int dsp5680xx_flash_protect(struct flash_bank *bank, int set, int first,
  *
  * @return
  */
-static int dsp5680xx_flash_write(struct flash_bank *bank, const uint8_tbuffer,
+static int dsp5680xx_flash_write(struct flash_bank *bank, const uint8_t *buffer,
                                 uint32_t offset, uint32_t count)
 {
-       int retval;
-
        if ((offset + count / 2) > bank->size) {
                LOG_ERROR("%s: Flash bank cannot fit data.", __func__);
                return ERROR_FAIL;
@@ -172,17 +149,7 @@ static int dsp5680xx_flash_write(struct flash_bank *bank, const uint8_t* buffer,
                LOG_ERROR("%s: Writing to odd addresses not supported for this target", __func__);
                return ERROR_FAIL;
        }
-       retval = dsp5680xx_f_wr(bank->target, buffer, bank->base + offset / 2, count, 0);
-       uint32_t addr_word;
-
-       for (addr_word = bank->base + offset / 2; addr_word < count / 2;
-                       addr_word += (HFM_SECTOR_SIZE / 2)) {
-               if (retval == ERROR_OK)
-                       bank->sectors[addr_word / (HFM_SECTOR_SIZE / 2)].is_erased = 0;
-               else
-                       bank->sectors[addr_word / (HFM_SECTOR_SIZE / 2)].is_erased = -1;
-       }
-       return retval;
+       return dsp5680xx_f_wr(bank->target, buffer, bank->base + offset / 2, count, 0);
 }
 
 static int dsp5680xx_probe(struct flash_bank *bank)
@@ -194,8 +161,8 @@ static int dsp5680xx_probe(struct flash_bank *bank)
 /**
  * The flash module (FM) on the dsp5680xx supports both individual sector
  * and mass erase of the flash memory.
- * If this function is called with @first == @last == 0 or if @first is the
- * first sector (#0) and @last is the last sector then the mass erase command
+ * If this function is called with @a first == @a last == 0 or if @a first is the
+ * first sector (#0) and @last is the last sector then the mass erase command
  * is executed (much faster than erasing each sector individually).
  *
  * @param bank
@@ -204,24 +171,10 @@ static int dsp5680xx_probe(struct flash_bank *bank)
  *
  * @return
  */
-static int dsp5680xx_flash_erase(struct flash_bank *bank, int first, int last)
+static int dsp5680xx_flash_erase(struct flash_bank *bank, unsigned int first,
+               unsigned int last)
 {
-       int retval;
-
-       retval = dsp5680xx_f_erase(bank->target, (uint32_t) first, (uint32_t) last);
-       if ((!(first | last)) || ((first == 0) && (last == (HFM_SECTOR_COUNT - 1))))
-               last = HFM_SECTOR_COUNT - 1;
-       if (retval == ERROR_OK)
-               for (int i = first; i <= last; i++)
-                       bank->sectors[i].is_erased = 1;
-       else
-               /**
-                * If an error occurred unknown status
-                *is set even though some sector could have been correctly erased.
-                */
-               for (int i = first; i <= last; i++)
-                       bank->sectors[i].is_erased = -1;
-       return retval;
+       return dsp5680xx_f_erase(bank->target, (uint32_t) first, (uint32_t) last);
 }
 
 /**
@@ -241,22 +194,20 @@ static int dsp5680xx_flash_erase_check(struct flash_bank *bank)
        uint32_t i;
 
        for (i = 0; i < HFM_SECTOR_COUNT; i++) {
-               if (bank->sectors[i].is_erased == -1) {
-                       retval = dsp5680xx_f_erase_check(bank->target, &erased, i);
-                       if (retval != ERROR_OK) {
-                               bank->sectors[i].is_erased = -1;
-                       } else {
-                               if (erased)
-                                       bank->sectors[i].is_erased = 1;
-                               else
-                                       bank->sectors[i].is_erased = 0;
-                       }
+               retval = dsp5680xx_f_erase_check(bank->target, &erased, i);
+               if (retval != ERROR_OK) {
+                       bank->sectors[i].is_erased = -1;
+               } else {
+                       if (erased)
+                               bank->sectors[i].is_erased = 1;
+                       else
+                               bank->sectors[i].is_erased = 0;
                }
        }
        return retval;
 }
 
-struct flash_driver dsp5680xx_flash = {
+const struct flash_driver dsp5680xx_flash = {
        .name = "dsp5680xx_flash",
        .flash_bank_command = dsp5680xx_flash_bank_command,
        .erase = dsp5680xx_flash_erase,

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)