projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
flash/nor/fm4,tms470: fix clang static analyzer warnings
[fw/openocd]
/
src
/
flash
/
nor
/
virtual.c
diff --git
a/src/flash/nor/virtual.c
b/src/flash/nor/virtual.c
index 45738ed42f88ff94323b9ba0e06f3e448e074d07..fa51537409a11de725ac76d04aa4a5c0b9e7bfc4 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 *
* 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
***************************************************************************/
#ifdef HAVE_CONFIG_H
@@
-46,8
+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->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_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)
}
FLASH_BANK_COMMAND_HANDLER(virtual_flash_bank_command)
@@
-118,7
+123,7
@@
static int virtual_erase(struct flash_bank *bank, int first, int last)
return ERROR_OK;
}
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);
uint32_t offset, uint32_t count)
{
struct flash_bank *master_bank = virtual_get_master_bank(bank);
@@
-180,7
+185,7
@@
static int virtual_info(struct flash_bank *bank, char *buf, int buf_size)
if (master_bank == NULL)
return ERROR_FLASH_OPERATION_FAILED;
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;
bank->driver->name, master_bank->name, master_bank->base);
return ERROR_OK;
@@
-219,7
+224,7
@@
static int virtual_flash_read(struct flash_bank *bank,
return ERROR_OK;
}
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,
.name = "virtual",
.flash_bank_command = virtual_flash_bank_command,
.erase = virtual_erase,
@@
-231,4
+236,5
@@
struct flash_driver virtual_flash = {
.erase_check = virtual_blank_check,
.protect_check = virtual_protect_check,
.info = virtual_info,
.erase_check = virtual_blank_check,
.protect_check = virtual_protect_check,
.info = virtual_info,
+ .free_driver_priv = default_flash_free_driver_priv,
};
};