end_state_command_t -> struct end_state_command

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

diff --git a/src/jtag/commands.h b/src/jtag/commands.h
index ac440db66f77d0a4db107c5b3e08d087e12c7d17..9d0747a6d6c33e115d749e47f0d6a24f427982ea 100644 (file)
--- a/src/jtag/commands.h
+++ b/src/jtag/commands.h
@@ -46,8 +46,7 @@ enum scan_type {
  * The scan_command provide a means of encapsulating a set of scan_field_s
  * structures that should be scanned in/out to the device.
  */
-typedef struct scan_command_s
-{
+struct scan_command {
        /// instruction/not data scan
        bool ir_scan;
        /// number of fields in *fields array
@@ -56,51 +55,45 @@ typedef struct scan_command_s
        struct scan_field* fields;
        /// state in which JTAG commands should finish
        tap_state_t end_state;
-} scan_command_t;
+};
 
-typedef struct statemove_command_s
-{
+struct statemove_command {
        /// state in which JTAG commands should finish
        tap_state_t end_state;
-} statemove_command_t;
+};
 
-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
 {
@@ -114,13 +107,13 @@ typedef struct sleep_command_s
  */
 typedef union jtag_command_container_u
 {
-       scan_command_t*         scan;
-       statemove_command_t*    statemove;
-       pathmove_command_t*     pathmove;
-       runtest_command_t*      runtest;
-       stableclocks_command_t* stableclocks;
-       reset_command_t*        reset;
-       end_state_command_t*    end_state;
+       struct scan_command*         scan;
+       struct statemove_command*    statemove;
+       struct pathmove_command*     pathmove;
+       struct runtest_command*      runtest;
+       struct stableclocks_command* stableclocks;
+       struct reset_command*        reset;
+       struct end_state_command*    end_state;
        sleep_command_t* sleep;
 } jtag_command_container_t;
 
@@ -154,9 +147,9 @@ void cmd_queue_free(void);
 void jtag_queue_command(jtag_command_t *cmd);
 void jtag_command_queue_reset(void);
 
-enum scan_type jtag_scan_type(const scan_command_t* cmd);
-int jtag_scan_size(const scan_command_t* cmd);
-int jtag_read_buffer(uint8_t* buffer, const scan_command_t* cmd);
-int jtag_build_buffer(const scan_command_t* cmd, uint8_t** buffer);
+enum scan_type jtag_scan_type(const struct scan_command* cmd);
+int jtag_scan_size(const struct scan_command* cmd);
+int jtag_read_buffer(uint8_t* buffer, const struct scan_command* cmd);
+int jtag_build_buffer(const struct scan_command* cmd, uint8_t** buffer);
 
 #endif // JTAG_COMMANDS_H