remove LTE/rrc_defs.h dependency in rrc_UE.c
This commit is contained in:
@@ -33,6 +33,7 @@
|
|||||||
#define RRC_UE
|
#define RRC_UE
|
||||||
#define RRC_UE_C
|
#define RRC_UE_C
|
||||||
|
|
||||||
|
#include "LTE_MeasObjectToAddMod.h"
|
||||||
#include "NR_DL-DCCH-Message.h" //asn_DEF_NR_DL_DCCH_Message
|
#include "NR_DL-DCCH-Message.h" //asn_DEF_NR_DL_DCCH_Message
|
||||||
#include "NR_DL-CCCH-Message.h" //asn_DEF_NR_DL_CCCH_Message
|
#include "NR_DL-CCCH-Message.h" //asn_DEF_NR_DL_CCCH_Message
|
||||||
#include "NR_BCCH-BCH-Message.h" //asn_DEF_NR_BCCH_BCH_Message
|
#include "NR_BCCH-BCH-Message.h" //asn_DEF_NR_BCCH_BCH_Message
|
||||||
@@ -47,7 +48,6 @@
|
|||||||
|
|
||||||
#include "rrc_defs.h"
|
#include "rrc_defs.h"
|
||||||
#include "rrc_proto.h"
|
#include "rrc_proto.h"
|
||||||
#include "openair2/RRC/LTE/rrc_defs.h"
|
|
||||||
#include "L2_interface_ue.h"
|
#include "L2_interface_ue.h"
|
||||||
#include "LAYER2/NR_MAC_UE/mac_proto.h"
|
#include "LAYER2/NR_MAC_UE/mac_proto.h"
|
||||||
|
|
||||||
@@ -2246,9 +2246,8 @@ static void nr_rrc_initiate_rrcReestablishment(NR_UE_RRC_INST_t *rrc, NR_Reestab
|
|||||||
static void nr_rrc_ue_generate_rrcReestablishmentComplete(const NR_UE_RRC_INST_t *rrc,
|
static void nr_rrc_ue_generate_rrcReestablishmentComplete(const NR_UE_RRC_INST_t *rrc,
|
||||||
const NR_RRCReestablishment_t *rrcReestablishment)
|
const NR_RRCReestablishment_t *rrcReestablishment)
|
||||||
{
|
{
|
||||||
uint8_t buffer[RRC_BUFFER_SIZE] = {0};
|
uint8_t buffer[NR_RRC_BUF_SIZE] = {0};
|
||||||
int size = do_RRCReestablishmentComplete(buffer, RRC_BUFFER_SIZE,
|
int size = do_RRCReestablishmentComplete(buffer, NR_RRC_BUF_SIZE, rrcReestablishment->rrc_TransactionIdentifier);
|
||||||
rrcReestablishment->rrc_TransactionIdentifier);
|
|
||||||
LOG_I(NR_RRC, "[RAPROC] Logical Channel UL-DCCH (SRB1), Generating RRCReestablishmentComplete (bytes %d)\n", size);
|
LOG_I(NR_RRC, "[RAPROC] Logical Channel UL-DCCH (SRB1), Generating RRCReestablishmentComplete (bytes %d)\n", size);
|
||||||
int srb_id = 1; // RRC re-establishment complete on SRB1
|
int srb_id = 1; // RRC re-establishment complete on SRB1
|
||||||
nr_pdcp_data_req_srb(rrc->ue_id, srb_id, 0, size, buffer, deliver_pdu_srb_rlc, NULL);
|
nr_pdcp_data_req_srb(rrc->ue_id, srb_id, 0, size, buffer, deliver_pdu_srb_rlc, NULL);
|
||||||
|
|||||||
Reference in New Issue
Block a user