diff --git a/openair1/PHY/LTE_TRANSPORT/dci_tools.c b/openair1/PHY/LTE_TRANSPORT/dci_tools.c index dbe06ea6bad17967707ae7681b0968da6f5391c0..2f578d9cc1b3cea4bf59a24df2f97c218565070c 100644 --- a/openair1/PHY/LTE_TRANSPORT/dci_tools.c +++ b/openair1/PHY/LTE_TRANSPORT/dci_tools.c @@ -6221,6 +6221,9 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu, if (dci_format == format0) { + if (!ulsch) + return -1; + if (rnti == ra_rnti) harq_pid = 0; else diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpb210.conf index 8144147ea587693e9314e22a299447b6ec351553..10da79724a1217e089344a695e5602bab705aef4 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpb210.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpb210.conf @@ -31,7 +31,7 @@ eNBs = tdd_config_s = 0; prefix_type = "NORMAL"; eutra_band = 7; - downlink_frequency = 2645000000L; + downlink_frequency = 2680000000L; uplink_frequency_offset = -120000000; Nid_cell = 0; N_RB_DL = 100; diff --git a/targets/RT/USER/eNB_usrp.gtkw b/targets/RT/USER/eNB_usrp.gtkw index 44401bd25e32b8e739f6dc7508354247f815896d..47f505031e445fc9a5d32d41ac4eb9c0a4c96357 100644 --- a/targets/RT/USER/eNB_usrp.gtkw +++ b/targets/RT/USER/eNB_usrp.gtkw @@ -1,19 +1,19 @@ [*] [*] GTKWave Analyzer v3.3.58 (w)1999-2014 BSI -[*] Sun Jul 24 14:21:37 2016 +[*] Wed Aug 31 12:37:04 2016 [*] [dumpfile] "/tmp/openair_dump_eNB.vcd" -[dumpfile_mtime] "Sun Jul 24 14:18:00 2016" -[dumpfile_size] 7104337 +[dumpfile_mtime] "Wed Aug 31 11:48:14 2016" +[dumpfile_size] 411905827 [savefile] "/home/papillon/openairinterface5g/targets/RT/USER/eNB_usrp.gtkw" [timestart] 10621768000 -[size] 1535 724 +[size] 1236 578 [pos] 309 0 *-19.793451 29026062100 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -[sst_width] 284 +[sst_width] 386 [signals_width] 262 [sst_expanded] 1 -[sst_vpaned_height] 294 +[sst_vpaned_height] 146 @28 functions.trx_read functions.trx_write @@ -28,14 +28,21 @@ variables.subframe_number_RX0_eNB[63:0] variables.frame_number_TX0_eNB[63:0] variables.subframe_number_TX0_eNB[63:0] @28 +functions.phy_procedures_eNb_rx_common0 +functions.phy_procedures_eNb_rx_uespec0 +functions.phy_procedures_eNb_tx0 functions.eNB_thread_rxtx1 @24 variables.frame_number_RX1_eNB[63:0] variables.subframe_number_RX1_eNB[63:0] variables.frame_number_TX1_eNB[63:0] -@25 variables.subframe_number_TX1_eNB[63:0] @28 +functions.phy_procedures_eNb_rx_common1 +functions.phy_procedures_eNb_rx_uespec1 +@29 +functions.phy_procedures_eNb_tx1 +@28 functions.phy_enb_sfgen functions.phy_eNB_slot_fep functions.phy_enb_prach_rx diff --git a/targets/RT/USER/lte-enb.c b/targets/RT/USER/lte-enb.c index a7a0314bdc3c3fc52412d01a1f87fea9e2fbb783..9f2a108f5b0d4de34ab054d7071710729c99f12b 100644 --- a/targets/RT/USER/lte-enb.c +++ b/targets/RT/USER/lte-enb.c @@ -191,7 +191,7 @@ static inline void thread_top_init(char *thread_name, exit_fun("Error setting deadline scheduler"); } - LOG_I( HW, "[SCHED] eNB %s deadline thread (TID %ld) started on CPU %d\n", gettid(), thread_name,sched_getcpu() ); + LOG_I( HW, "[SCHED] eNB %s deadline thread started on CPU %d\n", thread_name,sched_getcpu() ); #else //LOW_LATENCY int policy, s, j; @@ -880,7 +880,7 @@ void rx_rf(PHY_VARS_eNB *eNB,int *frame,int *subframe) { void *rxp[fp->nb_antennas_rx],*txp[fp->nb_antennas_tx]; unsigned int rxs,txs; int i; - int tx_sfoffset = (eNB->single_thread_flag == 1) ? 3 : 3; + int tx_sfoffset = 2;//(eNB->single_thread_flag == 1) ? 3 : 3; if (proc->first_rx==0) { // Transmit TX buffer based on timestamp from RX