From d85624817834edb7ed5c0b3854257ceae4217a0b Mon Sep 17 00:00:00 2001 From: Michael Black Date: Thu, 5 Mar 2020 08:44:18 -0600 Subject: [PATCH] Add RIG_MODEL macro and change all rigs to support it --- dummy/dummy.c | 2 +- dummy/flrig.c | 2 +- dummy/netrigctl.c | 2 +- dummy/trxmanager.c | 2 +- include/hamlib/amplifier.h | 2 ++ include/hamlib/rig.h | 8 +++++--- include/hamlib/rotator.h | 2 ++ rigs/adat/adt_200a.c | 2 +- rigs/alinco/dx77.c | 2 +- rigs/aor/ar2700.c | 2 +- rigs/aor/ar3000.c | 2 +- rigs/aor/ar3030.c | 2 +- rigs/aor/ar5000.c | 4 ++-- rigs/aor/ar7030.c | 2 +- rigs/aor/ar7030p.c | 2 +- rigs/aor/ar8000.c | 2 +- rigs/aor/ar8200.c | 2 +- rigs/aor/ar8600.c | 2 +- rigs/aor/sr2200.c | 2 +- rigs/barrett/barrett.c | 2 +- rigs/dorji/dra818.c | 4 ++-- rigs/drake/r8a.c | 2 +- rigs/drake/r8b.c | 2 +- rigs/elad/fdm_duo.c | 2 +- rigs/flexradio/dttsp.c | 4 ++-- rigs/flexradio/sdr1k.c | 2 +- rigs/icmarine/icm700pro.c | 2 +- rigs/icmarine/icm710.c | 2 +- rigs/icmarine/icm802.c | 2 +- rigs/icom/delta2.c | 2 +- rigs/icom/ic1275.c | 2 +- rigs/icom/ic271.c | 2 +- rigs/icom/ic2730.c | 2 +- rigs/icom/ic275.c | 2 +- rigs/icom/ic471.c | 2 +- rigs/icom/ic475.c | 2 +- rigs/icom/ic7000.c | 2 +- rigs/icom/ic703.c | 2 +- rigs/icom/ic706.c | 6 +++--- rigs/icom/ic707.c | 2 +- rigs/icom/ic7100.c | 2 +- rigs/icom/ic718.c | 2 +- rigs/icom/ic7200.c | 2 +- rigs/icom/ic725.c | 2 +- rigs/icom/ic726.c | 2 +- rigs/icom/ic728.c | 2 +- rigs/icom/ic7300.c | 4 ++-- rigs/icom/ic735.c | 2 +- rigs/icom/ic736.c | 2 +- rigs/icom/ic737.c | 2 +- rigs/icom/ic738.c | 2 +- rigs/icom/ic7410.c | 2 +- rigs/icom/ic746.c | 4 ++-- rigs/icom/ic751.c | 2 +- rigs/icom/ic756.c | 8 ++++---- rigs/icom/ic7600.c | 2 +- rigs/icom/ic761.c | 2 +- rigs/icom/ic7610.c | 2 +- rigs/icom/ic765.c | 2 +- rigs/icom/ic7700.c | 2 +- rigs/icom/ic775.c | 2 +- rigs/icom/ic78.c | 2 +- rigs/icom/ic7800.c | 2 +- rigs/icom/ic781.c | 2 +- rigs/icom/ic785x.c | 2 +- rigs/icom/ic820h.c | 2 +- rigs/icom/ic821h.c | 2 +- rigs/icom/ic910.c | 2 +- rigs/icom/ic9100.c | 2 +- rigs/icom/ic92d.c | 2 +- rigs/icom/ic970.c | 2 +- rigs/icom/icom.c | 5 +++-- rigs/icom/icom.h | 2 +- rigs/icom/icr10.c | 2 +- rigs/icom/icr20.c | 2 +- rigs/icom/icr30.c | 2 +- rigs/icom/icr6.c | 2 +- rigs/icom/icr7000.c | 4 ++-- rigs/icom/icr71.c | 2 +- rigs/icom/icr72.c | 2 +- rigs/icom/icr75.c | 2 +- rigs/icom/icr8500.c | 2 +- rigs/icom/icr8600.c | 2 +- rigs/icom/icr9000.c | 2 +- rigs/icom/icr9500.c | 2 +- rigs/icom/icrx7.c | 2 +- rigs/icom/id1.c | 2 +- rigs/icom/id31.c | 2 +- rigs/icom/id4100.c | 2 +- rigs/icom/id51.c | 2 +- rigs/icom/id5100.c | 2 +- rigs/icom/omni.c | 2 +- rigs/icom/os456.c | 2 +- rigs/icom/os535.c | 2 +- rigs/icom/perseus.c | 2 +- rigs/icom/x108g.c | 2 +- rigs/jrc/nrd525.c | 2 +- rigs/jrc/nrd535.c | 2 +- rigs/jrc/nrd545.c | 2 +- rigs/kachina/505dsp.c | 2 +- rigs/kenwood/flex6xxx.c | 2 +- rigs/kenwood/k2.c | 2 +- rigs/kenwood/k3.c | 8 ++++---- rigs/kenwood/pihpsdr.c | 2 +- rigs/kenwood/r5000.c | 2 +- rigs/kenwood/thd7.c | 2 +- rigs/kenwood/thd72.c | 2 +- rigs/kenwood/thd74.c | 2 +- rigs/kenwood/thf6a.c | 2 +- rigs/kenwood/thf7.c | 2 +- rigs/kenwood/thg71.c | 2 +- rigs/kenwood/tmd700.c | 2 +- rigs/kenwood/tmd710.c | 2 +- rigs/kenwood/tmv7.c | 2 +- rigs/kenwood/transfox.c | 2 +- rigs/kenwood/trc80.c | 2 +- rigs/kenwood/ts140.c | 2 +- rigs/kenwood/ts2000.c | 2 +- rigs/kenwood/ts440.c | 2 +- rigs/kenwood/ts450s.c | 2 +- rigs/kenwood/ts480.c | 4 ++-- rigs/kenwood/ts50s.c | 2 +- rigs/kenwood/ts570.c | 4 ++-- rigs/kenwood/ts590.c | 4 ++-- rigs/kenwood/ts680.c | 2 +- rigs/kenwood/ts690.c | 2 +- rigs/kenwood/ts711.c | 2 +- rigs/kenwood/ts790.c | 2 +- rigs/kenwood/ts811.c | 2 +- rigs/kenwood/ts850.c | 2 +- rigs/kenwood/ts870s.c | 2 +- rigs/kenwood/ts930.c | 2 +- rigs/kenwood/ts940.c | 2 +- rigs/kenwood/ts950.c | 2 +- rigs/kenwood/ts990s.c | 2 +- rigs/kenwood/xg3.c | 2 +- rigs/kit/dds60.c | 2 +- rigs/kit/drt1.c | 2 +- rigs/kit/dwt.c | 4 ++-- rigs/kit/elektor304.c | 2 +- rigs/kit/elektor507.c | 2 +- rigs/kit/fifisdr.c | 2 +- rigs/kit/funcube.c | 4 ++-- rigs/kit/hiqsdr.c | 2 +- rigs/kit/miniVNA.c | 2 +- rigs/kit/rs_hfiq.c | 2 +- rigs/kit/si570avrusb.c | 10 +++++----- rigs/kit/usrp.c | 2 +- rigs/lowe/hf235.c | 2 +- rigs/pcr/pcr100.c | 2 +- rigs/pcr/pcr1000.c | 2 +- rigs/pcr/pcr1500.c | 2 +- rigs/pcr/pcr2500.c | 2 +- rigs/prm80/prm8060.c | 2 +- rigs/racal/ra3702.c | 2 +- rigs/racal/ra6790.c | 2 +- rigs/rft/ekd500.c | 2 +- rigs/rs/eb200.c | 2 +- rigs/rs/esmc.c | 2 +- rigs/rs/xk2100.c | 2 +- rigs/skanti/trp8000.c | 2 +- rigs/skanti/trp8255.c | 2 +- rigs/tapr/dsp10.c | 2 +- rigs/tentec/argonaut.c | 2 +- rigs/tentec/jupiter.c | 2 +- rigs/tentec/omnivii.c | 2 +- rigs/tentec/orion.h | 4 ++-- rigs/tentec/paragon.c | 2 +- rigs/tentec/pegasus.c | 2 +- rigs/tentec/rx320.c | 2 +- rigs/tentec/rx331.c | 2 +- rigs/tentec/rx340.c | 2 +- rigs/tentec/rx350.c | 2 +- rigs/tuner/v4l.c | 2 +- rigs/tuner/v4l2.c | 2 +- rigs/uniden/bc245.c | 2 +- rigs/uniden/bc250.c | 2 +- rigs/uniden/bc780.c | 2 +- rigs/uniden/bc895.c | 2 +- rigs/uniden/bc898.c | 2 +- rigs/uniden/bcd396t.c | 2 +- rigs/uniden/bcd996t.c | 2 +- rigs/uniden/pro2052.c | 2 +- rigs/winradio/g303.c | 2 +- rigs/winradio/g305.c | 2 +- rigs/winradio/g313-posix.c | 2 +- rigs/winradio/g313-win.c | 2 +- rigs/winradio/wr1000.c | 2 +- rigs/winradio/wr1500.c | 2 +- rigs/winradio/wr1550.c | 2 +- rigs/winradio/wr3100.c | 2 +- rigs/winradio/wr3150.c | 2 +- rigs/winradio/wr3500.c | 2 +- rigs/winradio/wr3700.c | 2 +- rigs/wj/wj8888.c | 2 +- rigs/yaesu/frg100.c | 2 +- rigs/yaesu/frg8800.c | 2 +- rigs/yaesu/frg9600.c | 2 +- rigs/yaesu/ft100.c | 2 +- rigs/yaesu/ft1000d.c | 2 +- rigs/yaesu/ft1000mp.c | 6 +++--- rigs/yaesu/ft1200.c | 2 +- rigs/yaesu/ft2000.c | 2 +- rigs/yaesu/ft450.c | 2 +- rigs/yaesu/ft5000.c | 6 +++--- rigs/yaesu/ft600.c | 2 +- rigs/yaesu/ft736.c | 2 +- rigs/yaesu/ft747.c | 2 +- rigs/yaesu/ft757gx.c | 4 ++-- rigs/yaesu/ft767gx.c | 2 +- rigs/yaesu/ft817.c | 2 +- rigs/yaesu/ft840.c | 2 +- rigs/yaesu/ft847.c | 4 ++-- rigs/yaesu/ft857.c | 2 +- rigs/yaesu/ft890.c | 2 +- rigs/yaesu/ft891.c | 2 +- rigs/yaesu/ft897.c | 2 +- rigs/yaesu/ft900.c | 2 +- rigs/yaesu/ft9000.c | 2 +- rigs/yaesu/ft920.c | 2 +- rigs/yaesu/ft950.c | 2 +- rigs/yaesu/ft980.c | 2 +- rigs/yaesu/ft990.c | 2 +- rigs/yaesu/ft991.c | 2 +- rigs/yaesu/vr5000.c | 2 +- rigs/yaesu/vx1700.c | 2 +- src/rig.c | 2 +- tests/listrigs.c | 28 ++++++++++++++-------------- tests/rigmatrix.c | 2 +- 229 files changed, 280 insertions(+), 273 deletions(-) diff --git a/dummy/dummy.c b/dummy/dummy.c index 83ece3ac5..e0af211fd 100644 --- a/dummy/dummy.c +++ b/dummy/dummy.c @@ -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", diff --git a/dummy/flrig.c b/dummy/flrig.c index 5315dd7a9..f388d8405 100644 --- a/dummy/flrig.c +++ b/dummy/flrig.c @@ -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, diff --git a/dummy/netrigctl.c b/dummy/netrigctl.c index db6d3c0cb..368638e62 100644 --- a/dummy/netrigctl.c +++ b/dummy/netrigctl.c @@ -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", diff --git a/dummy/trxmanager.c b/dummy/trxmanager.c index 70e40042b..f5f0842d4 100644 --- a/dummy/trxmanager.c +++ b/dummy/trxmanager.c @@ -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, diff --git a/include/hamlib/amplifier.h b/include/hamlib/amplifier.h index 48ebd3428..4d7f70a33 100644 --- a/include/hamlib/amplifier.h +++ b/include/hamlib/amplifier.h @@ -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; diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h index 278448fcc..4226fa1ff 100644 --- a/include/hamlib/rig.h +++ b/include/hamlib/rig.h @@ -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)); diff --git a/include/hamlib/rotator.h b/include/hamlib/rotator.h index 16a04e3ee..b4ccd01c1 100644 --- a/include/hamlib/rotator.h +++ b/include/hamlib/rotator.h @@ -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 diff --git a/rigs/adat/adt_200a.c b/rigs/adat/adt_200a.c index c81e4c775..ef02f1855 100644 --- a/rigs/adat/adt_200a.c +++ b/rigs/adat/adt_200a.c @@ -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", diff --git a/rigs/alinco/dx77.c b/rigs/alinco/dx77.c index ed4a96373..c7411d509 100644 --- a/rigs/alinco/dx77.c +++ b/rigs/alinco/dx77.c @@ -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", diff --git a/rigs/aor/ar2700.c b/rigs/aor/ar2700.c index 3b8a5c43e..4bf733eb3 100644 --- a/rigs/aor/ar2700.c +++ b/rigs/aor/ar2700.c @@ -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, diff --git a/rigs/aor/ar3000.c b/rigs/aor/ar3000.c index 1092ea454..9af50ca21 100644 --- a/rigs/aor/ar3000.c +++ b/rigs/aor/ar3000.c @@ -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", diff --git a/rigs/aor/ar3030.c b/rigs/aor/ar3030.c index d8e3aed41..da515154b 100644 --- a/rigs/aor/ar3030.c +++ b/rigs/aor/ar3030.c @@ -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", diff --git a/rigs/aor/ar5000.c b/rigs/aor/ar5000.c index 6377596cd..b3c79ad07 100644 --- a/rigs/aor/ar5000.c +++ b/rigs/aor/ar5000.c @@ -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, diff --git a/rigs/aor/ar7030.c b/rigs/aor/ar7030.c index 5d0ce7dcd..b1976538a 100644 --- a/rigs/aor/ar7030.c +++ b/rigs/aor/ar7030.c @@ -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", diff --git a/rigs/aor/ar7030p.c b/rigs/aor/ar7030p.c index 6c042124e..e8565d487 100644 --- a/rigs/aor/ar7030p.c +++ b/rigs/aor/ar7030p.c @@ -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", diff --git a/rigs/aor/ar8000.c b/rigs/aor/ar8000.c index c518d32ea..edff39308 100644 --- a/rigs/aor/ar8000.c +++ b/rigs/aor/ar8000.c @@ -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", diff --git a/rigs/aor/ar8200.c b/rigs/aor/ar8200.c index 33ec705ac..dbdf0e77e 100644 --- a/rigs/aor/ar8200.c +++ b/rigs/aor/ar8200.c @@ -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", diff --git a/rigs/aor/ar8600.c b/rigs/aor/ar8600.c index e87331c64..e5b91a3ac 100644 --- a/rigs/aor/ar8600.c +++ b/rigs/aor/ar8600.c @@ -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", diff --git a/rigs/aor/sr2200.c b/rigs/aor/sr2200.c index 771e90a0a..1c59e6eb7 100644 --- a/rigs/aor/sr2200.c +++ b/rigs/aor/sr2200.c @@ -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", diff --git a/rigs/barrett/barrett.c b/rigs/barrett/barrett.c index 10e5a21a5..ad924d7df 100644 --- a/rigs/barrett/barrett.c +++ b/rigs/barrett/barrett.c @@ -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", diff --git a/rigs/dorji/dra818.c b/rigs/dorji/dra818.c index 2fc92c1e0..c3309986b 100644 --- a/rigs/dorji/dra818.c +++ b/rigs/dorji/dra818.c @@ -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", diff --git a/rigs/drake/r8a.c b/rigs/drake/r8a.c index fdbf06846..f395cd8a9 100644 --- a/rigs/drake/r8a.c +++ b/rigs/drake/r8a.c @@ -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", diff --git a/rigs/drake/r8b.c b/rigs/drake/r8b.c index 30f989588..34b4580b7 100644 --- a/rigs/drake/r8b.c +++ b/rigs/drake/r8b.c @@ -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, diff --git a/rigs/elad/fdm_duo.c b/rigs/elad/fdm_duo.c index ea3e9a316..add61a78c 100644 --- a/rigs/elad/fdm_duo.c +++ b/rigs/elad/fdm_duo.c @@ -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", diff --git a/rigs/flexradio/dttsp.c b/rigs/flexradio/dttsp.c index 47fe510ae..d0a373b69 100644 --- a/rigs/flexradio/dttsp.c +++ b/rigs/flexradio/dttsp.c @@ -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", diff --git a/rigs/flexradio/sdr1k.c b/rigs/flexradio/sdr1k.c index 3c527e0fb..f61a02172 100644 --- a/rigs/flexradio/sdr1k.c +++ b/rigs/flexradio/sdr1k.c @@ -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", diff --git a/rigs/icmarine/icm700pro.c b/rigs/icmarine/icm700pro.c index a4bdfed1e..e27373796 100644 --- a/rigs/icmarine/icm700pro.c +++ b/rigs/icmarine/icm700pro.c @@ -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, diff --git a/rigs/icmarine/icm710.c b/rigs/icmarine/icm710.c index d0bd2d091..df689ffbd 100644 --- a/rigs/icmarine/icm710.c +++ b/rigs/icmarine/icm710.c @@ -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", diff --git a/rigs/icmarine/icm802.c b/rigs/icmarine/icm802.c index 287837f84..8797874db 100644 --- a/rigs/icmarine/icm802.c +++ b/rigs/icmarine/icm802.c @@ -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", diff --git a/rigs/icom/delta2.c b/rigs/icom/delta2.c index fdeee16a7..40f65d06d 100644 --- a/rigs/icom/delta2.c +++ b/rigs/icom/delta2.c @@ -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", diff --git a/rigs/icom/ic1275.c b/rigs/icom/ic1275.c index 601b1a99d..b13bb3468 100644 --- a/rigs/icom/ic1275.c +++ b/rigs/icom/ic1275.c @@ -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", diff --git a/rigs/icom/ic271.c b/rigs/icom/ic271.c index 90af50f4b..7ad42b6e9 100644 --- a/rigs/icom/ic271.c +++ b/rigs/icom/ic271.c @@ -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", diff --git a/rigs/icom/ic2730.c b/rigs/icom/ic2730.c index e3a973525..82033d5fe 100644 --- a/rigs/icom/ic2730.c +++ b/rigs/icom/ic2730.c @@ -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", diff --git a/rigs/icom/ic275.c b/rigs/icom/ic275.c index bcb8af87a..5c6ab2e69 100644 --- a/rigs/icom/ic275.c +++ b/rigs/icom/ic275.c @@ -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", diff --git a/rigs/icom/ic471.c b/rigs/icom/ic471.c index 1320096c1..2d0fbe104 100644 --- a/rigs/icom/ic471.c +++ b/rigs/icom/ic471.c @@ -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", diff --git a/rigs/icom/ic475.c b/rigs/icom/ic475.c index d667a5168..d51bb77bb 100644 --- a/rigs/icom/ic475.c +++ b/rigs/icom/ic475.c @@ -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", diff --git a/rigs/icom/ic7000.c b/rigs/icom/ic7000.c index 037af1d4a..63a0286ef 100644 --- a/rigs/icom/ic7000.c +++ b/rigs/icom/ic7000.c @@ -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", diff --git a/rigs/icom/ic703.c b/rigs/icom/ic703.c index 086781a00..da2a395d1 100644 --- a/rigs/icom/ic703.c +++ b/rigs/icom/ic703.c @@ -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", diff --git a/rigs/icom/ic706.c b/rigs/icom/ic706.c index 2b3f5b226..381c6b491 100644 --- a/rigs/icom/ic706.c +++ b/rigs/icom/ic706.c @@ -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", diff --git a/rigs/icom/ic707.c b/rigs/icom/ic707.c index 1ac22042c..f3e8d2838 100644 --- a/rigs/icom/ic707.c +++ b/rigs/icom/ic707.c @@ -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", diff --git a/rigs/icom/ic7100.c b/rigs/icom/ic7100.c index b95abd7cd..851fefbe2 100644 --- a/rigs/icom/ic7100.c +++ b/rigs/icom/ic7100.c @@ -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", diff --git a/rigs/icom/ic718.c b/rigs/icom/ic718.c index 6a01fe858..b9c5215fb 100644 --- a/rigs/icom/ic718.c +++ b/rigs/icom/ic718.c @@ -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", diff --git a/rigs/icom/ic7200.c b/rigs/icom/ic7200.c index 3b5d1bff4..c7703c8de 100644 --- a/rigs/icom/ic7200.c +++ b/rigs/icom/ic7200.c @@ -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", diff --git a/rigs/icom/ic725.c b/rigs/icom/ic725.c index 95d7a27b0..9d6146a7b 100644 --- a/rigs/icom/ic725.c +++ b/rigs/icom/ic725.c @@ -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", diff --git a/rigs/icom/ic726.c b/rigs/icom/ic726.c index cdf0aa3cc..16fb6e67a 100644 --- a/rigs/icom/ic726.c +++ b/rigs/icom/ic726.c @@ -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", diff --git a/rigs/icom/ic728.c b/rigs/icom/ic728.c index ad4f110f8..5d75075bf 100644 --- a/rigs/icom/ic728.c +++ b/rigs/icom/ic728.c @@ -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", diff --git a/rigs/icom/ic7300.c b/rigs/icom/ic7300.c index 2f5f0e58e..374e1c3fa 100644 --- a/rigs/icom/ic7300.c +++ b/rigs/icom/ic7300.c @@ -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", diff --git a/rigs/icom/ic735.c b/rigs/icom/ic735.c index 694027af8..acca7ef57 100644 --- a/rigs/icom/ic735.c +++ b/rigs/icom/ic735.c @@ -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", diff --git a/rigs/icom/ic736.c b/rigs/icom/ic736.c index 28f9732c6..491b5323c 100644 --- a/rigs/icom/ic736.c +++ b/rigs/icom/ic736.c @@ -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", diff --git a/rigs/icom/ic737.c b/rigs/icom/ic737.c index 51e39f7b5..78c8f687d 100644 --- a/rigs/icom/ic737.c +++ b/rigs/icom/ic737.c @@ -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", diff --git a/rigs/icom/ic738.c b/rigs/icom/ic738.c index 699a2b4e6..993fc6ddc 100644 --- a/rigs/icom/ic738.c +++ b/rigs/icom/ic738.c @@ -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", diff --git a/rigs/icom/ic7410.c b/rigs/icom/ic7410.c index 65466a097..a2d7ce0b8 100644 --- a/rigs/icom/ic7410.c +++ b/rigs/icom/ic7410.c @@ -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", diff --git a/rigs/icom/ic746.c b/rigs/icom/ic746.c index 5b216e9e1..f6f13c6fd 100644 --- a/rigs/icom/ic746.c +++ b/rigs/icom/ic746.c @@ -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", diff --git a/rigs/icom/ic751.c b/rigs/icom/ic751.c index 185e3a8c9..66f71b161 100644 --- a/rigs/icom/ic751.c +++ b/rigs/icom/ic751.c @@ -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", diff --git a/rigs/icom/ic756.c b/rigs/icom/ic756.c index 44ac3fbc2..ce524e7d7 100644 --- a/rigs/icom/ic756.c +++ b/rigs/icom/ic756.c @@ -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", diff --git a/rigs/icom/ic7600.c b/rigs/icom/ic7600.c index f1c18c79e..64b13c662 100644 --- a/rigs/icom/ic7600.c +++ b/rigs/icom/ic7600.c @@ -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", diff --git a/rigs/icom/ic761.c b/rigs/icom/ic761.c index a48b59f63..af05f7051 100644 --- a/rigs/icom/ic761.c +++ b/rigs/icom/ic761.c @@ -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", diff --git a/rigs/icom/ic7610.c b/rigs/icom/ic7610.c index ac3db1723..95117c0fc 100644 --- a/rigs/icom/ic7610.c +++ b/rigs/icom/ic7610.c @@ -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", diff --git a/rigs/icom/ic765.c b/rigs/icom/ic765.c index 82d248461..0020a7791 100644 --- a/rigs/icom/ic765.c +++ b/rigs/icom/ic765.c @@ -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", diff --git a/rigs/icom/ic7700.c b/rigs/icom/ic7700.c index b14c5a06e..811d553e0 100644 --- a/rigs/icom/ic7700.c +++ b/rigs/icom/ic7700.c @@ -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", diff --git a/rigs/icom/ic775.c b/rigs/icom/ic775.c index c90da7e12..4cf385da2 100644 --- a/rigs/icom/ic775.c +++ b/rigs/icom/ic775.c @@ -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", diff --git a/rigs/icom/ic78.c b/rigs/icom/ic78.c index c8e08ae26..1a079176e 100644 --- a/rigs/icom/ic78.c +++ b/rigs/icom/ic78.c @@ -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", diff --git a/rigs/icom/ic7800.c b/rigs/icom/ic7800.c index 9c4981e2e..143020911 100644 --- a/rigs/icom/ic7800.c +++ b/rigs/icom/ic7800.c @@ -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", diff --git a/rigs/icom/ic781.c b/rigs/icom/ic781.c index 80fbf7ddc..d683357fb 100644 --- a/rigs/icom/ic781.c +++ b/rigs/icom/ic781.c @@ -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", diff --git a/rigs/icom/ic785x.c b/rigs/icom/ic785x.c index a6c73ca41..c37caf4d8 100644 --- a/rigs/icom/ic785x.c +++ b/rigs/icom/ic785x.c @@ -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", diff --git a/rigs/icom/ic820h.c b/rigs/icom/ic820h.c index 382095717..0609077b4 100644 --- a/rigs/icom/ic820h.c +++ b/rigs/icom/ic820h.c @@ -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", diff --git a/rigs/icom/ic821h.c b/rigs/icom/ic821h.c index b8fa1645a..e2251aa1f 100644 --- a/rigs/icom/ic821h.c +++ b/rigs/icom/ic821h.c @@ -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", diff --git a/rigs/icom/ic910.c b/rigs/icom/ic910.c index ed4dfb3f4..d242d1e81 100644 --- a/rigs/icom/ic910.c +++ b/rigs/icom/ic910.c @@ -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", diff --git a/rigs/icom/ic9100.c b/rigs/icom/ic9100.c index 91a4a9602..326d718b4 100644 --- a/rigs/icom/ic9100.c +++ b/rigs/icom/ic9100.c @@ -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", diff --git a/rigs/icom/ic92d.c b/rigs/icom/ic92d.c index 7b9781631..e000c0bd1 100644 --- a/rigs/icom/ic92d.c +++ b/rigs/icom/ic92d.c @@ -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", diff --git a/rigs/icom/ic970.c b/rigs/icom/ic970.c index f532bf88d..d81c6a8b9 100644 --- a/rigs/icom/ic970.c +++ b/rigs/icom/ic970.c @@ -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", diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c index d8baf28e6..238403f42 100644 --- a/rigs/icom/icom.c +++ b/rigs/icom/icom.c @@ -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; } diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h index 8c80df446..abbe52bc6 100644 --- a/rigs/icom/icom.h +++ b/rigs/icom/icom.h @@ -30,7 +30,7 @@ #include #endif -#define BACKEND_VER "0.32" +#define BACKEND_VER "0.33" /* * defines used by comp_cal_str in rig.c diff --git a/rigs/icom/icr10.c b/rigs/icom/icr10.c index 12c27553b..83e228f18 100644 --- a/rigs/icom/icr10.c +++ b/rigs/icom/icr10.c @@ -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", diff --git a/rigs/icom/icr20.c b/rigs/icom/icr20.c index a3f673341..a35d1af3a 100644 --- a/rigs/icom/icr20.c +++ b/rigs/icom/icr20.c @@ -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", diff --git a/rigs/icom/icr30.c b/rigs/icom/icr30.c index 039c5ce3c..954e93816 100644 --- a/rigs/icom/icr30.c +++ b/rigs/icom/icr30.c @@ -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", diff --git a/rigs/icom/icr6.c b/rigs/icom/icr6.c index 0ed5eebeb..a02e972d8 100644 --- a/rigs/icom/icr6.c +++ b/rigs/icom/icr6.c @@ -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", diff --git a/rigs/icom/icr7000.c b/rigs/icom/icr7000.c index d1d6cb0cc..1f0f777f6 100644 --- a/rigs/icom/icr7000.c +++ b/rigs/icom/icr7000.c @@ -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", diff --git a/rigs/icom/icr71.c b/rigs/icom/icr71.c index d3788aaa8..137cd1a84 100644 --- a/rigs/icom/icr71.c +++ b/rigs/icom/icr71.c @@ -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", diff --git a/rigs/icom/icr72.c b/rigs/icom/icr72.c index 50ad16653..af3d9f909 100644 --- a/rigs/icom/icr72.c +++ b/rigs/icom/icr72.c @@ -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", diff --git a/rigs/icom/icr75.c b/rigs/icom/icr75.c index 79c58f40a..c1b79ca42 100644 --- a/rigs/icom/icr75.c +++ b/rigs/icom/icr75.c @@ -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", diff --git a/rigs/icom/icr8500.c b/rigs/icom/icr8500.c index 25368d989..e375ccdaa 100644 --- a/rigs/icom/icr8500.c +++ b/rigs/icom/icr8500.c @@ -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", diff --git a/rigs/icom/icr8600.c b/rigs/icom/icr8600.c index 08b8db53f..35308b170 100644 --- a/rigs/icom/icr8600.c +++ b/rigs/icom/icr8600.c @@ -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", diff --git a/rigs/icom/icr9000.c b/rigs/icom/icr9000.c index e9754e820..c206396dd 100644 --- a/rigs/icom/icr9000.c +++ b/rigs/icom/icr9000.c @@ -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", diff --git a/rigs/icom/icr9500.c b/rigs/icom/icr9500.c index e1d1d57d4..227e5db66 100644 --- a/rigs/icom/icr9500.c +++ b/rigs/icom/icr9500.c @@ -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", diff --git a/rigs/icom/icrx7.c b/rigs/icom/icrx7.c index 84431fbcc..42d933f96 100644 --- a/rigs/icom/icrx7.c +++ b/rigs/icom/icrx7.c @@ -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", diff --git a/rigs/icom/id1.c b/rigs/icom/id1.c index 69e8a97ea..4fef87e6c 100644 --- a/rigs/icom/id1.c +++ b/rigs/icom/id1.c @@ -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", diff --git a/rigs/icom/id31.c b/rigs/icom/id31.c index 5011fc973..8da4fda48 100644 --- a/rigs/icom/id31.c +++ b/rigs/icom/id31.c @@ -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", diff --git a/rigs/icom/id4100.c b/rigs/icom/id4100.c index c4d66adb2..72c300a70 100644 --- a/rigs/icom/id4100.c +++ b/rigs/icom/id4100.c @@ -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", diff --git a/rigs/icom/id51.c b/rigs/icom/id51.c index 6263c5f34..b871f51c1 100644 --- a/rigs/icom/id51.c +++ b/rigs/icom/id51.c @@ -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", diff --git a/rigs/icom/id5100.c b/rigs/icom/id5100.c index 1eb439cfe..822afe46e 100644 --- a/rigs/icom/id5100.c +++ b/rigs/icom/id5100.c @@ -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", diff --git a/rigs/icom/omni.c b/rigs/icom/omni.c index de3083172..f22a58e24 100644 --- a/rigs/icom/omni.c +++ b/rigs/icom/omni.c @@ -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", diff --git a/rigs/icom/os456.c b/rigs/icom/os456.c index e1ea96af3..e96bbc5c2 100644 --- a/rigs/icom/os456.c +++ b/rigs/icom/os456.c @@ -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", diff --git a/rigs/icom/os535.c b/rigs/icom/os535.c index 06a1feb14..51e74f7d9 100644 --- a/rigs/icom/os535.c +++ b/rigs/icom/os535.c @@ -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", diff --git a/rigs/icom/perseus.c b/rigs/icom/perseus.c index 7eecc74cc..e875962da 100644 --- a/rigs/icom/perseus.c +++ b/rigs/icom/perseus.c @@ -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", diff --git a/rigs/icom/x108g.c b/rigs/icom/x108g.c index ebd9c3dab..3a0346208 100644 --- a/rigs/icom/x108g.c +++ b/rigs/icom/x108g.c @@ -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", diff --git a/rigs/jrc/nrd525.c b/rigs/jrc/nrd525.c index 9e7ca52ed..18e06c6ed 100644 --- a/rigs/jrc/nrd525.c +++ b/rigs/jrc/nrd525.c @@ -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", diff --git a/rigs/jrc/nrd535.c b/rigs/jrc/nrd535.c index 1d91ba624..337aec285 100644 --- a/rigs/jrc/nrd535.c +++ b/rigs/jrc/nrd535.c @@ -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, diff --git a/rigs/jrc/nrd545.c b/rigs/jrc/nrd545.c index 10c8233d0..018838478 100644 --- a/rigs/jrc/nrd545.c +++ b/rigs/jrc/nrd545.c @@ -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, diff --git a/rigs/kachina/505dsp.c b/rigs/kachina/505dsp.c index 98c457d78..7b0c16940 100644 --- a/rigs/kachina/505dsp.c +++ b/rigs/kachina/505dsp.c @@ -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", diff --git a/rigs/kenwood/flex6xxx.c b/rigs/kenwood/flex6xxx.c index fe0aaee22..b3c5ce128 100644 --- a/rigs/kenwood/flex6xxx.c +++ b/rigs/kenwood/flex6xxx.c @@ -314,7 +314,7 @@ static int flex6k_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) */ const struct rig_caps f6k_caps = { - .rig_model = RIG_MODEL_F6K, + RIG_MODEL(RIG_MODEL_F6K), .model_name = "6xxx", .mfg_name = "FlexRadio", .version = "20130717", diff --git a/rigs/kenwood/k2.c b/rigs/kenwood/k2.c index 0d3407e16..588605d1e 100644 --- a/rigs/kenwood/k2.c +++ b/rigs/kenwood/k2.c @@ -119,7 +119,7 @@ int k2_pop_fw_lst(RIG *rig, const char *cmd); */ const struct rig_caps k2_caps = { - .rig_model = RIG_MODEL_K2, + RIG_MODEL(RIG_MODEL_K2), .model_name = "K2", .mfg_name = "Elecraft", .version = "20200107", diff --git a/rigs/kenwood/k3.c b/rigs/kenwood/k3.c index 4b08d0733..0afd02d95 100644 --- a/rigs/kenwood/k3.c +++ b/rigs/kenwood/k3.c @@ -176,7 +176,7 @@ int kx3_get_bar_graph_level(RIG *rig, float *level); */ const struct rig_caps k3_caps = { - .rig_model = RIG_MODEL_K3, + RIG_MODEL(RIG_MODEL_K3), .model_name = "K3", .mfg_name = "Elecraft", .version = "20200107", @@ -325,7 +325,7 @@ const struct rig_caps k3_caps = const struct rig_caps k3s_caps = { - .rig_model = RIG_MODEL_K3S, + RIG_MODEL(RIG_MODEL_K3S), .model_name = "K3S", .mfg_name = "Elecraft", .version = "20190529", @@ -474,7 +474,7 @@ const struct rig_caps k3s_caps = const struct rig_caps kx3_caps = { - .rig_model = RIG_MODEL_KX3, + RIG_MODEL(RIG_MODEL_KX3), .model_name = "KX3", .mfg_name = "Elecraft", .version = "20190529", @@ -623,7 +623,7 @@ const struct rig_caps kx3_caps = const struct rig_caps kx2_caps = { - .rig_model = RIG_MODEL_KX2, + RIG_MODEL(RIG_MODEL_KX2), .model_name = "KX2", .mfg_name = "Elecraft", .version = "20190529", diff --git a/rigs/kenwood/pihpsdr.c b/rigs/kenwood/pihpsdr.c index 7e8868e98..963f2e67d 100644 --- a/rigs/kenwood/pihpsdr.c +++ b/rigs/kenwood/pihpsdr.c @@ -99,7 +99,7 @@ static struct kenwood_priv_caps ts2000_priv_caps = */ const struct rig_caps pihpsdr_caps = { - .rig_model = RIG_MODEL_HPSDR, + RIG_MODEL(RIG_MODEL_HPSDR), .model_name = "PiHPSDR", .mfg_name = "OpenHPSDR", .version = "20170121", diff --git a/rigs/kenwood/r5000.c b/rigs/kenwood/r5000.c index 5518c0225..324f7cfab 100644 --- a/rigs/kenwood/r5000.c +++ b/rigs/kenwood/r5000.c @@ -59,7 +59,7 @@ static struct kenwood_priv_caps r5000_priv_caps = */ const struct rig_caps r5000_caps = { - .rig_model = RIG_MODEL_R5000, + RIG_MODEL(RIG_MODEL_R5000), .model_name = "R-5000", .mfg_name = "Kenwood", .version = IC10_VER, diff --git a/rigs/kenwood/thd7.c b/rigs/kenwood/thd7.c index 240135c1a..6ce52fc4b 100644 --- a/rigs/kenwood/thd7.c +++ b/rigs/kenwood/thd7.c @@ -83,7 +83,7 @@ static struct kenwood_priv_caps thd7_priv_caps = */ const struct rig_caps thd7a_caps = { - .rig_model = RIG_MODEL_THD7A, + RIG_MODEL(RIG_MODEL_THD7A), .model_name = "TH-D7A", .mfg_name = "Kenwood", .version = TH_VER, diff --git a/rigs/kenwood/thd72.c b/rigs/kenwood/thd72.c index e11013f83..a9ef7de9c 100644 --- a/rigs/kenwood/thd72.c +++ b/rigs/kenwood/thd72.c @@ -1615,7 +1615,7 @@ int thd72_get_chan_all_cb(RIG *rig, chan_cb_t chan_cb, rig_ptr_t arg) */ const struct rig_caps thd72a_caps = { - .rig_model = RIG_MODEL_THD72A, + RIG_MODEL(RIG_MODEL_THD72A), .model_name = "TH-D72A", .mfg_name = "Kenwood", .version = TH_VER ".4", diff --git a/rigs/kenwood/thd74.c b/rigs/kenwood/thd74.c index d4f1151df..339635041 100644 --- a/rigs/kenwood/thd74.c +++ b/rigs/kenwood/thd74.c @@ -1626,7 +1626,7 @@ int thd74_get_chan_all_cb(RIG *rig, chan_cb_t chan_cb, rig_ptr_t arg) */ const struct rig_caps thd74_caps = { - .rig_model = RIG_MODEL_THD74, + RIG_MODEL(RIG_MODEL_THD74), .model_name = "TH-D74", .mfg_name = "Kenwood", .version = "0.1", diff --git a/rigs/kenwood/thf6a.c b/rigs/kenwood/thf6a.c index 6b3a85834..49a20a1d5 100644 --- a/rigs/kenwood/thf6a.c +++ b/rigs/kenwood/thf6a.c @@ -119,7 +119,7 @@ static int thf6a_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op); */ const struct rig_caps thf6a_caps = { - .rig_model = RIG_MODEL_THF6A, + RIG_MODEL(RIG_MODEL_THF6A), .model_name = "TH-F6A", .mfg_name = "Kenwood", .version = TH_VER, diff --git a/rigs/kenwood/thf7.c b/rigs/kenwood/thf7.c index 9fe0adfe4..33b83c93f 100644 --- a/rigs/kenwood/thf7.c +++ b/rigs/kenwood/thf7.c @@ -113,7 +113,7 @@ static int thf7e_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op); */ const struct rig_caps thf7e_caps = { - .rig_model = RIG_MODEL_THF7E, + RIG_MODEL(RIG_MODEL_THF7E), .model_name = "TH-F7E", .mfg_name = "Kenwood", .version = TH_VER ".2", diff --git a/rigs/kenwood/thg71.c b/rigs/kenwood/thg71.c index c51915f01..ec7bfaefa 100644 --- a/rigs/kenwood/thg71.c +++ b/rigs/kenwood/thg71.c @@ -84,7 +84,7 @@ static int thg71_set_func(RIG *rig, vfo_t vfo, setting_t func, int status); */ const struct rig_caps thg71_caps = { - .rig_model = RIG_MODEL_THG71, + RIG_MODEL(RIG_MODEL_THG71), .model_name = "TH-G71", .mfg_name = "Kenwood", .version = TH_VER, diff --git a/rigs/kenwood/tmd700.c b/rigs/kenwood/tmd700.c index 2c9616803..cf6944b2a 100644 --- a/rigs/kenwood/tmd700.c +++ b/rigs/kenwood/tmd700.c @@ -97,7 +97,7 @@ static struct kenwood_priv_caps tmd700_priv_caps = */ const struct rig_caps tmd700_caps = { - .rig_model = RIG_MODEL_TMD700, + RIG_MODEL(RIG_MODEL_TMD700), .model_name = "TM-D700", .mfg_name = "Kenwood", .version = TH_VER, diff --git a/rigs/kenwood/tmd710.c b/rigs/kenwood/tmd710.c index 1aa30cfac..ceed928cd 100644 --- a/rigs/kenwood/tmd710.c +++ b/rigs/kenwood/tmd710.c @@ -247,7 +247,7 @@ const struct confparams tmd710_ext_levels[] = const struct rig_caps tmd710_caps = { - .rig_model = RIG_MODEL_TMD710, + RIG_MODEL(RIG_MODEL_TMD710), .model_name = "TM-D710(G)", .mfg_name = "Kenwood", .version = BACKEND_VER ".1", diff --git a/rigs/kenwood/tmv7.c b/rigs/kenwood/tmv7.c index 79b443e8d..62bf94372 100644 --- a/rigs/kenwood/tmv7.c +++ b/rigs/kenwood/tmv7.c @@ -95,7 +95,7 @@ static int tmv7_set_channel(RIG *rig, const channel_t *chan); */ const struct rig_caps tmv7_caps = { - .rig_model = RIG_MODEL_TMV7, + RIG_MODEL(RIG_MODEL_TMV7), .model_name = "TM-V7", .mfg_name = "Kenwood", .version = TH_VER, diff --git a/rigs/kenwood/transfox.c b/rigs/kenwood/transfox.c index c8373f29b..abbb66267 100644 --- a/rigs/kenwood/transfox.c +++ b/rigs/kenwood/transfox.c @@ -70,7 +70,7 @@ static int transfox_get_level(RIG *rig, vfo_t vfo, setting_t level, */ const struct rig_caps transfox_caps = { - .rig_model = RIG_MODEL_TRANSFOX, + RIG_MODEL(RIG_MODEL_TRANSFOX), .model_name = "Transfox", .mfg_name = "SigFox", .version = "20111223", diff --git a/rigs/kenwood/trc80.c b/rigs/kenwood/trc80.c index f5ea43732..e5d81b1c0 100644 --- a/rigs/kenwood/trc80.c +++ b/rigs/kenwood/trc80.c @@ -69,7 +69,7 @@ static struct kenwood_priv_caps trc80_priv_caps = */ const struct rig_caps trc80_caps = { - .rig_model = RIG_MODEL_TRC80, + RIG_MODEL(RIG_MODEL_TRC80), .model_name = "TRC-80", .mfg_name = "Kenwood", .version = BACKEND_VER, diff --git a/rigs/kenwood/ts140.c b/rigs/kenwood/ts140.c index e57c8b19d..906024fc5 100644 --- a/rigs/kenwood/ts140.c +++ b/rigs/kenwood/ts140.c @@ -83,7 +83,7 @@ static int ts140_set_vfo(RIG *rig, vfo_t vfo) const struct rig_caps ts140_caps = { - .rig_model = RIG_MODEL_TS140S, + RIG_MODEL(RIG_MODEL_TS140S), .model_name = "TS-140S", .mfg_name = "Kenwood", .version = BACKEND_VER ".1", diff --git a/rigs/kenwood/ts2000.c b/rigs/kenwood/ts2000.c index 60af9c504..090f4fc6f 100644 --- a/rigs/kenwood/ts2000.c +++ b/rigs/kenwood/ts2000.c @@ -125,7 +125,7 @@ static struct kenwood_priv_caps ts2000_priv_caps = */ const struct rig_caps ts2000_caps = { - .rig_model = RIG_MODEL_TS2000, + RIG_MODEL(RIG_MODEL_TS2000), .model_name = "TS-2000", .mfg_name = "Kenwood", .version = BACKEND_VER ".4", diff --git a/rigs/kenwood/ts440.c b/rigs/kenwood/ts440.c index 1094f3647..2082bc98e 100644 --- a/rigs/kenwood/ts440.c +++ b/rigs/kenwood/ts440.c @@ -61,7 +61,7 @@ static struct kenwood_priv_caps ts440_priv_caps = */ const struct rig_caps ts440_caps = { - .rig_model = RIG_MODEL_TS440, + RIG_MODEL(RIG_MODEL_TS440), .model_name = "TS-440", .mfg_name = "Kenwood", .version = BACKEND_VER "." IC10_VER, diff --git a/rigs/kenwood/ts450s.c b/rigs/kenwood/ts450s.c index 3bcd5a00e..747bd0194 100644 --- a/rigs/kenwood/ts450s.c +++ b/rigs/kenwood/ts450s.c @@ -124,7 +124,7 @@ int ts450_open(RIG *rig) const struct rig_caps ts450s_caps = { - .rig_model = RIG_MODEL_TS450S, + RIG_MODEL(RIG_MODEL_TS450S), .model_name = "TS-450S", .mfg_name = "Kenwood", .version = BACKEND_VER ".1", diff --git a/rigs/kenwood/ts480.c b/rigs/kenwood/ts480.c index 932184ceb..0563c4422 100644 --- a/rigs/kenwood/ts480.c +++ b/rigs/kenwood/ts480.c @@ -476,7 +476,7 @@ static struct kenwood_priv_caps ts890s_priv_caps = */ const struct rig_caps ts480_caps = { - .rig_model = RIG_MODEL_TS480, + RIG_MODEL(RIG_MODEL_TS480), .model_name = "TS-480", .mfg_name = "Kenwood", .version = BACKEND_VER ".5", @@ -631,7 +631,7 @@ const struct rig_caps ts480_caps = */ const struct rig_caps ts890s_caps = { - .rig_model = RIG_MODEL_TS890S, + RIG_MODEL(RIG_MODEL_TS890S), .model_name = "TS-890S", .mfg_name = "Kenwood", .version = BACKEND_VER ".3", diff --git a/rigs/kenwood/ts50s.c b/rigs/kenwood/ts50s.c index 3d5ca53ef..4cd65cb1c 100644 --- a/rigs/kenwood/ts50s.c +++ b/rigs/kenwood/ts50s.c @@ -52,7 +52,7 @@ static struct kenwood_priv_caps ts50_priv_caps = */ const struct rig_caps ts50s_caps = { - .rig_model = RIG_MODEL_TS50, + RIG_MODEL(RIG_MODEL_TS50), .model_name = "TS-50S", .mfg_name = "Kenwood", .version = BACKEND_VER".1", diff --git a/rigs/kenwood/ts570.c b/rigs/kenwood/ts570.c index aef2f143a..a8c314678 100644 --- a/rigs/kenwood/ts570.c +++ b/rigs/kenwood/ts570.c @@ -936,7 +936,7 @@ int ts570_set_xit(RIG *rig, vfo_t vfo, shortfreq_t rit) */ const struct rig_caps ts570s_caps = { - .rig_model = RIG_MODEL_TS570S, + RIG_MODEL(RIG_MODEL_TS570S), .model_name = "TS-570S", .mfg_name = "Kenwood", .version = BACKEND_VER ".1", @@ -1117,7 +1117,7 @@ const struct rig_caps ts570s_caps = */ const struct rig_caps ts570d_caps = { - .rig_model = RIG_MODEL_TS570D, + RIG_MODEL(RIG_MODEL_TS570D), .model_name = "TS-570D", .mfg_name = "Kenwood", .version = BACKEND_VER ".2", diff --git a/rigs/kenwood/ts590.c b/rigs/kenwood/ts590.c index 3929ae8cf..5e6d02579 100644 --- a/rigs/kenwood/ts590.c +++ b/rigs/kenwood/ts590.c @@ -88,7 +88,7 @@ static struct kenwood_priv_caps ts590_priv_caps = */ const struct rig_caps ts590_caps = { - .rig_model = RIG_MODEL_TS590S, + RIG_MODEL(RIG_MODEL_TS590S), .model_name = "TS-590S", .mfg_name = "Kenwood", .version = BACKEND_VER ".3", @@ -257,7 +257,7 @@ const struct rig_caps ts590_caps = const struct rig_caps ts590sg_caps = { - .rig_model = RIG_MODEL_TS590SG, + RIG_MODEL(RIG_MODEL_TS590SG), .model_name = "TS-590SG", .mfg_name = "Kenwood", .version = BACKEND_VER ".1", diff --git a/rigs/kenwood/ts680.c b/rigs/kenwood/ts680.c index 301101601..d70e3dcc7 100644 --- a/rigs/kenwood/ts680.c +++ b/rigs/kenwood/ts680.c @@ -83,7 +83,7 @@ static int ts680_set_vfo(RIG *rig, vfo_t vfo) const struct rig_caps ts680s_caps = { - .rig_model = RIG_MODEL_TS680S, + RIG_MODEL(RIG_MODEL_TS680S), .model_name = "TS-680S", .mfg_name = "Kenwood", .version = BACKEND_VER ".1", diff --git a/rigs/kenwood/ts690.c b/rigs/kenwood/ts690.c index b7b3bfdbf..75d89217a 100644 --- a/rigs/kenwood/ts690.c +++ b/rigs/kenwood/ts690.c @@ -74,7 +74,7 @@ static struct kenwood_priv_caps ts690_priv_caps = */ const struct rig_caps ts690s_caps = { - .rig_model = RIG_MODEL_TS690S, + RIG_MODEL(RIG_MODEL_TS690S), .model_name = "TS-690S", .mfg_name = "Kenwood", .version = BACKEND_VER ".2", diff --git a/rigs/kenwood/ts711.c b/rigs/kenwood/ts711.c index 28afcef29..142bf654f 100644 --- a/rigs/kenwood/ts711.c +++ b/rigs/kenwood/ts711.c @@ -99,7 +99,7 @@ ts711_set_vfo(RIG *rig, vfo_t vfo) */ const struct rig_caps ts711_caps = { - .rig_model = RIG_MODEL_TS711, + RIG_MODEL(RIG_MODEL_TS711), .model_name = "TS-711", .mfg_name = "Kenwood", .version = BACKEND_VER ".1", diff --git a/rigs/kenwood/ts790.c b/rigs/kenwood/ts790.c index 446b633fe..6fcc2fcfe 100644 --- a/rigs/kenwood/ts790.c +++ b/rigs/kenwood/ts790.c @@ -71,7 +71,7 @@ static struct kenwood_priv_caps ts790_priv_caps = */ const struct rig_caps ts790_caps = { - .rig_model = RIG_MODEL_TS790, + RIG_MODEL(RIG_MODEL_TS790), .model_name = "TS-790", .mfg_name = "Kenwood", .version = BACKEND_VER ".3", diff --git a/rigs/kenwood/ts811.c b/rigs/kenwood/ts811.c index 0377d7226..2d6ba47af 100644 --- a/rigs/kenwood/ts811.c +++ b/rigs/kenwood/ts811.c @@ -86,7 +86,7 @@ ts811_set_vfo(RIG *rig, vfo_t vfo) */ const struct rig_caps ts811_caps = { - .rig_model = RIG_MODEL_TS811, + RIG_MODEL(RIG_MODEL_TS811), .model_name = "TS-811", .mfg_name = "Kenwood", .version = BACKEND_VER ".1", diff --git a/rigs/kenwood/ts850.c b/rigs/kenwood/ts850.c index 01d2b3596..e3aaf19b7 100644 --- a/rigs/kenwood/ts850.c +++ b/rigs/kenwood/ts850.c @@ -103,7 +103,7 @@ static const struct confparams ts850_ext_parms[] = */ const struct rig_caps ts850_caps = { - .rig_model = RIG_MODEL_TS850, + RIG_MODEL(RIG_MODEL_TS850), .model_name = "TS-850", .mfg_name = "Kenwood", .version = BACKEND_VER ".1", diff --git a/rigs/kenwood/ts870s.c b/rigs/kenwood/ts870s.c index e32eedb6b..5adc0930b 100644 --- a/rigs/kenwood/ts870s.c +++ b/rigs/kenwood/ts870s.c @@ -537,7 +537,7 @@ static int ts870s_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) */ const struct rig_caps ts870s_caps = { - .rig_model = RIG_MODEL_TS870S, + RIG_MODEL(RIG_MODEL_TS870S), .model_name = "TS-870S", .mfg_name = "Kenwood", .version = BACKEND_VER ".0", diff --git a/rigs/kenwood/ts930.c b/rigs/kenwood/ts930.c index 2505c5bce..f60cfa02f 100644 --- a/rigs/kenwood/ts930.c +++ b/rigs/kenwood/ts930.c @@ -56,7 +56,7 @@ static struct kenwood_priv_caps ts930_priv_caps = */ const struct rig_caps ts930_caps = { - .rig_model = RIG_MODEL_TS930, + RIG_MODEL(RIG_MODEL_TS930), .model_name = "TS-930", .mfg_name = "Kenwood", .version = BACKEND_VER, diff --git a/rigs/kenwood/ts940.c b/rigs/kenwood/ts940.c index 3c11a5573..a34e90932 100644 --- a/rigs/kenwood/ts940.c +++ b/rigs/kenwood/ts940.c @@ -81,7 +81,7 @@ static struct kenwood_priv_caps ts940_priv_caps = */ const struct rig_caps ts940_caps = { - .rig_model = RIG_MODEL_TS940, + RIG_MODEL(RIG_MODEL_TS940), .model_name = "TS-940S", .mfg_name = "Kenwood", .version = BACKEND_VER ".7", diff --git a/rigs/kenwood/ts950.c b/rigs/kenwood/ts950.c index b109ee66b..80b304454 100644 --- a/rigs/kenwood/ts950.c +++ b/rigs/kenwood/ts950.c @@ -58,7 +58,7 @@ static struct kenwood_priv_caps ts950_priv_caps = const struct rig_caps ts950sdx_caps = { - .rig_model = RIG_MODEL_TS950SDX, + RIG_MODEL(RIG_MODEL_TS950SDX), .model_name = "TS-950SDX", .mfg_name = "Kenwood", .version = BACKEND_VER, diff --git a/rigs/kenwood/ts990s.c b/rigs/kenwood/ts990s.c index 2411ae2bf..70b3b0612 100644 --- a/rigs/kenwood/ts990s.c +++ b/rigs/kenwood/ts990s.c @@ -123,7 +123,7 @@ static struct kenwood_priv_caps ts990s_priv_caps = */ const struct rig_caps ts990s_caps = { - .rig_model = RIG_MODEL_TS990S, + RIG_MODEL(RIG_MODEL_TS990S), .model_name = "TS-990s", .mfg_name = "Kenwood", .version = BACKEND_VER ".1", diff --git a/rigs/kenwood/xg3.c b/rigs/kenwood/xg3.c index 86ea4c3c0..e9097ccfe 100644 --- a/rigs/kenwood/xg3.c +++ b/rigs/kenwood/xg3.c @@ -104,7 +104,7 @@ int xg3_get_parm(RIG *rig, setting_t parm, value_t *val); */ const struct rig_caps xg3_caps = { - .rig_model = RIG_MODEL_XG3, + RIG_MODEL(RIG_MODEL_XG3), .model_name = "XG3", .mfg_name = "Elecraft", .version = "20191218", diff --git a/rigs/kit/dds60.c b/rigs/kit/dds60.c index f499d73a1..a9245983a 100644 --- a/rigs/kit/dds60.c +++ b/rigs/kit/dds60.c @@ -100,7 +100,7 @@ static int dds60_get_conf(RIG *rig, token_t token, char *val); const struct rig_caps dds60_caps = { - .rig_model = RIG_MODEL_DDS60, + RIG_MODEL(RIG_MODEL_DDS60), .model_name = "DDS-60", .mfg_name = "AmQRP", .version = "0.1", diff --git a/rigs/kit/drt1.c b/rigs/kit/drt1.c index 717a406a9..4e7ddb017 100644 --- a/rigs/kit/drt1.c +++ b/rigs/kit/drt1.c @@ -95,7 +95,7 @@ static int drt1_get_conf(RIG *rig, token_t token, char *val); const struct rig_caps drt1_caps = { - .rig_model = RIG_MODEL_DRT1, + RIG_MODEL(RIG_MODEL_DRT1), .model_name = "DRT1", .mfg_name = "SAT-Schneider", .version = "0.2", diff --git a/rigs/kit/dwt.c b/rigs/kit/dwt.c index 66038b582..91acedf73 100644 --- a/rigs/kit/dwt.c +++ b/rigs/kit/dwt.c @@ -148,7 +148,7 @@ static const char *dwtdll_get_info(RIG *rig); const struct rig_caps dwt_caps = { - .rig_model = RIG_MODEL_DWT, + RIG_MODEL(RIG_MODEL_DWT), .model_name = "Digital World Traveller", .mfg_name = "Coding Technologies", .version = "0.1.1", @@ -547,7 +547,7 @@ static const char *dwt_get_info(RIG *rig); const struct rig_caps dwt_caps = { - .rig_model = RIG_MODEL_DWT, + RIG_MODEL(RIG_MODEL_DWT), .model_name = "Digital World Traveller", .mfg_name = "Coding Technologies", .version = "0.2", diff --git a/rigs/kit/elektor304.c b/rigs/kit/elektor304.c index 829a0d2e9..7d2577e1e 100644 --- a/rigs/kit/elektor304.c +++ b/rigs/kit/elektor304.c @@ -87,7 +87,7 @@ static int elektor304_get_conf(RIG *rig, token_t token, char *val); const struct rig_caps elektor304_caps = { - .rig_model = RIG_MODEL_ELEKTOR304, + RIG_MODEL(RIG_MODEL_ELEKTOR304), .model_name = "Elektor 3/04", .mfg_name = "Elektor", .version = "0.4", diff --git a/rigs/kit/elektor507.c b/rigs/kit/elektor507.c index 4f7415dc8..3f7eb47d8 100644 --- a/rigs/kit/elektor507.c +++ b/rigs/kit/elektor507.c @@ -559,7 +559,7 @@ int elektor507_ftdi_write_data(RIG *rig, void *FTOutBuf, const struct rig_caps elektor507_caps = { - .rig_model = RIG_MODEL_ELEKTOR507, + RIG_MODEL(RIG_MODEL_ELEKTOR507), .model_name = "Elektor SDR-USB", .mfg_name = "Elektor", .version = "0.3.2", diff --git a/rigs/kit/fifisdr.c b/rigs/kit/fifisdr.c index 02a978d19..c12366fea 100644 --- a/rigs/kit/fifisdr.c +++ b/rigs/kit/fifisdr.c @@ -128,7 +128,7 @@ struct fifisdr_priv_instance_data /** FiFi-SDR receiver description. */ const struct rig_caps fifisdr_caps = { - .rig_model = RIG_MODEL_FIFISDR, + RIG_MODEL(RIG_MODEL_FIFISDR), .model_name = "FiFi-SDR", .mfg_name = "FiFi", .version = "0.6", diff --git a/rigs/kit/funcube.c b/rigs/kit/funcube.c index 267a004bf..191a200bd 100644 --- a/rigs/kit/funcube.c +++ b/rigs/kit/funcube.c @@ -98,7 +98,7 @@ struct funcube_priv_data const struct rig_caps funcube_caps = { - .rig_model = RIG_MODEL_FUNCUBEDONGLE, + RIG_MODEL(RIG_MODEL_FUNCUBEDONGLE), .model_name = "FUNcube Dongle", .mfg_name = "AMSAT-UK", .version = "0.3", @@ -161,7 +161,7 @@ const struct rig_caps funcube_caps = const struct rig_caps funcubeplus_caps = { - .rig_model = RIG_MODEL_FUNCUBEDONGLEPLUS, + RIG_MODEL(RIG_MODEL_FUNCUBEDONGLEPLUS), .model_name = "FUNcube Dongle Pro+", .mfg_name = "AMSAT-UK", .version = "0.4", diff --git a/rigs/kit/hiqsdr.c b/rigs/kit/hiqsdr.c index d2d0a17e5..8deabfa29 100644 --- a/rigs/kit/hiqsdr.c +++ b/rigs/kit/hiqsdr.c @@ -108,7 +108,7 @@ const struct confparams hiqsdr_cfg_params[] = const struct rig_caps hiqsdr_caps = { - .rig_model = RIG_MODEL_HIQSDR, + RIG_MODEL(RIG_MODEL_HIQSDR), .model_name = "HiQSDR", .mfg_name = "N2ADR", .version = "0.1", diff --git a/rigs/kit/miniVNA.c b/rigs/kit/miniVNA.c index 8e249a5cc..beb4749cc 100644 --- a/rigs/kit/miniVNA.c +++ b/rigs/kit/miniVNA.c @@ -62,7 +62,7 @@ static int miniVNA_set_freq(RIG *rig, vfo_t vfo, freq_t freq) const struct rig_caps miniVNA_caps = { - .rig_model = RIG_MODEL_MINIVNA, + RIG_MODEL(RIG_MODEL_MINIVNA), .model_name = "miniVNA", .mfg_name = "mRS", .version = "0.1", diff --git a/rigs/kit/rs_hfiq.c b/rigs/kit/rs_hfiq.c index aa96ad37b..cd7b51bb2 100644 --- a/rigs/kit/rs_hfiq.c +++ b/rigs/kit/rs_hfiq.c @@ -211,7 +211,7 @@ static int rshfiq_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt) const struct rig_caps rshfiq_caps = { - .rig_model = RIG_MODEL_RSHFIQ, + RIG_MODEL(RIG_MODEL_RSHFIQ), .model_name = "RS-HFIQ", .mfg_name = "HobbyPCB", .version = "0.1", diff --git a/rigs/kit/si570avrusb.c b/rigs/kit/si570avrusb.c index 8678ca1da..62a5850e8 100644 --- a/rigs/kit/si570avrusb.c +++ b/rigs/kit/si570avrusb.c @@ -155,7 +155,7 @@ struct si570xxxusb_priv_data const struct rig_caps si570avrusb_caps = { - .rig_model = RIG_MODEL_SI570AVRUSB, + RIG_MODEL(RIG_MODEL_SI570AVRUSB), .model_name = "Si570 AVR-USB", .mfg_name = "SoftRock", .version = "0.3", @@ -232,7 +232,7 @@ const struct rig_caps si570avrusb_caps = */ const struct rig_caps si570peaberry1_caps = { - .rig_model = RIG_MODEL_SI570PEABERRY1, + RIG_MODEL(RIG_MODEL_SI570PEABERRY1), .model_name = "Si570 Peaberry V1", .mfg_name = "AE9RB", .version = "0.3", @@ -309,7 +309,7 @@ const struct rig_caps si570peaberry1_caps = */ const struct rig_caps si570peaberry2_caps = { - .rig_model = RIG_MODEL_SI570PEABERRY2, + RIG_MODEL(RIG_MODEL_SI570PEABERRY2), .model_name = "Si570 Peaberry V2", .mfg_name = "AE9RB", .version = "0.2", @@ -391,7 +391,7 @@ const struct rig_caps si570peaberry2_caps = */ const struct rig_caps si570picusb_caps = { - .rig_model = RIG_MODEL_SI570PICUSB, + RIG_MODEL(RIG_MODEL_SI570PICUSB), .model_name = "Si570 PIC-USB", .mfg_name = "KTH-SDR kit", .version = "0.3", @@ -472,7 +472,7 @@ const struct rig_caps si570picusb_caps = const struct rig_caps fasdr_caps = { - .rig_model = RIG_MODEL_FASDR, + RIG_MODEL(RIG_MODEL_FASDR), .model_name = "FA-SDR", .mfg_name = "Funkamatuer", .version = "0.2", diff --git a/rigs/kit/usrp.c b/rigs/kit/usrp.c index a6c06b4bf..f487289b9 100644 --- a/rigs/kit/usrp.c +++ b/rigs/kit/usrp.c @@ -66,7 +66,7 @@ static const struct confparams usrp_cfg_params[] = const struct rig_caps usrp_caps = { - .rig_model = RIG_MODEL_USRP, + RIG_MODEL(RIG_MODEL_USRP), .model_name = "USRP", .mfg_name = "GNU Radio", .version = "0.1", diff --git a/rigs/lowe/hf235.c b/rigs/lowe/hf235.c index 1f45eed73..cf6224b94 100644 --- a/rigs/lowe/hf235.c +++ b/rigs/lowe/hf235.c @@ -49,7 +49,7 @@ const struct rig_caps hf235_caps = { - .rig_model = RIG_MODEL_HF235, + RIG_MODEL(RIG_MODEL_HF235), .model_name = "HF-235", .mfg_name = "Lowe", .version = "0.4", diff --git a/rigs/pcr/pcr100.c b/rigs/pcr/pcr100.c index 8be1fee23..ba86351a9 100644 --- a/rigs/pcr/pcr100.c +++ b/rigs/pcr/pcr100.c @@ -59,7 +59,7 @@ static const struct pcr_priv_caps pcr100_priv = */ const struct rig_caps pcr100_caps = { - .rig_model = RIG_MODEL_PCR100, + RIG_MODEL(RIG_MODEL_PCR100), .model_name = "IC-PCR100", .mfg_name = "Icom", .version = BACKEND_VER, diff --git a/rigs/pcr/pcr1000.c b/rigs/pcr/pcr1000.c index 6d8020a62..8634ab54b 100644 --- a/rigs/pcr/pcr1000.c +++ b/rigs/pcr/pcr1000.c @@ -52,7 +52,7 @@ static const struct pcr_priv_caps pcr1000_priv = */ const struct rig_caps pcr1000_caps = { - .rig_model = RIG_MODEL_PCR1000, + RIG_MODEL(RIG_MODEL_PCR1000), .model_name = "IC-PCR1000", .mfg_name = "Icom", .version = BACKEND_VER, diff --git a/rigs/pcr/pcr1500.c b/rigs/pcr/pcr1500.c index 7712ab4fd..fa480073d 100644 --- a/rigs/pcr/pcr1500.c +++ b/rigs/pcr/pcr1500.c @@ -55,7 +55,7 @@ static const struct pcr_priv_caps pcr1500_priv = */ const struct rig_caps pcr1500_caps = { - .rig_model = RIG_MODEL_PCR1500, + RIG_MODEL(RIG_MODEL_PCR1500), .model_name = "IC-PCR1500", .mfg_name = "Icom", .version = BACKEND_VER, diff --git a/rigs/pcr/pcr2500.c b/rigs/pcr/pcr2500.c index f0d63f303..1c87b693d 100644 --- a/rigs/pcr/pcr2500.c +++ b/rigs/pcr/pcr2500.c @@ -64,7 +64,7 @@ static const struct pcr_priv_caps pcr2500_priv = */ const struct rig_caps pcr2500_caps = { - .rig_model = RIG_MODEL_PCR2500, + RIG_MODEL(RIG_MODEL_PCR2500), .model_name = "IC-PCR2500", .mfg_name = "Icom", .version = BACKEND_VER, diff --git a/rigs/prm80/prm8060.c b/rigs/prm80/prm8060.c index a785c29c0..d4e030027 100644 --- a/rigs/prm80/prm8060.c +++ b/rigs/prm80/prm8060.c @@ -50,7 +50,7 @@ */ const struct rig_caps prm8060_caps = { - .rig_model = RIG_MODEL_PRM8060, + RIG_MODEL(RIG_MODEL_PRM8060), .model_name = "PRM8060", .mfg_name = "Philips/Simoco", .version = "0.1", diff --git a/rigs/racal/ra3702.c b/rigs/racal/ra3702.c index a7f7b829e..59544e089 100644 --- a/rigs/racal/ra3702.c +++ b/rigs/racal/ra3702.c @@ -52,7 +52,7 @@ */ const struct rig_caps ra3702_caps = { - .rig_model = RIG_MODEL_RA3702, + RIG_MODEL(RIG_MODEL_RA3702), .model_name = "RA3702", .mfg_name = "Racal", .version = "0.1", diff --git a/rigs/racal/ra6790.c b/rigs/racal/ra6790.c index 3ee65cccd..32caaac85 100644 --- a/rigs/racal/ra6790.c +++ b/rigs/racal/ra6790.c @@ -49,7 +49,7 @@ */ const struct rig_caps ra6790_caps = { - .rig_model = RIG_MODEL_RA6790, + RIG_MODEL(RIG_MODEL_RA6790), .model_name = "RA6790/GM", .mfg_name = "Racal", .version = "0.1", diff --git a/rigs/rft/ekd500.c b/rigs/rft/ekd500.c index eb079e98c..3c7260831 100644 --- a/rigs/rft/ekd500.c +++ b/rigs/rft/ekd500.c @@ -51,7 +51,7 @@ const struct rig_caps ekd500_caps = { - .rig_model = RIG_MODEL_EKD500, + RIG_MODEL(RIG_MODEL_EKD500), .model_name = "EKD-500", .mfg_name = "RFT", .version = "0.4", diff --git a/rigs/rs/eb200.c b/rigs/rs/eb200.c index dcb7e304c..17b45c0af 100644 --- a/rigs/rs/eb200.c +++ b/rigs/rs/eb200.c @@ -70,7 +70,7 @@ const struct rig_caps eb200_caps = { - .rig_model = RIG_MODEL_EB200, + RIG_MODEL(RIG_MODEL_EB200), .model_name = "EB200", .mfg_name = "Rohde&Schwarz", .version = "0.1", diff --git a/rigs/rs/esmc.c b/rigs/rs/esmc.c index ffd1df985..54d39abca 100644 --- a/rigs/rs/esmc.c +++ b/rigs/rs/esmc.c @@ -64,7 +64,7 @@ const struct rig_caps esmc_caps = { - .rig_model = RIG_MODEL_ESMC, + RIG_MODEL(RIG_MODEL_ESMC), .model_name = "ESMC", .mfg_name = "Rohde&Schwarz", .version = "0.1", diff --git a/rigs/rs/xk2100.c b/rigs/rs/xk2100.c index d20c1e365..72a27d37b 100644 --- a/rigs/rs/xk2100.c +++ b/rigs/rs/xk2100.c @@ -72,7 +72,7 @@ const struct rig_caps xk2100_caps = { - .rig_model = RIG_MODEL_XK2100, + RIG_MODEL(RIG_MODEL_XK2100), .model_name = "XK2100", .mfg_name = "Rohde&Schwarz", .version = "0.8f", diff --git a/rigs/skanti/trp8000.c b/rigs/skanti/trp8000.c index dea8b1924..ad899fbce 100644 --- a/rigs/skanti/trp8000.c +++ b/rigs/skanti/trp8000.c @@ -51,7 +51,7 @@ */ const struct rig_caps trp8000_caps = { - .rig_model = RIG_MODEL_TRP8000, + RIG_MODEL(RIG_MODEL_TRP8000), .model_name = "TRP8000", .mfg_name = "Skanti", .version = "0.2", diff --git a/rigs/skanti/trp8255.c b/rigs/skanti/trp8255.c index af21d54f7..c7a559b03 100644 --- a/rigs/skanti/trp8255.c +++ b/rigs/skanti/trp8255.c @@ -86,7 +86,7 @@ static int cu_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op); */ const struct rig_caps trp8255_caps = { - .rig_model = RIG_MODEL_TRP8255, + RIG_MODEL(RIG_MODEL_TRP8255), .model_name = "TRP 8255 S R", .mfg_name = "Skanti", .version = "0.1", diff --git a/rigs/tapr/dsp10.c b/rigs/tapr/dsp10.c index 787a82b2d..265aa58a9 100644 --- a/rigs/tapr/dsp10.c +++ b/rigs/tapr/dsp10.c @@ -58,7 +58,7 @@ */ const struct rig_caps dsp10_caps = { - .rig_model = RIG_MODEL_DSP10, + RIG_MODEL(RIG_MODEL_DSP10), .model_name = "DSP-10", .mfg_name = "TAPR", .version = "0.2", diff --git a/rigs/tentec/argonaut.c b/rigs/tentec/argonaut.c index 5526959fe..b24572783 100644 --- a/rigs/tentec/argonaut.c +++ b/rigs/tentec/argonaut.c @@ -54,7 +54,7 @@ */ const struct rig_caps tt516_caps = { - .rig_model = RIG_MODEL_TT516, + RIG_MODEL(RIG_MODEL_TT516), .model_name = "TT-516 Argonaut V", .mfg_name = "Ten-Tec", .version = "0.2", diff --git a/rigs/tentec/jupiter.c b/rigs/tentec/jupiter.c index a63e06ecb..92f873899 100644 --- a/rigs/tentec/jupiter.c +++ b/rigs/tentec/jupiter.c @@ -129,7 +129,7 @@ static int tt538_set_func(RIG *rig, vfo_t vfo, setting_t func, int status); */ const struct rig_caps tt538_caps = { - .rig_model = RIG_MODEL_TT538, + RIG_MODEL(RIG_MODEL_TT538), .model_name = "TT-538 Jupiter", .mfg_name = "Ten-Tec", .version = "0.7", diff --git a/rigs/tentec/omnivii.c b/rigs/tentec/omnivii.c index 0622f7c80..2d6051609 100644 --- a/rigs/tentec/omnivii.c +++ b/rigs/tentec/omnivii.c @@ -126,7 +126,7 @@ static int tt588_set_ant(RIG *rig, vfo_t vfo, ant_t ant); */ const struct rig_caps tt588_caps = { - .rig_model = RIG_MODEL_TT588, + RIG_MODEL(RIG_MODEL_TT588), .model_name = "TT-588 Omni VII", .mfg_name = "Ten-Tec", .version = "0.5", diff --git a/rigs/tentec/orion.h b/rigs/tentec/orion.h index bc14c678b..7074efc8f 100644 --- a/rigs/tentec/orion.h +++ b/rigs/tentec/orion.h @@ -190,7 +190,7 @@ struct tt565_priv_data { * http://www.rfsquared.com/ */ const struct rig_caps tt565_caps = { -.rig_model = RIG_MODEL_TT565, +RIG_MODEL(RIG_MODEL_TT565), .model_name = "TT-565 Orion", .mfg_name = "Ten-Tec", .version = "0.6", @@ -407,7 +407,7 @@ const struct rig_caps tt565_caps = { * */ const struct rig_caps tt599_caps = { -.rig_model = RIG_MODEL_TT599, +RIG_MODEL(RIG_MODEL_TT599), .model_name = "TT-599 Eagle", .mfg_name = "Ten-Tec", .version = "0.5", diff --git a/rigs/tentec/paragon.c b/rigs/tentec/paragon.c index a0cdb8b5a..8319b53ec 100644 --- a/rigs/tentec/paragon.c +++ b/rigs/tentec/paragon.c @@ -99,7 +99,7 @@ static int tt585_get_status_data(RIG *rig); */ const struct rig_caps tt585_caps = { - .rig_model = RIG_MODEL_TT585, + RIG_MODEL(RIG_MODEL_TT585), .model_name = "TT-585 Paragon", .mfg_name = "Ten-Tec", .version = "0.3", diff --git a/rigs/tentec/pegasus.c b/rigs/tentec/pegasus.c index 9bcc18b52..870c93fd9 100644 --- a/rigs/tentec/pegasus.c +++ b/rigs/tentec/pegasus.c @@ -67,7 +67,7 @@ */ const struct rig_caps tt550_caps = { - .rig_model = RIG_MODEL_TT550, + RIG_MODEL(RIG_MODEL_TT550), .model_name = "TT-550", .mfg_name = "Ten-Tec", .version = "0.3", diff --git a/rigs/tentec/rx320.c b/rigs/tentec/rx320.c index e263d78ea..5cfce415d 100644 --- a/rigs/tentec/rx320.c +++ b/rigs/tentec/rx320.c @@ -72,7 +72,7 @@ */ const struct rig_caps rx320_caps = { - .rig_model = RIG_MODEL_RX320, + RIG_MODEL(RIG_MODEL_RX320), .model_name = "RX-320", .mfg_name = "Ten-Tec", .version = "0.6", diff --git a/rigs/tentec/rx331.c b/rigs/tentec/rx331.c index 252333ec3..6bdb30b76 100644 --- a/rigs/tentec/rx331.c +++ b/rigs/tentec/rx331.c @@ -96,7 +96,7 @@ static const char *rx331_get_info(RIG *rig); */ const struct rig_caps rx331_caps = { - .rig_model = RIG_MODEL_RX331, + RIG_MODEL(RIG_MODEL_RX331), .model_name = "RX-331", .mfg_name = "Ten-Tec", .version = "0.1", diff --git a/rigs/tentec/rx340.c b/rigs/tentec/rx340.c index 798904cde..167041cac 100644 --- a/rigs/tentec/rx340.c +++ b/rigs/tentec/rx340.c @@ -85,7 +85,7 @@ static const char *rx340_get_info(RIG *rig); */ const struct rig_caps rx340_caps = { - .rig_model = RIG_MODEL_RX340, + RIG_MODEL(RIG_MODEL_RX340), .model_name = "RX-340", .mfg_name = "Ten-Tec", .version = "0.3", diff --git a/rigs/tentec/rx350.c b/rigs/tentec/rx350.c index bfa6d391c..53ab37cc0 100644 --- a/rigs/tentec/rx350.c +++ b/rigs/tentec/rx350.c @@ -60,7 +60,7 @@ */ const struct rig_caps rx350_caps = { - .rig_model = RIG_MODEL_RX350, + RIG_MODEL(RIG_MODEL_RX350), .model_name = "RX-350", .mfg_name = "Ten-Tec", .version = "0.1", diff --git a/rigs/tuner/v4l.c b/rigs/tuner/v4l.c index d4f222e88..e691de701 100644 --- a/rigs/tuner/v4l.c +++ b/rigs/tuner/v4l.c @@ -71,7 +71,7 @@ static const char *v4l_get_info(RIG *rig); */ const struct rig_caps v4l_caps = { - .rig_model = RIG_MODEL_V4L, + RIG_MODEL(RIG_MODEL_V4L), .model_name = "SW/FM radio", .mfg_name = "Video4Linux", .version = "0.2.1", diff --git a/rigs/tuner/v4l2.c b/rigs/tuner/v4l2.c index 21f5b6b9d..497d6b300 100644 --- a/rigs/tuner/v4l2.c +++ b/rigs/tuner/v4l2.c @@ -71,7 +71,7 @@ static const char *v4l2_get_info(RIG *rig); */ const struct rig_caps v4l2_caps = { - .rig_model = RIG_MODEL_V4L2, + RIG_MODEL(RIG_MODEL_V4L2), .model_name = "SW/FM radio", .mfg_name = "Video4Linux2", .version = "0.2.1", diff --git a/rigs/uniden/bc245.c b/rigs/uniden/bc245.c index 03c92fbef..4894d3483 100644 --- a/rigs/uniden/bc245.c +++ b/rigs/uniden/bc245.c @@ -46,7 +46,7 @@ */ const struct rig_caps bc245_caps = { - .rig_model = RIG_MODEL_BC245, + RIG_MODEL(RIG_MODEL_BC245), .model_name = "BC245xlt", .mfg_name = "Uniden", .version = BACKEND_VER, diff --git a/rigs/uniden/bc250.c b/rigs/uniden/bc250.c index 66a9966c8..efc2dad6e 100644 --- a/rigs/uniden/bc250.c +++ b/rigs/uniden/bc250.c @@ -55,7 +55,7 @@ */ const struct rig_caps bc250_caps = { - .rig_model = RIG_MODEL_BC250, + RIG_MODEL(RIG_MODEL_BC250), .model_name = "BC250D", .mfg_name = "Uniden", .version = BACKEND_VER, diff --git a/rigs/uniden/bc780.c b/rigs/uniden/bc780.c index 022f961de..437591e51 100644 --- a/rigs/uniden/bc780.c +++ b/rigs/uniden/bc780.c @@ -55,7 +55,7 @@ */ const struct rig_caps bc780_caps = { - .rig_model = RIG_MODEL_BC780, + RIG_MODEL(RIG_MODEL_BC780), .model_name = "BC780xlt", .mfg_name = "Uniden", .version = BACKEND_VER, diff --git a/rigs/uniden/bc895.c b/rigs/uniden/bc895.c index 4401cac3a..453082dfc 100644 --- a/rigs/uniden/bc895.c +++ b/rigs/uniden/bc895.c @@ -61,7 +61,7 @@ */ const struct rig_caps bc895_caps = { - .rig_model = RIG_MODEL_BC895, + RIG_MODEL(RIG_MODEL_BC895), .model_name = "BC895xlt", .mfg_name = "Uniden", .version = BACKEND_VER, diff --git a/rigs/uniden/bc898.c b/rigs/uniden/bc898.c index e3d7f7e02..08526ef4c 100644 --- a/rigs/uniden/bc898.c +++ b/rigs/uniden/bc898.c @@ -72,7 +72,7 @@ static const tone_t bc898_ctcss_list[] = */ const struct rig_caps bc898_caps = { - .rig_model = RIG_MODEL_BC898, + RIG_MODEL(RIG_MODEL_BC898), .model_name = "BC898T", .mfg_name = "Uniden", .version = BACKEND_VER, diff --git a/rigs/uniden/bcd396t.c b/rigs/uniden/bcd396t.c index d177b778f..acf8b949e 100644 --- a/rigs/uniden/bcd396t.c +++ b/rigs/uniden/bcd396t.c @@ -53,7 +53,7 @@ */ const struct rig_caps bcd396t_caps = { - .rig_model = RIG_MODEL_BCD396T, + RIG_MODEL(RIG_MODEL_BCD396T), .model_name = "BCD-396T", .mfg_name = "Uniden", .version = BACKEND_DIGITAL_VER, diff --git a/rigs/uniden/bcd996t.c b/rigs/uniden/bcd996t.c index 46a78c555..ec50b0605 100644 --- a/rigs/uniden/bcd996t.c +++ b/rigs/uniden/bcd996t.c @@ -53,7 +53,7 @@ */ const struct rig_caps bcd996t_caps = { - .rig_model = RIG_MODEL_BCD996T, + RIG_MODEL(RIG_MODEL_BCD996T), .model_name = "BCD-996T", .mfg_name = "Uniden", .version = BACKEND_DIGITAL_VER, diff --git a/rigs/uniden/pro2052.c b/rigs/uniden/pro2052.c index dd3e2be68..59ef9d401 100644 --- a/rigs/uniden/pro2052.c +++ b/rigs/uniden/pro2052.c @@ -58,7 +58,7 @@ */ const struct rig_caps pro2052_caps = { - .rig_model = RIG_MODEL_PRO2052, + RIG_MODEL(RIG_MODEL_PRO2052), .model_name = "PRO-2052", .mfg_name = "Radio Shack", .version = BACKEND_VER, diff --git a/rigs/winradio/g303.c b/rigs/winradio/g303.c index 020642157..67dceb781 100644 --- a/rigs/winradio/g303.c +++ b/rigs/winradio/g303.c @@ -122,7 +122,7 @@ struct g3_priv_data const struct rig_caps g303_caps = { - .rig_model = RIG_MODEL_G303, + RIG_MODEL(RIG_MODEL_G303), .model_name = "WR-G303", .mfg_name = "Winradio", .version = "0.2.1", diff --git a/rigs/winradio/g305.c b/rigs/winradio/g305.c index 258edb1f7..7e2a56434 100644 --- a/rigs/winradio/g305.c +++ b/rigs/winradio/g305.c @@ -123,7 +123,7 @@ struct g3_priv_data const struct rig_caps g305_caps = { - .rig_model = RIG_MODEL_G305, + RIG_MODEL(RIG_MODEL_G305), .model_name = "WR-G305", .mfg_name = "Winradio", .version = "0.2.1", diff --git a/rigs/winradio/g313-posix.c b/rigs/winradio/g313-posix.c index ba230d3ee..378f01205 100644 --- a/rigs/winradio/g313-posix.c +++ b/rigs/winradio/g313-posix.c @@ -649,7 +649,7 @@ static void g313_spectrum_callback(float *buffer, int count, void *arg) const struct rig_caps g313_caps = { - .rig_model = RIG_MODEL_G313, + RIG_MODEL(RIG_MODEL_G313), .model_name = "WR-G313", .mfg_name = "Winradio", .version = "0.1", diff --git a/rigs/winradio/g313-win.c b/rigs/winradio/g313-win.c index ffd1ae43a..47221f0c5 100644 --- a/rigs/winradio/g313-win.c +++ b/rigs/winradio/g313-win.c @@ -161,7 +161,7 @@ struct g313_priv_data const struct rig_caps g313_caps = { - .rig_model = RIG_MODEL_G313, + RIG_MODEL(RIG_MODEL_G313), .model_name = "WR-G313", .mfg_name = "Winradio", .version = "0.1", diff --git a/rigs/winradio/wr1000.c b/rigs/winradio/wr1000.c index 037e0ddf7..c499b96c3 100644 --- a/rigs/winradio/wr1000.c +++ b/rigs/winradio/wr1000.c @@ -40,7 +40,7 @@ const struct rig_caps wr1000_caps = { - .rig_model = RIG_MODEL_WR1000, + RIG_MODEL(RIG_MODEL_WR1000), .model_name = "WR-1000", .mfg_name = "Winradio", .version = "0.6", diff --git a/rigs/winradio/wr1500.c b/rigs/winradio/wr1500.c index d6b565b66..b34234c35 100644 --- a/rigs/winradio/wr1500.c +++ b/rigs/winradio/wr1500.c @@ -39,7 +39,7 @@ const struct rig_caps wr1500_caps = { - .rig_model = RIG_MODEL_WR1500, + RIG_MODEL(RIG_MODEL_WR1500), .model_name = "WR-1500", .mfg_name = "Winradio", .version = "0.6", diff --git a/rigs/winradio/wr1550.c b/rigs/winradio/wr1550.c index 475ba3e3c..ff364efd8 100644 --- a/rigs/winradio/wr1550.c +++ b/rigs/winradio/wr1550.c @@ -39,7 +39,7 @@ const struct rig_caps wr1550_caps = { - .rig_model = RIG_MODEL_WR1550, + RIG_MODEL(RIG_MODEL_WR1550), .model_name = "WR-1550", .mfg_name = "Winradio", .version = "0.6", diff --git a/rigs/winradio/wr3100.c b/rigs/winradio/wr3100.c index f39c4e570..c91a4d4b9 100644 --- a/rigs/winradio/wr3100.c +++ b/rigs/winradio/wr3100.c @@ -39,7 +39,7 @@ const struct rig_caps wr3100_caps = { - .rig_model = RIG_MODEL_WR3100, + RIG_MODEL(RIG_MODEL_WR3100), .model_name = "WR-3100", .mfg_name = "Winradio", .version = "0.6", diff --git a/rigs/winradio/wr3150.c b/rigs/winradio/wr3150.c index c39fc17be..b3d4c9e57 100644 --- a/rigs/winradio/wr3150.c +++ b/rigs/winradio/wr3150.c @@ -39,7 +39,7 @@ const struct rig_caps wr3150_caps = { - .rig_model = RIG_MODEL_WR3150, + RIG_MODEL(RIG_MODEL_WR3150), .model_name = "WR-3150", .mfg_name = "Winradio", .version = "0.6", diff --git a/rigs/winradio/wr3500.c b/rigs/winradio/wr3500.c index e8e29232f..b08fbf681 100644 --- a/rigs/winradio/wr3500.c +++ b/rigs/winradio/wr3500.c @@ -39,7 +39,7 @@ const struct rig_caps wr3500_caps = { - .rig_model = RIG_MODEL_WR3500, + RIG_MODEL(RIG_MODEL_WR3500), .model_name = "WR-3500", .mfg_name = "Winradio", .version = "0.6", diff --git a/rigs/winradio/wr3700.c b/rigs/winradio/wr3700.c index bbaf2ad0f..987437096 100644 --- a/rigs/winradio/wr3700.c +++ b/rigs/winradio/wr3700.c @@ -39,7 +39,7 @@ const struct rig_caps wr3700_caps = { - .rig_model = RIG_MODEL_WR3700, + RIG_MODEL(RIG_MODEL_WR3700), .model_name = "WR-3700", .mfg_name = "Winradio", .version = "0.6", diff --git a/rigs/wj/wj8888.c b/rigs/wj/wj8888.c index a5a0b82ba..f365494f8 100644 --- a/rigs/wj/wj8888.c +++ b/rigs/wj/wj8888.c @@ -56,7 +56,7 @@ */ const struct rig_caps wj8888_caps = { - .rig_model = RIG_MODEL_WJ8888, + RIG_MODEL(RIG_MODEL_WJ8888), .model_name = "WJ-8888", .mfg_name = "Watkins-Johnson", .version = "0.2", diff --git a/rigs/yaesu/frg100.c b/rigs/yaesu/frg100.c index 686cbeecf..071e6fbfa 100644 --- a/rigs/yaesu/frg100.c +++ b/rigs/yaesu/frg100.c @@ -121,7 +121,7 @@ static int mode2rig(RIG *rig, rmode_t mode, pbwidth_t width); const struct rig_caps frg100_caps = { - .rig_model = RIG_MODEL_FRG100, + RIG_MODEL(RIG_MODEL_FRG100), .model_name = "FRG-100", .mfg_name = "Yaesu", .version = "0.5", diff --git a/rigs/yaesu/frg8800.c b/rigs/yaesu/frg8800.c index 798f32245..1e895c722 100644 --- a/rigs/yaesu/frg8800.c +++ b/rigs/yaesu/frg8800.c @@ -59,7 +59,7 @@ static int frg8800_set_powerstat(RIG *rig, powerstat_t status); const struct rig_caps frg8800_caps = { - .rig_model = RIG_MODEL_FRG8800, + RIG_MODEL(RIG_MODEL_FRG8800), .model_name = "FRG-8800", .mfg_name = "Yaesu", .version = "0.2", diff --git a/rigs/yaesu/frg9600.c b/rigs/yaesu/frg9600.c index d23167574..ddf40d719 100644 --- a/rigs/yaesu/frg9600.c +++ b/rigs/yaesu/frg9600.c @@ -54,7 +54,7 @@ static int frg9600_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width); const struct rig_caps frg9600_caps = { - .rig_model = RIG_MODEL_FRG9600, + RIG_MODEL(RIG_MODEL_FRG9600), .model_name = "FRG-9600", .mfg_name = "Yaesu", .version = "0.2", diff --git a/rigs/yaesu/ft100.c b/rigs/yaesu/ft100.c index dd067cc40..d963d3804 100644 --- a/rigs/yaesu/ft100.c +++ b/rigs/yaesu/ft100.c @@ -172,7 +172,7 @@ static const tone_t ft100_dcs_list[] = const struct rig_caps ft100_caps = { - .rig_model = RIG_MODEL_FT100, + RIG_MODEL(RIG_MODEL_FT100), .model_name = "FT-100", .mfg_name = "Yaesu", .version = "0.4.1", diff --git a/rigs/yaesu/ft1000d.c b/rigs/yaesu/ft1000d.c index 16a5e9921..7090c4c77 100644 --- a/rigs/yaesu/ft1000d.c +++ b/rigs/yaesu/ft1000d.c @@ -155,7 +155,7 @@ struct ft1000d_priv_data const struct rig_caps ft1000d_caps = { - .rig_model = RIG_MODEL_FT1000D, + RIG_MODEL(RIG_MODEL_FT1000D), .model_name = "FT-1000D", .mfg_name = "Yaesu", .version = "0.1.2", diff --git a/rigs/yaesu/ft1000mp.c b/rigs/yaesu/ft1000mp.c index aff157fee..27d0efb75 100644 --- a/rigs/yaesu/ft1000mp.c +++ b/rigs/yaesu/ft1000mp.c @@ -210,7 +210,7 @@ struct ft1000mp_priv_data const struct rig_caps ft1000mp_caps = { - .rig_model = RIG_MODEL_FT1000MP, + RIG_MODEL(RIG_MODEL_FT1000MP), .model_name = "FT-1000MP", .mfg_name = "Yaesu", .version = "0.1.1", @@ -336,7 +336,7 @@ const struct rig_caps ft1000mp_caps = const struct rig_caps ft1000mpmkv_caps = { - .rig_model = RIG_MODEL_FT1000MPMKV, + RIG_MODEL(RIG_MODEL_FT1000MPMKV), .model_name = "MARK-V FT-1000MP", .mfg_name = "Yaesu", .version = "0.0.5", @@ -462,7 +462,7 @@ const struct rig_caps ft1000mpmkv_caps = const struct rig_caps ft1000mpmkvfld_caps = { - .rig_model = RIG_MODEL_FT1000MPMKVFLD, + RIG_MODEL(RIG_MODEL_FT1000MPMKVFLD), .model_name = "MARK-V Field FT-1000MP", .mfg_name = "Yaesu", .version = "0.0.5", diff --git a/rigs/yaesu/ft1200.c b/rigs/yaesu/ft1200.c index 8ef160f32..16b6d80b7 100644 --- a/rigs/yaesu/ft1200.c +++ b/rigs/yaesu/ft1200.c @@ -49,7 +49,7 @@ const struct rig_caps ft1200_caps = { - .rig_model = RIG_MODEL_FT1200, + RIG_MODEL(RIG_MODEL_FT1200), .model_name = "FT-1200", .mfg_name = "Yaesu", .version = NEWCAT_VER ".1", diff --git a/rigs/yaesu/ft2000.c b/rigs/yaesu/ft2000.c index fffecb564..8c44a60bb 100644 --- a/rigs/yaesu/ft2000.c +++ b/rigs/yaesu/ft2000.c @@ -48,7 +48,7 @@ const struct rig_caps ft2000_caps = { - .rig_model = RIG_MODEL_FT2000, + RIG_MODEL(RIG_MODEL_FT2000), .model_name = "FT-2000", .mfg_name = "Yaesu", .version = NEWCAT_VER ".1", diff --git a/rigs/yaesu/ft450.c b/rigs/yaesu/ft450.c index 397441717..cb99edc2e 100644 --- a/rigs/yaesu/ft450.c +++ b/rigs/yaesu/ft450.c @@ -47,7 +47,7 @@ const struct rig_caps ft450_caps = { - .rig_model = RIG_MODEL_FT450, + RIG_MODEL(RIG_MODEL_FT450), .model_name = "FT-450", .mfg_name = "Yaesu", .version = NEWCAT_VER ".1", diff --git a/rigs/yaesu/ft5000.c b/rigs/yaesu/ft5000.c index 15e706975..3b302c4a3 100644 --- a/rigs/yaesu/ft5000.c +++ b/rigs/yaesu/ft5000.c @@ -48,7 +48,7 @@ const struct rig_caps ftdx5000_caps = { - .rig_model = RIG_MODEL_FTDX5000, + RIG_MODEL(RIG_MODEL_FTDX5000), .model_name = "FT-DX5000", .mfg_name = "Yaesu", .version = NEWCAT_VER, @@ -220,7 +220,7 @@ const struct rig_caps ftdx5000_caps = const struct rig_caps ftdx3000_caps = { - .rig_model = RIG_MODEL_FTDX3000, + RIG_MODEL(RIG_MODEL_FTDX3000), .model_name = "FT-DX3000", .mfg_name = "Yaesu", .version = NEWCAT_VER ".1", @@ -383,7 +383,7 @@ const struct rig_caps ftdx3000_caps = const struct rig_caps ftdx101d_caps = { - .rig_model = RIG_MODEL_FTDX101D, + RIG_MODEL(RIG_MODEL_FTDX101D), .model_name = "FT-DX101D", .mfg_name = "Yaesu", .version = NEWCAT_VER ".1", diff --git a/rigs/yaesu/ft600.c b/rigs/yaesu/ft600.c index 740e6abec..3a9061799 100644 --- a/rigs/yaesu/ft600.c +++ b/rigs/yaesu/ft600.c @@ -133,7 +133,7 @@ static const yaesu_cmd_set_t ncmd[] = const struct rig_caps ft600_caps = { - .rig_model = RIG_MODEL_FT600, + RIG_MODEL(RIG_MODEL_FT600), .model_name = "FT-600", .mfg_name = "Yaesu", .version = "0.2", diff --git a/rigs/yaesu/ft736.c b/rigs/yaesu/ft736.c index 5ad632c11..0763a9221 100644 --- a/rigs/yaesu/ft736.c +++ b/rigs/yaesu/ft736.c @@ -99,7 +99,7 @@ static const tone_t ft736_ctcss_list[] = const struct rig_caps ft736_caps = { - .rig_model = RIG_MODEL_FT736R, + RIG_MODEL(RIG_MODEL_FT736R), .model_name = "FT-736R", .mfg_name = "Yaesu", .version = "0.3", diff --git a/rigs/yaesu/ft747.c b/rigs/yaesu/ft747.c index 3f98bf71b..712b3176e 100644 --- a/rigs/yaesu/ft747.c +++ b/rigs/yaesu/ft747.c @@ -164,7 +164,7 @@ struct ft747_priv_data const struct rig_caps ft747_caps = { - .rig_model = RIG_MODEL_FT747, + RIG_MODEL(RIG_MODEL_FT747), .model_name = "FT-747GX", .mfg_name = "Yaesu", .version = "0.4.1", diff --git a/rigs/yaesu/ft757gx.c b/rigs/yaesu/ft757gx.c index 6cdafab12..8593221eb 100644 --- a/rigs/yaesu/ft757gx.c +++ b/rigs/yaesu/ft757gx.c @@ -89,7 +89,7 @@ const struct confparams ft757gx_cfg_params[] = */ const struct rig_caps ft757gx_caps = { - .rig_model = RIG_MODEL_FT757, + RIG_MODEL(RIG_MODEL_FT757), .model_name = "FT-757GX", .mfg_name = "Yaesu", .version = "0.5.0", @@ -200,7 +200,7 @@ const struct rig_caps ft757gx_caps = */ const struct rig_caps ft757gx2_caps = { - .rig_model = RIG_MODEL_FT757GXII, + RIG_MODEL(RIG_MODEL_FT757GXII), .model_name = "FT-757GXII", .mfg_name = "Yaesu", .version = "0.4", diff --git a/rigs/yaesu/ft767gx.c b/rigs/yaesu/ft767gx.c index 2e4082d85..0879d23c9 100644 --- a/rigs/yaesu/ft767gx.c +++ b/rigs/yaesu/ft767gx.c @@ -260,7 +260,7 @@ const tone_t static_767gx_ctcss_list[] = const struct rig_caps ft767gx_caps = { - .rig_model = RIG_MODEL_FT767, + RIG_MODEL(RIG_MODEL_FT767), .model_name = "FT-767GX", .mfg_name = "Yaesu", .version = "1.1", diff --git a/rigs/yaesu/ft817.c b/rigs/yaesu/ft817.c index 8cc9dfcc8..7e4f33256 100644 --- a/rigs/yaesu/ft817.c +++ b/rigs/yaesu/ft817.c @@ -161,7 +161,7 @@ enum ft817_digi const struct rig_caps ft817_caps = { - .rig_model = RIG_MODEL_FT817, + RIG_MODEL(RIG_MODEL_FT817), .model_name = "FT-817", .mfg_name = "Yaesu", .version = "0.6.0", diff --git a/rigs/yaesu/ft840.c b/rigs/yaesu/ft840.c index a9d7fc48a..4a548b22a 100644 --- a/rigs/yaesu/ft840.c +++ b/rigs/yaesu/ft840.c @@ -215,7 +215,7 @@ struct ft840_priv_data const struct rig_caps ft840_caps = { - .rig_model = RIG_MODEL_FT840, + RIG_MODEL(RIG_MODEL_FT840), .model_name = "FT-840", .mfg_name = "Yaesu", .version = "0.1", diff --git a/rigs/yaesu/ft847.c b/rigs/yaesu/ft847.c index b7744b8d8..7e6667081 100644 --- a/rigs/yaesu/ft847.c +++ b/rigs/yaesu/ft847.c @@ -211,7 +211,7 @@ static const tone_t ft847_ctcss_list[] = const struct rig_caps ft847_caps = { - .rig_model = RIG_MODEL_FT847, + RIG_MODEL(RIG_MODEL_FT847), .model_name = "FT-847", .mfg_name = "Yaesu", .version = "0.5", @@ -366,7 +366,7 @@ const struct rig_caps ft847_caps = const struct rig_caps ft847uni_caps = { - .rig_model = RIG_MODEL_FT847UNI, + RIG_MODEL(RIG_MODEL_FT847UNI), .model_name = "FT-847UNI", .mfg_name = "Yaesu", .version = "0.1b", diff --git a/rigs/yaesu/ft857.c b/rigs/yaesu/ft857.c index acd9f1d28..05cd9b066 100644 --- a/rigs/yaesu/ft857.c +++ b/rigs/yaesu/ft857.c @@ -150,7 +150,7 @@ static int ft857_send_icmd(RIG *rig, int index, unsigned char *data); const struct rig_caps ft857_caps = { - .rig_model = RIG_MODEL_FT857, + RIG_MODEL(RIG_MODEL_FT857), .model_name = "FT-857", .mfg_name = "Yaesu", .version = "0.6", diff --git a/rigs/yaesu/ft890.c b/rigs/yaesu/ft890.c index d5e1517a9..6e767be0b 100644 --- a/rigs/yaesu/ft890.c +++ b/rigs/yaesu/ft890.c @@ -153,7 +153,7 @@ struct ft890_priv_data const struct rig_caps ft890_caps = { - .rig_model = RIG_MODEL_FT890, + RIG_MODEL(RIG_MODEL_FT890), .model_name = "FT-890", .mfg_name = "Yaesu", .version = "0.1", diff --git a/rigs/yaesu/ft891.c b/rigs/yaesu/ft891.c index 189c594f6..c6daff88f 100644 --- a/rigs/yaesu/ft891.c +++ b/rigs/yaesu/ft891.c @@ -52,7 +52,7 @@ const struct rig_caps ft891_caps = { - .rig_model = RIG_MODEL_FT891, + RIG_MODEL(RIG_MODEL_FT891), .model_name = "FT-891", .mfg_name = "Yaesu", .version = NEWCAT_VER ".2", diff --git a/rigs/yaesu/ft897.c b/rigs/yaesu/ft897.c index 6f16268c6..fc3ea0b3f 100644 --- a/rigs/yaesu/ft897.c +++ b/rigs/yaesu/ft897.c @@ -187,7 +187,7 @@ enum ft897_digi const struct rig_caps ft897_caps = { - .rig_model = RIG_MODEL_FT897, + RIG_MODEL(RIG_MODEL_FT897), .model_name = "FT-897", .mfg_name = "Yaesu", .version = "0.3.3", diff --git a/rigs/yaesu/ft900.c b/rigs/yaesu/ft900.c index 27187a15f..9019aba50 100644 --- a/rigs/yaesu/ft900.c +++ b/rigs/yaesu/ft900.c @@ -155,7 +155,7 @@ struct ft900_priv_data const struct rig_caps ft900_caps = { - .rig_model = RIG_MODEL_FT900, + RIG_MODEL(RIG_MODEL_FT900), .model_name = "FT-900", .mfg_name = "Yaesu", .version = "0.3", diff --git a/rigs/yaesu/ft9000.c b/rigs/yaesu/ft9000.c index eed06401d..dd396e5dd 100644 --- a/rigs/yaesu/ft9000.c +++ b/rigs/yaesu/ft9000.c @@ -48,7 +48,7 @@ const struct rig_caps ft9000_caps = { - .rig_model = RIG_MODEL_FT9000, + RIG_MODEL(RIG_MODEL_FT9000), .model_name = "FTDX-9000", .mfg_name = "Yaesu", .version = NEWCAT_VER ".1", diff --git a/rigs/yaesu/ft920.c b/rigs/yaesu/ft920.c index e8260f855..863fd546e 100644 --- a/rigs/yaesu/ft920.c +++ b/rigs/yaesu/ft920.c @@ -148,7 +148,7 @@ struct ft920_priv_data const struct rig_caps ft920_caps = { - .rig_model = RIG_MODEL_FT920, + RIG_MODEL(RIG_MODEL_FT920), .model_name = "FT-920", .mfg_name = "Yaesu", .version = "2010-08-23", /* YYYY-MM-DD */ diff --git a/rigs/yaesu/ft950.c b/rigs/yaesu/ft950.c index c31193d24..e4fe4681e 100644 --- a/rigs/yaesu/ft950.c +++ b/rigs/yaesu/ft950.c @@ -47,7 +47,7 @@ const struct rig_caps ft950_caps = { - .rig_model = RIG_MODEL_FT950, + RIG_MODEL(RIG_MODEL_FT950), .model_name = "FT-950", .mfg_name = "Yaesu", .version = NEWCAT_VER ".2", diff --git a/rigs/yaesu/ft980.c b/rigs/yaesu/ft980.c index febd73869..3af9c52d1 100644 --- a/rigs/yaesu/ft980.c +++ b/rigs/yaesu/ft980.c @@ -157,7 +157,7 @@ static int ft980_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t offs); const struct rig_caps ft980_caps = { - .rig_model = RIG_MODEL_FT980, + RIG_MODEL(RIG_MODEL_FT980), .model_name = "FT-980", .mfg_name = "Yaesu", .version = "0.1", diff --git a/rigs/yaesu/ft990.c b/rigs/yaesu/ft990.c index 5f647ca5a..16ae2bd9d 100644 --- a/rigs/yaesu/ft990.c +++ b/rigs/yaesu/ft990.c @@ -144,7 +144,7 @@ struct ft990_priv_data const struct rig_caps ft990_caps = { - .rig_model = RIG_MODEL_FT990, + RIG_MODEL(RIG_MODEL_FT990), .model_name = "FT-990", .mfg_name = "Yaesu", .version = "0.3.0", diff --git a/rigs/yaesu/ft991.c b/rigs/yaesu/ft991.c index 35d9278a3..d03c46ae7 100644 --- a/rigs/yaesu/ft991.c +++ b/rigs/yaesu/ft991.c @@ -52,7 +52,7 @@ const struct rig_caps ft991_caps = { - .rig_model = RIG_MODEL_FT991, + RIG_MODEL(RIG_MODEL_FT991), .model_name = "FT-991", .mfg_name = "Yaesu", .version = NEWCAT_VER ".9", diff --git a/rigs/yaesu/vr5000.c b/rigs/yaesu/vr5000.c index 0ab198ea1..c9295ce52 100644 --- a/rigs/yaesu/vr5000.c +++ b/rigs/yaesu/vr5000.c @@ -129,7 +129,7 @@ static int check_tuning_step(RIG *rig, vfo_t vfo, rmode_t mode, const struct rig_caps vr5000_caps = { - .rig_model = RIG_MODEL_VR5000, + RIG_MODEL(RIG_MODEL_VR5000), .model_name = "VR-5000", .mfg_name = "Yaesu", .version = "0.3", diff --git a/rigs/yaesu/vx1700.c b/rigs/yaesu/vx1700.c index a8c0e25de..be5f2f7f4 100644 --- a/rigs/yaesu/vx1700.c +++ b/rigs/yaesu/vx1700.c @@ -101,7 +101,7 @@ struct vx1700_priv_data const struct rig_caps vx1700_caps = { - .rig_model = RIG_MODEL_VX1700, + RIG_MODEL(RIG_MODEL_VX1700), .model_name = "VX-1700", .mfg_name = "Vertex Standard", .version = "1.1", diff --git a/src/rig.c b/src/rig.c index ebfd3d53e..98990c1e8 100644 --- a/src/rig.c +++ b/src/rig.c @@ -4560,7 +4560,7 @@ int HAMLIB_API rig_send_voice_mem(RIG *rig, vfo_t vfo, int ch) * otherwise NULL if not found or if \a range_list is invalid. * */ -const freq_range_t *HAMLIB_API rig_get_range(const freq_range_t range_list[], +const freq_range_t *HAMLIB_API rig_get_range(const freq_range_t *range_list, freq_t freq, rmode_t mode) { diff --git a/tests/listrigs.c b/tests/listrigs.c index 496c74746..48b390b2d 100644 --- a/tests/listrigs.c +++ b/tests/listrigs.c @@ -30,56 +30,56 @@ int print_caps_sum(const struct rig_caps *caps, void *data) { - printf("%d\t%-10s\t%-12s\t%s\t", + printf("%d\t%-10s\t%-14s\t%-8s\t", caps->rig_model, caps->mfg_name, caps->model_name, caps->version); - printf("%-10s\t", rig_strstatus(caps->status)); + printf("%.10s\t", rig_strstatus(caps->status)); switch (caps->rig_type & RIG_TYPE_MASK) { case RIG_TYPE_TRANSCEIVER: - printf("Transceiver\n"); + printf("%.16s\t","Transceiver"); break; case RIG_TYPE_HANDHELD: - printf("Handheld\n"); + printf("%.16s\t","Handheld"); break; case RIG_TYPE_MOBILE: - printf("Mobile\n"); + printf("%.16s\t","Mobile"); break; case RIG_TYPE_RECEIVER: - printf("Receiver\n"); + printf("%.16s\t","Receiver"); break; case RIG_TYPE_PCRECEIVER: - printf("PC Receiver\n"); + printf("%.16s\t","PC Receiver"); break; case RIG_TYPE_SCANNER: - printf("Scanner\n"); + printf("%.16s\t","Scanner"); break; case RIG_TYPE_TRUNKSCANNER: - printf("Trunking scanner\n"); + printf("%.16s\t","Trunking scanner"); break; case RIG_TYPE_COMPUTER: - printf("Computer\n"); + printf("%.16s\t","Computer"); break; case RIG_TYPE_OTHER: - printf("Other\n"); + printf("%.16s\t","Other"); break; default: - printf("Unknown\n"); + printf("%.16s\t","Unknown"); } - + printf("%s\n",caps->rig_model_macro_name==NULL?"Unknown":caps->rig_model_macro_name); return -1; /* !=0, we want them all ! */ } @@ -90,7 +90,7 @@ int main(int argc, char *argv[]) rig_load_all_backends(); - printf("Rig#\tMfg \tModel \tVers.\tStatus \tType\n"); + printf("Rig#\tMfg \tModel \tVers. \tStatus \tType \tMacro\n"); status = rig_list_foreach(print_caps_sum, NULL); diff --git a/tests/rigmatrix.c b/tests/rigmatrix.c index b7c72a164..f870ff07a 100644 --- a/tests/rigmatrix.c +++ b/tests/rigmatrix.c @@ -801,7 +801,7 @@ int main(int argc, char *argv[]) printf("

"); time(&gentime); - printf("Rigmatrix generated %s by %s\n", ctime(&gentime), getenv("USER")); + printf("Rigmatrix generated %s\n", ctime(&gentime)); printf("\n");