openocd: remove CamelCase symbols *xPSR*

[fw/openocd] / src / pld / virtex2.c

diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c
index 36d8f6fdea2c8dd29ce68f945cacecf9a04e52c6..b73f5d123ccf6c231fd0fdb5b8bcc20dde8fa5ca 100644 (file)
--- a/src/pld/virtex2.c
+++ b/src/pld/virtex2.c
@@ -1,21 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
 /***************************************************************************
  *   Copyright (C) 2006 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
- *                                                                         *
- *   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     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -28,7 +15,7 @@
 
 static int virtex2_set_instr(struct jtag_tap *tap, uint32_t new_instr)
 {
-       if (tap == NULL)
+       if (!tap)
                return ERROR_FAIL;
 
        if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr) {
@@ -159,13 +146,15 @@ static int virtex2_load(struct pld_device *pld_device, const char *filename)
 
        jtag_add_tlr();
 
-       virtex2_set_instr(virtex2_info->tap, 0xc);      /* JSTART */
+       if (!(virtex2_info->no_jstart))
+               virtex2_set_instr(virtex2_info->tap, 0xc);      /* JSTART */
        jtag_add_runtest(13, TAP_IDLE);
-       virtex2_set_instr(virtex2_info->tap, 0x3f);     /* BYPASS */
-       virtex2_set_instr(virtex2_info->tap, 0x3f);     /* BYPASS */
-       virtex2_set_instr(virtex2_info->tap, 0xc);      /* JSTART */
+       virtex2_set_instr(virtex2_info->tap, 0x3f);             /* BYPASS */
+       virtex2_set_instr(virtex2_info->tap, 0x3f);             /* BYPASS */
+       if (!(virtex2_info->no_jstart))
+               virtex2_set_instr(virtex2_info->tap, 0xc);      /* JSTART */
        jtag_add_runtest(13, TAP_IDLE);
-       virtex2_set_instr(virtex2_info->tap, 0x3f);     /* BYPASS */
+       virtex2_set_instr(virtex2_info->tap, 0x3f);             /* BYPASS */
        jtag_execute_queue();
 
        return ERROR_OK;
@@ -183,13 +172,13 @@ COMMAND_HANDLER(virtex2_handle_read_stat_command)
        COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], dev_id);
        device = get_pld_device_by_num(dev_id);
        if (!device) {
-               command_print(CMD_CTX, "pld device '#%s' is out of bounds", CMD_ARGV[0]);
+               command_print(CMD, "pld device '#%s' is out of bounds", CMD_ARGV[0]);
                return ERROR_OK;
        }
 
        virtex2_read_stat(device, &status);
 
-       command_print(CMD_CTX, "virtex2 status register: 0x%8.8" PRIx32 "", status);
+       command_print(CMD, "virtex2 status register: 0x%8.8" PRIx32 "", status);
 
        return ERROR_OK;
 }
@@ -204,14 +193,18 @@ PLD_DEVICE_COMMAND_HANDLER(virtex2_pld_device_command)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        tap = jtag_tap_by_string(CMD_ARGV[1]);
-       if (tap == NULL) {
-               command_print(CMD_CTX, "Tap: %s does not exist", CMD_ARGV[1]);
+       if (!tap) {
+               command_print(CMD, "Tap: %s does not exist", CMD_ARGV[1]);
                return ERROR_OK;
        }
 
        virtex2_info = malloc(sizeof(struct virtex2_pld_device));
        virtex2_info->tap = tap;
 
+       virtex2_info->no_jstart = 0;
+       if (CMD_ARGC >= 3)
+               COMMAND_PARSE_NUMBER(int, CMD_ARGV[2], virtex2_info->no_jstart);
+
        pld->driver_priv = virtex2_info;
 
        return ERROR_OK;