Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Transform 'u8' to 'uint8_t' in src/target
[openocd.git] / src / target / arm_jtag.c
diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c
index 77c818714478de19213190efd8a9f6ef3b49d771..3c1bb0afbe5e3953f90238db97dbdec378c18af0 100644 (file)
--- a/src/target/arm_jtag.c
+++ b/src/target/arm_jtag.c
@@ -2,6 +2,9 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -23,73 +26,83 @@
 
 #include "arm_jtag.h"
 
-#include "binarybuffer.h"
-#include "log.h"
-#include "jtag.h"
-
-#include <stdlib.h>
 
 #if 0
 #define _ARM_JTAG_SCAN_N_CHECK_
 #endif
 
-int arm_jtag_set_instr(arm_jtag_t *jtag_info, u32 new_instr,  in_handler_t handler)
+int arm_jtag_set_instr(arm_jtag_t *jtag_info, u32 new_instr,  void *no_verify_capture)
 {
-       jtag_device_t *device = jtag_get_device(jtag_info->chain_pos);
-       
-       if (buf_get_u32(device->cur_instr, 0, device->ir_length) != new_instr)
+       jtag_tap_t *tap;
+       tap = jtag_info->tap;
+       if (tap==NULL)
+               return ERROR_FAIL;
+
+       if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr)
        {
                scan_field_t field;
-               u8 t[4];
-       
-               field.device = jtag_info->chain_pos;
-               field.num_bits = device->ir_length;
+               uint8_t t[4];
+
+               field.tap = tap;
+               field.num_bits = tap->ir_length;
                field.out_value = t;
                buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
-               field.out_mask = NULL;
                field.in_value = NULL;
-               field.in_check_value = NULL;
-               field.in_check_mask = NULL;
-               field.in_handler = handler;
-               field.in_handler_priv = NULL;
-               jtag_add_ir_scan(1, &field, -1);
+               
+
+
+               if (no_verify_capture==NULL)
+               {
+                       jtag_add_ir_scan(1, &field, jtag_get_end_state());
+               } else
+               {
+                       /* FIX!!!! this is a kludge!!! arm926ejs.c should reimplement this arm_jtag_set_instr to
+                        * have special verification code.
+                        */
+                       jtag_add_ir_scan_noverify(1, &field, jtag_get_end_state());
+               }
        }
-       
+
        return ERROR_OK;
 }
 
 int arm_jtag_scann(arm_jtag_t *jtag_info, u32 new_scan_chain)
 {
+       int retval = ERROR_OK;
        if(jtag_info->cur_scan_chain != new_scan_chain)
        {
                u32 values[1];
                int num_bits[1];
-               
+
                values[0]=new_scan_chain;
                num_bits[0]=jtag_info->scann_size;
-               
-               arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL);
-               jtag_add_dr_out(jtag_info->chain_pos, 
+
+               if((retval = arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL)) != ERROR_OK)
+               {
+                       return retval;
+               }
+
+               jtag_add_dr_out(jtag_info->tap,
                                1,
                                num_bits,
                                values,
-                               -1);
-               
+                               jtag_get_end_state());
+
                jtag_info->cur_scan_chain = new_scan_chain;
        }
-       
-       return ERROR_OK;
+
+       return retval;
 }
 
 int arm_jtag_reset_callback(enum jtag_event event, void *priv)
 {
        arm_jtag_t *jtag_info = priv;
-       
+
        if (event == JTAG_TRST_ASSERTED)
        {
                jtag_info->cur_scan_chain = 0;
        }
-       
+
        return ERROR_OK;
 }
 
@@ -99,13 +112,11 @@ int arm_jtag_setup_connection(arm_jtag_t *jtag_info)
        jtag_info->cur_scan_chain = 0;
        jtag_info->intest_instr = 0xc;
 
-       jtag_register_event_callback(arm_jtag_reset_callback, jtag_info);
-       
-       return ERROR_OK;
+       return jtag_register_event_callback(arm_jtag_reset_callback, jtag_info);
 }
 
 /* read JTAG buffer into host-endian u32, flipping bit-order */
-int arm_jtag_buf_to_u32_flip(u8 *in_buf, void *priv, struct scan_field_s *field)
+int arm_jtag_buf_to_u32_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field)
 {
        u32 *dest = priv;
        *dest = flip_u32(le_to_h_u32(in_buf), 32);
@@ -113,44 +124,44 @@ int arm_jtag_buf_to_u32_flip(u8 *in_buf, void *priv, struct scan_field_s *field)
 }
 
 /* read JTAG buffer into little-endian u32, flipping bit-order */
-int arm_jtag_buf_to_le32_flip(u8 *in_buf, void *priv, struct scan_field_s *field)
+int arm_jtag_buf_to_le32_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field)
 {
-       h_u32_to_le(((u8*)priv), flip_u32(le_to_h_u32(in_buf), 32));
+       h_u32_to_le(((uint8_t*)priv), flip_u32(le_to_h_u32(in_buf), 32));
        return ERROR_OK;
 }
 
 /* read JTAG buffer into little-endian u16, flipping bit-order */
