remove conf.h, define package and state directories from compiler command line, with defaults

Author: ka9q

src/Makefile

@@ -18,6 +18,15 @@ pkgdatadir    ?= $(datadir)/ka9q-radio
 pkglibdir     ?= $(libdir)/ka9q-radio
 statedir      ?= $(localstatedir)/lib/ka9q-radio
 
+# eg, /var/lib/ka9q-radio
+PATH_FLAGS += -DSTATEDIR=\"$(statedir)\"
+
+# eg, /usr/local/share/ka9q-radio, /usr/share/ka9q-radio
+PATH_FLAGS += -DPKGDATADIR=\"$(pkgdatadir)\"
+
+# eg, /usr/local/lib/ka9q-radio, /usr/lib/ka9q-radio
+PATH_FLAGS += -DPKGLIBDIR=\"$(pkglibdir)\"
+
 UNAME_S := $(shell uname -s)
 
 CPPFLAGS ?=
@@ -66,10 +75,10 @@ ARCHOPTS = -march=native
 # do NOT set -ffast-math or -ffinite-math-only; NANs are widely used as 'variable not set' sentinels
 COPTS = -std=gnu11 -pthread -Wall -funsafe-math-optimizations -fno-math-errno -fcx-limited-range -freciprocal-math -fno-trapping-math -D_GNU_SOURCE=1 -Wextra -Wno-sign-conversion -Wno-int-conversion -MMD -MP
 COPTS += -fPIC
-CFLAGS += $(DOPTS) $(ARCHOPTS) $(COPTS) $(INCLUDES) $(VERSION_FLAGS)
+CFLAGS += $(DOPTS) $(ARCHOPTS) $(COPTS) $(INCLUDES) $(VERSION_FLAGS) $(PATH_FLAGS)
 DAEMONS = aprs aprsfeed cwd packetd radiod
 EXECS = ctcss control fft-gen jt-decoded metadump monitor pcmrecord powers tune wd-record
-LIBRADIO = ax25.o morse.o bandplan.o dump.o modes.o avahi.o avahi_browse.o attr.o filter.o iir.o decode_status.o status.o misc.o multicast.o rtp.o osc.o config.o sincospi.o sincospif.o window.o gauss.o
+LIBRADIO = ax25.o morse.o dump.o modes.o avahi.o avahi_browse.o attr.o filter.o iir.o decode_status.o status.o misc.o multicast.o rtp.o osc.o config.o sincospi.o sincospif.o window.o gauss.o
 DYNAMIC_DRIVERS = sig_gen.so
 RADIOD_OBJECTS = main.o audio.o fm.o wfm.o linear.o spectrum.o radio.o radio_status.o rtcp.o fcd.o hid-libusb.o libradio.a
 CFILES = airspy.c airspyhf.c aprs.c aprsfeed.c attr.c audio.c avahi.c avahi_browse.c ax25.c bandplan.c config.c control.c cwd.c decimate.c decode_status.c dump.c ezusb.c fcd.c filter.c fm.c funcube.c hid-libusb.c iir.c jt-decoded.c linear.c main.c metadump.c misc.c modes.c monitor.c monitor-data.c monitor-display.c monitor-repeater.c morse.c multicast.c opusd.c opussend.c osc.c packetd.c pcmcat.c pcmrecord.c pcmsend.c pcmspawn.c ctcss.c powers.c radio.c radio_status.c rdsd.c rtcp.c rtlsdr.c rtp.c rx888.c setfilt.c show-pkt.c show-sig.c sig_gen.c spectrum.c status.c stereod.c tune.c wd-record.c wfm.c
@@ -169,7 +178,7 @@ aprs: aprs.o libradio.a
 aprsfeed: aprsfeed.o libradio.a
 	$(CC) $(LDOPTS) -o $@ $^ $(LDLIBS)
 
-control: control.o libradio.a
+control: control.o bandplan.o libradio.a
 	$(CC) $(LDOPTS) -o $@ $^ -liniparser -lncursesw $(LDLIBS)
 
 ctcss: ctcss.o libradio.a

src/bandplan.c

@@ -15,10 +15,11 @@
 #include <limits.h>
 #include <stdbool.h>
 
-#include "conf.h"
 #include "misc.h"
 #include "bandplan.h"
 
+#define BANDPLAN "bandplan.txt"
+
 char Bandplan_file[] = BANDPLAN;
 #define MAX_BANDPLANS 1000
 struct bandplan Bandplans[MAX_BANDPLANS];

src/conf.h

@@ -16,10 +16,14 @@
 #include <sys/stat.h>
 #include <errno.h>
 #include <sys/file.h>
+#include <limits.h>
 
 #define System_wisdom_file "/etc/fftw/wisdomf"
-#define Wisdom_dir "/var/lib/ka9q-radio"
-#define Wisdom_file "/var/lib/ka9q-radio/wisdom"
+
+#ifndef STATEDIR
+#define STATEDIR "/var/lib/ka9q-radio"
+#endif
+#define WISDOM_FILE "wisdom"
 
 static int Verbose;
 static bool Force;
