mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

All conversions to rig_flush now done 

https://github.com/Hamlib/Hamlib/issues/307
pull/345/head
Michael Black W9MDB 2020-06-23 09:01:46 -05:00
rodzic b50975729c
commit b6a960d48e
61 zmienionych plików z 82 dodań i 100 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
rigs/adat/adat.c
Wyświetl plik

@ -1264,7 +1264,7 @@ int adat_send(RIG *pRig,
"*** ADAT: %d %s (%s:%d): ENTRY. Params: pRig = %p, pcData = %s\n",
gFnLevel, __func__, __FILE__, __LINE__, pRig, pcData);
serial_flush(&pRigState->rigport);
rig_flush(&pRigState->rigport);
nRC = write_block(&pRigState->rigport, pcData, strlen(pcData));
@ -1562,7 +1562,7 @@ int adat_get_single_cmd_result(RIG *pRig)
}
}
serial_flush(&pRigState->rigport);
rig_flush(&pRigState->rigport);
pPriv->nRC = nRC;
}

2
rigs/alinco/dx77.c
Wyświetl plik

@ -308,7 +308,7 @@ int dx77_transaction(RIG *rig,
rs = &rig->state;
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);

2
rigs/alinco/dxsr8.c
Wyświetl plik

@ -251,7 +251,7 @@ int dxsr8_transaction(RIG *rig,
rs = &rig->state;
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);

2
rigs/aor/aor.c
Wyświetl plik

@ -80,7 +80,7 @@ static int aor_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rs = &rig->state;
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);

2
rigs/aor/ar3000.c
Wyświetl plik

@ -196,7 +196,7 @@ static int ar3k_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rs = &rig->state;
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);

4
rigs/aor/ar3030.c
Wyświetl plik

@ -231,7 +231,7 @@ static int ar3030_transaction(RIG *rig, const char *cmd, int cmd_len,
data = tmpdata;
}
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
do
{
@ -315,7 +315,7 @@ int ar3030_close(RIG *rig)
rig_debug(RIG_DEBUG_TRACE, "%s:\n", __func__);
rs = &rig->state;
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
retval = ar3030_transaction(rig, "Q" CR, strlen("Q" CR), NULL, NULL);
rig_debug(RIG_DEBUG_TRACE, "%s: retval=%d\n", __func__, retval);

2
rigs/aor/sr2200.c
Wyświetl plik

@ -285,7 +285,7 @@ static int sr2200_transaction(RIG *rig, const char *cmd, int cmd_len,
rs = &rig->state;
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);

2
rigs/barrett/barrett.c
Wyświetl plik

@ -231,7 +231,7 @@ int barrett_transaction(RIG *rig, char *cmd, int expected, char **result)
cmd_len = snprintf(cmd_buf, sizeof(cmd_buf), "%s%s", cmd, EOM);
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd_buf, cmd_len);
if (retval < 0)

2
rigs/drake/drake.c
Wyświetl plik

@ -69,7 +69,7 @@ int drake_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rs = &rig->state;
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);

10
rigs/elad/elad.c
Wyświetl plik

@ -223,15 +223,7 @@ transaction_write:
}
/* flush anything in the read buffer before command is sent */
if (rs->rigport.type.rig == RIG_PORT_NETWORK
|| rs->rigport.type.rig == RIG_PORT_UDP_NETWORK)
{
network_flush(&rs->rigport);
}
else
{
serial_flush(&rs->rigport);
}
rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, len);

2
rigs/icmarine/icmarine.c
Wyświetl plik

