Add RIG_MODEL macro and change all rigs to support it

pull/224/head
Michael Black 2020-03-05 08:44:18 -06:00
rodzic 39ac8e7be2
commit d856248178
229 zmienionych plików z 280 dodań i 273 usunięć

Wyświetl plik

@ -1875,7 +1875,7 @@ static int dummy_mW2power(RIG *rig, float *power, unsigned int mwpower,
const struct rig_caps dummy_caps =
{
.rig_model = RIG_MODEL_DUMMY,
RIG_MODEL(RIG_MODEL_DUMMY),
.model_name = "Dummy",
.mfg_name = "Hamlib",
.version = "0.7",

Wyświetl plik

@ -106,7 +106,7 @@ struct flrig_priv_data
const struct rig_caps flrig_caps =
{
.rig_model = RIG_MODEL_FLRIG,
RIG_MODEL(RIG_MODEL_FLRIG),
.model_name = "FLRig",
.mfg_name = "FLRig",
.version = BACKEND_VER,

Wyświetl plik

@ -2107,7 +2107,7 @@ static int netrigctl_send_morse(RIG *rig, vfo_t vfo, const char *msg)
const struct rig_caps netrigctl_caps =
{
.rig_model = RIG_MODEL_NETRIGCTL,
RIG_MODEL(RIG_MODEL_NETRIGCTL),
.model_name = "NET rigctl",
.mfg_name = "Hamlib",
.version = "1.3",

Wyświetl plik

@ -116,7 +116,7 @@ struct trxmanager_priv_data
struct rig_caps trxmanager_caps =
{
.rig_model = RIG_MODEL_TRXMANAGER_RIG,
RIG_MODEL(RIG_MODEL_TRXMANAGER_RIG),
.model_name = "5.7.630+",
.mfg_name = "TRXManager",
.version = BACKEND_VER,

Wyświetl plik

@ -148,6 +148,7 @@ enum amp_level_e
* n.b.: Don't move fields around, as the backends depend on it when
* initializing their caps.
*/
#define AMP_MODEL(arg) .amp_model=arg,.amp_model_macro_name=#arg
struct amp_caps
{
amp_model_t amp_model; /*!< Amplifier model. */
@ -174,6 +175,7 @@ struct amp_caps
const struct confparams *cfgparams; /*!< Configuration parametres. */
const rig_ptr_t priv; /*!< Private data. */
const char *amp_model_macro_name; /*!< Model macro name */
setting_t has_get_level;
setting_t has_set_level;

Wyświetl plik

@ -1382,11 +1382,13 @@ typedef int (* confval_cb_t)(RIG *,
* sharing the struct rig_caps of the backend, while keeping their own
* customized data.
*
* NB: Don't move fields around, as the backends depend on it when
* initializing their caps.
* mdblack: Don't move fields around without bumping the version numbers
* DLL or shared library replacement would break the interface
*/
#define RIG_MODEL(arg) .rig_model=arg,.rig_model_macro_name=#arg
struct rig_caps {
rig_model_t rig_model; /*!< Rig model. */
const char *rig_model_macro_name; /*!< Rig model macro name */
const char *model_name; /*!< Model name. */
const char *mfg_name; /*!< Manufacturer. */
const char *version; /*!< Driver version. */
@ -2378,7 +2380,7 @@ extern HAMLIB_EXPORT(const struct rig_caps *)
rig_get_caps HAMLIB_PARAMS((rig_model_t rig_model));
extern HAMLIB_EXPORT(const freq_range_t *)
rig_get_range HAMLIB_PARAMS((const freq_range_t range_list[],
rig_get_range HAMLIB_PARAMS((const freq_range_t *range_list,
freq_t freq,
rmode_t mode));

Wyświetl plik

@ -216,6 +216,7 @@ typedef enum {
* n.b.: Don't move fields around, as the backends depend on it when
* initializing their caps.
*/
#define ROT_MODEL(arg) .rot_model=arg,.rot_model_macro_name=#arg
struct rot_caps {
rot_model_t rot_model; /*!< Rotator model. */
const char *model_name; /*!< Model name. */
@ -254,6 +255,7 @@ struct rot_caps {
const struct confparams *cfgparams; /*!< Configuration parametres. */
const rig_ptr_t priv; /*!< Private data. */
const char *rot_model_macro_name; /*!< Model macro name */
/*
* Rot Admin API

Wyświetl plik

@ -55,7 +55,7 @@
const struct rig_caps adt_200a_caps =
{
.rig_model = RIG_MODEL_ADT_200A,
RIG_MODEL(RIG_MODEL_ADT_200A),
.model_name = "ADT-200A",
.mfg_name = "ADAT www.adat.ch",
.version = "1.37",

Wyświetl plik

@ -76,7 +76,7 @@
*/
const struct rig_caps dx77_caps =
{
.rig_model = RIG_MODEL_DX77,
RIG_MODEL(RIG_MODEL_DX77),
.model_name = "DX-77",
.mfg_name = "Alinco",
.version = "0.9",

Wyświetl plik

@ -84,7 +84,7 @@ static const struct aor_priv_caps ar2700_priv_caps =
*/
const struct rig_caps ar2700_caps =
{
.rig_model = RIG_MODEL_AR2700,
RIG_MODEL(RIG_MODEL_AR2700),
.model_name = "AR2700",
.mfg_name = "AOR",
.version = BACKEND_VER,

Wyświetl plik

@ -71,7 +71,7 @@ static int ar3k_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
*/
const struct rig_caps ar3000a_caps =
{
.rig_model = RIG_MODEL_AR3000A,
RIG_MODEL(RIG_MODEL_AR3000A),
.model_name = "AR3000A",
.mfg_name = "AOR",
.version = "0.5",

Wyświetl plik

@ -99,7 +99,7 @@ struct ar3030_priv_data
*/
const struct rig_caps ar3030_caps =
{
.rig_model = RIG_MODEL_AR3030,
RIG_MODEL(RIG_MODEL_AR3030),
.model_name = "AR3030",
.mfg_name = "AOR",
.version = "1.0",

Wyświetl plik

@ -104,7 +104,7 @@ static const struct aor_priv_caps ar5k_priv_caps =
*/
const struct rig_caps ar5000_caps =
{
.rig_model = RIG_MODEL_AR5000,
RIG_MODEL(RIG_MODEL_AR5000),
.model_name = "AR5000",
.mfg_name = "AOR",
.version = BACKEND_VER ".1",
@ -249,7 +249,7 @@ const struct rig_caps ar5000_caps =
*/
const struct rig_caps ar5000a_caps =
{
.rig_model = RIG_MODEL_AR5000A,
RIG_MODEL(RIG_MODEL_AR5000A),
.model_name = "AR5000A",
.mfg_name = "AOR",
.version = BACKEND_VER,

Wyświetl plik

@ -821,7 +821,7 @@ static int ar7030_reset(RIG *rig, reset_t reset)
const struct rig_caps ar7030_caps =
{
.rig_model = RIG_MODEL_AR7030,
RIG_MODEL(RIG_MODEL_AR7030),
.model_name = "AR7030",
.mfg_name = "AOR",
.version = "0.4.1",

Wyświetl plik

@ -1759,7 +1759,7 @@ static int ar7030p_get_channel(RIG *rig, channel_t *chan)
const struct rig_caps ar7030p_caps =
{
.rig_model = RIG_MODEL_AR7030P,
RIG_MODEL(RIG_MODEL_AR7030P),
.model_name = "AR7030 Plus",
.mfg_name = "AOR",
.version = "0.1",

Wyświetl plik

@ -66,7 +66,7 @@ static const struct aor_priv_caps ar8000_priv_caps =
*/
const struct rig_caps ar8000_caps =
{
.rig_model = RIG_MODEL_AR8000,
RIG_MODEL(RIG_MODEL_AR8000),
.model_name = "AR8000",
.mfg_name = "AOR",
.version = BACKEND_VER ".1",

Wyświetl plik

@ -90,7 +90,7 @@ static const struct aor_priv_caps ar8k_priv_caps =
*/
const struct rig_caps ar8200_caps =
{
.rig_model = RIG_MODEL_AR8200,
RIG_MODEL(RIG_MODEL_AR8200),
.model_name = "AR8200",
.mfg_name = "AOR",
.version = BACKEND_VER ".1",

Wyświetl plik

@ -92,7 +92,7 @@ static const struct aor_priv_caps ar8600_priv_caps =
*/
const struct rig_caps ar8600_caps =
{
.rig_model = RIG_MODEL_AR8600,
RIG_MODEL(RIG_MODEL_AR8600),
.model_name = "AR8600",
.mfg_name = "AOR",
.version = BACKEND_VER ".1",

Wyświetl plik

@ -127,7 +127,7 @@ static const struct aor_priv_caps sr2200_priv_caps =
*/
const struct rig_caps sr2200_caps =
{
.rig_model = RIG_MODEL_SR2200,
RIG_MODEL(RIG_MODEL_SR2200),
.model_name = "SR2200",
.mfg_name = "AOR",
.version = "0.2",

Wyświetl plik

@ -71,7 +71,7 @@ static const char *barrett_get_info(RIG *rig);
const struct rig_caps barrett_caps =
{
.rig_model = RIG_MODEL_BARRETT_2050,
RIG_MODEL(RIG_MODEL_BARRETT_2050),
.model_name = "2050",
.mfg_name = "Barrett",
.version = BACKEND_VER ".1",

Wyświetl plik

@ -524,7 +524,7 @@ int dra818_get_ctcss_tone(RIG *rig, vfo_t vfo, tone_t *tone)
const struct rig_caps dra818u_caps =
{
.rig_model = RIG_MODEL_DORJI_DRA818U,
RIG_MODEL(RIG_MODEL_DORJI_DRA818U),
.model_name = "DRA818U",
.mfg_name = "Dorji",
.version = "0.1",
@ -627,7 +627,7 @@ const struct rig_caps dra818u_caps =
const struct rig_caps dra818v_caps =
{
.rig_model = RIG_MODEL_DORJI_DRA818V,
RIG_MODEL(RIG_MODEL_DORJI_DRA818V),
.model_name = "DRA818V",
.mfg_name = "Dorji",
.version = "0.1",

Wyświetl plik

@ -84,7 +84,7 @@
const struct rig_caps r8a_caps =
{
.rig_model = RIG_MODEL_DKR8A,
RIG_MODEL(RIG_MODEL_DKR8A),
.model_name = "R-8A",
.mfg_name = "Drake",
.version = BACKEND_VER ".1",

Wyświetl plik

@ -84,7 +84,7 @@
const struct rig_caps r8b_caps =
{
.rig_model = RIG_MODEL_DKR8B,
RIG_MODEL(RIG_MODEL_DKR8B),
.model_name = "R-8B",
.mfg_name = "Drake",
.version = BACKEND_VER,

Wyświetl plik

@ -335,7 +335,7 @@ static struct elad_priv_caps fdm_duo_priv_caps =
*/
const struct rig_caps fdm_duo_caps =
{
.rig_model = RIG_MODEL_ELAD_FDM_DUO,
RIG_MODEL(RIG_MODEL_ELAD_FDM_DUO),
.model_name = "FDM-DUO",
.mfg_name = "ELAD",
.version = BACKEND_VER ".5",

Wyświetl plik

@ -165,7 +165,7 @@ static const struct hamlib_vs_dttsp
const struct rig_caps dttsp_rig_caps =
{
.rig_model = RIG_MODEL_DTTSP,
RIG_MODEL(RIG_MODEL_DTTSP),
.model_name = "DttSP IPC",
.mfg_name = "DTTS Microwave Society",
.version = "0.2",
@ -250,7 +250,7 @@ const struct rig_caps dttsp_rig_caps =
*/
const struct rig_caps dttsp_udp_rig_caps =
{
.rig_model = RIG_MODEL_DTTSP_UDP,
RIG_MODEL(RIG_MODEL_DTTSP_UDP),
.model_name = "DttSP UDP",
.mfg_name = "DTTS Microwave Society",
.version = "0.2",

Wyświetl plik

@ -120,7 +120,7 @@ struct sdr1k_priv_data
const struct rig_caps sdr1k_rig_caps =
{
.rig_model = RIG_MODEL_SDR1000,
RIG_MODEL(RIG_MODEL_SDR1000),
.model_name = "SDR-1000",
.mfg_name = "Flex-radio",
.version = "0.2",

Wyświetl plik

@ -56,7 +56,7 @@ static const struct icmarine_priv_caps icm700pro_priv_caps =
const struct rig_caps icm700pro_caps =
{
.rig_model = RIG_MODEL_IC_M700PRO,
RIG_MODEL(RIG_MODEL_IC_M700PRO),
.model_name = "IC-M700PRO",
.mfg_name = "Icom",
.version = BACKEND_VER,

Wyświetl plik

@ -69,7 +69,7 @@ static const struct icm710_priv_caps icm710_priv_caps =
const struct rig_caps icm710_caps =
{
.rig_model = RIG_MODEL_IC_M710,
RIG_MODEL(RIG_MODEL_IC_M710),
.model_name = "IC-M710",
.mfg_name = "Icom",
.version = BACKEND_VER".1",

Wyświetl plik

@ -57,7 +57,7 @@ static const struct icmarine_priv_caps icm802_priv_caps =
const struct rig_caps icm802_caps =
{
.rig_model = RIG_MODEL_IC_M802,
RIG_MODEL(RIG_MODEL_IC_M802),
.model_name = "IC-M802",
.mfg_name = "Icom",
.version = BACKEND_VER".1",

Wyświetl plik

@ -63,7 +63,7 @@ static const struct icom_priv_caps delta2_priv_caps =
const struct rig_caps delta2_caps =
{
.rig_model = RIG_MODEL_DELTAII,
RIG_MODEL(RIG_MODEL_DELTAII),
.model_name = "Delta II",
.mfg_name = "Ten-Tec",
.version = BACKEND_VER ".1",

Wyświetl plik

@ -46,7 +46,7 @@ static const struct icom_priv_caps ic1275_priv_caps =
const struct rig_caps ic1275_caps =
{
.rig_model = RIG_MODEL_IC1275,
RIG_MODEL(RIG_MODEL_IC1275),
.model_name = "IC-1275",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -55,7 +55,7 @@ static const struct icom_priv_caps ic271_priv_caps =
const struct rig_caps ic271_caps =
{
.rig_model = RIG_MODEL_IC271,
RIG_MODEL(RIG_MODEL_IC271),
.model_name = "IC-271",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -66,7 +66,7 @@ static const struct icom_priv_caps ic2730_priv_caps =
const struct rig_caps ic2730_caps =
{
.rig_model = RIG_MODEL_IC2730,
RIG_MODEL(RIG_MODEL_IC2730),
.model_name = "IC-2730",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -50,7 +50,7 @@ static const struct icom_priv_caps ic275_priv_caps =
const struct rig_caps ic275_caps =
{
.rig_model = RIG_MODEL_IC275,
RIG_MODEL(RIG_MODEL_IC275),
.model_name = "IC-275",
.mfg_name = "Icom",
.version = BACKEND_VER ".1",

Wyświetl plik

@ -54,7 +54,7 @@ static const struct icom_priv_caps ic471_priv_caps =
const struct rig_caps ic471_caps =
{
.rig_model = RIG_MODEL_IC471,
RIG_MODEL(RIG_MODEL_IC471),
.model_name = "IC-471",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -50,7 +50,7 @@ static const struct icom_priv_caps ic475_priv_caps =
const struct rig_caps ic475_caps =
{
.rig_model = RIG_MODEL_IC475,
RIG_MODEL(RIG_MODEL_IC475),
.model_name = "IC-475",
.mfg_name = "Icom",
.version = BACKEND_VER ".1",

Wyświetl plik

@ -152,7 +152,7 @@ static const struct icom_priv_caps IC7000_priv_caps =
const struct rig_caps ic7000_caps =
{
.rig_model = RIG_MODEL_IC7000,
RIG_MODEL(RIG_MODEL_IC7000),
.model_name = "IC-7000",
.mfg_name = "Icom",
.version = BACKEND_VER ".2",

Wyświetl plik

@ -86,7 +86,7 @@ static const struct icom_priv_caps ic703_priv_caps =
const struct rig_caps ic703_caps =
{
.rig_model = RIG_MODEL_IC703,
RIG_MODEL(RIG_MODEL_IC703),
.model_name = "IC-703",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -150,7 +150,7 @@ static const struct icom_priv_caps ic706_priv_caps =
const struct rig_caps ic706_caps =
{
.rig_model = RIG_MODEL_IC706,
RIG_MODEL(RIG_MODEL_IC706),
.model_name = "IC-706",
.mfg_name = "Icom",
.version = BACKEND_VER ".2",
@ -288,7 +288,7 @@ static const struct icom_priv_caps ic706mkii_priv_caps =
const struct rig_caps ic706mkii_caps =
{
.rig_model = RIG_MODEL_IC706MKII,
RIG_MODEL(RIG_MODEL_IC706MKII),
.model_name = "IC-706MkII",
.mfg_name = "Icom",
.version = BACKEND_VER ".2",
@ -450,7 +450,7 @@ static const struct icom_priv_caps ic706mkiig_priv_caps =
const struct rig_caps ic706mkiig_caps =
{
.rig_model = RIG_MODEL_IC706MKIIG,
RIG_MODEL(RIG_MODEL_IC706MKIIG),
.model_name = "IC-706MkIIG",
.mfg_name = "Icom",
.version = BACKEND_VER ".4",

Wyświetl plik

@ -60,7 +60,7 @@ static const struct icom_priv_caps ic707_priv_caps =
const struct rig_caps ic707_caps =
{
.rig_model = RIG_MODEL_IC707,
RIG_MODEL(RIG_MODEL_IC707),
.model_name = "IC-707",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -193,7 +193,7 @@ static const struct icom_priv_caps ic7100_priv_caps =
const struct rig_caps ic7100_caps =
{
.rig_model = RIG_MODEL_IC7100,
RIG_MODEL(RIG_MODEL_IC7100),
.model_name = "IC-7100",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -78,7 +78,7 @@ static const struct icom_priv_caps IC718_priv_caps =
const struct rig_caps ic718_caps =
{
.rig_model = RIG_MODEL_IC718,
RIG_MODEL(RIG_MODEL_IC718),
.model_name = "IC-718",
.mfg_name = "Icom",
.version = BACKEND_VER ".1",

Wyświetl plik

@ -116,7 +116,7 @@ static const struct icom_priv_caps IC7200_priv_caps =
const struct rig_caps ic7200_caps =
{
.rig_model = RIG_MODEL_IC7200,
RIG_MODEL(RIG_MODEL_IC7200),
.model_name = "IC-7200",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -58,7 +58,7 @@ static const struct icom_priv_caps ic725_priv_caps =
const struct rig_caps ic725_caps =
{
.rig_model = RIG_MODEL_IC725,
RIG_MODEL(RIG_MODEL_IC725),
.model_name = "IC-725",
.mfg_name = "Icom",
.version = BACKEND_VER ".1",

Wyświetl plik

@ -60,7 +60,7 @@ static const struct icom_priv_caps ic726_priv_caps =
const struct rig_caps ic726_caps =
{
.rig_model = RIG_MODEL_IC726,
RIG_MODEL(RIG_MODEL_IC726),
.model_name = "IC-726",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -60,7 +60,7 @@ static const struct icom_priv_caps ic728_priv_caps =
const struct rig_caps ic728_caps =
{
.rig_model = RIG_MODEL_IC728,
RIG_MODEL(RIG_MODEL_IC728),
.model_name = "IC-728",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -238,7 +238,7 @@ static const struct icom_priv_caps IC9700_priv_caps =
const struct rig_caps ic7300_caps =
{
.rig_model = RIG_MODEL_IC7300,
RIG_MODEL(RIG_MODEL_IC7300),
.model_name = "IC-7300",
.mfg_name = "Icom",
.version = BACKEND_VER ".5",
@ -419,7 +419,7 @@ const struct rig_caps ic7300_caps =
const struct rig_caps ic9700_caps =
{
.rig_model = RIG_MODEL_IC9700,
RIG_MODEL(RIG_MODEL_IC9700),
.model_name = "IC-9700",
.mfg_name = "Icom",
.version = BACKEND_VER ".4",

Wyświetl plik

@ -57,7 +57,7 @@ static const struct icom_priv_caps ic735_priv_caps =
const struct rig_caps ic735_caps =
{
.rig_model = RIG_MODEL_IC735,
RIG_MODEL(RIG_MODEL_IC735),
.model_name = "IC-735",
.mfg_name = "Icom",
.version = BACKEND_VER ".1",

Wyświetl plik

@ -64,7 +64,7 @@ static const struct icom_priv_caps ic736_priv_caps =
const struct rig_caps ic736_caps =
{
.rig_model = RIG_MODEL_IC736,
RIG_MODEL(RIG_MODEL_IC736),
.model_name = "IC-736",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -62,7 +62,7 @@ static const struct icom_priv_caps ic737_priv_caps =
const struct rig_caps ic737_caps =
{
.rig_model = RIG_MODEL_IC737,
RIG_MODEL(RIG_MODEL_IC737),
.model_name = "IC-737",
.mfg_name = "Icom",
.version = BACKEND_VER ".2",

Wyświetl plik

@ -64,7 +64,7 @@ static const struct icom_priv_caps ic738_priv_caps =
const struct rig_caps ic738_caps =
{
.rig_model = RIG_MODEL_IC738,
RIG_MODEL(RIG_MODEL_IC738),
.model_name = "IC-738",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -112,7 +112,7 @@ static const struct icom_priv_caps ic7410_priv_caps =
const struct rig_caps ic7410_caps =
{
.rig_model = RIG_MODEL_IC7410,
RIG_MODEL(RIG_MODEL_IC7410),
.model_name = "IC-7410",
.mfg_name = "Icom",
.version = BACKEND_VER ".1",

Wyświetl plik

@ -181,7 +181,7 @@ static const struct icom_priv_caps ic746_priv_caps =
const struct rig_caps ic746_caps =
{
.rig_model = RIG_MODEL_IC746,
RIG_MODEL(RIG_MODEL_IC746),
.model_name = "IC-746",
.mfg_name = "Icom",
.version = BACKEND_VER ".4",
@ -408,7 +408,7 @@ static const struct icom_priv_caps ic746pro_priv_caps =
const struct rig_caps ic746pro_caps =
{
.rig_model = RIG_MODEL_IC746PRO,
RIG_MODEL(RIG_MODEL_IC746PRO),
.model_name = "IC-746PRO",
.mfg_name = "Icom",
.version = BACKEND_VER ".2",

Wyświetl plik

@ -86,7 +86,7 @@ static const struct icom_priv_caps ic751_priv_caps =
const struct rig_caps ic751_caps =
{
.rig_model = RIG_MODEL_IC751,
RIG_MODEL(RIG_MODEL_IC751),
.model_name = "IC-751",
.mfg_name = "Icom",
.version = BACKEND_VER ".1",

Wyświetl plik

@ -144,7 +144,7 @@ static const struct icom_priv_caps ic756_priv_caps =
const struct rig_caps ic756_caps =
{
.rig_model = RIG_MODEL_IC756,
RIG_MODEL(RIG_MODEL_IC756),
.model_name = "IC-756",
.mfg_name = "Icom",
.version = BACKEND_VER ".2",
@ -302,7 +302,7 @@ static const struct icom_priv_caps ic756pro_priv_caps =
const struct rig_caps ic756pro_caps =
{
.rig_model = RIG_MODEL_IC756PRO,
RIG_MODEL(RIG_MODEL_IC756PRO),
.model_name = "IC-756PRO",
.mfg_name = "Icom",
.version = BACKEND_VER ".1",
@ -536,7 +536,7 @@ static int ic756pro2_get_ext_parm(RIG *rig, token_t token, value_t *val);
const struct rig_caps ic756pro2_caps =
{
.rig_model = RIG_MODEL_IC756PROII,
RIG_MODEL(RIG_MODEL_IC756PROII),
.model_name = "IC-756PROII",
.mfg_name = "Icom",
.version = BACKEND_VER ".1",
@ -955,7 +955,7 @@ static const struct icom_priv_caps ic756pro3_priv_caps =
const struct rig_caps ic756pro3_caps =
{
.rig_model = RIG_MODEL_IC756PROIII,
RIG_MODEL(RIG_MODEL_IC756PROIII),
.model_name = "IC-756PROIII",
.mfg_name = "Icom",
.version = BACKEND_VER ".2",

Wyświetl plik

@ -163,7 +163,7 @@ const struct confparams ic7600_ext_levels[] =
const struct rig_caps ic7600_caps =
{
.rig_model = RIG_MODEL_IC7600,
RIG_MODEL(RIG_MODEL_IC7600),
.model_name = "IC-7600",
.mfg_name = "Icom",
.version = BACKEND_VER ".1",

Wyświetl plik

@ -58,7 +58,7 @@ static const struct icom_priv_caps ic761_priv_caps =
const struct rig_caps ic761_caps =
{
.rig_model = RIG_MODEL_IC761,
RIG_MODEL(RIG_MODEL_IC761),
.model_name = "IC-761",
.mfg_name = "Icom",
.version = BACKEND_VER ".1",

Wyświetl plik

@ -165,7 +165,7 @@ const struct confparams ic7610_ext_levels[] =
const struct rig_caps ic7610_caps =
{
.rig_model = RIG_MODEL_IC7610,
RIG_MODEL(RIG_MODEL_IC7610),
.model_name = "IC-7610",
.mfg_name = "Icom",
.version = BACKEND_VER ".2",

Wyświetl plik

@ -60,7 +60,7 @@ static const struct icom_priv_caps ic765_priv_caps =
const struct rig_caps ic765_caps =
{
.rig_model = RIG_MODEL_IC765,
RIG_MODEL(RIG_MODEL_IC765),
.model_name = "IC-765",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -150,7 +150,7 @@ const struct confparams ic7700_ext_levels[] =
const struct rig_caps ic7700_caps =
{
.rig_model = RIG_MODEL_IC7700,
RIG_MODEL(RIG_MODEL_IC7700),
.model_name = "IC-7700",
.mfg_name = "Icom",
.version = BACKEND_VER ".2",

Wyświetl plik

@ -57,7 +57,7 @@ static const struct icom_priv_caps ic775_priv_caps =
const struct rig_caps ic775_caps =
{
.rig_model = RIG_MODEL_IC775,
RIG_MODEL(RIG_MODEL_IC775),
.model_name = "IC-775",
.mfg_name = "Icom",
.version = BACKEND_VER ".1",

Wyświetl plik

@ -70,7 +70,7 @@ static const struct icom_priv_caps ic78_priv_caps =
const struct rig_caps ic78_caps =
{
.rig_model = RIG_MODEL_IC78,
RIG_MODEL(RIG_MODEL_IC78),
.model_name = "IC-78",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -150,7 +150,7 @@ const struct confparams ic7800_ext_levels[] =
const struct rig_caps ic7800_caps =
{
.rig_model = RIG_MODEL_IC7800,
RIG_MODEL(RIG_MODEL_IC7800),
.model_name = "IC-7800",
.mfg_name = "Icom",
.version = BACKEND_VER ".3",

Wyświetl plik

@ -61,7 +61,7 @@ static const struct icom_priv_caps ic781_priv_caps =
const struct rig_caps ic781_caps =
{
.rig_model = RIG_MODEL_IC781,
RIG_MODEL(RIG_MODEL_IC781),
.model_name = "IC-781",
.mfg_name = "Icom",
.version = BACKEND_VER ".1",

Wyświetl plik

@ -155,7 +155,7 @@ const struct confparams ic785x_ext_levels[] =
const struct rig_caps ic785x_caps =
{
.rig_model = RIG_MODEL_IC785x,
RIG_MODEL(RIG_MODEL_IC785x),
.model_name = "IC-785x",
.mfg_name = "Icom",
.version = BACKEND_VER ".2",

Wyświetl plik

@ -56,7 +56,7 @@ static const struct icom_priv_caps ic820h_priv_caps =
const struct rig_caps ic820h_caps =
{
.rig_model = RIG_MODEL_IC820,
RIG_MODEL(RIG_MODEL_IC820),
.model_name = "IC-820H",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -56,7 +56,7 @@ static const struct icom_priv_caps ic821h_priv_caps =
const struct rig_caps ic821h_caps =
{
.rig_model = RIG_MODEL_IC821H,
RIG_MODEL(RIG_MODEL_IC821H),
.model_name = "IC-821H",
.mfg_name = "Icom",
.version = BACKEND_VER ".2",

Wyświetl plik

@ -441,7 +441,7 @@ int ic910_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
const struct rig_caps ic910_caps =
{
.rig_model = RIG_MODEL_IC910,
RIG_MODEL(RIG_MODEL_IC910),
.model_name = "IC-910",
.mfg_name = "Icom",
.version = BACKEND_VER ".2",

Wyświetl plik

@ -106,7 +106,7 @@ static const struct icom_priv_caps ic9100_priv_caps =
const struct rig_caps ic9100_caps =
{
.rig_model = RIG_MODEL_IC9100,
RIG_MODEL(RIG_MODEL_IC9100),
.model_name = "IC-9100",
.mfg_name = "Icom",
.version = BACKEND_VER".3",

Wyświetl plik

@ -98,7 +98,7 @@ static const struct icom_priv_caps ic92d_priv_caps =
const struct rig_caps ic92d_caps =
{
.rig_model = RIG_MODEL_IC92D,
RIG_MODEL(RIG_MODEL_IC92D),
.model_name = "IC-92D", /* IC-E92D/IC-92AD */
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -51,7 +51,7 @@ static const struct icom_priv_caps ic970_priv_caps =
const struct rig_caps ic970_caps =
{
.rig_model = RIG_MODEL_IC970,
RIG_MODEL(RIG_MODEL_IC970),
.model_name = "IC-970",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -1391,7 +1391,8 @@ int icom_set_mode_with_data(RIG *rig, vfo_t vfo, rmode_t mode,
// since width_icom is 0-2 for rigs that need this here we have to make it 1-3
datamode[1] = datamode[0] ? width_icom : 0;
retval =
icom_transaction(rig, C_CTL_MEM, dm_sub_cmd, datamode, 2, ackbuf,
icom_transaction(rig, C_CTL_MEM, dm_sub_cmd, datamode, width_icom == -1 ? 1 : 2,
ackbuf,
&ack_len);
}
else
@ -4248,7 +4249,7 @@ int icom_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
/* If asking for Sub or Main on rig that doesn't have it map it */
if (VFO_HAS_A_B_ONLY && ((tx_vfo == RIG_VFO_MAIN || tx_vfo == RIG_VFO_SUB)
|| vfo == RIG_VFO_MAIN || vfo == RIG_VFO_SUB))
|| vfo == RIG_VFO_MAIN || vfo == RIG_VFO_SUB))
{
if (tx_vfo == RIG_VFO_MAIN) { tx_vfo = RIG_VFO_A; }
else if (tx_vfo == RIG_VFO_SUB) { tx_vfo = RIG_VFO_B; }

Wyświetl plik

@ -30,7 +30,7 @@
#include <sys/time.h>
#endif
#define BACKEND_VER "0.32"
#define BACKEND_VER "0.33"
/*
* defines used by comp_cal_str in rig.c

Wyświetl plik

@ -57,7 +57,7 @@ static struct icom_priv_caps icr10_priv_caps =
const struct rig_caps icr10_caps =
{
.rig_model = RIG_MODEL_ICR10,
RIG_MODEL(RIG_MODEL_ICR10),
.model_name = "IC-R10",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -57,7 +57,7 @@ static struct icom_priv_caps icr20_priv_caps =
const struct rig_caps icr20_caps =
{
.rig_model = RIG_MODEL_ICR20,
RIG_MODEL(RIG_MODEL_ICR20),
.model_name = "IC-R20",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -131,7 +131,7 @@ static struct icom_priv_caps icr30_priv_caps =
const struct rig_caps icr30_caps =
{
.rig_model = RIG_MODEL_ICR30,
RIG_MODEL(RIG_MODEL_ICR30),
.model_name = "IC-R30",
.mfg_name = "Icom",
.version = BACKEND_VER ".2",

Wyświetl plik

@ -58,7 +58,7 @@ static struct icom_priv_caps icr6_priv_caps =
const struct rig_caps icr6_caps =
{
.rig_model = RIG_MODEL_ICR6,
RIG_MODEL(RIG_MODEL_ICR6),
.model_name = "IC-R6",
.mfg_name = "Icom",
.version = BACKEND_VER ".1",

Wyświetl plik

@ -61,7 +61,7 @@ static struct icom_priv_caps icr7000_priv_caps =
*/
const struct rig_caps icr7000_caps =
{
.rig_model = RIG_MODEL_ICR7000,
RIG_MODEL(RIG_MODEL_ICR7000),
.model_name = "IC-R7000",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",
@ -176,7 +176,7 @@ static struct icom_priv_caps icr7100_priv_caps =
*/
const struct rig_caps icr7100_caps =
{
.rig_model = RIG_MODEL_ICR7100,
RIG_MODEL(RIG_MODEL_ICR7100),
.model_name = "IC-R7100",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -50,7 +50,7 @@ static struct icom_priv_caps icr71_priv_caps =
const struct rig_caps icr71_caps =
{
.rig_model = RIG_MODEL_ICR71,
RIG_MODEL(RIG_MODEL_ICR71),
.model_name = "IC-R71",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -51,7 +51,7 @@ static struct icom_priv_caps icr72_priv_caps =
const struct rig_caps icr72_caps =
{
.rig_model = RIG_MODEL_ICR72,
RIG_MODEL(RIG_MODEL_ICR72),
.model_name = "IC-R72",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -108,7 +108,7 @@ static struct icom_priv_caps icr75_priv_caps =
const struct rig_caps icr75_caps =
{
.rig_model = RIG_MODEL_ICR75,
RIG_MODEL(RIG_MODEL_ICR75),
.model_name = "IC-R75",
.mfg_name = "Icom",
.version = BACKEND_VER ".1",

Wyświetl plik

@ -76,7 +76,7 @@ static struct icom_priv_caps icr8500_priv_caps =
*/
const struct rig_caps icr8500_caps =
{
.rig_model = RIG_MODEL_ICR8500,
RIG_MODEL(RIG_MODEL_ICR8500),
.model_name = "ICR-8500",
.mfg_name = "Icom",
.version = BACKEND_VER ".1",

Wyświetl plik

@ -111,7 +111,7 @@ static struct icom_priv_caps icr8600_priv_caps =
const struct rig_caps icr8600_caps =
{
.rig_model = RIG_MODEL_ICR8600,
RIG_MODEL(RIG_MODEL_ICR8600),
.model_name = "IC-R8600",
.mfg_name = "Icom",
.version = BACKEND_VER ".9",

Wyświetl plik

@ -72,7 +72,7 @@ static struct icom_priv_caps icr9000_priv_caps =
*/
const struct rig_caps icr9000_caps =
{
.rig_model = RIG_MODEL_ICR9000,
RIG_MODEL(RIG_MODEL_ICR9000),
.model_name = "IC-R9000",
.mfg_name = "Icom",
.version = BACKEND_VER ".1",

Wyświetl plik

@ -88,7 +88,7 @@ static struct icom_priv_caps icr9500_priv_caps =
*/
const struct rig_caps icr9500_caps =
{
.rig_model = RIG_MODEL_ICR9500,
RIG_MODEL(RIG_MODEL_ICR9500),
.model_name = "IC-R9500",
.mfg_name = "Icom",
.version = BACKEND_VER ".3",

Wyświetl plik

@ -55,7 +55,7 @@ static struct icom_priv_caps icrx7_priv_caps =
const struct rig_caps icrx7_caps =
{
.rig_model = RIG_MODEL_ICRX7,
RIG_MODEL(RIG_MODEL_ICRX7),
.model_name = "IC-RX7",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -74,7 +74,7 @@ static struct icom_priv_caps id1_priv_caps =
const struct rig_caps id1_caps =
{
.rig_model = RIG_MODEL_ICID1,
RIG_MODEL(RIG_MODEL_ICID1),
.model_name = "IC ID-1",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -82,7 +82,7 @@ static struct icom_priv_caps id31_priv_caps =
const struct rig_caps id31_caps =
{
.rig_model = RIG_MODEL_ID31,
RIG_MODEL(RIG_MODEL_ID31),
.model_name = "ID-31",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -86,7 +86,7 @@ static struct icom_priv_caps id4100_priv_caps =
const struct rig_caps id4100_caps =
{
.rig_model = RIG_MODEL_ID4100,
RIG_MODEL(RIG_MODEL_ID4100),
.model_name = "ID-4100",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -90,7 +90,7 @@ static struct icom_priv_caps id51_priv_caps =
const struct rig_caps id51_caps =
{
.rig_model = RIG_MODEL_ID51,
RIG_MODEL(RIG_MODEL_ID51),
.model_name = "ID-51",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -86,7 +86,7 @@ static struct icom_priv_caps id5100_priv_caps =
const struct rig_caps id5100_caps =
{
.rig_model = RIG_MODEL_ID5100,
RIG_MODEL(RIG_MODEL_ID5100),
.model_name = "ID-5100",
.mfg_name = "Icom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -65,7 +65,7 @@ static struct icom_priv_caps omnivip_priv_caps =
const struct rig_caps omnivip_caps =
{
.rig_model = RIG_MODEL_OMNIVIP,
RIG_MODEL(RIG_MODEL_OMNIVIP),
.model_name = "Omni VI Plus",
.mfg_name = "Ten-Tec",
.version = BACKEND_VER ".2",

Wyświetl plik

@ -75,7 +75,7 @@ static struct icom_priv_caps os456_priv_caps =
const struct rig_caps os456_caps =
{
.rig_model = RIG_MODEL_OS456,
RIG_MODEL(RIG_MODEL_OS456),
.model_name = "OptoScan456",
.mfg_name = "Optoelectronics",
.version = BACKEND_VER ".3",

Wyświetl plik

@ -67,7 +67,7 @@ static struct icom_priv_caps os535_priv_caps =
const struct rig_caps os535_caps =
{
.rig_model = RIG_MODEL_OS535,
RIG_MODEL(RIG_MODEL_OS535),
.model_name = "OptoScan535",
.mfg_name = "Optoelectronics",
.version = BACKEND_VER ".3",

Wyświetl plik

@ -81,7 +81,7 @@ static struct icom_priv_caps perseus_priv_caps =
*/
const struct rig_caps perseus_caps =
{
.rig_model = RIG_MODEL_PERSEUS,
RIG_MODEL(RIG_MODEL_PERSEUS),
.model_name = "Perseus",
.mfg_name = "Microtelecom",
.version = BACKEND_VER ".0",

Wyświetl plik

@ -135,7 +135,7 @@ static struct icom_priv_caps x108g_priv_caps =
const struct rig_caps x108g_caps =
{
.rig_model = RIG_MODEL_X108G,
RIG_MODEL(RIG_MODEL_X108G),
.model_name = "X108G",
.mfg_name = "Xeigu",
.version = BACKEND_VER ".1",

Wyświetl plik

@ -60,7 +60,7 @@ static int nrd525_set_mem(RIG *rig, vfo_t vfo, int ch);
*/
const struct rig_caps nrd525_caps =
{
.rig_model = RIG_MODEL_NRD525,
RIG_MODEL(RIG_MODEL_NRD525),
.model_name = "NRD-525",
.mfg_name = "JRC",
.version = "0.1",

Wyświetl plik

@ -95,7 +95,7 @@ static const struct jrc_priv_caps nrd535_priv_caps =
*/
const struct rig_caps nrd535_caps =
{
.rig_model = RIG_MODEL_NRD535,
RIG_MODEL(RIG_MODEL_NRD535),
.model_name = "NRD-535D",
.mfg_name = "JRC",
.version = BACKEND_VER,

Wyświetl plik

@ -93,7 +93,7 @@ static const struct jrc_priv_caps nrd545_priv_caps =
*/
const struct rig_caps nrd545_caps =
{
.rig_model = RIG_MODEL_NRD545,
RIG_MODEL(RIG_MODEL_NRD545),
.model_name = "NRD-545 DSP",
.mfg_name = "JRC",
.version = BACKEND_VER,

Wyświetl plik

@ -59,7 +59,7 @@
*/
const struct rig_caps k505dsp_caps =
{
.rig_model = RIG_MODEL_505DSP,
RIG_MODEL(RIG_MODEL_505DSP),
.model_name = "505DSP",
.mfg_name = "Kachina",
.version = "0.3",

Some files were not shown because too many files have changed in this diff Show More