Apply Linux C Style to ic910.c

libusb-1-0
Nate Bargmann 2016-02-22 06:10:48 -06:00
rodzic ed3c48e71e
commit 97594e1c96
1 zmienionych plików z 252 dodań i 233 usunięć

Wyświetl plik

@ -45,6 +45,7 @@ static int ic910_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
if (mode == RIG_MODE_FM) { if (mode == RIG_MODE_FM) {
mode = RIG_MODE_RTTY; mode = RIG_MODE_RTTY;
} }
return icom_set_mode(rig, vfo, mode, width); return icom_set_mode(rig, vfo, mode, width);
} }
@ -52,9 +53,11 @@ 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 */ /* FIX: The IC-910 has "Set FM" = 4, which is RTTY in for other radios */
int retval = icom_get_mode(rig, vfo, mode, width); int retval = icom_get_mode(rig, vfo, mode, width);
if (*mode == RIG_MODE_RTTY) { if (*mode == RIG_MODE_RTTY) {
*mode = RIG_MODE_FM; *mode = RIG_MODE_FM;
} }
return retval; return retval;
} }
#endif /* HAVE_WEIRD_IC910_MODES */ #endif /* HAVE_WEIRD_IC910_MODES */
@ -64,22 +67,25 @@ static int ic910_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
* returns 0 if they are in different bands * returns 0 if they are in different bands
*/ */
static int compareFrequencies (RIG* rig, freq_t freq1, freq_t freq2) { static int compareFrequencies(RIG *rig, freq_t freq1, freq_t freq2)
int freq1band=0, freq2band=0; {
int freq1band = 0, freq2band = 0;
freq_range_t noband = RIG_FRNG_END; freq_range_t noband = RIG_FRNG_END;
while (rig->caps->rx_range_list1[freq1band].start!=noband.start) { while (rig->caps->rx_range_list1[freq1band].start != noband.start) {
if (freq1 >= rig->caps->rx_range_list1[freq1band].start && if (freq1 >= rig->caps->rx_range_list1[freq1band].start &&
freq1 <= rig->caps->rx_range_list1[freq1band].end) freq1 <= rig->caps->rx_range_list1[freq1band].end)
break; break;
++freq1band; ++freq1band;
//fprintf(stderr, "%i\n", freq1band); //fprintf(stderr, "%i\n", freq1band);
} }
while (rig->caps->rx_range_list1[freq2band].start!=noband.start) { while (rig->caps->rx_range_list1[freq2band].start != noband.start) {
if (freq2 >= rig->caps->rx_range_list1[freq2band].start && if (freq2 >= rig->caps->rx_range_list1[freq2band].start &&
freq2 <= rig->caps->rx_range_list1[freq2band].end) freq2 <= rig->caps->rx_range_list1[freq2band].end)
break; break;
++freq2band; ++freq2band;
} }
@ -87,13 +93,14 @@ static int compareFrequencies (RIG* rig, freq_t freq1, freq_t freq2) {
else return 0; else return 0;
} }
/* swaps main and sub band - but preserves PREAMP, MODE /* swaps main and sub band - but preserves PREAMP, MODE
* they are also exchanged, but we do not want that * they are also exchanged, but we do not want that
*/ */
static int icom_swap_bands(RIG* rig) { static int icom_swap_bands(RIG *rig)
{
/* TODO: actually use retval! */ /* TODO: actually use retval! */
int retval=0; int retval = 0;
rmode_t mmode, smode; /* used to store the mode */ rmode_t mmode, smode; /* used to store the mode */
pbwidth_t mwidth, swidth; /* used to store the width */ pbwidth_t mwidth, swidth; /* used to store the width */
value_t mpreamp, spreamp; /* used to store preamp */ value_t mpreamp, spreamp; /* used to store preamp */
@ -132,43 +139,47 @@ static int icom_swap_bands(RIG* rig) {
return retval; return retval;
} }
static int ic910_set_freq(RIG* rig, vfo_t vfo, freq_t freq) static int ic910_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
{ {
int retval; int retval;
freq_t otherfreq; freq_t otherfreq;
freq_t oldfreq; freq_t oldfreq;
retval=icom_get_freq(rig, vfo, &oldfreq); retval = icom_get_freq(rig, vfo, &oldfreq);
if (retval!=RIG_OK) return retval;
if (retval != RIG_OK) return retval;
if (!compareFrequencies(rig, freq, oldfreq)) { if (!compareFrequencies(rig, freq, oldfreq)) {
/* we are on the wrong band */ /* we are on the wrong band */
if (vfo==RIG_VFO_CURR) { if (vfo == RIG_VFO_CURR) {
/* try to detect active subband */ /* try to detect active subband */
icom_set_vfo(rig, RIG_VFO_SUB); icom_set_vfo(rig, RIG_VFO_SUB);
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 (otherfreq == oldfreq) { if (otherfreq == oldfreq) {
/* were already in subband */ /* were already in subband */
vfo = RIG_VFO_SUB; vfo = RIG_VFO_SUB;
icom_set_vfo(rig, RIG_VFO_MAIN); 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;
} else { } else {
/* we were in mainband */ /* we were in mainband */
vfo = RIG_VFO_MAIN; vfo = RIG_VFO_MAIN;
} }
} else { } else {
/* get the freq of the other band */ /* get the freq of the other band */
if (vfo==RIG_VFO_MAIN) if (vfo == RIG_VFO_MAIN)
icom_set_vfo(rig, RIG_VFO_SUB); icom_set_vfo(rig, RIG_VFO_SUB);
else else
icom_set_vfo(rig, RIG_VFO_MAIN); 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)) if (compareFrequencies(rig, freq, otherfreq))
@ -176,8 +187,9 @@ static int ic910_set_freq(RIG* rig, vfo_t vfo, freq_t freq)
icom_set_vfo(rig, vfo); icom_set_vfo(rig, vfo);
} }
return icom_set_freq(rig, RIG_VFO_CURR, freq); return icom_set_freq(rig, RIG_VFO_CURR, freq);
} }
/* /*
* This function does the special bandwidth coding for IC-910 * This function does the special bandwidth coding for IC-910
@ -254,141 +266,148 @@ static const struct icom_priv_caps ic910_priv_caps = {
}; };
const struct rig_caps ic910_caps = { const struct rig_caps ic910_caps = {
.rig_model = RIG_MODEL_IC910, .rig_model = RIG_MODEL_IC910,
.model_name = "IC-910", .model_name = "IC-910",
.mfg_name = "Icom", .mfg_name = "Icom",
.version = BACKEND_VER ".1", .version = BACKEND_VER ".1",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_BETA, .status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
.ptt_type = RIG_PTT_NONE, .ptt_type = RIG_PTT_NONE,
.dcd_type = RIG_DCD_RIG, .dcd_type = RIG_DCD_RIG,
.port_type = RIG_PORT_SERIAL, .port_type = RIG_PORT_SERIAL,
.serial_rate_min = 300, .serial_rate_min = 300,
.serial_rate_max = 19200, .serial_rate_max = 19200,
.serial_data_bits = 8, .serial_data_bits = 8,
.serial_stop_bits = 1, .serial_stop_bits = 1,
.serial_parity = RIG_PARITY_NONE, .serial_parity = RIG_PARITY_NONE,
.serial_handshake = RIG_HANDSHAKE_NONE, .serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0, .write_delay = 0,
.post_write_delay = 0, .post_write_delay = 0,
.timeout = 1000, .timeout = 1000,
.retry = 3, .retry = 3,
.has_get_func = IC910_FUNC_ALL, .has_get_func = IC910_FUNC_ALL,
.has_set_func = IC910_FUNC_ALL | RIG_FUNC_RESUME, .has_set_func = IC910_FUNC_ALL | RIG_FUNC_RESUME,
.has_get_level = IC910_LEVEL_ALL | (RIG_LEVEL_RAWSTR), .has_get_level = IC910_LEVEL_ALL | (RIG_LEVEL_RAWSTR),
.has_set_level = IC910_LEVEL_ALL, .has_set_level = IC910_LEVEL_ALL,
.has_get_parm = RIG_PARM_NONE, .has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE,
.level_gran = { .level_gran = {
[LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } }, [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
}, },
.parm_gran = {}, .parm_gran = {},
.ctcss_list = NULL, .ctcss_list = NULL,
.dcs_list = NULL, .dcs_list = NULL,
.preamp = {20, RIG_DBLST_END, }, .preamp = { 20, RIG_DBLST_END, },
.attenuator = {20, RIG_DBLST_END, }, .attenuator = { 20, RIG_DBLST_END, },
.max_rit = Hz(0), /* SSB,CW: +-1.0kHz FM: +-5.0kHz */ .max_rit = Hz(0), /* SSB,CW: +-1.0kHz FM: +-5.0kHz */
.max_xit = Hz(0), .max_xit = Hz(0),
.max_ifshift = Hz(0), /* 1.2kHz manual knob */ .max_ifshift = Hz(0), /* 1.2kHz manual knob */
.targetable_vfo = 0, .targetable_vfo = 0,
.vfo_ops = IC910_VFO_OPS, .vfo_ops = IC910_VFO_OPS,
.scan_ops = IC910_SCAN_OPS, .scan_ops = IC910_SCAN_OPS,
.transceive = RIG_TRN_RIG, .transceive = RIG_TRN_RIG,
.bank_qty = 0, .bank_qty = 0,
.chan_desc_sz = 0, .chan_desc_sz = 0,
.chan_list = { .chan_list = {
{ 1, 99, RIG_MTYPE_MEM }, { 1, 99, RIG_MTYPE_MEM },
{ 100, 105, RIG_MTYPE_EDGE }, { 100, 105, RIG_MTYPE_EDGE },
{ 106, 106, RIG_MTYPE_CALL }, { 106, 106, RIG_MTYPE_CALL },
RIG_CHAN_END, }, RIG_CHAN_END,
},
.rx_range_list1 = { /* USA */ .rx_range_list1 = { /* USA */
{MHz(144),MHz(148),IC910_MODES,-1,-1,IC910_VFO_ALL}, {MHz(144), MHz(148), IC910_MODES, -1, -1, IC910_VFO_ALL},
{MHz(430),MHz(450),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}, {MHz(1240), MHz(1300), IC910_MODES, -1, -1, IC910_VFO_ALL},
RIG_FRNG_END, }, RIG_FRNG_END,
.tx_range_list1 = { },
{MHz(144),MHz(148),IC910_MODES,W(5),W(100),IC910_VFO_ALL}, .tx_range_list1 = {
{MHz(430),MHz(450),IC910_MODES,W(5),W(75),IC910_VFO_ALL}, {MHz(144), MHz(148), IC910_MODES, W(5), W(100), IC910_VFO_ALL},
{MHz(1240),MHz(1300),IC910_MODES,-1,-1,IC910_VFO_ALL}, {MHz(430), MHz(450), IC910_MODES, W(5), W(75), IC910_VFO_ALL},
RIG_FRNG_END, }, {MHz(1240), MHz(1300), IC910_MODES, -1, -1, IC910_VFO_ALL},
RIG_FRNG_END,
},
.rx_range_list2 = { /* Europe */ .rx_range_list2 = { /* Europe */
{MHz(144),MHz(146),IC910_MODES,-1,-1,IC910_VFO_ALL}, {MHz(144), MHz(146), IC910_MODES, -1, -1, IC910_VFO_ALL},
{MHz(430),MHz(440),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}, {MHz(1240), MHz(1300), IC910_MODES, -1, -1, IC910_VFO_ALL},
RIG_FRNG_END, }, RIG_FRNG_END,
.tx_range_list2 = { },
{MHz(144),MHz(146),IC910_MODES,W(5),W(100),IC910_VFO_ALL}, .tx_range_list2 = {
{MHz(430),MHz(440),IC910_MODES,W(5),W(75),IC910_VFO_ALL}, {MHz(144), MHz(146), IC910_MODES, W(5), W(100), IC910_VFO_ALL},
{MHz(1240),MHz(1300),IC910_MODES,-1,-1,IC910_VFO_ALL}, {MHz(430), MHz(440), IC910_MODES, W(5), W(75), IC910_VFO_ALL},
RIG_FRNG_END, }, {MHz(1240), MHz(1300), IC910_MODES, -1, -1, IC910_VFO_ALL},
RIG_FRNG_END,
},
.tuning_steps = { .tuning_steps = {
{RIG_MODE_SSB|RIG_MODE_CW,1}, {RIG_MODE_SSB | RIG_MODE_CW, 1},
{RIG_MODE_SSB|RIG_MODE_CW,10}, {RIG_MODE_SSB | RIG_MODE_CW, 10},
{RIG_MODE_SSB|RIG_MODE_CW,50}, {RIG_MODE_SSB | RIG_MODE_CW, 50},
{RIG_MODE_SSB|RIG_MODE_CW,100}, {RIG_MODE_SSB | RIG_MODE_CW, 100},
{RIG_MODE_FM,kHz(0.1)}, {RIG_MODE_FM, kHz(0.1)},
{RIG_MODE_FM,kHz(5)}, {RIG_MODE_FM, kHz(5)},
{RIG_MODE_FM,kHz(6.25)}, {RIG_MODE_FM, kHz(6.25)},
{RIG_MODE_FM,kHz(10)}, {RIG_MODE_FM, kHz(10)},
{RIG_MODE_FM,kHz(12.5)}, {RIG_MODE_FM, kHz(12.5)},
{RIG_MODE_FM,kHz(20)}, {RIG_MODE_FM, kHz(20)},
{RIG_MODE_FM,kHz(25)}, {RIG_MODE_FM, kHz(25)},
{RIG_MODE_FM,kHz(100)}, {RIG_MODE_FM, kHz(100)},
RIG_TS_END, }, RIG_TS_END,
},
/* mode/filter list, remember: order matters! */ /* mode/filter list, remember: order matters! */
.filters = { .filters = {
{RIG_MODE_CW | RIG_MODE_SSB, kHz(2.3)}, /* builtin */ {RIG_MODE_CW | RIG_MODE_SSB, kHz(2.3)}, /* builtin */
{RIG_MODE_CW, Hz(600)}, /* with optional FL-132/Fl133 CW filters */ {RIG_MODE_CW, Hz(600)}, /* with optional FL-132/Fl133 CW filters */
{RIG_MODE_FM, kHz(15)}, /* builtin */ {RIG_MODE_FM, kHz(15)}, /* builtin */
{RIG_MODE_FM, kHz(6)}, /* builtin */ {RIG_MODE_FM, kHz(6)}, /* builtin */
RIG_FLT_END, }, RIG_FLT_END,
.str_cal = IC910_STR_CAL, },
.str_cal = IC910_STR_CAL,
.priv = (void*)&ic910_priv_caps, .priv = (void *)& ic910_priv_caps,
.rig_init = icom_init, .rig_init = icom_init,
.rig_cleanup = icom_cleanup, .rig_cleanup = icom_cleanup,
.rig_open = NULL, .rig_open = NULL,
.rig_close = NULL, .rig_close = NULL,
.cfgparams = icom_cfg_params, .cfgparams = icom_cfg_params,
.set_conf = icom_set_conf, .set_conf = icom_set_conf,
.get_conf = icom_get_conf, .get_conf = icom_get_conf,
.get_freq = icom_get_freq, .get_freq = icom_get_freq,
.set_freq = ic910_set_freq, .set_freq = ic910_set_freq,
#ifdef HAVE_WEIRD_IC910_MODES #ifdef HAVE_WEIRD_IC910_MODES
.get_mode = ic910_get_mode, .get_mode = ic910_get_mode,
.set_mode = ic910_set_mode, .set_mode = ic910_set_mode,
#else #else
.get_mode = icom_get_mode, .get_mode = icom_get_mode,
.set_mode = icom_set_mode, .set_mode = icom_set_mode,
#endif #endif
.get_vfo = NULL, .get_vfo = NULL,
.set_vfo = icom_set_vfo, .set_vfo = icom_set_vfo,
.get_ts = icom_get_ts, .get_ts = icom_get_ts,
.set_ts = icom_set_ts, .set_ts = icom_set_ts,
.get_func = icom_get_func, .get_func = icom_get_func,
.set_func = icom_set_func, .set_func = icom_set_func,
.get_level = icom_get_level, .get_level = icom_get_level,
.set_level = icom_set_level, .set_level = icom_set_level,
.set_mem = icom_set_mem, .set_mem = icom_set_mem,
.vfo_op = icom_vfo_op, .vfo_op = icom_vfo_op,
.scan = icom_scan, .scan = icom_scan,
.get_dcd = icom_get_dcd, .get_dcd = icom_get_dcd,
.decode_event = icom_decode_event, .decode_event = icom_decode_event,
.set_split_vfo = icom_set_split_vfo, .set_split_vfo = icom_set_split_vfo,
.set_split_freq = icom_set_split_freq, .set_split_freq = icom_set_split_freq,
.get_split_freq = icom_get_split_freq, .get_split_freq = icom_get_split_freq,
.set_split_mode = icom_set_split_mode, .set_split_mode = icom_set_split_mode,
.get_split_mode = icom_get_split_mode, .get_split_mode = icom_get_split_mode,
}; };
/* end of file */ /* end of file */