ham-ref/hamlib
1
0
Fork 0
mirror of https://github.com/Hamlib/Hamlib synced 2026-08-13 17:32:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge GitHub PR #2082

Browse source
This commit is contained in:
Nate Bargmann 2026-06-22 07:47:15 -05:00
commit 102e31c1fa
No known key found for this signature in database
GPG key ID: FB2C5130D55A8819
32 changed files with 156 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cppcheck.sh
View file

@ -36,6 +36,7 @@ SUPPRESS="\
--suppress=*:extra/gnuradio/wfm.h \
--suppress=*:extra/gnuradio/gnuradio.cc \
--suppress=missingIncludeSystem \
--suppress=uninitMemberVarNoCtor:*.h \
"
#CHECK="\

18
rigs/icom/ic7000.c
View file

@ -134,7 +134,23 @@
.levels = RIG_LEVEL_SET(IC7000_LEVELS), \
}
static struct cmdparams ic7000_extcmds[] =
static const struct ts_sc_list ic7000_ts_sc_list[] =
{
{10, 0x00},
{100, 0x01},
{kHz(1), 0x02},
{kHz(5), 0x03},
{kHz(9), 0x04},
{kHz(10), 0x05},
{12500, 0x06},
{kHz(20), 0x07},
{kHz(25), 0x08},
{kHz(100), 0x09},
{MHz(1), 0x10},
{0, 0},
};
static const struct cmdparams ic7000_extcmds[] =
{
{ {.s = RIG_LEVEL_VOXDELAY}, CMD_PARAM_TYPE_LEVEL, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x01, 0x17}, CMD_DAT_INT, 1 },
{ {.s = RIG_PARM_TIME}, CMD_PARAM_TYPE_PARM, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x00, 0x41}, CMD_DAT_TIM, 2 },

2
rigs/icom/ic7100.c
View file

@ -108,7 +108,7 @@ int ic7100_tokens[] = { TOK_DSTAR_CODE, TOK_DSTAR_DSQL, TOK_DSTAR_CALL_SIGN, TOK
TOK_BACKEND_NONE
};
static struct cmdparams ic7100_extcmds[] =
static const struct cmdparams ic7100_extcmds[] =
{
{ {.s = RIG_PARM_BEEP}, CMD_PARAM_TYPE_PARM, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x00, 0x03}, CMD_DAT_BOL, 1 },
{ {.s = RIG_PARM_BACKLIGHT}, CMD_PARAM_TYPE_PARM, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x01, 0x04}, CMD_DAT_LVL, 2 },

60
rigs/icom/ic7300.c
View file

@ -129,6 +129,20 @@ int ic9700_set_vfo(RIG *rig, vfo_t vfo);
{ 241, 25.0f } \
} }
static const struct ts_sc_list ic7300_ts_sc_list[] =
{
{1, 0x00}, /* Manual says "Send/read the tuning step OFF" */
{100, 0x01},
{kHz(1), 0x02},
{kHz(5), 0x03},
{kHz(9), 0x04},
{kHz(10), 0x05},
{kHz(12.5), 0x06},
{kHz(20), 0x07},
{kHz(25), 0x08},
{0, 0},
};
/*
* IC905 items that differ from IC7300
@ -192,6 +206,25 @@ int ic9700_set_vfo(RIG *rig, vfo_t vfo);
{ 241, 4.0f } \
} }
static const struct ts_sc_list ic705_ts_sc_list[] =
{
{10, 0x00},
{100, 0x01},
{500, 0x02},
{kHz(1), 0x03},
{kHz(5), 0x04},
{kHz(6.25), 0x05},
{kHz(8.33), 0x06},
{kHz(9), 0x07},
{kHz(10), 0x08},
{kHz(12.5), 0x09},
{kHz(20), 0x10},
{kHz(25), 0x11},
{kHz(50), 0x12},
{kHz(100), 0x13},
{0, 0},
};
/*
* IC9700 items that differ from IC7300
*/
@ -270,7 +303,24 @@ int ic9700_set_vfo(RIG *rig, vfo_t vfo);
{ 241, 20.0f } \
} }
static struct cmdparams ic7300_extcmds[] =
static const struct ts_sc_list ic9700_ts_sc_list[] =
{
{10, 0x00},
{100, 0x01},
{500, 0x02},
{kHz(1), 0x03},
{kHz(5), 0x04},
{kHz(6.25), 0x05},
{kHz(10), 0x06},
{kHz(12.5), 0x07},
{kHz(20), 0x08},
{kHz(25), 0x09},
{kHz(50), 0x10},
{kHz(100), 0x11},
{0, 0},
};
static const struct cmdparams ic7300_extcmds[] =
{
{ {.s = RIG_PARM_ANN}, CMD_PARAM_TYPE_PARM, C_CTL_ANN, 0, SC_MOD_WR, 0, {0x00}, CMD_DAT_INT, 1 },
{ {.s = RIG_PARM_BEEP}, CMD_PARAM_TYPE_PARM, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x00, 0x23}, CMD_DAT_BOL, 1 },
@ -287,7 +337,7 @@ static struct cmdparams ic7300_extcmds[] =
{ {.s = RIG_PARM_NONE} }
};
static struct cmdparams ic7300mk2_extcmds[] =
static const struct cmdparams ic7300mk2_extcmds[] =
{
{ {.s = RIG_PARM_ANN}, CMD_PARAM_TYPE_PARM, C_CTL_ANN, 0, SC_MOD_WR, 0, {0x00}, CMD_DAT_INT, 1 },
{ {.s = RIG_PARM_BEEP}, CMD_PARAM_TYPE_PARM, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x00, 0x24}, CMD_DAT_BOL, 1 },
@ -304,7 +354,7 @@ static struct cmdparams ic7300mk2_extcmds[] =
{ {.s = RIG_PARM_NONE} }
};
static struct cmdparams ic9700_extcmds[] =
static const struct cmdparams ic9700_extcmds[] =
{
{ {.s = RIG_PARM_ANN}, CMD_PARAM_TYPE_PARM, C_CTL_ANN, 0, SC_MOD_WR, 0, {0x00}, CMD_DAT_INT, 1 },
{ {.s = RIG_PARM_BEEP}, CMD_PARAM_TYPE_PARM, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x00, 0x29}, CMD_DAT_BOL, 1 },
@ -322,7 +372,7 @@ static struct cmdparams ic9700_extcmds[] =
{ {.s = RIG_PARM_NONE} }
};
static struct cmdparams ic705_extcmds[] =
static const struct cmdparams ic705_extcmds[] =
{
{ {.s = RIG_PARM_ANN}, CMD_PARAM_TYPE_PARM, C_CTL_ANN, 0, SC_MOD_WR, 0, {0x00}, CMD_DAT_INT, 1 },
{ {.s = RIG_PARM_BEEP}, CMD_PARAM_TYPE_PARM, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x00, 0x31}, CMD_DAT_BOL, 1 },
@ -339,7 +389,7 @@ static struct cmdparams ic705_extcmds[] =
{ {.s = RIG_PARM_NONE} }
};
static struct cmdparams ic905_extcmds[] =
static const struct cmdparams ic905_extcmds[] =
{
{ {.s = RIG_PARM_ANN}, CMD_PARAM_TYPE_PARM, C_CTL_ANN, 0, SC_MOD_WR, 0, {0x00}, CMD_DAT_INT, 1 },
{ {.s = RIG_PARM_BEEP}, CMD_PARAM_TYPE_PARM, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x00, 0x33}, CMD_DAT_BOL, 1 },

2
rigs/icom/ic7410.c
View file

@ -89,7 +89,7 @@
} }
static struct cmdparams ic7410_extcmds[] =
static const struct cmdparams ic7410_extcmds[] =
{
{ {.s = RIG_LEVEL_VOXDELAY}, CMD_PARAM_TYPE_LEVEL, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x00, 0x89}, CMD_DAT_INT, 1 },
{ {.s = RIG_PARM_KEYERTYPE}, CMD_PARAM_TYPE_PARM, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x00, 0x75}, CMD_DAT_INT, 1 },

12
rigs/icom/ic756.c
View file

