Skip to content

Conversation

@Shadowcaster77
Copy link
Collaborator

Multi::USRP enabled and tested with 16 USRP Radios.

address multi USRP case
address multi USRP case
address Multi USRP issue
address multi USRP issue
address multi USRP issue
address issue if not Ubuntu 20.04 systems
@asedlmayr asedlmayr requested review from asedlmayr and rdoosty May 20, 2022 16:39
asedlmayr and others added 5 commits May 23, 2022 15:49
Comment and debug print clean up
Comment and Debug print clean up
Comment and Debug print clean up
Comment and Debug print clean up
Copy link
Collaborator

@asedlmayr asedlmayr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would like any changes needed in Receiver.cc to work without ifdefs if possible. This might mean moving some code into the RadioUHD or the RadioSet.

_cfg->num_cells());

std::atomic_ulong thread_count = ATOMIC_VAR_INIT(num_radios);
std::atomic_ulong thread_count = ATOMIC_VAR_INIT(1);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this even make sense? If there is only 1?

context->tid = i;
context->cell = c;
#ifdef THREADED_INIT
pthread_t init_thread_;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure if threaded_init make sense for your use case

void Receiver::baseTxBeacon(int radio_id, int cell, int frame_id,
long long base_time) {
// prepare BS beacon in host buffer
#if defined(USE_UHD)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets remove the USE_UHD check and fix the equation to work for all configs

size_t tx_buffer_size = bs_tx_buffer_[radio_id].buffer.size() / packetLength;
int flagsTxData;
#if defined(USE_UHD)
int cha = config_->bs_channel() == "AB" ? 2 : 1;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same comment as above, make work for all

std::atomic_int* pkt_buf_inuse = rx_buffer[tid].pkt_buf_inuse;
char* buffer = rx_buffer[tid].buffer.data();

#if defined(USE_UHD)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we fix this too?

// read rx_offset to align the FPGA time of the BS
// by performing dummy readStream()
#if defined(USE_UHD)
std::vector<void*> samp_buffer(num_channels);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

necessary?

addressed comments
Comments addressed
comments addressed
comments addressed
Sync update
sync update
Sync update
Sync Update
Sync Update
Changed back to the original implementation
Shadowcaster77 and others added 22 commits July 7, 2022 14:08
Changed back to the original implementation.
Changed the original implementation.
Changed to the original implementation
Changed to the original implementation
changed and cleaned up to the original implementation
changed to Original
changed to original
changed to orginal
Updated to ORBIT grid configuration
Updated to ORBIT grid
# Conflicts:
#	CC/Sounder/receiver.cc
Added Beacon interval to support high BW for USRPs
Update according to sync
# Conflicts:
#	CC/Sounder/config.cc
#	CC/Sounder/receiver.cc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants