Touch up drake.c with astyle

Prior reformat had only been a reindent with Emacs.  Now use astyle.
libusb-1-0
Nate Bargmann 2016-02-14 18:07:16 -06:00
rodzic 4595f77f99
commit 65f87fb78c
1 zmienionych plików z 192 dodań i 100 usunięć

Wyświetl plik

@ -83,6 +83,7 @@ int drake_transaction(RIG *rig, const char *cmd, int cmd_len, char *data, int *d
if (retval == -RIG_ETIMEOUT)
retval = 0;
if (retval < 0)
return retval;
@ -184,9 +185,13 @@ int drake_set_vfo(RIG *rig, vfo_t vfo)
switch (vfo) {
case RIG_VFO_A : vfo_function = 'A'; break;
case RIG_VFO_B : vfo_function = 'B'; break;
case RIG_VFO_VFO: vfo_function = 'F'; break;
case RIG_VFO_MEM: vfo_function = 'C'; break;
default:
rig_debug(RIG_DEBUG_ERR, "drake_set_vfo: unsupported VFO %d\n",
vfo);
@ -197,6 +202,7 @@ int drake_set_vfo(RIG *rig, vfo_t vfo)
if ((vfo_function == 'A') || (vfo_function == 'B'))
cmd_len = sprintf((char *) cmdbuf, "V%c" EOM, vfo_function);
if ((vfo_function == 'F') || (vfo_function == 'C'))
cmd_len = sprintf((char *) cmdbuf, "%c" EOM, vfo_function);
@ -230,9 +236,12 @@ int drake_get_vfo(RIG *rig, vfo_t *vfo)
*vfo = RIG_VFO_MEM;
else {
cvfo = (mdbuf[9] & 0x38);
switch (cvfo) {
case '0' : *vfo = RIG_VFO_B; break;
case '8' : *vfo = RIG_VFO_A; break;
default : rig_debug(RIG_DEBUG_ERR,
"drake_get_vfo: unsupported vfo %c\n", cvfo);
*vfo = RIG_VFO_VFO;
@ -255,14 +264,20 @@ int drake_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
switch (mode) {
case RIG_MODE_CW: mode_sel = MD_CW; break;
case RIG_MODE_ECSSUSB:
case RIG_MODE_USB: mode_sel = MD_USB; break;
case RIG_MODE_ECSSLSB:
case RIG_MODE_LSB: mode_sel = MD_LSB; break;
case RIG_MODE_FM: mode_sel = MD_FM; break;
case RIG_MODE_AMS:
case RIG_MODE_AM: mode_sel = MD_AM; break;
case RIG_MODE_RTTY: mode_sel = MD_RTTY; break;
default:
rig_debug(RIG_DEBUG_ERR, "drake_set_mode: "
"unsupported mode %d\n", mode);
@ -282,15 +297,21 @@ int drake_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
switch (width) {
case 500: width_sel = '0'; break;
case 1800: width_sel = '1'; break;
case 2300: width_sel = '2'; break;
case 4000: width_sel = '4'; break;
case 6000: width_sel = '6'; break;
default:
rig_debug(RIG_DEBUG_ERR, "drake_set_mode: "
"unsupported width %d\n", width);
return -RIG_EINVAL;
}
mdbuf_len = sprintf((char *) mdbuf, "W%c" EOM, width_sel);
retval = drake_transaction(rig, (char *) mdbuf, mdbuf_len, (char *) ackbuf, &ack_len);
}
@ -336,10 +357,15 @@ int drake_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
switch (cwidth & 0x37) {
case '0': *width = s_Hz(500); break;
case '1': *width = s_Hz(1800); break;
case '2': *width = s_Hz(2300); break;
case '3': *width = s_Hz(4000); break;
case '4': *width = s_Hz(6000); break;
default :
rig_debug(RIG_DEBUG_ERR,
"drake_get_mode: unsupported width %c\n",
@ -351,8 +377,11 @@ int drake_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
if ((cwidth >= '0') && (cwidth <= '4')) {
switch (cmode & 0x33) {
case '0': *mode = RIG_MODE_LSB; break;
case '1': *mode = RIG_MODE_RTTY; break;
case '2': *mode = RIG_MODE_FM; *width = s_Hz(12000); break;
default :
rig_debug(RIG_DEBUG_ERR,
"drake_get_mode: unsupported mode %c\n",
@ -363,8 +392,11 @@ int drake_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
} else {
switch (cmode & 0x33) {
case '0': *mode = RIG_MODE_USB; break;
case '1': *mode = RIG_MODE_CW; break;
case '2': *mode = RIG_MODE_AM; break;
default :
rig_debug(RIG_DEBUG_ERR,
"drake_get_mode: unsupported mode %c\n",
@ -377,13 +409,12 @@ int drake_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
if ((csynch & 0x34) == '4') {
if (*mode == RIG_MODE_AM)
*mode = RIG_MODE_AMS;
else
if (*mode == RIG_MODE_USB)
else if (*mode == RIG_MODE_USB)
*mode = RIG_MODE_ECSSUSB;
else
if (*mode == RIG_MODE_LSB)
else if (*mode == RIG_MODE_LSB)
*mode = RIG_MODE_ECSSLSB;
}
return RIG_OK;
}
@ -428,8 +459,11 @@ int drake_get_ant(RIG *rig, vfo_t vfo, ant_t *ant)
switch (cant & 0x3c) {
case '0': *ant = RIG_ANT_1; break;
case '4': *ant = RIG_ANT_3; break;
case '8': *ant = RIG_ANT_2; break;
default :
rig_debug(RIG_DEBUG_ERR,
"drake_get_ant: unsupported antenna %c\n",
@ -517,6 +551,7 @@ int drake_set_chan(RIG *rig, const channel_t *chan)
if (old_vfo == RIG_VFO_MEM) {
old_chan = priv->curr_ch;
retval = drake_set_vfo(rig, RIG_VFO_VFO);
if (retval != RIG_OK)
return retval;
}
@ -592,11 +627,13 @@ int drake_get_chan(RIG *rig, channel_t *chan)
//go to new channel
retval = drake_set_mem(rig, RIG_VFO_CURR, chan->channel_num);
if (retval != RIG_OK)
return RIG_OK;
//now decypher it
retval = drake_transaction(rig, "RA" EOM, 3, mdbuf, &mdbuf_len);
if (retval != RIG_OK)
return retval;
@ -611,8 +648,11 @@ int drake_get_chan(RIG *rig, channel_t *chan)
switch (mdbuf[5] & 0x33) {
case '0': chan->levels[rig_setting2idx(RIG_LEVEL_AGC)].i = RIG_AGC_OFF; break;
case '2': chan->levels[rig_setting2idx(RIG_LEVEL_AGC)].i = RIG_AGC_FAST; break;
case '3': chan->levels[rig_setting2idx(RIG_LEVEL_AGC)].i = RIG_AGC_SLOW; break;
default : chan->levels[rig_setting2idx(RIG_LEVEL_AGC)].i = RIG_AGC_FAST;
}
@ -627,33 +667,47 @@ int drake_get_chan(RIG *rig, channel_t *chan)
switch (mdbuf[7] & 0x3c) {
case '0': chan->ant = RIG_ANT_1; break;
case '4': chan->ant = RIG_ANT_3; break;
case '8': chan->ant = RIG_ANT_2; break;
default : chan->ant = RIG_ANT_NONE;
}
switch (mdbuf[8] & 0x37) {
case '0': chan->width = s_Hz(500); break;
case '1': chan->width = s_Hz(1800); break;
case '2': chan->width = s_Hz(2300); break;
case '3': chan->width = s_Hz(4000); break;
case '4': chan->width = s_Hz(6000); break;
default : chan->width = RIG_PASSBAND_NORMAL;
}
if ((mdbuf[8] >= '0') && (mdbuf[8] <= '4')) {
switch (mdbuf[7] & 0x33) {
case '0': chan->mode = RIG_MODE_LSB; break;
case '1': chan->mode = RIG_MODE_RTTY; break;
case '2': chan->mode = RIG_MODE_FM;
chan->width = s_Hz(12000); break;
default : chan->mode = RIG_MODE_NONE;
}
} else {
switch (mdbuf[7] & 0x33) {
case '0': chan->mode = RIG_MODE_USB; break;
case '1': chan->mode = RIG_MODE_CW; break;
case '2': chan->mode = RIG_MODE_AM; break;
default : chan->mode = RIG_MODE_NONE;
}
}
@ -669,8 +723,10 @@ int drake_get_chan(RIG *rig, channel_t *chan)
strncpy(freqstr, mdbuf + 11, 9);
freqstr[9] = 0x00;
if ((mdbuf[21] == 'k') || (mdbuf[21] == 'K'))
chan->freq = strtod(freqstr, NULL) * 1000.0;
if ((mdbuf[21] == 'm') || (mdbuf[21] == 'M'))
chan->freq = strtod(freqstr, NULL) * 1000000.0;
@ -680,10 +736,12 @@ int drake_get_chan(RIG *rig, channel_t *chan)
//now put the radio back the way it was
if (old_vfo != RIG_VFO_MEM) {
retval = drake_set_vfo(rig, RIG_VFO_VFO);
if (retval != RIG_OK)
return retval;
} else {
retval = drake_set_mem(rig, RIG_VFO_CURR, old_chan);
if (retval != RIG_OK)
return retval;
}
@ -705,22 +763,28 @@ int drake_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
case RIG_OP_UP:
len = sprintf(buf, "U");
break;
case RIG_OP_DOWN:
len = sprintf(buf, "D");
break;
case RIG_OP_CPY:
len = sprintf(buf, "A E B" EOM);
break;
case RIG_OP_TO_VFO:
/* len = sprintf(buf,"C%03d" EOM, priv->curr_ch); */
len = sprintf(buf, "F" EOM);
break;
case RIG_OP_MCL:
len = sprintf(buf, "EC%03d" EOM, priv->curr_ch);
break;
case RIG_OP_FROM_VFO:
len = sprintf(buf, "PR" EOM "%03d" EOM, priv->curr_ch);
break;
default:
return -RIG_EINVAL;
}
@ -743,13 +807,16 @@ int drake_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
case RIG_FUNC_MN:
len = sprintf(buf, "N%c" EOM, status ? 'O' : 'F');
break;
case RIG_FUNC_LOCK:
len = sprintf(buf, "L%c" EOM, status ? 'O' : 'F');
break;
case RIG_FUNC_NB:
/* TODO: NB narrow */
len = sprintf(buf, "B%c" EOM, status ? 'W' : 'F');
break;
default:
return -RIG_EINVAL;
}
@ -785,11 +852,13 @@ int drake_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
mc = mdbuf[2];
*status = ((mc & 0x32) == '2');
break;
case RIG_FUNC_NB:
/* TODO: NB narrow */
mc = mdbuf[1];
*status = ((mc >= '4') && (mc <= '?'));
break;
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported get func %d\n", func);
return -RIG_EINVAL;
@ -811,14 +880,17 @@ int drake_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_PREAMP:
len = sprintf(buf, "G%c" EOM, val.i ? '+' : '0');
break;
case RIG_LEVEL_ATT:
len = sprintf(buf, "G%c" EOM, val.i ? '-' : '0');
break;
case RIG_LEVEL_AGC:
len = sprintf(buf, "A%c" EOM,
val.i == RIG_AGC_OFF ? 'O' :
(val.i == RIG_AGC_FAST ? 'F' : 'S'));
break;
default:
return -RIG_EINVAL;
}
@ -840,6 +912,7 @@ int drake_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
if ((level != RIG_LEVEL_RAWSTR) && (level != RIG_LEVEL_STRENGTH)) {
retval = drake_transaction(rig, "RM" EOM, 3, lvlbuf, &lvl_len);
if (retval != RIG_OK)
return retval;
@ -853,6 +926,7 @@ int drake_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
switch (level) {
case RIG_LEVEL_RAWSTR:
retval = drake_transaction(rig, "RSS" EOM, 4, lvlbuf, &lvl_len);
if (retval != RIG_OK)
return retval;
@ -865,8 +939,10 @@ int drake_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
lvlbuf[3] = '\0';
val->i = strtol(lvlbuf + 1, (char **)NULL, 16);
break;
case RIG_LEVEL_STRENGTH:
retval = drake_transaction(rig, "RSS" EOM, 4, lvlbuf, &lvl_len);
if (retval != RIG_OK)
return retval;
@ -880,29 +956,42 @@ int drake_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
ss = strtol(lvlbuf + 1, (char **)NULL, 16);
val->i = (int)rig_raw2val(ss, &rig->caps->str_cal);
break;
case RIG_LEVEL_PREAMP:
mc = lvlbuf[2];
if ((mc & 0x3c) == '8')
val->i = 10;
else
val->i = 0;
break;
case RIG_LEVEL_ATT:
mc = lvlbuf[2];
if ((mc & 0x3c) == '4')
val->i = 10;
else
val->i = 0;
break;
case RIG_LEVEL_AGC:
mc = lvlbuf[1];
switch (mc & 0x33) {
case '0': val->i = RIG_AGC_OFF; break;
case '2': val->i = RIG_AGC_FAST; break;
case '3': val->i = RIG_AGC_SLOW; break;
default : val->i = RIG_AGC_FAST;
}
break;
default:
rig_debug(RIG_DEBUG_ERR, "Unsupported get_level %d\n", level);
return -RIG_EINVAL;
@ -1010,11 +1099,14 @@ DECLARE_PROBERIG_BACKEND(drake)
if (!strcmp(idbuf, "R8B")) {
if (cfunc)
(*cfunc)(port, RIG_MODEL_DKR8B, data);
return RIG_MODEL_DKR8B;
}
if (!strcmp(idbuf, "R8A")) { /* TBC */
if (cfunc)
(*cfunc)(port, RIG_MODEL_DKR8A, data);
return RIG_MODEL_DKR8A;
}