@ -256,7 +256,7 @@ int icmarine_transaction(RIG *rig, const char *cmd, const char *param,
rs = &rig->state;
priv = (struct icmarine_priv_data *)rs->priv;
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
/* command formating */
cmd_len = snprintf(cmdbuf, BUFSZ, "$PICOA,%02d,%02u,%s",

2
rigs/icom/frame.c
Wyświetl plik

@ -130,7 +130,7 @@ int icom_one_transaction(RIG *rig, int cmd, int subcmd,
// cppcheck-suppress *
Hold_Decode(rig);
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, (char *) sendbuf, frm_len);

4
rigs/icom/icom.c
Wyświetl plik

@ -7279,7 +7279,7 @@ DECLARE_PROBERIG_BACKEND(icom)
frm_len = make_cmd_frame((char *) buf, civ_addr, CTRLID,
C_RD_TRXID, S_RD_TRXID, NULL, 0);
serial_flush(port);
rig_flush(port);
write_block(port, (char *) buf, frm_len);
/* read out the bytes we just sent
@ -7353,7 +7353,7 @@ DECLARE_PROBERIG_BACKEND(icom)
frm_len = make_cmd_frame((char *) buf, civ_addr, CTRLID,
C_CTL_MISC, S_OPTO_RDID, NULL, 0);
serial_flush(port);
rig_flush(port);
write_block(port, (char *) buf, frm_len);
/* read out the bytes we just sent

2
rigs/jrc/jrc.c
Wyświetl plik

@ -75,7 +75,7 @@ static int jrc_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rs = &rig->state;
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
// cppcheck-suppress *
Hold_Decode(rig);

6
rigs/kachina/kachina.c
Wyświetl plik

@ -84,7 +84,7 @@ static int kachina_transaction(RIG *rig, unsigned char cmd1, unsigned char cmd2)
buf4[2] = cmd2;
buf4[3] = ETX;
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, (char *) buf4, 4);
@ -119,7 +119,7 @@ static int kachina_trans_n(RIG *rig, unsigned char cmd1, const char *data,
cmd_len = data_len + 3;
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, (char *) buf, cmd_len);
@ -270,7 +270,7 @@ int kachina_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
/* telemetry sent to the PC automatically at a 50msec rate */
serial_flush(&rig->state.rigport);
rig_flush(&rig->state.rigport);
count = read_string(&rig->state.rigport, (char *) buf, 31, rcv_signal_range,
128);

2
rigs/kenwood/ic10.c
Wyświetl plik

@ -89,7 +89,7 @@ int ic10_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rs = &rig->state;
transaction:
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);

10
rigs/kenwood/kenwood.c
Wyświetl plik

@ -311,15 +311,7 @@ transaction_write:
}
/* flush anything in the read buffer before command is sent */
if (rs->rigport.type.rig == RIG_PORT_NETWORK
|| rs->rigport.type.rig == RIG_PORT_UDP_NETWORK)
{
network_flush(&rs->rigport);
}
else
{
serial_flush(&rs->rigport);
}
rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, len);

2
rigs/kenwood/thd72.c
Wyświetl plik

@ -1514,7 +1514,7 @@ int thd72_get_chan_all_cb(RIG *rig, chan_cb_t chan_cb, rig_ptr_t arg)
hl_usleep(100 * 1000); /* let the pcr settle */
serial_flush(rp); /* flush any remaining data */
rig_flush(rp); /* flush any remaining data */
ret = ser_set_rts(rp, 1); /* setRTS or Hardware flow control? */
if (ret != RIG_OK)

2
rigs/kenwood/thd74.c
Wyświetl plik

@ -1526,7 +1526,7 @@ int thd74_get_chan_all_cb(RIG *rig, chan_cb_t chan_cb, rig_ptr_t arg)
hl_usleep(100 * 1000); /* let the pcr settle */
serial_flush(rp); /* flush any remaining data */
rig_flush(rp); /* flush any remaining data */
ret = ser_set_rts(rp, 1); /* setRTS or Hardware flow control? */
if (ret != RIG_OK)

2
rigs/kit/drt1.c
Wyświetl plik

@ -415,7 +415,7 @@ int drt1_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
priv = (struct drt1_priv_data *)rig->state.priv;
serial_flush(port);
rig_flush(port);
/* Initialization */
ad_ioupd(port, 0);

2
rigs/kit/elektor304.c
Wyświetl plik

@ -345,7 +345,7 @@ int elektor304_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
priv = (struct elektor304_priv_data *)rig->state.priv;
serial_flush(port);
rig_flush(port);
/* Initialization */
ad_fsync(port, 0);

2
rigs/kit/miniVNA.c
Wyświetl plik

@ -46,7 +46,7 @@ static int miniVNA_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
rig_debug(RIG_DEBUG_TRACE, "%s called: %s %s\n", __func__,
rig_strvfo(vfo), fstr);
serial_flush(&rig->state.rigport);
rig_flush(&rig->state.rigport);
sprintf(cmdstr, "0\r%lu\r1\r0\r", (unsigned long int)(freq * DDS_RATIO));

6
rigs/kit/rs_hfiq.c
Wyświetl plik

