X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fcommands.h;h=86ded1520b239c73702f2e7759a391fe8f2fe9ac;hb=cb4a475f6c26ff197cd9d601b0b9f86653d961a2;hp=5c2744359464545e6408018a202bd4a160d39f2a;hpb=22b220ad7f42ea288b1762692d079ecbde10ba24;p=openocd.git

diff --git a/src/jtag/commands.h b/src/jtag/commands.h
index 5c27443594..86ded1520b 100644
--- a/src/jtag/commands.h
+++ b/src/jtag/commands.h
@@ -26,7 +26,7 @@
 #ifndef JTAG_COMMANDS_H
 #define JTAG_COMMANDS_H
 
-#include "jtag.h"
+#include <jtag/jtag.h>
 
 /**
  * The inferred type of a scan_command_s structure, indicating whether
@@ -104,8 +104,7 @@ struct sleep_command {
  * 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;
@@ -114,10 +113,10 @@ typedef union jtag_command_container_u
 	struct reset_command*        reset;
 	struct end_state_command*    end_state;
 	struct sleep_command* sleep;
-} jtag_command_container_t;
+};
 
 /**
- * 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 {
@@ -130,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);