@ -57,7 +57,7 @@
#define IC756_ANTS (RIG_ANT_1|RIG_ANT_2)
struct cmdparams ic756pro_cmdparms[] =
static const struct cmdparams ic756pro_cmdparms[] =
{
{ {.s = RIG_PARM_BEEP}, CMD_PARAM_TYPE_PARM, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x00, 0x20}, CMD_DAT_BOL, 1 },
{ {.s = RIG_PARM_BACKLIGHT}, CMD_PARAM_TYPE_PARM, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x00, 0x09}, CMD_DAT_LVL, 2 },
@ -86,6 +86,16 @@ struct cmdparams ic756pro_cmdparms[] =
{ 247 ,60 } \
} }
static const struct ts_sc_list ic756_ts_sc_list[] =
{
{10, 0x00},
{kHz(1), 0x01},
{kHz(5), 0x02},
{kHz(9), 0x03},
{kHz(10), 0x04},
{0, 0},
};
/*
* This function deals with the older type radios with only 2 filter widths
* (0 - normal, 1 - narrow)

2
rigs/icom/ic7600.c
View file

@ -127,7 +127,7 @@
{ 241, 25.0f } \
} }
static struct cmdparams ic7600_extcmds[] =
static const struct cmdparams ic7600_extcmds[] =
{
{ {.s = RIG_PARM_BEEP}, CMD_PARAM_TYPE_PARM, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x00, 0x59}, CMD_DAT_BOL, 1 },
{ {.s = RIG_PARM_BACKLIGHT}, CMD_PARAM_TYPE_PARM, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x00, 0x38}, CMD_DAT_LVL, 2 },

2
rigs/icom/ic7610.c
View file

@ -128,7 +128,7 @@
{ 241, 30.0f } \
} }
static struct cmdparams ic7610_extcmds[] =
static const struct cmdparams ic7610_extcmds[] =
{
{ {.s = RIG_PARM_BEEP}, CMD_PARAM_TYPE_PARM, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x00, 0x24}, CMD_DAT_BOL, 1 },
{ {.s = RIG_PARM_BACKLIGHT}, CMD_PARAM_TYPE_PARM, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x01, 0x41}, CMD_DAT_LVL, 2 },

2
rigs/icom/ic7700.c
View file

@ -103,7 +103,7 @@
{ 241, 15.0f } \
} }
static struct cmdparams ic7700_extcmds[] =
static const struct cmdparams ic7700_extcmds[] =
{
{ {.s = RIG_LEVEL_VOXDELAY}, CMD_PARAM_TYPE_LEVEL, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x01, 0x82}, CMD_DAT_INT, 1 },
{ { 0 } }

2
rigs/icom/ic7760.c
View file

@ -102,7 +102,7 @@
{ 241, 15.0f } \
} }
static struct cmdparams ic7760_extcmds[] =
static const struct cmdparams ic7760_extcmds[] =
{
{ {.s = RIG_LEVEL_VOXDELAY}, CMD_PARAM_TYPE_LEVEL, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x01, 0x82}, CMD_DAT_INT, 1 },
{ { 0 } }

2
rigs/icom/ic7800.c
View file

@ -116,7 +116,7 @@
int ic7800_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val);
int ic7800_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
static struct cmdparams ic7800_extcmds[] =
static const struct cmdparams ic7800_extcmds[] =
{
{ {.s = RIG_LEVEL_VOXDELAY}, CMD_PARAM_TYPE_LEVEL, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x01, 0x83}, CMD_DAT_INT, 1 },
{ { 0 } }

2
rigs/icom/ic785x.c
View file

@ -118,7 +118,7 @@ extern int ic7800_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
static int ic785x_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val);
static int ic785x_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
static struct cmdparams ic785x_extcmds[] =
static const struct cmdparams ic785x_extcmds[] =
{
{ {.s = RIG_PARM_BEEP}, CMD_PARAM_TYPE_PARM, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x01, 0x04}, CMD_DAT_BOL, 1 },
{ {.s = RIG_PARM_BACKLIGHT}, CMD_PARAM_TYPE_PARM, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x00, 0x76}, CMD_DAT_LVL, 2 },

2
rigs/icom/ic9100.c
View file

@ -86,7 +86,7 @@
#define IC9100_HF_ANTS (RIG_ANT_1|RIG_ANT_2)
static struct cmdparams ic9100_extcmds[] =
static const struct cmdparams ic9100_extcmds[] =
{
{ {.s = RIG_LEVEL_VOXDELAY}, CMD_PARAM_TYPE_LEVEL, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x01, 0x27}, CMD_DAT_INT, 1 },
{ {.s = RIG_PARM_KEYERTYPE}, CMD_PARAM_TYPE_PARM, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x01, 0x02}, CMD_DAT_INT, 1 },

96
rigs/icom/icom.c
View file

@ -282,16 +282,6 @@ const struct ts_sc_list ic718_ts_sc_list[] =
{0, 0},
};
const struct ts_sc_list ic756_ts_sc_list[] =
{
{10, 0x00},
{kHz(1), 0x01},
{kHz(5), 0x02},
{kHz(9), 0x03},
{kHz(10), 0x04},
{0, 0},
};
const struct ts_sc_list ic756pro_ts_sc_list[] =
{
{10, 0x00}, /* 1 if step turned off */
@ -321,22 +311,6 @@ const struct ts_sc_list ic706_ts_sc_list[] =
{0, 0},
};
const struct ts_sc_list ic7000_ts_sc_list[] =
{
{10, 0x00},
{100, 0x01},
{kHz(1), 0x02},
{kHz(5), 0x03},
{kHz(9), 0x04},
{kHz(10), 0x05},
{12500, 0x06},
{kHz(20), 0x07},
{kHz(25), 0x08},
{kHz(100), 0x09},
{MHz(1), 0x10},
{0, 0},
};
const struct ts_sc_list ic7100_ts_sc_list[] =
{
{10, 0x00},
@ -366,20 +340,6 @@ const struct ts_sc_list ic7200_ts_sc_list[] =
{0, 0},
};
const struct ts_sc_list ic7300_ts_sc_list[] =
{
{1, 0x00}, /* Manual says "Send/read the tuning step OFF" */
{100, 0x01},
{kHz(1), 0x02},
{kHz(5), 0x03},
{kHz(9), 0x04},
{kHz(10), 0x05},
{kHz(12.5), 0x06},
{kHz(20), 0x07},
{kHz(25), 0x08},
{0, 0},
};
const struct ts_sc_list ic910_ts_sc_list[] =
{
{Hz(1), 0x00},
@ -397,62 +357,6 @@ const struct ts_sc_list ic910_ts_sc_list[] =
{0, 0},
};
const struct ts_sc_list r8600_ts_sc_list[] =
{
{10, 0x00},
{100, 0x01},
{kHz(1), 0x02},
{kHz(2.5), 0x03},
{3125, 0x04},
{kHz(5), 0x05},
{6250, 0x06},
{8330, 0x07},
{kHz(9), 0x08},
{kHz(10), 0x09},
{kHz(12.5), 0x10},
{kHz(20), 0x11},
{kHz(25), 0x12},
{kHz(100), 0x13},
{0, 0x14}, /* programmable tuning step not supported */
{0, 0},
};
const struct ts_sc_list ic705_ts_sc_list[] =
{
{10, 0x00},
{100, 0x01},
{500, 0x02},
{kHz(1), 0x03},
{kHz(5), 0x04},
{kHz(6.25), 0x05},
{kHz(8.33), 0x06},
{kHz(9), 0x07},
{kHz(10), 0x08},
{kHz(12.5), 0x09},
{kHz(20), 0x10},
{kHz(25), 0x11},
{kHz(50), 0x12},
{kHz(100), 0x13},
{0, 0},
};
const struct ts_sc_list ic9700_ts_sc_list[] =
{
{10, 0x00},
{100, 0x01},
{500, 0x02},
{kHz(1), 0x03},
{kHz(5), 0x04},
{kHz(6.25), 0x05},
{kHz(10), 0x06},
{kHz(12.5), 0x07},
{kHz(20), 0x08},
{kHz(25), 0x09},
{kHz(50), 0x10},
{kHz(100), 0x11},
{0, 0},
};
/* rtty filter list for some DSP rigs ie PRO */
#define RTTY_FIL_NB 5
const pbwidth_t rtty_fil[] =