@ -79,7 +79,7 @@ static int rshfiq_open(RIG *rig)
}
}
serial_flush(&rig->state.rigport);
rig_flush(&rig->state.rigport);
snprintf(versionstr, sizeof(versionstr), "*w\r");
rig_debug(RIG_DEBUG_TRACE, "%s: cmdstr = %s\n", __func__, versionstr);
@ -132,7 +132,7 @@ static int rshfiq_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
rig_debug(RIG_DEBUG_TRACE, "%s called: %s %s\n", __func__,
rig_strvfo(vfo), fstr);
serial_flush(&rig->state.rigport);
rig_flush(&rig->state.rigport);
snprintf(cmdstr, sizeof(cmdstr), "*f%lu\r", (unsigned long int)(freq));
@ -150,7 +150,7 @@ static int rshfiq_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
char cmdstr[15];
char stopset[2];
int retval;
serial_flush(&rig->state.rigport);
rig_flush(&rig->state.rigport);
stopset[0] = '\r';
stopset[1] = '\n';

2
rigs/lowe/lowe.c
Wyświetl plik

@ -63,7 +63,7 @@ int lowe_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rs = &rig->state;
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);

6
rigs/pcr/pcr.c
Wyświetl plik

@ -384,7 +384,7 @@ pcr_transaction(RIG *rig, const char *cmd)
if (!priv->auto_update)
{
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
}
pcr_send(rig, cmd);
@ -582,7 +582,7 @@ pcr_open(RIG *rig)
/* let the pcr settle and flush any remaining data*/
hl_usleep(100 * 1000);
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
/* try powering on twice, sometimes the pcr answers H100 (off) */
pcr_send(rig, "H101");
@ -591,7 +591,7 @@ pcr_open(RIG *rig)
pcr_send(rig, "H101");
hl_usleep(100 * 250);
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
/* return RIG_ERJCTED if power is off */
err = pcr_transaction(rig, "H1?");

2
rigs/prm80/prm80.c
Wyświetl plik

@ -78,7 +78,7 @@ static int prm80_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rs = &rig->state;
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);

2
rigs/racal/ra37xx.c
Wyświetl plik

@ -104,7 +104,7 @@ static int ra37xx_one_transaction(RIG *rig, const char *cmd, char *data,
cmd_len = sprintf(cmdbuf, SOM "%s" EOM, cmd);
}
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmdbuf, cmd_len);

2
rigs/racal/racal.c
Wyświetl plik

@ -84,7 +84,7 @@ static int racal_transaction(RIG *rig, const char *cmd, char *data,
cmd_len = sprintf(cmdbuf, SOM "%u%s" EOM, priv->receiver_id, cmd);
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmdbuf, cmd_len);

2
rigs/rft/rft.c
Wyświetl plik

@ -55,7 +55,7 @@ int rft_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rs = &rig->state;
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);

2
rigs/rs/gp2000.c
Wyświetl plik

@ -71,7 +71,7 @@ gp2000_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rs = &rig->state;
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
rig_debug(RIG_DEBUG_VERBOSE, "gp2000_transaction: len=%d,cmd=%s\n",
cmd_len, cmd);

2
rigs/rs/rs.c
Wyświetl plik

@ -64,7 +64,7 @@ int rs_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rs = &rig->state;
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);

2
rigs/skanti/skanti.c
Wyświetl plik

@ -71,7 +71,7 @@ static int skanti_transaction(RIG *rig, const char *cmd, int cmd_len,
rs = &rig->state;
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);

2
rigs/tapr/tapr.c
Wyświetl plik

