merge develop, use Linux crypto library

2020-10-12 18:24:08 +02:00
parent 489fc7c0fe 0fe3e5fde2
commit 4f2d8ebfcd
58 changed files with 3064 additions and 4090 deletions
@@ -131,12 +131,12 @@ gNBs =
 # 0=unrestricted, 1=restricted type A, 2=restricted type B
        restrictedSetConfig                                         = 0,
      # pusch-ConfigCommon (up to 16 elements)
-        initialULBWPk2_0                      = 2;
+        initialULBWPk2_0                      = 6;
        initialULBWPmappingType_0             = 1
        # this is SS=0 L=11
        initialULBWPstartSymbolAndLength_0    = 55;
 	
-	initialULBWPk2_1                      = 2;
+	initialULBWPk2_1                      = 6;
        initialULBWPmappingType_1             = 1;
        # this is SS=0 L=12
        initialULBWPstartSymbolAndLength_1    = 69;