Merge branch 'master' of https://github.com/Hamlib/Hamlib

include/hamlib/rig.h

@@ -33,7 +33,6 @@
 #define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
 
 #include <stdio.h>
-#include <stdarg.h>
 #include <string.h>
 #include <inttypes.h>
 #include <time.h>

rigs/alinco/dx77.c

@@ -30,7 +30,6 @@
 #include "alinco.h"
 #include <serial.h>
 #include <misc.h>
-#include <cal.h>
 
 /*
  * modes in use by the "2G" command

rigs/aor/aor.c

@@ -22,7 +22,6 @@
 #include <hamlib/config.h>
 
 #include <stdio.h>
-#include <ctype.h>
 
 #include "hamlib/rig.h"
 #include "serial.h"

rigs/barrett/4050.c

@@ -25,7 +25,6 @@
 #include <hamlib/rig.h>
 #include "serial.h"
 #include "misc.h"
-#include "cal.h"
 #include "token.h"
 #include "register.h"
 

rigs/barrett/950.c

@@ -26,7 +26,6 @@
 #include <hamlib/rig.h>
 #include "serial.h"
 #include "misc.h"
-#include "cal.h"
 #include "token.h"
 #include "register.h"
 

rigs/barrett/barrett.c

@@ -27,7 +27,6 @@
 #include <hamlib/rig.h>
 #include "serial.h"
 #include "misc.h"
-#include "cal.h"
 #include "token.h"
 #include "register.h"
 

rigs/codan/codan.c

@@ -27,7 +27,6 @@
 #include <hamlib/rig.h>
 #include "serial.h"
 #include "misc.h"
-#include "cal.h"
 #include "token.h"
 #include "register.h"
 

rigs/dorji/dra818.c

@@ -23,7 +23,6 @@
 
 #include <stdlib.h>
 #include <string.h>  /* String function definitions */
-#include <stdbool.h>
 
 #include "hamlib/rig.h"
 #include "bandplan.h"

rigs/dummy/flrig.c

@@ -28,7 +28,6 @@
 #include <hamlib/rig.h>
 #include <serial.h>
 #include <misc.h>
-#include <cal.h>
 #include <token.h>
 #include <register.h>
 #include <network.h>

rigs/dummy/netampctl.c

@@ -23,14 +23,11 @@
 
 #include <stdlib.h>
 #include <string.h>  /* String function definitions */
-#include <errno.h>
 
 #include "hamlib/amplifier.h"
 #include "iofunc.h"
 #include "misc.h"
 
-#include "amp_dummy.h"
-
 #define CMD_MAX 32
 #define BUF_MAX 64
 

rigs/dummy/netrigctl.c

@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <errno.h>
 
 #include "hamlib/rig.h"
 #include "network.h"

rigs/dummy/netrotctl.c

@@ -23,7 +23,6 @@
 
 #include <stdlib.h>
 #include <string.h>  /* String function definitions */
-#include <errno.h>
 
 #include "hamlib/rotator.h"
 #include "iofunc.h"

rigs/dummy/tci1x.c

@@ -27,7 +27,6 @@
 #include <hamlib/rig.h>
 #include <serial.h>
 #include <misc.h>
-#include <cal.h>
 #include <token.h>
 #include <register.h>
 #include <network.h>

rigs/dummy/trxmanager.c

@@ -28,7 +28,6 @@
 #include <hamlib/rig.h>
 #include <serial.h>
 #include <misc.h>
-#include <cal.h>
 #include <token.h>
 #include <register.h>
 #include <network.h>

rigs/flexradio/dttsp.c

@@ -28,8 +28,6 @@
 #include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
 #include <math.h>
 
 #include "hamlib/rig.h"

rigs/gomspace/gs100.c

@@ -34,8 +34,6 @@
 #include "hamlib/rig.h"
 #include "serial.h"
 #include "parallel.h"
-#include "cm108.h"
-#include "gpio.h"
 #include "misc.h"
 #include "tones.h"
 #include "idx_builtin.h"

rigs/icmarine/icm710.c

@@ -28,7 +28,6 @@
 #include <hamlib/rig.h>
 #include <serial.h>
 #include <misc.h>
-#include <cal.h>
 #include <token.h>
 #include <register.h>
 

rigs/icmarine/icm710.h

@@ -23,7 +23,6 @@
 #define _ICM710_H 1
 
 #include "hamlib/rig.h"
