X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fcc3220sf.c;h=74cb7aea572358bd67c0a71a9c54eaacb5c8cbeb;hp=1d01ba3be3aea4d56d243fa812d58078b912f54d;hb=HEAD;hpb=64c2e03b23d9cadc1b919d38e902a079d015ddc6

diff --git a/src/flash/nor/cc3220sf.c b/src/flash/nor/cc3220sf.c
index 1d01ba3be3..74cb7aea57 100644
--- a/src/flash/nor/cc3220sf.c
+++ b/src/flash/nor/cc3220sf.c
@@ -1,18 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2017 by Texas Instruments, Inc.                         *
- *                                                                         *
- *   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
@@ -21,6 +10,7 @@
 
 #include "imp.h"
 #include "cc3220sf.h"
+#include <helper/binarybuffer.h>
 #include <helper/time_support.h>
 #include <target/algorithm.h>
 #include <target/armv7m.h>
@@ -32,6 +22,11 @@ struct cc3220sf_bank {
 	struct armv7m_algorithm armv7m_info;
 };
 
+/* Flash helper algorithm for CC3220SF */
+static const uint8_t cc3220sf_algo[] = {
+#include "../../../contrib/loaders/flash/cc3220sf/cc3220sf.inc"
+};
+
 static int cc3220sf_mass_erase(struct flash_bank *bank)
 {
 	struct target *target = bank->target;
@@ -42,19 +37,19 @@ static int cc3220sf_mass_erase(struct flash_bank *bank)
 
 	int retval = ERROR_OK;
 
-	if (TARGET_HALTED != target->state) {
+	if (target->state != TARGET_HALTED) {
 		LOG_ERROR("Target not halted");
 		return ERROR_TARGET_NOT_HALTED;
 	}
 
 	/* Set starting address to erase to zero */
 	retval = target_write_u32(target, FMA_REGISTER_ADDR, 0);
-	if (ERROR_OK != retval)
+	if (retval != ERROR_OK)
 		return retval;
 
 	/* Write the MERASE bit of the FMC register */
 	retval = target_write_u32(target, FMC_REGISTER_ADDR, FMC_MERASE_VALUE);
-	if (ERROR_OK != retval)
+	if (retval != ERROR_OK)
 		return retval;
 
 	/* Poll the MERASE bit until the mass erase is complete */
@@ -62,7 +57,7 @@ static int cc3220sf_mass_erase(struct flash_bank *bank)
 	start_ms = timeval_ms();
 	while (!done) {
 		retval = target_read_u32(target, FMC_REGISTER_ADDR, &value);
-		if (ERROR_OK != retval)
+		if (retval != ERROR_OK)
 			return retval;
 
 		if ((value & FMC_MERASE_BIT) == 0) {
@@ -93,7 +88,7 @@ FLASH_BANK_COMMAND_HANDLER(cc3220sf_flash_bank_command)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	cc3220sf_bank = malloc(sizeof(struct cc3220sf_bank));
-	if (NULL == cc3220sf_bank)
+	if (!cc3220sf_bank)
 		return ERROR_FAIL;
 
 	/* Initialize private flash information */
@@ -101,7 +96,6 @@ FLASH_BANK_COMMAND_HANDLER(cc3220sf_flash_bank_command)
 
 	/* Finish initialization of flash bank */
 	bank->driver_priv = cc3220sf_bank;
-	bank->next = NULL;
 
 	return ERROR_OK;
 }
@@ -118,7 +112,7 @@ static int cc3220sf_erase(struct flash_bank *bank, unsigned int first,
 
 	int retval = ERROR_OK;
 
-	if (TARGET_HALTED != target->state) {
+	if (target->state != TARGET_HALTED) {
 		LOG_ERROR("Target not halted");
 		return ERROR_TARGET_NOT_HALTED;
 	}
@@ -137,12 +131,12 @@ static int cc3220sf_erase(struct flash_bank *bank, unsigned int first,
 
 		/* Set starting address to erase */
 		retval = target_write_u32(target, FMA_REGISTER_ADDR, address);
-		if (ERROR_OK != retval)
+		if (retval != ERROR_OK)
 			return retval;
 
 		/* Write the ERASE bit of the FMC register */
 		retval = target_write_u32(target, FMC_REGISTER_ADDR, FMC_ERASE_VALUE);
-		if (ERROR_OK != retval)
+		if (retval != ERROR_OK)
 			return retval;
 
 		/* Poll the ERASE bit until the erase is complete */
@@ -150,7 +144,7 @@ static int cc3220sf_erase(struct flash_bank *bank, unsigned int first,
 		start_ms = timeval_ms();
 		while (!done) {
 			retval = target_read_u32(target, FMC_REGISTER_ADDR, &value);
-			if (ERROR_OK != retval)
+			if (retval != ERROR_OK)
 				return retval;
 
 			if ((value & FMC_ERASE_BIT) == 0) {
@@ -192,7 +186,7 @@ static int cc3220sf_write(struct flash_bank *bank, const uint8_t *buffer,
 
 	int retval = ERROR_OK;
 
-	if (TARGET_HALTED != target->state) {
+	if (target->state != TARGET_HALTED) {
 		LOG_ERROR("Target not halted");
 		return ERROR_TARGET_NOT_HALTED;
 	}
@@ -200,13 +194,13 @@ static int cc3220sf_write(struct flash_bank *bank, const uint8_t *buffer,
 	/* Obtain working area to use for flash helper algorithm */
 	retval = target_alloc_working_area(target, sizeof(cc3220sf_algo),
 				&algo_working_area);
-	if (ERROR_OK != retval)
+	if (retval != ERROR_OK)
 		return retval;
 
 	/* Obtain working area to use for flash buffer */
 	retval = target_alloc_working_area(target,
 				target_get_working_area_avail(target), &buffer_working_area);
-	if (ERROR_OK != retval) {
+	if (retval != ERROR_OK) {
 		target_free_working_area(target, algo_working_area);
 		return retval;
 	}
@@ -223,7 +217,7 @@ static int cc3220sf_write(struct flash_bank *bank, const uint8_t *buffer,
 	/* Write flash helper algorithm into target memory */
 	retval = target_write_buffer(target, algo_base_address,
 				sizeof(cc3220sf_algo), cc3220sf_algo);
-	if (ERROR_OK != retval) {
+	if (retval != ERROR_OK) {
 		target_free_working_area(target, algo_working_area);
 		target_free_working_area(target, buffer_working_area);
 		return retval;
@@ -262,7 +256,7 @@ static int cc3220sf_write(struct flash_bank *bank, const uint8_t *buffer,
 		/* Retrieve what is already in flash at the head address */
 		retval = target_read_buffer(target, head_address, sizeof(head), head);
 
-		if (ERROR_OK == retval) {
+		if (retval == ERROR_OK) {
 			/* Substitute in the new data to write */
 			while ((remaining > 0) && (head_offset < 4)) {
 				head[head_offset] = *buffer;
@@ -273,7 +267,7 @@ static int cc3220sf_write(struct flash_bank *bank, const uint8_t *buffer,
 			}
 		}
 
-		if (ERROR_OK == retval) {
+		if (retval == ERROR_OK) {
 			/* Helper parameters are passed in registers R0-R2 */
 			/* Set start of data buffer, address to write to, and word count */
 			buf_set_u32(reg_params[0].value, 0, 32, algo_buffer_address);
@@ -285,17 +279,17 @@ static int cc3220sf_write(struct flash_bank *bank, const uint8_t *buffer,
 						sizeof(head), head);
 		}
 
-		if (ERROR_OK == retval) {
+		if (retval == ERROR_OK) {
 			/* Execute the flash helper algorithm */
 			retval = target_run_algorithm(target, 0, NULL, 3, reg_params,
 						algo_base_address, 0, FLASH_TIMEOUT,
 						&cc3220sf_bank->armv7m_info);
-			if (ERROR_OK != retval)
+			if (retval != ERROR_OK)
 				LOG_ERROR("cc3220sf: Flash algorithm failed to run");
 
 			/* Check that the head value was written to flash */
 			result = buf_get_u32(reg_params[2].value, 0, 32);
-			if (0 != result) {
+			if (result != 0) {
 				retval = ERROR_FAIL;
 				LOG_ERROR("cc3220sf: Flash operation failed");
 			}
@@ -307,7 +301,7 @@ static int cc3220sf_write(struct flash_bank *bank, const uint8_t *buffer,
 	/* Adjust remaining so it is a multiple of whole words */
 	remaining -= tail_count;
 
-	while ((ERROR_OK == retval) && (remaining > 0)) {
+	while ((retval == ERROR_OK) && (remaining > 0)) {
 		/* Set start of data buffer and address to write to */
 		buf_set_u32(reg_params[0].value, 0, 32, algo_buffer_address);
 		buf_set_u32(reg_params[1].value, 0, 32, address);
@@ -317,7 +311,7 @@ static int cc3220sf_write(struct flash_bank *bank, const uint8_t *buffer,
 			/* Fill up buffer with data to flash */
 			retval = target_write_buffer(target, algo_buffer_address,
 						algo_buffer_size, buffer);
-			if (ERROR_OK != retval)
+			if (retval != ERROR_OK)
 				break;
 
 			/* Count to write is in 32-bit words */
@@ -331,7 +325,7 @@ static int cc3220sf_write(struct flash_bank *bank, const uint8_t *buffer,
 			/* Fill buffer with what's left of the data */
 			retval = target_write_buffer(target, algo_buffer_address,
 						remaining, buffer);
-			if (ERROR_OK != retval)
+			if (retval != ERROR_OK)
 				break;
 
 			/* Calculate the final word count to write */
@@ -352,14 +346,14 @@ static int cc3220sf_write(struct flash_bank *bank, const uint8_t *buffer,
 		retval = target_run_algorithm(target, 0, NULL, 3, reg_params,
 					algo_base_address, 0, FLASH_TIMEOUT,
 					&cc3220sf_bank->armv7m_info);
-		if (ERROR_OK != retval) {
+		if (retval != ERROR_OK) {
 			LOG_ERROR("cc3220sf: Flash algorithm failed to run");
 			break;
 		}
 
 		/* Check that all words were written to flash */
 		result = buf_get_u32(reg_params[2].value, 0, 32);
-		if (0 != result) {
+		if (result != 0) {
 			retval = ERROR_FAIL;
 			LOG_ERROR("cc3220sf: Flash operation failed");
 			break;
@@ -369,7 +363,7 @@ static int cc3220sf_write(struct flash_bank *bank, const uint8_t *buffer,
 	}
 
 	/* Do one word write for any final bytes less than a full word */
-	if ((ERROR_OK == retval) && (0 != tail_count)) {
+	if ((retval == ERROR_OK) && (tail_count != 0)) {
 		uint8_t tail[4];
 
 		/* Set starting byte offset for data to write */
@@ -378,7 +372,7 @@ static int cc3220sf_write(struct flash_bank *bank, const uint8_t *buffer,
 		/* Retrieve what is already in flash at the tail address */
 		retval = target_read_buffer(target, address, sizeof(tail), tail);
 
-		if (ERROR_OK == retval) {
+		if (retval == ERROR_OK) {
 			/* Substitute in the new data to write */
 			while (tail_count > 0) {
 				tail[tail_offset] = *buffer;
@@ -388,7 +382,7 @@ static int cc3220sf_write(struct flash_bank *bank, const uint8_t *buffer,
 			}
 		}
 
-		if (ERROR_OK == retval) {
+		if (retval == ERROR_OK) {
 			/* Set start of data buffer, address to write to, and word count */
 			buf_set_u32(reg_params[0].value, 0, 32, algo_buffer_address);
 			buf_set_u32(reg_params[1].value, 0, 32, address);
@@ -399,17 +393,17 @@ static int cc3220sf_write(struct flash_bank *bank, const uint8_t *buffer,
 						sizeof(tail), tail);
 		}
 
-		if (ERROR_OK == retval) {
+		if (retval == ERROR_OK) {
 			/* Execute the flash helper algorithm */
 			retval = target_run_algorithm(target, 0, NULL, 3, reg_params,
 						algo_base_address, 0, FLASH_TIMEOUT,
 						&cc3220sf_bank->armv7m_info);
-			if (ERROR_OK != retval)
+			if (retval != ERROR_OK)
 				LOG_ERROR("cc3220sf: Flash algorithm failed to run");
 
 			/* Check that the tail was written to flash */
 			result = buf_get_u32(reg_params[2].value, 0, 32);
-			if (0 != result) {
+			if (result != 0) {
 				retval = ERROR_FAIL;
 				LOG_ERROR("cc3220sf: Flash operation failed");
 			}
@@ -441,7 +435,7 @@ static int cc3220sf_probe(struct flash_bank *bank)
 	free(bank->sectors);
 
 	bank->sectors = malloc(sizeof(struct flash_sector) * num_sectors);
-	if (NULL == bank->sectors)
+	if (!bank->sectors)
 		return ERROR_FAIL;
 
 	bank->base = base;