diff --git a/openair1/PHY/INIT/README.txt b/openair1/PHY/INIT/README.txt
index d40d0feecd1a816f4f7a9a5fd04577680520618d..520e0acd4fa2d6fc23130677a6c874e70a7491c6 100644
--- a/openair1/PHY/INIT/README.txt
+++ b/openair1/PHY/INIT/README.txt
@@ -2,4 +2,6 @@ This directory contains files related to initialization of variables/structures
init_top.c : initialize top-level variables and signal buffers, FFT twiddle factors, etc.
lte_init.c : LTE specific initlization routines (DLSCH/ULSCH signal buffers for RX, data buffers for TX, etc.)
-init.c : non-LTE initialization routines (to be removed)
+lte_param_init.c: used only in unitary simulations. initializes the global variables eNB and UE.
+lte_parms.c: contains init_frame_parms to initialize frame parameters structure
+
diff --git a/openair1/README.TXT b/openair1/README.TXT
index 34d3144105dfe8eafef6370d68be93a6f4d97c7f..23c86e888e47f697adb8d1509630d5958e5be693 100644
--- a/openair1/README.TXT
+++ b/openair1/README.TXT
@@ -1,40 +1,5 @@
This folder contains the software for the device driver of CBMIMO1 and the physical layer signal processing.
-
-|-- ARCH // contains drivers for hardware
-| |-- CBMIMO1 // contains everything related to CBMIMO1
-| | `-- DEVICE_DRIVER
-| | |-- Makefile // main Makefile used to compile the driver; usually invoked from the top level Makefile
-| | |-- cbmimo1_device.c // main file for device driver (initializes the card, bigphys, main variables)
-| | |-- cbmimo1_device.h
-| | |-- cbmimo1_dma.c
-| | |-- cbmimo1_fileops.c // file that processes IOCTL commands coming from the userspace control utility (USERSPACE_TOOLS/OPENAIR_RF/)
-| | |-- cbmimo1_generate_fs4.c // generates test signals (DEBUGGING)
-| | |-- cbmimo1_generate_ofdm.c // generates test signals (DEBUGGING)
-| | |-- cbmimo1_get_frame.c // code to grab a frame from the card
-| | |-- cbmimo1_init.c // code to set up the registers of the card
-| | |-- cbmimo1_pci.h
-| | |-- cbmimo1_proc.c // generates the proc entries /proc/openair1/bch_stats and /proc/openair1/openair1_state
-| | |-- cbmimo1_rf_cntl.c // controls the RF chipset on the card
-| | |-- cbmimo1_test.c
-| | |-- from_grlib_softconfig.h
-| | |-- from_grlib_softregs.h
-| | |-- defs.h
-| | |-- extern.h
-| | `-- vars.h
-| |-- COMMON // common for all hardware (mainly bigphys)
-| |-- EXPRESS_MIMO // contains everything related to EXPRESS MIMO
-|-- DOCS // Documentation
-| |-- DOXYGEN // Automaitcally generated DOXYGEN documentation in latex and html
-| `-- PAPERS // papers related to openair1
-|-- EMOS // this contains everything related to Eurecom MIMO Openair Sounder (EMOS)
-| |-- DOC
-| |-- DUMP // program that dumps channel estimate to disk using a FIFO
-| |-- GUI
-| |-- MATLAB // Matlab code to process measurements
-| |-- SIM // EMOS simulator (for DEBUGGING)
-| `-- UTIL
-|-- MAC_INTERFACE // interface with MAC layer (in openair2)
|-- PHY // contains all signal processing related to physical layer (used in real-time AND simulation)
General remarks: every directory contains at least defs.h (for declaration of structure and functions), vars.h (for definitions of variables), and extern.h (variables are defined only once in cbmimo1_device.c (for real-time HW operation) or a top-level simulation (in SIMULATION/xxx), if variables are needed in another file, use extern.h)
@@ -57,17 +22,19 @@ General remarks: every directory contains at least defs.h (for declaration of st
| |-- spec_defs_top.h
| |-- types.h
| `-- vars.h
-|-- SCHED // schedules the different PHY functions according to the nodes role (CH=BS, MR=UE)
+|-- SCHED // schedules the different PHY functions according to the nodes role
| |-- defs.h
| |-- extern.h
-| |-- phy_procedures.c // non-LTE PHY procedures this is used in synchronized mode to schedule the slot processing
| |-- phy_procedures_emos.c // non-LTE PHY procedures for EMOS
| |-- phy_procedures_emos.h
| |-- phy_procedures_lte_eNb.c // LTE PHY procedures for eNB (from 36-213)
| |-- phy_procedures_lte_ue.c // LTE PHY procedures for UE (from 36-213)
+| |-- phy_procedures_lte_common.c // LTE PHY procedures common for UE and eNB (from 36-213)
+| |-- phy_mac_stub.c //MAC stub that generates channels when used in phy-test-mode
+| |-- pucch_pc.c // power control for PUCCH
+| |-- pusch_pc.c // power control for PUSCH
+| |-- srs_pc.c // power control for SRS
| |-- rt_compat.h
-| |-- sched.c // contains the top level scheduler (only for CBMIMO1 HW)
-| |-- sched_lte.c // same as sched.c for LTE (only for CBMIMO1 HW)
| `-- vars.h
|-- SIMULATION // contains simulation routines to test PHY
| |-- LTE_PHY // LTE simulation testbenches for unitary simulation of transport/physical channels
@@ -76,17 +43,9 @@ General remarks: every directory contains at least defs.h (for declaration of st
| | |-- dlsim.c // PDSCH simulation testbench
| | |-- ulsim.c // PUSCH simulation testbench
| | |-- pucchsim.c // PUCCH simulation testbench
-| |-- LTE_PHY_L2 // LTE simulation testbench for full system simulation (PHY,MAC,RLC,RRC,PDCP)
-| `-- TOOLS
| |-- RF
-|-- USERSPACE_TOOLS // tools that run in userspace (not kernel)
-| |-- OCTAVE
-| | |-- AGILE_RF_TOOLS // octave tools to test agile RF
-| | |-- CBMIMO1_TOOLS // octave interface for CBMIMO1
-| | |-- GPIB // octave tools to control signal generator (used for calibration)
-| | `-- PHY_SIM // octave implementation of sync
-| |-- OPENAIR_RF // tool to interface with the device driver using IOCTL
-| |-- SCOPE // tool to visualize data from PHY (channel estimates, IQ plots, etc.). Communicates with kernel module using shared memory.
-| `-- SENSING // tools related to sensing
+| |-- ETH_TRANSPORT
+| `-- TOOLS
+
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
index 585d9c2c1c7c7ac9443b60fb895553233d2d062d..6d0044b346a2484aeccedb1a4932572eb8e1b7cd 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
@@ -885,7 +885,7 @@ abort();
rb_table_index=UE_template->pre_allocated_rb_table_index_ul;
} else {
mcs=10;//cmin (10, openair_daq_vars.target_ue_ul_mcs);
- rb_table_index=13; // for PHR
+ rb_table_index=5; // for PHR
}
UE_list->eNB_UE_stats[CC_id][UE_id].ulsch_mcs2=mcs;
diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c
index 848b7011337d2e82e637426ebf91d2184e6a0078..68fcbc49d5eb2e88dec2d63221044b53c2b5505f 100644
--- a/targets/RT/USER/lte-softmodem.c
+++ b/targets/RT/USER/lte-softmodem.c
@@ -1387,6 +1387,7 @@ int main( int argc, char **argv ) {
memset(&openair0_cfg[0],0,sizeof(openair0_config_t)*MAX_CARDS);
memset(tx_max_power,0,sizeof(int)*MAX_NUM_CCs);
+
set_latency_target();
// set default parameters
@@ -1518,6 +1519,12 @@ int main( int argc, char **argv ) {
check_clock();
+#ifndef PACKAGE_VERSION
+# define PACKAGE_VERSION "UNKNOWN-EXPERIMENTAL"
+#endif
+
+ LOG_I(HW, "Version: %s\n", PACKAGE_VERSION);
+
// init the parameters
for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {