X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fcmsis_dap_usb_bulk.c;h=034527015b5986c0aba6cea744655c2fa4944363;hb=f97915f248d7e3e7db49139b4fbb40e1e480ed53;hp=f535119f30d8c2cec259e0262878dcc40bf3ad38;hpb=11d918d9c1f7cb637a525a92521b747d2d4c840f;p=fw%2Fopenocd

diff --git a/src/jtag/drivers/cmsis_dap_usb_bulk.c b/src/jtag/drivers/cmsis_dap_usb_bulk.c
index f535119f3..034527015 100644
--- a/src/jtag/drivers/cmsis_dap_usb_bulk.c
+++ b/src/jtag/drivers/cmsis_dap_usb_bulk.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
 /***************************************************************************
  *   Copyright (C) 2018 by Mickaël Thomas                                  *
  *   mickael9@gmail.com                                                    *
@@ -16,27 +18,16 @@
  *                                                                         *
  *   Copyright (C) 2013 by Spencer Oliver                                  *
  *   spen@spen-soft.co.uk                                                  *
- *                                                                         *
- *   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
 #include "config.h"
 #endif
 
+#include <helper/system.h>
 #include <libusb.h>
 #include <helper/log.h>
+#include <helper/replacements.h>
 
 #include "cmsis_dap.h"
 
@@ -53,7 +44,7 @@ static int cmsis_dap_usb_interface = -1;
 static void cmsis_dap_usb_close(struct cmsis_dap *dap);
 static int cmsis_dap_usb_alloc(struct cmsis_dap *dap, unsigned int pkt_sz);
 
-static int cmsis_dap_usb_open(struct cmsis_dap *dap, uint16_t vids[], uint16_t pids[], char *serial)
+static int cmsis_dap_usb_open(struct cmsis_dap *dap, uint16_t vids[], uint16_t pids[], const char *serial)
 {
 	int err;
 	struct libusb_context *ctx;
@@ -260,7 +251,7 @@ static int cmsis_dap_usb_open(struct cmsis_dap *dap, uint16_t vids[], uint16_t p
 				 * - config asked explicitly for an interface number
 				 * - the device has only one interface
 				 * The later two cases should be honored only if we know
-				 * we are on the rigt device */
+				 * we are on the right device */
 				bool intf_identified_reliably = cmsis_dap_in_interface_str
 							|| (device_identified_reliably &&
 									(cmsis_dap_usb_interface != -1
@@ -351,7 +342,7 @@ static int cmsis_dap_usb_open(struct cmsis_dap *dap, uint16_t vids[], uint16_t p
 				LOG_WARNING("could not claim interface: %s", libusb_strerror(err));
 
 			dap->bdata = malloc(sizeof(struct cmsis_dap_backend_data));
-			if (dap->bdata == NULL) {
+			if (!dap->bdata) {
 				LOG_ERROR("unable to allocate memory");
 				libusb_release_interface(dev_handle, interface_num);
 				libusb_close(dev_handle);
@@ -368,7 +359,7 @@ static int cmsis_dap_usb_open(struct cmsis_dap *dap, uint16_t vids[], uint16_t p
 			dap->bdata->interface = interface_num;
 
 			dap->packet_buffer = malloc(dap->packet_buffer_size);
-			if (dap->packet_buffer == NULL) {
+			if (!dap->packet_buffer) {
 				LOG_ERROR("unable to allocate memory");
 				cmsis_dap_usb_close(dap);
 				return ERROR_FAIL;
@@ -444,7 +435,7 @@ static int cmsis_dap_usb_write(struct cmsis_dap *dap, int txlen, int timeout_ms)
 static int cmsis_dap_usb_alloc(struct cmsis_dap *dap, unsigned int pkt_sz)
 {
 	uint8_t *buf = malloc(pkt_sz);
-	if (buf == NULL) {
+	if (!buf) {
 		LOG_ERROR("unable to allocate CMSIS-DAP packet buffer");
 		return ERROR_FAIL;
 	}
@@ -462,7 +453,7 @@ static int cmsis_dap_usb_alloc(struct cmsis_dap *dap, unsigned int pkt_sz)
 COMMAND_HANDLER(cmsis_dap_handle_usb_interface_command)
 {
 	if (CMD_ARGC == 1)
-		cmsis_dap_usb_interface = strtoul(CMD_ARGV[0], NULL, 10);
+		COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], cmsis_dap_usb_interface);
 	else
 		LOG_ERROR("expected exactly one argument to cmsis_dap_usb_interface <interface_number>");