jtag/drivers/bitbang: use LOG_CUSTOM_LEVEL() macro for SWD

[openocd.git] / src / jtag / drivers / rshim.c

diff --git a/src/jtag/drivers/rshim.c b/src/jtag/drivers/rshim.c
index f977ca7c86be0963d20d73bbd008d899f70ed569..21fc7fd378509c329a19017447c8c78b777fc357 100644 (file)
--- a/src/jtag/drivers/rshim.c
+++ b/src/jtag/drivers/rshim.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /*
  * Copyright (c) 2020, Mellanox Technologies Ltd. - All Rights Reserved
  * Liming Sun <lsun@mellanox.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
- * (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, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -265,8 +254,8 @@ static int rshim_dp_q_write(struct adiv5_dap *dap, unsigned int reg,
                dp_ctrl_stat = data;
                break;
        case DP_SELECT:
-               ap_sel = (data & DP_SELECT_APSEL) >> 24;
-               ap_bank = (data & DP_SELECT_APBANK) >> 4;
+               ap_sel = (data & ADIV5_DP_SELECT_APSEL) >> 24;
+               ap_bank = (data & ADIV5_DP_SELECT_APBANK) >> 4;
                break;
        default:
                LOG_INFO("Unknown command");
@@ -445,10 +434,8 @@ static void rshim_disconnect(struct adiv5_dap *dap)
 
 COMMAND_HANDLER(rshim_dap_device_command)
 {
-       if (CMD_ARGC != 1) {
-               command_print(CMD, "Too many arguments");
+       if (CMD_ARGC != 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
-       }
 
        free(rshim_dev_path);
        rshim_dev_path = strdup(CMD_ARGV[0]);