@ -58,7 +58,7 @@ static int tapr_cmd(RIG *rig, unsigned char cmd, unsigned char c1,
rs = &rig->state;
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
cmdbuf[0] = ESC;
cmdbuf[1] = cmd;

2
rigs/tentec/omnivii.c
Wyświetl plik

@ -268,7 +268,7 @@ static int tt588_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
for (i = 0; i < 3; ++i) // We'll try 3 times
{
char xxbuf[32];
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
// We add 1 to data_len here for the null byte inserted by read_string eventually
// That way all the callers can use the expected response length for the cmd_len paramter here

2
rigs/tentec/orion.c
Wyświetl plik

@ -130,7 +130,7 @@ static int tt565_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
{
int retval;
rs = &rig->state;
serial_flush(&rs->rigport); /* discard pending i/p */
rig_flush(&rs->rigport); /* discard pending i/p */
retval = write_block(&rs->rigport, cmd, cmd_len);
if (retval != RIG_OK)

2
rigs/tentec/paragon.c
Wyświetl plik

@ -582,7 +582,7 @@ int tt585_get_status_data(RIG *rig)
return RIG_OK;
}
serial_flush(rigport);
rig_flush(rigport);
/* send STATUS comand to fetch data*/

2
rigs/tentec/rx331.c
Wyświetl plik

@ -253,7 +253,7 @@ static int rx331_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rs = &rig->state;
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
num_snprintf(str, BUFSZ, "$%u%s", priv->receiver_id, cmd);
retval = write_block(&rs->rigport, str, strlen(str));

2
rigs/tentec/rx340.c
Wyświetl plik

@ -204,7 +204,7 @@ static int rx340_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rs = &rig->state;
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);

2
rigs/tentec/tentec.c
Wyświetl plik

@ -70,7 +70,7 @@ int tentec_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
rs = &rig->state;
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);

2
rigs/tentec/tt550.c
Wyświetl plik

@ -85,7 +85,7 @@ tt550_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
// cppcheck-suppress *
Hold_Decode(rig);
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, cmd, cmd_len);

2
rigs/uniden/uniden.c
Wyświetl plik

@ -132,7 +132,7 @@ uniden_transaction(RIG *rig, const char *cmdstr, int cmd_len,
transaction_write:
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
if (cmdstr)
{

2
rigs/uniden/uniden_digital.c
Wyświetl plik

@ -114,7 +114,7 @@ uniden_digital_transaction(RIG *rig, const char *cmdstr, int cmd_len,
transaction_write:
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
if (cmdstr)
{

2
rigs/wj/wj.c
Wyświetl plik

@ -177,7 +177,7 @@ static int wj_transaction(RIG *rig, int monitor)
/* buf[9]: not used if command byte, but must be transmitted */
serial_flush(&rig->state.rigport);
rig_flush(&rig->state.rigport);
retval = write_block(&rig->state.rigport, (char *) buf, CMDSZ);

4
rigs/yaesu/frg100.c
Wyświetl plik

@ -233,7 +233,7 @@ static int frg100_do_transaction(RIG *rig,
rs = &rig->state;
memset(retbuf, 0, retbuf_len);
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, (const char *)cmd, YAESU_CMD_LENGTH);
if (retval != RIG_OK) { return retval; }
@ -409,7 +409,7 @@ int frg100_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return -RIG_EINVAL;
}
serial_flush(&rig->state.rigport);
rig_flush(&rig->state.rigport);
/* send READ STATUS(Meter only) cmd to rig */
retval = write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH);

4
rigs/yaesu/ft100.c
Wyświetl plik

@ -403,7 +403,7 @@ static int ft100_read_status(RIG *rig)
priv = (struct ft100_priv_data *)rig->state.priv;
serial_flush(&rig->state.rigport);
rig_flush(&rig->state.rigport);
ret = ft100_send_priv_cmd(rig, FT100_NATIVE_CAT_READ_STATUS);
@ -432,7 +432,7 @@ static int ft100_read_flags(RIG *rig)
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
serial_flush(&rig->state.rigport);
rig_flush(&rig->state.rigport);
ret = ft100_send_priv_cmd(rig, FT100_NATIVE_CAT_READ_FLAGS);

2
rigs/yaesu/ft1000mp.c
Wyświetl plik

@ -1516,7 +1516,7 @@ static int ft1000mp_send_priv_cmd(RIG *rig, unsigned char ci)
}
cmd = (unsigned char *) p->pcs[cmd_index].nseq; /* get native sequence */
serial_flush(&rig_s->rigport);
rig_flush(&rig_s->rigport);
write_block(&rig_s->rigport, (char *) cmd, YAESU_CMD_LENGTH);
return RIG_OK;

2
rigs/yaesu/ft600.c
Wyświetl plik

@ -313,7 +313,7 @@ static int ft600_read_status(RIG *rig)
priv = (struct ft600_priv_data *)rig->state.priv;
serial_flush(&rig->state.rigport);
rig_flush(&rig->state.rigport);
ret = ft600_send_priv_cmd(rig, FT600_NATIVE_CAT_READ_STATUS);

4
rigs/yaesu/ft736.c
Wyświetl plik

@ -440,7 +440,7 @@ int ft736_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd)
unsigned char cmd[YAESU_CMD_LENGTH] = { 0x00, 0x00, 0x00, 0x00, 0xe7};
int retval;
serial_flush(&rig->state.rigport);
rig_flush(&rig->state.rigport);
retval = write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH);
@ -475,7 +475,7 @@ int ft736_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return -RIG_EINVAL;
}
serial_flush(&rig->state.rigport);
rig_flush(&rig->state.rigport);
/* send Test S-meter cmd to rig */
retval = write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH);

