X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fmflash.c;h=5790a9583ceab2e258893a1ee5423f8bae344093;hb=3b7aee21b50f4bd0014878f29129ac33812faea3;hp=84ad3a8ade3e6d1b9830b2c20ff4eb5efaac5b59;hpb=a043632a529c0b98bb8771c8815e7681e4ed0f12;p=openocd.git

diff --git a/src/flash/mflash.c b/src/flash/mflash.c
index 84ad3a8ade..5790a9583c 100644
--- a/src/flash/mflash.c
+++ b/src/flash/mflash.c
@@ -34,21 +34,21 @@ static int pxa270_set_gpio_output_val (struct mflash_gpio_num gpio, uint8_t val)
 
 static command_t *mflash_cmd;
 
-static mflash_bank_t *mflash_bank;
+static struct mflash_bank *mflash_bank;
 
-static mflash_gpio_drv_t pxa270_gpio = {
+static struct mflash_gpio_drv pxa270_gpio = {
 	.name = "pxa270",
 	.set_gpio_to_output = pxa270_set_gpio_to_output,
 	.set_gpio_output_val = pxa270_set_gpio_output_val
 };
 
-static mflash_gpio_drv_t s3c2440_gpio = {
+static struct mflash_gpio_drv s3c2440_gpio = {
 	.name = "s3c2440",
 	.set_gpio_to_output = s3c2440_set_gpio_to_output,
 	.set_gpio_output_val = s3c2440_set_gpio_output_val
 };
 
-static mflash_gpio_drv_t *mflash_gpio[] =
+static struct mflash_gpio_drv *mflash_gpio[] =
 {
 		&pxa270_gpio,
 		&s3c2440_gpio,
@@ -199,7 +199,7 @@ static int mg_hdrst(uint8_t level)
 static int mg_init_gpio (void)
 {
 	int ret;
-	mflash_gpio_drv_t *gpio_drv = mflash_bank->gpio_drv;
+	struct mflash_gpio_drv *gpio_drv = mflash_bank->gpio_drv;
 
 	ret = gpio_drv->set_gpio_to_output(mflash_bank->rst_pin);
 	if (ret != ERROR_OK)
@@ -349,7 +349,7 @@ static int mg_dsk_drv_info(void)
 	LOG_INFO("mflash: read drive info");
 
 	if (! mflash_bank->drv_info)
-		mflash_bank->drv_info = malloc(sizeof(mg_drv_info_t));
+		mflash_bank->drv_info = malloc(sizeof(struct mg_drv_info));
 
 	target_read_memory(target, mg_buff, 2, sizeof(mg_io_type_drv_info) >> 1,
 			(uint8_t *)&mflash_bank->drv_info->drv_id);
@@ -1296,7 +1296,7 @@ COMMAND_HANDLER(mg_bank_cmd)
 		return ERROR_FAIL;
 	}
 
-	mflash_bank = calloc(sizeof(mflash_bank_t), 1);
+	mflash_bank = calloc(sizeof(struct mflash_bank), 1);
 	COMMAND_PARSE_NUMBER(u32, args[1], mflash_bank->base);
 	/// @todo Verify how this parsing should work, then document it.
 	char *str;