jtag_add_shift() fn - minidriver work in progress.

git-svn-id: svn://svn.berlios.de/openocd/trunk@367 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index c02b7e611ff10568fa2f872cf043d416eef67b83..985cf8c2df6337040f1930da5749dd9544284cb4 100644 (file)
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -1898,6 +1898,43 @@ int handle_drscan_command(struct command_context_s *cmd_ctx, char *cmd, char **a
        return ERROR_OK;
 }
 
+
+
+int MINIDRIVER(interface_jtag_add_shift)(const enum tap_state shift_state, const enum tap_state end_state, int num_bits, u32 value)
+{
+       u8 out_buf[4];
+       buf_set_u32(out_buf, 0, 32, flip_u32(value, 32));
+
+       /* allocate memory for a new list member */
+       jtag_command_t **last_cmd;
+       last_cmd = jtag_get_last_command_p();
+       *last_cmd = cmd_queue_alloc(sizeof(jtag_command_t));
+       last_comand_pointer = &((*last_cmd)->next);
+       (*last_cmd)->next = NULL;
+       (*last_cmd)->type = JTAG_SCAN;
+
+       /* allocate memory for scan command */
+       (*last_cmd)->cmd.scan = cmd_queue_alloc(sizeof(scan_command_t));
+       (*last_cmd)->cmd.scan->ir_scan = (shift_state==TAP_SI);
+       (*last_cmd)->cmd.scan->num_fields = 1;
+       (*last_cmd)->cmd.scan->fields = cmd_queue_alloc(1 * sizeof(scan_field_t));
+       (*last_cmd)->cmd.scan->end_state = end_state;
+               
+       int num_bytes = CEIL(num_bits, 8);
+       int i=0;
+       (*last_cmd)->cmd.scan->fields[i].device = 0; /* not used by any drivers */
+       (*last_cmd)->cmd.scan->fields[i].num_bits = num_bits;
+       (*last_cmd)->cmd.scan->fields[i].out_value = buf_cpy(out_buf, cmd_queue_alloc(num_bytes), num_bits);
+       (*last_cmd)->cmd.scan->fields[i].out_mask = NULL;
+       (*last_cmd)->cmd.scan->fields[i].in_value = NULL;
+       (*last_cmd)->cmd.scan->fields[i].in_check_value = NULL;
+       (*last_cmd)->cmd.scan->fields[i].in_check_mask = NULL;
+       (*last_cmd)->cmd.scan->fields[i].in_handler = NULL;
+       (*last_cmd)->cmd.scan->fields[i].in_handler_priv = NULL;
+       
+       return ERROR_OK;
+}
+
 int handle_verify_ircapture_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
        if (argc == 1)

diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h
index e190858a9e47ac46fc5648125820c334c6cc5874..f5602f1f87b6815c95fcf51c378b0cc177fe183c 100644 (file)
--- a/src/jtag/jtag.h
+++ b/src/jtag/jtag.h
@@ -22,6 +22,7 @@
 
 #include "types.h"
 #include "binarybuffer.h"
+#include "log.h"
 
 #include "command.h"
 
@@ -289,6 +290,9 @@ extern int jtag_add_end_state(enum tap_state endstate);
 extern int interface_jtag_add_end_state(enum tap_state endstate);
 extern int jtag_add_sleep(u32 us);
 extern int interface_jtag_add_sleep(u32 us);
+
+
+
 /*
  * For software FIFO implementations, the queued commands can be executed 
  * during this call or earlier. A sw queue might decide to push out
@@ -340,4 +344,30 @@ extern int jtag_verify_capture_ir;
 #define ERROR_JTAG_DEVICE_ERROR                        (-107)
 
 
+/* Here a #define MINIDRIVER() and an inline version of hw fifo interface_jtag_add_shift can be defined */
+
+#ifndef MINIDRIVER 
+extern int interface_jtag_add_shift(const enum tap_state shift_state, const enum tap_state end_state, int bits, u32 value);
+#endif
+
+/* Enter the shift_state and cycle "bits" times out of that state.
+ * 
+ * So if the end_state!=shift_state, then the transition from shift_state to 
+ * end_state counts as a transition out of shift_state.
+ * 
+ * Legal shift states TAP_SD and TAP_SI
+ * 
+ * Legal end state does not include TAP_TLR
+ * 
+ * Bits are clocked out from value LSB first.
+ */
+static __inline int jtag_add_shift(const enum tap_state shift_state, const enum tap_state end_state, int bits, u32 value)
+{
+       int retval;
+       retval=interface_jtag_add_shift(shift_state, end_state, bits, value);
+       cmd_queue_end_state = end_state;
+       return retval;
+}
+
+
 #endif /* JTAG_H */