X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fdsp5680xx.c;h=a50f2cd4746b7b95169a60e296ee1437f77ae01a;hp=f82fa63dc35279fa04835b4de6e5fa5e73d70610;hb=7a3eec2b4d9dbb9533acfb271dbe91afa0727c8e;hpb=4315142ea0d7035fe117b9e344beaf98c91ee35c diff --git a/src/target/dsp5680xx.c b/src/target/dsp5680xx.c index f82fa63dc3..a50f2cd474 100644 --- a/src/target/dsp5680xx.c +++ b/src/target/dsp5680xx.c @@ -16,9 +16,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., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifdef HAVE_CONFIG_H @@ -1003,17 +1001,17 @@ static int dsp5680xx_poll(struct target *target) __func__); target->state = TARGET_UNKNOWN; return ERROR_TARGET_FAILURE; - }; + } if (target->state == TARGET_UNKNOWN) { LOG_ERROR("%s: Target status invalid - communication failure", __func__); return ERROR_TARGET_FAILURE; - }; + } return ERROR_OK; } static int dsp5680xx_resume(struct target *target, int current, - uint32_t address, int hb, int d) + target_addr_t address, int hb, int d) { if (target->state == TARGET_RUNNING) { LOG_USER("Target already running."); @@ -1125,7 +1123,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 +1168,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, target_addr_t a, uint32_t size, + uint32_t count, uint8_t *buf) { struct target *target = t; @@ -1307,7 +1305,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 +1362,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 +1399,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; @@ -1425,7 +1423,7 @@ static int dsp5680xx_write_32(struct target *t, uint32_t a, uint32_t c, * * @return */ -static int dsp5680xx_write(struct target *t, uint32_t a, uint32_t s, uint32_t c, +static int dsp5680xx_write(struct target *t, target_addr_t a, uint32_t s, uint32_t c, const uint8_t *b) { /* TODO Cannot write 32bit to odd address, will write 0x12345678 as 0x5678 0x0012 */ @@ -1470,7 +1468,7 @@ static int dsp5680xx_write(struct target *t, uint32_t a, uint32_t s, uint32_t c, return retval; } -static int dsp5680xx_write_buffer(struct target *t, uint32_t a, uint32_t size, +static int dsp5680xx_write_buffer(struct target *t, target_addr_t a, uint32_t size, const uint8_t *b) { check_halt_and_debug(t); @@ -1487,7 +1485,7 @@ static int dsp5680xx_write_buffer(struct target *t, uint32_t a, uint32_t size, * * @return */ -static int dsp5680xx_read_buffer(struct target *t, uint32_t a, uint32_t size, +static int dsp5680xx_read_buffer(struct target *t, target_addr_t a, uint32_t size, uint8_t *buf) { check_halt_and_debug(t); @@ -1507,7 +1505,7 @@ static int dsp5680xx_read_buffer(struct target *t, uint32_t a, uint32_t size, * * @return */ -static int dsp5680xx_checksum_memory(struct target *t, uint32_t a, uint32_t s, +static int dsp5680xx_checksum_memory(struct target *t, target_addr_t a, uint32_t s, uint32_t *checksum) { return ERROR_FAIL; @@ -1524,7 +1522,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; @@ -1983,14 +1981,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; @@ -2264,7 +2262,7 @@ int dsp5680xx_f_lock(struct target *target) return retval; } -static int dsp5680xx_step(struct target *target, int current, uint32_t address, +static int dsp5680xx_step(struct target *target, int current, target_addr_t address, int handle_breakpoints) { err_check(ERROR_FAIL, DSP5680XX_ERROR_NOT_IMPLEMENTED_STEP, @@ -2278,8 +2276,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,