1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-11-10 20:10:05 +00:00

Moved ION GSMS file source to gnuradio_blocks/ directory

Also fixed some header guards.
This commit is contained in:
Victor Castillo 2024-08-19 15:58:37 +02:00
parent 174364af31
commit c10eceb973
No known key found for this signature in database
GPG Key ID: 8EF1FC8B7182F608
8 changed files with 17 additions and 14 deletions

View File

@ -21,6 +21,11 @@ if(ENABLE_PLUTOSDR)
set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} ad936x_iio_source.h) set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} ad936x_iio_source.h)
endif() 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 set(SIGNAL_SOURCE_GR_BLOCKS_SOURCES
fifo_reader.cc fifo_reader.cc
unpack_byte_2bit_samples.cc unpack_byte_2bit_samples.cc

View File

@ -46,8 +46,6 @@ if(ENABLE_PLUTOSDR)
endif() endif()
if(ENABLE_ION) 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_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_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) set(OPT_SIGNAL_SOURCE_LIB_SOURCES ${OPT_SIGNAL_SOURCE_LIB_SOURCES} ion_gsms_metadata_handler.cc)

View File

@ -14,8 +14,8 @@
* ----------------------------------------------------------------------------- * -----------------------------------------------------------------------------
*/ */
#ifndef ION_GSM_CHUNK_DATA_H #ifndef GNSS_SDR_ION_GSMS_CHUNK_DATA_H
#define ION_GSM_CHUNK_DATA_H #define GNSS_SDR_ION_GSMS_CHUNK_DATA_H
#include "ion_gsms_chunk_unpacking_ctx.h" #include "ion_gsms_chunk_unpacking_ctx.h"
#include "ion_gsms_stream_encodings.h" #include "ion_gsms_stream_encodings.h"
@ -185,4 +185,4 @@ private:
void* buffer_; void* buffer_;
}; };
#endif // ION_GSM_CHUNK_DATA_H #endif // GNSS_SDR_ION_GSMS_CHUNK_DATA_H

View File

@ -16,8 +16,8 @@
* ----------------------------------------------------------------------------- * -----------------------------------------------------------------------------
*/ */
#ifndef ION_GSM_CHUNK_UNPACKING_CTX_H #ifndef GNSS_SDR_ION_GSMS_CHUNK_UNPACKING_CTX_H
#define ION_GSM_CHUNK_UNPACKING_CTX_H #define GNSS_SDR_ION_GSMS_CHUNK_UNPACKING_CTX_H
#include <gnuradio/block.h> #include <gnuradio/block.h>
#include <GnssMetadata.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

View File

@ -14,8 +14,8 @@
* ----------------------------------------------------------------------------- * -----------------------------------------------------------------------------
*/ */
#ifndef ION_GSMS_METADATA_HANDLER_H #ifndef GNSS_SDR_ION_GSMSS_METADATA_HANDLER_H
#define ION_GSMS_METADATA_HANDLER_H #define GNSS_SDR_ION_GSMSS_METADATA_HANDLER_H
#include "ion_gsms.h" #include "ion_gsms.h"
#include <gnuradio/block.h> #include <gnuradio/block.h>
@ -48,4 +48,4 @@ private:
/** \} */ /** \} */
/** \} */ /** \} */
#endif // ION_GSMS_METADATA_HANDLER_H #endif // GNSS_SDR_ION_GSMSS_METADATA_HANDLER_H

View File

@ -16,8 +16,8 @@
* ----------------------------------------------------------------------------- * -----------------------------------------------------------------------------
*/ */
#ifndef ION_GSM_STREAM_ENCODINGS_H #ifndef GNSS_SDR_ION_GSMS_STREAM_ENCODINGS_H
#define ION_GSM_STREAM_ENCODINGS_H #define GNSS_SDR_ION_GSMS_STREAM_ENCODINGS_H
#include <string> #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