8
rigs/icom/icom.h
View file

@ -253,7 +253,7 @@ struct icom_priv_caps
struct icom_agc_level agc_levels[HAMLIB_MAX_AGC_LEVELS + 1]; /*!< Icom rig-specific AGC levels, the last entry should have level -1 */
struct icom_spectrum_scope_caps spectrum_scope_caps; /*!< Icom spectrum scope capabilities, if supported by the rig. Main/Sub scopes in Icom rigs have the same caps. */
struct icom_spectrum_edge_frequency_range spectrum_edge_frequency_ranges[ICOM_MAX_SPECTRUM_FREQ_RANGES]; /*!< Icom spectrum scope edge frequencies, if supported by the rig. Last entry should have zeros in all fields. */
struct cmdparams *extcmds; /*!< Pointer to extended operations array */
const struct cmdparams *extcmds; /*!< Pointer to extended operations array */
int dualwatch_split; /*!< Rig supports dual watch for split ops -- e.g. ID-5100 */
int x25x26_always; /*!< Rig should use 0x25 and 0x26 commands always */
int x25x26_possibly; /*!< Rig might support 0x25 and 0x26 commands if the firmware is upgraded */
@ -313,21 +313,15 @@ struct icom_priv_data
};
extern const struct ts_sc_list r8500_ts_sc_list[];
extern const struct ts_sc_list r8600_ts_sc_list[];
extern const struct ts_sc_list ic737_ts_sc_list[];
extern const struct ts_sc_list r75_ts_sc_list[];
extern const struct ts_sc_list r7100_ts_sc_list[];
extern const struct ts_sc_list r9000_ts_sc_list[];
extern const struct ts_sc_list r9500_ts_sc_list[];
extern const struct ts_sc_list ic756_ts_sc_list[];
extern const struct ts_sc_list ic756pro_ts_sc_list[];
extern const struct ts_sc_list ic705_ts_sc_list[];
extern const struct ts_sc_list ic706_ts_sc_list[];
extern const struct ts_sc_list ic7000_ts_sc_list[];
extern const struct ts_sc_list ic7100_ts_sc_list[];
extern const struct ts_sc_list ic7200_ts_sc_list[];
extern const struct ts_sc_list ic7300_ts_sc_list[];
extern const struct ts_sc_list ic9700_ts_sc_list[];
extern const struct ts_sc_list ic910_ts_sc_list[];
extern const struct ts_sc_list ic718_ts_sc_list[];
extern const struct ts_sc_list x108g_ts_sc_list[];

