casa-mp-base

From cf762649f1a74454cb43225e2534ac87b1e75660 Mon Sep 17 00:00:00 2001

Date: Mon, 15 Apr 2019 14:55:41 +0200

Subject: [PATCH 1/3] fix version consistency

​

---

 rsp_tcp.c | 7 +------

 1 file changed, 1 insertion(+), 6 deletions(-)

​

diff --git a/rsp_tcp.c b/rsp_tcp.c

index a3f7b39..ca4302a 100644

--- a/rsp_tcp.c

+++ b/rsp_tcp.c

@@ -115,9 +115,6 @@ static int llbuf_num = 500;

 static volatile int do_exit = 0;

-#define RSP_TCP_VERSION_MAJOR (1)

-#define RSP_TCP_VERSION_MINOR (0)

-

 #define MAX_DECIMATION_FACTOR (64)

 #define MAX_DEVS 4

 #define WORKER_TIMEOUT_SEC 3

@@ -1441,9 +1438,7 @@ int init_rsp_device(unsigned int sr, unsigned int freq, int enable_bias_t, unsig

 void usage(void)

 {

    printf("rsp_tcp, an I/Q spectrum server for SDRPlay receivers "

-#ifdef SERVER_VERSION

        "VERSION "SERVER_VERSION

-#endif

        "\n\n"

        "Usage:\t[-a listen address]\n"

        "\t[-p listen port (default: 1234)]\n"

@@ -1500,7 +1495,7 @@ int main(int argc, char **argv)

    struct sigaction sigact, sigign;

 #endif

-   printf("rsp_tcp version %d.%d\n\n", RSP_TCP_VERSION_MAJOR, RSP_TCP_VERSION_MINOR);

+   printf("rsp_tcp version %s\n\n", SERVER_VERSION);

    while ((opt = getopt(argc, argv, "a:p:f:b:s:n:d:P:TvADBFRE")) != -1) {

        switch (opt) {

​

From 258a27957e276653e040121db0f15138ec195a25 Mon Sep 17 00:00:00 2001

Date: Mon, 15 Apr 2019 15:06:26 +0200

Subject: [PATCH 2/3] fix usage()

​

- fix ./rsp_tcp: option requires an argument -- h

- remove double header when request help

---

 CMakeLists.txt |  1 +

 rsp_tcp.c      | 49 +++++++++++++++++++++++++++----------------------

 2 files changed, 28 insertions(+), 22 deletions(-)

​

diff --git a/CMakeLists.txt b/CMakeLists.txt

index ed46c99..0bb114b 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -22,6 +22,7 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)

 set(CMAKE_C_FLAGS "-Wall")

 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -ggdb")

 add_definitions(-D_GNU_SOURCE)

+add_definitions(-DSERVER_NAME="${PROJECT_NAME}")

 add_definitions(-DSERVER_VERSION="${PROJECT_VERSION}")