X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fcommands.h;h=967a8349e277683983f78358244612563d5a028c;hb=ca32f25638408df8a9c18522da43f6e8adcdb5cb;hp=f43a4149b299c4939962b4ca940b6dec6d96878b;hpb=5f6d8ecf8c2cf1427a8677155843081d07ff57c4;p=openocd.git

diff --git a/src/jtag/commands.h b/src/jtag/commands.h
index f43a4149b2..967a8349e2 100644
--- a/src/jtag/commands.h
+++ b/src/jtag/commands.h
@@ -77,51 +77,46 @@ struct runtest_command {
 };
 
 
-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;
 	struct pathmove_command*     pathmove;
 	struct runtest_command*      runtest;
-	stableclocks_command_t* stableclocks;
-	reset_command_t*        reset;
-	end_state_command_t*    end_state;
-	sleep_command_t* sleep;
-} jtag_command_container_t;
+	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 {
@@ -134,20 +129,19 @@ enum jtag_command_type {
 	JTAG_STABLECLOCKS = 8
 };
 
-typedef struct jtag_command_s
-{
-	jtag_command_container_t cmd;
+struct jtag_command {
+	union jtag_command_container cmd;
 	enum jtag_command_type   type;
-	struct jtag_command_s*   next;
-} jtag_command_t;
+	struct jtag_command *next;
+};
 
 /// The current queue of jtag_command_s structures.
-extern jtag_command_t* jtag_command_queue;
+extern struct jtag_command* jtag_command_queue;
 
 void* cmd_queue_alloc(size_t size);
 void cmd_queue_free(void);
 
-void jtag_queue_command(jtag_command_t *cmd);
+void jtag_queue_command(struct jtag_command *cmd);
 void jtag_command_queue_reset(void);
 
 enum scan_type jtag_scan_type(const struct scan_command* cmd);