2
rigs/icom/icr30.c
View file

@ -62,7 +62,7 @@ static struct confparams icr30_ext[] =
{ 0 }
};
static struct cmdparams icr30_extcmds[] =
static const struct cmdparams icr30_extcmds[] =
{
{ {.t = TOK_ANL}, CMD_PARAM_TYPE_TOKEN, C_CTL_MEM, S_MEM_ANL, SC_MOD_RW, 0, {}, CMD_DAT_BOL, 1 },
{ {.t = TOK_EAR}, CMD_PARAM_TYPE_TOKEN, C_CTL_MEM, S_MEM_EAR, SC_MOD_RW, 0, {}, CMD_DAT_BOL, 1 },

22
rigs/icom/icr8600.c
View file

@ -63,7 +63,27 @@
{ 255, 60 }, \
} }
struct cmdparams icr8600_extcmds[] =
static const struct ts_sc_list r8600_ts_sc_list[] =
{
{10, 0x00},
{100, 0x01},
{kHz(1), 0x02},
{kHz(2.5), 0x03},
{3125, 0x04},
{kHz(5), 0x05},
{6250, 0x06},
{8330, 0x07},
{kHz(9), 0x08},
{kHz(10), 0x09},
{kHz(12.5), 0x10},
{kHz(20), 0x11},
{kHz(25), 0x12},
{kHz(100), 0x13},
{0, 0x14}, /* programmable tuning step not supported */
{0, 0},
};
static const struct cmdparams icr8600_extcmds[] =
{
{ {.s = RIG_PARM_BEEP}, CMD_PARAM_TYPE_PARM, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x00, 0x38}, CMD_DAT_BOL, 1 },
{ {.s = RIG_PARM_BACKLIGHT}, CMD_PARAM_TYPE_PARM, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x01, 0x15}, CMD_DAT_LVL, 2 },

10
rigs/kenwood/ts2000.c
View file

