X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnor%2Ffaux.c;h=46eda722334c4201a2f22711d75a131e2f7c70b8;hp=e1e77eaa23864d14d9364bd4d723c7c67e7853a2;hb=20113201df25475889a3cd9ee22c0397e4fae530;hpb=303b493c229475df26d69d102bbaf5ae5e5e7a3f
diff --git a/src/flash/nor/faux.c b/src/flash/nor/faux.c
index e1e77eaa23..46eda72233 100644
--- a/src/flash/nor/faux.c
+++ b/src/flash/nor/faux.c
@@ -13,10 +13,9 @@
* 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 . *
***************************************************************************/
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -25,9 +24,7 @@
#include
#include "hello.h"
-
-struct faux_flash_bank
-{
+struct faux_flash_bank {
struct target *target;
uint8_t *memory;
uint32_t start_address;
@@ -43,20 +40,15 @@ FLASH_BANK_COMMAND_HANDLER(faux_flash_bank_command)
struct faux_flash_bank *info;
if (CMD_ARGC < 6)
- {
- LOG_WARNING("incomplete flash_bank faux configuration");
- return ERROR_FLASH_BANK_INVALID;
- }
+ return ERROR_COMMAND_SYNTAX_ERROR;
info = malloc(sizeof(struct faux_flash_bank));
- if (info == NULL)
- {
+ if (info == NULL) {
LOG_ERROR("no memory for flash bank info");
return ERROR_FAIL;
}
info->memory = malloc(bank->size);
- if (info == NULL)
- {
+ if (info->memory == NULL) {
free(info);
LOG_ERROR("no memory for flash bank info");
return ERROR_FAIL;
@@ -68,8 +60,7 @@ FLASH_BANK_COMMAND_HANDLER(faux_flash_bank_command)
uint32_t offset = 0;
bank->num_sectors = bank->size/sectorSize;
bank->sectors = malloc(sizeof(struct flash_sector) * bank->num_sectors);
- for (i = 0; i < bank->num_sectors; i++)
- {
+ for (i = 0; i < bank->num_sectors; i++) {
bank->sectors[i].offset = offset;
bank->sectors[i].size = sectorSize;
offset += bank->sectors[i].size;
@@ -78,8 +69,7 @@ FLASH_BANK_COMMAND_HANDLER(faux_flash_bank_command)
}
info->target = get_target(CMD_ARGV[5]);
- if (info->target == NULL)
- {
+ if (info->target == NULL) {
LOG_ERROR("target '%s' not defined", CMD_ARGV[5]);
free(info->memory);
free(info);
@@ -97,11 +87,11 @@ static int faux_erase(struct flash_bank *bank, int first, int last)
static int faux_protect(struct flash_bank *bank, int set, int first, int last)
{
- LOG_USER("set protection sector %d to %d to %s", first, last, set?"on":"off");
+ LOG_USER("set protection sector %d to %d to %s", first, last, set ? "on" : "off");
return ERROR_OK;
}
-static int faux_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
+static int faux_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t offset, uint32_t count)
{
struct faux_flash_bank *info = bank->driver_priv;
memcpy(info->memory + offset, buffer, count);
@@ -141,9 +131,11 @@ struct flash_driver faux_flash = {
.erase = faux_erase,
.protect = faux_protect,
.write = faux_write,
+ .read = default_flash_read,
.probe = faux_probe,
.auto_probe = faux_probe,
.erase_check = default_flash_blank_check,
.protect_check = faux_protect_check,
- .info = faux_info
+ .info = faux_info,
+ .free_driver_priv = default_flash_free_driver_priv,
};