mflash_gpio_drv_t -> struct mflash_gpio_drv

[openocd.git] / src / flash / mflash.c

diff --git a/src/flash/mflash.c b/src/flash/mflash.c
index 54578da3851eb43b9cae702bbd6f667a2d3e2bfb..7696f0d8919f9444e8050cc12523e2c88f95141c 100644 (file)
--- a/src/flash/mflash.c
+++ b/src/flash/mflash.c
@@ -27,28 +27,28 @@
 #include "log.h"
 
 
-static int s3c2440_set_gpio_to_output (mflash_gpio_num_t gpio);
-static int s3c2440_set_gpio_output_val (mflash_gpio_num_t gpio, uint8_t val);
-static int pxa270_set_gpio_to_output (mflash_gpio_num_t gpio);
-static int pxa270_set_gpio_output_val (mflash_gpio_num_t gpio, uint8_t val);
+static int s3c2440_set_gpio_to_output (struct mflash_gpio_num gpio);
+static int s3c2440_set_gpio_output_val (struct mflash_gpio_num gpio, uint8_t val);
+static int pxa270_set_gpio_to_output (struct mflash_gpio_num gpio);
+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 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,
@@ -64,7 +64,7 @@ static mflash_gpio_drv_t *mflash_gpio[] =
 #define PXA270_GPSR0 0x40E00018
 #define PXA270_GPCR0 0x40E00024
 
-static int pxa270_set_gpio_to_output (mflash_gpio_num_t gpio)
+static int pxa270_set_gpio_to_output (struct mflash_gpio_num gpio)
 {
        uint32_t addr, value, mask;
        target_t *target = mflash_bank->target;
@@ -101,7 +101,7 @@ static int pxa270_set_gpio_to_output (mflash_gpio_num_t gpio)
        return ret;
 }
 
-static int pxa270_set_gpio_output_val (mflash_gpio_num_t gpio, uint8_t val)
+static int pxa270_set_gpio_output_val (struct mflash_gpio_num gpio, uint8_t val)
 {
        uint32_t addr, value, mask;
        target_t *target = mflash_bank->target;
@@ -130,7 +130,7 @@ static int pxa270_set_gpio_output_val (mflash_gpio_num_t gpio, uint8_t val)
 #define S3C2440_GPJCON 0x560000d0
 #define S3C2440_GPJDAT 0x560000d4
 
-static int s3c2440_set_gpio_to_output (mflash_gpio_num_t gpio)
+static int s3c2440_set_gpio_to_output (struct mflash_gpio_num gpio)
 {
        uint32_t data, mask, gpio_con;
        target_t *target = mflash_bank->target;
@@ -162,7 +162,7 @@ static int s3c2440_set_gpio_to_output (mflash_gpio_num_t gpio)
        return ret;
 }
 
-static int s3c2440_set_gpio_output_val (mflash_gpio_num_t gpio, uint8_t val)
+static int s3c2440_set_gpio_output_val (struct mflash_gpio_num gpio, uint8_t val)
 {
        uint32_t data, mask, gpio_dat;
        target_t *target = mflash_bank->target;
@@ -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)