jtag_interface_t -> struct jtag_interface

Remove useless typedef and redundant suffix from struct jtag_interface.

diff --git a/src/jtag/amt_jtagaccel.c b/src/jtag/amt_jtagaccel.c
index a34387f8b43df0db78ea98dfc676cbe3e6da010e..306216adb4afd2b65feba76052f11a6f584f5f4a 100644 (file)
--- a/src/jtag/amt_jtagaccel.c
+++ b/src/jtag/amt_jtagaccel.c
@@ -552,7 +552,7 @@ static int amt_jtagaccel_register_commands(struct command_context_s *cmd_ctx)
        return ERROR_OK;
 }
 
        return ERROR_OK;
 }
 

-jtag_interface_t amt_jtagaccel_interface = {
+struct jtag_interface amt_jtagaccel_interface = {

                .name = "amt_jtagaccel",
                .register_commands = &amt_jtagaccel_register_commands,
                .init = &amt_jtagaccel_init,
                .name = "amt_jtagaccel",
                .register_commands = &amt_jtagaccel_register_commands,
                .init = &amt_jtagaccel_init,

diff --git a/src/jtag/arm-jtag-ew.c b/src/jtag/arm-jtag-ew.c
index fa18ef0f59f8371eef027ce6113d3053b27ea152..e337260649fea2bda3dc6e769beafbbf3d043cbe 100644 (file)
--- a/src/jtag/arm-jtag-ew.c
+++ b/src/jtag/arm-jtag-ew.c
@@ -109,7 +109,7 @@ static armjtagew_jtag_t* armjtagew_jtag_handle;
 /***************************************************************************/
 /* External interface implementation */
 
 /***************************************************************************/
 /* External interface implementation */
 

-jtag_interface_t armjtagew_interface =
+struct jtag_interface armjtagew_interface =

 {
        .name = "arm-jtag-ew",
        .execute_queue = armjtagew_execute_queue,
 {
        .name = "arm-jtag-ew",
        .execute_queue = armjtagew_execute_queue,

diff --git a/src/jtag/at91rm9200.c b/src/jtag/at91rm9200.c
index 52869a3e53efb42a6786aa840a84bc6fc2f30974..706257533e3a02132a3e447e8126c2f9d44fb235 100644 (file)
--- a/src/jtag/at91rm9200.c
+++ b/src/jtag/at91rm9200.c
@@ -122,7 +122,7 @@ static int at91rm9200_register_commands(struct command_context_s *cmd_ctx);
 static int at91rm9200_init(void);
 static int at91rm9200_quit(void);
 
 static int at91rm9200_init(void);
 static int at91rm9200_quit(void);
 

-jtag_interface_t at91rm9200_interface =
+struct jtag_interface at91rm9200_interface =

 {
        .name = "at91rm9200",
 
 {
        .name = "at91rm9200",
 

diff --git a/src/jtag/core.c b/src/jtag/core.c
index 48af0406fe74aa954306014f48d7aeb17fafb211..3684e06c8f7fc74eed22ff8f105c706c84aacecf 100644 (file)
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -115,10 +115,10 @@ static int rclk_fallback_speed_khz = 0;
 static enum {CLOCK_MODE_SPEED, CLOCK_MODE_KHZ, CLOCK_MODE_RCLK} clock_mode;
 static int jtag_speed = 0;
 
 static enum {CLOCK_MODE_SPEED, CLOCK_MODE_KHZ, CLOCK_MODE_RCLK} clock_mode;
 static int jtag_speed = 0;
 

-static struct jtag_interface_s *jtag = NULL;
+static struct jtag_interface *jtag = NULL;

 
 /* configuration */
 
 /* configuration */

-jtag_interface_t *jtag_interface = NULL;
+struct jtag_interface *jtag_interface = NULL;

 
 void jtag_set_error(int error)
 {
 
 void jtag_set_error(int error)
 {

diff --git a/src/jtag/dummy.c b/src/jtag/dummy.c
index 5fc9251f9a38118221ac2783020ed8d2f37bd1e8..ce3cca355d20bd6dd6e82374a24e0a4ba1bdcfb4 100644 (file)
--- a/src/jtag/dummy.c
+++ b/src/jtag/dummy.c
@@ -46,7 +46,7 @@ static int dummy_speed_div(int speed, int *khz);
 /* The dummy driver is used to easily check the code path
  * where the target is unresponsive.
  */
 /* The dummy driver is used to easily check the code path
  * where the target is unresponsive.
  */

-jtag_interface_t dummy_interface =
+struct jtag_interface dummy_interface =

 {
        .name = "dummy",
 
 {
        .name = "dummy",
 

diff --git a/src/jtag/ep93xx.c b/src/jtag/ep93xx.c
index 50e2ad3f55ab82435c46b3c653456a505f4bfa95..6ae823e82652bf00dce016be0e5f10784e818e3f 100644 (file)
--- a/src/jtag/ep93xx.c
+++ b/src/jtag/ep93xx.c
@@ -53,7 +53,7 @@ static int ep93xx_quit(void);
 
 struct timespec ep93xx_zzzz;
 
 
 struct timespec ep93xx_zzzz;
 

-jtag_interface_t ep93xx_interface =
+struct jtag_interface ep93xx_interface =

 {
        .name = "ep93xx",
 
 {
        .name = "ep93xx",
 

diff --git a/src/jtag/ft2232.c b/src/jtag/ft2232.c
index 39036bcb9e6a51aba169daba0bb2d3681a5c09fc..6f8dd0d46b215ea4dc9a0adda21ce67d1ca8020d 100644 (file)
--- a/src/jtag/ft2232.c
+++ b/src/jtag/ft2232.c
@@ -3993,7 +3993,7 @@ static int ft2232_register_commands(struct command_context_s* cmd_ctx)
 }
 
 
 }
 
 

-jtag_interface_t ft2232_interface = {
+struct jtag_interface ft2232_interface = {

                .name = "ft2232",
                .register_commands = &ft2232_register_commands,
                .init = &ft2232_init,
                .name = "ft2232",
                .register_commands = &ft2232_register_commands,
                .init = &ft2232_init,

diff --git a/src/jtag/gw16012.c b/src/jtag/gw16012.c
index 07188f4e5cbd6ab26c91aa0c323e0d83f5775550..dfc07be2ae39a8447b889b52556c6460804e1724 100644 (file)
--- a/src/jtag/gw16012.c
+++ b/src/jtag/gw16012.c
@@ -571,7 +571,7 @@ static int gw16012_register_commands(struct command_context_s *cmd_ctx)
        return ERROR_OK;
 }
 
        return ERROR_OK;
 }
 

-jtag_interface_t gw16012_interface = {
+struct jtag_interface gw16012_interface = {

                .name = "gw16012",
                .register_commands = &gw16012_register_commands,
                .init = &gw16012_init,
                .name = "gw16012",
                .register_commands = &gw16012_register_commands,
                .init = &gw16012_init,

diff --git a/src/jtag/interface.h b/src/jtag/interface.h
index afe21086c0f79f238ff8f06db9b2fb400334f981..5727298513b1cbd65a2ef6a4acfe77c57df5048a 100644 (file)
--- a/src/jtag/interface.h
+++ b/src/jtag/interface.h
@@ -184,8 +184,7 @@ static inline tap_state_t jtag_debug_state_machine(const void *tms_buf,
 }
 #endif // _DEBUG_JTAG_IO_
 
 }
 #endif // _DEBUG_JTAG_IO_
 

-typedef struct jtag_interface_s
-{
+struct jtag_interface {

        /// The name of the JTAG interface driver.
        char* name;
 
        /// The name of the JTAG interface driver.
        char* name;
 


@@ -271,7 +270,7 @@ typedef struct jtag_interface_s
         * @returns ERROR_OK on success, or an error code on failure.
         */
        int (*srst_asserted)(int* srst_asserted);
         * @returns ERROR_OK on success, or an error code on failure.
         */
        int (*srst_asserted)(int* srst_asserted);

-} jtag_interface_t;
+};

 
 
 #endif // OPENOCD_JTAG_INTERFACE_H
 
 
 #endif // OPENOCD_JTAG_INTERFACE_H

diff --git a/src/jtag/interfaces.c b/src/jtag/interfaces.c
index 778c4e3f27a3f4c46bc0a0ff826bb8d165b3df2a..643e1118114a0706c9047fdeacd43eea71d50233 100644 (file)
--- a/src/jtag/interfaces.c
+++ b/src/jtag/interfaces.c
@@ -42,51 +42,51 @@
  */
 
 #if BUILD_ZY1000 == 1
  */
 
 #if BUILD_ZY1000 == 1

-extern jtag_interface_t zy1000_interface;
+extern struct jtag_interface zy1000_interface;

 #elif defined(BUILD_MINIDRIVER_DUMMY)
 #elif defined(BUILD_MINIDRIVER_DUMMY)

-extern jtag_interface_t minidummy_interface;
+extern struct jtag_interface minidummy_interface;

 #else // standard drivers
 #if BUILD_PARPORT == 1
 #else // standard drivers
 #if BUILD_PARPORT == 1

-extern jtag_interface_t parport_interface;
+extern struct jtag_interface parport_interface;

 #endif
 #if BUILD_DUMMY == 1
 #endif
 #if BUILD_DUMMY == 1

-extern jtag_interface_t dummy_interface;
+extern struct jtag_interface dummy_interface;

 #endif
 #if BUILD_FT2232_FTD2XX == 1
 #endif
 #if BUILD_FT2232_FTD2XX == 1

-extern jtag_interface_t ft2232_interface;
+extern struct jtag_interface ft2232_interface;

 #endif
 #if BUILD_FT2232_LIBFTDI == 1
 #endif
 #if BUILD_FT2232_LIBFTDI == 1

-extern jtag_interface_t ft2232_interface;
+extern struct jtag_interface ft2232_interface;

 #endif
 #if BUILD_AMTJTAGACCEL == 1
 #endif
 #if BUILD_AMTJTAGACCEL == 1

-extern jtag_interface_t amt_jtagaccel_interface;
+extern struct jtag_interface amt_jtagaccel_interface;

 #endif
 #if BUILD_EP93XX == 1
 #endif
 #if BUILD_EP93XX == 1

-extern jtag_interface_t ep93xx_interface;
+extern struct jtag_interface ep93xx_interface;

 #endif
 #if BUILD_AT91RM9200 == 1
 #endif
 #if BUILD_AT91RM9200 == 1

-extern jtag_interface_t at91rm9200_interface;
+extern struct jtag_interface at91rm9200_interface;

 #endif
 #if BUILD_GW16012 == 1
 #endif
 #if BUILD_GW16012 == 1

-extern jtag_interface_t gw16012_interface;
+extern struct jtag_interface gw16012_interface;

 #endif
 #if BUILD_PRESTO_LIBFTDI == 1 || BUILD_PRESTO_FTD2XX == 1
 #endif
 #if BUILD_PRESTO_LIBFTDI == 1 || BUILD_PRESTO_FTD2XX == 1

-extern jtag_interface_t presto_interface;
+extern struct jtag_interface presto_interface;

 #endif
 #if BUILD_USBPROG == 1
 #endif
 #if BUILD_USBPROG == 1

-extern jtag_interface_t usbprog_interface;
+extern struct jtag_interface usbprog_interface;

 #endif
 #if BUILD_JLINK == 1
 #endif
 #if BUILD_JLINK == 1

-extern jtag_interface_t jlink_interface;
+extern struct jtag_interface jlink_interface;

 #endif
 #if BUILD_VSLLINK == 1
 #endif
 #if BUILD_VSLLINK == 1

-extern jtag_interface_t vsllink_interface;
+extern struct jtag_interface vsllink_interface;

 #endif
 #if BUILD_RLINK == 1
 #endif
 #if BUILD_RLINK == 1

-extern jtag_interface_t rlink_interface;
+extern struct jtag_interface rlink_interface;

 #endif
 #if BUILD_ARMJTAGEW == 1
 #endif
 #if BUILD_ARMJTAGEW == 1

-extern jtag_interface_t armjtagew_interface;
+extern struct jtag_interface armjtagew_interface;

 #endif
 #endif // standard drivers
 
 #endif
 #endif // standard drivers
 


@@ -97,7 +97,7 @@ extern jtag_interface_t armjtagew_interface;
  * The list should be defined to contain either one minidriver interface
  * or some number of standard driver interfaces, never both.
  */
  * The list should be defined to contain either one minidriver interface
  * or some number of standard driver interfaces, never both.
  */

-jtag_interface_t *jtag_interfaces[] = {
+struct jtag_interface *jtag_interfaces[] = {

 #if BUILD_ZY1000 == 1
                &zy1000_interface,
 #elif defined(BUILD_MINIDRIVER_DUMMY)
 #if BUILD_ZY1000 == 1
                &zy1000_interface,
 #elif defined(BUILD_MINIDRIVER_DUMMY)

diff --git a/src/jtag/interfaces.h b/src/jtag/interfaces.h
index a32d3f918223ccb81a90a5170a2178004c27bccf..38f1e714cf6a4b2f52947f3ba6d73d9e766a9103 100644 (file)
--- a/src/jtag/interfaces.h
+++ b/src/jtag/interfaces.h
@@ -40,6 +40,6 @@
 /// Dynamically load all JTAG interface modules from specified directory.
 void jtag_interface_modules_load(const char *path);
 
 /// Dynamically load all JTAG interface modules from specified directory.
 void jtag_interface_modules_load(const char *path);
 

-extern jtag_interface_t *jtag_interfaces[];
+extern struct jtag_interface *jtag_interfaces[];

 
 #endif // OPENOCD_JTAG_INTERFACES_H
 
 #endif // OPENOCD_JTAG_INTERFACES_H

diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c
index 5cf944c7ee8e3156fbb9ba6dca8c54ba117a5e1e..8d9aa8f0265382c1e5d70818fa29dc6ebb987bc5 100644 (file)
--- a/src/jtag/jlink.c
+++ b/src/jtag/jlink.c
@@ -139,7 +139,7 @@ static jlink_jtag_t* jlink_jtag_handle;
 /***************************************************************************/
 /* External interface implementation */
 
 /***************************************************************************/
 /* External interface implementation */
 

-jtag_interface_t jlink_interface =
+struct jtag_interface jlink_interface =

 {
        .name = "jlink",
        .execute_queue = jlink_execute_queue,
 {
        .name = "jlink",
        .execute_queue = jlink_execute_queue,

diff --git a/src/jtag/minidummy/minidummy.c b/src/jtag/minidummy/minidummy.c
index af98ec5f24017f254877c109e4fe60d3fbc0ea40..b01f593bdf5e50a0ad73cf6121375ecc879d575c 100644 (file)
--- a/src/jtag/minidummy/minidummy.c
+++ b/src/jtag/minidummy/minidummy.c
@@ -27,7 +27,7 @@
 
 
 
 
 
 

-jtag_interface_t minidummy_interface =
+struct jtag_interface minidummy_interface =

 {
        .name = "minidummy",
        .execute_queue = NULL,
 {
        .name = "minidummy",
        .execute_queue = NULL,

diff --git a/src/jtag/parport.c b/src/jtag/parport.c
index 8906970dcafe8a45c8d154813b62d53442adba42..d4d9b22d6373a9ca4cbd6310cbcf2295228d5f15 100644 (file)
--- a/src/jtag/parport.c
+++ b/src/jtag/parport.c
@@ -510,7 +510,7 @@ static int parport_register_commands(struct command_context_s *cmd_ctx)
        return ERROR_OK;
 }
 
        return ERROR_OK;
 }
 

-jtag_interface_t parport_interface = {
+struct jtag_interface parport_interface = {

        .name =                 "parport",
        .register_commands =    parport_register_commands,
        .init =                 parport_init,
        .name =                 "parport",
        .register_commands =    parport_register_commands,
        .init =                 parport_init,

diff --git a/src/jtag/presto.c b/src/jtag/presto.c
index b8703770b498a6c18952b0457adcef91a99c6634..29066b18a283b8707acf52ad21114154d52673ba 100644 (file)
--- a/src/jtag/presto.c
+++ b/src/jtag/presto.c
@@ -46,7 +46,7 @@ static int presto_jtag_register_commands(struct command_context_s *cmd_ctx);
 static int presto_jtag_init(void);
 static int presto_jtag_quit(void);
 
 static int presto_jtag_init(void);
 static int presto_jtag_quit(void);
 

-jtag_interface_t presto_interface =
+struct jtag_interface presto_interface =

 {
        .name = "presto",
        .execute_queue = bitq_execute_queue,
 {
        .name = "presto",
        .execute_queue = bitq_execute_queue,

diff --git a/src/jtag/rlink/rlink.c b/src/jtag/rlink/rlink.c
index 3c85789fe05c73d0f046c3feb3794ffb3848a531..db91698e72309f75b15beb1d2133294d333ac126 100644 (file)
--- a/src/jtag/rlink/rlink.c
+++ b/src/jtag/rlink/rlink.c
@@ -1878,7 +1878,7 @@ int rlink_quit(void)
 }
 
 
 }
 
 

-jtag_interface_t rlink_interface =
+struct jtag_interface rlink_interface =

 {
        .name = "rlink",
        .init = rlink_init,
 {
        .name = "rlink",
        .init = rlink_init,

diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index 04b3ed2f880cafa1f8a800bbb26bfa72736eaf14..3c9ef0e2727b89b5003ab21530c2071ee190907e 100644 (file)
--- a/src/jtag/tcl.c
+++ b/src/jtag/tcl.c
@@ -49,7 +49,7 @@ static const Jim_Nvp nvp_jtag_tap_event[] = {
        { .name = NULL, .value = -1 }
 };
 
        { .name = NULL, .value = -1 }
 };
 

-extern jtag_interface_t *jtag_interface;
+extern struct jtag_interface *jtag_interface;

 
 enum jtag_tap_cfg_param {
        JCFG_EVENT
 
 enum jtag_tap_cfg_param {
        JCFG_EVENT

diff --git a/src/jtag/usbprog.c b/src/jtag/usbprog.c
index 6c416644bff9e12405ce247fea9583e3b3db1584..06a9673f96df6ecee89ddf24ff306ef84dd0dd90 100644 (file)
--- a/src/jtag/usbprog.c
+++ b/src/jtag/usbprog.c
@@ -61,7 +61,7 @@ static void usbprog_path_move(pathmove_command_t *cmd);
 static void usbprog_runtest(int num_cycles);
 static void usbprog_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size);
 
 static void usbprog_runtest(int num_cycles);
 static void usbprog_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size);
 

-jtag_interface_t usbprog_interface =
+struct jtag_interface usbprog_interface =

 {
        .name = "usbprog",
        .execute_queue = usbprog_execute_queue,
 {
        .name = "usbprog",
        .execute_queue = usbprog_execute_queue,

diff --git a/src/jtag/vsllink.c b/src/jtag/vsllink.c
index decca16c61eecb1fad46c6a35696d922309f2859..f462f07c82cdc20baf794dbc96fb1bec8736ecd2 100644 (file)
--- a/src/jtag/vsllink.c
+++ b/src/jtag/vsllink.c
@@ -1907,7 +1907,7 @@ static int vsllink_register_commands(struct command_context_s *cmd_ctx)
        return ERROR_OK;
 }
 
        return ERROR_OK;
 }
 

-jtag_interface_t vsllink_interface = {
+struct jtag_interface vsllink_interface = {

                .name = "vsllink",
                .register_commands = &vsllink_register_commands,
                .init = &vsllink_init,
                .name = "vsllink",
                .register_commands = &vsllink_register_commands,
                .init = &vsllink_init,

diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index 1a926ca96baa06ef896d190bbbc78d5ebe299683..8f4d5e5fdf711c1996d8cda443997cc842dea2e4 100644 (file)
--- a/src/jtag/zy1000/zy1000.c
+++ b/src/jtag/zy1000/zy1000.c
@@ -110,7 +110,7 @@ static int zy1000_power_dropout(int *dropout)
 }
 
 
 }
 
 

-jtag_interface_t zy1000_interface =
+struct jtag_interface zy1000_interface =

 {
        .name = "ZY1000",
        .execute_queue = NULL,
 {
        .name = "ZY1000",
        .execute_queue = NULL,