Merge branch 'next' of github.com:softwareradiosystems/srsLTE into next

master
Ismael Gomez 7 years ago
commit c521739b51

@ -70,6 +70,7 @@ public:
level = LOG_LEVEL_NONE; level = LOG_LEVEL_NONE;
hex_limit = 0; hex_limit = 0;
show_layer_en = true; show_layer_en = true;
level_text_short = true;
} }
log(std::string service_name_) { log(std::string service_name_) {
@ -78,6 +79,7 @@ public:
level = LOG_LEVEL_NONE; level = LOG_LEVEL_NONE;
hex_limit = 0; hex_limit = 0;
show_layer_en = true; show_layer_en = true;
level_text_short = true;
} }
// This function shall be called at the start of every tti for printing tti // This function shall be called at the start of every tti for printing tti

@ -43,14 +43,18 @@ log_filter::log_filter()
} }
log_filter::log_filter(std::string layer) log_filter::log_filter(std::string layer)
:log_filter()
{ {
do_tti = false;
time_src = NULL;
time_format = TIME;
init(layer, &def_logger_stdout, tti); init(layer, &def_logger_stdout, tti);
} }
log_filter::log_filter(std::string layer, logger *logger_, bool tti) log_filter::log_filter(std::string layer, logger *logger_, bool tti)
:log_filter()
{ {
do_tti = false;
time_src = NULL;
time_format = TIME;
init(layer, logger_, tti); init(layer, logger_, tti);
} }

@ -98,14 +98,14 @@ void srslte_bit_interleaver_run(srslte_bit_interleaver_t *q, uint8_t *input, uin
w_offset_p=8-w_offset; w_offset_p=8-w_offset;
} }
uint32_t i = st * 8; int i = st * 8;
byte_idx += i - w_offset_p; byte_idx += i - w_offset_p;
bit_mask += i - w_offset_p; bit_mask += i - w_offset_p;
output_ptr += st; output_ptr += st;
#ifdef LV_HAVE_SSE #ifdef LV_HAVE_SSE
for(; i < q->nof_bits - 15; i += 16) { for(; i < (int) q->nof_bits - 15; i += 16) {
__m128i in128; __m128i in128;
in128 = _mm_insert_epi8(in128, input[*(byte_idx++)], 0x7); in128 = _mm_insert_epi8(in128, input[*(byte_idx++)], 0x7);
in128 = _mm_insert_epi8(in128, input[*(byte_idx++)], 0x6); in128 = _mm_insert_epi8(in128, input[*(byte_idx++)], 0x6);
@ -137,7 +137,7 @@ void srslte_bit_interleaver_run(srslte_bit_interleaver_t *q, uint8_t *input, uin
#endif /* LV_HAVE_SSE */ #endif /* LV_HAVE_SSE */
for(; i < q->nof_bits; i += 8) { for(; i < (int) q->nof_bits - 7; i += 8) {
uint8_t out0 = (input[*(byte_idx++)] & *(bit_mask++))?mask[0]:(uint8_t)0; uint8_t out0 = (input[*(byte_idx++)] & *(bit_mask++))?mask[0]:(uint8_t)0;
uint8_t out1 = (input[*(byte_idx++)] & *(bit_mask++))?mask[1]:(uint8_t)0; uint8_t out1 = (input[*(byte_idx++)] & *(bit_mask++))?mask[1]:(uint8_t)0;
uint8_t out2 = (input[*(byte_idx++)] & *(bit_mask++))?mask[2]:(uint8_t)0; uint8_t out2 = (input[*(byte_idx++)] & *(bit_mask++))?mask[2]:(uint8_t)0;

Loading…
Cancel
Save