Merge branch 'next' into sync_states

CHANGELOG

@@ -1,6 +1,13 @@
 Change Log for Releases
 ==============================
 
+## 18.03.1
+  * Fixed compilation for NEON
+  * Fixed logging and RLC AM issue
+
+## 18.03
+  * Many bug-fixes and improved stability and performance in all parts
+
 ## 17.12
   * Added support for MIMO 2x2 in srsENB (i.e. TM3/TM4)
   * Added srsEPC, a light-weight core network implementation

CMakeLists.txt

@@ -41,8 +41,6 @@ include(SRSLTEVersion) #sets version information
 include(SRSLTEPackage) #setup cpack
 
 include(CTest)
-set(CTEST_MEMORYCHECK_COMMAND valgrind)
-set(CTEST_MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --leak-check=full" )
 
 configure_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/CTestCustom.cmake.in"
@@ -171,7 +169,6 @@ if(ENABLE_SRSUE OR ENABLE_SRSENB OR ENABLE_SRSEPC)
 
   set(BOOST_REQUIRED_COMPONENTS
       program_options
-      system
   )
   if(UNIX AND EXISTS "/usr/lib64")
       list(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix
@@ -229,7 +226,7 @@ macro(ADD_CXX_COMPILER_FLAG_IF_AVAILABLE flag have)
 endmacro(ADD_CXX_COMPILER_FLAG_IF_AVAILABLE)
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${GCC_ARCH} -Wall -Wno-comment -Wno-reorder -Wno-unused-but-set-variable -Wno-unused-variable -std=c++03")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${GCC_ARCH} -Wall -Wno-comment -Wno-reorder -Wno-unused-but-set-variable -Wno-unused-variable -Wformat -std=c++03")
 
   find_package(SSE)
   if (HAVE_AVX2)

CTestConfig.cmake

@@ -11,3 +11,4 @@ set(CTEST_DROP_METHOD "http")
 set(CTEST_DROP_SITE "my.cdash.org")
 set(CTEST_DROP_LOCATION "/submit.php?project=srsLTE")
 set(CTEST_DROP_SITE_CDASH TRUE)
+set(VALGRIND_COMMAND_OPTIONS "--trace-children=yes --leak-check=full --show-reachable=yes --vex-guest-max-insns=25")

README.md

@@ -102,7 +102,7 @@ Build Instructions
 
 For example, on Ubuntu 17.04, one can install the required libraries with:
 ```
-sudo apt-get install cmake libfftw3-dev libmbedtls-dev libboost-program-options-dev libboost-thread-dev libconfig++-dev libsctp-dev
+sudo apt-get install cmake libfftw3-dev libmbedtls-dev libboost-program-options-dev libconfig++-dev libsctp-dev
 ```
 Note that depending on your flavor and version of Linux, the actual package names may be different.
 

cmake/modules/SRSLTEVersion.cmake

@@ -18,7 +18,7 @@
 # and at http://www.gnu.org/licenses/.
 #
 
-SET(SRSLTE_VERSION_MAJOR 17)
+SET(SRSLTE_VERSION_MAJOR 18)
-SET(SRSLTE_VERSION_MINOR 12)
+SET(SRSLTE_VERSION_MINOR 3)
-SET(SRSLTE_VERSION_PATCH 0)
+SET(SRSLTE_VERSION_PATCH 1)
 SET(SRSLTE_VERSION_STRING "${SRSLTE_VERSION_MAJOR}.${SRSLTE_VERSION_MINOR}.${SRSLTE_VERSION_PATCH}")

lib/include/srslte/asn1/gtpc.h

@@ -21,8 +21,8 @@
  * and at http://www.gnu.org/licenses/.
  *
  */
-#ifndef GTPC_V2_H
+#ifndef SRSLTE_GTPC_H
-#define GTPC_V2_H
+#define SRSLTE_GTPC_H
 
 #include <stdint.h>
 #include "srslte/asn1/gtpc_msg.h"
@@ -52,16 +52,15 @@ const uint8_t GTPC_V2 = 2;
  * n+2    |           Sequence            |
  * n+3    |            Spare              |
  ***************************************************************************/
-
+typedef struct gtpc_header
-  typedef struct gtpc_header
+{
-  {
+  uint8_t version;
-    uint8_t version;
+  bool piggyback;
-    bool piggyback;
+  bool teid_present;
-    bool teid_present;
+  uint8_t type;
-    uint8_t type;
+  uint64_t teid;
-    uint64_t teid;
+  uint64_t sequence;
-    uint64_t sequence;
+}gtpc_header_t;
-  } gtpc_header_t;
 
 /****************************************************************************
  * GTP-C v2 Payload
@@ -69,16 +68,17 @@ const uint8_t GTPC_V2 = 2;
  *
  * Union that hold the different structures for the possible message types.
  ***************************************************************************/
-
 typedef union gtpc_msg_choice
 {
   struct gtpc_create_session_request create_session_request;
   struct gtpc_create_session_response create_session_response;
   struct gtpc_modify_bearer_request modify_bearer_request;
   struct gtpc_modify_bearer_response modify_bearer_response;
+  struct gtpc_release_access_bearers_request release_access_bearers_request;
+  struct gtpc_release_access_bearers_response release_access_bearers_response;
   struct gtpc_delete_session_request delete_session_request;
   struct gtpc_delete_session_response delete_session_response;
-} gtpc_msg_choice_t;
+}gtpc_msg_choice_t;
 
 /****************************************************************************
  * GTP-C v2 Message
@@ -88,15 +88,10 @@ typedef union gtpc_msg_choice
  * of one GTP-C header and one union of structures, which can hold
  * all the possible GTP-C messages
  ***************************************************************************/
-
 typedef struct gtpc_pdu
 {
   struct gtpc_header header;
   union gtpc_msg_choice choice;
-} gtpc_pdu_t;
+}gtpc_pdu_t;
-
+}//namespace
-
+#endif // SRSLTE_GTPC_H
-
-};
-
-#endif

lib/include/srslte/asn1/gtpc_ies.h

@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef GTPC_IES_H
+#ifndef SRSLTE_GTPC_IES_H
-#define GTPC_IES_H
+#define SRSLTE_GTPC_IES_H
 
 #include "srslte/phy/io/netsource.h"
 
@@ -400,7 +400,8 @@ enum gtpc_interface_type
   S2B_U_PGW_GTP_U_INTERFACE
 };
 
-struct gtpc_f_teid_ie
+
+typedef struct gtpc_f_teid_ie
 {
   bool ipv4_present;
   bool ipv6_present;
@@ -408,7 +409,7 @@ struct gtpc_f_teid_ie
   uint32_t teid;
   in_addr_t  ipv4;
   struct in6_addr ipv6; //FIXME
-};
+} gtp_fteid_t;
 
 //TODO
 //TODO IEs between 8.22 and 8.28 missing
@@ -425,4 +426,4 @@ struct gtpc_f_teid_ie
 //locally, according to the rules of  TS 29.274 v10.14.0 Section 7.
 
 } //namespace
-#endif //GTPC_IES_H
+#endif // SRSLTE_GTPC_IES_H

lib/include/srslte/asn1/gtpc_msg.h

@@ -21,8 +21,8 @@
  * and at http://www.gnu.org/licenses/.
  *
  */
-#ifndef GTPC_V2_MSG_H
+#ifndef SRSLTE_GTPC_MSG_H
-#define GTPC_V2_MSG_H
+#define SRSLTE_GTPC_MSG_H
 
 #include "srslte/asn1/gtpc_ies.h"
 
@@ -410,5 +410,36 @@ struct gtpc_delete_session_response
   //Private extension
 };
 
+/****************************************************************************
+ *
+ * GTP-C v2 Release Access Bearers Request
+ * Ref: 3GPP TS 29.274 v10.14.0 Table 7.2.21.1-1
+ *
+ ***************************************************************************/
+struct gtpc_release_access_bearers_request
+{
+  bool list_of_rabs_present;
+  //Linked EPS Bearer ID
+  bool originating_node_present;
+  //Indication Flags
+  //Private Extension
+};
+
+  /****************************************************************************
+   *
+   * GTP-C v2 Delete Session Response
+   * Ref: 3GPP TS 29.274 v10.14.0 Table 7.2.22.1-1
+   *
+   ***************************************************************************/
+
+  struct gtpc_release_access_bearers_response
+  {
+    struct gtpc_cause_ie cause;
+    //Recovery
+    //Private extension
+  };
+
+
+
 } //namespace
-#endif //GTPC_V2_MSG_H
+#endif // SRSLTE_GTPC_MSG_H

lib/include/srslte/asn1/liblte_common.h

@@ -33,8 +33,8 @@
 
 *******************************************************************************/
 
-#ifndef __LIBLTE_COMMON_H__
+#ifndef SRSLTE_LIBLTE_COMMON_H
-#define __LIBLTE_COMMON_H__
+#define SRSLTE_LIBLTE_COMMON_H
 
 /*******************************************************************************
                               INCLUDES
@@ -244,4 +244,4 @@ void liblte_align_up(uint8_t **ptr, uint32_t align);
 *********************************************************************/
 void liblte_align_up_zero(uint8_t **ptr, uint32_t align);
 
