From 72117308663f97bc7ae396a108f6c5ffd51b2258 Mon Sep 17 00:00:00 2001 From: Daniele Forsi IU5HKX Date: Tue, 14 Feb 2023 20:00:43 +0100 Subject: [PATCH] [icom] Fix includes --- rigs/icom/delta2.c | 2 -- rigs/icom/frame.c | 4 ++++ rigs/icom/frame.h | 4 ++++ rigs/icom/ic2730.c | 1 + rigs/icom/ic7000.c | 1 + rigs/icom/ic703.c | 1 + rigs/icom/ic706.c | 2 +- rigs/icom/ic7100.c | 1 + rigs/icom/ic7200.c | 2 -- rigs/icom/ic7300.c | 4 ++-- rigs/icom/ic7300.h | 4 ++-- rigs/icom/ic7410.c | 3 +-- rigs/icom/ic746.c | 3 +-- rigs/icom/ic751.c | 1 - rigs/icom/ic756.c | 1 + rigs/icom/ic7600.c | 1 + rigs/icom/ic761.c | 1 - rigs/icom/ic7610.c | 1 + rigs/icom/ic7700.c | 1 + rigs/icom/ic7800.c | 4 ++++ rigs/icom/ic785x.c | 1 + rigs/icom/ic910.c | 2 +- rigs/icom/ic9100.c | 2 +- rigs/icom/ic92d.c | 1 + rigs/icom/icom.c | 3 --- rigs/icom/icr30.c | 1 + rigs/icom/icr6.c | 1 + rigs/icom/icr7000.c | 3 --- rigs/icom/icr8600.c | 2 ++ rigs/icom/icr9000.c | 3 --- rigs/icom/icr9500.c | 5 +---- rigs/icom/id1.c | 1 + rigs/icom/id31.c | 1 + rigs/icom/id4100.c | 1 + rigs/icom/id51.c | 1 + rigs/icom/id5100.c | 1 + rigs/icom/optoscan.c | 6 +++++- rigs/icom/optoscan.h | 3 ++- rigs/icom/os456.c | 1 - rigs/icom/perseus.c | 4 ---- rigs/icom/xiegu.c | 3 +-- 41 files changed, 49 insertions(+), 39 deletions(-) diff --git a/rigs/icom/delta2.c b/rigs/icom/delta2.c index be334a593..349186cb2 100644 --- a/rigs/icom/delta2.c +++ b/rigs/icom/delta2.c @@ -33,8 +33,6 @@ #include #include "icom.h" -#include "icom_defs.h" -#include "misc.h" #define DELTAII_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM) diff --git a/rigs/icom/frame.c b/rigs/icom/frame.c index 8880444a3..081692705 100644 --- a/rigs/icom/frame.c +++ b/rigs/icom/frame.c @@ -23,6 +23,10 @@ #include /* String function definitions */ +#ifdef HAVE_SYS_TIME_H +#include +#endif + #include "hamlib/rig.h" #include "serial.h" #include "misc.h" diff --git a/rigs/icom/frame.h b/rigs/icom/frame.h index 63019fb32..2dab9c59f 100644 --- a/rigs/icom/frame.h +++ b/rigs/icom/frame.h @@ -22,6 +22,10 @@ #ifndef _FRAME_H #define _FRAME_H 1 +#include + +#include "rig.h" + // Has to be big enough for 0xfe sequence to wake up rig #define MAXFRAMELEN 200 diff --git a/rigs/icom/ic2730.c b/rigs/icom/ic2730.c index 3d3479894..f21935a68 100644 --- a/rigs/icom/ic2730.c +++ b/rigs/icom/ic2730.c @@ -22,6 +22,7 @@ #include "hamlib/rig.h" #include "idx_builtin.h" #include "icom.h" +#include "tones.h" #define IC2730_MODES (RIG_MODE_FM) #define IC2730_ALL_RX_MODES (RIG_MODE_AM|IC2730_MODES) diff --git a/rigs/icom/ic7000.c b/rigs/icom/ic7000.c index c2f5b6833..6d1aab267 100644 --- a/rigs/icom/ic7000.c +++ b/rigs/icom/ic7000.c @@ -29,6 +29,7 @@ #include "icom_defs.h" #include "frame.h" #include "bandplan.h" +#include "tones.h" #define IC7000_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_FM|RIG_MODE_WFM) #define IC7000_1HZ_TS_MODES (RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR) diff --git a/rigs/icom/ic703.c b/rigs/icom/ic703.c index 043404c38..0e9097539 100644 --- a/rigs/icom/ic703.c +++ b/rigs/icom/ic703.c @@ -25,6 +25,7 @@ #include "icom.h" #include "bandplan.h" #include "idx_builtin.h" +#include "tones.h" #define IC703_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_FM) diff --git a/rigs/icom/ic706.c b/rigs/icom/ic706.c index 9e429da7e..761898a99 100644 --- a/rigs/icom/ic706.c +++ b/rigs/icom/ic706.c @@ -25,8 +25,8 @@ #include "icom.h" #include "icom_defs.h" #include "frame.h" -#include "idx_builtin.h" #include "bandplan.h" +#include "tones.h" /* diff --git a/rigs/icom/ic7100.c b/rigs/icom/ic7100.c index 1b5315782..c0931aa12 100644 --- a/rigs/icom/ic7100.c +++ b/rigs/icom/ic7100.c @@ -28,6 +28,7 @@ #include "idx_builtin.h" #include "bandplan.h" #include "token.h" +#include "tones.h" #include "misc.h" diff --git a/rigs/icom/ic7200.c b/rigs/icom/ic7200.c index e71408eee..2a93f39a9 100644 --- a/rigs/icom/ic7200.c +++ b/rigs/icom/ic7200.c @@ -27,13 +27,11 @@ #include #include -#include "token.h" #include "idx_builtin.h" #include "icom.h" #include "icom_defs.h" #include "frame.h" -#include "misc.h" #include "bandplan.h" diff --git a/rigs/icom/ic7300.c b/rigs/icom/ic7300.c index e0a47791a..7740c18b8 100644 --- a/rigs/icom/ic7300.c +++ b/rigs/icom/ic7300.c @@ -26,12 +26,12 @@ #include "idx_builtin.h" #include "token.h" +#include "frame.h" #include "icom.h" #include "icom_defs.h" -#include "frame.h" +#include "misc.h" #include "bandplan.h" #include "tones.h" -#include "misc.h" #include "ic7300.h" static int ic7300_set_parm(RIG *rig, setting_t parm, value_t val); diff --git a/rigs/icom/ic7300.h b/rigs/icom/ic7300.h index a1973a011..626298032 100644 --- a/rigs/icom/ic7300.h +++ b/rigs/icom/ic7300.h @@ -1,5 +1,5 @@ -#include "frame.h" -#include "misc.h" +#include "rig.h" + extern int ic7300_set_clock(RIG *rig, int year, int month, int day, int hour, int min, int sec, double msec, int utc_offset); extern int ic7300_get_clock(RIG *rig, int *year, int *month, int *day, diff --git a/rigs/icom/ic7410.c b/rigs/icom/ic7410.c index 13323d91f..5c48dc0f7 100644 --- a/rigs/icom/ic7410.c +++ b/rigs/icom/ic7410.c @@ -22,13 +22,12 @@ #include #include -#include "token.h" #include "idx_builtin.h" #include "icom.h" #include "icom_defs.h" -#include "misc.h" #include "bandplan.h" +#include "tones.h" #define IC7410_OTHER_TX_MODES (RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_FM|RIG_MODE_PKTLSB|RIG_MODE_PKTUSB|RIG_MODE_PKTFM) #define IC7410_AM_TX_MODES (RIG_MODE_AM) diff --git a/rigs/icom/ic746.c b/rigs/icom/ic746.c index ec8259ab2..b63701412 100644 --- a/rigs/icom/ic746.c +++ b/rigs/icom/ic746.c @@ -23,7 +23,6 @@ #include /* String function definitions */ #include -#include "token.h" #include "idx_builtin.h" #include "icom.h" @@ -31,7 +30,7 @@ #include "frame.h" #include "bandplan.h" #include "misc.h" - +#include "tones.h" /* * IC-746 and IC-746pro diff --git a/rigs/icom/ic751.c b/rigs/icom/ic751.c index 7a314bc04..ec386a798 100644 --- a/rigs/icom/ic751.c +++ b/rigs/icom/ic751.c @@ -22,7 +22,6 @@ #include #include "hamlib/rig.h" -#include "bandplan.h" #include "icom.h" #include "idx_builtin.h" diff --git a/rigs/icom/ic756.c b/rigs/icom/ic756.c index 6b9c59cf6..7b420c55c 100644 --- a/rigs/icom/ic756.c +++ b/rigs/icom/ic756.c @@ -29,6 +29,7 @@ #include "frame.h" #include "misc.h" #include "bandplan.h" +#include "tones.h" #define IC756_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_FM) #define IC756_1HZ_TS_MODES IC756_ALL_RX_MODES diff --git a/rigs/icom/ic7600.c b/rigs/icom/ic7600.c index c99e638e9..94f350439 100644 --- a/rigs/icom/ic7600.c +++ b/rigs/icom/ic7600.c @@ -30,6 +30,7 @@ #include "bandplan.h" #include "frame.h" #include "misc.h" +#include "tones.h" #define IC7600_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_FM|RIG_MODE_PSK|RIG_MODE_PSKR|RIG_MODE_PKTLSB|RIG_MODE_PKTUSB|RIG_MODE_PKTAM|RIG_MODE_PKTFM) #define IC7600_1HZ_TS_MODES IC7600_ALL_RX_MODES diff --git a/rigs/icom/ic761.c b/rigs/icom/ic761.c index 95b4fdeaa..21f13db45 100644 --- a/rigs/icom/ic761.c +++ b/rigs/icom/ic761.c @@ -22,7 +22,6 @@ #include #include "hamlib/rig.h" -#include "bandplan.h" #include "icom.h" diff --git a/rigs/icom/ic7610.c b/rigs/icom/ic7610.c index 764281751..fde58830e 100644 --- a/rigs/icom/ic7610.c +++ b/rigs/icom/ic7610.c @@ -24,6 +24,7 @@ #include #include "token.h" +#include "tones.h" #include "idx_builtin.h" #include "icom.h" diff --git a/rigs/icom/ic7700.c b/rigs/icom/ic7700.c index 7987d6a04..5b8050193 100644 --- a/rigs/icom/ic7700.c +++ b/rigs/icom/ic7700.c @@ -23,6 +23,7 @@ #include #include "token.h" +#include "tones.h" #include "idx_builtin.h" #include "icom.h" diff --git a/rigs/icom/ic7800.c b/rigs/icom/ic7800.c index 39bcf1a12..4d214be16 100644 --- a/rigs/icom/ic7800.c +++ b/rigs/icom/ic7800.c @@ -22,7 +22,11 @@ #include #include + +#include "frame.h" +#include "misc.h" #include "token.h" +#include "tones.h" #include "idx_builtin.h" #include "icom.h" diff --git a/rigs/icom/ic785x.c b/rigs/icom/ic785x.c index 4dd465579..4842fe597 100644 --- a/rigs/icom/ic785x.c +++ b/rigs/icom/ic785x.c @@ -24,6 +24,7 @@ #include #include "token.h" +#include "tones.h" #include "idx_builtin.h" #include "icom.h" diff --git a/rigs/icom/ic910.c b/rigs/icom/ic910.c index fc5ea609b..00f932d32 100644 --- a/rigs/icom/ic910.c +++ b/rigs/icom/ic910.c @@ -24,11 +24,11 @@ #include #include -#include "misc.h" #include "icom.h" #include "icom_defs.h" #include "frame.h" #include "idx_builtin.h" +#include "tones.h" /* * It seems some IC910 out there have weird firmware. Uncomment the following diff --git a/rigs/icom/ic9100.c b/rigs/icom/ic9100.c index 0e1fd3006..e0a9afc1c 100644 --- a/rigs/icom/ic9100.c +++ b/rigs/icom/ic9100.c @@ -24,7 +24,7 @@ #include "icom_defs.h" #include "idx_builtin.h" #include "bandplan.h" - +#include "tones.h" #define IC9100_MODES (RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_CWR|\ RIG_MODE_AM|RIG_MODE_FM|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_PKTUSB|RIG_MODE_PKTLSB) diff --git a/rigs/icom/ic92d.c b/rigs/icom/ic92d.c index 9f19c4fc5..8e0e8093c 100644 --- a/rigs/icom/ic92d.c +++ b/rigs/icom/ic92d.c @@ -26,6 +26,7 @@ #include "icom.h" #include "frame.h" #include "icom_defs.h" +#include "tones.h" /* TODO: DV (GMSK 4.8 kbps voice) */ #define IC92D_MODES (RIG_MODE_FM) diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c index 48be85320..c4d9b9c65 100644 --- a/rigs/icom/icom.c +++ b/rigs/icom/icom.c @@ -19,8 +19,6 @@ * */ -// cppcheck-suppress * -#include // cppcheck-suppress * #include // cppcheck-suppress * @@ -32,7 +30,6 @@ #include #include -#include #include #include #include diff --git a/rigs/icom/icr30.c b/rigs/icom/icr30.c index bcb8f93c4..1cb05558f 100644 --- a/rigs/icom/icr30.c +++ b/rigs/icom/icr30.c @@ -25,6 +25,7 @@ #include "idx_builtin.h" #include "icom_defs.h" #include "frame.h" +#include "tones.h" #define ICR30_MODES (RIG_MODE_LSB|RIG_MODE_USB|RIG_MODE_AM|RIG_MODE_AMN|\ RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_RTTY|RIG_MODE_FM|RIG_MODE_FMN|RIG_MODE_WFM|\ diff --git a/rigs/icom/icr6.c b/rigs/icom/icr6.c index 82389f595..1db529d01 100644 --- a/rigs/icom/icr6.c +++ b/rigs/icom/icr6.c @@ -22,6 +22,7 @@ #include "hamlib/rig.h" #include "icom.h" #include "idx_builtin.h" +#include "tones.h" #define ICR6_MODES (RIG_MODE_AM|RIG_MODE_FM|RIG_MODE_WFM) diff --git a/rigs/icom/icr7000.c b/rigs/icom/icr7000.c index e2dbd7830..f7168496b 100644 --- a/rigs/icom/icr7000.c +++ b/rigs/icom/icr7000.c @@ -22,12 +22,9 @@ #include #include -#include "serial.h" -#include "misc.h" #include "idx_builtin.h" #include "icom.h" -#include "icom_defs.h" #define ICR7000_MODES (RIG_MODE_AM|RIG_MODE_SSB|RIG_MODE_FM|RIG_MODE_WFM) diff --git a/rigs/icom/icr8600.c b/rigs/icom/icr8600.c index a604cab10..da932200d 100644 --- a/rigs/icom/icr8600.c +++ b/rigs/icom/icr8600.c @@ -21,10 +21,12 @@ * */ +#include #include "hamlib/rig.h" #include "idx_builtin.h" #include "token.h" +#include "tones.h" #include "icom.h" #include "icom_defs.h" diff --git a/rigs/icom/icr9000.c b/rigs/icom/icr9000.c index 3d0997127..723c29046 100644 --- a/rigs/icom/icr9000.c +++ b/rigs/icom/icr9000.c @@ -22,12 +22,9 @@ #include #include -#include "serial.h" -#include "misc.h" #include "idx_builtin.h" #include "icom.h" -#include "icom_defs.h" #define ICR9000_MODES (RIG_MODE_AM|RIG_MODE_SSB|RIG_MODE_FM|RIG_MODE_RTTY|RIG_MODE_CW|RIG_MODE_WFM) diff --git a/rigs/icom/icr9500.c b/rigs/icom/icr9500.c index 7ac9ef285..e2b769e89 100644 --- a/rigs/icom/icr9500.c +++ b/rigs/icom/icr9500.c @@ -20,13 +20,10 @@ */ #include -#include "serial.h" -#include "misc.h" #include "idx_builtin.h" #include "icom.h" -#include "icom_defs.h" - +#include "tones.h" #define ICR9500_MODES (RIG_MODE_AM|RIG_MODE_AMS|\ RIG_MODE_SSB|RIG_MODE_FM|RIG_MODE_RTTY|RIG_MODE_RTTYR|\ diff --git a/rigs/icom/id1.c b/rigs/icom/id1.c index 01bc60739..5fe1d3d43 100644 --- a/rigs/icom/id1.c +++ b/rigs/icom/id1.c @@ -22,6 +22,7 @@ #include "hamlib/rig.h" #include "idx_builtin.h" #include "icom.h" +#include "tones.h" #define ID1_MODES (RIG_MODE_FM /* |RIG_MODE_DIGVOICE|RIG_MODE_DIGDATA*/ ) diff --git a/rigs/icom/id31.c b/rigs/icom/id31.c index ef165b72f..475b871cd 100644 --- a/rigs/icom/id31.c +++ b/rigs/icom/id31.c @@ -23,6 +23,7 @@ #include "hamlib/rig.h" #include "idx_builtin.h" #include "icom.h" +#include "tones.h" /* * Specs and protocol details comes from the chapter 11 of ID-31A_E_CD_ENG_1.pdf diff --git a/rigs/icom/id4100.c b/rigs/icom/id4100.c index 898703826..4983e6d68 100644 --- a/rigs/icom/id4100.c +++ b/rigs/icom/id4100.c @@ -23,6 +23,7 @@ #include "hamlib/rig.h" #include "idx_builtin.h" #include "icom.h" +#include "tones.h" /* * Specs and protocol details comes from the chapter 10 of ID-4100A_E_ENG_PU_0.pdf diff --git a/rigs/icom/id51.c b/rigs/icom/id51.c index 42c6eba47..e22076f40 100644 --- a/rigs/icom/id51.c +++ b/rigs/icom/id51.c @@ -25,6 +25,7 @@ #include "icom.h" #include "idx_builtin.h" #include "icom_defs.h" +#include "tones.h" /* * Specs and protocol details comes from the chapter 17 of ID-51A_E_PLUS2_CD_0.pdf diff --git a/rigs/icom/id5100.c b/rigs/icom/id5100.c index 5436f0d16..f6a0904b7 100644 --- a/rigs/icom/id5100.c +++ b/rigs/icom/id5100.c @@ -26,6 +26,7 @@ #include "icom_defs.h" #include "frame.h" #include "misc.h" +#include "tones.h" /* * Specs and protocol details comes from the chapter 13 of ID-5100_Full-Inst_Manual.pdf diff --git a/rigs/icom/optoscan.c b/rigs/icom/optoscan.c index 4a8dfe5be..34d4d0a66 100644 --- a/rigs/icom/optoscan.c +++ b/rigs/icom/optoscan.c @@ -18,8 +18,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ + #include +#ifdef HAVE_SYS_TIME_H +#include +#endif + #include #include #include /* String function definitions */ @@ -27,7 +32,6 @@ #include "hamlib/rig.h" #include "serial.h" #include "misc.h" -#include "token.h" #include "icom.h" #include "icom_defs.h" diff --git a/rigs/icom/optoscan.h b/rigs/icom/optoscan.h index 5be3dbb9e..6cfb5f4d1 100644 --- a/rigs/icom/optoscan.h +++ b/rigs/icom/optoscan.h @@ -23,7 +23,8 @@ #define _OPTOSCAN_H 1 #include -#include + +#include "icom_defs.h" #define TOK_TAPECNTL TOKEN_BACKEND(1) #define TOK_5KHZWIN TOKEN_BACKEND(2) diff --git a/rigs/icom/os456.c b/rigs/icom/os456.c index 6c15bf96c..f0c0e9f14 100644 --- a/rigs/icom/os456.c +++ b/rigs/icom/os456.c @@ -30,7 +30,6 @@ #include "idx_builtin.h" #include "icom.h" #include "tones.h" -#include "token.h" #include "optoscan.h" extern struct confparams opto_ext_parms[]; diff --git a/rigs/icom/perseus.c b/rigs/icom/perseus.c index 64c0c1b18..095a786d4 100644 --- a/rigs/icom/perseus.c +++ b/rigs/icom/perseus.c @@ -22,12 +22,8 @@ #include #include -#include "serial.h" -#include "misc.h" -#include "idx_builtin.h" #include "icom.h" -#include "icom_defs.h" #include "frame.h" diff --git a/rigs/icom/xiegu.c b/rigs/icom/xiegu.c index 5d3570aa2..40b8f271d 100644 --- a/rigs/icom/xiegu.c +++ b/rigs/icom/xiegu.c @@ -32,15 +32,14 @@ #include #include -#include "token.h" #include "idx_builtin.h" #include "icom.h" #include "icom_defs.h" #include "frame.h" #include "misc.h" +#include "tones.h" #include "bandplan.h" -#include "serial.h" #define X108G_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_FM|RIG_MODE_WFM|RIG_MODE_FMN|RIG_MODE_PKTUSB|RIG_MODE_PKTLSB) #define X108G_1HZ_TS_MODES (RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_PKTUSB|RIG_MODE_PKTLSB)