X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fdsp5680xx_flash.c;h=38649ff0409ddc857b9bcfb9956f92d5ae1cc952;hp=78cd6e3d4e49775567291931f1640f6e547bb7f6;hb=8f777bc1a66b5f604fde8bbdbe64206413c8aa1c;hpb=3d0e2547fe4a0ea50d31beec8b4be1cc7cf51cda
diff --git a/src/flash/nor/dsp5680xx_flash.c b/src/flash/nor/dsp5680xx_flash.c
index 78cd6e3d4e..38649ff040 100644
--- a/src/flash/nor/dsp5680xx_flash.c
+++ b/src/flash/nor/dsp5680xx_flash.c
@@ -18,21 +18,19 @@
* 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., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * along with this program. If not, see . *
***************************************************************************/
/**
* @file dsp5680xx_flash.c
* @author Rodrigo L. Rosa
* @date Thu Jun 9 18:21:58 2011
- *
+ *
* @brief This file implements the basic functions to run flashing commands
* from the TCL interface.
* It allows the user to flash the Freescale 5680xx DSP.
- *
- *
+ *
+ *
*/
#ifdef HAVE_CONFIG_H
@@ -45,10 +43,6 @@
#include
#include
-struct dsp5680xx_flash_bank {
- struct working_area *write_algorithm;
-};
-
static int dsp5680xx_build_sector_list(struct flash_bank *bank)
{
uint32_t offset = HFM_FLASH_BASE_ADDR;
@@ -71,27 +65,22 @@ static int dsp5680xx_build_sector_list(struct flash_bank *bank)
/* flash bank dsp5680xx 0 0 0 0 */
FLASH_BANK_COMMAND_HANDLER(dsp5680xx_flash_bank_command)
{
- struct dsp5680xx_flash_bank *nbank;
-
- nbank = malloc(sizeof(struct dsp5680xx_flash_bank));
-
bank->base = HFM_FLASH_BASE_ADDR;
bank->size = HFM_SIZE_BYTES; /* top 4k not accessible */
- bank->driver_priv = nbank;
bank->num_sectors = HFM_SECTOR_COUNT;
dsp5680xx_build_sector_list(bank);
return ERROR_OK;
}
-/**
+/**
* A memory mapped register (PROT) holds information regarding sector protection.
* Protection refers to undesired core access.
* The value in this register is loaded from flash upon reset.
- *
- * @param bank
- *
- * @return
+ *
+ * @param bank
+ *
+ * @return
*/
static int dsp5680xx_flash_protect_check(struct flash_bank *bank)
{
@@ -118,17 +107,18 @@ static int dsp5680xx_flash_protect_check(struct flash_bank *bank)
return retval;
}
-/**
+/**
* Protection funcionality is not implemented.
* The current implementation applies/removes security on the chip.
- * The chip is effectively secured/unsecured after the first reset following the execution of this function.
- *
- * @param bank
+ * The chip is effectively secured/unsecured after the first reset
+ * following the execution of this function.
+ *
+ * @param bank
* @param set Apply or remove security on the chip.
* @param first This parameter is ignored.
* @param last This parameter is ignored.
- *
- * @return
+ *
+ * @return
*/
static int dsp5680xx_flash_protect(struct flash_bank *bank, int set, int first,
int last)
@@ -153,17 +143,18 @@ static int dsp5680xx_flash_protect(struct flash_bank *bank, int set, int first,
return retval;
}
-/**
- * The dsp5680xx use word addressing. The "/2" that appear in the following code are a workaround for the fact that OpenOCD uses byte addressing.
- *
- * @param bank
+/**
+ * The dsp5680xx use word addressing. The "/2" that appear in the following code
+ * are a workaround for the fact that OpenOCD uses byte addressing.
+ *
+ * @param bank
* @param buffer Data to write to flash.
- * @param offset
+ * @param offset
* @param count In bytes (2 bytes per address).
- *
- * @return
+ *
+ * @return
*/
-static int dsp5680xx_flash_write(struct flash_bank *bank, uint8_t * buffer,
+static int dsp5680xx_flash_write(struct flash_bank *bank, const uint8_t* buffer,
uint32_t offset, uint32_t count)
{
int retval;
@@ -178,24 +169,18 @@ static int dsp5680xx_flash_write(struct flash_bank *bank, uint8_t * buffer,
* This chip uses word addressing, Openocd only supports byte addressing.
* The workaround results in disabling writing to odd byte addresses
*/
- LOG_ERROR
- ("%s: Writing to odd addresses not supported for this target",
- __func__);
+ LOG_ERROR("%s: Writing to odd addresses not supported for this target", __func__);
return ERROR_FAIL;
}
- retval =
- dsp5680xx_f_wr(bank->target, buffer, bank->base + offset / 2, count,
- 0);
+ retval = dsp5680xx_f_wr(bank->target, buffer, bank->base + offset / 2, count, 0);
uint32_t addr_word;
for (addr_word = bank->base + offset / 2; addr_word < count / 2;
- addr_word += (HFM_SECTOR_SIZE / 2)) {
+ addr_word += (HFM_SECTOR_SIZE / 2)) {
if (retval == ERROR_OK)
- bank->sectors[addr_word /
- (HFM_SECTOR_SIZE / 2)].is_erased = 0;
+ bank->sectors[addr_word / (HFM_SECTOR_SIZE / 2)].is_erased = 0;
else
- bank->sectors[addr_word /
- (HFM_SECTOR_SIZE / 2)].is_erased = -1;
+ bank->sectors[addr_word / (HFM_SECTOR_SIZE / 2)].is_erased = -1;
}
return retval;
}
@@ -206,32 +191,25 @@ static int dsp5680xx_probe(struct flash_bank *bank)
return ERROR_OK;
}
-static int dsp5680xx_flash_info(struct flash_bank *bank, char *buf,
- int buf_size)
-{
- snprintf(buf, buf_size,
- "\ndsp5680xx flash driver info:\n - See comments in code.");
- return ERROR_OK;
-}
-
-/**
- * The flash module (FM) on the dsp5680xx supports both individual sector and mass erase of the flash memory.
- * If this function is called with @first == @last == 0 or if @first is the first sector (#0) and @last is the last sector then the mass erase command is executed (much faster than erasing each sector individually).
- *
- * @param bank
- * @param first
- * @param last
- *
- * @return
+/**
+ * The flash module (FM) on the dsp5680xx supports both individual sector
+ * and mass erase of the flash memory.
+ * If this function is called with @first == @last == 0 or if @first is the
+ * first sector (#0) and @last is the last sector then the mass erase command
+ * is executed (much faster than erasing each sector individually).
+ *
+ * @param bank
+ * @param first
+ * @param last
+ *
+ * @return
*/
static int dsp5680xx_flash_erase(struct flash_bank *bank, int first, int last)
{
int retval;
- retval =
- dsp5680xx_f_erase(bank->target, (uint32_t) first, (uint32_t) last);
- if ((!(first | last))
- || ((first == 0) && (last == (HFM_SECTOR_COUNT - 1))))
+ retval = dsp5680xx_f_erase(bank->target, (uint32_t) first, (uint32_t) last);
+ if ((!(first | last)) || ((first == 0) && (last == (HFM_SECTOR_COUNT - 1))))
last = HFM_SECTOR_COUNT - 1;
if (retval == ERROR_OK)
for (int i = first; i <= last; i++)
@@ -246,13 +224,13 @@ static int dsp5680xx_flash_erase(struct flash_bank *bank, int first, int last)
return retval;
}
-/**
+/**
* The flash module (FM) on the dsp5680xx support a blank check function.
* This function executes the FM's blank check functionality on each and every sector.
- *
- * @param bank
- *
- * @return
+ *
+ * @param bank
+ *
+ * @return
*/
static int dsp5680xx_flash_erase_check(struct flash_bank *bank)
{
@@ -264,8 +242,7 @@ static int dsp5680xx_flash_erase_check(struct flash_bank *bank)
for (i = 0; i < HFM_SECTOR_COUNT; i++) {
if (bank->sectors[i].is_erased == -1) {
- retval =
- dsp5680xx_f_erase_check(bank->target, &erased, i);
+ retval = dsp5680xx_f_erase_check(bank->target, &erased, i);
if (retval != ERROR_OK) {
bank->sectors[i].is_erased = -1;
} else {
@@ -290,5 +267,4 @@ struct flash_driver dsp5680xx_flash = {
.auto_probe = dsp5680xx_probe,
.erase_check = dsp5680xx_flash_erase_check,
.protect_check = dsp5680xx_flash_protect_check,
- .info = dsp5680xx_flash_info
};