From c10eceb9731c67014935cbfbd397ca364eb52491 Mon Sep 17 00:00:00 2001
From: Victor Castillo <victorcastilloaguero@gmail.com>
Date: Mon, 19 Aug 2024 15:58:37 +0200
Subject: [PATCH] Moved ION GSMS file source to `gnuradio_blocks/` directory

Also fixed some header guards.
---
 src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt | 5 +++++
 .../signal_source/{libs => gnuradio_blocks}/ion_gsms.cc     | 0
 .../signal_source/{libs => gnuradio_blocks}/ion_gsms.h      | 0
 src/algorithms/signal_source/libs/CMakeLists.txt            | 2 --
 src/algorithms/signal_source/libs/ion_gsms_chunk_data.h     | 6 +++---
 .../signal_source/libs/ion_gsms_chunk_unpacking_ctx.h       | 6 +++---
 .../signal_source/libs/ion_gsms_metadata_handler.h          | 6 +++---
 .../signal_source/libs/ion_gsms_stream_encodings.h          | 6 +++---
 8 files changed, 17 insertions(+), 14 deletions(-)
 rename src/algorithms/signal_source/{libs => gnuradio_blocks}/ion_gsms.cc (100%)
 rename src/algorithms/signal_source/{libs => gnuradio_blocks}/ion_gsms.h (100%)

diff --git a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
index 24f067be6..a217648b4 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
@@ -21,6 +21,11 @@ if(ENABLE_PLUTOSDR)
     set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} ad936x_iio_source.h)
 endif()
 
+if(ENABLE_ION)
+    set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} ion_gsms.cc)
+    set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} ion_gsms.h)
+endif()
+
 set(SIGNAL_SOURCE_GR_BLOCKS_SOURCES
     fifo_reader.cc
     unpack_byte_2bit_samples.cc
diff --git a/src/algorithms/signal_source/libs/ion_gsms.cc b/src/algorithms/signal_source/gnuradio_blocks/ion_gsms.cc
similarity index 100%
rename from src/algorithms/signal_source/libs/ion_gsms.cc
rename to src/algorithms/signal_source/gnuradio_blocks/ion_gsms.cc
diff --git a/src/algorithms/signal_source/libs/ion_gsms.h b/src/algorithms/signal_source/gnuradio_blocks/ion_gsms.h
similarity index 100%
rename from src/algorithms/signal_source/libs/ion_gsms.h
rename to src/algorithms/signal_source/gnuradio_blocks/ion_gsms.h
diff --git a/src/algorithms/signal_source/libs/CMakeLists.txt b/src/algorithms/signal_source/libs/CMakeLists.txt
index aa4fa8eea..b674ef5f5 100644
--- a/src/algorithms/signal_source/libs/CMakeLists.txt
+++ b/src/algorithms/signal_source/libs/CMakeLists.txt
@@ -46,8 +46,6 @@ if(ENABLE_PLUTOSDR)
 endif()
 
 if(ENABLE_ION)
-    set(OPT_SIGNAL_SOURCE_LIB_SOURCES ${OPT_SIGNAL_SOURCE_LIB_SOURCES} ion_gsms.cc)
-    set(OPT_SIGNAL_SOURCE_LIB_HEADERS ${OPT_SIGNAL_SOURCE_LIB_HEADERS} ion_gsms.h)
     set(OPT_SIGNAL_SOURCE_LIB_SOURCES ${OPT_SIGNAL_SOURCE_LIB_SOURCES} ion_gsms_chunk_data.cc)
     set(OPT_SIGNAL_SOURCE_LIB_HEADERS ${OPT_SIGNAL_SOURCE_LIB_HEADERS} ion_gsms_chunk_data.h)
     set(OPT_SIGNAL_SOURCE_LIB_SOURCES ${OPT_SIGNAL_SOURCE_LIB_SOURCES} ion_gsms_metadata_handler.cc)
diff --git a/src/algorithms/signal_source/libs/ion_gsms_chunk_data.h b/src/algorithms/signal_source/libs/ion_gsms_chunk_data.h
index 1dd712351..5170af848 100644
--- a/src/algorithms/signal_source/libs/ion_gsms_chunk_data.h
+++ b/src/algorithms/signal_source/libs/ion_gsms_chunk_data.h
@@ -14,8 +14,8 @@
  * -----------------------------------------------------------------------------
  */
 
-#ifndef ION_GSM_CHUNK_DATA_H
-#define ION_GSM_CHUNK_DATA_H
+#ifndef GNSS_SDR_ION_GSMS_CHUNK_DATA_H
+#define GNSS_SDR_ION_GSMS_CHUNK_DATA_H
 
 #include "ion_gsms_chunk_unpacking_ctx.h"
 #include "ion_gsms_stream_encodings.h"
@@ -185,4 +185,4 @@ private:
     void* buffer_;
 };
 
