flash/nor/stm32f2x: add new revisions of STM32F4x parts

[fw/openocd] / src / target / dsp5680xx.c

diff --git a/src/target/dsp5680xx.c b/src/target/dsp5680xx.c
index ae160c4f3accafa5f0b4b22da4a910518d4be548..8a58cab473e17ec2c89d94bcab7771cf7d845138 100644 (file)
--- a/src/target/dsp5680xx.c
+++ b/src/target/dsp5680xx.c
@@ -18,7 +18,7 @@
  *  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.             *
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -1125,7 +1125,7 @@ static int dsp5680xx_read_16_single(struct target *t, uint32_t a,
        /* at this point the data i want is at the reg eonce can read */
        retval = core_rx_lower_data(target, data_read);
        err_check_propagate(retval);
-       LOG_DEBUG("%s:Data read from 0x%06X: 0x%02X%02X", __func__, address,
+       LOG_DEBUG("%s:Data read from 0x%06" PRIX32 ": 0x%02X%02X", __func__, address,
                  data_read[1], data_read[0]);
        return retval;
 }
@@ -1170,8 +1170,8 @@ static int dsp5680xx_read_32_single(struct target *t, uint32_t a,
        return retval;
 }
 
-static int dsp5680xx_read(struct target *t, uint32_t a, unsigned size,
-                         unsigned count, uint8_t *buf)
+static int dsp5680xx_read(struct target *t, uint32_t a, uint32_t size,
+                         uint32_t count, uint8_t *buf)
 {
        struct target *target = t;
 
@@ -1307,7 +1307,7 @@ static int dsp5680xx_write_8(struct target *t, uint32_t a, uint32_t c,
                        dsp5680xx_write_16_single(target, address + iter, data_16,
                                                  pmem);
                if (retval != ERROR_OK) {
-                       LOG_ERROR("%s: Could not write to p:0x%04X", __func__,
+                       LOG_ERROR("%s: Could not write to p:0x%04" PRIX32, __func__,
                                  address);
                        dsp5680xx_context.flush = 1;
                        return retval;
@@ -1364,7 +1364,7 @@ static int dsp5680xx_write_16(struct target *t, uint32_t a, uint32_t c,
                        dsp5680xx_write_16_single(target, address + iter,
                                                  data[iter], pmem);
                if (retval != ERROR_OK) {
-                       LOG_ERROR("%s: Could not write to p:0x%04X", __func__,
+                       LOG_ERROR("%s: Could not write to p:0x%04" PRIX32, __func__,
                                  address);
                        dsp5680xx_context.flush = 1;
                        return retval;
@@ -1401,7 +1401,7 @@ static int dsp5680xx_write_32(struct target *t, uint32_t a, uint32_t c,
                        dsp5680xx_write_32_single(target, address + (iter << 1),
                                                  data[iter], pmem);
                if (retval != ERROR_OK) {
-                       LOG_ERROR("%s: Could not write to p:0x%04X", __func__,
+                       LOG_ERROR("%s: Could not write to p:0x%04" PRIX32, __func__,
                                  address);
                        dsp5680xx_context.flush = 1;
                        return retval;
@@ -1470,13 +1470,6 @@ static int dsp5680xx_write(struct target *t, uint32_t a, uint32_t s, uint32_t c,
        return retval;
 }
 
-static int dsp5680xx_bulk_write_memory(struct target *t, uint32_t a,
-                                      uint32_t al, const uint8_t *b)
-{
-       LOG_ERROR("Not implemented yet.");
-       return ERROR_FAIL;
-}
-
 static int dsp5680xx_write_buffer(struct target *t, uint32_t a, uint32_t size,
                                  const uint8_t *b)
 {
@@ -1531,7 +1524,7 @@ static int dsp5680xx_checksum_memory(struct target *t, uint32_t a, uint32_t s,
  *
  * @return
  */
-static int perl_crc(uint8_t *buff8, uint32_t word_count)
+static int perl_crc(const uint8_t *buff8, uint32_t word_count)
 {
        uint16_t checksum = 0xffff;
 
@@ -1990,14 +1983,14 @@ const uint16_t pgm_write_pflash[] = { 0x8A46, 0x0013, 0x807D, 0xE700,
 
 const uint32_t pgm_write_pflash_length = 31;
 
-int dsp5680xx_f_wr(struct target *t, uint8_t *b, uint32_t a, uint32_t count,
+int dsp5680xx_f_wr(struct target *t, const uint8_t *b, uint32_t a, uint32_t count,
                   int is_flash_lock)
 {
        struct target *target = t;
 
        uint32_t address = a;
 
-       uint8_t *buffer = b;
+       const uint8_t *buffer = b;
 
        int retval = ERROR_OK;
 
@@ -2285,8 +2278,6 @@ struct target_type dsp5680xx_target = {
        .poll = dsp5680xx_poll,
        .arch_state = dsp5680xx_arch_state,
 
-       .target_request_data = NULL,
-
        .halt = dsp5680xx_halt,
        .resume = dsp5680xx_resume,
        .step = dsp5680xx_step,
@@ -2300,7 +2291,6 @@ struct target_type dsp5680xx_target = {
 
        .read_memory = dsp5680xx_read,
        .write_memory = dsp5680xx_write,
-       .bulk_write_memory = dsp5680xx_bulk_write_memory,
 
        .checksum_memory = dsp5680xx_checksum_memory,