maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dec3

Browse Source
This commit is contained in:
maki
2025-12-03 13:51:53 +09:00
parent aa353fdcff
commit 01db9857c4
4 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml
+9 -2
View File
@@ -1,5 +1,12 @@
Active_gNBs: Active_gNBs:
- gnb-rfsim - gnb-rfsim
e2_agent:
enabled: "yes"
near_ric_ip_addr: 192.168.71.21
e2ap_server_port: 36422
sm_dir: "/usr/local/lib/flexric/"
# Asn1_verbosity, choice in: none, info, annoying # Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity: none Asn1_verbosity: none
gNBs: gNBs:
@@ -139,13 +146,13 @@ gNBs:
GNB_IPV4_ADDRESS_FOR_NGU: 192.168.71.140 GNB_IPV4_ADDRESS_FOR_NGU: 192.168.71.140
GNB_PORT_FOR_S1U: 2152 # Spec 2152 GNB_PORT_FOR_S1U: 2152 # Spec 2152
MACRLCs: MACRLCs:
- num_cc: 1 - num_cc: 1
tr_s_preference: local_L1 tr_s_preference: local_L1
tr_n_preference: local_RRC tr_n_preference: local_RRC
pusch_TargetSNRx10: 200 pusch_TargetSNRx10: 200
pucch_TargetSNRx10: 200 pucch_TargetSNRx10: 200
min_grant_prb: 5
stats_max_ue: 17 stats_max_ue: 17
L1s: L1s:
@@ -193,6 +200,6 @@ log_config:
mac_log_level: info mac_log_level: info
rlc_log_level: info rlc_log_level: info
pdcp_log_level: info pdcp_log_level: info
rrc_log_level: info rrc_log_level: debug
ngap_log_level: debug ngap_log_level: debug
f1ap_log_level: debug f1ap_log_level: debug
common/platform_constants.h
+2 -2
View File
@@ -83,8 +83,8 @@
#define MAX_NUM_SLICES 1024 #define MAX_NUM_SLICES 1024
// RLC Entity // RLC Entity
#define RLC_TX_MAXSIZE 10000000 #define RLC_TX_MAXSIZE 100000000
#define RLC_RX_MAXSIZE 10000000 #define RLC_RX_MAXSIZE 100000000
#define SEND_MRW_ON 240 #define SEND_MRW_ON 240
#define MAX_ANT 8 #define MAX_ANT 8
// CBA constant // CBA constant
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+3 -3
View File
@@ -793,10 +793,10 @@ static void pf_dl(gNB_MAC_INST *mac,
while (rbStart < rbStop && (rballoc_mask[rbStart + bwp_start] & slbitmap)) while (rbStart < rbStop && (rballoc_mask[rbStart + bwp_start] & slbitmap))
rbStart++; rbStart++;
uint16_t max_rbSize = 1; uint16_t max_rbSize = 5;
while (rbStart + max_rbSize <= rbStop && !(rballoc_mask[rbStart + max_rbSize + bwp_start] & slbitmap)) /* while (rbStart + max_rbSize <= rbStop && !(rballoc_mask[rbStart + max_rbSize + bwp_start] & slbitmap)) */
max_rbSize++; /* max_rbSize++; */
if (max_rbSize < min_rbSize) { if (max_rbSize < min_rbSize) {
LOG_D(NR_MAC, LOG_D(NR_MAC,
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+6 -2
View File
@@ -2173,12 +2173,16 @@ static int pf_ul(gNB_MAC_INST *nrmac,
bwp_info_t bi = get_pusch_bwp_start_size(iterator->UE); bwp_info_t bi = get_pusch_bwp_start_size(iterator->UE);
while (rbStart < bi.bwpSize && (rballoc_mask[rbStart + bi.bwpStart] & slbitmap)) while (rbStart < bi.bwpSize && (rballoc_mask[rbStart + bi.bwpStart] & slbitmap))
rbStart++; rbStart++;
/* if it's for inactivity, min_grant_prb is enough, otherwise check what /* if it's for inactivity, min_grant_prb is enough, otherwise check what
* would be the maximum */ * would be the maximum */
uint16_t max_rbSize = iterator->sched_inactive ? min_rb : bi.bwpSize; /* uint16_t max_rbSize = iterator->sched_inactive ? min_rb : bi.bwpSize; */
uint16_t max_rbSize = min_rb;
uint16_t available_rb = 1; uint16_t available_rb = 1;
while (rbStart + available_rb < bi.bwpSize && !(rballoc_mask[rbStart + bi.bwpStart + available_rb] & slbitmap) && available_rb < max_rbSize) while (rbStart + available_rb < bi.bwpSize && !(rballoc_mask[rbStart + bi.bwpStart + available_rb] & slbitmap) && available_rb < max_rbSize)
available_rb++; available_rb++;
/* LOG_I(NR_MAC, "[UE %04x] RB size: %u\n", iterator->UE->rnti, available_rb); */
if (rbStart + min_rb > bi.bwpSize || available_rb < min_rb) { if (rbStart + min_rb > bi.bwpSize || available_rb < min_rb) {
reset_beam_status(&nrmac->beam_info, frame, slot, iterator->UE->UE_beam_index, slots_per_frame, dci_beam.new_beam); reset_beam_status(&nrmac->beam_info, frame, slot, iterator->UE->UE_beam_index, slots_per_frame, dci_beam.new_beam);