-#endif  // ION_GSM_CHUNK_DATA_H
+#endif  // GNSS_SDR_ION_GSMS_CHUNK_DATA_H
diff --git a/src/algorithms/signal_source/libs/ion_gsms_chunk_unpacking_ctx.h b/src/algorithms/signal_source/libs/ion_gsms_chunk_unpacking_ctx.h
index 44c125889..3c5d7b662 100644
--- a/src/algorithms/signal_source/libs/ion_gsms_chunk_unpacking_ctx.h
+++ b/src/algorithms/signal_source/libs/ion_gsms_chunk_unpacking_ctx.h
@@ -16,8 +16,8 @@
  * -----------------------------------------------------------------------------
  */
 
-#ifndef ION_GSM_CHUNK_UNPACKING_CTX_H
-#define ION_GSM_CHUNK_UNPACKING_CTX_H
+#ifndef GNSS_SDR_ION_GSMS_CHUNK_UNPACKING_CTX_H
+#define GNSS_SDR_ION_GSMS_CHUNK_UNPACKING_CTX_H
 
 #include <gnuradio/block.h>
 #include <GnssMetadata.h>
@@ -178,4 +178,4 @@ struct IONGSMSChunkUnpackingCtx
 
 /** \} */
 /** \} */
-#endif  // ION_GSM_CHUNK_UNPACKING_CTX_H
+#endif  // GNSS_SDR_ION_GSMS_CHUNK_UNPACKING_CTX_H
diff --git a/src/algorithms/signal_source/libs/ion_gsms_metadata_handler.h b/src/algorithms/signal_source/libs/ion_gsms_metadata_handler.h
index 4b6f5be81..6d01567c5 100644
--- a/src/algorithms/signal_source/libs/ion_gsms_metadata_handler.h
+++ b/src/algorithms/signal_source/libs/ion_gsms_metadata_handler.h
@@ -14,8 +14,8 @@
  * -----------------------------------------------------------------------------
  */
 
-#ifndef ION_GSMS_METADATA_HANDLER_H
-#define ION_GSMS_METADATA_HANDLER_H
+#ifndef GNSS_SDR_ION_GSMSS_METADATA_HANDLER_H
+#define GNSS_SDR_ION_GSMSS_METADATA_HANDLER_H
 
 #include "ion_gsms.h"
 #include <gnuradio/block.h>
@@ -48,4 +48,4 @@ private:
 
 /** \} */
 /** \} */
-#endif  // ION_GSMS_METADATA_HANDLER_H
+#endif  // GNSS_SDR_ION_GSMSS_METADATA_HANDLER_H
diff --git a/src/algorithms/signal_source/libs/ion_gsms_stream_encodings.h b/src/algorithms/signal_source/libs/ion_gsms_stream_encodings.h
index 90ba15cac..5b39e6497 100644
--- a/src/algorithms/signal_source/libs/ion_gsms_stream_encodings.h
+++ b/src/algorithms/signal_source/libs/ion_gsms_stream_encodings.h
@@ -16,8 +16,8 @@
  * -----------------------------------------------------------------------------
  */
 
-#ifndef ION_GSM_STREAM_ENCODINGS_H
-#define ION_GSM_STREAM_ENCODINGS_H
+#ifndef GNSS_SDR_ION_GSMS_STREAM_ENCODINGS_H
+#define GNSS_SDR_ION_GSMS_STREAM_ENCODINGS_H
 
 #include <string>
 
@@ -167,4 +167,4 @@ inline T five_bit_look_up[11][32]{
 
 /** \} */
 /** \} */
-#endif  // ION_GSM_STREAM_ENCODINGS_H
+#endif  // GNSS_SDR_ION_GSMS_STREAM_ENCODINGS_H