2
rigs/yaesu/ft747.c
Wyświetl plik

@ -869,7 +869,7 @@ static int ft747_get_update_data(RIG *rig)
{
int ret;
int port_timeout;
serial_flush(rigport);
rig_flush(rigport);
/* send UPDATE comand to fetch data*/

4
rigs/yaesu/ft757gx.c
Wyświetl plik

@ -652,7 +652,7 @@ int ft757_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return -RIG_EINVAL;
}
serial_flush(&rig->state.rigport);
rig_flush(&rig->state.rigport);
/* send READ STATUS(Meter only) cmd to rig */
retval = write_block(&rig->state.rigport, (char *)cmd, YAESU_CMD_LENGTH);
@ -702,7 +702,7 @@ int ft757_get_update_data(RIG *rig)
does not fix things. So we restart the read from scratch, it works most of times. */
for (nbtries = 0 ; nbtries < maxtries ; nbtries++)
{
serial_flush(&rig->state.rigport);
rig_flush(&rig->state.rigport);
/* send READ STATUS cmd to rig */
retval = write_block(&rig->state.rigport, (char *)cmd, YAESU_CMD_LENGTH);

10
rigs/yaesu/ft767gx.c
Wyświetl plik

@ -460,7 +460,7 @@ int ft767_open(RIG *rig)
struct ft767_priv_data *priv = (struct ft767_priv_data *)rig->state.priv;
int retval;
serial_flush(&rig->state.rigport);
rig_flush(&rig->state.rigport);
/* send 0 delay PACING cmd to rig */
retval = ft767_enter_CAT(rig);
@ -492,7 +492,7 @@ int ft767_open(RIG *rig)
int ft767_close(RIG *rig)
{
serial_flush(&rig->state.rigport);
rig_flush(&rig->state.rigport);
return RIG_OK;
}
@ -1225,7 +1225,7 @@ int ft767_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
return -RIG_EINVAL; /* sorry, wrong VFO */
}
serial_flush(&rig->state.rigport);
rig_flush(&rig->state.rigport);
retval = ft767_enter_CAT(rig);
@ -1538,7 +1538,7 @@ int ft767_get_update_data(RIG *rig)
struct ft767_priv_data *priv = (struct ft767_priv_data *)rig->state.priv;
int retval;
serial_flush(&rig->state.rigport);
rig_flush(&rig->state.rigport);
/* Entering CAT updates our data structures */
retval = ft767_enter_CAT(rig);
@ -1569,7 +1569,7 @@ int ft767_set_split(RIG *rig, unsigned int split)
int retval;
unsigned int curr_split;
serial_flush(&rig->state.rigport);
rig_flush(&rig->state.rigport);
/* Entering CAT updates our data structures */
retval = ft767_enter_CAT(rig);

2
rigs/yaesu/ft817.c
Wyświetl plik

@ -451,7 +451,7 @@ static int ft817_get_status(RIG *rig, int status)
do
{
serial_flush(&rig->state.rigport);
rig_flush(&rig->state.rigport);
write_block(&rig->state.rigport, (char *) p->pcs[status].nseq,
YAESU_CMD_LENGTH);
n = read_block(&rig->state.rigport, (char *) data, len);

2
rigs/yaesu/ft847.c
Wyświetl plik

@ -1143,7 +1143,7 @@ static int ft847_get_status(RIG *rig, int status_ci)
return -RIG_EINTERNAL;
}
serial_flush(&rig->state.rigport);
rig_flush(&rig->state.rigport);
n = write_block(&rig->state.rigport, (char *) ncmd[status_ci].nseq,
YAESU_CMD_LENGTH);

2
rigs/yaesu/ft857.c
Wyświetl plik

@ -438,7 +438,7 @@ static int ft857_get_status(RIG *rig, int status)
return -RIG_EINTERNAL;
}
serial_flush(&rig->state.rigport);
rig_flush(&rig->state.rigport);
write_block(&rig->state.rigport, (char *) p->pcs[status].nseq,
YAESU_CMD_LENGTH);

