use ARRAY_SIZE macro

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

diff --git a/src/flash/mflash.h b/src/flash/mflash.h
index c09120b6ae70d7d2498f762096f724650dcaf2a7..358d25364187b05bd2c32872b74104c569427fa2 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;
@@ -125,24 +125,24 @@ typedef struct _mg_pll_t
        unsigned char  output_div;      /* 2bit divider */
 } mg_pll_t;
 
-typedef struct mg_drv_info_s {
+struct mg_drv_info {
        mg_io_type_drv_info drv_id;
        uint32_t tot_sects;
-} mg_drv_info_t;
+};
 
-typedef struct mflash_bank_s
+struct mflash_bank
 {
        uint32_t base;
 
        struct mflash_gpio_num rst_pin;
 
        struct mflash_gpio_drv *gpio_drv;
-       target_t *target;
-       mg_drv_info_t *drv_info;
-} mflash_bank_t;
+       struct target *target;
+       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);
+int mflash_init_drivers(struct command_context *cmd_ctx);
 
 #define MG_MFLASH_SECTOR_SIZE          (0x200)         /* 512Bytes = 2^9 */
 #define MG_MFLASH_SECTOR_SIZE_MASK     (0x200-1)