Use bytes instead of bit packing for rb_mask_ul
Clarify the code, the bitpacking might even potentially be slower. Signed-off-by: Robert Schmidt <robert.schmidt@openairinterface.org>
This commit is contained in:
@@ -630,27 +630,24 @@ int main(int argc, char **argv)
|
||||
rxlev_pucch += signal_energy((int32_t *)&rxdataF[aarx][startingSymbolIndex * frame_parms->ofdm_symbol_size], 12);
|
||||
|
||||
// set UL mask for pucch allocation
|
||||
uint32_t rb_mask_ul[14][9] = {0};
|
||||
uint32_t rb_mask_ul[14][MAX_BWP_SIZE] = {0};
|
||||
|
||||
if (format == 1) {
|
||||
for (int s = 0; s < frame_parms->symbols_per_slot; s++) {
|
||||
if (s >= startingSymbolIndex && s < (startingSymbolIndex + nrofSymbols / 2))
|
||||
for (int rb = 0; rb < N_RB; rb++) {
|
||||
int rb2 = rb + startingPRB;
|
||||
rb_mask_ul[s][rb2 >> 5] |= (1 << (rb2 & 31));
|
||||
rb_mask_ul[s][rb + startingPRB] = 1;
|
||||
}
|
||||
else if (s >= (startingSymbolIndex + nrofSymbols / 2) && s < startingSymbolIndex + nrofSymbols)
|
||||
for (int rb = 0; rb < N_RB; rb++) {
|
||||
int rb2 = rb + startingPRB_intraSlotHopping;
|
||||
rb_mask_ul[s][rb2 >> 5] |= (1 << (rb2 & 31));
|
||||
rb_mask_ul[s][rb + startingPRB_intraSlotHopping] = 1;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (int s = 0; s < frame_parms->symbols_per_slot; s++) {
|
||||
if (s >= startingSymbolIndex && s < (startingSymbolIndex + nrofSymbols))
|
||||
for (int rb = 0; rb < N_RB; rb++) {
|
||||
int rb2 = rb + startingPRB;
|
||||
rb_mask_ul[s][rb2 >> 5] |= (1 << (rb2 & 31));
|
||||
rb_mask_ul[s][rb + startingPRB] = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user