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

Further cleanup: define oai_exit for 4G

Browse Source 
The parent commit cleans up and groups oai_exit in one place,
nr-softmodem-common.h. Therefore, this 5G file is included in the 4G
defs_common.h (at least it's mostly 4G), which is not nice. Instead,
define oai_exit also in 4G softmodem-common.h, and include this in
defs_common.h. Remove the cyclic inclusion of defs_common.h in
softmodem-common.h, and resolve all subsequent errors around unknown
types and extern definition mismatches.
This commit is contained in:
Robert Schmidt
2025-01-09 15:28:25 +01:00
parent e0ca70c36d
commit e2a3cde4b7
24 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/ETHERNET/benetel/4g/benetel.c
+1 -1
View File
@@ -243,7 +243,7 @@ next:
//printf("BENETEL: %s (f.sf %d.%d)\n", __FUNCTION__, *frame, *subframe);
RU_proc_t *proc = &ru->proc;
extern uint16_t sf_ahead;
extern int sf_ahead;
int f = *frame;
int sf = *subframe;
radio/ETHERNET/benetel/5g/benetel.c
+1 -1
View File
@@ -257,7 +257,7 @@ printf("rxdata in benetel_fh_if4p5_south_in %p\n", &ru->common.rxdataF[antenna][
//printf("BENETEL: %s (f.sf %d.%d)\n", __FUNCTION__, *frame, *slot);
RU_proc_t *proc = &ru->proc;
extern uint16_t sl_ahead;
extern int sl_ahead;
int f = *frame;
int sl = *slot;
radio/fhi_72/oran_isolate.c
+1 -1
View File
@@ -203,7 +203,7 @@ void oran_fh_if4p5_south_in(RU_t *ru, int *frame, int *slot)
ru_info.prach_buf = ru->prach_rxsigF[0]; // index: [prach_oca][ant_id]
RU_proc_t *proc = &ru->proc;
extern uint16_t sl_ahead;
extern int sl_ahead;
int f, sl;
LOG_D(PHY, "Read rxdataF %p,%p\n", ru_info.rxdataF[0], ru_info.rxdataF[1]);
start_meas(&ru->rx_fhaul);