Commit 6988893a authored by Matthieu Kanj's avatar Matthieu Kanj

optimizing parameters

parent 0dbd5a61
...@@ -124,11 +124,10 @@ void ccode_encode_npdsch_NB_IoT (int32_t numbits, ...@@ -124,11 +124,10 @@ void ccode_encode_npdsch_NB_IoT (int32_t numbits,
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
int dlsch_encoding_NB_IoT(unsigned char *a, int dlsch_encoding_NB_IoT(unsigned char *a,
NB_IoT_eNB_NDLSCH_t *dlsch, //NB_IoT_eNB_NDLSCH_t NB_IoT_eNB_NDLSCH_t *dlsch, //NB_IoT_eNB_NDLSCH_t
uint8_t Nsf, // number of subframes required for npdsch pdu transmission calculated from Isf (3GPP spec table) uint8_t Nsf, // number of subframes required for npdsch pdu transmission calculated from Isf (3GPP spec table)
unsigned int G, unsigned int G) // G (number of available RE) is implicitly multiplied by 2 (since only QPSK modulation)
uint8_t option) // G (number of available RE) is implicitly multiplied by 2 (since only QPSK modulation)
{ {
uint32_t crc = 1; uint32_t crc = 1;
//unsigned char harq_pid = dlsch->current_harq_pid; // to check during implementation if harq_pid is required in the NB_IoT_eNB_DLSCH_t structure in defs_NB_IoT.h //unsigned char harq_pid = dlsch->current_harq_pid; // to check during implementation if harq_pid is required in the NB_IoT_eNB_DLSCH_t structure in defs_NB_IoT.h
......
...@@ -321,8 +321,7 @@ int dlsch_modulation_rar_NB_IoT(int32_t **txdataF, ...@@ -321,8 +321,7 @@ int dlsch_modulation_rar_NB_IoT(int32_t **txdataF,
int32_t dlsch_encoding_NB_IoT(unsigned char *a, int32_t dlsch_encoding_NB_IoT(unsigned char *a,
NB_IoT_eNB_NDLSCH_t *dlsch, // NB_IoT_eNB_NDLSCH_t NB_IoT_eNB_NDLSCH_t *dlsch, // NB_IoT_eNB_NDLSCH_t
uint8_t Nsf, // number of subframes required for npdsch pdu transmission calculated from Isf (3GPP spec table) uint8_t Nsf, // number of subframes required for npdsch pdu transmission calculated from Isf (3GPP spec table)
unsigned int G, unsigned int G); // G (number of available RE) is implicitly multiplied by 2 (since only QPSK modulation)
uint8_t option); // G (number of available RE) is implicitly multiplied by 2 (since only QPSK modulation)
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
......
...@@ -683,8 +683,7 @@ if(proc->flag_msg4 == 1 && proc->counter_msg4 > 0) ...@@ -683,8 +683,7 @@ if(proc->flag_msg4 == 1 && proc->counter_msg4 > 0)
dlsch_encoding_NB_IoT(tab_rar, dlsch_encoding_NB_IoT(tab_rar,
rar, rar,
1, ///// number_of_subframes_required 1, ///// number_of_subframes_required
236, 236); //////////// G*2 // option =2 for msg4
1); //////////// G*2 // option =2 for msg4
dlsch_scrambling_Gen_NB_IoT(fp, dlsch_scrambling_Gen_NB_IoT(fp,
......
...@@ -331,8 +331,7 @@ void common_signal_procedures_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc) ...@@ -331,8 +331,7 @@ void common_signal_procedures_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc)
dlsch_encoding_NB_IoT(sib1_pdu, dlsch_encoding_NB_IoT(sib1_pdu,
sib1, sib1,
8, ///// number_of_subframes_required 8, ///// number_of_subframes_required
get_G_NB_IoT(fp), get_G_NB_IoT(fp)); //////////// G*2
1); //////////// G*2
dlsch_scrambling_Gen_NB_IoT(fp, dlsch_scrambling_Gen_NB_IoT(fp,
sib1, sib1,
...@@ -352,7 +351,7 @@ void common_signal_procedures_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc) ...@@ -352,7 +351,7 @@ void common_signal_procedures_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc)
4, 4,
RB_IoT_ID); RB_IoT_ID);
} }
///////////////////////////////////////////////////////// END //////////////////////////////////////////////////////// ///////////////////////////////////////////////////////// END ////////////////////////////////////////////////////////
//////////////////////////////////////////////////// SIB23 //////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////// SIB23 ////////////////////////////////////////////////////////////////////////
...@@ -368,8 +367,7 @@ void common_signal_procedures_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc) ...@@ -368,8 +367,7 @@ void common_signal_procedures_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc)
dlsch_encoding_NB_IoT(sib23_pdu, dlsch_encoding_NB_IoT(sib23_pdu,
sib23, sib23,
8, ///// number_of_subframes_required 8, ///// number_of_subframes_required
236, 236); //////////// G*2
2); //////////// G*2
dlsch_scrambling_Gen_NB_IoT(fp, // is called only in subframe 4 dlsch_scrambling_Gen_NB_IoT(fp, // is called only in subframe 4
sib23, sib23,
......
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