-#endif /* __LIBLTE_COMMON_H__ */
+#endif // SRSLTE_LIBLTE_COMMON_H

lib/include/srslte/asn1/liblte_mme.h

@@ -35,8 +35,8 @@
 
 *******************************************************************************/
 
-#ifndef __LIBLTE_MME_H__
+#ifndef SRSLTE_LIBLTE_MME_H
-#define __LIBLTE_MME_H__
+#define SRSLTE_LIBLTE_MME_H
 
 /*******************************************************************************
                               INCLUDES
@@ -175,6 +175,7 @@ typedef struct{
     uint8 imsi[15];
     uint8 imei[15];
     uint8 imeisv[16];
+    uint32 tmsi;
 }LIBLTE_MME_MOBILE_ID_STRUCT;
 // Functions
 LIBLTE_ERROR_ENUM liblte_mme_pack_mobile_id_ie(LIBLTE_MME_MOBILE_ID_STRUCT  *mobile_id,
@@ -4037,4 +4038,4 @@ LIBLTE_ERROR_ENUM liblte_mme_pack_pdn_disconnect_request_msg(LIBLTE_MME_PDN_DISC
 LIBLTE_ERROR_ENUM liblte_mme_unpack_pdn_disconnect_request_msg(LIBLTE_BYTE_MSG_STRUCT                       *msg,
                                                                LIBLTE_MME_PDN_DISCONNECT_REQUEST_MSG_STRUCT *pdn_discon_req);
 
-#endif /* __LIBLTE_MME_H__ */
+#endif // SRSLTE_LIBLTE_MME_H

lib/include/srslte/asn1/liblte_rrc.h

@@ -51,8 +51,8 @@
 
 *******************************************************************************/
 
-#ifndef __LIBLTE_RRC_H__
+#ifndef SRSLTE_LIBLTE_RRC_H
-#define __LIBLTE_RRC_H__
+#define SRSLTE_LIBLTE_RRC_H
 
 /*******************************************************************************
                               INCLUDES
@@ -7013,4 +7013,4 @@ LIBLTE_ERROR_ENUM liblte_rrc_pack_ul_dcch_msg(LIBLTE_RRC_UL_DCCH_MSG_STRUCT *ul_
 LIBLTE_ERROR_ENUM liblte_rrc_unpack_ul_dcch_msg(LIBLTE_BIT_MSG_STRUCT         *msg,
                                                 LIBLTE_RRC_UL_DCCH_MSG_STRUCT *ul_dcch_msg);
 
-#endif /* __LIBLTE_RRC_H__ */
+#endif // SRSLTE_LIBLTE_RRC_H

lib/include/srslte/asn1/liblte_s1ap.h

@@ -4,8 +4,8 @@
 /*
 ********************************************************************************/
 
-#ifndef LIBLTE_S1AP_H
+#ifndef SRSLTE_LIBLTE_S1AP_H
-#define LIBLTE_S1AP_H
+#define SRSLTE_LIBLTE_S1AP_H
 
 /*******************************************************************************
 /* Warnings/Todos
@@ -10352,4 +10352,4 @@ LIBLTE_ERROR_ENUM liblte_s1ap_pack_s1ap_pdu(
 LIBLTE_ERROR_ENUM liblte_s1ap_unpack_s1ap_pdu(
   LIBLTE_BYTE_MSG_STRUCT      *msg,
   LIBLTE_S1AP_S1AP_PDU_STRUCT *s1ap_pdu);
-#endif // LIBLTE_S1AP_H
+#endif // SRSLTE_LIBLTE_S1AP_H

lib/include/srslte/build_info.h.in

@@ -25,8 +25,8 @@
  *
  */
 
-#ifndef BUILD_INFO_
+#ifndef SRSLTE_BUILD_INFO_H_IN
-#define BUILD_INFO_
+#define SRSLTE_BUILD_INFO_H_IN
 
 # ifdef __cplusplus
 extern "C" {

lib/include/srslte/common/bcd_helpers.h

@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef BCD_HELPERS
+#ifndef SRSLTE_BCD_HELPERS_H
-#define BCD_HELPERS
+#define SRSLTE_BCD_HELPERS_H
 
 #include <ctype.h>
 #include <stdint.h>
@@ -194,4 +194,4 @@ inline void s1ap_mccmnc_to_plmn(uint16_t mcc, uint16_t mnc, uint32_t *plmn)
 
 } // namespace srslte
 
-#endif // BCD_HELPERS
+#endif // SRSLTE_BCD_HELPERS_H

lib/include/srslte/common/block_queue.h

@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef BLOCK_QUEUE
+#ifndef SRSLTE_BLOCK_QUEUE_H
-#define BLOCK_QUEUE
+#define SRSLTE_BLOCK_QUEUE_H
 
 #include <queue>
 #include <memory>
@@ -94,4 +94,4 @@ private:
 
 }
 
-#endif
+#endif // SRSLTE_BLOCK_QUEUE_H

lib/include/srslte/common/buffer_pool.h

@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef BUFFER_POOL_H
+#ifndef SRSLTE_BUFFER_POOL_H
-#define BUFFER_POOL_H
+#define SRSLTE_BUFFER_POOL_H
 
 #include <pthread.h>
 #include <vector>
@@ -187,4 +187,4 @@ private:
 
 } // namespace srsue
 
-#endif // BUFFER_POOL_H
+#endif // SRSLTE_BUFFER_POOL_H

lib/include/srslte/common/common.h

@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef COMMON_H
+#ifndef SRSLTE_COMMON_H
-#define COMMON_H
+#define SRSLTE_COMMON_H
 
 /*******************************************************************************
                               INCLUDES
@@ -147,6 +147,11 @@ public:
     {
       return msg-buffer;
     }
+    // Returns the remaining space from what is reported to be the length of msg
+    uint32_t get_tailroom()
+    {
+      return (sizeof(buffer) - (msg-buffer) - N_bytes);
+    }
     long get_latency_us()
     {
 #ifdef ENABLE_TIMESTAMP
@@ -234,6 +239,6 @@ private:
 
 };
 
-} // namespace srsue
+} // namespace srslte
 
-#endif // COMMON_H
+#endif // SRSLTE_COMMON_H

lib/include/srslte/common/config.h

@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef CONFIG_H
+#ifndef SRSLTE_CONFIG_H
-#define CONFIG_H
+#define SRSLTE_CONFIG_H
 
 // Generic helper definitions for shared library support
 #if defined _WIN32 || defined __CYGWIN__
@@ -54,4 +54,4 @@
 // cf_t definition
 typedef _Complex float cf_t;
 
-#endif // CONFIG_H
+#endif // SRSLTE_CONFIG_H

lib/include/srslte/common/interfaces_common.h

@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef INTERFACE_COMMON_H
+#ifndef SRSLTE_INTERFACES_COMMON_H
-#define INTERFACE_COMMON_H
+#define SRSLTE_INTERFACES_COMMON_H
 
 #include "srslte/common/timers.h"
 #include "srslte/common/security.h"
@@ -96,4 +96,4 @@ public:
 
 }
 
-#endif
+#endif // SRSLTE_INTERFACES_COMMON_H

lib/include/srslte/common/liblte_security.h

@@ -29,8 +29,8 @@
 
 *******************************************************************************/
 
-#ifndef __LIBLTE_SECURITY_H__
+#ifndef SRSLTE_LIBLTE_SECURITY_H
-#define __LIBLTE_SECURITY_H__
+#define SRSLTE_LIBLTE_SECURITY_H
 
 /*******************************************************************************
                               INCLUDES
@@ -345,4 +345,4 @@ LIBLTE_ERROR_ENUM liblte_security_milenage_f5_star(uint8 *k,
                                                    uint8 *rand,
                                                    uint8 *ak);
 
-#endif /* __LIBLTE_SECURITY_H__ */
+#endif // SRSLTE_LIBLTE_SECURITY_H

lib/include/srslte/common/liblte_ssl.h

@@ -1,5 +1,5 @@
-#ifndef __LIBLTE_SSL_H__
+#ifndef SRSLTE_LIBLTE_SSL_H
-#define __LIBLTE_SSL_H__
+#define SRSLTE_LIBLTE_SSL_H
 
 #ifdef HAVE_POLARSSL
 
@@ -62,4 +62,4 @@ void sha256(const unsigned char *key, size_t keylen,
 
 #endif // HAVE_MBEDTLS
 
-#endif // __LIBLTE_SSL_H__
+#endif // SRSLTE_LIBLTE_SSL_H

lib/include/srslte/common/log.h

@@ -32,8 +32,8 @@
  *  Reference:
  *****************************************************************************/
 
-#ifndef LOG_H
+#ifndef SRSLTE_LOG_H
-#define LOG_H
+#define SRSLTE_LOG_H
 
 #include <stdint.h>
 #include <string>
@@ -122,17 +122,21 @@ public:
   }
 
   // Pure virtual methods for logging