2
rigs/yaesu/ft897.c
Wyświetl plik

@ -473,7 +473,7 @@ static int ft897_get_status(RIG *rig, int status)
return -RIG_EINTERNAL;
}
serial_flush(&rig->state.rigport);
rig_flush(&rig->state.rigport);
write_block(&rig->state.rigport, (char *) p->pcs[status].nseq,
YAESU_CMD_LENGTH);

2
rigs/yaesu/ft980.c
Wyświetl plik

@ -635,7 +635,7 @@ int ft980_transaction(RIG *rig, const unsigned char *cmd, unsigned char *data,
int retval;
char echo_back[YAESU_CMD_LENGTH];
serial_flush(&rig->state.rigport);
rig_flush(&rig->state.rigport);
retval = write_block(&rig->state.rigport, (const char *)cmd, YAESU_CMD_LENGTH);

2
rigs/yaesu/newcat.c
Wyświetl plik

@ -6520,7 +6520,7 @@ int newcat_set_cmd(RIG *rig)
while (rc != RIG_OK && retry_count++ <= state->rigport.retry)
{
serial_flush(&state->rigport); /* discard any unsolicited data */
rig_flush(&state->rigport); /* discard any unsolicited data */
/* send the command */
rig_debug(RIG_DEBUG_TRACE, "cmd_str = %s\n", priv->cmd_str);

4
rigs/yaesu/vr5000.c
Wyświetl plik

@ -412,7 +412,7 @@ int vr5000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return -RIG_EINVAL;
}
serial_flush(&rig->state.rigport);
rig_flush(&rig->state.rigport);
/* send READ STATUS(Meter only) cmd to rig */
retval = write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH);
@ -446,7 +446,7 @@ int vr5000_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd)
unsigned char cmd[YAESU_CMD_LENGTH] = { 0x00, 0x00, 0x00, 0x00, 0xe7};
int retval;
serial_flush(&rig->state.rigport);
rig_flush(&rig->state.rigport);
/* send READ STATUS(Meter only) cmd to rig */
retval = write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH);

2
rigs/yaesu/vx1700.c
Wyświetl plik

@ -240,7 +240,7 @@ static int vx1700_do_transaction(RIG *rig,
rs = &rig->state;
memset(retbuf, 0, retbuf_len);
serial_flush(&rs->rigport);
rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, (const char *)cmd, YAESU_CMD_LENGTH);
if (retval != RIG_OK) { return retval; }

6
src/misc.c
Wyświetl plik

@ -1492,7 +1492,11 @@ int HAMLIB_API rig_flush(hamlib_port_t *port)
return RIG_OK;
}
return serial_flush(port);
if (port->type.rig != RIG_PORT_SERIAL)
{
rig_debug(RIG_DEBUG_WARN, "%s: Expected serial port type!!\nWhat is this rig?\n", __func__);
}
return serial_flush(port); // we must be on serial port
}
//! @endcond

6
src/serial.c
Wyświetl plik

@ -203,9 +203,7 @@ int HAMLIB_API serial_open(hamlib_port_t *rp)
/*
* Open in Non-blocking mode. Watch for EAGAIN errors!
*/
rig_debug(RIG_DEBUG_TRACE, "%s: OPEN before\n", __func__);
fd = OPEN(rp->pathname, O_RDWR | O_NOCTTY | O_NDELAY);
rig_debug(RIG_DEBUG_TRACE, "%s: OPEN after\n", __func__);
if (fd == -1)
{
@ -220,9 +218,7 @@ int HAMLIB_API serial_open(hamlib_port_t *rp)
rp->fd = fd;
rig_debug(RIG_DEBUG_TRACE, "%s: serial_setup before\n", __func__);
err = serial_setup(rp);
rig_debug(RIG_DEBUG_TRACE, "%s: serial_setup after\n", __func__);
if (err != RIG_OK)
{
@ -230,9 +226,7 @@ int HAMLIB_API serial_open(hamlib_port_t *rp)
return err;
}
rig_debug(RIG_DEBUG_TRACE, "%s: serial_flush before\n", __func__);
serial_flush(rp); // ensure nothing is there when we open
rig_debug(RIG_DEBUG_TRACE, "%s: serial_flush before\n", __func__);
return RIG_OK;
}