ulsim is functional

openair1/PHY/LTE_TRANSPORT/dci_tools.c

@@ -50,6 +50,8 @@
 #include "dci_tools_common_extern.h"
 #include "transport_proto.h"
 
+//#undef LOG_D
+//#define LOG_D(A,B...) printf(B)
 
 int16_t find_dlsch(uint16_t rnti, PHY_VARS_eNB *eNB,find_type_t type)
 {
@@ -2012,7 +2014,7 @@ void fill_ulsch(PHY_VARS_eNB *eNB,int UE_id,nfapi_ul_config_ulsch_pdu *ulsch_pdu
 
 #if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))
   ulsch->ue_type = ulsch_pdu->ulsch_pdu_rel13.ue_type;
-  AssertFatal(harq_pid ==0, "Harq PID is not zero for BL/CE UE\n");
+  AssertFatal(harq_pid ==0 || ulsch->ue_type == NOCE, "Harq PID is not zero for BL/CE UE\n");
 
 
 #else
@@ -2024,6 +2026,14 @@ void fill_ulsch(PHY_VARS_eNB *eNB,int UE_id,nfapi_ul_config_ulsch_pdu *ulsch_pdu
     LOG_E(PHY, "fill_ulsch UE_id %d nb_rb = 0\n", UE_id);
   }
 
+  ulsch->harq_processes[harq_pid]->frame                                 = frame;
+  ulsch->harq_processes[harq_pid]->subframe                              = subframe;
+  ulsch->harq_processes[harq_pid]->handled                               = 0;
+
+  ulsch->harq_processes[harq_pid]->first_rb                              = ulsch_pdu->ulsch_pdu_rel8.resource_block_start;
+  ulsch->harq_processes[harq_pid]->nb_rb                                 = ulsch_pdu->ulsch_pdu_rel8.number_of_resource_blocks;
+
+
   ulsch->harq_processes[harq_pid]->dci_alloc                             = 1;
   ulsch->harq_processes[harq_pid]->rar_alloc                             = 0;
   ulsch->harq_processes[harq_pid]->n_DMRS                                = ulsch_pdu->ulsch_pdu_rel8.cyclic_shift_2_for_drms;

openair1/SIMULATION/LTE_PHY/ulsim.c

@@ -500,9 +500,9 @@ int main(int argc, char **argv) {
   // enable these lines if you need debug info
   // however itti will catch all signals, so ctrl-c won't work anymore
   // alternatively you can disable ITTI completely in CMakeLists.txt
-  //itti_init(TASK_MAX, THREAD_MAX, MESSAGES_ID_MAX, tasks_info, messages_info, messages_definition_xml, NULL);
-  //set_comp_log(PHY,LOG_DEBUG,LOG_MED,1);
-  //set_glog(LOG_DEBUG,LOG_MED);
+  //  itti_init(TASK_MAX, THREAD_MAX, MESSAGES_ID_MAX, tasks_info, messages_info, messages_definition_xml, NULL);
+  //  set_comp_log(PHY,LOG_DEBUG,LOG_HIGH,1);
+  //  set_glog(LOG_DEBUG,LOG_HIGH);
   //hapZEbm:n:Y:X:x:s:w:e:q:d:D:O:c:r:i:f:y:c:oA:C:R:g:N:l:S:T:QB:PI:LF
   static paramdef_t options[] = {
     { "awgn", "Additive white gaussian noise", PARAMFLAG_BOOL, strptr:NULL, defintval:0, TYPE_INT, 0, NULL, NULL },