From 0a46cc56a2a1d4282847fdffb7b611a889c1bf43 Mon Sep 17 00:00:00 2001 From: khadraou Date: Wed, 1 Mar 2017 10:11:07 +0100 Subject: [PATCH 1/3] fixed PRACH hardcoded size --- targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h b/targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h index b1e3db1b6e..6c51db64ce 100644 --- a/targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h +++ b/targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h @@ -68,7 +68,7 @@ // Packet sizes for IF4p5 interface format #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 RAW_IF4p5_PDLFFT_SIZE_BYTES(nblocks) (MAC_HEADER_SIZE_BYTES + sizeof_IF4p5_header_t + DATA_BLOCK_SIZE_BYTES(nblocks)) From 94229ca59383f4edf29626b81dc00e13f8845564 Mon Sep 17 00:00:00 2001 From: Cedric Roux Date: Fri, 3 Mar 2017 15:17:00 +0100 Subject: [PATCH 2/3] bugfix: = instead of == Bug reported by Bruno Mongazon from Nokia. --- targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c b/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c index 0e2a5ceb36..7278c2727d 100644 --- a/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c +++ b/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c @@ -148,7 +148,7 @@ int trx_eth_write_raw(openair0_device *device, openair0_timestamp timestamp, voi int sent_byte; - if (eth->compression = ALAW_COMPRESS) { + if (eth->compression == ALAW_COMPRESS) { sent_byte = RAW_PACKET_SIZE_BYTES_ALAW(nsamps); } else { sent_byte = RAW_PACKET_SIZE_BYTES(nsamps); From f94835becfd9fdd19a1f2517364f6949129b4871 Mon Sep 17 00:00:00 2001 From: Cedric Roux Date: Fri, 3 Mar 2017 15:25:10 +0100 Subject: [PATCH 3/3] bugfix: "if_compress" parameter not taken into account Bug reported by Bruno Mongazon from Nokia. "Without this line, the config file parameter is not properly stored and the FH will always work with compression." --- targets/RT/USER/lte-softmodem.c | 1 + 1 file changed, 1 insertion(+) diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c index ed9d955e8a..8303d88218 100644 --- a/targets/RT/USER/lte-softmodem.c +++ b/targets/RT/USER/lte-softmodem.c @@ -1081,6 +1081,7 @@ static void get_options (int argc, char **argv) { } else { (eth_params+j)->rf_preference = 0; } + (eth_params+j)->if_compress = enb_properties->properties[i]->rrh_gw_config[j].if_compress; } else { local_remote_radio = BBU_LOCAL_RADIO_HEAD; }