@@ -173,16 +177,18 @@ int main(int argc,char *argv[]){
       }
     }
     track_wisdom_length();
-    lr = fftwf_import_wisdom_from_filename(Wisdom_file);
+    char wisdom_file[PATH_MAX];
+    snprintf(wisdom_file,sizeof wisdom_file,"%s/%s",STATEDIR,WISDOM_FILE);
+    lr = fftwf_import_wisdom_from_filename(wisdom_file);
     if(Verbose > 1){
-      printf("fftwf_import_wisdom_from_filename(%s) %s\n",Wisdom_file,lr ? "succeeded" : "failed");
+      printf("fftwf_import_wisdom_from_filename(%s) %s\n",wisdom_file,lr ? "succeeded" : "failed");
       if(!lr){
-	if(access(Wisdom_file,R_OK) == -1){
-	  printf("%s not readable: %s\n",Wisdom_file,strerror(errno));
+	if(access(wisdom_file,R_OK) == -1){
+	  printf("%s not readable: %s\n",wisdom_file,strerror(errno));
 	}
       }
-      if(access(Wisdom_file,W_OK) == -1)
-	printf("Warning: %s not writeable, exports will fail: %s\n",Wisdom_file,strerror(errno));
+      if(access(wisdom_file,W_OK) == -1)
+	printf("Warning: %s not writeable, exports will fail: %s\n",wisdom_file,strerror(errno));
     }
     track_wisdom_length();
   }
