From 3d613519d52b8520d7a66f03389b2a2b3abf0c0a Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Sat, 6 Mar 2021 12:37:53 -0600 Subject: [PATCH] Rename macros to avoid collisions with other software --- c++/rigclass.cc | 4 +- include/hamlib/rig.h | 82 +++++++++++++++++++-------------------- macros/ax_python_devel.m4 | 2 + rigs/aor/aor.c | 8 ++-- rigs/aor/sr2200.c | 6 +-- rigs/dummy/netrigctl.c | 16 ++++---- rigs/elad/elad.c | 8 ++-- rigs/flexradio/dttsp.c | 4 +- rigs/icom/icom.c | 16 ++++---- rigs/kenwood/k3.c | 4 +- rigs/kenwood/kenwood.c | 8 ++-- rigs/kenwood/pihpsdr.c | 4 +- rigs/kenwood/thg71.c | 2 +- rigs/kenwood/tmd710.c | 2 +- rigs/kenwood/ts570.c | 4 +- rigs/kenwood/ts870s.c | 2 +- rigs/kit/hiqsdr.c | 2 +- rigs/tentec/orion.c | 2 +- rigs/tuner/v4l.c | 2 +- rigs/tuner/v4l2.c | 2 +- rigs/winradio/winradio.c | 2 +- rigs/yaesu/newcat.c | 10 ++--- rigs/yaesu/vr5000.c | 4 +- src/amp_conf.c | 2 +- src/amplifier.c | 6 +-- src/conf.c | 26 ++++++------- src/gpio.c | 4 +- src/mem.c | 10 ++--- src/rig.c | 60 ++++++++++++++-------------- src/rot_conf.c | 2 +- src/rotator.c | 8 ++-- src/sprintflst.c | 10 ++--- 32 files changed, 163 insertions(+), 161 deletions(-) diff --git a/c++/rigclass.cc b/c++/rigclass.cc index ee8c8fd66..ad778e814 100644 --- a/c++/rigclass.cc +++ b/c++/rigclass.cc @@ -673,7 +673,7 @@ rmode_t Rig::RngRxModes (freq_t freq) unsigned modes = RIG_MODE_NONE; int i; - for (i=0; istate.rx_range_list[i]; if (RIG_IS_FRNG_END(*rng)) { return (rmode_t)modes; @@ -690,7 +690,7 @@ rmode_t Rig::RngTxModes (freq_t freq) unsigned modes = RIG_MODE_NONE; int i; - for (i=0; istate.tx_range_list[i]; if (RIG_IS_FRNG_END(*rng)) { return (rmode_t)modes; diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h index cc6a0f0bc..4afde0d4f 100644 --- a/include/hamlib/rig.h +++ b/include/hamlib/rig.h @@ -176,21 +176,21 @@ struct rig_state; typedef struct s_rig RIG; //! @cond Doxygen_Suppress -#define RIGNAMSIZ 30 -#define RIGVERSIZ 8 -#define FILPATHLEN 512 -#define FRQRANGESIZ 30 -#define MAXCHANDESC 30 /* describe channel eg: "WWV 5Mhz" */ -#define TSLSTSIZ 20 /* max tuning step list size, zero ended */ -#define FLTLSTSIZ 60 /* max mode/filter list size, zero ended */ -#define MAXDBLSTSIZ 8 /* max preamp/att levels supported, zero ended */ -#define CHANLSTSIZ 16 /* max mem_list size, zero ended */ -#define MAX_CAL_LENGTH 32 /* max calibration plots in cal_table_t */ -#define MAX_MODES 63 -#define MAX_VFOS 31 -#define MAX_ROTORS 63 -#define MAX_VFO_OPS 31 -#define MAX_RSCANS 31 +#define HAMLIB_RIGNAMSIZ 30 +#define HAMLIB_RIGVERSIZ 8 +#define HAMLIB_FILPATHLEN 512 +#define HAMLIB_FRQRANGESIZ 30 +#define HAMLIB_MAXCHANDESC 30 /* describe channel eg: "WWV 5Mhz" */ +#define HAMLIB_TSLSTSIZ 20 /* max tuning step list size, zero ended */ +#define HAMLIB_FLTLSTSIZ 60 /* max mode/filter list size, zero ended */ +#define HAMLIB_MAXDBLSTSIZ 8 /* max preamp/att levels supported, zero ended */ +#define HAMLIB_CHANLSTSIZ 16 /* max mem_list size, zero ended */ +#define HAMLIB_MAX_CAL_LENGTH 32 /* max calibration plots in cal_table_t */ +#define HAMLIB_MAX_MODES 63 +#define HAMLIB_MAX_VFOS 31 +#define HAMLIB_MAX_ROTORS 63 +#define HAMLIB_MAX_VFO_OPS 31 +#define HAMLIB_MAX_RSCANS 31 //! @endcond @@ -1363,7 +1363,7 @@ struct channel { tone_t dcs_sql; /*!< DCS squelch code */ int scan_group; /*!< Scan group */ unsigned int flags; /*!< Channel flags, see RIG_CHFLAG's */ - char channel_desc[MAXCHANDESC]; /*!< Name */ + char channel_desc[HAMLIB_MAXCHANDESC]; /*!< Name */ struct ext_list *ext_levels; /*!< Extension level value list, NULL ended. ext_levels can be NULL */ }; @@ -1505,7 +1505,7 @@ struct cal_table { struct { int raw; /*!< raw (A/D) value, as returned by \a RIG_LEVEL_RAWSTR */ int val; /*!< associated value, basically the measured dB value */ - } table[MAX_CAL_LENGTH]; /*!< table of plots */ + } table[HAMLIB_MAX_CAL_LENGTH]; /*!< table of plots */ }; /** @@ -1535,7 +1535,7 @@ struct cal_table_float { struct { int raw; /*!< raw (A/D) value */ float val; /*!< associated value */ - } table[MAX_CAL_LENGTH]; /*!< table of plots */ + } table[HAMLIB_MAX_CAL_LENGTH]; /*!< table of plots */ }; /** @@ -1627,8 +1627,8 @@ struct rig_caps { const tone_t *ctcss_list; /*!< CTCSS tones list, zero ended */ const tone_t *dcs_list; /*!< DCS code list, zero ended */ - int preamp[MAXDBLSTSIZ]; /*!< Preamp list in dB, 0 terminated */ - int attenuator[MAXDBLSTSIZ]; /*!< Preamp list in dB, 0 terminated */ + int preamp[HAMLIB_MAXDBLSTSIZ]; /*!< Preamp list in dB, 0 terminated */ + int attenuator[HAMLIB_MAXDBLSTSIZ]; /*!< Preamp list in dB, 0 terminated */ shortfreq_t max_rit; /*!< max absolute RIT */ shortfreq_t max_xit; /*!< max absolute XIT */ shortfreq_t max_ifshift; /*!< max absolute IF-SHIFT */ @@ -1643,25 +1643,25 @@ struct rig_caps { int bank_qty; /*!< Number of banks */ int chan_desc_sz; /*!< Max length of memory channel name */ - chan_t chan_list[CHANLSTSIZ]; /*!< Channel list, zero ended */ + chan_t chan_list[HAMLIB_CHANLSTSIZ]; /*!< Channel list, zero ended */ // As of 2020-02-12 we know of 5 models from Icom USA, EUR, ITR, TPE, KOR for the IC-9700 // So we currently have 5 ranges we need to deal with // The backend for the model should fill in the label field to explain what model it is // The the IC-9700 in ic7300.c for an example - freq_range_t rx_range_list1[FRQRANGESIZ]; /*!< Receive frequency range list #1 */ - freq_range_t tx_range_list1[FRQRANGESIZ]; /*!< Transmit frequency range list #1 */ - freq_range_t rx_range_list2[FRQRANGESIZ]; /*!< Receive frequency range list #2 */ - freq_range_t tx_range_list2[FRQRANGESIZ]; /*!< Transmit frequency range list #2 */ - freq_range_t rx_range_list3[FRQRANGESIZ]; /*!< Receive frequency range list #3 */ - freq_range_t tx_range_list3[FRQRANGESIZ]; /*!< Transmit frequency range list #3 */ - freq_range_t rx_range_list4[FRQRANGESIZ]; /*!< Receive frequency range list #4 */ - freq_range_t tx_range_list4[FRQRANGESIZ]; /*!< Transmit frequency range list #4 */ - freq_range_t rx_range_list5[FRQRANGESIZ]; /*!< Receive frequency range list #5 */ - freq_range_t tx_range_list5[FRQRANGESIZ]; /*!< Transmit frequency range list #5 */ + freq_range_t rx_range_list1[HAMLIB_FRQRANGESIZ]; /*!< Receive frequency range list #1 */ + freq_range_t tx_range_list1[HAMLIB_FRQRANGESIZ]; /*!< Transmit frequency range list #1 */ + freq_range_t rx_range_list2[HAMLIB_FRQRANGESIZ]; /*!< Receive frequency range list #2 */ + freq_range_t tx_range_list2[HAMLIB_FRQRANGESIZ]; /*!< Transmit frequency range list #2 */ + freq_range_t rx_range_list3[HAMLIB_FRQRANGESIZ]; /*!< Receive frequency range list #3 */ + freq_range_t tx_range_list3[HAMLIB_FRQRANGESIZ]; /*!< Transmit frequency range list #3 */ + freq_range_t rx_range_list4[HAMLIB_FRQRANGESIZ]; /*!< Receive frequency range list #4 */ + freq_range_t tx_range_list4[HAMLIB_FRQRANGESIZ]; /*!< Transmit frequency range list #4 */ + freq_range_t rx_range_list5[HAMLIB_FRQRANGESIZ]; /*!< Receive frequency range list #5 */ + freq_range_t tx_range_list5[HAMLIB_FRQRANGESIZ]; /*!< Transmit frequency range list #5 */ - struct tuning_step_list tuning_steps[TSLSTSIZ]; /*!< Tuning step list */ - struct filter_list filters[FLTLSTSIZ]; /*!< mode/filter table, at -6dB */ + struct tuning_step_list tuning_steps[HAMLIB_TSLSTSIZ]; /*!< Tuning step list */ + struct filter_list filters[HAMLIB_FLTLSTSIZ]; /*!< mode/filter table, at -6dB */ cal_table_t str_cal; /*!< S-meter calibration table */ cal_table_float_t swr_cal; /*!< SWR meter calibration table */ @@ -2012,7 +2012,7 @@ typedef struct hamlib_port { short retry; /*!< Maximum number of retries, 0 to disable */ short flushx; /*!< If true flush is done with read instead of TCFLUSH - MicroHam */ - char pathname[FILPATHLEN]; /*!< Port pathname */ + char pathname[HAMLIB_FILPATHLEN]; /*!< Port pathname */ union { struct { @@ -2144,16 +2144,16 @@ struct rig_state { double vfo_comp; /*!< VFO compensation in PPM, 0.0 to disable */ int deprecated_itu_region; /*!< ITU region to select among freq_range_t */ - freq_range_t rx_range_list[FRQRANGESIZ]; /*!< Receive frequency range list */ - freq_range_t tx_range_list[FRQRANGESIZ]; /*!< Transmit frequency range list */ + freq_range_t rx_range_list[HAMLIB_FRQRANGESIZ]; /*!< Receive frequency range list */ + freq_range_t tx_range_list[HAMLIB_FRQRANGESIZ]; /*!< Transmit frequency range list */ - struct tuning_step_list tuning_steps[TSLSTSIZ]; /*!< Tuning step list */ + struct tuning_step_list tuning_steps[HAMLIB_TSLSTSIZ]; /*!< Tuning step list */ - struct filter_list filters[FLTLSTSIZ]; /*!< Mode/filter table, at -6dB */ + struct filter_list filters[HAMLIB_FLTLSTSIZ]; /*!< Mode/filter table, at -6dB */ cal_table_t str_cal; /*!< S-meter calibration table */ - chan_t chan_list[CHANLSTSIZ]; /*!< Channel list, zero ended */ + chan_t chan_list[HAMLIB_CHANLSTSIZ]; /*!< Channel list, zero ended */ shortfreq_t max_rit; /*!< max absolute RIT */ shortfreq_t max_xit; /*!< max absolute XIT */ @@ -2161,8 +2161,8 @@ struct rig_state { ann_t announces; /*!< Announces bit field list */ - int preamp[MAXDBLSTSIZ]; /*!< Preamp list in dB, 0 terminated */ - int attenuator[MAXDBLSTSIZ]; /*!< Preamp list in dB, 0 terminated */ + int preamp[HAMLIB_MAXDBLSTSIZ]; /*!< Preamp list in dB, 0 terminated */ + int attenuator[HAMLIB_MAXDBLSTSIZ]; /*!< Preamp list in dB, 0 terminated */ setting_t has_get_func; /*!< List of get functions */ setting_t has_set_func; /*!< List of set functions */ diff --git a/macros/ax_python_devel.m4 b/macros/ax_python_devel.m4 index 44def0957..ffac14882 100644 --- a/macros/ax_python_devel.m4 +++ b/macros/ax_python_devel.m4 @@ -149,6 +149,8 @@ variable to configure. See ``configure --help'' for reference. fi else sysconfig="sysconfig" + PYTHON_CPPFLAGS=`python3-config --cflags` + PYTHON_EXTRA_LDFLAGS=`python3-config --ldflags` AC_MSG_RESULT([yes]) fi diff --git a/rigs/aor/aor.c b/rigs/aor/aor.c index d21b84ba3..6c2dd0450 100644 --- a/rigs/aor/aor.c +++ b/rigs/aor/aor.c @@ -632,7 +632,7 @@ int aor_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) unsigned i; - for (i = 0; i < MAXDBLSTSIZ && !RIG_IS_DBLST_END(rs->attenuator[i]); i++) + for (i = 0; i < HAMLIB_MAXDBLSTSIZ && !RIG_IS_DBLST_END(rs->attenuator[i]); i++) { if (rs->attenuator[i] == val.i) { @@ -642,7 +642,7 @@ int aor_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) } /* should be caught by the front end */ - if ((val.i != 0) && (i >= MAXDBLSTSIZ || RIG_IS_DBLST_END(rs->attenuator[i]))) + if ((val.i != 0) && (i >= HAMLIB_MAXDBLSTSIZ || RIG_IS_DBLST_END(rs->attenuator[i]))) { return -RIG_EINVAL; } @@ -762,7 +762,7 @@ int aor_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) break; } - if (att > MAXDBLSTSIZ || rs->attenuator[att - 1] == 0) + if (att > HAMLIB_MAXDBLSTSIZ || rs->attenuator[att - 1] == 0) { rig_debug(RIG_DEBUG_ERR, "Unsupported att %s %d\n", __func__, att); @@ -1270,7 +1270,7 @@ int aor_get_channel(RIG *rig, vfo_t vfo, channel_t *chan, int read_only) */ int i; - for (i = 0; i < CHANLSTSIZ && !RIG_IS_CHAN_END(chan_list[i]); i++) + for (i = 0; i < HAMLIB_CHANLSTSIZ && !RIG_IS_CHAN_END(chan_list[i]); i++) { if (channel_num >= chan_list[i].startc && channel_num <= chan_list[i].endc) diff --git a/rigs/aor/sr2200.c b/rigs/aor/sr2200.c index aac33f726..954568a0b 100644 --- a/rigs/aor/sr2200.c +++ b/rigs/aor/sr2200.c @@ -638,7 +638,7 @@ int sr2200_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) break; case RIG_LEVEL_ATT: - for (i = 0; i < MAXDBLSTSIZ && !RIG_IS_DBLST_END(rs->attenuator[i]); i++) + for (i = 0; i < HAMLIB_MAXDBLSTSIZ && !RIG_IS_DBLST_END(rs->attenuator[i]); i++) { if (rs->attenuator[i] == val.i) { @@ -648,7 +648,7 @@ int sr2200_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) } /* should be caught by the front end */ - if ((val.i != 0) && (i >= MAXDBLSTSIZ || RIG_IS_DBLST_END(rs->attenuator[i]))) + if ((val.i != 0) && (i >= HAMLIB_MAXDBLSTSIZ || RIG_IS_DBLST_END(rs->attenuator[i]))) { return -RIG_EINVAL; } @@ -759,7 +759,7 @@ int sr2200_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) break; } - if (att > MAXDBLSTSIZ || rs->attenuator[att - 1] == 0) + if (att > HAMLIB_MAXDBLSTSIZ || rs->attenuator[att - 1] == 0) { rig_debug(RIG_DEBUG_ERR, "Unsupported att %s %u\n", __func__, att); diff --git a/rigs/dummy/netrigctl.c b/rigs/dummy/netrigctl.c index 7a8563b5d..9b28abd47 100644 --- a/rigs/dummy/netrigctl.c +++ b/rigs/dummy/netrigctl.c @@ -270,7 +270,7 @@ static int netrigctl_open(RIG *rig) rs->deprecated_itu_region = atoi(buf); - for (i = 0; i < FRQRANGESIZ; i++) + for (i = 0; i < HAMLIB_FRQRANGESIZ; i++) { ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1); @@ -300,7 +300,7 @@ static int netrigctl_open(RIG *rig) } } - for (i = 0; i < FRQRANGESIZ; i++) + for (i = 0; i < HAMLIB_FRQRANGESIZ; i++) { ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1); @@ -330,7 +330,7 @@ static int netrigctl_open(RIG *rig) } } - for (i = 0; i < TSLSTSIZ; i++) + for (i = 0; i < HAMLIB_TSLSTSIZ; i++) { ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1); @@ -354,7 +354,7 @@ static int netrigctl_open(RIG *rig) } } - for (i = 0; i < FLTLSTSIZ; i++) + for (i = 0; i < HAMLIB_FLTLSTSIZ; i++) { ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1); @@ -432,7 +432,7 @@ static int netrigctl_open(RIG *rig) &rs->preamp[4], &rs->preamp[5], &rs->preamp[6]); - if (ret < 0 || ret >= MAXDBLSTSIZ) + if (ret < 0 || ret >= HAMLIB_MAXDBLSTSIZ) { ret = 0; } @@ -452,7 +452,7 @@ static int netrigctl_open(RIG *rig) &rs->attenuator[4], &rs->attenuator[5], &rs->attenuator[6]); - if (ret < 0 || ret >= MAXDBLSTSIZ) + if (ret < 0 || ret >= HAMLIB_MAXDBLSTSIZ) { ret = 0; } @@ -526,13 +526,13 @@ static int netrigctl_open(RIG *rig) gran_t parm_gran[RIG_SETTING_MAX]; /*!< parm granularity */ #endif - for (i = 0; i < FRQRANGESIZ && !RIG_IS_FRNG_END(rs->rx_range_list[i]); i++) + for (i = 0; i < HAMLIB_FRQRANGESIZ && !RIG_IS_FRNG_END(rs->rx_range_list[i]); i++) { rs->mode_list |= rs->rx_range_list[i].modes; rs->vfo_list |= rs->rx_range_list[i].vfo; } - for (i = 0; i < FRQRANGESIZ && !RIG_IS_FRNG_END(rs->tx_range_list[i]); i++) + for (i = 0; i < HAMLIB_FRQRANGESIZ && !RIG_IS_FRNG_END(rs->tx_range_list[i]); i++) { rs->mode_list |= rs->tx_range_list[i].modes; rs->vfo_list |= rs->tx_range_list[i].vfo; diff --git a/rigs/elad/elad.c b/rigs/elad/elad.c index b6d46d540..7bfb9b59e 100644 --- a/rigs/elad/elad.c +++ b/rigs/elad/elad.c @@ -1929,7 +1929,7 @@ int elad_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) { int foundit = 0; - for (i = 0; i < MAXDBLSTSIZ && rig->state.attenuator[i]; i++) + for (i = 0; i < HAMLIB_MAXDBLSTSIZ && rig->state.attenuator[i]; i++) { if (val.i == rig->state.attenuator[i]) { @@ -1958,7 +1958,7 @@ int elad_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) { int foundit = 0; - for (i = 0; i < MAXDBLSTSIZ && rig->state.preamp[i]; i++) + for (i = 0; i < HAMLIB_MAXDBLSTSIZ && rig->state.preamp[i]; i++) { if (val.i == rig->state.preamp[i]) { @@ -2141,7 +2141,7 @@ int elad_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) } else { - for (i = 0; i < lvl && i < MAXDBLSTSIZ; i++) + for (i = 0; i < lvl && i < HAMLIB_MAXDBLSTSIZ; i++) { if (rig->state.attenuator[i] == 0) { @@ -2178,7 +2178,7 @@ int elad_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) { lvl = lvlbuf[2] - '0'; - for (i = 0; i < lvl && i < MAXDBLSTSIZ; i++) + for (i = 0; i < lvl && i < HAMLIB_MAXDBLSTSIZ; i++) { if (rig->state.preamp[i] == 0) { diff --git a/rigs/flexradio/dttsp.c b/rigs/flexradio/dttsp.c index 08ffd59da..a25bc9944 100644 --- a/rigs/flexradio/dttsp.c +++ b/rigs/flexradio/dttsp.c @@ -519,7 +519,7 @@ int dttsp_init(RIG *rig) cmdpath = rig->state.rigport.type.rig == RIG_PORT_UDP_NETWORK ? DEFAULT_DTTSP_CMD_NET_ADDR : DEFAULT_DTTSP_CMD_PATH; - strncpy(rig->state.rigport.pathname, cmdpath, FILPATHLEN - 1); + strncpy(rig->state.rigport.pathname, cmdpath, HAMLIB_FILPATHLEN - 1); return RIG_OK; } @@ -571,7 +571,7 @@ int dttsp_open(RIG *rig) if (!p) { meterpath = priv->meter_port.pathname; - snprintf(meterpath, FILPATHLEN, "%s", rig->state.rigport.pathname); + snprintf(meterpath, HAMLIB_FILPATHLEN, "%s", rig->state.rigport.pathname); if (rig->state.rigport.type.rig == RIG_PORT_UDP_NETWORK) { diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c index ed450e5ca..1a76ffd4e 100644 --- a/rigs/icom/icom.c +++ b/rigs/icom/icom.c @@ -2585,7 +2585,7 @@ int icom_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) break; } - for (i = 0; i < MAXDBLSTSIZ; i++) + for (i = 0; i < HAMLIB_MAXDBLSTSIZ; i++) { if (rs->preamp[i] == val.i) { @@ -2593,7 +2593,7 @@ int icom_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) } } - if (i == MAXDBLSTSIZ || rs->preamp[i] == 0) + if (i == HAMLIB_MAXDBLSTSIZ || rs->preamp[i] == 0) { rig_debug(RIG_DEBUG_ERR, "%s: unsupported preamp set_level %ddB", __func__, val.i); @@ -3268,7 +3268,7 @@ int icom_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) break; } - if (icom_val > MAXDBLSTSIZ || rs->preamp[icom_val - 1] == 0) + if (icom_val > HAMLIB_MAXDBLSTSIZ || rs->preamp[icom_val - 1] == 0) { rig_debug(RIG_DEBUG_ERR, "%s: unsupported preamp get_level %ddB", __func__, icom_val); @@ -5311,7 +5311,7 @@ int icom_set_ts(RIG *rig, vfo_t vfo, shortfreq_t ts) rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); priv_caps = (const struct icom_priv_caps *) rig->caps->priv; - for (i = 0; i < TSLSTSIZ; i++) + for (i = 0; i < HAMLIB_TSLSTSIZ; i++) { if (priv_caps->ts_sc_list[i].ts == ts) { @@ -5320,7 +5320,7 @@ int icom_set_ts(RIG *rig, vfo_t vfo, shortfreq_t ts) } } - if (i >= TSLSTSIZ) + if (i >= HAMLIB_TSLSTSIZ) { RETURNFUNC(-RIG_EINVAL); /* not found, unsupported */ } @@ -5381,7 +5381,7 @@ int icom_get_ts(RIG *rig, vfo_t vfo, shortfreq_t *ts) RETURNFUNC(-RIG_ERJCTED); } - for (i = 0; i < TSLSTSIZ; i++) + for (i = 0; i < HAMLIB_TSLSTSIZ; i++) { if (priv_caps->ts_sc_list[i].sc == tsbuf[1]) { @@ -5390,7 +5390,7 @@ int icom_get_ts(RIG *rig, vfo_t vfo, shortfreq_t *ts) } } - if (i >= TSLSTSIZ) + if (i >= HAMLIB_TSLSTSIZ) { RETURNFUNC(-RIG_EPROTO); /* not found, unsupported */ } @@ -7595,7 +7595,7 @@ int icom_get_freq_range(RIG *rig) // Automatically fill in the freq range for this rig if available rig_debug(RIG_DEBUG_TRACE, "%s: Hamlib ranges\n", __func__); - for (i = 0; i < FRQRANGESIZ + for (i = 0; i < HAMLIB_FRQRANGESIZ && !RIG_IS_FRNG_END(rig->caps->rx_range_list1[i]); i++) { rig_debug(RIG_DEBUG_TRACE, "%s: rig chan %d, low=%.0f, high=%.0f\n", __func__, diff --git a/rigs/kenwood/k3.c b/rigs/kenwood/k3.c index 7f5e2ba50..4b83c295a 100644 --- a/rigs/kenwood/k3.c +++ b/rigs/kenwood/k3.c @@ -1792,7 +1792,7 @@ int k3_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) int i; int foundit = 0; - for (i = 0; i < MAXDBLSTSIZ && rig->state.attenuator[i]; i++) + for (i = 0; i < HAMLIB_MAXDBLSTSIZ && rig->state.attenuator[i]; i++) { if (val.i == rig->state.attenuator[i]) { @@ -2027,7 +2027,7 @@ int k3_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) { int i; - for (i = 0; i < lvl && i < MAXDBLSTSIZ; i++) + for (i = 0; i < lvl && i < HAMLIB_MAXDBLSTSIZ; i++) { if (rig->state.attenuator[i] == 0) { diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c index 21826e0d2..d4f565991 100644 --- a/rigs/kenwood/kenwood.c +++ b/rigs/kenwood/kenwood.c @@ -2517,7 +2517,7 @@ int kenwood_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) { int foundit = 0; - for (i = 0; i < MAXDBLSTSIZ && rig->state.attenuator[i]; i++) + for (i = 0; i < HAMLIB_MAXDBLSTSIZ && rig->state.attenuator[i]; i++) { if (val.i == rig->state.attenuator[i]) { @@ -2546,7 +2546,7 @@ int kenwood_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) { int foundit = 0; - for (i = 0; i < MAXDBLSTSIZ && rig->state.preamp[i]; i++) + for (i = 0; i < HAMLIB_MAXDBLSTSIZ && rig->state.preamp[i]; i++) { if (val.i == rig->state.preamp[i]) { @@ -2735,7 +2735,7 @@ int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) } else { - for (i = 0; i < lvl && i < MAXDBLSTSIZ; i++) + for (i = 0; i < lvl && i < HAMLIB_MAXDBLSTSIZ; i++) { if (rig->state.attenuator[i] == 0) { @@ -2772,7 +2772,7 @@ int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) { lvl = lvlbuf[2] - '0'; - for (i = 0; i < lvl && i < MAXDBLSTSIZ; i++) + for (i = 0; i < lvl && i < HAMLIB_MAXDBLSTSIZ; i++) { if (rig->state.preamp[i] == 0) { diff --git a/rigs/kenwood/pihpsdr.c b/rigs/kenwood/pihpsdr.c index c711ea44f..05830c136 100644 --- a/rigs/kenwood/pihpsdr.c +++ b/rigs/kenwood/pihpsdr.c @@ -843,7 +843,7 @@ int pihpsdr_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) { int foundit = 0; - for (i = 0; i < MAXDBLSTSIZ && rig->state.attenuator[i]; i++) + for (i = 0; i < HAMLIB_MAXDBLSTSIZ && rig->state.attenuator[i]; i++) { if (val.i == rig->state.attenuator[i]) { @@ -872,7 +872,7 @@ int pihpsdr_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) { int foundit = 0; - for (i = 0; i < MAXDBLSTSIZ && rig->state.preamp[i]; i++) + for (i = 0; i < HAMLIB_MAXDBLSTSIZ && rig->state.preamp[i]; i++) { if (val.i == rig->state.preamp[i]) { diff --git a/rigs/kenwood/thg71.c b/rigs/kenwood/thg71.c index 39e624469..332b09de5 100644 --- a/rigs/kenwood/thg71.c +++ b/rigs/kenwood/thg71.c @@ -522,7 +522,7 @@ int thg71_open(RIG *rig) strtok(ackbuf, " "); - for (i = 0; i < FRQRANGESIZ - 1; i++) + for (i = 0; i < HAMLIB_FRQRANGESIZ - 1; i++) { freq_range_t frng; char *strl, *stru; diff --git a/rigs/kenwood/tmd710.c b/rigs/kenwood/tmd710.c index 223184545..846de3264 100644 --- a/rigs/kenwood/tmd710.c +++ b/rigs/kenwood/tmd710.c @@ -1405,7 +1405,7 @@ static int tmd710_find_tuning_step_index(RIG *rig, shortfreq_t ts, { int k, stepind = -1; - for (k = 0; k < TSLSTSIZ; k++) + for (k = 0; k < HAMLIB_TSLSTSIZ; k++) { if ((rig->caps->tuning_steps[k].modes == RIG_MODE_NONE) && (rig->caps->tuning_steps[k].ts == 0)) diff --git a/rigs/kenwood/ts570.c b/rigs/kenwood/ts570.c index a836029f0..508dac778 100644 --- a/rigs/kenwood/ts570.c +++ b/rigs/kenwood/ts570.c @@ -352,7 +352,7 @@ ts570_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) { int i; - for (i = 0; i < MAXDBLSTSIZ; i++) + for (i = 0; i < HAMLIB_MAXDBLSTSIZ; i++) if (kenwood_val == rig->state.preamp[i]) { sprintf(levelbuf, "PA%01d", i + 1); @@ -475,7 +475,7 @@ ts570_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) { int i; - for (i = 0; i < levelint && i < MAXDBLSTSIZ; i++) + for (i = 0; i < levelint && i < HAMLIB_MAXDBLSTSIZ; i++) { if (rig->state.preamp[i] == 0) { diff --git a/rigs/kenwood/ts870s.c b/rigs/kenwood/ts870s.c index 92825811e..ffd1d041a 100644 --- a/rigs/kenwood/ts870s.c +++ b/rigs/kenwood/ts870s.c @@ -439,7 +439,7 @@ static int ts870s_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) } else { - for (i = 0; i < lvl && i < MAXDBLSTSIZ; i++) + for (i = 0; i < lvl && i < HAMLIB_MAXDBLSTSIZ; i++) if (rig->state.attenuator[i] == 0) { rig_debug(RIG_DEBUG_ERR, "ts870s_get_level: " diff --git a/rigs/kit/hiqsdr.c b/rigs/kit/hiqsdr.c index e1acc9c41..bbb956812 100644 --- a/rigs/kit/hiqsdr.c +++ b/rigs/kit/hiqsdr.c @@ -307,7 +307,7 @@ int hiqsdr_init(RIG *rig) priv->split = RIG_SPLIT_OFF; priv->ref_clock = REFCLOCK; priv->sample_rate = DEFAULT_SAMPLE_RATE; - strncpy(rig->state.rigport.pathname, "192.168.2.196:48248", FILPATHLEN - 1); + strncpy(rig->state.rigport.pathname, "192.168.2.196:48248", HAMLIB_FILPATHLEN - 1); return RIG_OK; } diff --git a/rigs/tentec/orion.c b/rigs/tentec/orion.c index 560a228f8..41a6d9242 100644 --- a/rigs/tentec/orion.c +++ b/rigs/tentec/orion.c @@ -379,7 +379,7 @@ int tt565_set_freq(RIG *rig, vfo_t vfo, freq_t freq) */ in_range = FALSE; - for (i = 0; i < FRQRANGESIZ; i++) + for (i = 0; i < HAMLIB_FRQRANGESIZ; i++) { this_range = rig->state.rx_range_list[i]; diff --git a/rigs/tuner/v4l.c b/rigs/tuner/v4l.c index 74ee90b8f..6181a303e 100644 --- a/rigs/tuner/v4l.c +++ b/rigs/tuner/v4l.c @@ -159,7 +159,7 @@ const struct rig_caps v4l_caps = int v4l_init(RIG *rig) { rig->state.rigport.type.rig = RIG_PORT_DEVICE; - strncpy(rig->state.rigport.pathname, DEFAULT_V4L_PATH, FILPATHLEN - 1); + strncpy(rig->state.rigport.pathname, DEFAULT_V4L_PATH, HAMLIB_FILPATHLEN - 1); return RIG_OK; } diff --git a/rigs/tuner/v4l2.c b/rigs/tuner/v4l2.c index 4e1dea2a1..08b604acc 100644 --- a/rigs/tuner/v4l2.c +++ b/rigs/tuner/v4l2.c @@ -159,7 +159,7 @@ const struct rig_caps v4l2_caps = int v4l2_init(RIG *rig) { rig->state.rigport.type.rig = RIG_PORT_DEVICE; - strncpy(rig->state.rigport.pathname, DEFAULT_V4L2_PATH, FILPATHLEN - 1); + strncpy(rig->state.rigport.pathname, DEFAULT_V4L2_PATH, HAMLIB_FILPATHLEN - 1); return RIG_OK; } diff --git a/rigs/winradio/winradio.c b/rigs/winradio/winradio.c index b57a52578..84c3428be 100644 --- a/rigs/winradio/winradio.c +++ b/rigs/winradio/winradio.c @@ -46,7 +46,7 @@ int wr_rig_init(RIG *rig) { rig->state.rigport.type.rig = RIG_PORT_DEVICE; - strncpy(rig->state.rigport.pathname, DEFAULT_WINRADIO_PATH, FILPATHLEN - 1); + strncpy(rig->state.rigport.pathname, DEFAULT_WINRADIO_PATH, HAMLIB_FILPATHLEN - 1); return RIG_OK; } diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c index 6f6affb46..e657567ef 100644 --- a/rigs/yaesu/newcat.c +++ b/rigs/yaesu/newcat.c @@ -2616,7 +2616,7 @@ int newcat_set_ts(RIG *rig, vfo_t vfo, shortfreq_t ts) } /* assume 2 tuning steps per mode */ - for (i = 0, ts_match = FALSE; i < TSLSTSIZ + for (i = 0, ts_match = FALSE; i < HAMLIB_TSLSTSIZ && rig->caps->tuning_steps[i].ts; i++) if (rig->caps->tuning_steps[i].modes & mode) { @@ -2678,7 +2678,7 @@ int newcat_get_ts(RIG *rig, vfo_t vfo, shortfreq_t *ts) } /* assume 2 tuning steps per mode */ - for (i = 0, ts_match = FALSE; i < TSLSTSIZ + for (i = 0, ts_match = FALSE; i < HAMLIB_TSLSTSIZ && rig->caps->tuning_steps[i].ts; i++) if (rig->caps->tuning_steps[i].modes & mode) { @@ -5924,7 +5924,7 @@ int newcat_set_mem(RIG *rig, vfo_t vfo, int ch) chan_list = rig->caps->chan_list; - for (i = 0; i < CHANLSTSIZ && !RIG_IS_CHAN_END(chan_list[i]); i++) + for (i = 0; i < HAMLIB_CHANLSTSIZ && !RIG_IS_CHAN_END(chan_list[i]); i++) { if (ch >= chan_list[i].startc && ch <= chan_list[i].endc) @@ -6249,7 +6249,7 @@ int newcat_set_channel(RIG *rig, vfo_t vfo, const channel_t *chan) chan_list = rig->caps->chan_list; - for (i = 0; i < CHANLSTSIZ && !RIG_IS_CHAN_END(chan_list[i]); i++) + for (i = 0; i < HAMLIB_CHANLSTSIZ && !RIG_IS_CHAN_END(chan_list[i]); i++) { if (chan->channel_num >= chan_list[i].startc && chan->channel_num <= chan_list[i].endc && @@ -6403,7 +6403,7 @@ int newcat_get_channel(RIG *rig, vfo_t vfo, channel_t *chan, int read_only) chan_list = rig->caps->chan_list; - for (i = 0; i < CHANLSTSIZ && !RIG_IS_CHAN_END(chan_list[i]); i++) + for (i = 0; i < HAMLIB_CHANLSTSIZ && !RIG_IS_CHAN_END(chan_list[i]); i++) { if (chan->channel_num >= chan_list[i].startc && chan->channel_num <= chan_list[i].endc) diff --git a/rigs/yaesu/vr5000.c b/rigs/yaesu/vr5000.c index 0fa335f89..3ec7976f1 100644 --- a/rigs/yaesu/vr5000.c +++ b/rigs/yaesu/vr5000.c @@ -648,7 +648,7 @@ int find_tuning_step(RIG *rig, vfo_t vfo, rmode_t mode, shortfreq_t *ts) { int i; - for (i = 0; i < TSLSTSIZ; i++) + for (i = 0; i < HAMLIB_TSLSTSIZ; i++) { if ((rig->caps->tuning_steps[i].modes & mode) != 0) { @@ -667,7 +667,7 @@ int check_tuning_step(RIG *rig, vfo_t vfo, rmode_t mode, shortfreq_t ts) { int i; - for (i = 0; i < TSLSTSIZ; i++) + for (i = 0; i < HAMLIB_TSLSTSIZ; i++) { if (rig->caps->tuning_steps[i].ts == ts && ((rig->caps->tuning_steps[i].modes & mode) != 0)) diff --git a/src/amp_conf.c b/src/amp_conf.c index b819e56fb..a06d9c372 100644 --- a/src/amp_conf.c +++ b/src/amp_conf.c @@ -145,7 +145,7 @@ int frontamp_set_conf(AMP *amp, token_t token, const char *val) switch (token) { case TOK_PATHNAME: - strncpy(rs->ampport.pathname, val, FILPATHLEN - 1); + strncpy(rs->ampport.pathname, val, HAMLIB_FILPATHLEN - 1); break; case TOK_WRITE_DELAY: diff --git a/src/amplifier.c b/src/amplifier.c index 60d30e080..7f518b1bb 100644 --- a/src/amplifier.c +++ b/src/amplifier.c @@ -239,7 +239,7 @@ AMP *HAMLIB_API amp_init(amp_model_t amp_model) { case RIG_PORT_SERIAL: // Dont' think we need a default port here - //strncpy(rs->ampport.pathname, DEFAULT_SERIAL_PORT, FILPATHLEN - 1); + //strncpy(rs->ampport.pathname, DEFAULT_SERIAL_PORT, HAMLIB_FILPATHLEN - 1); rs->ampport.parm.serial.rate = caps->serial_rate_max; /* fastest ! */ rs->ampport.parm.serial.data_bits = caps->serial_data_bits; rs->ampport.parm.serial.stop_bits = caps->serial_stop_bits; @@ -249,11 +249,11 @@ AMP *HAMLIB_API amp_init(amp_model_t amp_model) case RIG_PORT_NETWORK: case RIG_PORT_UDP_NETWORK: - strncpy(rs->ampport.pathname, "127.0.0.1:4531", FILPATHLEN - 1); + strncpy(rs->ampport.pathname, "127.0.0.1:4531", HAMLIB_FILPATHLEN - 1); break; default: - strncpy(rs->ampport.pathname, "", FILPATHLEN - 1); + strncpy(rs->ampport.pathname, "", HAMLIB_FILPATHLEN - 1); } rs->ampport.fd = -1; diff --git a/src/conf.c b/src/conf.c index 63d48f96b..2f31c369a 100644 --- a/src/conf.c +++ b/src/conf.c @@ -232,7 +232,7 @@ static int frontend_set_conf(RIG *rig, token_t token, const char *val) switch (token) { case TOK_PATHNAME: - strncpy(rs->rigport.pathname, val, FILPATHLEN - 1); + strncpy(rs->rigport.pathname, val, HAMLIB_FILPATHLEN - 1); break; case TOK_WRITE_DELAY: @@ -431,37 +431,37 @@ static int frontend_set_conf(RIG *rig, token_t token, const char *val) { case 1: memcpy(rs->tx_range_list, caps->tx_range_list1, - sizeof(struct freq_range_list)*FRQRANGESIZ); + sizeof(struct freq_range_list)*HAMLIB_FRQRANGESIZ); memcpy(rs->rx_range_list, caps->rx_range_list1, - sizeof(struct freq_range_list)*FRQRANGESIZ); + sizeof(struct freq_range_list)*HAMLIB_FRQRANGESIZ); break; case 2: memcpy(rs->tx_range_list, caps->tx_range_list2, - sizeof(struct freq_range_list)*FRQRANGESIZ); + sizeof(struct freq_range_list)*HAMLIB_FRQRANGESIZ); memcpy(rs->rx_range_list, caps->rx_range_list2, - sizeof(struct freq_range_list)*FRQRANGESIZ); + sizeof(struct freq_range_list)*HAMLIB_FRQRANGESIZ); break; case 3: memcpy(rs->tx_range_list, caps->tx_range_list3, - sizeof(struct freq_range_list)*FRQRANGESIZ); + sizeof(struct freq_range_list)*HAMLIB_FRQRANGESIZ); memcpy(rs->rx_range_list, caps->rx_range_list3, - sizeof(struct freq_range_list)*FRQRANGESIZ); + sizeof(struct freq_range_list)*HAMLIB_FRQRANGESIZ); break; case 4: memcpy(rs->tx_range_list, caps->tx_range_list4, - sizeof(struct freq_range_list)*FRQRANGESIZ); + sizeof(struct freq_range_list)*HAMLIB_FRQRANGESIZ); memcpy(rs->rx_range_list, caps->rx_range_list4, - sizeof(struct freq_range_list)*FRQRANGESIZ); + sizeof(struct freq_range_list)*HAMLIB_FRQRANGESIZ); break; case 5: memcpy(rs->tx_range_list, caps->tx_range_list5, - sizeof(struct freq_range_list)*FRQRANGESIZ); + sizeof(struct freq_range_list)*HAMLIB_FRQRANGESIZ); memcpy(rs->rx_range_list, caps->rx_range_list5, - sizeof(struct freq_range_list)*FRQRANGESIZ); + sizeof(struct freq_range_list)*HAMLIB_FRQRANGESIZ); break; default: @@ -515,7 +515,7 @@ static int frontend_set_conf(RIG *rig, token_t token, const char *val) break; case TOK_PTT_PATHNAME: - strncpy(rs->pttport.pathname, val, FILPATHLEN - 1); + strncpy(rs->pttport.pathname, val, HAMLIB_FILPATHLEN - 1); break; case TOK_PTT_BITNUM: @@ -572,7 +572,7 @@ static int frontend_set_conf(RIG *rig, token_t token, const char *val) break; case TOK_DCD_PATHNAME: - strncpy(rs->dcdport.pathname, val, FILPATHLEN - 1); + strncpy(rs->dcdport.pathname, val, HAMLIB_FILPATHLEN - 1); break; diff --git a/src/gpio.c b/src/gpio.c index 700777739..d3dc56a08 100644 --- a/src/gpio.c +++ b/src/gpio.c @@ -31,14 +31,14 @@ int gpio_open(hamlib_port_t *port, int output, int on_value) { - char pathname[FILPATHLEN * 2]; + char pathname[HAMLIB_FILPATHLEN * 2]; FILE *fexp, *fdir; int fd; char *dir; port->parm.gpio.on_value = on_value; - snprintf(pathname, FILPATHLEN, "/sys/class/gpio/export"); + snprintf(pathname, HAMLIB_FILPATHLEN, "/sys/class/gpio/export"); fexp = fopen(pathname, "w"); if (!fexp) diff --git a/src/mem.c b/src/mem.c index 9055f8790..678607b97 100644 --- a/src/mem.c +++ b/src/mem.c @@ -947,7 +947,7 @@ int get_chan_all_cb_generic(RIG *rig, vfo_t vfo, chan_cb_t chan_cb, chan_t *chan_list = rig->state.chan_list; channel_t *chan; - for (i = 0; !RIG_IS_CHAN_END(chan_list[i]) && i < CHANLSTSIZ; i++) + for (i = 0; !RIG_IS_CHAN_END(chan_list[i]) && i < HAMLIB_CHANLSTSIZ; i++) { int retval; @@ -1013,7 +1013,7 @@ int set_chan_all_cb_generic(RIG *rig, vfo_t vfo, chan_cb_t chan_cb, chan_t *chan_list = rig->state.chan_list; channel_t *chan; - for (i = 0; !RIG_IS_CHAN_END(chan_list[i]) && i < CHANLSTSIZ; i++) + for (i = 0; !RIG_IS_CHAN_END(chan_list[i]) && i < HAMLIB_CHANLSTSIZ; i++) { for (j = chan_list[i].startc; j <= chan_list[i].endc; j++) @@ -1605,7 +1605,7 @@ const chan_t *HAMLIB_API rig_lookup_mem_caps(RIG *rig, int ch) chan_list_all.startc = chan_list[0].startc; chan_list_all.type = RIG_MTYPE_NONE; /* meaningless */ - for (i = 0; i < CHANLSTSIZ && !RIG_IS_CHAN_END(chan_list[i]); i++) + for (i = 0; i < HAMLIB_CHANLSTSIZ && !RIG_IS_CHAN_END(chan_list[i]); i++) { int j; unsigned char *p1, *p2; @@ -1630,7 +1630,7 @@ const chan_t *HAMLIB_API rig_lookup_mem_caps(RIG *rig, int ch) chan_list = rig->state.chan_list; - for (i = 0; i < CHANLSTSIZ && !RIG_IS_CHAN_END(chan_list[i]); i++) + for (i = 0; i < HAMLIB_CHANLSTSIZ && !RIG_IS_CHAN_END(chan_list[i]); i++) { if (ch >= chan_list[i].startc && ch <= chan_list[i].endc) { @@ -1666,7 +1666,7 @@ int HAMLIB_API rig_mem_count(RIG *rig) chan_list = rig->state.chan_list; count = 0; - for (i = 0; i < CHANLSTSIZ && !RIG_IS_CHAN_END(chan_list[i]); i++) + for (i = 0; i < HAMLIB_CHANLSTSIZ && !RIG_IS_CHAN_END(chan_list[i]); i++) { count += chan_list[i].endc - chan_list[i].startc + 1; } diff --git a/src/rig.c b/src/rig.c index fbd454c7c..2e48d4239 100644 --- a/src/rig.c +++ b/src/rig.c @@ -410,7 +410,7 @@ RIG *HAMLIB_API rig_init(rig_model_t rig_model) switch (caps->port_type) { case RIG_PORT_SERIAL: - strncpy(rs->rigport.pathname, DEFAULT_SERIAL_PORT, FILPATHLEN - 1); + strncpy(rs->rigport.pathname, DEFAULT_SERIAL_PORT, HAMLIB_FILPATHLEN - 1); rs->rigport.parm.serial.rate = caps->serial_rate_max; /* fastest ! */ rs->rigport.parm.serial.data_bits = caps->serial_data_bits; rs->rigport.parm.serial.stop_bits = caps->serial_stop_bits; @@ -419,29 +419,29 @@ RIG *HAMLIB_API rig_init(rig_model_t rig_model) break; case RIG_PORT_PARALLEL: - strncpy(rs->rigport.pathname, DEFAULT_PARALLEL_PORT, FILPATHLEN - 1); + strncpy(rs->rigport.pathname, DEFAULT_PARALLEL_PORT, HAMLIB_FILPATHLEN - 1); break; /* Adding support for CM108 GPIO. This is compatible with CM108 series * USB audio chips from CMedia and SSS1623 series USB audio chips from 3S */ case RIG_PORT_CM108: - strncpy(rs->rigport.pathname, DEFAULT_CM108_PORT, FILPATHLEN); + strncpy(rs->rigport.pathname, DEFAULT_CM108_PORT, HAMLIB_FILPATHLEN); rs->rigport.parm.cm108.ptt_bitnum = DEFAULT_CM108_PTT_BITNUM; rs->pttport.parm.cm108.ptt_bitnum = DEFAULT_CM108_PTT_BITNUM; break; case RIG_PORT_GPIO: - strncpy(rs->rigport.pathname, DEFAULT_GPIO_PORT, FILPATHLEN); + strncpy(rs->rigport.pathname, DEFAULT_GPIO_PORT, HAMLIB_FILPATHLEN); break; case RIG_PORT_NETWORK: case RIG_PORT_UDP_NETWORK: - strncpy(rs->rigport.pathname, "127.0.0.1:4532", FILPATHLEN - 1); + strncpy(rs->rigport.pathname, "127.0.0.1:4532", HAMLIB_FILPATHLEN - 1); break; default: - strncpy(rs->rigport.pathname, "", FILPATHLEN - 1); + strncpy(rs->rigport.pathname, "", HAMLIB_FILPATHLEN - 1); } rs->rigport.write_delay = caps->write_delay; @@ -466,9 +466,9 @@ RIG *HAMLIB_API rig_init(rig_model_t rig_model) // Every rig should have a rx_range // Rig backends need updating for new range_list format memcpy(rs->rx_range_list, caps->rx_range_list1, - sizeof(struct freq_range_list)*FRQRANGESIZ); + sizeof(struct freq_range_list)*HAMLIB_FRQRANGESIZ); memcpy(rs->tx_range_list, caps->tx_range_list1, - sizeof(struct freq_range_list)*FRQRANGESIZ); + sizeof(struct freq_range_list)*HAMLIB_FRQRANGESIZ); // if we don't have list1 we'll try list2 if (rs->rx_range_list[0].startf == 0) @@ -476,9 +476,9 @@ RIG *HAMLIB_API rig_init(rig_model_t rig_model) rig_debug(RIG_DEBUG_TRACE, "%s: rx_range_list1 is empty, using rx_range_list2\n", __func__); memcpy(rs->tx_range_list, caps->rx_range_list2, - sizeof(struct freq_range_list)*FRQRANGESIZ); + sizeof(struct freq_range_list)*HAMLIB_FRQRANGESIZ); memcpy(rs->rx_range_list, caps->tx_range_list2, - sizeof(struct freq_range_list)*FRQRANGESIZ); + sizeof(struct freq_range_list)*HAMLIB_FRQRANGESIZ); } if (rs->tx_range_list[0].startf == 0) @@ -498,18 +498,18 @@ RIG *HAMLIB_API rig_init(rig_model_t rig_model) { case RIG_ITU_REGION1: memcpy(rs->tx_range_list, caps->tx_range_list1, - sizeof(struct freq_range_list)*FRQRANGESIZ); + sizeof(struct freq_range_list)*HAMLIB_FRQRANGESIZ); memcpy(rs->rx_range_list, caps->rx_range_list1, - sizeof(struct freq_range_list)*FRQRANGESIZ); + sizeof(struct freq_range_list)*HAMLIB_FRQRANGESIZ); break; case RIG_ITU_REGION2: case RIG_ITU_REGION3: default: memcpy(rs->tx_range_list, caps->tx_range_list2, - sizeof(struct freq_range_list)*FRQRANGESIZ); + sizeof(struct freq_range_list)*HAMLIB_FRQRANGESIZ); memcpy(rs->rx_range_list, caps->rx_range_list2, - sizeof(struct freq_range_list)*FRQRANGESIZ); + sizeof(struct freq_range_list)*HAMLIB_FRQRANGESIZ); break; } @@ -517,25 +517,25 @@ RIG *HAMLIB_API rig_init(rig_model_t rig_model) rs->vfo_list = 0; rs->mode_list = 0; - for (i = 0; i < FRQRANGESIZ && !RIG_IS_FRNG_END(caps->rx_range_list1[i]); i++) + for (i = 0; i < HAMLIB_FRQRANGESIZ && !RIG_IS_FRNG_END(caps->rx_range_list1[i]); i++) { rs->vfo_list |= caps->rx_range_list1[i].vfo; rs->mode_list |= caps->rx_range_list1[i].modes; } - for (i = 0; i < FRQRANGESIZ && !RIG_IS_FRNG_END(caps->tx_range_list1[i]); i++) + for (i = 0; i < HAMLIB_FRQRANGESIZ && !RIG_IS_FRNG_END(caps->tx_range_list1[i]); i++) { rs->vfo_list |= caps->tx_range_list1[i].vfo; rs->mode_list |= caps->tx_range_list1[i].modes; } - for (i = 0; i < FRQRANGESIZ && !RIG_IS_FRNG_END(caps->rx_range_list2[i]); i++) + for (i = 0; i < HAMLIB_FRQRANGESIZ && !RIG_IS_FRNG_END(caps->rx_range_list2[i]); i++) { rs->vfo_list |= caps->rx_range_list2[i].vfo; rs->mode_list |= caps->rx_range_list2[i].modes; } - for (i = 0; i < FRQRANGESIZ && !RIG_IS_FRNG_END(caps->tx_range_list2[i]); i++) + for (i = 0; i < HAMLIB_FRQRANGESIZ && !RIG_IS_FRNG_END(caps->tx_range_list2[i]); i++) { rs->vfo_list |= caps->tx_range_list2[i].vfo; rs->mode_list |= caps->tx_range_list2[i].modes; @@ -561,16 +561,16 @@ RIG *HAMLIB_API rig_init(rig_model_t rig_model) if (rs->vfo_list & RIG_VFO_MEM) { rig_debug(RIG_DEBUG_VERBOSE, "%s: rig has VFO_MEM\n", __func__); } - memcpy(rs->preamp, caps->preamp, sizeof(int)*MAXDBLSTSIZ); - memcpy(rs->attenuator, caps->attenuator, sizeof(int)*MAXDBLSTSIZ); + memcpy(rs->preamp, caps->preamp, sizeof(int)*HAMLIB_MAXDBLSTSIZ); + memcpy(rs->attenuator, caps->attenuator, sizeof(int)*HAMLIB_MAXDBLSTSIZ); memcpy(rs->tuning_steps, caps->tuning_steps, - sizeof(struct tuning_step_list)*TSLSTSIZ); + sizeof(struct tuning_step_list)*HAMLIB_TSLSTSIZ); memcpy(rs->filters, caps->filters, - sizeof(struct filter_list)*FLTLSTSIZ); + sizeof(struct filter_list)*HAMLIB_FLTLSTSIZ); memcpy(&rs->str_cal, &caps->str_cal, sizeof(cal_table_t)); - memcpy(rs->chan_list, caps->chan_list, sizeof(chan_t)*CHANLSTSIZ); + memcpy(rs->chan_list, caps->chan_list, sizeof(chan_t)*HAMLIB_CHANLSTSIZ); rs->has_get_func = caps->has_get_func; rs->has_set_func = caps->has_set_func; @@ -2191,7 +2191,7 @@ pbwidth_t HAMLIB_API rig_passband_normal(RIG *rig, rmode_t mode) rs = &rig->state; - for (i = 0; i < FLTLSTSIZ && rs->filters[i].modes; i++) + for (i = 0; i < HAMLIB_FLTLSTSIZ && rs->filters[i].modes; i++) { if (rs->filters[i].modes & mode) { @@ -2237,13 +2237,13 @@ pbwidth_t HAMLIB_API rig_passband_narrow(RIG *rig, rmode_t mode) rs = &rig->state; - for (i = 0; i < FLTLSTSIZ - 1 && rs->filters[i].modes; i++) + for (i = 0; i < HAMLIB_FLTLSTSIZ - 1 && rs->filters[i].modes; i++) { if (rs->filters[i].modes & mode) { normal = rs->filters[i].width; - for (i++; i < FLTLSTSIZ && rs->filters[i].modes; i++) + for (i++; i < HAMLIB_FLTLSTSIZ && rs->filters[i].modes; i++) { if ((rs->filters[i].modes & mode) && (rs->filters[i].width < normal)) @@ -2289,13 +2289,13 @@ pbwidth_t HAMLIB_API rig_passband_wide(RIG *rig, rmode_t mode) rs = &rig->state; - for (i = 0; i < FLTLSTSIZ - 1 && rs->filters[i].modes; i++) + for (i = 0; i < HAMLIB_FLTLSTSIZ - 1 && rs->filters[i].modes; i++) { if (rs->filters[i].modes & mode) { normal = rs->filters[i].width; - for (i++; i < FLTLSTSIZ && rs->filters[i].modes; i++) + for (i++; i < HAMLIB_FLTLSTSIZ && rs->filters[i].modes; i++) { if ((rs->filters[i].modes & mode) && (rs->filters[i].width > normal)) @@ -4869,7 +4869,7 @@ shortfreq_t HAMLIB_API rig_get_resolution(RIG *rig, rmode_t mode) rs = &rig->state; - for (i = 0; i < TSLSTSIZ && rs->tuning_steps[i].ts; i++) + for (i = 0; i < HAMLIB_TSLSTSIZ && rs->tuning_steps[i].ts; i++) { if (rs->tuning_steps[i].modes & mode) { @@ -5687,7 +5687,7 @@ const freq_range_t *HAMLIB_API rig_get_range(const freq_range_t *range_list, { int i; - for (i = 0; i < FRQRANGESIZ; i++) + for (i = 0; i < HAMLIB_FRQRANGESIZ; i++) { if (range_list[i].startf == 0 && range_list[i].endf == 0) { diff --git a/src/rot_conf.c b/src/rot_conf.c index 95c2a92ac..3040cdbc4 100644 --- a/src/rot_conf.c +++ b/src/rot_conf.c @@ -177,7 +177,7 @@ int frontrot_set_conf(ROT *rot, token_t token, const char *val) switch (token) { case TOK_PATHNAME: - strncpy(rs->rotport.pathname, val, FILPATHLEN - 1); + strncpy(rs->rotport.pathname, val, HAMLIB_FILPATHLEN - 1); break; case TOK_WRITE_DELAY: diff --git a/src/rotator.c b/src/rotator.c index b57d63ed4..51787ea7e 100644 --- a/src/rotator.c +++ b/src/rotator.c @@ -270,7 +270,7 @@ ROT *HAMLIB_API rot_init(rot_model_t rot_model) switch (caps->port_type) { case RIG_PORT_SERIAL: - strncpy(rs->rotport.pathname, DEFAULT_SERIAL_PORT, FILPATHLEN - 1); + strncpy(rs->rotport.pathname, DEFAULT_SERIAL_PORT, HAMLIB_FILPATHLEN - 1); rs->rotport.parm.serial.rate = caps->serial_rate_max; /* fastest ! */ rs->rotport.parm.serial.data_bits = caps->serial_data_bits; rs->rotport.parm.serial.stop_bits = caps->serial_stop_bits; @@ -279,16 +279,16 @@ ROT *HAMLIB_API rot_init(rot_model_t rot_model) break; case RIG_PORT_PARALLEL: - strncpy(rs->rotport.pathname, DEFAULT_PARALLEL_PORT, FILPATHLEN - 1); + strncpy(rs->rotport.pathname, DEFAULT_PARALLEL_PORT, HAMLIB_FILPATHLEN - 1); break; case RIG_PORT_NETWORK: case RIG_PORT_UDP_NETWORK: - strncpy(rs->rotport.pathname, "127.0.0.1:4533", FILPATHLEN - 1); + strncpy(rs->rotport.pathname, "127.0.0.1:4533", HAMLIB_FILPATHLEN - 1); break; default: - strncpy(rs->rotport.pathname, "", FILPATHLEN - 1); + strncpy(rs->rotport.pathname, "", HAMLIB_FILPATHLEN - 1); } rs->min_el = caps->min_el; diff --git a/src/sprintflst.c b/src/sprintflst.c index 1af316a75..884c31108 100644 --- a/src/sprintflst.c +++ b/src/sprintflst.c @@ -49,7 +49,7 @@ int rig_sprintf_vfo(char *str, int nlen, vfo_t vfo) return 0; } - for (i = 0; i < MAX_VFOS; i++) + for (i = 0; i < HAMLIB_MAX_VFOS; i++) { const char *sv; sv = rig_strvfo(vfo & RIG_VFO_N(i)); @@ -79,7 +79,7 @@ int rig_sprintf_mode(char *str, int nlen, rmode_t mode) return 0; } - for (i = 0; i < MAX_MODES; i++) + for (i = 0; i < HAMLIB_MAX_MODES; i++) { const char *ms = rig_strrmode(mode & (1ULL << i)); @@ -678,7 +678,7 @@ int rig_sprintf_vfop(char *str, int nlen, vfo_op_t op) return 0; } - for (i = 0; i < MAX_VFO_OPS; i++) + for (i = 0; i < HAMLIB_MAX_VFO_OPS; i++) { const char *ms = rig_strvfop(op & (1UL << i)); @@ -711,7 +711,7 @@ int rig_sprintf_scan(char *str, int nlen, scan_t rscan) return 0; } - for (i = 0; i < MAX_RSCANS; i++) + for (i = 0; i < HAMLIB_MAX_RSCANS; i++) { const char *ms = rig_strscan(rscan & (1UL << i)); @@ -745,7 +745,7 @@ int rot_sprintf_status(char *str, int nlen, rot_status_t status) return 0; } - for (i = 0; i < MAX_ROTORS; i++) + for (i = 0; i < HAMLIB_MAX_ROTORS; i++) { const char *sv; sv = rot_strstatus(status & ROT_STATUS_N(i));