X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnand%2Flpc32xx.c;h=058d9a50ee5efc6f9ea91104429a1b64cb9dc42b;hp=38c7e33500ed705bd3a2a9a728afab77cbe3d8c2;hb=844c82934ed5f23b62326870f9d7818afce7c4f6;hpb=f132fcf636361009b4125827351ef01556d49b31

diff --git a/src/flash/nand/lpc32xx.c b/src/flash/nand/lpc32xx.c
index 38c7e33500..058d9a50ee 100644
--- a/src/flash/nand/lpc32xx.c
+++ b/src/flash/nand/lpc32xx.c
@@ -21,9 +21,7 @@
  *   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.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -52,10 +50,10 @@ extern int nand_correct_data(struct nand_device *nand, u_char *dat,
 #define SPARE_OFFS 0x140
 #define DATA_OFFS  0x200
 
-static int sp_ooblayout[] = {
+static const int sp_ooblayout[] = {
 	10, 11, 12, 13, 14, 15
 };
-static int lp_ooblayout[] = {
+static const int lp_ooblayout[] = {
 	40, 41, 42, 43, 44, 45,
 	46, 47, 48, 49, 50, 51,
 	52, 53, 54, 55, 56, 57,
@@ -334,7 +332,7 @@ static int lpc32xx_init(struct nand_device *nand)
 			WIDTH = bus_width)
 		*/
 		retval = target_write_u32(target, 0x20020014,
-				0x3e | (bus_width == 16) ? 1 : 0);
+				0x3e | ((bus_width == 16) ? 1 : 0));
 		if (ERROR_OK != retval) {
 			LOG_ERROR("could not set SLC_CFG");
 			return ERROR_NAND_OPERATION_FAILED;
@@ -1148,7 +1146,7 @@ static int lpc32xx_write_page_slc(struct nand_device *nand,
 		/* Copy to oob, at correct offsets */
 		static uint8_t ecc[24];
 		slc_ecc_copy_to_buffer(ecc, hw_ecc, ecc_count);
-		int *layout = nand->page_size == 2048 ? lp_ooblayout : sp_ooblayout;
+		const int *layout = nand->page_size == 2048 ? lp_ooblayout : sp_ooblayout;
 		int i;
 		for (i = 0; i < ecc_count * 3; i++)
 			foob[layout[i]] = ecc[i];
@@ -1549,7 +1547,7 @@ static int lpc32xx_read_page_slc(struct nand_device *nand,
 	slc_ecc_copy_to_buffer(ecc, hw_ecc, ecc_count);
 	/* Copy ECC from flash using correct layout */
 	static uint8_t fecc[24];/* max size */
-	int *layout = nand->page_size == 2048 ? lp_ooblayout : sp_ooblayout;
+	const int *layout = nand->page_size == 2048 ? lp_ooblayout : sp_ooblayout;
 	int i;
 	for (i = 0; i < ecc_count * 3; i++)
 		fecc[i] = foob[layout[i]];
@@ -1762,7 +1760,7 @@ COMMAND_HANDLER(handle_lpc32xx_select_command)
 	COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], num);
 	struct nand_device *nand = get_nand_device_by_num(num);
 	if (!nand) {
-		command_print(CMD_CTX, "nand device '#%s' is out of bounds",
+		command_print(CMD, "nand device '#%s' is out of bounds",
 			CMD_ARGV[0]);
 		return ERROR_OK;
 	}
@@ -1780,7 +1778,7 @@ COMMAND_HANDLER(handle_lpc32xx_select_command)
 			return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
-	command_print(CMD_CTX, "%s controller selected",
+	command_print(CMD, "%s controller selected",
 		selected[lpc32xx_info->selected_controller]);
 
 	return ERROR_OK;