int result, ret;
ret = f(dev, ep, bytes + count, size - count, timeout, &result);
- if (ERROR_OK == ret)
+ if (ret == ERROR_OK)
count += result;
- else if ((ERROR_TIMEOUT_REACHED != ret) || !--tries)
+ else if ((ret != ERROR_TIMEOUT_REACHED) || !--tries)
return ret;
}
if (usb_out_packets_buffer_length == 0)
return 0;
- if (AICE_COMMAND_MODE_PACK == aice_command_mode) {
+ if (aice_command_mode == AICE_COMMAND_MODE_PACK) {
LOG_DEBUG("Flush usb packets (AICE_COMMAND_MODE_PACK)");
if (aice_usb_write(usb_out_packets_buffer,
usb_out_packets_buffer_length = 0;
usb_in_packets_buffer_length = 0;
- } else if (AICE_COMMAND_MODE_BATCH == aice_command_mode) {
+ } else if (aice_command_mode == AICE_COMMAND_MODE_BATCH) {
LOG_DEBUG("Flush usb packets (AICE_COMMAND_MODE_BATCH)");
/* use BATCH_BUFFER_WRITE to fill command-batch-buffer */
{
uint32_t max_packet_size = AICE_OUT_PACKETS_BUFFER_SIZE;
- if (AICE_COMMAND_MODE_PACK == aice_command_mode) {
+ if (aice_command_mode == AICE_COMMAND_MODE_PACK) {
max_packet_size = AICE_OUT_PACK_COMMAND_SIZE;
- } else if (AICE_COMMAND_MODE_BATCH == aice_command_mode) {
+ } else if (aice_command_mode == AICE_COMMAND_MODE_BATCH) {
max_packet_size = AICE_OUT_BATCH_COMMAND_SIZE;
} else {
/* AICE_COMMAND_MODE_NORMAL */
{
int retry_times = 0;
- if ((AICE_COMMAND_MODE_PACK == aice_command_mode) ||
- (AICE_COMMAND_MODE_BATCH == aice_command_mode))
+ if ((aice_command_mode == AICE_COMMAND_MODE_PACK) ||
+ (aice_command_mode == AICE_COMMAND_MODE_BATCH))
aice_usb_packet_flush();
do {
/** TODO: modify receive length */
int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHA);
- if (AICE_FORMAT_DTHA != result) {
+ if (result != AICE_FORMAT_DTHA) {
LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
AICE_FORMAT_DTHA, result);
return ERROR_FAIL;
int aice_read_ctrl(uint32_t address, uint32_t *data)
{
- if ((AICE_COMMAND_MODE_PACK == aice_command_mode) ||
- (AICE_COMMAND_MODE_BATCH == aice_command_mode))
+ if ((aice_command_mode == AICE_COMMAND_MODE_PACK) ||
+ (aice_command_mode == AICE_COMMAND_MODE_BATCH))
aice_usb_packet_flush();
aice_pack_htda(AICE_CMD_READ_CTRL, 0, address);
LOG_DEBUG("READ_CTRL, address: 0x%" PRIx32, address);
int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHA);
- if (AICE_FORMAT_DTHA != result) {
+ if (result != AICE_FORMAT_DTHA) {
LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
AICE_FORMAT_DTHA, result);
return ERROR_FAIL;
int aice_write_ctrl(uint32_t address, uint32_t data)
{
- if (AICE_COMMAND_MODE_PACK == aice_command_mode) {
+ if (aice_command_mode == AICE_COMMAND_MODE_PACK) {
aice_usb_packet_flush();
- } else if (AICE_COMMAND_MODE_BATCH == aice_command_mode) {
+ } else if (aice_command_mode == AICE_COMMAND_MODE_BATCH) {
aice_pack_htdc(AICE_CMD_WRITE_CTRL, 0, address, data, AICE_LITTLE_ENDIAN);
return aice_usb_packet_append(usb_out_buffer, AICE_FORMAT_HTDC,
AICE_FORMAT_DTHB);
LOG_DEBUG("WRITE_CTRL, address: 0x%" PRIx32 ", data: 0x%" PRIx32, address, data);
int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHB);
- if (AICE_FORMAT_DTHB != result) {
+ if (result != AICE_FORMAT_DTHB) {
LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
AICE_FORMAT_DTHB, result);
return ERROR_FAIL;
{
int retry_times = 0;
- if ((AICE_COMMAND_MODE_PACK == aice_command_mode) ||
- (AICE_COMMAND_MODE_BATCH == aice_command_mode))
+ if ((aice_command_mode == AICE_COMMAND_MODE_PACK) ||
+ (aice_command_mode == AICE_COMMAND_MODE_BATCH))
aice_usb_packet_flush();
do {
LOG_DEBUG("READ_DTR, COREID: %" PRIu8, target_id);
int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMA);
- if (AICE_FORMAT_DTHMA != result) {
+ if (result != AICE_FORMAT_DTHMA) {
LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
AICE_FORMAT_DTHMA, result);
return ERROR_FAIL;
{
int retry_times = 0;
- if (AICE_COMMAND_MODE_PACK == aice_command_mode) {
+ if (aice_command_mode == AICE_COMMAND_MODE_PACK) {
aice_usb_packet_flush();
- } else if (AICE_COMMAND_MODE_BATCH == aice_command_mode) {
+ } else if (aice_command_mode == AICE_COMMAND_MODE_BATCH) {
aice_pack_htdma(AICE_CMD_READ_DTR_TO_BUFFER, target_id, 0, buffer_idx);
return aice_usb_packet_append(usb_out_buffer, AICE_FORMAT_HTDMA,
AICE_FORMAT_DTHMB);
LOG_DEBUG("READ_DTR_TO_BUFFER, COREID: %" PRIu8, target_id);
int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
- if (AICE_FORMAT_DTHMB != result) {
+ if (result != AICE_FORMAT_DTHMB) {
LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)", AICE_FORMAT_DTHMB, result);
return ERROR_FAIL;
}
{
int retry_times = 0;
- if (AICE_COMMAND_MODE_PACK == aice_command_mode) {
+ if (aice_command_mode == AICE_COMMAND_MODE_PACK) {
aice_usb_packet_flush();
- } else if (AICE_COMMAND_MODE_BATCH == aice_command_mode) {
+ } else if (aice_command_mode == AICE_COMMAND_MODE_BATCH) {
aice_pack_htdmc(AICE_CMD_T_WRITE_DTR, target_id, 0, 0, data, AICE_LITTLE_ENDIAN);
return aice_usb_packet_append(usb_out_buffer, AICE_FORMAT_HTDMC,
AICE_FORMAT_DTHMB);
LOG_DEBUG("WRITE_DTR, COREID: %" PRIu8 ", data: 0x%" PRIx32, target_id, data);
int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
- if (AICE_FORMAT_DTHMB != result) {
+ if (result != AICE_FORMAT_DTHMB) {
LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)", AICE_FORMAT_DTHMB, result);
return ERROR_FAIL;
}
{
int retry_times = 0;
- if (AICE_COMMAND_MODE_PACK == aice_command_mode) {
+ if (aice_command_mode == AICE_COMMAND_MODE_PACK) {
aice_usb_packet_flush();
- } else if (AICE_COMMAND_MODE_BATCH == aice_command_mode) {
+ } else if (aice_command_mode == AICE_COMMAND_MODE_BATCH) {
aice_pack_htdma(AICE_CMD_WRITE_DTR_FROM_BUFFER, target_id, 0, buffer_idx);
return aice_usb_packet_append(usb_out_buffer, AICE_FORMAT_HTDMA,
AICE_FORMAT_DTHMB);
LOG_DEBUG("WRITE_DTR_FROM_BUFFER, COREID: %" PRIu8 "", target_id);
int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
- if (AICE_FORMAT_DTHMB != result) {
+ if (result != AICE_FORMAT_DTHMB) {
LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)", AICE_FORMAT_DTHMB, result);
return ERROR_FAIL;
}
{
int retry_times = 0;
- if ((AICE_COMMAND_MODE_PACK == aice_command_mode) ||
- (AICE_COMMAND_MODE_BATCH == aice_command_mode))
+ if ((aice_command_mode == AICE_COMMAND_MODE_PACK) ||
+ (aice_command_mode == AICE_COMMAND_MODE_BATCH))
aice_usb_packet_flush();
do {
LOG_DEBUG("READ_MISC, COREID: %" PRIu8 ", address: 0x%" PRIx32, target_id, address);
int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMA);
- if (AICE_FORMAT_DTHMA != result) {
+ if (result != AICE_FORMAT_DTHMA) {
LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
AICE_FORMAT_DTHMA, result);
return ERROR_AICE_DISCONNECT;
{
int retry_times = 0;
- if (AICE_COMMAND_MODE_PACK == aice_command_mode) {
+ if (aice_command_mode == AICE_COMMAND_MODE_PACK) {
aice_usb_packet_flush();
- } else if (AICE_COMMAND_MODE_BATCH == aice_command_mode) {
+ } else if (aice_command_mode == AICE_COMMAND_MODE_BATCH) {
aice_pack_htdmc(AICE_CMD_T_WRITE_MISC, target_id, 0, address, data,
AICE_LITTLE_ENDIAN);
return aice_usb_packet_append(usb_out_buffer, AICE_FORMAT_HTDMC,
target_id, address, data);
int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
- if (AICE_FORMAT_DTHMB != result) {
+ if (result != AICE_FORMAT_DTHMB) {
LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
AICE_FORMAT_DTHMB, result);
return ERROR_FAIL;
{
int retry_times = 0;
- if ((AICE_COMMAND_MODE_PACK == aice_command_mode) ||
- (AICE_COMMAND_MODE_BATCH == aice_command_mode))
+ if ((aice_command_mode == AICE_COMMAND_MODE_PACK) ||
+ (aice_command_mode == AICE_COMMAND_MODE_BATCH))
aice_usb_packet_flush();
do {
LOG_DEBUG("READ_EDMSR, COREID: %" PRIu8 ", address: 0x%" PRIx32, target_id, address);
int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMA);
- if (AICE_FORMAT_DTHMA != result) {
+ if (result != AICE_FORMAT_DTHMA) {
LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
AICE_FORMAT_DTHMA, result);
return ERROR_FAIL;
{
int retry_times = 0;
- if (AICE_COMMAND_MODE_PACK == aice_command_mode) {
+ if (aice_command_mode == AICE_COMMAND_MODE_PACK) {
aice_usb_packet_flush();
- } else if (AICE_COMMAND_MODE_BATCH == aice_command_mode) {
+ } else if (aice_command_mode == AICE_COMMAND_MODE_BATCH) {
aice_pack_htdmc(AICE_CMD_T_WRITE_EDMSR, target_id, 0, address, data,
AICE_LITTLE_ENDIAN);
return aice_usb_packet_append(usb_out_buffer, AICE_FORMAT_HTDMC,
target_id, address, data);
int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
- if (AICE_FORMAT_DTHMB != result) {
+ if (result != AICE_FORMAT_DTHMB) {
LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
AICE_FORMAT_DTHMB, result);
return ERROR_FAIL;
memcpy(big_endian_word, word, sizeof(big_endian_word));
aice_switch_to_big_endian(big_endian_word, num_of_words);
- if (AICE_COMMAND_MODE_PACK == aice_command_mode) {
+ if (aice_command_mode == AICE_COMMAND_MODE_PACK) {
aice_usb_packet_flush();
- } else if (AICE_COMMAND_MODE_BATCH == aice_command_mode) {
+ } else if (aice_command_mode == AICE_COMMAND_MODE_BATCH) {
aice_pack_htdmc_multiple_data(AICE_CMD_T_WRITE_DIM, target_id,
num_of_words - 1, 0, big_endian_word, num_of_words,
AICE_LITTLE_ENDIAN);
big_endian_word[3]);
int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
- if (AICE_FORMAT_DTHMB != result) {
+ if (result != AICE_FORMAT_DTHMB) {
LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)", AICE_FORMAT_DTHMB, result);
return ERROR_FAIL;
}
{
int retry_times = 0;
- if (AICE_COMMAND_MODE_PACK == aice_command_mode) {
+ if (aice_command_mode == AICE_COMMAND_MODE_PACK) {
aice_usb_packet_flush();
- } else if (AICE_COMMAND_MODE_BATCH == aice_command_mode) {
+ } else if (aice_command_mode == AICE_COMMAND_MODE_BATCH) {
aice_pack_htdmc(AICE_CMD_T_EXECUTE, target_id, 0, 0, 0, AICE_LITTLE_ENDIAN);
return aice_usb_packet_append(usb_out_buffer,
AICE_FORMAT_HTDMC,
LOG_DEBUG("EXECUTE, COREID: %" PRIu8 "", target_id);
int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
- if (AICE_FORMAT_DTHMB != result) {
+ if (result != AICE_FORMAT_DTHMB) {
LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
AICE_FORMAT_DTHMB, result);
return ERROR_FAIL;
address,
data);
- if ((AICE_COMMAND_MODE_PACK == aice_command_mode) ||
- (AICE_COMMAND_MODE_BATCH == aice_command_mode)) {
+ if ((aice_command_mode == AICE_COMMAND_MODE_PACK) ||
+ (aice_command_mode == AICE_COMMAND_MODE_BATCH)) {
aice_pack_htdmd(AICE_CMD_T_WRITE_MEM_B, target_id, 0, address,
data & 0x000000FF, data_endian);
return aice_usb_packet_append(usb_out_buffer, AICE_FORMAT_HTDMD,
aice_usb_write(usb_out_buffer, AICE_FORMAT_HTDMD);
int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
- if (AICE_FORMAT_DTHMB != result) {
+ if (result != AICE_FORMAT_DTHMB) {
LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)", AICE_FORMAT_DTHMB, result);
return ERROR_FAIL;
}
address,
data);
- if ((AICE_COMMAND_MODE_PACK == aice_command_mode) ||
- (AICE_COMMAND_MODE_BATCH == aice_command_mode)) {
+ if ((aice_command_mode == AICE_COMMAND_MODE_PACK) ||
+ (aice_command_mode == AICE_COMMAND_MODE_BATCH)) {
aice_pack_htdmd(AICE_CMD_T_WRITE_MEM_H, target_id, 0,
(address >> 1) & 0x7FFFFFFF, data & 0x0000FFFF, data_endian);
return aice_usb_packet_append(usb_out_buffer, AICE_FORMAT_HTDMD,
aice_usb_write(usb_out_buffer, AICE_FORMAT_HTDMD);
int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
- if (AICE_FORMAT_DTHMB != result) {
+ if (result != AICE_FORMAT_DTHMB) {
LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
AICE_FORMAT_DTHMB, result);
return ERROR_FAIL;
address,
data);
- if ((AICE_COMMAND_MODE_PACK == aice_command_mode) ||
- (AICE_COMMAND_MODE_BATCH == aice_command_mode)) {
+ if ((aice_command_mode == AICE_COMMAND_MODE_PACK) ||
+ (aice_command_mode == AICE_COMMAND_MODE_BATCH)) {
aice_pack_htdmd(AICE_CMD_T_WRITE_MEM, target_id, 0,
(address >> 2) & 0x3FFFFFFF, data, data_endian);
return aice_usb_packet_append(usb_out_buffer, AICE_FORMAT_HTDMD,
aice_usb_write(usb_out_buffer, AICE_FORMAT_HTDMD);
int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
- if (AICE_FORMAT_DTHMB != result) {
+ if (result != AICE_FORMAT_DTHMB) {
LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
AICE_FORMAT_DTHMB, result);
return ERROR_FAIL;
{
int retry_times = 0;
- if ((AICE_COMMAND_MODE_PACK == aice_command_mode) ||
- (AICE_COMMAND_MODE_BATCH == aice_command_mode))
+ if ((aice_command_mode == AICE_COMMAND_MODE_PACK) ||
+ (aice_command_mode == AICE_COMMAND_MODE_BATCH))
aice_usb_packet_flush();
do {
{
int retry_times = 0;
- if (AICE_COMMAND_MODE_PACK == aice_command_mode) {
+ if (aice_command_mode == AICE_COMMAND_MODE_PACK) {
aice_usb_packet_flush();
- } else if (AICE_COMMAND_MODE_BATCH == aice_command_mode) {
+ } else if (aice_command_mode == AICE_COMMAND_MODE_BATCH) {
aice_pack_htdmd_multiple_data(AICE_CMD_T_FASTWRITE_MEM, target_id,
num_of_words - 1, 0, word, data_endian);
return aice_usb_packet_append(usb_out_buffer,
target_id, num_of_words);
int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
- if (AICE_FORMAT_DTHMB != result) {
+ if (result != AICE_FORMAT_DTHMB) {
LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
AICE_FORMAT_DTHMB, result);
return ERROR_FAIL;
{
int retry_times = 0;
- if ((AICE_COMMAND_MODE_PACK == aice_command_mode) ||
- (AICE_COMMAND_MODE_BATCH == aice_command_mode))
+ if ((aice_command_mode == AICE_COMMAND_MODE_PACK) ||
+ (aice_command_mode == AICE_COMMAND_MODE_BATCH))
aice_usb_packet_flush();
do {
LOG_DEBUG("READ_MEM_B, COREID: %" PRIu8 "", target_id);
int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMA);
- if (AICE_FORMAT_DTHMA != result) {
+ if (result != AICE_FORMAT_DTHMA) {
LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
AICE_FORMAT_DTHMA, result);
return ERROR_FAIL;
{
int retry_times = 0;
- if ((AICE_COMMAND_MODE_PACK == aice_command_mode) ||
- (AICE_COMMAND_MODE_BATCH == aice_command_mode))
+ if ((aice_command_mode == AICE_COMMAND_MODE_PACK) ||
+ (aice_command_mode == AICE_COMMAND_MODE_BATCH))
aice_usb_packet_flush();
do {
LOG_DEBUG("READ_MEM_H, CORE_ID: %" PRIu8 "", target_id);
int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMA);
- if (AICE_FORMAT_DTHMA != result) {
+ if (result != AICE_FORMAT_DTHMA) {
LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
AICE_FORMAT_DTHMA, result);
return ERROR_FAIL;
{
int retry_times = 0;
- if ((AICE_COMMAND_MODE_PACK == aice_command_mode) ||
- (AICE_COMMAND_MODE_BATCH == aice_command_mode))
+ if ((aice_command_mode == AICE_COMMAND_MODE_PACK) ||
+ (aice_command_mode == AICE_COMMAND_MODE_BATCH))
aice_usb_packet_flush();
do {
LOG_DEBUG("READ_MEM, COREID: %" PRIu8 "", target_id);
int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMA);
- if (AICE_FORMAT_DTHMA != result) {
+ if (result != AICE_FORMAT_DTHMA) {
LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
AICE_FORMAT_DTHMA, result);
return ERROR_FAIL;
LOG_DEBUG("BATCH_BUFFER_WRITE, # of DATA %08" PRIx32, num_of_words);
int result = aice_usb_read(usb_in_buffer, AICE_FORMAT_DTHMB);
- if (AICE_FORMAT_DTHMB != result) {
+ if (result != AICE_FORMAT_DTHMB) {
LOG_ERROR("aice_usb_read failed (requested=%d, result=%d)",
AICE_FORMAT_DTHMB, result);
return ERROR_FAIL;
instructions[3] = BEQ_MINUS_12;
}
} else if (NDS32_REG_TYPE_FPU == nds32_reg_type(num)) { /* fpu registers */
- if (FPCSR == num) {
+ if (num == FPCSR) {
instructions[0] = FMFCSR;
instructions[1] = MTSR_DTR(0);
instructions[2] = DSB;
instructions[3] = BEQ_MINUS_12;
- } else if (FPCFG == num) {
+ } else if (num == FPCFG) {
instructions[0] = FMFCFG;
instructions[1] = MTSR_DTR(0);
instructions[2] = DSB;
instructions[3] = BEQ_MINUS_12;
}
} else if (NDS32_REG_TYPE_FPU == nds32_reg_type(num)) { /* fpu registers */
- if (FPCSR == num) {
+ if (num == FPCSR) {
instructions[0] = MFSR_DTR(0);
instructions[1] = FMTCSR;
instructions[2] = DSB;
instructions[3] = BEQ_MINUS_12;
- } else if (FPCFG == num) {
+ } else if (num == FPCFG) {
/* FPCFG is readonly */
} else {
if (FS0 <= num && num <= FS31) { /* single precision */
if (!timeout)
break;
}
- if (ERROR_OK != retval)
+ if (retval != ERROR_OK)
return ERROR_FAIL;
#endif
int retval;
retval = aice_scan_chain(idcode, num_of_idcode);
- if (ERROR_OK == retval) {
+ if (retval == ERROR_OK) {
for (int i = 0; i < *num_of_idcode; i++) {
aice_core_init(i);
aice_edm_init(i);
int result = aice_read_misc(coreid, NDS_EDM_MISC_DBGER, &dbger_value);
- if (ERROR_AICE_TIMEOUT == result) {
+ if (result == ERROR_AICE_TIMEOUT) {
if (aice_read_ctrl(AICE_READ_CTRL_GET_ICE_STATE, &ice_state) != ERROR_OK) {
LOG_ERROR("<-- AICE ERROR! AICE is unplugged. -->");
return ERROR_FAIL;
} else {
return ERROR_FAIL;
}
- } else if (ERROR_AICE_DISCONNECT == result) {
+ } else if (result == ERROR_AICE_DISCONNECT) {
LOG_ERROR("<-- AICE ERROR! AICE is unplugged. -->");
return ERROR_FAIL;
}
static int aice_usb_assert_srst(uint32_t coreid, enum aice_srst_type_s srst)
{
- if ((AICE_SRST != srst) && (AICE_RESET_HOLD != srst))
+ if ((srst != AICE_SRST) && (srst != AICE_RESET_HOLD))
return ERROR_FAIL;
/* clear DBGER */
return ERROR_FAIL;
int result = ERROR_OK;
- if (AICE_SRST == srst)
+ if (srst == AICE_SRST)
result = aice_issue_srst(coreid);
else {
if (1 == total_num_of_core)
if (aice_usb_state(coreid, &state) != ERROR_OK)
return ERROR_FAIL;
- if (AICE_TARGET_HALTED == state)
+ if (state == AICE_TARGET_HALTED)
break;
int64_t then = 0;
static int aice_usb_read_debug_reg(uint32_t coreid, uint32_t addr, uint32_t *val)
{
if (AICE_TARGET_HALTED == core_info[coreid].core_state) {
- if (NDS_EDM_SR_EDMSW == addr) {
+ if (addr == NDS_EDM_SR_EDMSW) {
*val = core_info[coreid].edmsw_backup;
- } else if (NDS_EDM_SR_EDM_DTR == addr) {
+ } else if (addr == NDS_EDM_SR_EDM_DTR) {
if (core_info[coreid].target_dtr_valid) {
/* if EDM_DTR has read out, clear it. */
*val = core_info[coreid].target_dtr_backup;
static int aice_usb_write_debug_reg(uint32_t coreid, uint32_t addr, const uint32_t val)
{
if (AICE_TARGET_HALTED == core_info[coreid].core_state) {
- if (NDS_EDM_SR_EDM_DTR == addr) {
+ if (addr == NDS_EDM_SR_EDM_DTR) {
core_info[coreid].host_dtr_backup = val;
core_info[coreid].edmsw_backup |= 0x2;
core_info[coreid].host_dtr_valid = true;
/* flush usb_packets_buffer as users change mode */
retval = aice_usb_packet_flush();
- if (AICE_COMMAND_MODE_BATCH == command_mode) {
+ if (command_mode == AICE_COMMAND_MODE_BATCH) {
/* reset batch buffer */
aice_command_mode = AICE_COMMAND_MODE_NORMAL;
retval = aice_write_ctrl(AICE_WRITE_CTRL_BATCH_CMD_BUF0_CTRL, 0x40000);