[icom] Fix includes

rigs/icom/delta2.c

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

rigs/icom/frame.c

@@ -23,6 +23,10 @@
 
 #include <string.h>  /* String function definitions */
 
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
 #include "hamlib/rig.h"
 #include "serial.h"
 #include "misc.h"

rigs/icom/frame.h

@@ -22,6 +22,10 @@
 #ifndef _FRAME_H
 #define _FRAME_H 1
 
+#include <stddef.h>
+
+#include "rig.h"
+
 // Has to be big enough for 0xfe sequence to wake up rig
 #define MAXFRAMELEN 200
 

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)

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)

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)
 

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"
 
 
 /*

rigs/icom/ic7100.c

@@ -28,6 +28,7 @@
 #include "idx_builtin.h"
 #include "bandplan.h"
 #include "token.h"
+#include "tones.h"
 #include "misc.h"
 
 

rigs/icom/ic7200.c

@@ -27,13 +27,11 @@
 #include <stdlib.h>
 
 #include <hamlib/rig.h>
-#include "token.h"
 #include "idx_builtin.h"
 
 #include "icom.h"
 #include "icom_defs.h"
 #include "frame.h"
-#include "misc.h"
 #include "bandplan.h"
 
 

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);

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,

rigs/icom/ic7410.c

@@ -22,13 +22,12 @@
 #include <stdlib.h>
 
 #include <hamlib/rig.h>
-#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)

rigs/icom/ic746.c

@@ -23,7 +23,6 @@
 #include <string.h>  /* String function definitions */
 
 #include <hamlib/rig.h>
-#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

rigs/icom/ic751.c

@@ -22,7 +22,6 @@
 #include <stdlib.h>
 
 #include "hamlib/rig.h"
-#include "bandplan.h"
 #include "icom.h"
 #include "idx_builtin.h"
 

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

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

rigs/icom/ic761.c

@@ -22,7 +22,6 @@
 #include <stdlib.h>
 
 #include "hamlib/rig.h"
-#include "bandplan.h"
 #include "icom.h"
 
 

rigs/icom/ic7610.c

@@ -24,6 +24,7 @@
 
 #include <hamlib/rig.h>
 #include "token.h"
+#include "tones.h"
 #include "idx_builtin.h"
 
 #include "icom.h"

rigs/icom/ic7700.c

@@ -23,6 +23,7 @@
 
 #include <hamlib/rig.h>
 #include "token.h"
+#include "tones.h"
 #include "idx_builtin.h"
 
 #include "icom.h"

rigs/icom/ic7800.c

@@ -22,7 +22,11 @@
 #include <stdlib.h>
 
 #include <hamlib/rig.h>
+
+#include "frame.h"
+#include "misc.h"
 #include "token.h"
+#include "tones.h"
 #include "idx_builtin.h"
 
 #include "icom.h"

rigs/icom/ic785x.c

@@ -24,6 +24,7 @@
 
 #include <hamlib/rig.h>
 #include "token.h"
+#include "tones.h"
 #include "idx_builtin.h"
 
 #include "icom.h"

rigs/icom/ic910.c

@@ -24,11 +24,11 @@
 #include <stdlib.h>
 
 #include <hamlib/rig.h>
-#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

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)

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)

rigs/icom/icom.c

@@ -19,8 +19,6 @@
  *
  */
 
-// cppcheck-suppress *
-#include <stdio.h>
 // cppcheck-suppress *
 #include <stdlib.h>
 // cppcheck-suppress *
@@ -32,7 +30,6 @@
 
 #include <hamlib/rig.h>
 #include <serial.h>
-#include <misc.h>
 #include <cal.h>
 #include <token.h>
 #include <register.h>

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|\

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)
 

rigs/icom/icr7000.c

@@ -22,12 +22,9 @@
 #include <stdlib.h>
 
 #include <hamlib/rig.h>
-#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)

rigs/icom/icr8600.c

@@ -21,10 +21,12 @@
  *
  */
 
+#include <stddef.h>
 
 #include "hamlib/rig.h"
 #include "idx_builtin.h"
 #include "token.h"
+#include "tones.h"
 
 #include "icom.h"
 #include "icom_defs.h"

rigs/icom/icr9000.c

@@ -22,12 +22,9 @@
 #include <stdlib.h>
 
 #include <hamlib/rig.h>
-#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)

rigs/icom/icr9500.c

@@ -20,13 +20,10 @@
  */
 
 #include <hamlib/rig.h>
-#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|\

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*/ )
 

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

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

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

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

rigs/icom/optoscan.c

@@ -18,8 +18,13 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+
 #include <hamlib/config.h>
 
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>  /* 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"

rigs/icom/optoscan.h

@@ -23,7 +23,8 @@
 #define _OPTOSCAN_H 1
 
 #include <hamlib/rig.h>
-#include <tones.h>
+
+#include "icom_defs.h"
 
 #define TOK_TAPECNTL  TOKEN_BACKEND(1)
 #define TOK_5KHZWIN   TOKEN_BACKEND(2)

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[];

rigs/icom/perseus.c

@@ -22,12 +22,8 @@
 #include <stdlib.h>
 
 #include <hamlib/rig.h>
-#include "serial.h"
-#include "misc.h"
-#include "idx_builtin.h"
 
 #include "icom.h"
-#include "icom_defs.h"
 #include "frame.h"
 
 

rigs/icom/xiegu.c

@@ -32,15 +32,14 @@
 #include <stdlib.h>
 
 #include <hamlib/rig.h>
-#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)