-  virtual void console(std::string message, ...) = 0;
+  virtual void console(const char * message, ...) __attribute__ ((format (printf, 2, 3))) = 0;
-  virtual void error(std::string message, ...)   = 0;
+  virtual void error(const char * message, ...)   __attribute__ ((format (printf, 2, 3))) = 0;
-  virtual void warning(std::string message, ...) = 0;
+  virtual void warning(const char * message, ...) __attribute__ ((format (printf, 2, 3))) = 0;
-  virtual void info(std::string message, ...)    = 0;
+  virtual void info(const char * message, ...)    __attribute__ ((format (printf, 2, 3))) = 0;
-  virtual void debug(std::string message, ...)   = 0;
+  virtual void debug(const char * message, ...)   __attribute__ ((format (printf, 2, 3))) = 0;
 
   // Same with hex dump
-  virtual void error_hex(uint8_t *hex, int size, std::string message, ...){error("error_hex not implemented.\n");}
+  virtual void error_hex(const uint8_t *hex, int size, const char *, ...)   __attribute__((format (printf, 4, 5)))
-  virtual void warning_hex(uint8_t *hex, int size, std::string message, ...){error("warning_hex not implemented.\n");}
+    {error("error_hex not implemented.\n");}
-  virtual void info_hex(uint8_t *hex, int size, std::string message, ...){error("info_hex not implemented.\n");}
+  virtual void warning_hex(const uint8_t *hex, int size, const char *, ...) __attribute__((format (printf, 4, 5)))
-  virtual void debug_hex(uint8_t *hex, int size, std::string message, ...){error("debug_hex not implemented.\n");}
+    {error("warning_hex not implemented.\n");}
+  virtual void info_hex(const uint8_t *hex, int size, const char *, ...)    __attribute__((format (printf, 4, 5)))
+    {error("info_hex not implemented.\n");}
+  virtual void debug_hex(const uint8_t *hex, int size, const char *, ...)   __attribute__((format (printf, 4, 5)))
+    {error("debug_hex not implemented.\n");}
 
 protected:
   std::string get_service_name() { return service_name; }
@@ -149,5 +153,5 @@ protected:
 
 } // namespace srslte
 
-#endif // LOG_H
+#endif // SRSLTE_LOG_H
 

lib/include/srslte/common/log_filter.h

@@ -32,8 +32,8 @@
  *              common logger object.
  *****************************************************************************/
 
-#ifndef LOG_FILTER_H
+#ifndef SRSLTE_LOG_FILTER_H
-#define LOG_FILTER_H
+#define SRSLTE_LOG_FILTER_H
 
 #include <stdarg.h>
 #include <string>
@@ -57,16 +57,16 @@ public:
 
   void init(std::string layer, logger *logger_, bool tti=false);
 
-  void console(std::string message, ...);
+  void console(const char * message, ...) __attribute__ ((format (printf, 2, 3)));
-  void error(std::string message, ...);
+  void error(const char * message, ...)   __attribute__ ((format (printf, 2, 3)));
-  void warning(std::string message, ...);
+  void warning(const char * message, ...) __attribute__ ((format (printf, 2, 3)));
-  void info(std::string message, ...);
+  void info(const char * message, ...)    __attribute__ ((format (printf, 2, 3)));
-  void debug(std::string message, ...);
+  void debug(const char * message, ...)   __attribute__ ((format (printf, 2, 3)));
 
-  void error_hex(uint8_t *hex, int size, std::string message, ...);
+  void error_hex(const uint8_t *hex, int size, const char * message, ...)   __attribute__((format (printf, 4, 5)));
-  void warning_hex(uint8_t *hex, int size, std::string message, ...);
+  void warning_hex(const uint8_t *hex, int size, const char * message, ...) __attribute__((format (printf, 4, 5)));
-  void info_hex(uint8_t *hex, int size, std::string message, ...);
+  void info_hex(const uint8_t *hex, int size, const char * message, ...)    __attribute__((format (printf, 4, 5)));
-  void debug_hex(uint8_t *hex, int size, std::string message, ...);
+  void debug_hex(const uint8_t *hex, int size, const char * message, ...)   __attribute__((format (printf, 4, 5)));
 
   class time_itf {
   public:
@@ -89,13 +89,13 @@ private:
 
   logger_stdout def_logger_stdout;
 
-  void all_log(srslte::LOG_LEVEL_ENUM level, uint32_t tti, char *msg);
+  void all_log(srslte::LOG_LEVEL_ENUM level, uint32_t tti, const char *msg);
-  void all_log(srslte::LOG_LEVEL_ENUM level, uint32_t tti, char *msg, uint8_t *hex, int size);
+  void all_log(srslte::LOG_LEVEL_ENUM level, uint32_t tti, const char *msg, const uint8_t *hex, int size);
   void all_log_line(srslte::LOG_LEVEL_ENUM level, uint32_t tti, std::string file, int line, char *msg);
   std::string now_time();
-  std::string hex_string(uint8_t *hex, int size);
+  std::string hex_string(const uint8_t *hex, int size);
 };
 
 } // namespace srsue
 
-#endif // LOG_FILTER_H
+#endif // SRSLTE_LOG_FILTER_H

lib/include/srslte/common/logger.h

@@ -29,8 +29,8 @@
  * Description: Interface for logging output
  *****************************************************************************/
 
-#ifndef LOGGER_H
+#ifndef SRSLTE_LOGGER_H
-#define LOGGER_H
+#define SRSLTE_LOGGER_H
 
 #include <stdio.h>
 #include <string>
@@ -45,4 +45,4 @@ public:
 
 } // namespace srslte
 
-#endif // LOGGER_H
+#endif // SRSLTE_LOGGER_H

lib/include/srslte/common/logger_file.h

@@ -32,8 +32,8 @@
  *              increase queue size. If empty, consumer blocks.
  *****************************************************************************/
 
-#ifndef LOGGER_FILE_H
+#ifndef SRSLTE_LOGGER_FILE_H
-#define LOGGER_FILE_H
+#define SRSLTE_LOGGER_FILE_H
 
 #include <stdio.h>
 #include <deque>
@@ -74,6 +74,6 @@ private:
   std::deque<str_ptr> buffer;
 };
 
-} // namespace srsue
+} // namespace srslte
 
-#endif // LOGGER_H
+#endif // SRSLTE_LOGGER_FILE_H

lib/include/srslte/common/logger_stdout.h

@@ -29,8 +29,8 @@
  * Description: Interface for logging output
  *****************************************************************************/
 
-#ifndef LOGGER_STDOUT_H
+#ifndef SRSLTE_LOGGER_STDOUT_H
-#define LOGGER_STDOUT_H
+#define SRSLTE_LOGGER_STDOUT_H
 
 #include <stdio.h>
 #include <string>
@@ -51,4 +51,4 @@ namespace srslte {
 
 } // namespace srslte
 
-#endif // LOGGER_H
+#endif // SRSLTE_LOGGER_STDOUT_H

lib/include/srslte/common/mac_pcap.h

@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef MACPCAP_H
+#ifndef SRSLTE_MAC_PCAP_H
-#define MACPCAP_H
+#define SRSLTE_MAC_PCAP_H
 
 #include <stdint.h>
 #include "srslte/common/pcap.h"
@@ -59,6 +59,6 @@ private:
                               uint16_t crnti_, uint8_t direction, uint8_t rnti_type);
 };
 
-} // namespace srsue
+} // namespace srslte
 
-#endif // MACPCAP_H
+#endif // SRSLTE_MAC_PCAP_H

lib/include/srslte/common/metrics_hub.h

@@ -5,8 +5,8 @@
  *              to get metrics 
  *****************************************************************************/
 
-#ifndef METRICS_HUB_H
+#ifndef SRSLTE_METRICS_HUB_H
-#define METRICS_HUB_H
+#define SRSLTE_METRICS_HUB_H
 
 #include <vector>
 #include "srslte/common/threads.h"
@@ -79,4 +79,4 @@ private:
 
 } // namespace srslte
 
-#endif // METRICS_HUB_H
+#endif // SRSLTE_METRICS_HUB_H

lib/include/srslte/common/msg_queue.h

@@ -30,8 +30,8 @@
  *  Reference:
  *****************************************************************************/
 
-#ifndef MSG_QUEUE_H
+#ifndef SRSLTE_MSG_QUEUE_H
-#define MSG_QUEUE_H
+#define SRSLTE_MSG_QUEUE_H
 
 #include "srslte/common/common.h"
 #include <pthread.h>
@@ -149,7 +149,7 @@ private:
   uint32_t              tail;
 };
 
-} // namespace srsue
+} // namespace srslte
 
 
-#endif // MSG_QUEUE_H
+#endif // SRSLTE_MSG_QUEUE_H

lib/include/srslte/common/nas_pcap.h

@@ -1,5 +1,5 @@
-#ifndef NAS_PCAP_H
+#ifndef SRSLTE_NAS_PCAP_H
-#define NAS_PCAP_H
+#define SRSLTE_NAS_PCAP_H
 
 #include "srslte/common/pcap.h"
 
@@ -20,6 +20,6 @@ private:
     void pack_and_write(uint8_t* pdu, uint32_t pdu_len_bytes);
 };
 
-} //namespace srsue
+} //namespace srslte
 
