X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fflash.h;h=e2f788554f066e31cd5e9b46146adbbd86e7f066;hp=a8cc18691b97c3f7250b2cc79b6e28a6bb6ee2a3;hb=040e25424314b49e35eb158eb88e287c76e50596;hpb=8b4e882a1630d63bbc9840fa3f968e36b6ac3702

diff --git a/src/flash/flash.h b/src/flash/flash.h
index a8cc18691b..e2f788554f 100644
--- a/src/flash/flash.h
+++ b/src/flash/flash.h
@@ -21,6 +21,9 @@
 #define FLASH_H
 
 #include "target.h"
+#include "image.h"
+
+#define FLASH_MAX_ERROR_STR	(128)
 
 typedef struct flash_sector_s
 {
@@ -37,17 +40,26 @@ typedef struct flash_driver_s
 	char *name;
 	int (*register_commands)(struct command_context_s *cmd_ctx);
 	int (*flash_bank_command)(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
+
+	/* use flash_driver_erase() wrapper to invoke */
 	int (*erase)(struct flash_bank_s *bank, int first, int last);
+
+	/* use flash_driver_protect() wrapper to invoke */
 	int (*protect)(struct flash_bank_s *bank, int set, int first, int last);
+
+	/* use the flash_driver_write() wrapper to invoke. */
 	int (*write)(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count);
+
 	int (*probe)(struct flash_bank_s *bank);
 	int (*erase_check)(struct flash_bank_s *bank);
 	int (*protect_check)(struct flash_bank_s *bank);
 	int (*info)(struct flash_bank_s *bank, char *buf, int buf_size);
+	int (*auto_probe)(struct flash_bank_s *bank);
 } flash_driver_t;
 
 typedef struct flash_bank_s
 {
+	target_t *target;
 	flash_driver_t *driver;
 	void *driver_priv;
 	u32 base;
@@ -60,9 +72,17 @@ typedef struct flash_bank_s
 } flash_bank_t;
 
 extern int flash_register_commands(struct command_context_s *cmd_ctx);
-extern int flash_init(struct command_context_s *cmd_ctx);
+extern int flash_init_drivers(struct command_context_s *cmd_ctx);
+
+extern int flash_erase_address_range(target_t *target, u32 addr, u32 length);
+extern int flash_write(target_t *target, image_t *image, u32 *written, int erase);
+extern void flash_set_dirty(void);
+extern int flash_get_bank_count();
+int default_flash_blank_check(struct flash_bank_s *bank);
 
 extern flash_bank_t *get_flash_bank_by_num(int num);
+extern flash_bank_t *get_flash_bank_by_num_noprobe(int num);
+extern flash_bank_t *get_flash_bank_by_addr(target_t *target, u32 addr);
 
 #define		ERROR_FLASH_BANK_INVALID		(-900)
 #define		ERROR_FLASH_SECTOR_INVALID		(-901)