Further cleanup: define oai_exit for 4G

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
+2 -3
View File
@@ -38,9 +38,8 @@
extern RAN_CONTEXT_t RC;
extern UL_RCC_IND_t UL_RCC_INFO;
extern uint16_t sf_ahead;
extern uint16_t slot_ahead;
extern int sf_ahead;
extern int slot_ahead;
void *aerial_vnf_nr_p7_config_init(void *ptr)
{
+1 -1
View File
@@ -2435,7 +2435,7 @@ void handle_nr_slot_ind(uint16_t sfn, uint16_t slot) {
//send VNF slot indication, which is aligned with TX thread, so that it can call the scheduler
nfapi_nr_slot_indication_scf_t *ind;
ind = (nfapi_nr_slot_indication_scf_t *) malloc(sizeof(nfapi_nr_slot_indication_scf_t));
uint8_t slot_ahead = 6;
int slot_ahead = 6;
uint32_t sfn_slot_tx = sfnslot_add_slot(sfn, slot, slot_ahead);
uint16_t sfn_tx = NFAPI_SFNSLOT2SFN(sfn_slot_tx);
uint8_t slot_tx = NFAPI_SFNSLOT2SLOT(sfn_slot_tx);
+1 -1
View File
@@ -230,7 +230,7 @@ int vnf_nr_unpack_vendor_extension_tlv(nfapi_tl_t *tl,
}
void install_nr_schedule_handlers(NR_IF_Module_t *if_inst);
void install_schedule_handlers(IF_Module_t *if_inst);
extern uint16_t sf_ahead;
extern int sf_ahead;
void oai_create_enb(void) {
int bodge_counter=0;
+1 -3
View File
@@ -31,9 +31,7 @@
#define FAPI2_IP_DSCP 0
extern uint16_t sf_ahead;
//uint16_t sf_ahead=4;
extern int sf_ahead;
void add_slot(uint16_t *frameP, uint16_t *slotP, int offset)
{