Skip to content

O
OpenXG-RAN
Commit ab857a55 authored by changshengliu's avatar changshengliu
Browse files
Options

fix openair1 bug

parent e8f43ba5
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 10 deletions
openair1/PHY/NBIoT_TRANSPORT/SIB_NB_IoT.c
View file @ ab857a55
...@@ -212,7 +212,7 @@ int generate_SIB23(NB_IoT_eNB_NDLSCH_t *SIB23, ...@@ -212,7 +212,7 @@ int generate_SIB23(NB_IoT_eNB_NDLSCH_t *SIB23,
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
int generate_NDLSCH_NB_IoT(PHY_VARS_eNB *eNB, int generate_NDLSCH_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,
NB_IoT_eNB_NDLSCH_t *RAR, NB_IoT_eNB_NDLSCH_t *RAR,
int32_t **txdataF, int32_t **txdataF,
int16_t amp, int16_t amp,
...@@ -348,7 +348,7 @@ int generate_NDLSCH_NB_IoT(PHY_VARS_eNB *eNB, ...@@ -348,7 +348,7 @@ int generate_NDLSCH_NB_IoT(PHY_VARS_eNB *eNB,
///////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////
int generate_NPDCCH_NB_IoT(NB_IoT_eNB_NPDCCH_t *DCI_pdu, int generate_NPDCCH_NB_IoT(NB_IoT_eNB_NPDCCH_t *DCI_1,
int32_t **txdataF, int32_t **txdataF,
int16_t amp, int16_t amp,
LTE_DL_FRAME_PARMS *frame_parms, LTE_DL_FRAME_PARMS *frame_parms,
...@@ -364,14 +364,14 @@ int generate_NPDCCH_NB_IoT(NB_IoT_eNB_NPDCCH_t *DCI_pdu, ...@@ -364,14 +364,14 @@ int generate_NPDCCH_NB_IoT(NB_IoT_eNB_NPDCCH_t *DCI_pdu,
uint8_t ncce_index = 0; /// = DCI->ncce_index[i]; uint8_t ncce_index = 0; /// = DCI->ncce_index[i];
uint8_t agr_level = 2; /// = DCI->aggregation_level[i]; uint8_t agr_level = 2; /// = DCI->aggregation_level[i];
if( DCI->active[i] == 1) if( DCI_1->active[i] == 1)
{ {
//LOG_I(PHY,"[Frame: %d][Subframe: %d]sent DCI\n",frame,subframe); //LOG_I(PHY,"[Frame: %d][Subframe: %d]sent DCI\n",frame,subframe);
uint8_t *DCI_pdu = DCI->pdu[i]; uint8_t *DCI_pdu = DCI_1->pdu[i];
uint32_t rep = DCI->dci_repetitions[i]; /// repetition number uint32_t rep = DCI_1->dci_repetitions[i]; /// repetition number
uint8_t eutra_control_region = 3; uint8_t eutra_control_region = 3;
uint8_t num_bits_of_DCI =DCI->A[i]; //DCI->dci_bits_length; /// value to be passed through nfapi when filling the PHY structures uint8_t num_bits_of_DCI =DCI_1->A[i]; //DCI->dci_bits_length; /// value to be passed through nfapi when filling the PHY structures
uint32_t counter_rep = DCI->counter_repetition_number[i]; ////// Buffer for repetitions uint32_t counter_rep = DCI_1->counter_repetition_number[i]; ////// Buffer for repetitions
int G = get_G_NB_IoT(frame_parms); int G = get_G_NB_IoT(frame_parms);
//////////// uint8_t Nsf = DCI->number_of_subframes_for_resource_assignment; //////////// uint8_t Nsf = DCI->number_of_subframes_for_resource_assignment;
......
openair1/PHY/NBIoT_TRANSPORT/dlsch_demodulation_NB_IoT.c
View file @ ab857a55
...@@ -89,6 +89,7 @@ extern void print_shorts(char *s,int16_t *x); ...@@ -89,6 +89,7 @@ extern void print_shorts(char *s,int16_t *x);
int rx_npdsch_NB_IoT(PHY_VARS_UE_NB_IoT *ue, int rx_npdsch_NB_IoT(PHY_VARS_UE_NB_IoT *ue,
PDSCH_t type,
unsigned char eNB_id, unsigned char eNB_id,
unsigned char eNB_id_i, //if this == ue->n_connected_eNB, we assume MU interference unsigned char eNB_id_i, //if this == ue->n_connected_eNB, we assume MU interference
uint32_t frame, uint32_t frame,
......
openair1/PHY/NBIoT_TRANSPORT/proto_NB_IoT.h
View file @ ab857a55
...@@ -117,7 +117,7 @@ int allocate_REs_in_RB_NB_IoT(LTE_DL_FRAME_PARMS *frame_parms, ...@@ -117,7 +117,7 @@ int allocate_REs_in_RB_NB_IoT(LTE_DL_FRAME_PARMS *frame_parms,
uint8_t pilot_shift, uint8_t pilot_shift,
uint32_t *re_allocated); uint32_t *re_allocated);
int generate_NDLSCH_NB_IoT(PHY_VARS_eNB *eNB, int generate_NDLSCH_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,
NB_IoT_eNB_NDLSCH_t *RAR, NB_IoT_eNB_NDLSCH_t *RAR,
int32_t **txdataF, int32_t **txdataF,
int16_t amp, int16_t amp,
...@@ -127,7 +127,7 @@ int generate_NDLSCH_NB_IoT(PHY_VARS_eNB *eNB, ...@@ -127,7 +127,7 @@ int generate_NDLSCH_NB_IoT(PHY_VARS_eNB *eNB,
int RB_IoT_ID, int RB_IoT_ID,
uint8_t release_v13_5_0); uint8_t release_v13_5_0);
int generate_NPDCCH_NB_IoT(NB_IoT_eNB_NPDCCH_t *DCI_pdu, int generate_NPDCCH_NB_IoT(NB_IoT_eNB_NPDCCH_t *DCI_1,
int32_t **txdataF, int32_t **txdataF,
int16_t amp, int16_t amp,
LTE_DL_FRAME_PARMS *frame_parms, LTE_DL_FRAME_PARMS *frame_parms,
...@@ -588,6 +588,7 @@ void rotate_bpsk_NB_IoT(PHY_VARS_eNB *eNB, ...@@ -588,6 +588,7 @@ void rotate_bpsk_NB_IoT(PHY_VARS_eNB *eNB,
int rx_npdsch_NB_IoT(PHY_VARS_UE_NB_IoT *ue, int rx_npdsch_NB_IoT(PHY_VARS_UE_NB_IoT *ue,
PDSCH_t type,
unsigned char eNB_id, unsigned char eNB_id,
unsigned char eNB_id_i, //if this == ue->n_connected_eNB, we assume MU interference unsigned char eNB_id_i, //if this == ue->n_connected_eNB, we assume MU interference
uint32_t frame, uint32_t frame,
......
openair1/PHY/defs_L1_NB_IoT.h
View file @ ab857a55
...@@ -795,7 +795,7 @@ typedef struct PHY_VARS_eNB_NB_IoT_s { ...@@ -795,7 +795,7 @@ typedef struct PHY_VARS_eNB_NB_IoT_s {
NB_IoT_eNB_NPBCH_t *npbch; NB_IoT_eNB_NPBCH_t *npbch;
NB_IoT_eNB_NPDCCH_t *npdcch[NUMBER_OF_UE_MAX_NB_IoT]; NB_IoT_eNB_NPDCCH_t *npdcch[NUMBER_OF_UE_MAX_NB_IoT];
NB_IoT_eNB_NDLSCH_t *ndlsch[NUMBER_OF_UE_MAX_NB_IoT][2]; NB_IoT_eNB_NDLSCH_t *ndlsch[NUMBER_OF_UE_MAX_NB_IoT][2];
NB_IoT_eNB_NULSCH_t *nulsch[NUMBER_OF_UE_MAX_NB_IoT+1]; //nulsch[0] contains the RAR NB_IoT_eNB_NULSCH_t *ulsch_NB_IoT[NUMBER_OF_UE_MAX_NB_IoT+1]; //nulsch[0] contains the RAR
NB_IoT_eNB_NDLSCH_t *ndlsch_SI,*ndlsch_ra, *ndlsch_SIB1; NB_IoT_eNB_NDLSCH_t *ndlsch_SI,*ndlsch_ra, *ndlsch_SIB1;
NB_IoT_DL_FRAME_PARMS frame_parms_NB_IoT; NB_IoT_DL_FRAME_PARMS frame_parms_NB_IoT;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment