Merge branch 'develop' into parallel-phy-test-EMUFH

Conflicts: openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c openair1/PHY/LTE_UE_TRANSPORT/get_pmi.c openair2/LAYER2/MAC/eNB_scheduler_phytest.c openair3/S1AP/MESSAGES/ASN1/R8/s1ap-8.10.0.asn1 targets/RT/USER/lte-enb.c targets/RT/USER/lte-ru.c targets/RT/USER/rfsim.h
2018-07-30 11:42:34 +02:00
parent aa00a4734a e83a7fca5f
commit d45fcd6fc2
56 changed files with 232203 additions and 3 deletions
@@ -2127,6 +2127,7 @@ int dlsch_modulation(PHY_VARS_eNB* phy_vars_eNB,
                      int *);


+
  int P1_SHIFT[13],P2_SHIFT[13];
  int offset,nushiftmod3;