@@ -310,7 +316,10 @@ static int save_plans(){
   int fd = -1;
 
   // Import or re-import wisdom and merge
-  if(asprintf(&lockfile,"%s.lock",Wisdom_file) <= 0){
+  char wisdom_file[PATH_MAX];
+  snprintf(wisdom_file,sizeof wisdom_file,"%s/%s",STATEDIR,WISDOM_FILE);
+
+  if(asprintf(&lockfile,"%s.lock",wisdom_file) <= 0){
     free(lockfile);
     return 0;
   }
@@ -320,12 +329,12 @@ static int save_plans(){
     printf("Can't acquire lock on %s\n",lockfile);
   else
     flock(lockfd,LOCK_EX);
-  bool reimport = fftwf_import_wisdom_from_filename(Wisdom_file);
+  bool reimport = fftwf_import_wisdom_from_filename(wisdom_file);
   if(Verbose > 1)
-    printf("fftwf_import_wisdom_from_filename(%s) %s\n",Wisdom_file,reimport ? "succeeded" : "failed");
+    printf("fftwf_import_wisdom_from_filename(%s) %s\n",wisdom_file,reimport ? "succeeded" : "failed");
   track_wisdom_length();
 
-  if(asprintf(&newtemp,"%s-XXXXXX",Wisdom_file) < 0)
+  if(asprintf(&newtemp,"%s-XXXXXX",wisdom_file) < 0)
     goto quit;
 
   wisdom = fftwf_export_wisdom_to_string();
@@ -350,7 +359,7 @@ static int save_plans(){
 
   // Copy user/group/mode from old version
   struct stat st;
-  if(stat(Wisdom_file,&st) == 0){
+  if(stat(wisdom_file,&st) == 0){
     int r = fchown(fd, st.st_uid, st.st_gid); // Best effort
     (void)r;
     fchmod(fd, st.st_mode);
@@ -363,13 +372,13 @@ static int save_plans(){
   fsync(fd);
   close(fd);
   fd = -1;
-  int dir = open(Wisdom_dir,O_DIRECTORY);
+  int dir = open(STATEDIR,O_DIRECTORY);
   fsync(dir);
   close(dir);
-  if(rename(newtemp,Wisdom_file) != 0)
-    printf("rename %s to %s failed: %s\n",newtemp,Wisdom_file,strerror(errno));
+  if(rename(newtemp,wisdom_file) != 0)
+    printf("rename %s to %s failed: %s\n",newtemp,wisdom_file,strerror(errno));
   else if(Verbose > 1)
-    printf("rename %s to %s succeeded\n",newtemp,Wisdom_file);
+    printf("rename %s to %s succeeded\n",newtemp,wisdom_file);
 
   if(Force)
     fftwf_forget_wisdom(); // start fresh for the next on the list

src/fft-gen.c

@@ -33,17 +33,21 @@
 #pragma GCC diagnostic pop
 #endif
 
-#include "conf.h"
 #include "misc.h"
 #include "filter.h"
 #include "window.h"
 
-#define FFT_LOG_FILE "/var/lib/ka9q-radio/fft.log"
+#ifndef STATEDIR
+#define STATEDIR "/var/lib/ka9q-radio"
+#endif
+#define FFT_LOG_FILE "fft.log"
+
+const char *Wisdom_file; // Set in radio.c when reading config file
+
 
 //#define FILTER_DEBUG 1 // turn on lots of printfs in the window creation code
 
 // Settable from main
-char const *Wisdom_file = "/var/lib/ka9q-radio/wisdom";
 char const *System_wisdom_file = "/etc/fftw/wisdomf"; // only valid for float version
 int N_worker_threads = 1;
 int N_internal_threads = 1; // Usually most efficient
@@ -211,9 +215,11 @@ int create_filter_input(struct filter_in *master,int const L,int const M, enum f
   // of independent FFTs to execute at the same time
   if(!atomic_flag_test_and_set_explicit(&FFTW_init,memory_order_relaxed)){
     fprintf(stderr,"FFTW version: %s\n", fftwf_version);
-    FFT_log = fopen(FFT_LOG_FILE,"a");
+    char fft_file[PATH_MAX];
+    snprintf(fft_file,sizeof fft_file,"%s/%s",STATEDIR,FFT_LOG_FILE);
+    FFT_log = fopen(fft_file,"a");
     if(FFT_log == NULL)
-      fprintf(stderr,"Can't append to %s: %s\n",FFT_LOG_FILE,strerror(errno));
+      fprintf(stderr,"Can't append to %s: %s\n",fft_file,strerror(errno));
 
     fftwf_init_threads();
     bool sr = fftwf_import_system_wisdom();
@@ -223,7 +229,6 @@ int create_filter_input(struct filter_in *master,int const L,int const M, enum f
 	fprintf(stderr,"%s not readable: %s\n",System_wisdom_file,strerror(errno));
       }
     }
-
     bool lr = fftwf_import_wisdom_from_filename(Wisdom_file);
     fprintf(stderr,"fftwf_import_wisdom_from_filename(%s) %s\n",Wisdom_file,lr ? "succeeded" : "failed");
     if(!lr){

src/filter.c

@@ -22,6 +22,7 @@ extern double FFTW_plan_timelimit;
 extern pthread_mutex_t FFTW_planning_mutex;
 extern int N_internal_threads;
 extern int N_worker_threads; // owned by filter.c
+extern char const *Wisdom_file;
 
 // Input can be REAL or COMPLEX
 // Output can be REAL, COMPLEX, BEAM or SPECTRUM

src/filter.h

@@ -325,6 +325,24 @@ static void *hydrasdr_monitor(void *p){
   (void)ret;
   assert(ret == HYDRASDR_SUCCESS);
   fprintf(stderr,"hydrasdr running\n");
+#if 1  
+  {
+    hydrasdr_device_info_t info = {0};
+    hydrasdr_get_device_info(sdr->device, &info);
+
+  // Current streaming configuration
+  fprintf(stderr,"Effective rate: %u Hz\n", info.current_samplerate);
+  fprintf(stderr,"Hardware rate:  %u Hz\n", info.current_hw_samplerate);
+  fprintf(stderr,"Decimation:     %ux (%s mode)\n",
+	 info.current_decimation_factor,
+	 info.current_decimation_mode ? "High Definition" : "Low Bandwidth");
+  fprintf(stderr,"Bandwidth:      %u Hz (%s)\n",
+	 info.current_bandwidth,
+	 info.bandwidth_auto_selected ? "auto" : "manual");
+  fprintf(stderr,"Sample type:    %u\n", info.current_sample_type);
+  fprintf(stderr,"Packing:        %s\n", info.current_packing ? "12-bit" : "16-bit");
+  }
+#endif
   // Periodically poll status to ensure device hasn't reset
   while(true){
     sleep(1);

src/hydrasdr.c

@@ -33,10 +33,13 @@
 #define NULL ((void *)0)
 #endif
 
-#include "conf.h"
 #include "misc.h"
 
-char const *Libdir = LIBDIR;
+#ifndef PKGDATADIR
+#define PKGDATADIR "/usr/local/share/ka9q-radio"
+#endif
+
+char const *Pkgdatadir = PKGDATADIR;
 
 // Return path to file which is part of the application distribution.
 // This allows to run the program either from build directory or from
@@ -57,7 +60,7 @@ int dist_path(char *path,int path_len,const char *fname){
   if(stat(path, &st) == 0 && (st.st_mode & S_IFMT) == S_IFREG)
     return 0;
 
-  snprintf(path,path_len,"%s/%s",Libdir,fname);
+  snprintf(path,path_len,"%s/%s",Pkgdatadir,fname);
   if(stat(path, &st) == 0 && (st.st_mode & S_IFMT) == S_IFREG)
     return 0;
 

src/misc.c

@@ -25,7 +25,6 @@
 #include <poll.h>
 #include <stdatomic.h>
 
-#include "conf.h"
 #include "config.h"
 #include "misc.h"
 #include "multicast.h"

src/monitor-data.c

@@ -25,7 +25,6 @@
 #include <regex.h>
 #include <ctype.h>
 
-#include "conf.h"
 #include "config.h"
 #include "misc.h"
 #include "multicast.h"
@@ -35,6 +34,8 @@
 #include "status.h"
 #include "monitor.h"
 
+#define ID "id.txt"
+
 bool Auto_sort = false;
 int Update_interval = 100;  // Default time in ms between display updates