openocd: fix SPDX tag format for files .c

[fw/openocd] / src / flash / nand / ecc.c

diff --git a/src/flash/nand/ecc.c b/src/flash/nand/ecc.c
index b4039976044df33d4baa37fa2212909ad8d1c845..20b8ba85dc6cf9d093324212e36202f5b620715b 100644 (file)
--- a/src/flash/nand/ecc.c
+++ b/src/flash/nand/ecc.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later WITH eCos-exception-2.0
+
 /*
  * This file contains an ECC algorithm from Toshiba that allows for detection
  * and correction of 1-bit errors in a 256 byte block of data.
@@ -10,31 +12,6 @@
  *                         Toshiba America Electronics Components, Inc.
  *
  * Copyright (C) 2006 Thomas Gleixner <tglx at linutronix.de>
- *
- * This file 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 or (at your option) any
- * later version.
- *
- * This file 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 file; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
- * As a special exception, if other files instantiate templates or use
- * macros or inline functions from these files, or you compile these
- * files and link them with other works to produce a work based on these
- * files, these files do not by themselves cause the resulting work to be
- * covered by the GNU General Public License. However the source code for
- * these files must still be made available in accordance with section (3)
- * of the GNU General Public License.
- *
- * This exception does not invalidate any other reasons why a work based on
- * this file might be covered by the GNU General Public License.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -121,12 +98,12 @@ int nand_calculate_ecc(struct nand_device *nand, const uint8_t *dat, uint8_t *ec
        return 0;
 }
 
-static inline int countbits(uint32_t byte)
+static inline int countbits(uint32_t b)
 {
        int res = 0;
 
-       for (;byte; byte >>= 1)
-               res += byte & 0x01;
+       for (; b; b >>= 1)
+               res += b & 0x01;
        return res;
 }
 
@@ -134,7 +111,7 @@ static inline int countbits(uint32_t byte)
  * nand_correct_data - Detect and correct a 1 bit error for 256 byte block
  */
 int nand_correct_data(struct nand_device *nand, u_char *dat,
-                     u_char *read_ecc, u_char *calc_ecc)
+               u_char *read_ecc, u_char *calc_ecc)
 {
        uint8_t s0, s1, s2;
 
@@ -151,9 +128,9 @@ int nand_correct_data(struct nand_device *nand, u_char *dat,
                return 0;
 
        /* Check for a single bit error */
-       if( ((s0 ^ (s0 >> 1)) & 0x55) == 0x55 &&
-           ((s1 ^ (s1 >> 1)) & 0x55) == 0x55 &&
-           ((s2 ^ (s2 >> 1)) & 0x54) == 0x54) {
+       if (((s0 ^ (s0 >> 1)) & 0x55) == 0x55 &&
+                       ((s1 ^ (s1 >> 1)) & 0x55) == 0x55 &&
+                       ((s2 ^ (s2 >> 1)) & 0x54) == 0x54) {
 
                uint32_t byteoffs, bitnum;
 
@@ -176,7 +153,7 @@ int nand_correct_data(struct nand_device *nand, u_char *dat,
                return 1;
        }
 
-       if(countbits(s0 | ((uint32_t)s1 << 8) | ((uint32_t)s2 <<16)) == 1)
+       if (countbits(s0 | ((uint32_t)s1 << 8) | ((uint32_t)s2 << 16)) == 1)
                return 1;
 
        return -1;