From: Zachary T Welch Date: Fri, 13 Nov 2009 15:38:17 +0000 (-0800) Subject: mflash_gpio_drv_t -> struct mflash_gpio_drv X-Git-Tag: v0.4.0-rc1~746 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fc01dd6a13167c33491b9ccc1543d34b2e485c32;p=openocd mflash_gpio_drv_t -> struct mflash_gpio_drv Remove misleading typedef and redundant suffix from struct mflash_gpio_drv. --- diff --git a/src/flash/mflash.c b/src/flash/mflash.c index 84ad3a8a..7696f0d8 100644 --- a/src/flash/mflash.c +++ b/src/flash/mflash.c @@ -36,19 +36,19 @@ 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, @@ -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) diff --git a/src/flash/mflash.h b/src/flash/mflash.h index 75fbaa44..c09120b6 100644 --- a/src/flash/mflash.h +++ b/src/flash/mflash.h @@ -32,12 +32,12 @@ struct mflash_gpio_num signed short num; }; -typedef struct mflash_gpio_drv_s +struct mflash_gpio_drv { 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); -} mflash_gpio_drv_t; +}; typedef struct _mg_io_type_drv_info { @@ -136,7 +136,7 @@ typedef struct mflash_bank_s struct mflash_gpio_num rst_pin; - mflash_gpio_drv_t *gpio_drv; + struct mflash_gpio_drv *gpio_drv; target_t *target; mg_drv_info_t *drv_info; } mflash_bank_t;