X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Favr32_jtag.c;h=6a4d4b3e7ca02bb443d869cb9bbdec5188fae9df;hp=b6b5e37b0eb6fa4626c7d294d7554d76aa66bd10;hb=a2e822834df52efef5e1bbcb91a6eb1afbf102db;hpb=c3d51bf0da7333de303adf86011913a4bca96e4d diff --git a/src/target/avr32_jtag.c b/src/target/avr32_jtag.c index b6b5e37b0e..6a4d4b3e7c 100644 --- a/src/target/avr32_jtag.c +++ b/src/target/avr32_jtag.c @@ -12,16 +12,14 @@ * 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 #include "config.h" #endif #include "target.h" -#include "helper/types.h" #include "jtag/jtag.h" #include "avr32_jtag.h" @@ -34,11 +32,10 @@ static int avr32_jtag_set_instr(struct avr32_jtag *jtag_info, int new_instr) if (tap == NULL) return ERROR_FAIL; - if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != (uint32_t)new_instr) - { + if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != (uint32_t)new_instr) { do { struct scan_field field; - uint8_t t[4]; + uint8_t t[4] = { 0 }; uint8_t ret[4]; field.num_bits = tap->ir_length; @@ -47,8 +44,7 @@ static int avr32_jtag_set_instr(struct avr32_jtag *jtag_info, int new_instr) field.in_value = ret; jtag_add_ir_scan(tap, &field, TAP_IDLE); - if (jtag_execute_queue() != ERROR_OK) - { + if (jtag_execute_queue() != ERROR_OK) { LOG_ERROR("%s: setting address failed", __func__); return ERROR_FAIL; } @@ -59,7 +55,7 @@ static int avr32_jtag_set_instr(struct avr32_jtag *jtag_info, int new_instr) return ERROR_OK; } -int avr32_jtag_nexus_set_address(struct avr32_jtag *jtag_info, +int avr32_jtag_nexus_set_address(struct avr32_jtag *jtag_info, uint32_t addr, int mode) { struct scan_field fields[2]; @@ -85,19 +81,18 @@ int avr32_jtag_nexus_set_address(struct avr32_jtag *jtag_info, fields[1].out_value = addr_buf; jtag_add_dr_scan(jtag_info->tap, 2, fields, TAP_IDLE); - if (jtag_execute_queue() != ERROR_OK) - { + if (jtag_execute_queue() != ERROR_OK) { LOG_ERROR("%s: setting address failed", __func__); return ERROR_FAIL; } busy = buf_get_u32(busy_buf, 6, 1); - } while(busy); + } while (busy); return ERROR_OK; } -int avr32_jtag_nexus_read_data(struct avr32_jtag *jtag_info, +int avr32_jtag_nexus_read_data(struct avr32_jtag *jtag_info, uint32_t *pdata) { @@ -121,8 +116,7 @@ int avr32_jtag_nexus_read_data(struct avr32_jtag *jtag_info, jtag_add_dr_scan(jtag_info->tap, 2, fields, TAP_IDLE); - if (jtag_execute_queue() != ERROR_OK) - { + if (jtag_execute_queue() != ERROR_OK) { LOG_ERROR("%s: reading data failed", __func__); return ERROR_FAIL; } @@ -135,8 +129,7 @@ int avr32_jtag_nexus_read_data(struct avr32_jtag *jtag_info, return ERROR_OK; } - -int avr32_jtag_nexus_write_data(struct avr32_jtag *jtag_info, +int avr32_jtag_nexus_write_data(struct avr32_jtag *jtag_info, uint32_t data) { @@ -163,8 +156,7 @@ int avr32_jtag_nexus_write_data(struct avr32_jtag *jtag_info, jtag_add_dr_scan(jtag_info->tap, 2, fields, TAP_IDLE); - if (jtag_execute_queue() != ERROR_OK) - { + if (jtag_execute_queue() != ERROR_OK) { LOG_ERROR("%s: reading data failed", __func__); return ERROR_FAIL; } @@ -176,27 +168,20 @@ int avr32_jtag_nexus_write_data(struct avr32_jtag *jtag_info, return ERROR_OK; } - - - int avr32_jtag_nexus_read(struct avr32_jtag *jtag_info, uint32_t addr, uint32_t *value) { avr32_jtag_set_instr(jtag_info, AVR32_INST_NEXUS_ACCESS); avr32_jtag_nexus_set_address(jtag_info, addr, MODE_READ); - avr32_jtag_nexus_read_data(jtag_info, value); - - return ERROR_OK; - + return avr32_jtag_nexus_read_data(jtag_info, value); } + int avr32_jtag_nexus_write(struct avr32_jtag *jtag_info, uint32_t addr, uint32_t value) { avr32_jtag_set_instr(jtag_info, AVR32_INST_NEXUS_ACCESS); avr32_jtag_nexus_set_address(jtag_info, addr, MODE_WRITE); - avr32_jtag_nexus_write_data(jtag_info, value); - - return ERROR_OK; + return avr32_jtag_nexus_write_data(jtag_info, value); } int avr32_jtag_mwa_set_address(struct avr32_jtag *jtag_info, int slave, @@ -228,18 +213,17 @@ int avr32_jtag_mwa_set_address(struct avr32_jtag *jtag_info, int slave, fields[1].out_value = slave_buf; jtag_add_dr_scan(jtag_info->tap, 2, fields, TAP_IDLE); - if (jtag_execute_queue() != ERROR_OK) - { + if (jtag_execute_queue() != ERROR_OK) { LOG_ERROR("%s: setting address failed", __func__); return ERROR_FAIL; } busy = buf_get_u32(busy_buf, 1, 1); - } while(busy); + } while (busy); return ERROR_OK; } -int avr32_jtag_mwa_read_data(struct avr32_jtag *jtag_info, +int avr32_jtag_mwa_read_data(struct avr32_jtag *jtag_info, uint32_t *pdata) { @@ -263,8 +247,7 @@ int avr32_jtag_mwa_read_data(struct avr32_jtag *jtag_info, jtag_add_dr_scan(jtag_info->tap, 2, fields, TAP_IDLE); - if (jtag_execute_queue() != ERROR_OK) - { + if (jtag_execute_queue() != ERROR_OK) { LOG_ERROR("%s: reading data failed", __func__); return ERROR_FAIL; } @@ -277,7 +260,7 @@ int avr32_jtag_mwa_read_data(struct avr32_jtag *jtag_info, return ERROR_OK; } -int avr32_jtag_mwa_write_data(struct avr32_jtag *jtag_info, +int avr32_jtag_mwa_write_data(struct avr32_jtag *jtag_info, uint32_t data) { @@ -304,8 +287,7 @@ int avr32_jtag_mwa_write_data(struct avr32_jtag *jtag_info, jtag_add_dr_scan(jtag_info->tap, 2, fields, TAP_IDLE); - if (jtag_execute_queue() != ERROR_OK) - { + if (jtag_execute_queue() != ERROR_OK) { LOG_ERROR("%s: reading data failed", __func__); return ERROR_FAIL; } @@ -316,8 +298,6 @@ int avr32_jtag_mwa_write_data(struct avr32_jtag *jtag_info, return ERROR_OK; } - - int avr32_jtag_mwa_read(struct avr32_jtag *jtag_info, int slave, uint32_t addr, uint32_t *value) {