Indent correctly
This commit is contained in:
committed by
Robert Schmidt
parent
75a68167ea
commit
e6b307bf6e
@@ -491,12 +491,12 @@ static int trx_usrp_write(openair0_device *device,
|
|||||||
}
|
}
|
||||||
|
|
||||||
s->tx_md.has_time_spec = true;
|
s->tx_md.has_time_spec = true;
|
||||||
s->tx_md.start_of_burst = (s->tx_count==0) ? true : first_packet_state;
|
s->tx_md.start_of_burst = (s->tx_count == 0) ? true : first_packet_state;
|
||||||
s->tx_md.end_of_burst = last_packet_state;
|
s->tx_md.end_of_burst = last_packet_state;
|
||||||
s->tx_md.time_spec = uhd::time_spec_t::from_ticks(timestamp, s->sample_rate);
|
s->tx_md.time_spec = uhd::time_spec_t::from_ticks(timestamp, s->sample_rate);
|
||||||
s->tx_count++;
|
s->tx_count++;
|
||||||
|
|
||||||
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_BEAM_SWITCHING_GPIO,1);
|
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_BEAM_SWITCHING_GPIO, 1);
|
||||||
// bit 13 enables gpio
|
// bit 13 enables gpio
|
||||||
if ((flags_gpio & TX_GPIO_CHANGE) != 0) {
|
if ((flags_gpio & TX_GPIO_CHANGE) != 0) {
|
||||||
// push GPIO bits
|
// push GPIO bits
|
||||||
@@ -504,21 +504,22 @@ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_BEAM_SWITCHI
|
|||||||
s->usrp->set_gpio_attr(s->gpio_bank, "OUT", flags_gpio, MAN_MASK);
|
s->usrp->set_gpio_attr(s->gpio_bank, "OUT", flags_gpio, MAN_MASK);
|
||||||
s->usrp->clear_command_time();
|
s->usrp->clear_command_time();
|
||||||
}
|
}
|
||||||
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_BEAM_SWITCHING_GPIO,0);
|
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_BEAM_SWITCHING_GPIO, 0);
|
||||||
|
|
||||||
if (cc>1) {
|
if (cc > 1) {
|
||||||
std::vector<void *> buff_ptrs;
|
std::vector<void *> buff_ptrs;
|
||||||
|
|
||||||
for (int i=0; i<cc; i++)
|
for (int i = 0; i < cc; i++)
|
||||||
buff_ptrs.push_back(&(((int16_t *)buff_tx[i])[0]));
|
buff_ptrs.push_back(&(((int16_t *)buff_tx[i])[0]));
|
||||||
|
|
||||||
ret = (int)s->tx_stream->send(buff_ptrs, nsamps, s->tx_md);
|
ret = (int)s->tx_stream->send(buff_ptrs, nsamps, s->tx_md);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
ret = (int)s->tx_stream->send(&(((int16_t *)buff_tx[0])[0]), nsamps, s->tx_md);
|
ret = (int)s->tx_stream->send(&(((int16_t *)buff_tx[0])[0]), nsamps, s->tx_md);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ret != nsamps) LOG_E(HW,"[xmit] tx samples %d != %d\n",ret,nsamps);
|
if (ret != nsamps) {
|
||||||
|
LOG_E(HW, "[xmit] tx samples %d != %d\n", ret, nsamps);
|
||||||
|
}
|
||||||
return ret;
|
return ret;
|
||||||
} else {
|
} else {
|
||||||
pthread_mutex_lock(&write_thread->mutex_write);
|
pthread_mutex_lock(&write_thread->mutex_write);
|
||||||
|
|||||||
Reference in New Issue
Block a user