jtag_command_container_t -> union jtag_command_container

[fw/openocd] / src / jtag / commands.h

diff --git a/src/jtag/commands.h b/src/jtag/commands.h
index 858f7aad5011529ad36682ea59e286573a7039c7..150f03360a699667fd9e2b36444cf534238801df 100644 (file)
--- a/src/jtag/commands.h
+++ b/src/jtag/commands.h
@@ -62,68 +62,61 @@ struct statemove_command {
        tap_state_t end_state;
 };
 
-typedef struct pathmove_command_s
-{
+struct pathmove_command {
        /// number of states in *path
        int num_states;
        /// states that have to be passed
        tap_state_t* path;
-} pathmove_command_t;
+};
 
-typedef struct runtest_command_s
-{
+struct runtest_command {
        /// number of cycles to spend in Run-Test/Idle state
        int num_cycles;
        /// state in which JTAG commands should finish
        tap_state_t end_state;
-} runtest_command_t;
+};
 
 
-typedef struct stableclocks_command_s
-{
+struct stableclocks_command {
        /// number of clock cycles that should be sent
        int num_cycles;
-} stableclocks_command_t;
+};
 
 
-typedef struct reset_command_s
-{
+struct reset_command {
        /// Set TRST output: 0 = deassert, 1 = assert, -1 = no change
        int trst;
        /// Set SRST output: 0 = deassert, 1 = assert, -1 = no change
        int srst;
-} reset_command_t;
+};
 
-typedef struct end_state_command_s
-{
+struct end_state_command {
        /// state in which JTAG commands should finish
        tap_state_t end_state;
-} end_state_command_t;
+};
 
-typedef struct sleep_command_s
-{
+struct sleep_command {
        /// number of microseconds to sleep
        uint32_t us;
-} sleep_command_t;
+};
 
 /**
  * Defines a container type that hold a pointer to a JTAG command
  * structure of any defined type.
  */
-typedef union jtag_command_container_u
-{
+union jtag_command_container {
        struct scan_command*         scan;
        struct statemove_command*    statemove;
-       pathmove_command_t*     pathmove;
-       runtest_command_t*      runtest;
-       stableclocks_command_t* stableclocks;
-       reset_command_t*        reset;
-       end_state_command_t*    end_state;
-       sleep_command_t* sleep;
-} jtag_command_container_t;
+       struct pathmove_command*     pathmove;
+       struct runtest_command*      runtest;
+       struct stableclocks_command* stableclocks;
+       struct reset_command*        reset;
+       struct end_state_command*    end_state;
+       struct sleep_command* sleep;
+};
 
 /**
- * The type of the @c jtag_command_container_u contained by a
+ * The type of the @c jtag_command_container contained by a
  * @c jtag_command_s structure.
  */
 enum jtag_command_type {
@@ -138,7 +131,7 @@ enum jtag_command_type {
 
 typedef struct jtag_command_s
 {
-       jtag_command_container_t cmd;
+       union jtag_command_container cmd;
        enum jtag_command_type   type;
        struct jtag_command_s*   next;
 } jtag_command_t;