mac: fix PMI+RI encoding into UCI in case of test mode

frankist · frankist · commit 2db7d056ae12 · 2023-06-19T21:36:33.000+02:00
diff --git a/lib/du_high/mac_test_mode_adapter.cpp b/lib/du_high/mac_test_mode_adapter.cpp
@@ -173,7 +173,7 @@ class test_cell_adapter : public mac_cell_control_information_handler
     } else {
       payload.resize(CQI_BITLEN + RI_BITLEN + PMI_BITLEN);
       packed_bits = packed_bits << (RI_BITLEN + PMI_BITLEN);
-      packed_bits += ((test_ue_cfg.ri - 1) << PMI_BITLEN) + test_ue_cfg.pmi;
+      packed_bits += (test_ue_cfg.ri - 1) + (test_ue_cfg.pmi << RI_BITLEN);
     }
     payload.from_uint64(packed_bits);
   }

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ class test_cell_adapter : public mac_cell_control_information_handler`
`173`	`173`	`} else {`
`174`	`174`	`payload.resize(CQI_BITLEN + RI_BITLEN + PMI_BITLEN);`
`175`	`175`	`packed_bits = packed_bits << (RI_BITLEN + PMI_BITLEN);`
`176`		`- packed_bits += ((test_ue_cfg.ri - 1) << PMI_BITLEN) + test_ue_cfg.pmi;`
	`176`	`+ packed_bits += (test_ue_cfg.ri - 1) + (test_ue_cfg.pmi << RI_BITLEN);`
`177`	`177`	`}`
`178`	`178`	`payload.from_uint64(packed_bits);`
`179`	`179`	`}`