openocd: fix SPDX tag format for files .c

[fw/openocd] / src / flash / nor / xmc4xxx.c

diff --git a/src/flash/nor/xmc4xxx.c b/src/flash/nor/xmc4xxx.c
index a2cf6a0b1e58f88b20bd4e17598c9634165a819e..54fd5a58678e8d5114381441a8c4a125a53549ac 100644 (file)
--- a/src/flash/nor/xmc4xxx.c
+++ b/src/flash/nor/xmc4xxx.c
@@ -1,18 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /**************************************************************************
 *   Copyright (C) 2015 Jeff Ciesielski <jeffciesielski@gmail.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
@@ -577,8 +566,6 @@ static int xmc4xxx_erase(struct flash_bank *bank, unsigned int first,
 
                if (res != ERROR_OK)
                        goto clear_status_and_exit;
-
-               bank->sectors[i].is_erased = 1;
        }
 
 clear_status_and_exit:
@@ -941,7 +928,7 @@ static int xmc4xxx_get_info_command(struct flash_bank *bank, struct command_invo
                }
        }
 
-       if (rev_str != NULL)
+       if (rev_str)
                command_print_sameline(cmd, "%s - Rev: %s%s", dev_str, rev_str, prot_str);
        else
                command_print_sameline(cmd, "%s - Rev: unknown (0x%01x)%s", dev_str, rev_id, prot_str);
@@ -1270,12 +1257,12 @@ COMMAND_HANDLER(xmc4xxx_handle_flash_password_command)
        errno = 0;
 
        /* We skip over the flash bank */
-       fb->pw1 = strtol(CMD_ARGV[1], NULL, 16);
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], fb->pw1);
 
        if (errno)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
-       fb->pw2 = strtol(CMD_ARGV[2], NULL, 16);
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], fb->pw2);
 
        if (errno)
                return ERROR_COMMAND_SYNTAX_ERROR;