@ -91,7 +91,7 @@
/*
* 38 CTCSS sub-audible tones + 1750 tone
*/
tone_t ts2000_ctcss_list[] =
static tone_t ts2000_ctcss_list[] =
{
670, 719, 744, 770, 797, 825, 854, 885, 915, 948,
974, 1000, 1035, 1072, 1109, 1148, 1188, 1230, 1273, 1318,
@ -103,7 +103,7 @@ tone_t ts2000_ctcss_list[] =
/*
* 103 available DCS codes
*/
tone_t ts2000_dcs_list[] =
static tone_t ts2000_dcs_list[] =
{
23, 25, 26, 31, 32, 36, 43, 47, 51, 53,
54, 65, 71, 72, 73, 74, 114, 115, 116, 122, 125, 131,
@ -117,7 +117,7 @@ tone_t ts2000_dcs_list[] =
0,
};
int ts2000_ext_tokens[] =
static int ts2000_ext_tokens[] =
{
TOK_FUNC_NOISE_REDUCTION_2, TOK_FUNC_FILTER_WIDTH_DATA,
TOK_LEVEL_DSP_RX_EQUALIZER, TOK_LEVEL_DSP_TX_EQUALIZER, TOK_LEVEL_DSP_TX_BANDWIDTH,
@ -125,7 +125,7 @@ int ts2000_ext_tokens[] =
TOK_BACKEND_NONE,
};
const struct confparams ts2000_ext_funcs[] =
static const struct confparams ts2000_ext_funcs[] =
{
{
TOK_FUNC_NOISE_REDUCTION_2, "NR2", "Noise reduction 2", "Noise reduction 2",
@ -134,7 +134,7 @@ const struct confparams ts2000_ext_funcs[] =
{ RIG_CONF_END, NULL, }
};
const struct confparams ts2000_ext_levels[] =
static const struct confparams ts2000_ext_levels[] =
{
{
TOK_LEVEL_DSP_RX_EQUALIZER, "DSP_RX_EQUALIZER", "DSP RX equalizer", "DSP RX equalizer type",

6
rigs/kenwood/ts480.c
View file

@ -97,7 +97,7 @@
#define TOK_LEVEL_DIGITAL_NOISE_LIMITER TOKEN_BACKEND(111)
#define TOK_FUNC_CW_IF_FOR_SSB_RX TOKEN_BACKEND(112)
int ts480_ext_tokens[] =
static int ts480_ext_tokens[] =
{
TOK_FUNC_NOISE_REDUCTION_2, TOK_FUNC_FILTER_WIDTH_DATA, TOK_FUNC_TX_AUDIO_FROM_DATA_INPUT,
TOK_LEVEL_DSP_RX_EQUALIZER, TOK_LEVEL_DSP_TX_EQUALIZER, TOK_LEVEL_DSP_TX_BANDWIDTH,
@ -107,7 +107,7 @@ int ts480_ext_tokens[] =
TOK_BACKEND_NONE,
};
const struct confparams ts480_ext_funcs[] =
static const struct confparams ts480_ext_funcs[] =
{
{
TOK_FUNC_NOISE_REDUCTION_2, "NR2", "Noise reduction 2", "Noise reduction 2",
@ -128,7 +128,7 @@ const struct confparams ts480_ext_funcs[] =
{ RIG_CONF_END, NULL, }
};
const struct confparams ts480_ext_levels[] =
static const struct confparams ts480_ext_levels[] =
{
{
TOK_LEVEL_DIGITAL_NOISE_LIMITER, "DIGITAL_NOISE_LIMITER", "Digital Noise Limiter", "Digital Noise Limiter",

6
rigs/kenwood/ts590.c
View file

@ -105,7 +105,7 @@
#define TOK_LEVEL_DSP_TX_SSB_DATA_LOW_CUT_FILTER TOKEN_BACKEND(117)
#define TOK_LEVEL_DSP_TX_SSB_DATA_HIGH_CUT_FILTER TOKEN_BACKEND(118)
int ts590_ext_tokens[] =
static int ts590_ext_tokens[] =
{
TOK_FUNC_NOISE_REDUCTION_2,
TOK_LEVEL_DSP_RX_EQUALIZER, TOK_LEVEL_DSP_TX_EQUALIZER,
@ -118,7 +118,7 @@ int ts590_ext_tokens[] =
TOK_BACKEND_NONE,
};
const struct confparams ts590_ext_funcs[] =
static const struct confparams ts590_ext_funcs[] =
{
{
TOK_FUNC_NOISE_REDUCTION_2, "NR2", "Noise reduction 2", "Noise reduction 2",
@ -127,7 +127,7 @@ const struct confparams ts590_ext_funcs[] =
{ RIG_CONF_END, NULL, }
};
const struct confparams ts590_ext_levels[] =
static const struct confparams ts590_ext_levels[] =
{
{
TOK_LEVEL_DSP_RX_EQUALIZER, "DSP_RX_EQUALIZER", "DSP RX equalizer", "DSP RX equalizer type",

2
rigs/mds/serialnum.c
View file

@ -18,7 +18,7 @@
14 - PTT +5V
*/
void serial_num(const char *s)
static void serial_num(const char *s)
{
char model[16];
char *operation;

8
rigs/tentec/tt550.c
View file

@ -62,7 +62,7 @@ static int tt550_tx_filters[] =
* We assume that rig!=NULL, STATE(rig)!= NULL, data!=NULL, data_len!=NULL
* Otherwise, you'll get a nice seg fault. You've been warned!
*/
int
static int
tt550_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
int *data_len)
{
@ -122,7 +122,7 @@ tt550_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
* amplifier loop, enable/disable keep alive, etc.
* This function provides for these commands.
*/
int
static int
tt550_tx_control(RIG *rig, char oper)
{
int retval;
@ -161,7 +161,7 @@ tt550_tx_control(RIG *rig, char oper)
* $6<cr> = Inductor Dn
* This function provides for these commands.
*/
int
static int
tt550_ldg_control(RIG *rig, char oper)
{
int retval, lvl_len;
@ -1571,7 +1571,7 @@ tt550_get_tuning_step(RIG *rig, vfo_t vfo, shortfreq_t *stepsize)
/*
* Tune the radio using the LDG antenna tuner
*/
int
static int
tt550_tune(RIG *rig)
{
value_t current_power;

3
rigs/yaesu/ft710.c
View file

@ -187,7 +187,7 @@ struct rig_caps ft710_caps =
.comp_meter_cal = FT710_COMP_CAL,
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },
{ 1, 5, RIG_MTYPE_VOICE },
{ 1, 5, RIG_MTYPE_VOICE },
{ 1, 5, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},
@ -318,6 +318,7 @@ struct rig_caps ft710_caps =
.get_clock = newcat_get_clock,
.scan = newcat_scan,
.send_voice_mem = newcat_send_voice_mem,
.stop_voice_mem = newcat_stop_voice_mem,
.morse_qsize = 50,
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
};

3
rigs/yaesu/ft891.c
View file

@ -201,7 +201,7 @@ struct rig_caps ft891_caps =
.str_cal = FT891_STR_CAL,
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },
{ 1, 5, RIG_MTYPE_VOICE },
{ 1, 5, RIG_MTYPE_VOICE },
{ 1, 5, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},
@ -347,6 +347,7 @@ struct rig_caps ft891_caps =
.get_clock = newcat_get_clock,
.scan = newcat_scan,
.send_voice_mem = newcat_send_voice_mem,
.stop_voice_mem = newcat_stop_voice_mem,
.morse_qsize = 50,
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
};

1
rigs/yaesu/ft991.c
View file

@ -429,6 +429,7 @@ struct rig_caps ft991_caps =
.wait_morse = rig_wait_morse,
.scan = newcat_scan,
.send_voice_mem = newcat_send_voice_mem,
.stop_voice_mem = newcat_stop_voice_mem,
.set_clock = newcat_set_clock,
.get_clock = newcat_get_clock,
.morse_qsize = 50,

5
rigs/yaesu/ftdx10.c
View file

@ -200,8 +200,8 @@ struct rig_caps ftdx10_caps =
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },
{ 501, 510, RIG_MTYPE_BAND, NEWCAT_MEM_CAP }, /* 60M Channels, 5-01 - 5-10, if available */
{ 1, 5, RIG_MTYPE_VOICE },
{ 1, 5, RIG_MTYPE_MORSE },
{ 1, 5, RIG_MTYPE_VOICE },
{ 1, 5, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},
@ -331,6 +331,7 @@ struct rig_caps ftdx10_caps =
.get_clock = newcat_get_clock,
.scan = newcat_scan,
.send_voice_mem = newcat_send_voice_mem,
.stop_voice_mem = newcat_stop_voice_mem,
.morse_qsize = 50,
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
};

3
rigs/yaesu/ftdx101.c
View file

@ -261,7 +261,7 @@ struct rig_caps ftdx101d_caps =
{ 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },
{ 100, 117, RIG_MTYPE_MEM, NEWCAT_MEM_CAP }, // P1L-P9U PMS channels
{ 501, 510, RIG_MTYPE_MEM, NEWCAT_MEM_CAP }, // 5xx 5 MHz band
{ 1, 5, RIG_MTYPE_VOICE },
{ 1, 5, RIG_MTYPE_VOICE },
{ 1, 5, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},
@ -392,6 +392,7 @@ struct rig_caps ftdx101d_caps =
.get_clock = newcat_get_clock,
.scan = newcat_scan,
.send_voice_mem = newcat_send_voice_mem,
.stop_voice_mem = newcat_stop_voice_mem,
.morse_qsize = 50,
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
};

3
rigs/yaesu/ftdx101mp.c
View file

@ -147,7 +147,7 @@ struct rig_caps ftdx101mp_caps =
{ 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },
{ 100, 117, RIG_MTYPE_MEM, NEWCAT_MEM_CAP }, // P1L-P9U PMS channels
{ 501, 510, RIG_MTYPE_MEM, NEWCAT_MEM_CAP }, // 5xx 5 MHz band
{ 1, 5, RIG_MTYPE_VOICE },
{ 1, 5, RIG_MTYPE_VOICE },
{ 1, 5, RIG_MTYPE_MORSE },
RIG_CHAN_END,
},
@ -278,6 +278,7 @@ struct rig_caps ftdx101mp_caps =
.get_clock = newcat_get_clock,
.scan = newcat_scan,
.send_voice_mem = newcat_send_voice_mem,
.stop_voice_mem = newcat_stop_voice_mem,
.morse_qsize = 50,
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
};

2
rigs/yaesu/ftx1/ftx1.c
View file

@ -1101,6 +1101,7 @@ struct rig_caps ftx1_caps = {
{1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP},
{100, 117, RIG_MTYPE_EDGE, NEWCAT_MEM_CAP}, /* PMS */
{500, 503, RIG_MTYPE_MEM, NEWCAT_MEM_CAP}, /* 60m */
{ 1, 5, RIG_MTYPE_VOICE},
RIG_CHAN_END,
},
/* FTX-1 uses MAIN/SUB VFOs, not A/B. This ensures vfo_fixup() preserves
@ -1232,6 +1233,7 @@ struct rig_caps ftx1_caps = {
.stop_morse = ftx1_stop_morse_func,
.wait_morse = ftx1_wait_morse_func,
.send_voice_mem = newcat_send_voice_mem,
.stop_voice_mem = newcat_stop_voice_mem,
.set_clock = newcat_set_clock,
.get_clock = newcat_get_clock,
.set_trn = ftx1_set_trn_func,

5
rigs/yaesu/newcat.c
View file

@ -11094,6 +11094,11 @@ int newcat_send_voice_mem(RIG *rig, vfo_t vfo, int ch)
RETURNFUNC2(newcat_set_cmd(rig));
}
int newcat_stop_voice_mem(RIG *rig, vfo_t vfo)
{
return newcat_send_voice_mem(rig, vfo, 0);
}
static int newcat_set_clarifier(RIG *rig, vfo_t vfo, int rx, int tx)
{
struct newcat_priv_data *priv = (struct newcat_priv_data *)STATE(rig)->priv;

1
rigs/yaesu/newcat.h
View file

@ -267,6 +267,7 @@ int newcat_get_ext_level(RIG *rig, vfo_t vfo, hamlib_token_t token, value_t *val
int newcat_send_morse(RIG *rig, vfo_t vfo, const char *msg);
int newcat_send_voice_mem(RIG *rig, vfo_t vfo, int ch);
int newcat_stop_voice_mem(RIG *rig, vfo_t vfo);
int newcat_set_clock(RIG *rig, int year, int month, int day, int hour, int min,
int sec, double msec, int utc_offset);
int newcat_get_clock(RIG *rig, int *year, int *month, int *day, int *hour,

8
rotators/skywatcher/skywatcher.c
View file

@ -107,7 +107,7 @@ static int skywatcher_cmd(ROT *rot, const char *cmd, char *response,
return RIG_OK;
}
uint32_t skywatcher_convert24bit(long input)
static uint32_t skywatcher_convert24bit(long input)
{
return ((input & 0x0000FF) << 16) | (input & 0x00FF00) | ((
input & 0xFF0000) >> 16);
@ -131,7 +131,7 @@ static const char *skywatcher_get_info(ROT *rot)
return info;
}
int skywatcher_get_spr(ROT *rot, int motor_index, uint32_t *result)
static int skywatcher_get_spr(ROT *rot, int motor_index, uint32_t *result)
{
skywatcher_priv_data *priv = ROTSTATE(rot)->priv;
@ -150,7 +150,7 @@ int skywatcher_get_spr(ROT *rot, int motor_index, uint32_t *result)
return RIG_OK;
}
int skywatcher_get_motor_position(ROT *rot, int motor_index, float *result)
static int skywatcher_get_motor_position(ROT *rot, int motor_index, float *result)
{
char str[16];
char req[16];
@ -192,7 +192,7 @@ static int skywatcher_stop(ROT *rot)
return RIG_OK;
}
int skywatcher_set_motor_position(ROT *rot, int motor_index, float angle)
static int skywatcher_set_motor_position(ROT *rot, int motor_index, float angle)
{
char str[16];
char req[16];