Cleanup nr transport header file

openair1/PHY/CODING/TESTBENCH/polartest.c

@@ -12,7 +12,6 @@
 #include "PHY/CODING/coding_defs.h"
 #include "SIMULATION/TOOLS/sim.h"
 #include "openair1/SIMULATION/NR_PHY/nr_unitary_defs.h"
-//#include "PHY/NR_TRANSPORT/nr_transport.h"
 //#include "common/utils/LOG/log.h"
 
 //#define DEBUG_DCI_POLAR_PARAMS

openair1/PHY/NR_TRANSPORT/nr_pbch.c

@@ -33,7 +33,6 @@
 
 #include "PHY/defs_gNB.h"
 #include "PHY/NR_TRANSPORT/nr_transport_proto.h"
-#include "PHY/NR_TRANSPORT/nr_transport.h"
 #include "PHY/LTE_REFSIG/lte_refsig.h"
 #include "PHY/sse_intrin.h"
 

openair1/PHY/NR_TRANSPORT/nr_transport.h

-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-#ifndef __NR_TRANSPORT__H__
-#define __NR_TRANSPORT__H__
-
-#define NR_PBCH_PDU_BITS 24
-
-#endif /*__NR_TRANSPORT__H__*/

openair1/PHY/NR_TRANSPORT/nr_transport_proto.h

@@ -30,10 +30,15 @@
 * \warning
 */
 
+#ifndef __NR_TRANSPORT__H__
+#define __NR_TRANSPORT__H__
+
 #include "PHY/defs_nr_common.h"
 #include "PHY/defs_gNB.h"
 #include "LAYER2/NR_MAC_gNB/mac_proto.h"
 
+#define NR_PBCH_PDU_BITS 24
+
 /*!
 \fn int nr_generate_pss
 \brief Generation of the NR PSS
@@ -307,3 +312,5 @@ int16_t find_nr_prach_ru(RU_t *ru,int frame,int slot, find_type_t type);
 void init_prach_list(PHY_VARS_gNB *gNB);
 void init_prach_ru_list(RU_t *ru);
 void free_nr_ru_prach_entry(RU_t *ru, int prach_id);
+
+#endif /*__NR_TRANSPORT__H__*/

openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c

@@ -30,7 +30,6 @@
  */
 #include "PHY/defs_nr_UE.h"
 #include "PHY/phy_extern_nr_ue.h"
-#include "PHY/NR_TRANSPORT/nr_transport.h"
 #include "PHY/NR_TRANSPORT/nr_transport_proto.h"
 #include "nr_transport_proto_ue.h"
 //#include "SCHED/defs.h"

openair1/SCHED_NR/fapi_nr_l1.c

@@ -31,7 +31,6 @@
  */
 #include "fapi_nr_l1.h"
 #include "PHY/NR_TRANSPORT/nr_transport_proto.h"
-#include "PHY/NR_TRANSPORT/nr_transport.h"
 #include "PHY/NR_TRANSPORT/nr_dlsch.h"
 #include "PHY/NR_TRANSPORT/nr_dci.h"
 

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -23,7 +23,6 @@
 #include "PHY/defs_gNB.h"
 #include "sched_nr.h"
 #include "PHY/NR_REFSIG/dmrs_nr.h"
-#include "PHY/NR_TRANSPORT/nr_transport.h"
 #include "PHY/NR_TRANSPORT/nr_transport_proto.h"
 #include "PHY/NR_TRANSPORT/nr_dlsch.h"
 #include "PHY/NR_TRANSPORT/nr_ulsch.h"

openair1/SIMULATION/NR_PHY/ulsim.c

@@ -41,7 +41,6 @@
 #include "PHY/NR_REFSIG/refsig_defs_ue.h"
 #include "PHY/NR_TRANSPORT/nr_dlsch.h"
 #include "PHY/NR_TRANSPORT/nr_sch_dmrs.h"
-#include "PHY/NR_TRANSPORT/nr_transport.h"
 #include "PHY/NR_TRANSPORT/nr_transport_proto.h"
 #include "PHY/NR_TRANSPORT/nr_ulsch.h"
 #include "PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h"