Skip to content

Commit 762c5d6

Browse files
tdk-opensourceijenkins-invn
authored andcommitted
Release 4.5.4.
1 parent 245b58c commit 762c5d6

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

invn/soniclib/ch_common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3010,7 +3010,7 @@ uint8_t ch_common_set_target_interrupt(ch_dev_t *dev_ptr, ch_tgt_int_filter_t tg
30103010
if (tgt_filter_mode == CH_TGT_INT_FILTER_ANY) {
30113011
dev_ptr->meas_queue.intconfig |= INTCONFIG_ON_TARGET;
30123012
} else if (tgt_filter_mode == CH_TGT_INT_FILTER_OFF) {
3013-
dev_ptr->meas_queue.intconfig &= !INTCONFIG_ON_TARGET;
3013+
dev_ptr->meas_queue.intconfig &= ~INTCONFIG_ON_TARGET;
30143014
} else {
30153015
ret_val = RET_ERR; // no Shasta target int counter support yet
30163016
}

invn/soniclib/ch_driver.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,15 +1072,17 @@ static uint8_t limit_rx_len(volatile measurement_t *meas, int rx_len, int eof_id
10721072
static uint8_t adjust_rx_len(volatile measurement_t *meas, int rx_len, int eof_idx) {
10731073
const int rx_samples = rx_len >> (11 - meas->odr);
10741074
const int new_rx_len = rx_samples << (11 - meas->odr);
1075-
int samples_to_cut = rx_len - new_rx_len;
1075+
int len_to_cut = rx_len - new_rx_len;
10761076

1077-
CH_LOG_DEBUG("rx_len=%d rx_samples=%d new_rx_len=%d samples_to_cut=%d", rx_len, rx_samples, new_rx_len,
1078-
samples_to_cut);
1077+
CH_LOG_DEBUG("rx_len=%d rx_samples=%d new_rx_len=%d len_to_cut=%d", rx_len, rx_samples, new_rx_len, len_to_cut);
10791078

1080-
if (meas->trx_inst[eof_idx - 1].length > (1 << (11 - meas->odr)) + samples_to_cut) {
1079+
if (len_to_cut == 0) {
1080+
// No modification needed for this rx instruction
1081+
return 0;
1082+
} else if (meas->trx_inst[eof_idx - 1].length >= (1 << (11 - meas->odr)) + len_to_cut) {
10811083
// make sure resulting rx instruction will have at least one RX sample left
10821084
// in it after the cut.
1083-
meas->trx_inst[eof_idx - 1].length -= samples_to_cut;
1085+
meas->trx_inst[eof_idx - 1].length -= len_to_cut;
10841086
return 0;
10851087
} else {
10861088
// return error otherwise

invn/soniclib/soniclib.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ extern "C" {
113113
/* SonicLib API/Driver version */
114114
#define SONICLIB_VER_MAJOR (4) /*!< SonicLib major version. */
115115
#define SONICLIB_VER_MINOR (5) /*!< SonicLib minor version. */
116-
#define SONICLIB_VER_REV (3) /*!< SonicLib revision. */
116+
#define SONICLIB_VER_REV (4) /*!< SonicLib revision. */
117117
#define SONICLIB_VER_SUFFIX "" /*!< SonicLib version suffix (contains pre-release info) */
118118

119119
/***** DO NOT MODIFY ANY VALUES BEYOND THIS POINT! *****/

0 commit comments

Comments
 (0)