X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fmflash.h;h=358d25364187b05bd2c32872b74104c569427fa2;hp=bfaf743e92bd14c68eec2c435bac37df2c098df8;hb=ff5deeeeaa4f394931e3c5ccfb4cfd33beda0743;hpb=8959de9f679cfd0436d731fd91b88a68b9a75fa6

diff --git a/src/flash/mflash.h b/src/flash/mflash.h
index bfaf743e92..358d253641 100644
--- a/src/flash/mflash.h
+++ b/src/flash/mflash.h
@@ -20,24 +20,24 @@
 #ifndef _MFLASH_H
 #define _MFLASH_H
 
-#include "target.h"
+struct command_context;
 
 typedef unsigned long mg_io_uint32;
 typedef unsigned short mg_io_uint16;
 typedef unsigned char mg_io_uint8;
 
-typedef struct mflash_gpio_num_s
+struct mflash_gpio_num
 {
 	char port[2];
 	signed short num;
-} mflash_gpio_num_t;
+};
 
-typedef struct mflash_gpio_drv_s
+struct mflash_gpio_drv
 {
 	char *name;
-	int (*set_gpio_to_output) (mflash_gpio_num_t gpio);
-	int (*set_gpio_output_val) (mflash_gpio_num_t gpio, uint8_t val);
-} mflash_gpio_drv_t;
+	int (*set_gpio_to_output) (struct mflash_gpio_num gpio);
+	int (*set_gpio_output_val) (struct mflash_gpio_num gpio, uint8_t val);
+};
 
 typedef struct _mg_io_type_drv_info {
 
@@ -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;
 
-	mflash_gpio_num_t rst_pin;
+	struct mflash_gpio_num rst_pin;
 
-	mflash_gpio_drv_t *gpio_drv;
-	target_t *target;
-	mg_drv_info_t *drv_info;
-} mflash_bank_t;
+	struct mflash_gpio_drv *gpio_drv;
+	struct target *target;
+	struct mg_drv_info *drv_info;
+};
 
-extern int mflash_register_commands(struct command_context_s *cmd_ctx);
-extern 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)