-int arm_jtag_buf_to_le16_flip(u8 *in_buf, void *priv, struct scan_field_s *field)
+int arm_jtag_buf_to_le16_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field)
 {
-       h_u16_to_le(((u8*)priv), flip_u32(le_to_h_u32(in_buf), 32) & 0xffff);
+       h_u16_to_le(((uint8_t*)priv), flip_u32(le_to_h_u32(in_buf), 32) & 0xffff);
        return ERROR_OK;
 }
 
 /* read JTAG buffer into big-endian u32, flipping bit-order */
-int arm_jtag_buf_to_be32_flip(u8 *in_buf, void *priv, struct scan_field_s *field)
+int arm_jtag_buf_to_be32_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field)
 {
-       h_u32_to_be(((u8*)priv), flip_u32(le_to_h_u32(in_buf), 32));
+       h_u32_to_be(((uint8_t*)priv), flip_u32(le_to_h_u32(in_buf), 32));
        return ERROR_OK;
 }
 
 /* read JTAG buffer into big-endian u16, flipping bit-order */
-int arm_jtag_buf_to_be16_flip(u8 *in_buf, void *priv, struct scan_field_s *field)
+int arm_jtag_buf_to_be16_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field)
 {
-       h_u16_to_be(((u8*)priv), flip_u32(le_to_h_u32(in_buf), 32) & 0xffff);
+       h_u16_to_be(((uint8_t*)priv), flip_u32(le_to_h_u32(in_buf), 32) & 0xffff);
        return ERROR_OK;
 }
 
-/* read JTAG buffer into u8, flipping bit-order */
-int arm_jtag_buf_to_8_flip(u8 *in_buf, void *priv, struct scan_field_s *field)
+/* read JTAG buffer into uint8_t, flipping bit-order */
+int arm_jtag_buf_to_8_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field)
 {
-       u8 *dest = priv;
+       uint8_t *dest = priv;
        *dest = flip_u32(le_to_h_u32(in_buf), 32) & 0xff;
        return ERROR_OK;
 }
 
 /* not-flipping variants */
 /* read JTAG buffer into host-endian u32 */
-int arm_jtag_buf_to_u32(u8 *in_buf, void *priv, struct scan_field_s *field)
+int arm_jtag_buf_to_u32(uint8_t *in_buf, void *priv, struct scan_field_s *field)
 {
        u32 *dest = priv;
        *dest = le_to_h_u32(in_buf);
@@ -158,37 +169,37 @@ int arm_jtag_buf_to_u32(u8 *in_buf, void *priv, struct scan_field_s *field)
 }
 
 /* read JTAG buffer into little-endian u32 */
-int arm_jtag_buf_to_le32(u8 *in_buf, void *priv, struct scan_field_s *field)
+int arm_jtag_buf_to_le32(uint8_t *in_buf, void *priv, struct scan_field_s *field)
 {
-       h_u32_to_le(((u8*)priv), le_to_h_u32(in_buf));
+       h_u32_to_le(((uint8_t*)priv), le_to_h_u32(in_buf));
        return ERROR_OK;
 }
 
 /* read JTAG buffer into little-endian u16 */
-int arm_jtag_buf_to_le16(u8 *in_buf, void *priv, struct scan_field_s *field)
+int arm_jtag_buf_to_le16(uint8_t *in_buf, void *priv, struct scan_field_s *field)
 {
-       h_u16_to_le(((u8*)priv), le_to_h_u32(in_buf) & 0xffff);
+       h_u16_to_le(((uint8_t*)priv), le_to_h_u32(in_buf) & 0xffff);
        return ERROR_OK;
 }
 
 /* read JTAG buffer into big-endian u32 */
-int arm_jtag_buf_to_be32(u8 *in_buf, void *priv, struct scan_field_s *field)
+int arm_jtag_buf_to_be32(uint8_t *in_buf, void *priv, struct scan_field_s *field)
 {
-       h_u32_to_be(((u8*)priv), le_to_h_u32(in_buf));
+       h_u32_to_be(((uint8_t*)priv), le_to_h_u32(in_buf));
        return ERROR_OK;
 }
 
 /* read JTAG buffer into big-endian u16 */
-int arm_jtag_buf_to_be16(u8 *in_buf, void *priv, struct scan_field_s *field)
+int arm_jtag_buf_to_be16(uint8_t *in_buf, void *priv, struct scan_field_s *field)
 {
-       h_u16_to_be(((u8*)priv), le_to_h_u32(in_buf) & 0xffff);
+       h_u16_to_be(((uint8_t*)priv), le_to_h_u32(in_buf) & 0xffff);
        return ERROR_OK;
 }
 
-/* read JTAG buffer into u8 */
-int arm_jtag_buf_to_8(u8 *in_buf, void *priv, struct scan_field_s *field)
+/* read JTAG buffer into uint8_t */
+int arm_jtag_buf_to_8(uint8_t *in_buf, void *priv, struct scan_field_s *field)
 {
-       u8 *dest = priv;
+       uint8_t *dest = priv;
        *dest = le_to_h_u32(in_buf) & 0xff;
        return ERROR_OK;
 }
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)