--gNB and --nrUE compiles

cmake_targets/CMakeLists.txt

@@ -2422,7 +2422,7 @@ target_link_libraries (lte-uesoftmodem
   -Wl,--end-group z dl)
 
 target_link_libraries (lte-uesoftmodem ${LIBXML2_LIBRARIES})
-target_link_libraries (lte-uesoftmodem pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp ${PROTOBUF_LIB}  ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES} ${ATLAS_LIBRARIES})
+target_link_libraries (lte-uesoftmodem pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp ${PROTOBUF_LIB} ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES} ${ATLAS_LIBRARIES})
 target_link_libraries (lte-uesoftmodem ${LIB_LMS_LIBRARIES})
 target_link_libraries (lte-uesoftmodem ${T_LIB})
 

executables/nr-uesoftmodem.c

@@ -50,7 +50,6 @@
 #include "RRC/LTE/rrc_vars.h"
 #include "PHY_INTERFACE/phy_interface_vars.h"
 #include "openair1/SIMULATION/TOOLS/sim.h"
-#include "PHY/NR_UE_TRANSPORT/rlc_common_defs.h"
 
 #ifdef SMBV
 #include "PHY/TOOLS/smbv.h"
@@ -653,38 +652,8 @@ void init_pdcp(void) {
   LOG_I(PDCP, "Before getting out from init_pdcp() \n");
 }
 
-rlc_um_entity entity;
-struct my_socket mySocket;
-
-int start_socket( struct my_socket *mySocket, const char* tx_address, unsigned tx_port) {
-  mySocket->tx_sock = socket(AF_INET, SOCK_DGRAM, 0);
-  if(mySocket < 0) {
-    printf("tx socket creation error\n");
-    return -1;
-  } 
-  mySocket->tx_addr.sin_family = AF_INET;
-  mySocket->tx_addr.sin_port = htons(tx_port);
-  mySocket->tx_addr.sin_addr.s_addr = inet_addr(tx_address);
-
-
-  //(connect(sock, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0)
-  if( connect(mySocket->tx_sock, (struct sockaddr *)&mySocket->tx_addr, sizeof(mySocket->tx_addr)) < 0) {
-    printf("\nConnection Failed \n"); 
-    return -1;
-  }
-
-  sendto(mySocket->tx_sock , "hello\n" , strlen("hello\n") , 0, (struct sockaddr*)&(mySocket->tx_addr), sizeof(mySocket->tx_addr) );
-  
-  return 1;
-}
-
 
 int main( int argc, char **argv ) {
-  printf("****MAIN****\n");
-  printf("[LOG] creation of rlc entity\n");
-  rlc_entity_init(&entity, 6);
-  start_socket(&mySocket, "127.0.0.1", 2115);
-  
   //uint8_t beta_ACK=0,beta_RI=0,beta_CQI=2;
   PHY_VARS_NR_UE *UE[MAX_NUM_CCs];
   start_background_system();
@@ -814,10 +783,7 @@ int main( int argc, char **argv ) {
   printf("TYPE <CTRL-C> TO TERMINATE\n");
   init_NR_UE(1);
 
-  while(true)
-    sleep(3600);
-    
-//   rlc_entity_dest(&entity);
+  while(true) sleep(3600);
 
   if (ouput_vcd) vcd_signal_dumper_close();
 

openair1/SCHED_NR/fapi_nr_l1.h

@@ -37,12 +37,8 @@
 
 void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO);
 
-void handle_nfapi_nr_dci_dl_pdu(PHY_VARS_gNB *gNB,
-                                int frame, int subframe,
-                                nfapi_nr_dl_config_dci_dl_pdu *dcl_dl_pdu);
+void handle_nfapi_nr_dci_dl_pdu(PHY_VARS_gNB *gNB, int frame, int subframe, nfapi_nr_dl_config_dci_dl_pdu *dcl_dl_pdu);
 
-void handle_nr_nfapi_dlsch_pdu(PHY_VARS_gNB *gNB,int frame,int slot,
-                            nfapi_nr_dl_config_dlsch_pdu *dlsch_pdu,
-                            uint8_t *sdu);
+void handle_nr_nfapi_dlsch_pdu(PHY_VARS_gNB *gNB, int frame, int slot, nfapi_nr_dl_config_dlsch_pdu *dlsch_pdu, uint8_t *sdu);
 
 void nr_fill_rx_indication(PHY_VARS_gNB *gNB, int frame, int slot_rx, int UE_id, uint8_t harq_pid);