Pure uhd multi usrp #131
Open
Pure uhd multi usrp #131
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
clean up
clean up
clean up
Comment and debug print clean up
Comment and Debug print clean up
Comment and Debug print clean up
Comment and Debug print clean up
asedlmayr
reviewed
Jun 1, 2022
| MLPD_TRACE("Setting up radio: %zu, cells: %zu\n", num_radios, | ||
| _cfg->num_cells()); | ||
|
|
||
| std::atomic_ulong thread_count = ATOMIC_VAR_INIT(num_radios); | ||
| std::atomic_ulong thread_count = ATOMIC_VAR_INIT(1); |
There was a problem hiding this comment.
Does this even make sense? If there is only 1?
| #ifdef THREADED_INIT | ||
| pthread_t init_thread_; |
There was a problem hiding this comment.
not sure if threaded_init make sense for your use case
CC/Sounder/receiver.cc
Outdated
| @@ -206,10 +208,18 @@ void Receiver::go() { | |||
| 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) | |||
There was a problem hiding this comment.
Lets remove the USE_UHD check and fix the equation to work for all configs
CC/Sounder/receiver.cc
Outdated
| @@ -243,7 +253,15 @@ int Receiver::baseTxData(int radio_id, int cell, int frame_id, | |||
| size_t packetLength = sizeof(Packet) + config_->getPacketDataLength(); | |||
| 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; | |||
There was a problem hiding this comment.
same comment as above, make work for all
CC/Sounder/receiver.cc
Outdated
| @@ -354,7 +379,12 @@ void Receiver::loopRecv(int tid, int core_id, SampleBuffer* rx_buffer) { | |||
| std::atomic_int* pkt_buf_inuse = rx_buffer[tid].pkt_buf_inuse; | |||
| char* buffer = rx_buffer[tid].buffer.data(); | |||
|
|
|||
| #if defined(USE_UHD) | |||
CC/Sounder/receiver.cc
Outdated
| @@ -394,13 +424,22 @@ void Receiver::loopRecv(int tid, int core_id, SampleBuffer* rx_buffer) { | |||
|
|
|||
| // 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); | |||
addressed comments
Comments addressed
comments addressed
comments addressed
Sync update
sync update
sync update
Sync update
Sync Update
Sync Update
Changed back to the original implementation
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
update
update
Update
# 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Multi::USRP enabled and tested with 16 USRP Radios.