integration fix: let simulators compile again
- pucchsim - prachsim - pdcchsim - pbchsim - mbmssim Mostly, add and initialize the variable 'cpuf'. Also, pdcchsim was calling rx_pdcch with wrong arguments.
This commit is contained in:
@@ -50,6 +50,7 @@
|
|||||||
PHY_VARS_eNB *eNB;
|
PHY_VARS_eNB *eNB;
|
||||||
PHY_VARS_UE *UE;
|
PHY_VARS_UE *UE;
|
||||||
|
|
||||||
|
double cpuf;
|
||||||
|
|
||||||
DCI1E_5MHz_2A_M10PRB_TDD_t DLSCH_alloc_pdu2_1E[2];
|
DCI1E_5MHz_2A_M10PRB_TDD_t DLSCH_alloc_pdu2_1E[2];
|
||||||
#define UL_RB_ALLOC 0x1ff;
|
#define UL_RB_ALLOC 0x1ff;
|
||||||
@@ -118,6 +119,8 @@ int main(int argc, char **argv)
|
|||||||
#endif
|
#endif
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
cpuf = get_cpu_freq_GHz();
|
||||||
|
|
||||||
logInit();
|
logInit();
|
||||||
number_of_cards = 1;
|
number_of_cards = 1;
|
||||||
|
|
||||||
|
|||||||
@@ -50,6 +50,8 @@
|
|||||||
PHY_VARS_eNB *eNB,*eNB1,*eNB2;
|
PHY_VARS_eNB *eNB,*eNB1,*eNB2;
|
||||||
PHY_VARS_UE *UE;
|
PHY_VARS_UE *UE;
|
||||||
|
|
||||||
|
double cpuf;
|
||||||
|
|
||||||
#define DLSCH_RB_ALLOC 0x1fbf // igore DC component,RB13
|
#define DLSCH_RB_ALLOC 0x1fbf // igore DC component,RB13
|
||||||
|
|
||||||
int32_t *dummybuf[4];
|
int32_t *dummybuf[4];
|
||||||
@@ -116,6 +118,8 @@ int main(int argc, char **argv)
|
|||||||
char title[255];
|
char title[255];
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
cpuf = get_cpu_freq_GHz();
|
||||||
|
|
||||||
logInit();
|
logInit();
|
||||||
number_of_cards = 1;
|
number_of_cards = 1;
|
||||||
|
|
||||||
|
|||||||
@@ -50,6 +50,7 @@ PHY_VARS_UE *UE;
|
|||||||
#define CCCH_RB_ALLOC computeRIV(eNB->frame_parms.N_RB_UL,0,2)
|
#define CCCH_RB_ALLOC computeRIV(eNB->frame_parms.N_RB_UL,0,2)
|
||||||
#define DLSCH_RB_ALLOC ((uint16_t)0x1fbf) // igore DC component,RB13
|
#define DLSCH_RB_ALLOC ((uint16_t)0x1fbf) // igore DC component,RB13
|
||||||
|
|
||||||
|
double cpuf;
|
||||||
|
|
||||||
DCI_PDU DCI_pdu;
|
DCI_PDU DCI_pdu;
|
||||||
|
|
||||||
@@ -457,6 +458,8 @@ int main(int argc, char **argv)
|
|||||||
|
|
||||||
number_of_cards = 1;
|
number_of_cards = 1;
|
||||||
|
|
||||||
|
cpuf = get_cpu_freq_GHz();
|
||||||
|
|
||||||
logInit();
|
logInit();
|
||||||
|
|
||||||
|
|
||||||
@@ -1088,9 +1091,7 @@ int main(int argc, char **argv)
|
|||||||
UE->pdcch_vars[0][0]->crnti = n_rnti;
|
UE->pdcch_vars[0][0]->crnti = n_rnti;
|
||||||
|
|
||||||
// printf("Doing RX : num_pdcch_symbols at TX %d\n",num_pdcch_symbols);
|
// printf("Doing RX : num_pdcch_symbols at TX %d\n",num_pdcch_symbols);
|
||||||
rx_pdcch(&UE->common_vars,
|
rx_pdcch(UE,
|
||||||
UE->pdcch_vars[0],
|
|
||||||
&UE->frame_parms,
|
|
||||||
trial,
|
trial,
|
||||||
subframe,
|
subframe,
|
||||||
0,
|
0,
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ PHY_VARS_UE *UE;
|
|||||||
|
|
||||||
#define DLSCH_RB_ALLOC 0x1fbf // igore DC component,RB13
|
#define DLSCH_RB_ALLOC 0x1fbf // igore DC component,RB13
|
||||||
|
|
||||||
|
double cpuf;
|
||||||
|
|
||||||
extern uint16_t prach_root_sequence_map0_3[838];
|
extern uint16_t prach_root_sequence_map0_3[838];
|
||||||
|
|
||||||
@@ -99,6 +99,8 @@ int main(int argc, char **argv)
|
|||||||
int NCS_config = 1,rootSequenceIndex=0;
|
int NCS_config = 1,rootSequenceIndex=0;
|
||||||
int threequarter_fs = 0;
|
int threequarter_fs = 0;
|
||||||
|
|
||||||
|
cpuf = get_cpu_freq_GHz();
|
||||||
|
|
||||||
logInit();
|
logInit();
|
||||||
|
|
||||||
number_of_cards = 1;
|
number_of_cards = 1;
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ PHY_VARS_UE *UE;
|
|||||||
|
|
||||||
#define DLSCH_RB_ALLOC 0x1fbf // igore DC component,RB13
|
#define DLSCH_RB_ALLOC 0x1fbf // igore DC component,RB13
|
||||||
|
|
||||||
|
double cpuf;
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
@@ -101,6 +101,8 @@ int main(int argc, char **argv)
|
|||||||
|
|
||||||
number_of_cards = 1;
|
number_of_cards = 1;
|
||||||
|
|
||||||
|
cpuf = get_cpu_freq_GHz();
|
||||||
|
|
||||||
while ((c = getopt (argc, argv, "har:pf:g:n:s:S:x:y:z:N:F:T:R:")) != -1) {
|
while ((c = getopt (argc, argv, "har:pf:g:n:s:S:x:y:z:N:F:T:R:")) != -1) {
|
||||||
switch (c) {
|
switch (c) {
|
||||||
case 'a':
|
case 'a':
|
||||||
|
|||||||
Reference in New Issue
Block a user