srsLTE: ZMQ renamed struct field
This commit is contained in:
parent
2d98f92823
commit
307c27dc30
|
@ -389,8 +389,8 @@ int rf_zmq_open_multi(char* args, void** h, uint32_t nof_channels)
|
|||
|
||||
double freq = 0.0;
|
||||
if (!parse_double(args, config_arg, &freq)) {
|
||||
rx_opts.frequency_hz_mhz = (uint32_t)(freq / 1e6);
|
||||
printf("Channel %d. Using rx_freq=%dMHz\n", i, rx_opts.frequency_hz_mhz);
|
||||
rx_opts.frequency_mhz = (uint32_t)(freq / 1e6);
|
||||
printf("Channel %d. Using rx_freq=%dMHz\n", i, rx_opts.frequency_mhz);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -424,8 +424,8 @@ int rf_zmq_open_multi(char* args, void** h, uint32_t nof_channels)
|
|||
|
||||
double freq = 0.0;
|
||||
if (!parse_double(args, config_arg, &freq)) {
|
||||
tx_opts.frequency_hz_mhz = (uint32_t)(freq / 1e6);
|
||||
printf("Channel %d. Using tx_freq=%dMHz\n", i, tx_opts.frequency_hz_mhz);
|
||||
tx_opts.frequency_mhz = (uint32_t)(freq / 1e6);
|
||||
printf("Channel %d. Using tx_freq=%dMHz\n", i, tx_opts.frequency_mhz);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -120,7 +120,7 @@ int rf_zmq_rx_open(rf_zmq_rx_t* q, rf_zmq_opts_t opts, void* zmq_ctx, char* sock
|
|||
}
|
||||
q->socket_type = opts.socket_type;
|
||||
q->sample_format = opts.sample_format;
|
||||
q->frequency_hz_mhz = opts.frequency_hz_mhz;
|
||||
q->frequency_mhz = opts.frequency_mhz;
|
||||
|
||||
if (opts.socket_type == ZMQ_SUB) {
|
||||
zmq_setsockopt(q->sock, ZMQ_SUBSCRIBE, "", 0);
|
||||
|
@ -213,7 +213,7 @@ bool rf_zmq_rx_match_freq(rf_zmq_rx_t* q, uint32_t freq_hz)
|
|||
{
|
||||
bool ret = false;
|
||||
if (q) {
|
||||
ret = (q->frequency_hz_mhz == 0 || q->frequency_hz_mhz == freq_hz);
|
||||
ret = (q->frequency_mhz == 0 || q->frequency_mhz == freq_hz);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
|
|
@ -69,14 +69,14 @@ typedef struct {
|
|||
srslte_ringbuffer_t ringbuffer;
|
||||
cf_t* temp_buffer;
|
||||
void* temp_buffer_convert;
|
||||
uint32_t frequency_hz_mhz;
|
||||
uint32_t frequency_mhz;
|
||||
} rf_zmq_rx_t;
|
||||
|
||||
typedef struct {
|
||||
const char* id;
|
||||
uint32_t socket_type;
|
||||
rf_zmq_format_t sample_format;
|
||||
uint32_t frequency_hz_mhz;
|
||||
uint32_t frequency_mhz;
|
||||
} rf_zmq_opts_t;
|
||||
|
||||
/*
|
||||
|
|
|
@ -52,7 +52,7 @@ int rf_zmq_tx_open(rf_zmq_tx_t* q, rf_zmq_opts_t opts, void* zmq_ctx, char* sock
|
|||
}
|
||||
q->socket_type = opts.socket_type;
|
||||
q->sample_format = opts.sample_format;
|
||||
q->frequency_hz_mhz = opts.frequency_hz_mhz;
|
||||
q->frequency_hz_mhz = opts.frequency_mhz;
|
||||
|
||||
rf_zmq_info(q->id, "Binding transmitter: %s\n", sock_args);
|
||||
|
||||
|
|
Loading…
Reference in New Issue