-#endif // NAS_PCAP_H
+#endif // SRSLTE_NAS_PCAP_H

lib/include/srslte/common/pcap.h

@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef UEPCAP_H
+#ifndef SRSLTE_PCAP_H
-#define UEPCAP_H
+#define SRSLTE_PCAP_H
 
 #include <stdio.h>
 #include <string.h>
@@ -247,4 +247,4 @@ inline int LTE_PCAP_NAS_WritePDU(FILE *fd, NAS_Context_Info_t *context,
     return 1;
 }
 
-#endif /* UEPCAP_H */
+#endif // SRSLTE_PCAP_H

lib/include/srslte/common/pdu.h

@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef MACPDU_H
+#ifndef SRSLTE_PDU_H
-#define MACPDU_H
+#define SRSLTE_PDU_H
 
 #include <stdint.h>
 #include "srslte/common/log.h"
@@ -338,6 +338,6 @@ private:
   uint8_t    backoff_indicator; 
 };
 
-} // namespace srsue
+} // namespace srslte
 
-#endif // MACPDU_H
+#endif // SRSLTE_PDU_H

lib/include/srslte/common/pdu_queue.h

@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef PDUPROC_H
+#ifndef SRSLTE_PDU_QUEUE_H
-#define PDUPROC_H
+#define SRSLTE_PDU_QUEUE_H
 
 #include "srslte/common/log.h"
 #include "srslte/common/block_queue.h"
@@ -79,7 +79,7 @@ private:
 
 } // namespace srslte
 
-#endif // PDUPROC_H
+#endif // SRSLTE_PDU_QUEUE_H
 
 
 

lib/include/srslte/common/security.h

@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef SECURITY_H
+#ifndef SRSLTE_SECURITY_H
-#define SECURITY_H
+#define SRSLTE_SECURITY_H
 
 /******************************************************************************
  * Common security header - wraps ciphering/integrity check algorithms.
@@ -175,6 +175,6 @@ uint8_t security_milenage_f5_star( uint8_t *k,
                                    uint8_t *ak);
 
 
-} // namespace srsue
+} // namespace srslte
 
-#endif // SECURITY_H
+#endif // SRSLTE_SECURITY_H

lib/include/srslte/common/snow_3g.h

@@ -9,6 +9,8 @@
 * and Integrity Algorithms UEA2 & UIA2.
 * Document 2: SNOW 3G Specification"
 *---------------------------------------------------------*/
+#ifndef SRSLTE_SNOW_3G_H
+#define SRSLTE_SNOW_3G_H
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -69,3 +71,4 @@ void snow3g_f8( u8 *key, u32 count, u32 bearer, u32 dir, \
 u8* snow3g_f9( u8* key, u32 count, u32 fresh, u32 dir, \
                  u8 *data, u64 length);
 
+#endif // SRSLTE_SNOW_3G_H

lib/include/srslte/common/task_dispatcher.h

@@ -30,8 +30,8 @@
  *  Reference:
  *****************************************************************************/
 
-#ifndef TASK_DISPATCHER_H
+#ifndef SRSLTE_TASK_DISPATCHER_H
-#define TASK_DISPATCHER_H
+#define SRSLTE_TASK_DISPATCHER_H
 
 #include <pthread.h>
 #include <stdint.h>
@@ -56,6 +56,6 @@ private:
   bool running;
 };
 
-} // namespace srsue
+} // namespace srslte
   
-#endif // TASK_DISPATCHER_H
+#endif // SRSLTE_TASK_DISPATCHER_H

lib/include/srslte/common/thread_pool.h

@@ -31,8 +31,8 @@
  *  Reference:
  *****************************************************************************/
 
-#ifndef THREAD_POOL_H
+#ifndef SRSLTE_THREAD_POOL_H
-#define THREAD_POOL_H
+#define SRSLTE_THREAD_POOL_H
 
 #include <stdint.h>
 #include <string>
@@ -102,4 +102,4 @@ private:
 };
 }
   
-#endif
+#endif // SRSLTE_THREAD_POOL_H

lib/include/srslte/common/threads.h

@@ -24,6 +24,7 @@
  *
  */
 
+
 #include <pthread.h>
 #include <stdint.h>
 #include <sys/timerfd.h>
@@ -46,8 +47,8 @@
 #ifdef __cplusplus
 }
   
-#ifndef THREADS_
+#ifndef SRSLTE_THREADS_H
-#define THREADS_   
+#define SRSLTE_THREADS_H  
   
 class thread
 {
@@ -159,7 +160,7 @@ private:
 
 
 
-#endif // THREADS_
+#endif // SRSLTE_THREADS_H
 
 #endif // __cplusplus
 

lib/include/srslte/common/timeout.h

@@ -31,8 +31,8 @@
  *  Reference:
  *****************************************************************************/
 
-#ifndef TIMEOUT_H
+#ifndef SRSLTE_TIMEOUT_H
-#define TIMEOUT_H
+#define SRSLTE_TIMEOUT_H
 
 #include <stdint.h>
 #include <pthread.h>
@@ -126,6 +126,6 @@ private:
   int duration_msec;
 };
 
-} // namespace srsue
+} // namespace srslte
   
-#endif // TIMEOUT_H
+#endif // SRSLTE_TIMEOUT_H

lib/include/srslte/common/timers.h

@@ -32,8 +32,8 @@
  *  Reference:
  *****************************************************************************/
 
-#ifndef TIMERS_H
+#ifndef SRSLTE_TIMERS_H
-#define TIMERS_H
+#define SRSLTE_TIMERS_H
 
 #include <stdio.h>
 #include <stdint.h>
@@ -173,4 +173,4 @@ private:
 
 } // namespace srslte
   
-#endif // TIMERS_H
+#endif // SRSLTE_TIMERS_H

lib/include/srslte/common/trace.h

@@ -30,8 +30,8 @@
  *  Reference:
  *****************************************************************************/
 
-#ifndef TRACE_H
+#ifndef SRSLTE_TRACE_H
-#define TRACE_H
+#define SRSLTE_TRACE_H
 
 #include <stdio.h>
 #include <string>
@@ -98,4 +98,4 @@ private:
 
 } // namespace srslte
   
-#endif // TRACE_H
+#endif // SRSLTE_TRACE_H

lib/include/srslte/common/tti_sync.h

@@ -33,8 +33,8 @@
  *  Reference:
  *****************************************************************************/
 
-#ifndef TTISYNC_H
+#ifndef SRSLTE_TTI_SYNC_H
-#define TTISYNC_H
+#define SRSLTE_TTI_SYNC_H
 
 #include <stdint.h>
 
@@ -77,4 +77,4 @@ class tti_sync
 
 } // namespace srsue
 
-#endif // TTISYNC_H
+#endif // SRSLTE_TTI_SYNC_H

lib/include/srslte/common/tti_sync_cv.h

@@ -30,8 +30,8 @@
  *  Reference:
  *****************************************************************************/
 
-#ifndef TTISYNC_CV_H
+#ifndef SRSLTE_TTI_SYNC_CV_H
-#define TTISYNC_CV_H
+#define SRSLTE_TTI_SYNC_CV_H
 
 #include <pthread.h>
 #include "srslte/common/tti_sync.h"
@@ -54,6 +54,6 @@ class tti_sync_cv : public tti_sync
     pthread_mutex_t mutex; 
 }; 
 
-} // namespace srsue
+} // namespace srslte
 
-#endif // TTISYNC_CV_H
+#endif // SRSLTE_TTI_SYNC_CV_H

lib/include/srslte/config.h

@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef CONFIG_H
+#ifndef SRSLTE_CONFIG_H
-#define CONFIG_H
+#define SRSLTE_CONFIG_H
 
 // Generic helper definitions for shared library support
 #if defined _WIN32 || defined __CYGWIN__
@@ -64,4 +64,4 @@ typedef _Complex float cf_t;
 typedef _Complex short int c16_t;
 #endif /* ENABLE_C16 */
 
-#endif // CONFIG_H
+#endif // SRSLTE_CONFIG_H

lib/include/srslte/interfaces/enb_interfaces.h

@@ -36,8 +36,8 @@
 
 #include <vector>
 
-#ifndef ENBINTERFACES_H
+#ifndef SRSLTE_ENB_INTERFACES_H
-#define ENBINTERFACES_H
+#define SRSLTE_ENB_INTERFACES_H
 
 namespace srsenb {
 
@@ -272,4 +272,4 @@ public:
 
 }
 
-#endif
+#endif // SRSLTE_ENB_INTERFACES_H

lib/include/srslte/interfaces/enb_metrics_interface.h

@@ -24,18 +24,18 @@
  *
  */
 
-#ifndef ENB_METRICS_INTERFACE_H
+#ifndef SRSLTE_ENB_METRICS_INTERFACE_H
-#define ENB_METRICS_INTERFACE_H
+#define SRSLTE_ENB_METRICS_INTERFACE_H
 
 #include <stdint.h>
 
