Updated fm3.c, added Flash type 2 support, error handling improved

[fw/openocd] / src / flash / mflash.h

diff --git a/src/flash/mflash.h b/src/flash/mflash.h
index a2bd5b3a888da748982d64acdc51d3ef543ae5c3..0520c5fa9fd6c34078124aebc995e37cd329d765 100644 (file)
--- a/src/flash/mflash.h
+++ b/src/flash/mflash.h
@@ -20,7 +20,7 @@
 #ifndef _MFLASH_H
 #define _MFLASH_H
 
-#include "target.h"
+struct command_context;
 
 typedef unsigned long mg_io_uint32;
 typedef unsigned short mg_io_uint16;
@@ -34,7 +34,7 @@ struct mflash_gpio_num
 
 struct mflash_gpio_drv
 {
-       char *name;
+       const char *name;
        int (*set_gpio_to_output) (struct mflash_gpio_num gpio);
        int (*set_gpio_output_val) (struct mflash_gpio_num gpio, uint8_t val);
 };
@@ -141,8 +141,7 @@ struct mflash_bank
        struct mg_drv_info *drv_info;
 };
 
-int mflash_register_commands(struct command_context_s *cmd_ctx);
-int mflash_init_drivers(struct command_context_s *cmd_ctx);
+int mflash_register_commands(struct command_context *cmd_ctx);
 
 #define MG_MFLASH_SECTOR_SIZE          (0x200)         /* 512Bytes = 2^9 */
 #define MG_MFLASH_SECTOR_SIZE_MASK     (0x200-1)