X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fcommands.h;h=509ca5aadb0ab7fdb286588183c3e5e002f3cce6;hp=38c7e5c4a6db9ad6e34c98c29e33a5256714f84b;hb=2fecae46f62ca98657d650de9fc73d44247971e8;hpb=4a6adee17e18fc4aba58f8bfbb463c67a8fd6b5d

diff --git a/src/jtag/commands.h b/src/jtag/commands.h
index 38c7e5c4a6..509ca5aadb 100644
--- a/src/jtag/commands.h
+++ b/src/jtag/commands.h
@@ -46,53 +46,48 @@ 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
 	int num_fields;
 	/// pointer to an array of data scan fields
-	scan_field_t* fields;
+	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
 {
-	/// Set TRST output: 0=deassert, 1=assert, -1=no change
+	/// Set TRST output: 0 = deassert, 1 = assert, -1 = no change
 	int trst;
-	/// Set SRST output: 0=deassert, 1=assert, -1=no change
+	/// Set SRST output: 0 = deassert, 1 = assert, -1 = no change
 	int srst;
 } reset_command_t;
 
@@ -105,7 +100,7 @@ typedef struct end_state_command_s
 typedef struct sleep_command_s
 {
 	/// number of microseconds to sleep
-	u32 us;
+	uint32_t us;
 } sleep_command_t;
 
 /**
@@ -114,11 +109,11 @@ 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;
+	struct scan_command*         scan;
+	struct statemove_command*    statemove;
+	struct pathmove_command*     pathmove;
+	struct runtest_command*      runtest;
+	struct stableclocks_command* stableclocks;
 	reset_command_t*        reset;
 	end_state_command_t*    end_state;
 	sleep_command_t* sleep;
@@ -154,9 +149,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(u8* buffer, const scan_command_t* cmd);
-int jtag_build_buffer(const scan_command_t* cmd, u8** 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