Rename to libosmosdr to libosmodsp to avoid conflict with the SDR hw

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>

Doxyfile.in

@@ -25,7 +25,7 @@ DOXYFILE_ENCODING      = UTF-8
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = libosmosdr
+PROJECT_NAME           = libosmodsp
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
 # This could be handy for archiving the generated documentation or
@@ -37,7 +37,7 @@ PROJECT_NUMBER         = @VERSION@
 # for a project that appears at the top of each page and should give viewer
 # a quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = "Osmocom SDR library"
+PROJECT_BRIEF          = "Osmocom DSP library"
 
 # With the PROJECT_LOGO tag one can specify an logo or icon that is
 # included in the documentation. The maximum height of the logo should not
@@ -610,7 +610,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = include/osmocom/sdr src
+INPUT                  = include/osmocom/dsp src
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

Makefile.am

@@ -5,7 +5,7 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include
 SUBDIRS = include src
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libosmosdr.pc
+pkgconfig_DATA = libosmodsp.pc
 
 BUILT_SOURCES = $(top_srcdir)/.version
 $(top_srcdir)/.version:

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([libosmo-sdr],
+AC_INIT([libosmodsp],
         m4_esyscmd([./git-version-gen .tarball-version]),
         [gmr@lists.osmocom.org])
 
@@ -38,10 +38,10 @@ dnl Generate the output
 AM_CONFIG_HEADER(config.h)
 
 AC_OUTPUT(
-	libosmosdr.pc
+	libosmodsp.pc
 	include/Makefile
 	include/osmocom/Makefile
-	include/osmocom/sdr/Makefile
+	include/osmocom/dsp/Makefile
 	src/Makefile
 	Makefile
 	Doxyfile

include/osmocom/Makefile.am

@@ -1 +1 @@
-SUBDIRS=sdr
+SUBDIRS=dsp

include/osmocom/dsp/Makefile.am

@@ -0,0 +1,3 @@
+osmodsp_HEADERS = cfile.h cxvec.h cxvec_math.h
+
+osmodspdir = $(includedir)/osmocom/dsp

include/osmocom/dsp/cfile.h

@@ -22,8 +22,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef __OSMO_SDR_CFILE_H__
+#ifndef __OSMO_DSP_CFILE_H__
-#define __OSMO_SDR_CFILE_H__
+#define __OSMO_DSP_CFILE_H__
 
 /*! \defgroup cfile .cfile helpers
  *  @{
@@ -47,4 +47,4 @@ void cfile_release(struct cfile *cf);
 
 /*! @} */
 
-#endif /* __OSMO_SDR_CFILE_H__ */
+#endif /* __OSMO_DSP_CFILE_H__ */

include/osmocom/dsp/cxvec.h

@@ -22,8 +22,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef __OSMO_SDR_CXVEC_H__
+#ifndef __OSMO_DSP_CXVEC_H__
-#define __OSMO_SDR_CXVEC_H__
+#define __OSMO_DSP_CXVEC_H__
 
 /*! \defgroup cxvec Complex vectors
  *  @{
@@ -64,4 +64,4 @@ osmo_cxvec_dbg_dump(struct osmo_cxvec *cv, const char *fname);
 
 /*! @} */
 
-#endif /* __OSMO_SDR_CXVEC_H__ */
+#endif /* __OSMO_DSP_CXVEC_H__ */

include/osmocom/dsp/cxvec_math.h

@@ -22,8 +22,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef __OSMO_SDR_CXVEC_MATH_H__
+#ifndef __OSMO_DSP_CXVEC_MATH_H__
-#define __OSMO_SDR_CXVEC_MATH_H__
+#define __OSMO_DSP_CXVEC_MATH_H__
 
 /*! \defgroup cxvec_math Complex vectors math and signal processing
  *  \ingroup cxvec
@@ -37,7 +37,7 @@
 #include <complex.h>
 #include <math.h>
 
-#include <osmocom/sdr/cxvec.h>
+#include <osmocom/dsp/cxvec.h>
 
 
 	/* Generic math stuff */
@@ -120,4 +120,4 @@ osmo_cxvec_sig_normalize(struct osmo_cxvec *sig, int decim, float freq_shift,
 
 /*! @} */
 
-#endif /* __OSMO_SDR_CXVEC_MATH_H__ */
+#endif /* __OSMO_DSP_CXVEC_MATH_H__ */

include/osmocom/sdr/Makefile.am

@@ -1,3 +0,0 @@
-osmosdr_HEADERS = cfile.h cxvec.h cxvec_math.h
-
-osmosdrdir = $(includedir)/osmocom/sdr

libosmodsp.pc.in

@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: Osmocom SDR Library
+Name: Osmocom DSP Library
 Description: C Utility Library
 Version: @VERSION@
-Libs: -L${libdir} -losmosdr -lm
+Libs: -L${libdir} -losmodsp -lm
 Cflags: -I${includedir}/

src/Makefile.am

@@ -5,7 +5,7 @@ LIBVERSION=0:0:0
 INCLUDES = $(all_includes) -I$(top_srcdir)/include
 AM_CFLAGS = -fPIC -Wall -ffast-math
 
-lib_LTLIBRARIES = libosmosdr.la
+lib_LTLIBRARIES = libosmodsp.la
 
-libosmosdr_la_SOURCES = cfile.c cxvec.c cxvec_math.c
+libosmodsp_la_SOURCES = cfile.c cxvec.c cxvec_math.c
-libosmosdr_la_LDFALGS = -version-info $(LIBVERSION)
+libosmodsp_la_LDFALGS = -version-info $(LIBVERSION)

src/cfile.c

@@ -39,7 +39,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <osmocom/sdr/cfile.h>
+#include <osmocom/dsp/cfile.h>
 
 
 /*! \brief .cfile loader: mmap() the data into memory (read-only)

src/cxvec.c

@@ -35,7 +35,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <osmocom/sdr/cxvec.h>
+#include <osmocom/dsp/cxvec.h>
 
 /*! \brief Initialize a vector structure with a given data array
  *  \param[out] cv The vector to be initialized

src/cxvec_math.c

@@ -35,8 +35,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <osmocom/sdr/cxvec.h>
+#include <osmocom/dsp/cxvec.h>
-#include <osmocom/sdr/cxvec_math.h>
+#include <osmocom/dsp/cxvec_math.h>
 
 /*! \brief Scale a complex vector (multiply by a constant)
  *  \param[in] in Input complex vector