From 97594e1c967d7741b74c7b61dcb58b1f05684f5f Mon Sep 17 00:00:00 2001 From: Nate Bargmann Date: Mon, 22 Feb 2016 06:10:48 -0600 Subject: [PATCH] Apply Linux C Style to ic910.c --- icom/ic910.c | 485 ++++++++++++++++++++++++++------------------------- 1 file changed, 252 insertions(+), 233 deletions(-) diff --git a/icom/ic910.c b/icom/ic910.c index 66142681c..ca92cff28 100644 --- a/icom/ic910.c +++ b/icom/ic910.c @@ -41,21 +41,24 @@ #ifdef HAVE_WEIRD_IC910_MODES static int ic910_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) { - /* FIX: The IC-910 has "Set FM" = 4, which is RTTY in for other radios */ - if (mode == RIG_MODE_FM) { - mode = RIG_MODE_RTTY; - } - return icom_set_mode(rig, vfo, mode, width); + /* FIX: The IC-910 has "Set FM" = 4, which is RTTY in for other radios */ + if (mode == RIG_MODE_FM) { + mode = RIG_MODE_RTTY; + } + + return icom_set_mode(rig, vfo, mode, width); } static int ic910_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) { - /* FIX: The IC-910 has "Set FM" = 4, which is RTTY in for other radios */ - int retval = icom_get_mode(rig, vfo, mode, width); - if (*mode == RIG_MODE_RTTY) { - *mode = RIG_MODE_FM; - } - return retval; + /* FIX: The IC-910 has "Set FM" = 4, which is RTTY in for other radios */ + int retval = icom_get_mode(rig, vfo, mode, width); + + if (*mode == RIG_MODE_RTTY) { + *mode = RIG_MODE_FM; + } + + return retval; } #endif /* HAVE_WEIRD_IC910_MODES */ @@ -64,129 +67,138 @@ static int ic910_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) * returns 0 if they are in different bands */ -static int compareFrequencies (RIG* rig, freq_t freq1, freq_t freq2) { - int freq1band=0, freq2band=0; - freq_range_t noband = RIG_FRNG_END; +static int compareFrequencies(RIG *rig, freq_t freq1, freq_t freq2) +{ + int freq1band = 0, freq2band = 0; + freq_range_t noband = RIG_FRNG_END; - while (rig->caps->rx_range_list1[freq1band].start!=noband.start) { - if (freq1 >= rig->caps->rx_range_list1[freq1band].start && - freq1 <= rig->caps->rx_range_list1[freq1band].end) - break; - ++freq1band; - //fprintf(stderr, "%i\n", freq1band); - } + while (rig->caps->rx_range_list1[freq1band].start != noband.start) { + if (freq1 >= rig->caps->rx_range_list1[freq1band].start && + freq1 <= rig->caps->rx_range_list1[freq1band].end) + break; - while (rig->caps->rx_range_list1[freq2band].start!=noband.start) { - if (freq2 >= rig->caps->rx_range_list1[freq2band].start && - freq2 <= rig->caps->rx_range_list1[freq2band].end) - break; - ++freq2band; - } + ++freq1band; + //fprintf(stderr, "%i\n", freq1band); + } - if (freq2band == freq1band) return 1; - else return 0; + while (rig->caps->rx_range_list1[freq2band].start != noband.start) { + if (freq2 >= rig->caps->rx_range_list1[freq2band].start && + freq2 <= rig->caps->rx_range_list1[freq2band].end) + break; + + ++freq2band; + } + + if (freq2band == freq1band) return 1; + else return 0; } - /* swaps main and sub band - but preserves PREAMP, MODE - * they are also exchanged, but we do not want that - */ +/* swaps main and sub band - but preserves PREAMP, MODE + * they are also exchanged, but we do not want that + */ -static int icom_swap_bands(RIG* rig) { - /* TODO: actually use retval! */ - int retval=0; - rmode_t mmode, smode; /* used to store the mode */ - pbwidth_t mwidth, swidth; /* used to store the width */ - value_t mpreamp, spreamp; /* used to store preamp */ - value_t matt, satt; /* used to store attenuation */ +static int icom_swap_bands(RIG *rig) +{ + /* TODO: actually use retval! */ + int retval = 0; + rmode_t mmode, smode; /* used to store the mode */ + pbwidth_t mwidth, swidth; /* used to store the width */ + value_t mpreamp, spreamp; /* used to store preamp */ + value_t matt, satt; /* used to store attenuation */ - /* main band get values */ - icom_set_vfo(rig, RIG_VFO_MAIN); - /* get the mode, width, preamp */ - icom_get_mode(rig, RIG_VFO_CURR, &mmode, &mwidth); - icom_get_level(rig, RIG_VFO_CURR, RIG_LEVEL_PREAMP, &mpreamp); - icom_get_level(rig, RIG_VFO_CURR, RIG_LEVEL_ATT, &matt); + /* main band get values */ + icom_set_vfo(rig, RIG_VFO_MAIN); + /* get the mode, width, preamp */ + icom_get_mode(rig, RIG_VFO_CURR, &mmode, &mwidth); + icom_get_level(rig, RIG_VFO_CURR, RIG_LEVEL_PREAMP, &mpreamp); + icom_get_level(rig, RIG_VFO_CURR, RIG_LEVEL_ATT, &matt); - /* sub band get values */ - icom_set_vfo(rig, RIG_VFO_SUB); - /* get the mode, width, preamp, att */ - icom_get_mode(rig, RIG_VFO_CURR, &smode, &swidth); - icom_get_level(rig, RIG_VFO_CURR, RIG_LEVEL_PREAMP, &spreamp); - icom_get_level(rig, RIG_VFO_CURR, RIG_LEVEL_ATT, &satt); + /* sub band get values */ + icom_set_vfo(rig, RIG_VFO_SUB); + /* get the mode, width, preamp, att */ + icom_get_mode(rig, RIG_VFO_CURR, &smode, &swidth); + icom_get_level(rig, RIG_VFO_CURR, RIG_LEVEL_PREAMP, &spreamp); + icom_get_level(rig, RIG_VFO_CURR, RIG_LEVEL_ATT, &satt); - /* now, we can exchange the bands */ - icom_vfo_op(rig, RIG_VFO_CURR, RIG_OP_XCHG); + /* now, we can exchange the bands */ + icom_vfo_op(rig, RIG_VFO_CURR, RIG_OP_XCHG); - /* restore the sub vales NOTE: sub band is still active */ - /* set the mode, width, preamp */ - icom_set_mode(rig, RIG_VFO_CURR, smode, swidth); - icom_set_level(rig, RIG_VFO_CURR, RIG_LEVEL_PREAMP, spreamp); - icom_set_level(rig, RIG_VFO_CURR, RIG_LEVEL_ATT, satt); + /* restore the sub vales NOTE: sub band is still active */ + /* set the mode, width, preamp */ + icom_set_mode(rig, RIG_VFO_CURR, smode, swidth); + icom_set_level(rig, RIG_VFO_CURR, RIG_LEVEL_PREAMP, spreamp); + icom_set_level(rig, RIG_VFO_CURR, RIG_LEVEL_ATT, satt); - /* restore main band values */ - icom_set_vfo(rig, RIG_VFO_MAIN); - /* set the mode, width, preamp */ - icom_set_mode(rig, RIG_VFO_CURR, mmode, mwidth); - icom_set_level(rig, RIG_VFO_CURR, RIG_LEVEL_PREAMP, mpreamp); - icom_set_level(rig, RIG_VFO_CURR, RIG_LEVEL_ATT, matt); + /* restore main band values */ + icom_set_vfo(rig, RIG_VFO_MAIN); + /* set the mode, width, preamp */ + icom_set_mode(rig, RIG_VFO_CURR, mmode, mwidth); + icom_set_level(rig, RIG_VFO_CURR, RIG_LEVEL_PREAMP, mpreamp); + icom_set_level(rig, RIG_VFO_CURR, RIG_LEVEL_ATT, matt); - return retval; + return retval; } -static int ic910_set_freq(RIG* rig, vfo_t vfo, freq_t freq) - { - int retval; - freq_t otherfreq; - freq_t oldfreq; +static int ic910_set_freq(RIG *rig, vfo_t vfo, freq_t freq) +{ + int retval; + freq_t otherfreq; + freq_t oldfreq; - retval=icom_get_freq(rig, vfo, &oldfreq); - if (retval!=RIG_OK) return retval; + retval = icom_get_freq(rig, vfo, &oldfreq); - if (!compareFrequencies(rig, freq, oldfreq)) { - /* we are on the wrong band */ - if (vfo==RIG_VFO_CURR) { - /* try to detect active subband */ - icom_set_vfo(rig, RIG_VFO_SUB); + if (retval != RIG_OK) return retval; - retval=icom_get_freq(rig, RIG_VFO_CURR, &otherfreq); - if (retval!=RIG_OK) return retval; + if (!compareFrequencies(rig, freq, oldfreq)) { + /* we are on the wrong band */ + if (vfo == RIG_VFO_CURR) { + /* try to detect active subband */ + icom_set_vfo(rig, RIG_VFO_SUB); - if (otherfreq == oldfreq) { - /* were already in subband */ - vfo = RIG_VFO_SUB; - icom_set_vfo(rig, RIG_VFO_MAIN); - retval=icom_get_freq(rig, RIG_VFO_CURR, &otherfreq); - if (retval!=RIG_OK) return retval; - } else { - /* we were in mainband */ - vfo = RIG_VFO_MAIN; - } - } else { - /* get the freq of the other band */ - if (vfo==RIG_VFO_MAIN) - icom_set_vfo(rig, RIG_VFO_SUB); - else - icom_set_vfo(rig, RIG_VFO_MAIN); + retval = icom_get_freq(rig, RIG_VFO_CURR, &otherfreq); - retval=icom_get_freq(rig, RIG_VFO_CURR, &otherfreq); - if (retval!=RIG_OK) return retval; - } + if (retval != RIG_OK) return retval; - if (compareFrequencies(rig, freq, otherfreq)) - icom_swap_bands(rig); + if (otherfreq == oldfreq) { + /* were already in subband */ + vfo = RIG_VFO_SUB; + icom_set_vfo(rig, RIG_VFO_MAIN); + retval = icom_get_freq(rig, RIG_VFO_CURR, &otherfreq); - icom_set_vfo(rig, vfo); - } - return icom_set_freq(rig, RIG_VFO_CURR, freq); - } + if (retval != RIG_OK) return retval; + } else { + /* we were in mainband */ + vfo = RIG_VFO_MAIN; + } + } else { + /* get the freq of the other band */ + if (vfo == RIG_VFO_MAIN) + icom_set_vfo(rig, RIG_VFO_SUB); + else + icom_set_vfo(rig, RIG_VFO_MAIN); + + retval = icom_get_freq(rig, RIG_VFO_CURR, &otherfreq); + + if (retval != RIG_OK) return retval; + } + + if (compareFrequencies(rig, freq, otherfreq)) + icom_swap_bands(rig); + + icom_set_vfo(rig, vfo); + } + + return icom_set_freq(rig, RIG_VFO_CURR, freq); +} /* * This function does the special bandwidth coding for IC-910 * (1 - normal, 2 - narrow) */ static int ic910_r2i_mode(RIG *rig, rmode_t mode, pbwidth_t width, - unsigned char *md, signed char *pd) + unsigned char *md, signed char *pd) { - int err; + int err; err = rig2icom_mode(rig, mode, width, md, pd); @@ -246,149 +258,156 @@ static int ic910_r2i_mode(RIG *rig, rmode_t mode, pbwidth_t width, /* */ static const struct icom_priv_caps ic910_priv_caps = { - 0x60, /* default address */ - 0, /* 731 mode */ - 0, /* no XCHG */ - ic910_ts_sc_list, - .r2i_mode = ic910_r2i_mode + 0x60, /* default address */ + 0, /* 731 mode */ + 0, /* no XCHG */ + ic910_ts_sc_list, + .r2i_mode = ic910_r2i_mode }; const struct rig_caps ic910_caps = { -.rig_model = RIG_MODEL_IC910, -.model_name = "IC-910", -.mfg_name = "Icom", -.version = BACKEND_VER ".1", -.copyright = "LGPL", -.status = RIG_STATUS_BETA, -.rig_type = RIG_TYPE_TRANSCEIVER, -.ptt_type = RIG_PTT_NONE, -.dcd_type = RIG_DCD_RIG, -.port_type = RIG_PORT_SERIAL, -.serial_rate_min = 300, -.serial_rate_max = 19200, -.serial_data_bits = 8, -.serial_stop_bits = 1, -.serial_parity = RIG_PARITY_NONE, -.serial_handshake = RIG_HANDSHAKE_NONE, -.write_delay = 0, -.post_write_delay = 0, -.timeout = 1000, -.retry = 3, -.has_get_func = IC910_FUNC_ALL, -.has_set_func = IC910_FUNC_ALL | RIG_FUNC_RESUME, -.has_get_level = IC910_LEVEL_ALL | (RIG_LEVEL_RAWSTR), -.has_set_level = IC910_LEVEL_ALL, -.has_get_parm = RIG_PARM_NONE, -.has_set_parm = RIG_PARM_NONE, -.level_gran = { - [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } }, -}, -.parm_gran = {}, -.ctcss_list = NULL, -.dcs_list = NULL, -.preamp = {20, RIG_DBLST_END, }, -.attenuator = {20, RIG_DBLST_END, }, -.max_rit = Hz(0), /* SSB,CW: +-1.0kHz FM: +-5.0kHz */ -.max_xit = Hz(0), -.max_ifshift = Hz(0), /* 1.2kHz manual knob */ -.targetable_vfo = 0, -.vfo_ops = IC910_VFO_OPS, -.scan_ops = IC910_SCAN_OPS, -.transceive = RIG_TRN_RIG, -.bank_qty = 0, -.chan_desc_sz = 0, + .rig_model = RIG_MODEL_IC910, + .model_name = "IC-910", + .mfg_name = "Icom", + .version = BACKEND_VER ".1", + .copyright = "LGPL", + .status = RIG_STATUS_BETA, + .rig_type = RIG_TYPE_TRANSCEIVER, + .ptt_type = RIG_PTT_NONE, + .dcd_type = RIG_DCD_RIG, + .port_type = RIG_PORT_SERIAL, + .serial_rate_min = 300, + .serial_rate_max = 19200, + .serial_data_bits = 8, + .serial_stop_bits = 1, + .serial_parity = RIG_PARITY_NONE, + .serial_handshake = RIG_HANDSHAKE_NONE, + .write_delay = 0, + .post_write_delay = 0, + .timeout = 1000, + .retry = 3, + .has_get_func = IC910_FUNC_ALL, + .has_set_func = IC910_FUNC_ALL | RIG_FUNC_RESUME, + .has_get_level = IC910_LEVEL_ALL | (RIG_LEVEL_RAWSTR), + .has_set_level = IC910_LEVEL_ALL, + .has_get_parm = RIG_PARM_NONE, + .has_set_parm = RIG_PARM_NONE, + .level_gran = { + [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } }, + }, + .parm_gran = {}, + .ctcss_list = NULL, + .dcs_list = NULL, + .preamp = { 20, RIG_DBLST_END, }, + .attenuator = { 20, RIG_DBLST_END, }, + .max_rit = Hz(0), /* SSB,CW: +-1.0kHz FM: +-5.0kHz */ + .max_xit = Hz(0), + .max_ifshift = Hz(0), /* 1.2kHz manual knob */ + .targetable_vfo = 0, + .vfo_ops = IC910_VFO_OPS, + .scan_ops = IC910_SCAN_OPS, + .transceive = RIG_TRN_RIG, + .bank_qty = 0, + .chan_desc_sz = 0, -.chan_list = { - { 1, 99, RIG_MTYPE_MEM }, - { 100, 105, RIG_MTYPE_EDGE }, - { 106, 106, RIG_MTYPE_CALL }, - RIG_CHAN_END, }, + .chan_list = { + { 1, 99, RIG_MTYPE_MEM }, + { 100, 105, RIG_MTYPE_EDGE }, + { 106, 106, RIG_MTYPE_CALL }, + RIG_CHAN_END, + }, -.rx_range_list1 = { /* USA */ - {MHz(144),MHz(148),IC910_MODES,-1,-1,IC910_VFO_ALL}, - {MHz(430),MHz(450),IC910_MODES,-1,-1,IC910_VFO_ALL}, - {MHz(1240),MHz(1300),IC910_MODES,-1,-1,IC910_VFO_ALL}, - RIG_FRNG_END, }, -.tx_range_list1 = { - {MHz(144),MHz(148),IC910_MODES,W(5),W(100),IC910_VFO_ALL}, - {MHz(430),MHz(450),IC910_MODES,W(5),W(75),IC910_VFO_ALL}, - {MHz(1240),MHz(1300),IC910_MODES,-1,-1,IC910_VFO_ALL}, - RIG_FRNG_END, }, + .rx_range_list1 = { /* USA */ + {MHz(144), MHz(148), IC910_MODES, -1, -1, IC910_VFO_ALL}, + {MHz(430), MHz(450), IC910_MODES, -1, -1, IC910_VFO_ALL}, + {MHz(1240), MHz(1300), IC910_MODES, -1, -1, IC910_VFO_ALL}, + RIG_FRNG_END, + }, + .tx_range_list1 = { + {MHz(144), MHz(148), IC910_MODES, W(5), W(100), IC910_VFO_ALL}, + {MHz(430), MHz(450), IC910_MODES, W(5), W(75), IC910_VFO_ALL}, + {MHz(1240), MHz(1300), IC910_MODES, -1, -1, IC910_VFO_ALL}, + RIG_FRNG_END, + }, -.rx_range_list2 = { /* Europe */ - {MHz(144),MHz(146),IC910_MODES,-1,-1,IC910_VFO_ALL}, - {MHz(430),MHz(440),IC910_MODES,-1,-1,IC910_VFO_ALL}, - {MHz(1240),MHz(1300),IC910_MODES,-1,-1,IC910_VFO_ALL}, - RIG_FRNG_END, }, -.tx_range_list2 = { - {MHz(144),MHz(146),IC910_MODES,W(5),W(100),IC910_VFO_ALL}, - {MHz(430),MHz(440),IC910_MODES,W(5),W(75),IC910_VFO_ALL}, - {MHz(1240),MHz(1300),IC910_MODES,-1,-1,IC910_VFO_ALL}, - RIG_FRNG_END, }, + .rx_range_list2 = { /* Europe */ + {MHz(144), MHz(146), IC910_MODES, -1, -1, IC910_VFO_ALL}, + {MHz(430), MHz(440), IC910_MODES, -1, -1, IC910_VFO_ALL}, + {MHz(1240), MHz(1300), IC910_MODES, -1, -1, IC910_VFO_ALL}, + RIG_FRNG_END, + }, + .tx_range_list2 = { + {MHz(144), MHz(146), IC910_MODES, W(5), W(100), IC910_VFO_ALL}, + {MHz(430), MHz(440), IC910_MODES, W(5), W(75), IC910_VFO_ALL}, + {MHz(1240), MHz(1300), IC910_MODES, -1, -1, IC910_VFO_ALL}, + RIG_FRNG_END, + }, -.tuning_steps = { - {RIG_MODE_SSB|RIG_MODE_CW,1}, - {RIG_MODE_SSB|RIG_MODE_CW,10}, - {RIG_MODE_SSB|RIG_MODE_CW,50}, - {RIG_MODE_SSB|RIG_MODE_CW,100}, - {RIG_MODE_FM,kHz(0.1)}, - {RIG_MODE_FM,kHz(5)}, - {RIG_MODE_FM,kHz(6.25)}, - {RIG_MODE_FM,kHz(10)}, - {RIG_MODE_FM,kHz(12.5)}, - {RIG_MODE_FM,kHz(20)}, - {RIG_MODE_FM,kHz(25)}, - {RIG_MODE_FM,kHz(100)}, - RIG_TS_END, }, - /* mode/filter list, remember: order matters! */ -.filters = { - {RIG_MODE_CW | RIG_MODE_SSB, kHz(2.3)}, /* builtin */ - {RIG_MODE_CW, Hz(600)}, /* with optional FL-132/Fl133 CW filters */ - {RIG_MODE_FM, kHz(15)}, /* builtin */ - {RIG_MODE_FM, kHz(6)}, /* builtin */ - RIG_FLT_END, }, -.str_cal = IC910_STR_CAL, + .tuning_steps = { + {RIG_MODE_SSB | RIG_MODE_CW, 1}, + {RIG_MODE_SSB | RIG_MODE_CW, 10}, + {RIG_MODE_SSB | RIG_MODE_CW, 50}, + {RIG_MODE_SSB | RIG_MODE_CW, 100}, + {RIG_MODE_FM, kHz(0.1)}, + {RIG_MODE_FM, kHz(5)}, + {RIG_MODE_FM, kHz(6.25)}, + {RIG_MODE_FM, kHz(10)}, + {RIG_MODE_FM, kHz(12.5)}, + {RIG_MODE_FM, kHz(20)}, + {RIG_MODE_FM, kHz(25)}, + {RIG_MODE_FM, kHz(100)}, + RIG_TS_END, + }, + /* mode/filter list, remember: order matters! */ + .filters = { + {RIG_MODE_CW | RIG_MODE_SSB, kHz(2.3)}, /* builtin */ + {RIG_MODE_CW, Hz(600)}, /* with optional FL-132/Fl133 CW filters */ + {RIG_MODE_FM, kHz(15)}, /* builtin */ + {RIG_MODE_FM, kHz(6)}, /* builtin */ + RIG_FLT_END, + }, + .str_cal = IC910_STR_CAL, -.priv = (void*)&ic910_priv_caps, -.rig_init = icom_init, -.rig_cleanup = icom_cleanup, -.rig_open = NULL, -.rig_close = NULL, + .priv = (void *)& ic910_priv_caps, + .rig_init = icom_init, + .rig_cleanup = icom_cleanup, + .rig_open = NULL, + .rig_close = NULL, -.cfgparams = icom_cfg_params, -.set_conf = icom_set_conf, -.get_conf = icom_get_conf, + .cfgparams = icom_cfg_params, + .set_conf = icom_set_conf, + .get_conf = icom_get_conf, -.get_freq = icom_get_freq, -.set_freq = ic910_set_freq, + .get_freq = icom_get_freq, + .set_freq = ic910_set_freq, #ifdef HAVE_WEIRD_IC910_MODES -.get_mode = ic910_get_mode, -.set_mode = ic910_set_mode, + .get_mode = ic910_get_mode, + .set_mode = ic910_set_mode, #else -.get_mode = icom_get_mode, -.set_mode = icom_set_mode, + .get_mode = icom_get_mode, + .set_mode = icom_set_mode, #endif -.get_vfo = NULL, -.set_vfo = icom_set_vfo, -.get_ts = icom_get_ts, -.set_ts = icom_set_ts, -.get_func = icom_get_func, -.set_func = icom_set_func, -.get_level = icom_get_level, -.set_level = icom_set_level, + .get_vfo = NULL, + .set_vfo = icom_set_vfo, + .get_ts = icom_get_ts, + .set_ts = icom_set_ts, + .get_func = icom_get_func, + .set_func = icom_set_func, + .get_level = icom_get_level, + .set_level = icom_set_level, -.set_mem = icom_set_mem, -.vfo_op = icom_vfo_op, -.scan = icom_scan, -.get_dcd = icom_get_dcd, -.decode_event = icom_decode_event, -.set_split_vfo = icom_set_split_vfo, -.set_split_freq = icom_set_split_freq, -.get_split_freq = icom_get_split_freq, -.set_split_mode = icom_set_split_mode, -.get_split_mode = icom_get_split_mode, + .set_mem = icom_set_mem, + .vfo_op = icom_vfo_op, + .scan = icom_scan, + .get_dcd = icom_get_dcd, + .decode_event = icom_decode_event, + .set_split_vfo = icom_set_split_vfo, + .set_split_freq = icom_set_split_freq, + .get_split_freq = icom_get_split_freq, + .set_split_mode = icom_set_split_mode, + .get_split_mode = icom_get_split_mode, }; /* end of file */