-#include "cal.h"
 #include "tones.h"
 
 struct icm710_priv_caps {

rigs/icmarine/icmarine.c

@@ -27,7 +27,6 @@
 #include <hamlib/rig.h>
 #include <serial.h>
 #include <misc.h>
-#include <cal.h>
 #include <token.h>
 #include <register.h>
 

rigs/icmarine/icmarine.h

@@ -23,7 +23,6 @@
 #define _ICMARINE_H 1
 
 #include "hamlib/rig.h"
-#include "cal.h"
 #include "tones.h"
 
 #define BACKEND_VER "20181007"

rigs/icom/delta2.c

@@ -37,7 +37,6 @@
 #include <hamlib/rig.h>
 #include "icom.h"
 #include "icom_defs.h"
-#include "frame.h"
 #include "misc.h"
 
 #define DELTAII_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM)

rigs/icom/ic7410.c

@@ -29,7 +29,6 @@
 
 #include "icom.h"
 #include "icom_defs.h"
-#include "frame.h"
 #include "misc.h"
 #include "bandplan.h"
 

rigs/icom/ic9100.c

@@ -25,7 +25,6 @@
 #include <hamlib/rig.h>
 #include "icom.h"
 #include "icom_defs.h"
-#include "frame.h"
 #include "idx_builtin.h"
 #include "bandplan.h"
 

rigs/icom/icr7000.c

@@ -30,7 +30,6 @@
 
 #include "icom.h"
 #include "icom_defs.h"
-#include "frame.h"
 
 
 #define ICR7000_MODES (RIG_MODE_AM|RIG_MODE_SSB|RIG_MODE_FM|RIG_MODE_WFM)

rigs/icom/icr9000.c

@@ -30,7 +30,6 @@
 
 #include "icom.h"
 #include "icom_defs.h"
-#include "frame.h"
 
 
 #define ICR9000_MODES (RIG_MODE_AM|RIG_MODE_SSB|RIG_MODE_FM|RIG_MODE_RTTY|RIG_MODE_CW|RIG_MODE_WFM)

rigs/icom/icr9500.c

@@ -29,7 +29,6 @@
 
 #include "icom.h"
 #include "icom_defs.h"
-#include "frame.h"
 
 
 #define ICR9500_MODES (RIG_MODE_AM|RIG_MODE_AMS|\

rigs/icom/id51.c

@@ -28,7 +28,6 @@
 #include "icom.h"
 #include "idx_builtin.h"
 #include "icom_defs.h"
-#include "frame.h"
 
 /*
  * Specs and protocol details comes from the chapter 17 of ID-51A_E_PLUS2_CD_0.pdf

rigs/icom/optoscan.c

@@ -27,7 +27,6 @@
 #include "hamlib/rig.h"
 #include "serial.h"
 #include "misc.h"
-#include "cal.h"
 #include "token.h"
 
 #include "icom.h"

rigs/icom/optoscan.h

@@ -23,7 +23,6 @@
 #define _OPTOSCAN_H 1
 
 #include <hamlib/rig.h>
-#include <cal.h>
 #include <tones.h>
 
 #define TOK_TAPECNTL  TOKEN_BACKEND(1)

rigs/kachina/kachina.c

@@ -26,7 +26,6 @@
 #include "hamlib/rig.h"
 #include "serial.h"
 #include "misc.h"
-#include "cal.h"
 #include "register.h"
 
 #include "kachina.h"

rigs/kenwood/flex6xxx.c

@@ -33,7 +33,6 @@
 #include "bandplan.h"
 #include "flex.h"
 #include "token.h"
-#include "cal.h"
 
 #define F6K_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_AM|RIG_MODE_FM|RIG_MODE_PKTLSB|RIG_MODE_PKTUSB)
 

rigs/kit/hiqsdr.c

@@ -22,8 +22,6 @@
 #include <stdlib.h>
 #include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
 
 #include "hamlib/rig.h"
 #include "iofunc.h"

rigs/mds/mds.c

@@ -27,7 +27,6 @@
 #include <hamlib/rig.h>
 #include "serial.h"
 #include "misc.h"
-#include "cal.h"
 #include "token.h"
 #include "register.h"
 

rigs/pcr/pcr.c

@@ -34,7 +34,6 @@
 #include <stdlib.h>
 #include <string.h>     /* String function definitions */
 #include <errno.h>
-#include <ctype.h>
 
 #include "hamlib/rig.h"
 #include "serial.h"

rigs/prm80/prm80.c

@@ -28,7 +28,6 @@
 
 #include "hamlib/rig.h"
 #include "serial.h"
-#include "cal.h"
 #include "register.h"
 #include "idx_builtin.h"
 

rigs/racal/ra37xx.c

@@ -27,7 +27,6 @@
 #include "hamlib/rig.h"
 #include "serial.h"
 #include "misc.h"
-#include "cal.h"
 #include "register.h"
 #include "token.h"
 

rigs/racal/racal.c

@@ -28,7 +28,6 @@
 #include "hamlib/rig.h"
 #include "serial.h"
 #include "misc.h"
-#include "cal.h"
 #include "register.h"
 #include "token.h"
 

rigs/rs/ek89x.c

@@ -29,7 +29,6 @@
 #include <hamlib/config.h>
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>     /* String function definitions */
 
 #include "hamlib/rig.h"

rigs/skanti/skanti.c

@@ -27,7 +27,6 @@
 #include <hamlib/rig.h>
 #include <serial.h>
 #include <misc.h>
-#include <cal.h>
 #include <register.h>
 
 #include "skanti.h"

rigs/tentec/orion.c

@@ -79,7 +79,6 @@
 #include "misc.h"
 #include "idx_builtin.h"
 #include "orion.h"
-#include <cal.h>
 
 #ifdef TT565_TIME
 /**

rigs/tentec/tentec.c

@@ -29,7 +29,6 @@
 #include "hamlib/rig.h"
 #include "serial.h"
 #include "misc.h"
-#include "cal.h"
 #include "register.h"
 
 #include "tentec.h"

rigs/tentec/tentec2.c

@@ -59,7 +59,6 @@
 #include "hamlib/rig.h"
 #include "serial.h"
 #include "misc.h"
-#include "cal.h"
 #include "register.h"
 
 #include "tentec.h"

rigs/tentec/tt550.c

@@ -26,13 +26,10 @@
 #include <stdio.h>      /* Standard input/output definitions */
 #include <string.h>     /* String function definitions */
 #include <unistd.h>     /* UNIX standard function definitions */
-#include <fcntl.h>      /* File control definitions */
-#include <errno.h>      /* Error number definitions */
 
 #include <hamlib/rig.h>
 #include "serial.h"
 #include "misc.h"
-#include "cal.h"
 
 #include "tt550.h"
 

rigs/tentec/tt550.h

@@ -23,7 +23,6 @@
 #define _TT550_H 1
 
 #include <hamlib/rig.h>
-#include <cal.h>
 
 
 #define EOM "\015"		/* CR */

rigs/uniden/uniden.h

@@ -23,7 +23,6 @@
 #define _UNIDEN_H 1
 
 #include <hamlib/rig.h>
-#include <cal.h>
 
 #define BACKEND_VER	"20200621"
 

rigs/wj/wj.c

@@ -27,7 +27,6 @@
 #include "hamlib/rig.h"
 #include "serial.h"
 #include "misc.h"
-#include "cal.h"
 #include "register.h"
 #include "token.h"
 

rigs/yaesu/ft1000mp.c

@@ -41,7 +41,6 @@
 #include "bandplan.h"
 #include "serial.h"
 #include "misc.h"
-#include "cal.h"
 #include "yaesu.h"
 #include "ft1000mp.h"
 

security/password.c

@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 #include "hamlib/rig.h"
 #include "password.h"
 #include "md5.h"

src/debug.c

@@ -35,8 +35,6 @@
 #include <stdarg.h>
 #include <stdio.h>  /* Standard input/output definitions */
 #include <string.h> /* String function definitions */
-#include <fcntl.h>  /* File control definitions */
-#include <errno.h>  /* Error number definitions */
 #include <sys/types.h>
 
 #ifdef ANDROID

src/iofunc.c

@@ -50,7 +50,6 @@
 #include "usb_port.h"
 #include "network.h"
 #include "cm108.h"
-#include "gpio.h"
 #include "asyncpipe.h"
 
 #if defined(WIN32) && defined(HAVE_WINDOWS_H)

src/mem.c

@@ -39,7 +39,6 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
 
 #include <hamlib/rig.h>
 

src/microham.c

@@ -36,10 +36,6 @@
 #include <time.h>
 #include <limits.h>
 
-#ifdef HAVE_ERRNO_H
-#  include <errno.h>
-#endif
-
 #ifdef HAVE_SYS_SELECT_H
 #  include <sys/select.h>
 #endif

src/misc.c

@@ -34,8 +34,6 @@
 #include <stdarg.h>
 #include <stdio.h>   /* Standard input/output definitions */
 #include <string.h>  /* String function definitions */
-#include <fcntl.h>   /* File control definitions */
-#include <errno.h>   /* Error number definitions */
 
 #ifdef HAVE_SYS_TYPES_H
 #  include <sys/types.h>

src/register.c

@@ -28,7 +28,6 @@
 
 #include <hamlib/config.h>
 
-#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>

src/rig.c

@@ -58,7 +58,6 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
 #include <errno.h>
 #ifdef HAVE_PTHREAD
 #include <pthread.h>
@@ -68,7 +67,6 @@
 #include <hamlib/rig.h>
 #include "serial.h"
 #include "parallel.h"
-#include "usb_port.h"
 #include "network.h"
 #include "event.h"
 #include "cm108.h"

src/rot_settings.c

@@ -40,11 +40,9 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
 
 #include <hamlib/rig.h>
 #include <hamlib/rotator.h>
-#include "cal.h"
 
 
 #ifndef DOC_HIDDEN

src/usb_port.c

@@ -37,7 +37,6 @@
 
 #include <stdlib.h>
 #include <string.h>  /* String function definitions */
-#include <errno.h>
 #include <sys/types.h>
 
 #include <hamlib/rig.h>

tests/memcsv.c

@@ -27,9 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <errno.h>
-
-#include <getopt.h>
 
 #include <hamlib/rig.h>
 #include "misc.h"

tests/rigmem.c

@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <errno.h>
 
 #include <getopt.h>
 

tests/rigsmtr.c

@@ -26,7 +26,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <errno.h>
 #include <math.h>
 
 #include <getopt.h>

tests/rigswr.c

@@ -26,7 +26,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <errno.h>
 
 #include <getopt.h>