-#include "upper/common_enb.h"
+#include "srsenb/hdr/upper/common_enb.h"
-#include "upper/s1ap_metrics.h"
+#include "srsenb/hdr/upper/s1ap_metrics.h"
-#include "upper/rrc_metrics.h"
+#include "srsenb/hdr/upper/rrc_metrics.h"
-#include "../../../../srsue/hdr/upper/gw_metrics.h"
+#include "srsue/hdr/upper/gw_metrics.h"
 #include "srslte/upper/rlc_metrics.h"
-#include "mac/mac_metrics.h"
+#include "srsenb/hdr/mac/mac_metrics.h"
-#include "phy/phy_metrics.h"
+#include "srsenb/hdr/phy/phy_metrics.h"
 
 namespace srsenb {
   
@@ -64,4 +64,4 @@ public:
 
 } // namespace srsenb
 
-#endif // ENB_METRICS_INTERFACE_H
+#endif // SRSLTE_ENB_METRICS_INTERFACE_H

lib/include/srslte/interfaces/epc_interfaces.h

@@ -1,5 +1,5 @@
-#ifndef EPC_INTERFACE_H
+#ifndef SRSLTE_EPC_INTERFACES_H
-#define EPC_INTERFACE_H
+#define SRSLTE_EPC_INTERFACES_H
 
 #include "srslte/srslte.h"
 
@@ -15,4 +15,4 @@ public:
 };
 
 }
-#endif // ENB_METRICS_INTERFACE_H
+#endif // SRSLTE_EPC_INTERFACES_H

lib/include/srslte/interfaces/sched_interface.h

@@ -26,8 +26,8 @@
 
 #include "srslte/srslte.h"
 
-#ifndef SCHED_INTERFACE_H
+#ifndef SRSLTE_SCHED_INTERFACE_H
-#define SCHED_INTERFACE_H
+#define SRSLTE_SCHED_INTERFACE_H
 
 namespace srsenb {
 
@@ -248,4 +248,4 @@ public:
 
 }
 
-#endif
+#endif // SRSLTE_SCHED_INTERFACE_H

lib/include/srslte/interfaces/ue_interfaces.h

@@ -30,8 +30,8 @@
  *              to other layers.
  *****************************************************************************/
 
-#ifndef INTERFACES_H
+#ifndef SRSLTE_UE_INTERFACES_H
-#define INTERFACES_H
+#define SRSLTE_UE_INTERFACES_H
 
 #include <string>
 
@@ -608,6 +608,6 @@ public:
 };
   
 
-} // namespace srslte
+} // namespace srsue
 
-#endif // INTERFACES_H
+#endif // SRSLTE_UE_INTERFACES_H

lib/include/srslte/phy/agc/agc.h

@@ -33,8 +33,8 @@
  *  Reference:
  *********************************************************************************************/
 
-#ifndef AGC_
+#ifndef SRSLTE_AGC_H
-#define AGC_
+#define SRSLTE_AGC_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -101,4 +101,4 @@ SRSLTE_API void srslte_agc_process(srslte_agc_t *q,
                                    cf_t *signal,
                                    uint32_t len);
 
-#endif // AGC_
+#endif // SRSLTE_AGC_H

lib/include/srslte/phy/ch_estimation/chest_common.h

@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef CHEST_
+#ifndef SRSLTE_CHEST_COMMON_H
-#define CHEST_
+#define SRSLTE_CHEST_COMMON_H
 
 #include <stdint.h>
 #include "srslte/config.h"
