/* The specification for SVF is available here:
* http://www.asset-intertech.com/support/svf.pdf
- * Below, this document is refered to as the "SVF spec".
+ * Below, this document is referred to as the "SVF spec".
*
* The specification for XSVF is available here:
* http://www.xilinx.com/support/documentation/application_notes/xapp503.pdf
- * Below, this document is refered to as the "XSVF spec".
+ * Below, this document is referred to as the "XSVF spec".
*/
#ifdef HAVE_CONFIG_H
#define SVF_MAX_BUFFER_SIZE_TO_COMMIT (1024 * 1024)
static uint8_t *svf_tdi_buffer, *svf_tdo_buffer, *svf_mask_buffer;
-static int svf_buffer_index, svf_buffer_size ;
+static int svf_buffer_index, svf_buffer_size;
static int svf_quiet;
static int svf_nil;
static int svf_ignore_error;
-/* Targetting particular tap */
+/* Targeting particular tap */
static int svf_tap_is_specified;
static int svf_set_padding(struct svf_xxr_para *para, int len, unsigned char tdi);
* DEBUG, INFO, ERROR, USER
*/
#define SVF_BUF_LOG(_lvl, _buf, _nbits, _desc) \
- svf_hexbuf_print(LOG_LVL_##_lvl , __FILE__, __LINE__, __func__, _buf, _nbits, _desc)
+ svf_hexbuf_print(LOG_LVL_##_lvl, __FILE__, __LINE__, __func__, _buf, _nbits, _desc)
static void svf_hexbuf_print(int dbg_lvl, const char *file, unsigned line,
const char *function, const uint8_t *buf,
static void svf_free_xxd_para(struct svf_xxr_para *para)
{
if (NULL != para) {
- if (para->tdi != NULL) {
- free(para->tdi);
- para->tdi = NULL;
- }
- if (para->tdo != NULL) {
- free(para->tdo);
- para->tdo = NULL;
- }
- if (para->mask != NULL) {
- free(para->mask);
- para->mask = NULL;
- }
- if (para->smask != NULL) {
- free(para->smask);
- para->smask = NULL;
- }
+ free(para->tdi);
+ para->tdi = NULL;
+
+ free(para->tdo);
+ para->tdo = NULL;
+
+ free(para->mask);
+ para->mask = NULL;
+
+ free(para->smask);
+ para->smask = NULL;
}
}
if (strcmp(CMD_ARGV[i], "-tap") == 0) {
tap = jtag_tap_by_string(CMD_ARGV[i+1]);
if (!tap) {
- command_print(CMD_CTX, "Tap: %s unknown", CMD_ARGV[i+1]);
+ command_print(CMD, "Tap: %s unknown", CMD_ARGV[i+1]);
return ERROR_FAIL;
}
i++;
svf_fd = fopen(CMD_ARGV[i], "r");
if (svf_fd == NULL) {
int err = errno;
- command_print(CMD_CTX, "open(\"%s\"): %s", CMD_ARGV[i], strerror(err));
+ command_print(CMD, "open(\"%s\"): %s", CMD_ARGV[i], strerror(err));
/* no need to free anything now */
return ERROR_COMMAND_SYNTAX_ERROR;
} else
time_measure_m = time_measure_s / 60;
time_measure_s %= 60;
if (time_measure_ms < 1000)
- command_print(CMD_CTX,
+ command_print(CMD,
"\r\nTime used: %dm%ds%" PRId64 "ms ",
time_measure_m,
time_measure_s,
svf_fd = 0;
/* free buffers */
- if (svf_command_buffer) {
- free(svf_command_buffer);
- svf_command_buffer = NULL;
- svf_command_buffer_size = 0;
- }
- if (svf_check_tdo_para) {
- free(svf_check_tdo_para);
- svf_check_tdo_para = NULL;
- svf_check_tdo_para_index = 0;
- }
- if (svf_tdi_buffer) {
- free(svf_tdi_buffer);
- svf_tdi_buffer = NULL;
- }
- if (svf_tdo_buffer) {
- free(svf_tdo_buffer);
- svf_tdo_buffer = NULL;
- }
- if (svf_mask_buffer) {
- free(svf_mask_buffer);
- svf_mask_buffer = NULL;
- }
+ free(svf_command_buffer);
+ svf_command_buffer = NULL;
+ svf_command_buffer_size = 0;
+
+ free(svf_check_tdo_para);
+ svf_check_tdo_para = NULL;
+ svf_check_tdo_para_index = 0;
+
+ free(svf_tdi_buffer);
+ svf_tdi_buffer = NULL;
+
+ free(svf_tdo_buffer);
+ svf_tdo_buffer = NULL;
+
+ free(svf_mask_buffer);
+ svf_mask_buffer = NULL;
+
svf_buffer_index = 0;
svf_buffer_size = 0;
svf_free_xxd_para(&svf_para.sir_para);
if (ERROR_OK == ret)
- command_print(CMD_CTX,
+ command_print(CMD,
"svf file programmed %s for %d commands with %d errors",
(svf_ignore_error > 1) ? "unsuccessfully" : "successfully",
command_num,
(svf_ignore_error > 1) ? (svf_ignore_error - 1) : 0);
else
- command_print(CMD_CTX, "svf file programmed failed");
+ command_print(CMD, "svf file programmed failed");
svf_ignore_error = 0;
return ret;
int new_byte_len = (new_bit_len + 7) >> 3;
if ((NULL == *arr) || (((orig_bit_len + 7) >> 3) < ((new_bit_len + 7) >> 3))) {
- if (*arr != NULL) {
- free(*arr);
- *arr = NULL;
- }
- *arr = malloc(new_byte_len);
+ free(*arr);
+ *arr = calloc(1, new_byte_len);
if (NULL == *arr) {
LOG_ERROR("not enough memory");
return ERROR_FAIL;
}
- memset(*arr, 0, new_byte_len);
}
return ERROR_OK;
}
/* check validity: we must have consumed everything */
if (str_len > 0 || (ch & ~((2 << ((bit_len - 1) % 4)) - 1)) != 0) {
- LOG_ERROR("value execeeds length");
+ LOG_ERROR("value exceeds length");
return ERROR_FAIL;
}
/* TODO: set jtag speed to */
if (svf_para.frequency > 0) {
command_run_linef(cmd_ctx,
- "adapter_khz %d",
+ "adapter speed %d",
(int)svf_para.frequency / 1000);
LOG_DEBUG("\tfrequency = %f", svf_para.frequency);
}
pbuffer_tmp = &xxr_para_tmp->smask;
xxr_para_tmp->data_mask |= XXR_SMASK;
} else {
- LOG_ERROR("unknow parameter: %s", argus[i]);
+ LOG_ERROR("unknown parameter: %s", argus[i]);
return ERROR_FAIL;
}
if (ERROR_OK !=
case PIOMAP:
LOG_ERROR("PIO and PIOMAP are not supported");
return ERROR_FAIL;
- break;
case RUNTEST:
/* RUNTEST [run_state] run_count run_clk [min_time SEC [MAXIMUM max_time
* SEC]] [ENDSTATE end_state] */
svf_para.trst_mode = i_tmp;
LOG_DEBUG("\ttrst_mode = %s", svf_trst_mode_name[svf_para.trst_mode]);
} else {
- LOG_ERROR("can not accpet TRST command if trst_mode is ABSENT");
+ LOG_ERROR("can not accept TRST command if trst_mode is ABSENT");
return ERROR_FAIL;
}
break;
default:
LOG_ERROR("invalid svf command: %s", argus[0]);
return ERROR_FAIL;
- break;
}
if (!svf_quiet) {
if (debug_level >= LOG_LVL_DEBUG) {
/* for convenient debugging, execute tap if possible */
- if ((svf_buffer_index > 0) && \
- (((command != STATE) && (command != RUNTEST)) || \
+ if ((svf_buffer_index > 0) &&
+ (((command != STATE) && (command != RUNTEST)) ||
((command == STATE) && (num_of_argu == 2)))) {
if (ERROR_OK != svf_execute_tap())
return ERROR_FAIL;
/* for fast executing, execute tap if necessary */
/* half of the buffer is for the next command */
if (((svf_buffer_index >= SVF_MAX_BUFFER_SIZE_TO_COMMIT) ||
- (svf_check_tdo_para_index >= SVF_CHECK_TDO_PARA_SIZE / 2)) && \
- (((command != STATE) && (command != RUNTEST)) || \
+ (svf_check_tdo_para_index >= SVF_CHECK_TDO_PARA_SIZE / 2)) &&
+ (((command != STATE) && (command != RUNTEST)) ||
((command == STATE) && (num_of_argu == 2))))
return svf_execute_tap();
}
.handler = handle_svf_command,
.mode = COMMAND_EXEC,
.help = "Runs a SVF file.",
- .usage = "svf [-tap device.tap] <file> [quiet] [nil] [progress] [ignore_error]",
+ .usage = "[-tap device.tap] <file> [quiet] [nil] [progress] [ignore_error]",
},
COMMAND_REGISTRATION_DONE
};
projects / fw / openocd / blobdiff