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

Merge remote-tracking branch 'origin/imscope-for-7.2' into integration_2026_w06 (!3889)

Browse Source 
Enable imscope for split7.2
This commit is contained in:
Robert Schmidt
2026-02-05 13:28:08 +01:00
parent f4b9e04c61 315fe92253
commit 12fc8112d9
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executables/nr-softmodem.c
+18 -9
View File
@@ -675,11 +675,28 @@ int main( int argc, char **argv ) {
wait_nfapi_init("main?"); wait_nfapi_init("main?");
} }
if (IS_SOFTMODEM_IMSCOPE_ENABLED || IS_SOFTMODEM_IMSCOPE_RECORD_ENABLED) {
sleep(1);
scopeParms_t p;
p.argc = &argc;
p.argv = argv;
p.gNB = RC.gNB[0];
p.ru = RC.ru[0];
if (IS_SOFTMODEM_IMSCOPE_ENABLED) {
load_softscope("im", &p);
}
AssertFatal(!(IS_SOFTMODEM_IMSCOPE_ENABLED && IS_SOFTMODEM_IMSCOPE_RECORD_ENABLED),
"Data recoding and ImScope cannot be enabled at the same time\n");
if (IS_SOFTMODEM_IMSCOPE_RECORD_ENABLED) {
load_module_shlib("imscope_record", NULL, 0, &p);
}
}
if (RC.nb_nr_L1_inst > 0) { if (RC.nb_nr_L1_inst > 0) {
wait_RUs(); wait_RUs();
// once all RUs are ready initialize the rest of the gNBs ((dependence on final RU parameters after configuration) // once all RUs are ready initialize the rest of the gNBs ((dependence on final RU parameters after configuration)
if (IS_SOFTMODEM_DOSCOPE || IS_SOFTMODEM_IMSCOPE_ENABLED || IS_SOFTMODEM_IMSCOPE_RECORD_ENABLED) { if (IS_SOFTMODEM_DOSCOPE) {
sleep(1); sleep(1);
scopeParms_t p; scopeParms_t p;
p.argc = &argc; p.argc = &argc;
@@ -689,14 +706,6 @@ int main( int argc, char **argv ) {
if (IS_SOFTMODEM_DOSCOPE) { if (IS_SOFTMODEM_DOSCOPE) {
load_softscope("nr", &p); load_softscope("nr", &p);
} }
if (IS_SOFTMODEM_IMSCOPE_ENABLED) {
load_softscope("im", &p);
}
AssertFatal(!(IS_SOFTMODEM_IMSCOPE_ENABLED && IS_SOFTMODEM_IMSCOPE_RECORD_ENABLED),
"Data recoding and ImScope cannot be enabled at the same time\n");
if (IS_SOFTMODEM_IMSCOPE_RECORD_ENABLED) {
load_module_shlib("imscope_record", NULL, 0, &p);
}
} }
if (NFAPI_MODE != NFAPI_MODE_PNF && NFAPI_MODE != NFAPI_MODE_VNF && NFAPI_MODE != NFAPI_MODE_AERIAL) { if (NFAPI_MODE != NFAPI_MODE_PNF && NFAPI_MODE != NFAPI_MODE_VNF && NFAPI_MODE != NFAPI_MODE_AERIAL) {
openair1/PHY/TOOLS/imscope/imscope_init.cpp
+2 -1
View File
@@ -41,7 +41,8 @@ extern "C" void imscope_autoinit(void *dataptr)
if (IS_SOFTMODEM_GNB) { if (IS_SOFTMODEM_GNB) {
scopeParms_t *scope_params = (scopeParms_t *)dataptr; scopeParms_t *scope_params = (scopeParms_t *)dataptr;
scope_params->gNB->scopeData = scope; scope_params->gNB->scopeData = scope;
scope_params->ru->scopeData = scope; if (scope_params->ru)
scope_params->ru->scopeData = scope;
} else { } else {
PHY_VARS_NR_UE *ue = (PHY_VARS_NR_UE *)dataptr; PHY_VARS_NR_UE *ue = (PHY_VARS_NR_UE *)dataptr;
ue->scopeData = scope; ue->scopeData = scope;