@@ -51,5 +51,5 @@ SRSLTE_API float srslte_chest_estimate_noise_pilots(cf_t *noisy,
 SRSLTE_API void srslte_chest_set_triangle_filter(float *fil, 
                                                  int filter_len); 
 
-#endif
+#endif // SRSLTE_CHEST_COMMON_H
 

lib/include/srslte/phy/ch_estimation/chest_dl.h

@@ -38,8 +38,8 @@
  *  Reference:
  *********************************************************************************************/
 
-#ifndef CHEST_DL_
+#ifndef SRSLTE_CHEST_DL_H
-#define CHEST_DL_
+#define SRSLTE_CHEST_DL_H
 
 #include <stdio.h>
 
@@ -193,4 +193,4 @@ SRSLTE_API float srslte_chest_dl_get_rsrp(srslte_chest_dl_t *q);
 
 SRSLTE_API float srslte_chest_dl_get_rsrp_neighbour(srslte_chest_dl_t *q);
 
-#endif
+#endif // SRSLTE_CHEST_DL_H

lib/include/srslte/phy/ch_estimation/chest_ul.h

@@ -36,8 +36,8 @@
  *  Reference:
  *********************************************************************************************/
 
-#ifndef CHEST_UL_
+#ifndef SRSLTE_CHEST_UL_H
-#define CHEST_UL_
+#define SRSLTE_CHEST_UL_H
 
 #include <stdio.h>
 
@@ -118,4 +118,4 @@ SRSLTE_API float srslte_chest_ul_get_noise_estimate(srslte_chest_ul_t *q);
 SRSLTE_API float srslte_chest_ul_get_snr(srslte_chest_ul_t *q);
 
 
-#endif
+#endif // SRSLTE_CHEST_UL_H

lib/include/srslte/phy/ch_estimation/refsignal_dl.h

@@ -32,8 +32,8 @@
  *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.10
  *********************************************************************************************/
 
-#ifndef SRSLTE_REFSIGNAL_DL_
+#ifndef SRSLTE_REFSIGNAL_DL_H
-#define SRSLTE_REFSIGNAL_DL_
+#define SRSLTE_REFSIGNAL_DL_H
 
 #include "srslte/config.h"
 #include "srslte/phy/common/phy_common.h"
@@ -118,4 +118,4 @@ SRSLTE_API  int srslte_refsignal_mbsfn_gen_seq(srslte_refsignal_t * q,
                                                uint32_t N_mbsfn_id);
 
 
-#endif
+#endif // SRSLTE_REFSIGNAL_DL_H

lib/include/srslte/phy/ch_estimation/refsignal_ul.h

@@ -32,8 +32,8 @@
  *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 5.5
  *********************************************************************************************/
 
-#ifndef SRSLTE_REFSIGNAL_UL_
+#ifndef SRSLTE_REFSIGNAL_UL_H
-#define SRSLTE_REFSIGNAL_UL_
+#define SRSLTE_REFSIGNAL_UL_H
 
 #include "srslte/config.h"
 #include "srslte/phy/phch/pucch.h"
@@ -209,4 +209,4 @@ SRSLTE_API uint32_t srslte_refsignal_srs_rb_L_cs(uint32_t bw_cfg,
 
 SRSLTE_API uint32_t srslte_refsignal_srs_M_sc(srslte_refsignal_ul_t *q); 
 
-#endif
+#endif // SRSLTE_REFSIGNAL_UL_H

lib/include/srslte/phy/channel/ch_awgn.h

@@ -37,8 +37,8 @@
 
 #include "srslte/config.h"
 
-#ifndef CH_AWGN_
+#ifndef SRSLTE_CH_AWGN_H
-#define CH_AWGN_
+#define SRSLTE_CH_AWGN_H
 
 SRSLTE_API void srslte_ch_awgn_c(const cf_t* input, 
                                  cf_t* output, 
@@ -54,4 +54,4 @@ SRSLTE_API float srslte_ch_awgn_get_variance(float ebno_db,
                                              float rate);
 
 
-#endif
+#endif // SRSLTE_CH_AWGN_H

lib/include/srslte/phy/common/phy_common.h

@@ -32,8 +32,8 @@
  *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10
  *********************************************************************************************/
 
-#ifndef _LTEBASE_
+#ifndef SRSLTE_PHY_COMMON_H
-#define _LTEBASE_
+#define SRSLTE_PHY_COMMON_H
 
 #include <stdio.h>
 #include <stdint.h>
@@ -305,4 +305,4 @@ SRSLTE_API char *srslte_mimotype2str(srslte_mimo_type_t mimo_type);
 SRSLTE_API uint32_t srslte_tti_interval(uint32_t tti1,
                                         uint32_t tti2); 
 
-#endif
+#endif // SRSLTE_PHY_COMMON_H

lib/include/srslte/phy/common/phy_logger.h

@@ -29,8 +29,8 @@
  * Description: Interface for logging output
  *****************************************************************************/
 
-#ifndef PHY_LOGGER_H
+#ifndef SRSLTE_PHY_LOGGER_H
-#define PHY_LOGGER_H
+#define SRSLTE_PHY_LOGGER_H
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -56,4 +56,4 @@ void srslte_phy_log_register_handler(void *ctx, phy_log_handler_t handler);
 }
 #endif // C++ 
 
-#endif // LOGGER_H
+#endif // SRSLTE_PHY_LOGGER_H

lib/include/srslte/phy/common/sequence.h

@@ -33,8 +33,8 @@
  *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 7.2
  *********************************************************************************************/
 
-#ifndef LTESEQ_
+#ifndef SRSLTE_SEQUENCE_H
-#define LTESEQ_
+#define SRSLTE_SEQUENCE_H
 
 #include "srslte/config.h"
 #include "srslte/phy/common/phy_common.h"
@@ -100,4 +100,4 @@ SRSLTE_API int srslte_sequence_pmch(srslte_sequence_t *seq,
                                     uint32_t mbsfn_id,
                                     uint32_t len);
 
-#endif
+#endif // SRSLTE_SEQUENCE_H

lib/include/srslte/phy/common/timestamp.h

@@ -34,8 +34,8 @@
  *  Reference:
  *********************************************************************************************/
 
-#ifndef TIMESTAMP_
+#ifndef SRSLTE_TIMESTAMP_H
-#define TIMESTAMP_
+#define SRSLTE_TIMESTAMP_H
 
 #include <time.h>
 #include <stdint.h>
@@ -65,4 +65,4 @@ SRSLTE_API double srslte_timestamp_real(srslte_timestamp_t *t);
 
 SRSLTE_API uint32_t srslte_timestamp_uint32(srslte_timestamp_t *t);
 
-#endif // TIMESTAMP_
+#endif // SRSLTE_TIMESTAMP_H

lib/include/srslte/phy/dft/dft.h

@@ -25,8 +25,8 @@
  */
 
 
-#ifndef DFT_H_
+#ifndef SRSLTE_DFT_H
-#define DFT_H_
+#define SRSLTE_DFT_H
  
 #include <stdbool.h>
 #include "srslte/config.h"
@@ -157,5 +157,5 @@ SRSLTE_API void srslte_dft_run_r(srslte_dft_plan_t *plan,
                                  const float *in,
                                  float *out);
 
-#endif // DFT_H_
+#endif // SRSLTE_DFT_H
 

lib/include/srslte/phy/dft/dft_precoding.h

@@ -33,8 +33,8 @@
  *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 5.3.3
  *********************************************************************************************/
 
-#ifndef DFTPREC_
+#ifndef SRSLTE_DFT_PRECODING_H
-#define DFTPREC_
+#define SRSLTE_DFT_PRECODING_H
 
 #include "srslte/config.h"
 #include "srslte/phy/common/phy_common.h"
@@ -68,4 +68,4 @@ SRSLTE_API int srslte_dft_precoding(srslte_dft_precoding_t *q,
                                     uint32_t nof_prb, 
                                     uint32_t nof_symbols);
 
-#endif
+#endif // SRSLTE_DFT_PRECODING_H

lib/include/srslte/phy/dft/ofdm.h

@@ -25,8 +25,8 @@
  */
 
 
-#ifndef LTEFFT_
+#ifndef SRSLTE_OFDM_H
-#define LTEFFT_
+#define SRSLTE_OFDM_H
 
 /**********************************************************************************************
  *  File:         ofdm.h
@@ -158,4 +158,4 @@ SRSLTE_API void srslte_ofdm_set_non_mbsfn_region(srslte_ofdm_t *q,
                                                uint8_t non_mbsfn_region);
 
 
-#endif
+#endif // SRSLTE_OFDM_H

lib/include/srslte/phy/enb/enb_dl.h

@@ -35,8 +35,8 @@
  *  Reference:
  *****************************************************************************/
 
-#ifndef ENBDL_H
+#ifndef SRSLTE_ENB_DL_H
-#define ENBDL_H
+#define SRSLTE_ENB_DL_H
 
 #include <stdbool.h>
 
@@ -195,4 +195,4 @@ SRSLTE_API void srslte_enb_dl_save_signal(srslte_enb_dl_t *q,
                                           uint16_t rnti,
                                           uint32_t cfi);
 
-#endif
+#endif // SRSLTE_ENB_DL_H

lib/include/srslte/phy/enb/enb_ul.h

@@ -35,8 +35,8 @@
  *  Reference:
  *****************************************************************************/
 
-#ifndef ENBUL_H
+#ifndef SRSLTE_ENB_UL_H
-#define ENBUL_H
+#define SRSLTE_ENB_UL_H
 
 #include <stdbool.h>
 
@@ -153,4 +153,4 @@ SRSLTE_API int srslte_enb_ul_detect_prach(srslte_enb_ul_t *q,
                                           float *peak2avg);
 
 
-#endif
+#endif // SRSLTE_ENB_UL_H

lib/include/srslte/phy/fec/cbsegm.h

@@ -29,8 +29,8 @@
 
 #include "srslte/config.h"
 
-#ifndef CBSEGM_H
+#ifndef SRSLTE_CBSEGM_H
-#define CBSEGM_H
+#define SRSLTE_CBSEGM_H
 
 #define SRSLTE_NOF_TC_CB_SIZES 188
 
@@ -56,4 +56,4 @@ SRSLTE_API bool srslte_cbsegm_cbsize_isvalid(uint32_t size);
 
 SRSLTE_API int  srslte_cbsegm_cbindex(uint32_t long_cb);
 
-#endif
+#endif // SRSLTE_CBSEGM_H

lib/include/srslte/phy/fec/convcoder.h

@@ -34,8 +34,8 @@
  *  Reference:    3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.3.1
  *********************************************************************************************/
 
-#ifndef CONVCODER_
+#ifndef SRSLTE_CONVCODER_H
-#define CONVCODER_
+#define SRSLTE_CONVCODER_H
 
 #include <stdbool.h>
 #include "srslte/config.h"
@@ -53,4 +53,4 @@ SRSLTE_API int srslte_convcoder_encode(srslte_convcoder_t *q,
                                        uint32_t frame_length);
 
 
-#endif
+#endif // SRSLTE_CONVCODER_H

lib/include/srslte/phy/fec/crc.h

@@ -34,8 +34,8 @@
  *  Reference:    3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.1
  *********************************************************************************************/
 
-#ifndef CRC_
+#ifndef SRSLTE_CRC_H
-#define CRC_
+#define SRSLTE_CRC_H
 
 #include "srslte/config.h"
 #include <stdint.h>
@@ -73,4 +73,4 @@ SRSLTE_API uint32_t srslte_crc_checksum(srslte_crc_t *h,
                                         uint8_t *data, 
                                         int len);
 
-#endif
+#endif // SRSLTE_CRC_H

lib/include/srslte/phy/fec/rm_conv.h

@@ -33,8 +33,8 @@
  *  Reference:    3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.4.2
  *********************************************************************************************/
 
-#ifndef RM_CONV_
+#ifndef SRSLTE_RM_CONV_H
-#define RM_CONV_
+#define SRSLTE_RM_CONV_H
 
 #include "srslte/config.h"
 
@@ -63,4 +63,4 @@ SRSLTE_API int srslte_rm_conv_rx_s(int16_t *input,
                                    int16_t *output, 
                                    uint32_t out_len);
 
-#endif
+#endif // SRSLTE_RM_CONV_H

lib/include/srslte/phy/fec/rm_turbo.h

@@ -32,8 +32,8 @@
  *  Reference:    3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.4.1
  *********************************************************************************************/
 
-#ifndef RM_TURBO_
+#ifndef SRSLTE_RM_TURBO_H
-#define RM_TURBO_
+#define SRSLTE_RM_TURBO_H
 
 #include "srslte/config.h"
 
@@ -85,4 +85,4 @@ SRSLTE_API int srslte_rm_turbo_rx_lut(int16_t *input,
                                       uint32_t rv_idx); 
 
 
-#endif
+#endif // SRSLTE_RM_TURBO_H

lib/include/srslte/phy/fec/softbuffer.h

@@ -33,8 +33,8 @@
  *  Reference:
  *****************************************************************************/
 
-#ifndef SOFTBUFFER_
+#ifndef SRSLTE_SOFTBUFFER_H
-#define SOFTBUFFER_
+#define SRSLTE_SOFTBUFFER_H
 
 #include "srslte/config.h"
 #include "srslte/phy/common/phy_common.h"
@@ -82,4 +82,4 @@ SRSLTE_API void srslte_softbuffer_tx_free(srslte_softbuffer_tx_t *p);
 
 
 
-#endif
+#endif // SRSLTE_SOFTBUFFER_H

lib/include/srslte/phy/fec/tc_interl.h

@@ -32,8 +32,8 @@
  *  Reference:    3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.3.2.3
  *********************************************************************************************/
 
-#ifndef _TC_INTERL_H
+#ifndef SRSLTE_TC_INTERL_H
-#define _TC_INTERL_H
+#define SRSLTE_TC_INTERL_H
 
 #include "srslte/config.h"
 #include <stdint.h>
@@ -55,4 +55,4 @@ SRSLTE_API int srslte_tc_interl_init(srslte_tc_interl_t *h,
 
 SRSLTE_API void srslte_tc_interl_free(srslte_tc_interl_t *h);
 
-#endif
+#endif // SRSLTE_TC_INTERL_H

lib/include/srslte/phy/fec/turbocoder.h

@@ -35,8 +35,8 @@
  *  Reference:    3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.3.2
  *********************************************************************************************/
 
-#ifndef TURBOCODER_
+#ifndef SRSLTE_TURBOCODER_H
-#define TURBOCODER_
+#define SRSLTE_TURBOCODER_H
 
 #include "srslte/config.h"
 #include "srslte/phy/fec/tc_interl.h"
@@ -75,5 +75,5 @@ SRSLTE_API int srslte_tcod_encode_lut(srslte_tcod_t *h,
 
 SRSLTE_API void srslte_tcod_gentable(); 
 
-#endif
+#endif // SRSLTE_TURBOCODER_H
 

lib/include/srslte/phy/fec/turbodecoder.h

@@ -36,8 +36,8 @@
  *  Reference:    3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.3.2
  *********************************************************************************************/
 
-#ifndef TURBODECODER_
+#ifndef SRSLTE_TURBODECODER_H
-#define TURBODECODER_
+#define SRSLTE_TURBODECODER_H
 
 #include "srslte/config.h"
 #include "srslte/phy/fec/tc_interl.h"
@@ -117,4 +117,4 @@ SRSLTE_API int srslte_tdec_run_all_par(srslte_tdec_t * h,
                                        uint32_t nof_iterations, 
                                        uint32_t long_cb);
 
-#endif
+#endif // SRSLTE_TURBODECODER_H

lib/include/srslte/phy/fec/turbodecoder_gen.h

@@ -36,8 +36,8 @@
  *  Reference:    3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.3.2
  *********************************************************************************************/
 
-#ifndef TURBODECODER_GEN_
+#ifndef SRSLTE_TURBODECODER_GEN_H
-#define TURBODECODER_GEN_
+#define SRSLTE_TURBODECODER_GEN_H
 
 #include "srslte/config.h"
 #include "srslte/phy/fec/tc_interl.h"
@@ -96,4 +96,4 @@ SRSLTE_API int srslte_tdec_gen_run_all(srslte_tdec_gen_t * h,
                                    uint32_t nof_iterations, 
                                    uint32_t long_cb);
 
-#endif
+#endif // SRSLTE_TURBODECODER_GEN_H

lib/include/srslte/phy/fec/turbodecoder_simd.h

@@ -36,8 +36,8 @@
  *  Reference:    3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.3.2
  *********************************************************************************************/
 
-#ifndef TURBODECODER_SSE_
+#ifndef SRSLTE_TURBODECODER_SIMD_H
-#define TURBODECODER_SSE_
+#define SRSLTE_TURBODECODER_SIMD_H
 
 #include "srslte/config.h"
 #include "srslte/phy/fec/tc_interl.h"
@@ -119,4 +119,4 @@ SRSLTE_API int srslte_tdec_simd_run_all(srslte_tdec_simd_t * h,
                                         uint32_t nof_iterations, 
                                         uint32_t long_cb);
 
-#endif
+#endif // SRSLTE_TURBODECODER_SIMD_H

lib/include/srslte/phy/fec/turbodecoder_simd_inter.h

@@ -36,8 +36,8 @@
  *  Reference:    3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.3.2
  *********************************************************************************************/
 
-#ifndef TURBODECODER_SSE_INTER_
+#ifndef SRSLTE_TURBODECODER_SIMD_INTER_H
-#define TURBODECODER_SSE_INTER_
+#define SRSLTE_TURBODECODER_SIMD_INTER_H
 
 
 /** This is an simd inter-frame parallel turbo decoder. Parallizes 8 code-blocks using SSE
@@ -116,4 +116,4 @@ SRSLTE_API int srslte_tdec_simd_inter_run_all(srslte_tdec_simd_inter_t * h,
                                         uint32_t nof_cb,
                                         uint32_t long_cb);
 
-#endif
+#endif // SRSLTE_TURBODECODER_SIMD_INTER_H

lib/include/srslte/phy/fec/turbodecoder_sse.h

@@ -36,8 +36,8 @@
  *  Reference:    3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.3.2
  *********************************************************************************************/
 
-#ifndef TURBODECODER_SSE_
+#ifndef SRSLTE_TURBODECODER_SSE_
-#define TURBODECODER_SSE_
+#define SRSLTE_TURBODECODER_SSE_
 
 #include "srslte/config.h"
 #include "srslte/phy/fec/tc_interl.h"
@@ -98,4 +98,4 @@ SRSLTE_API int srslte_tdec_sse_run_all(srslte_tdec_sse_t * h,
                                    uint32_t nof_iterations, 
                                    uint32_t long_cb);
 
-#endif
+#endif // SRSLTE_TURBODECODER_SSE_

lib/include/srslte/phy/fec/viterbi.h

@@ -33,8 +33,8 @@
  *  Reference:
  *****************************************************************************/
 
-#ifndef VITERBI_
+#ifndef SRSLTE_VITERBI_H
-#define VITERBI_
+#define SRSLTE_VITERBI_H
 
 #include <stdbool.h>
 #include "srslte/config.h"
@@ -119,4 +119,4 @@ SRSLTE_API int srslte_viterbi_init_avx2(srslte_viterbi_t *q,
 
 
 
-#endif
+#endif // SRSLTE_VITERBI_H

lib/include/srslte/phy/io/binsource.h

@@ -32,8 +32,8 @@
  *  Reference:
  *****************************************************************************/
 
-#ifndef BINSOURCE_
+#ifndef SRSLTE_BINSOURCE_H
-#define BINSOURCE_
+#define SRSLTE_BINSOURCE_H
 
 
 #include <stdint.h>
@@ -68,4 +68,4 @@ SRSLTE_API int srslte_binsource_generate(srslte_binsource_t* q,
                                          uint8_t *bits, 
                                          int nbits);
 
-#endif // BINSOURCE_
+#endif // SRSLTE_BINSOURCE_H

lib/include/srslte/phy/io/filesink.h

@@ -34,8 +34,8 @@
  *  Reference:
  *****************************************************************************/
 
-#ifndef FILESINK_
+#ifndef SRSLTE_FILESINK_H
-#define FILESINK_
+#define SRSLTE_FILESINK_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -64,4 +64,4 @@ SRSLTE_API int srslte_filesink_write_multi(srslte_filesink_t *q,
                                            int nsamples,
                                            int nchannels);
 
-#endif // FILESINK_
+#endif // SRSLTE_FILESINK_H

lib/include/srslte/phy/io/filesource.h

@@ -34,8 +34,8 @@
  *  Reference:
  *****************************************************************************/
 
-#ifndef FILESOURCE_
+#ifndef SRSLTE_FILESOURCE_H
-#define FILESOURCE_
+#define SRSLTE_FILESOURCE_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -67,4 +67,4 @@ SRSLTE_API int srslte_filesource_read_multi(srslte_filesource_t *q,
                                             int nsamples,
                                             int nof_channels);
 
-#endif // FILESOURCE_
+#endif // SRSLTE_FILESOURCE_H

lib/include/srslte/phy/io/format.h

@@ -25,8 +25,8 @@
  */
 
 
-#ifndef FORMAT_
+#ifndef SRSLTE_FORMAT_H
-#define FORMAT_
+#define SRSLTE_FORMAT_H
 
 typedef enum { 
   SRSLTE_FLOAT, 
@@ -37,4 +37,4 @@ typedef enum {
   SRSLTE_COMPLEX_SHORT_BIN  
 } srslte_datatype_t;
 
-#endif // FORMAT_
+#endif // SRSLTE_FORMAT_H

lib/include/srslte/phy/io/netsink.h

@@ -33,8 +33,8 @@
  *  Reference:
  *****************************************************************************/
 
-#ifndef NETSINK_
+#ifndef SRSLTE_NETSINK_H
-#define NETSINK_
+#define SRSLTE_NETSINK_H
 
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -71,4 +71,4 @@ SRSLTE_API int srslte_netsink_write(srslte_netsink_t *q,
 
 SRSLTE_API int srslte_netsink_set_nonblocking(srslte_netsink_t *q); 
 
-#endif // UDPSINK_
+#endif // SRSLTE_NETSINK_H

lib/include/srslte/phy/io/netsource.h

@@ -33,8 +33,8 @@
  *  Reference:
  *****************************************************************************/
 
-#ifndef NETSOURCE_
+#ifndef SRSLTE_NETSOURCE_H
-#define NETSOURCE_
+#define SRSLTE_NETSOURCE_H
 
 #include <stdbool.h>
 #include <sys/socket.h>
@@ -75,4 +75,4 @@ SRSLTE_API int srslte_netsource_read(srslte_netsource_t *q,
 SRSLTE_API int srslte_netsource_set_timeout(srslte_netsource_t *q, 
                                             uint32_t microseconds); 
 
-#endif // UDPSOURCE_
+#endif // SRSLTE_NETSOURCE_H

lib/include/srslte/phy/mimo/layermap.h

@@ -34,8 +34,8 @@
  *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.3.3
  *****************************************************************************/
 
-#ifndef LAYERMAP_H_
+#ifndef SRSLTE_LAYERMAP_H
-#define LAYERMAP_H_
+#define SRSLTE_LAYERMAP_H
 
 #include "srslte/config.h"
 #include "srslte/phy/common/phy_common.h"
@@ -91,4 +91,4 @@ SRSLTE_API int srslte_layerdemap_type(cf_t *x[SRSLTE_MAX_LAYERS],
                                       int nof_symbols[SRSLTE_MAX_CODEWORDS], 
                                       srslte_mimo_type_t type);
 
-#endif // LAYERMAP_H_
+#endif // SRSLTE_LAYERMAP_H

lib/include/srslte/phy/mimo/precoding.h

@@ -33,8 +33,8 @@
  *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.3.4
  *****************************************************************************/
 
-#ifndef PRECODING_H_
+#ifndef SRSLTE_PRECODING_H
-#define PRECODING_H_
+#define SRSLTE_PRECODING_H
 
 #include "srslte/config.h"
 #include "srslte/phy/common/phy_common.h"
@@ -137,4 +137,4 @@ SRSLTE_API int srslte_precoding_cn(cf_t *h[SRSLTE_MAX_PORTS][SRSLTE_MAX_PORTS],
                                    float *cn);
 
 
-#endif /* PRECODING_H_ */
+#endif // SRSLTE_PRECODING_H

lib/include/srslte/phy/modem/demod_hard.h

@@ -33,8 +33,8 @@
  *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 7.1
  *****************************************************************************/
 
-#ifndef DEMOD_HARD_
+#ifndef SRSLTE_DEMOD_HARD_H
-#define DEMOD_HARD_
+#define SRSLTE_DEMOD_HARD_H
 
 #include <complex.h>
 #include <stdint.h>
@@ -57,4 +57,4 @@ SRSLTE_API int srslte_demod_hard_demodulate(srslte_demod_hard_t* q,
                                             uint8_t *bits, 
                                             uint32_t nsymbols);
 
-#endif // DEMOD_HARD_
+#endif // SRSLTE_DEMOD_HARD_H

lib/include/srslte/phy/modem/demod_soft.h

@@ -33,8 +33,8 @@
  *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 7.1
  *****************************************************************************/
 
-#ifndef DEMOD_SOFT_
+#ifndef SRSLTE_DEMOD_SOFT_H
-#define DEMOD_SOFT_
+#define SRSLTE_DEMOD_SOFT_H
 
 #include <complex.h>
 #include <stdint.h>
@@ -53,4 +53,4 @@ SRSLTE_API int srslte_demod_soft_demodulate_s(srslte_mod_t modulation,
                                               short* llr, 
                                               int nsymbols); 
 
-#endif // DEMOD_SOFT_
+#endif // SRSLTE_DEMOD_SOFT_H

lib/include/srslte/phy/modem/mod.h

@@ -33,8 +33,8 @@
  *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 7.1
  *****************************************************************************/
 
-#ifndef MOD_
+#ifndef SRSLTE_MOD_H
-#define MOD_
+#define SRSLTE_MOD_H
 
 #include <complex.h>
 #include <stdint.h>
@@ -52,4 +52,4 @@ SRSLTE_API int srslte_mod_modulate_bytes(srslte_modem_table_t* q,
                                          cf_t* symbols, 
                                          uint32_t nbits); 
 
-#endif // MOD_
+#endif // SRSLTE_MOD_H

lib/include/srslte/phy/modem/modem_table.h

@@ -33,8 +33,8 @@
  *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 7.1
  *****************************************************************************/
 
-#ifndef MODEM_TABLE_
+#ifndef SRSLTE_MODEM_TABLE_H
-#define MODEM_TABLE_
+#define SRSLTE_MODEM_TABLE_H
 
 #include <stdbool.h>
 #include <complex.h>
@@ -83,4 +83,4 @@ SRSLTE_API int srslte_modem_table_lte(srslte_modem_table_t* q,
 
 SRSLTE_API void srslte_modem_table_bytes(srslte_modem_table_t* q); 
 
-#endif // MODEM_TABLE_
+#endif // SRSLTE_MODEM_TABLE_H

lib/include/srslte/phy/phch/cqi.h

@@ -32,8 +32,8 @@
  *  Reference:    3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.2.2.6, 5.2.3.3
  *****************************************************************************/
 
-#ifndef CQI_
+#ifndef SRSLTE_CQI_H
-#define CQI_
+#define SRSLTE_CQI_H
 
 #include <stdint.h>
 
@@ -179,4 +179,4 @@ SRSLTE_API int srslte_cqi_hl_get_no_subbands(int num_prbs);
 
 SRSLTE_API void srslte_cqi_to_str(const uint8_t *cqi_value, int cqi_len, char *str, int str_len);
 
-#endif // CQI_
+#endif // SRSLTE_CQI_H

lib/include/srslte/phy/phch/dci.h

@@ -34,8 +34,8 @@
  *  Reference:    3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.3.3
  *****************************************************************************/
 
-#ifndef DCI_
+#ifndef SRSLTE_DCI_H
-#define DCI_
+#define SRSLTE_DCI_H
 
 #include <stdint.h>
 

lib/include/srslte/phy/phch/pbch.h

@@ -34,8 +34,8 @@
  *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.6
  *****************************************************************************/
 
-#ifndef PBCH_
+#ifndef SRSLTE_PBCH_H
-#define PBCH_
+#define SRSLTE_PBCH_H
 
 #include "srslte/config.h"
 #include "srslte/phy/common/phy_common.h"
@@ -115,4 +115,4 @@ SRSLTE_API void srslte_pbch_mib_pack(srslte_cell_t *cell,
                               uint32_t sfn, 
                               uint8_t *msg);
 
-#endif // PBCH_
+#endif // SRSLTE_PBCH_H

lib/include/srslte/phy/phch/pcfich.h

@@ -32,8 +32,8 @@
  *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.7
  *****************************************************************************/
 
-#ifndef PCFICH_
+#ifndef SRSLTE_PCFICH_H
-#define PCFICH_
+#define SRSLTE_PCFICH_H
 
 #include "srslte/config.h"
 #include "srslte/phy/common/phy_common.h"
@@ -108,4 +108,4 @@ SRSLTE_API int srslte_pcfich_encode(srslte_pcfich_t *q,
                              cf_t *sf_symbols[SRSLTE_MAX_PORTS],
                              uint32_t subframe);
 
-#endif
+#endif // SRSLTE_PCFICH_H

lib/include/srslte/phy/phch/pdcch.h

@@ -32,8 +32,8 @@
  *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.8
  *****************************************************************************/
 
-#ifndef PDCCH_
+#ifndef SRSLTE_PDCCH_H
-#define PDCCH_
+#define SRSLTE_PDCCH_H
 
 #include "srslte/config.h"
 #include "srslte/phy/common/phy_common.h"
@@ -186,4 +186,4 @@ SRSLTE_API uint32_t srslte_pdcch_common_locations_ncce(uint32_t nof_cce,
                                                        uint32_t max_candidates); 
 
 
-#endif
+#endif // SRSLTE_PDCCH_H

lib/include/srslte/phy/phch/pdsch.h

@@ -32,8 +32,8 @@
  *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.4
  *****************************************************************************/
 
-#ifndef PDSCH_
+#ifndef SRSLTE_PDSCH_H
-#define PDSCH_
+#define SRSLTE_PDSCH_H
 
 #include "srslte/config.h"
 #include "srslte/phy/common/phy_common.h"
@@ -170,4 +170,4 @@ SRSLTE_API float srslte_pdsch_last_noi(srslte_pdsch_t *q);
 SRSLTE_API uint32_t srslte_pdsch_last_noi_cw(srslte_pdsch_t *q,
                                              uint32_t cw_idx);
 
-#endif
+#endif // SRSLTE_PDSCH_H

lib/include/srslte/phy/phch/pdsch_cfg.h

@@ -32,8 +32,8 @@
  *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.4
  *****************************************************************************/
 
-#ifndef PDSCHCFG_
+#ifndef SRSLTE_PDSCH_CFG_H
-#define PDSCHCFG_
+#define SRSLTE_PDSCH_CFG_H
 
 #include "srslte/phy/phch/ra.h"
 #include "srslte/phy/fec/softbuffer.h"
@@ -58,5 +58,5 @@ typedef struct SRSLTE_API {
   bool tb_cw_swap;
 } srslte_pdsch_cfg_t;
 
-#endif
+#endif // SRSLTE_PDSCH_CFG_H
 

lib/include/srslte/phy/phch/phich.h

@@ -32,8 +32,8 @@
  *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.9
  *****************************************************************************/
 
-#ifndef PHICH_
+#ifndef SRSLTE_PHICH_H
-#define PHICH_
+#define SRSLTE_PHICH_H
 
 #include "srslte/config.h"
 #include "srslte/phy/common/phy_common.h"
@@ -124,4 +124,4 @@ SRSLTE_API uint32_t srslte_phich_ngroups(srslte_phich_t *q);
 
 SRSLTE_API uint32_t srslte_phich_nsf(srslte_phich_t *q);
 
-#endif // PHICH_
+#endif // SRSLTE_PHICH_H

lib/include/srslte/phy/phch/pmch.h

@@ -32,8 +32,8 @@
  *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.5
  *****************************************************************************/
 
-#ifndef PMCH_
+#ifndef SRSLTE_PMCH_H
-#define PMCH_
+#define SRSLTE_PMCH_H
 
 #include "srslte/config.h"
 #include "srslte/phy/common/phy_common.h"
@@ -149,4 +149,4 @@ SRSLTE_API float srslte_pmch_average_noi(srslte_pmch_t *q);
 
 SRSLTE_API uint32_t srslte_pmch_last_noi(srslte_pmch_t *q);
 
-#endif
+#endif // SRSLTE_PMCH_H