maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature-59-tm4

Browse Source
This commit is contained in:
Elena_Lukashova
2017-03-10 16:42:11 +01:00
parent 83a045ec83 5c375d3ae8
commit 112b3719e4
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
+1 -1
View File
@@ -148,7 +148,7 @@ int trx_eth_write_raw(openair0_device *device, openair0_timestamp timestamp, voi
int sent_byte; int sent_byte;
if (eth->compression = ALAW_COMPRESS) { if (eth->compression == ALAW_COMPRESS) {
sent_byte = RAW_PACKET_SIZE_BYTES_ALAW(nsamps); sent_byte = RAW_PACKET_SIZE_BYTES_ALAW(nsamps);
} else { } else {
sent_byte = RAW_PACKET_SIZE_BYTES(nsamps); sent_byte = RAW_PACKET_SIZE_BYTES(nsamps);
targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h
+1 -1
View File
@@ -68,7 +68,7 @@
// Packet sizes for IF4p5 interface format // Packet sizes for IF4p5 interface format
#define DATA_BLOCK_SIZE_BYTES(scaled_nblocks) (sizeof(uint16_t)*scaled_nblocks) #define DATA_BLOCK_SIZE_BYTES(scaled_nblocks) (sizeof(uint16_t)*scaled_nblocks)
#define PRACH_HARD_CODED_NUM_SAMPLES (839*4) #define PRACH_HARD_CODED_NUM_SAMPLES (839*2)
#define PRACH_BLOCK_SIZE_BYTES (sizeof(int16_t)*PRACH_HARD_CODED_NUM_SAMPLES) // FIX hard coded prach size #define PRACH_BLOCK_SIZE_BYTES (sizeof(int16_t)*PRACH_HARD_CODED_NUM_SAMPLES) // FIX hard coded prach size
#define RAW_IF4p5_PDLFFT_SIZE_BYTES(nblocks) (MAC_HEADER_SIZE_BYTES + sizeof_IF4p5_header_t + DATA_BLOCK_SIZE_BYTES(nblocks)) #define RAW_IF4p5_PDLFFT_SIZE_BYTES(nblocks) (MAC_HEADER_SIZE_BYTES + sizeof_IF4p5_header_t + DATA_BLOCK_SIZE_BYTES(nblocks))
targets/RT/USER/lte-softmodem.c
+1
View File
@@ -1081,6 +1081,7 @@ static void get_options (int argc, char **argv) {
} else { } else {
(eth_params+j)->rf_preference = 0; (eth_params+j)->rf_preference = 0;
} }
(eth_params+j)->if_compress = enb_properties->properties[i]->rrh_gw_config[j].if_compress;
} else { } else {
local_remote_radio = BBU_LOCAL_RADIO_HEAD; local_remote_radio = BBU_LOCAL_RADIO_HEAD;
} }