sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 1.2.6

Browse source 
PR:		107212
Submitted by:	Diane Bruce (maintainer)
This commit is contained in:
Ion-Mihai Tetcu 2006-12-26 20:38:39 +00:00
parent 2a0c4e9e23
commit 4df902198f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=180809
16 changed files with 9 additions and 1464 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
comms/hamlib/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= hamlib
PORTVERSION= 1.2.5
PORTVERSION= 1.2.6
CATEGORIES= comms hamradio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -22,7 +22,7 @@ USE_GETOPT_LONG= yes
USE_PERL5= yes
USE_PYTHON= yes
USE_AUTOTOOLS= autoconf:259 libtool:15
INSTALLS_SHLIB= yes
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-perl-binding --with-python=${PYTHON_CMD}
PLIST_SUB= VER=${PORTVERSION}

6
comms/hamlib/distinfo
View file

@ -1,3 +1,3 @@
MD5 (hamlib-1.2.5.tar.gz) = 9725a6ae60c1c8ead8669e42a67cc5e8
SHA256 (hamlib-1.2.5.tar.gz) = 1a66cee68486087305b1f9ccfc2ea816aa88a50817257d6213608ec16a65c1ba
SIZE (hamlib-1.2.5.tar.gz) = 1420619
MD5 (hamlib-1.2.6.tar.gz) = 4bb058cfb9f13eaa8948b41e47956599
SHA256 (hamlib-1.2.6.tar.gz) = 230bc5185521b7b5761677e96b3da29c349e16d074f88b107eb4c9bb717a6ca4
SIZE (hamlib-1.2.6.tar.gz) = 1473299

318
comms/hamlib/files/patch-kenwood__kenwood.c
View file

@ -1,318 +0,0 @@
--- kenwood/kenwood.c.orig Mon Apr 10 00:28:17 2006
+++ kenwood/kenwood.c Mon Apr 10 00:48:27 2006
@@ -239,7 +239,8 @@
int kenwood_set_vfo(RIG *rig, vfo_t vfo)
{
unsigned char cmdbuf[16], ackbuf[16];
- int cmd_len, ack_len, retval;
+ int cmd_len, retval;
+ size_t ack_len;
char vfo_function;
switch (vfo) {
@@ -273,7 +274,8 @@
int kenwood_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
{
unsigned char cmdbuf[16], ackbuf[16];
- int cmd_len, ack_len, retval;
+ int cmd_len, retval;
+ size_t ack_len;
char vfo_function;
if(vfo !=RIG_VFO_CURR) {
@@ -326,7 +328,8 @@
int kenwood_get_vfo(RIG *rig, vfo_t *vfo)
{
unsigned char infobuf[50];
- int info_len, retval;
+ int retval;
+ size_t info_len;
info_len = 50;
retval = kenwood_transaction (rig, "IF;", 3, infobuf, &info_len);
@@ -358,7 +361,8 @@
int kenwood_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
{
unsigned char freqbuf[16], ackbuf[16];
- int freq_len, ack_len, retval;
+ int freq_len, retval;
+ size_t ack_len;
char vfo_letter;
vfo_t tvfo;
@@ -373,7 +377,7 @@
vfo);
return -RIG_EINVAL;
}
- freq_len = sprintf(freqbuf,"F%c%011"PRIll";", vfo_letter, (long long)freq);
+ freq_len = sprintf(freqbuf,"F%c%011"PRIll";", vfo_letter, (long)freq);
ack_len = 0;
retval = kenwood_transaction (rig, freqbuf, freq_len, ackbuf, &ack_len);
@@ -389,7 +393,8 @@
{
unsigned char freqbuf[50];
unsigned char cmdbuf[4];
- int cmd_len, freq_len, retval;
+ int cmd_len, retval;
+ size_t freq_len;
char vfo_letter;
vfo_t tvfo;
@@ -426,7 +431,8 @@
int kenwood_get_rit(RIG *rig, vfo_t vfo, shortfreq_t * rit)
{
unsigned char infobuf[50];
- int info_len, retval;
+ int retval;
+ size_t info_len;
info_len = 50;
retval = kenwood_transaction (rig, "IF;", 3, infobuf, &info_len);
@@ -451,7 +457,8 @@
int kenwood_set_rit(RIG * rig, vfo_t vfo, shortfreq_t rit)
{
unsigned char buf[50], infobuf[50], c;
- int retval, info_len, len, i;
+ int retval, len, i;
+ size_t info_len;
info_len = 0;
@@ -491,7 +498,7 @@
int kenwood_scan(RIG * rig, vfo_t vfo, scan_t scan, int ch)
{
unsigned char ackbuf[16];
- int ack_len = 0;
+ size_t ack_len = 0;
return kenwood_transaction (rig, scan==RIG_SCAN_STOP? "SC0;":"SC1;", 4,
ackbuf, &ack_len);
@@ -505,7 +512,8 @@
int kenwood_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
{
unsigned char mdbuf[16],ackbuf[16];
- int mdbuf_len, ack_len, kmode, retval;
+ int mdbuf_len, kmode, retval;
+ size_t ack_len;
switch (mode) {
case RIG_MODE_CW: kmode = MD_CW; break;
@@ -536,7 +544,8 @@
int kenwood_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
{
unsigned char modebuf[50];
- int mode_len, retval;
+ int retval;
+ size_t mode_len;
mode_len = 50;
@@ -574,7 +583,8 @@
int kenwood_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{
unsigned char levelbuf[16], ackbuf[16];
- int level_len, ack_len, retval;
+ int level_len, retval;
+ size_t ack_len;
int i, kenwood_val;
if (RIG_LEVEL_IS_FLOAT(level))
@@ -636,7 +646,8 @@
int get_kenwood_level(RIG *rig, const char *cmd, int cmd_len, float *f)
{
unsigned char lvlbuf[50];
- int lvl_len, retval;
+ int retval;
+ size_t lvl_len;
int lvl;
lvl_len = 50;
@@ -667,7 +678,8 @@
int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{
unsigned char lvlbuf[50];
- int lvl_len, retval;
+ int retval;
+ size_t lvl_len;
int lvl;
int i, ret, agclevel;
@@ -769,7 +781,8 @@
int kenwood_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
{
unsigned char fctbuf[16], ackbuf[16];
- int fct_len, ack_len;
+ int fct_len;
+ size_t ack_len;
/* Optimize:
* sort the switch cases with the most frequent first
@@ -836,7 +849,8 @@
static int get_kenwood_func(RIG *rig, const char *cmd, int cmd_len, int *status)
{
unsigned char fctbuf[50];
- int fct_len, retval;
+ int retval;
+ size_t fct_len;
fct_len = 50;
retval = kenwood_transaction (rig, cmd, cmd_len, fctbuf, &fct_len);
@@ -862,7 +876,8 @@
int kenwood_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
{
unsigned char fctbuf[50];
- int fct_len, retval;
+ int retval;
+ size_t fct_len;
fct_len = 50;
@@ -933,7 +948,8 @@
{
const struct rig_caps *caps;
unsigned char tonebuf[16], ackbuf[16];
- int tone_len, ack_len;
+ int tone_len;
+ size_t ack_len;
int i;
caps = rig->caps;
@@ -961,7 +977,8 @@
{
const struct rig_caps *caps;
unsigned char tonebuf[50];
- int tone_len, i, retval;
+ int i, retval;
+ size_t tone_len;
unsigned int tone_idx;
caps = rig->caps;
@@ -1006,7 +1023,8 @@
int kenwood_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
{
unsigned char infobuf[50];
- int info_len, retval;
+ int retval;
+ size_t info_len;
info_len = 50;
retval = kenwood_transaction (rig, "IF;", 3, infobuf, &info_len);
@@ -1032,7 +1050,7 @@
int kenwood_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
{
unsigned char ackbuf[16];
- int ack_len = 0;
+ size_t ack_len = 0;
return kenwood_transaction (rig, ptt==RIG_PTT_ON? "TX;":"RX;", 3,
ackbuf, &ack_len);
@@ -1046,7 +1064,8 @@
int kenwood_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd)
{
unsigned char busybuf[50];
- int busy_len, retval;
+ int retval;
+ size_t busy_len;
busy_len = 50;
retval = kenwood_transaction (rig, "BY;", 3, busybuf, &busy_len);
@@ -1071,7 +1090,8 @@
int kenwood_set_trn(RIG *rig, int trn)
{
unsigned char trnbuf[16], ackbuf[16];
- int trn_len, ack_len = 0;
+ int trn_len;
+ size_t ack_len = 0;
trn_len = sprintf(trnbuf,"AI%c;", trn==RIG_TRN_RIG?'1':'0');
@@ -1085,7 +1105,8 @@
int kenwood_get_trn(RIG *rig, int *trn)
{
unsigned char trnbuf[50];
- int trn_len, retval;
+ int retval;
+ size_t trn_len;
trn_len = 50;
retval = kenwood_transaction (rig, "AI;", 3, trnbuf, &trn_len);
@@ -1109,7 +1130,8 @@
int kenwood_set_powerstat(RIG *rig, powerstat_t status)
{
unsigned char pwrbuf[16], ackbuf[16];
- int pwr_len, ack_len = 0;
+ int pwr_len;
+ size_t ack_len = 0;
pwr_len = sprintf(pwrbuf,"PS%c;", status==RIG_POWER_ON?'1':'0');
@@ -1123,7 +1145,8 @@
int kenwood_get_powerstat(RIG *rig, powerstat_t *status)
{
unsigned char pwrbuf[50];
- int pwr_len = 50, retval;
+ int retval;
+ size_t pwr_len = 50;
retval = kenwood_transaction (rig, "PS;", 3, pwrbuf, &pwr_len);
if (retval != RIG_OK)
@@ -1146,7 +1169,8 @@
int kenwood_reset(RIG *rig, reset_t reset)
{
unsigned char rstbuf[16], ackbuf[16];
- int rst_len, ack_len = 0;
+ int rst_len;
+ size_t ack_len = 0;
char rst;
switch(reset) {
@@ -1169,7 +1193,8 @@
int kenwood_send_morse(RIG *rig, vfo_t vfo, const char *msg)
{
unsigned char morsebuf[30], m2[30], ackbuf[16];
- int morse_len, ack_len;
+ int morse_len;
+ size_t ack_len;
int msg_len, buff_len, retval;
const char *p;
@@ -1212,7 +1237,7 @@
int kenwood_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
{
unsigned char *cmd, ackbuf[16];
- int ack_len = 0;
+ size_t ack_len = 0;
switch(op) {
case RIG_OP_UP: cmd="UP;"; break;
@@ -1236,7 +1261,8 @@
int kenwood_set_mem(RIG *rig, vfo_t vfo, int ch)
{
unsigned char membuf[16], ackbuf[16];
- int mem_len, ack_len = 0;
+ int mem_len;
+ size_t ack_len = 0;
/*
* "MCbmm;"
@@ -1255,7 +1281,8 @@
int kenwood_get_mem(RIG *rig, vfo_t vfo, int *ch)
{
unsigned char membuf[50];
- int retval, mem_len;
+ int retval;
+ size_t mem_len;
/*
* "MCbmm;"
@@ -1286,7 +1313,8 @@
const char* kenwood_get_info(RIG *rig)
{
unsigned char firmbuf[50];
- int firm_len, retval;
+ int retval;
+ size_t firm_len;
firm_len = 50;
retval = kenwood_transaction (rig, "TY;", 3, firmbuf, &firm_len);

287
comms/hamlib/files/patch-kenwood__th.c
View file

@ -1,287 +0,0 @@
--- kenwood/th.c.orig Mon Apr 10 01:19:35 2006
+++ kenwood/th.c Mon Apr 10 02:34:23 2006
@@ -64,7 +64,8 @@
th_decode_event (RIG *rig)
{
char asyncbuf[128];
- int retval,async_len=128;
+ int retval;
+ size_t async_len=128;
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__);
@@ -182,7 +183,8 @@
th_set_freq (RIG *rig, vfo_t vfo, freq_t freq)
{
char freqbuf[ACKBUF_LEN], ackbuf[ACKBUF_LEN];
- int retval, step,ack_len=ACKBUF_LEN;
+ int retval, step;
+ size_t ack_len=ACKBUF_LEN;
long long f;
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__);
@@ -193,7 +195,7 @@
}
step = 1;
- f=(long long) freq;
+ f=(long) freq;
sprintf(freqbuf, "FQ %011"PRIll",%1d"EOM, f, step);
retval = kenwood_transaction(rig, freqbuf, strlen(freqbuf), ackbuf, &ack_len);
if (retval != RIG_OK)
@@ -210,7 +212,8 @@
th_get_freq (RIG *rig, vfo_t vfo, freq_t *freq)
{
char freqbuf[24], ackbuf[ACKBUF_LEN];
- int retval, step,ack_len=ACKBUF_LEN;
+ int retval, step;
+ size_t ack_len=ACKBUF_LEN;
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__);
@@ -243,7 +246,8 @@
th_set_mode (RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
{
char kmode, mdbuf[24], ackbuf[ACKBUF_LEN];
- int retval,ack_len=ACKBUF_LEN;
+ int retval;
+ size_t ack_len=ACKBUF_LEN;
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__);
if(vfo!=RIG_VFO_CURR) {
@@ -276,7 +280,8 @@
th_get_mode (RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
{
char vch, ackbuf[ACKBUF_LEN];
- int retval,ack_len=ACKBUF_LEN;
+ int retval;
+ size_t ack_len=ACKBUF_LEN;
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__);
if(vfo!=RIG_VFO_CURR) {
@@ -316,7 +321,8 @@
th_set_vfo (RIG *rig, vfo_t vfo)
{
char vfobuf[16], ackbuf[ACKBUF_LEN];
- int retval,ack_len=ACKBUF_LEN;
+ int retval;
+ size_t ack_len=ACKBUF_LEN;
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__);
@@ -368,7 +374,8 @@
th_get_vfo (RIG *rig, vfo_t *vfo)
{
char cmdbuf[16], ackbuf[ACKBUF_LEN],vfoc;
- int retval,ack_len;
+ int retval;
+ size_t ack_len;
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__);
@@ -425,7 +432,8 @@
th_set_trn(RIG *rig, int trn)
{
char trnbuf[16], ackbuf[ACKBUF_LEN];
- int retval,ack_len=ACKBUF_LEN;
+ int retval;
+ size_t ack_len=ACKBUF_LEN;
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__);
@@ -445,7 +453,8 @@
th_get_trn (RIG *rig, int *trn)
{
char ackbuf[ACKBUF_LEN];
- int retval,ack_len=ACKBUF_LEN;
+ int retval;
+ size_t ack_len=ACKBUF_LEN;
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__);
@@ -471,7 +480,8 @@
static int th_get_kenwood_func (RIG *rig, const char *cmd, int *status)
{
char ackbuf[ACKBUF_LEN];
- int retval,ack_len=ACKBUF_LEN;
+ int retval;
+ size_t ack_len=ACKBUF_LEN;
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__);
retval = kenwood_transaction (rig, cmd, strlen(cmd), ackbuf, &ack_len);
@@ -528,7 +538,8 @@
static int th_tburst(RIG *rig, vfo_t vfo, int status)
{
char ackbuf[ACKBUF_LEN];
- int retval,ack_len=ACKBUF_LEN;
+ int retval;
+ size_t ack_len=ACKBUF_LEN;
if(status==1) {
retval = kenwood_transaction(rig, "TT"EOM, 3, ackbuf, &ack_len);
@@ -550,7 +561,8 @@
static int th_set_kenwood_func (RIG *rig, const char *cmd, int status)
{
char trbuf[16], ackbuf[ACKBUF_LEN];
- int retval,ack_len=ACKBUF_LEN;
+ int retval;
+ size_t ack_len=ACKBUF_LEN;
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__);
@@ -641,7 +653,8 @@
th_get_level (RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{
char vch, lvlbuf[32], ackbuf[ACKBUF_LEN];
- int retval, v, l,ack_len=ACKBUF_LEN;
+ int retval, v, l;
+ size_t ack_len=ACKBUF_LEN;
vfo_t tvfo;
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__);
@@ -734,7 +747,8 @@
int th_set_level (RIG *rig, vfo_t vfo, setting_t level, value_t val)
{
char vch, lvlbuf[32], ackbuf[ACKBUF_LEN];
- int retval,ack_len=ACKBUF_LEN;
+ int retval;
+ size_t ack_len=ACKBUF_LEN;
vfo_t tvfo;
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__);
@@ -788,7 +802,8 @@
{
const struct rig_caps *caps;
unsigned char tonebuf[16], ackbuf[ACKBUF_LEN];
- int i, retval,ack_len=ACKBUF_LEN;
+ int i, retval;
+ size_t ack_len=ACKBUF_LEN;
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__);
@@ -819,7 +834,8 @@
{
struct rig_caps *caps;
char ackbuf[ACKBUF_LEN];
- int retval,ack_len=ACKBUF_LEN;
+ int retval;
+ size_t ack_len=ACKBUF_LEN;
unsigned int tone_idx;
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__);
@@ -851,7 +867,8 @@
th_get_info(RIG *rig)
{
static unsigned char firmbuf[16];
- int retval,firm_len=16;
+ int retval;
+ size_t firm_len=16;
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__);
@@ -877,7 +894,8 @@
th_set_mem(RIG *rig, vfo_t vfo, int ch)
{
unsigned char vsel, membuf[16], ackbuf[16];
- int retval, ack_len = 16;
+ int retval;
+ size_t ack_len = 16;
vfo_t tvfo;
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__);
@@ -913,7 +931,8 @@
th_get_mem(RIG *rig, vfo_t vfo, int *ch)
{
unsigned char *membuf, ackbuf[ACKBUF_LEN];
- int retval,ack_len=ACKBUF_LEN;
+ int retval;
+ size_t ack_len=ACKBUF_LEN;
vfo_t tvfo,cvfo;
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__);
@@ -966,7 +985,8 @@
th_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
{
unsigned char *membuf, ackbuf[ACKBUF_LEN];
- int retval,ack_len=ACKBUF_LEN;
+ int retval;
+ size_t ack_len=ACKBUF_LEN;
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__);
@@ -1017,7 +1037,8 @@
int th_get_powerstat(RIG *rig, powerstat_t *status)
{
unsigned char pwrbuf[50];
- int pwr_len = 50, retval;
+ int retval;
+ size_t pwr_len = 50;
retval = kenwood_transaction (rig, "PS;", 3, pwrbuf, &pwr_len);
if (retval != RIG_OK)
@@ -1037,7 +1058,8 @@
int th_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd)
{
unsigned char *membuf, ackbuf[ACKBUF_LEN];
- int retval, ack_len=ACKBUF_LEN;
+ int retval;
+ size_t ack_len=ACKBUF_LEN;
switch (vfo) {
case RIG_VFO_VFO:
@@ -1081,7 +1103,8 @@
{
unsigned char *membuf,ackbuf[ACKBUF_LEN];
- int retval,ack_len=ACKBUF_LEN;
+ int retval;
+ size_t ack_len=ACKBUF_LEN;
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__);
@@ -1123,7 +1146,8 @@
int th_get_channel(RIG *rig, channel_t *chan)
{
char membuf[64],ackbuf[ACKBUF_LEN];
- int retval,ack_len;
+ int retval;
+ size_t ack_len;
freq_t freq,offset;
char req[16],scf[128];
int step, shift, rev, tone, ctcss, tonefq, ctcssfq;
@@ -1228,7 +1252,8 @@
int th_set_channel(RIG *rig, const channel_t *chan)
{
char membuf[ACKBUF_LEN],ackbuf[ACKBUF_LEN];
- int retval,ack_len;
+ int retval;
+ size_t ack_len;
char req[64];
long long freq,offset;
int chn, step, shift, tone, ctcss, tonefq, ctcssfq;
@@ -1298,12 +1323,12 @@
if(chan->channel_num<=220)
sprintf(membuf, "%s,%011"PRIll",%01d,%01d,0,%01d,%01d,,%02d,,%02d,%09"PRIll",0"EOM,
- req,(long long)freq, step, shift, tone,
- ctcss, tonefq, ctcssfq, (long long)offset);
+ req,(long)freq, step, shift, tone,
+ ctcss, tonefq, ctcssfq, (long)offset);
else
sprintf(membuf, "%s,%011"PRIll",%01d,%01d,0,%01d,%01d,,%02d,,%02d,%09"PRIll EOM,
- req, (long long)freq, step, shift, tone,
- ctcss, tonefq, ctcssfq, (long long)offset);
+ req, (long)freq, step, shift, tone,
+ ctcss, tonefq, ctcssfq, (long)offset);
ack_len=ACKBUF_LEN;
retval = kenwood_transaction(rig, membuf, strlen(membuf), ackbuf, &ack_len);
@@ -1312,7 +1337,7 @@
if(chan->channel_num<223 && chan->tx_freq!=RIG_FREQ_NONE) {
req[5]='1';
- sprintf(membuf, "%s,%011"PRIll",%01d"EOM, req,(long long)chan->tx_freq, step);
+ sprintf(membuf, "%s,%011"PRIll",%01d"EOM, req,(long)chan->tx_freq, step);
ack_len=ACKBUF_LEN;
retval = kenwood_transaction(rig, membuf, strlen(membuf), ackbuf, &ack_len);
if (retval != RIG_OK)

62
comms/hamlib/files/patch-kenwood__thg71.c
View file

@ -1,62 +0,0 @@
--- kenwood/thg71.c.orig Mon Apr 10 01:13:33 2006
+++ kenwood/thg71.c Mon Apr 10 01:16:04 2006
@@ -184,7 +184,8 @@
int thg71_decode_event (RIG *rig)
{
char asyncbuf[ACKBUF_LEN];
- int retval, asyncbuf_len = ACKBUF_LEN-1;
+ int retval;
+ size_t asyncbuf_len = ACKBUF_LEN-1;
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__);
retval = kenwood_transaction(rig, NULL, 0, asyncbuf, &asyncbuf_len);
@@ -291,7 +292,8 @@
int thg71_get_mode (RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
{
char ackbuf[ACKBUF_LEN];
- int retval,ack_len=ACKBUF_LEN;
+ int retval;
+ size_t ack_len=ACKBUF_LEN;
int step;
freq_t freq;
@@ -327,7 +329,8 @@
int thg71_set_vfo (RIG *rig, vfo_t vfo)
{
char vfobuf[16], ackbuf[ACKBUF_LEN];
- int retval,ack_len=ACKBUF_LEN;
+ int retval;
+ size_t ack_len=ACKBUF_LEN;
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__);
@@ -355,7 +358,8 @@
int thg71_get_vfo (RIG *rig, vfo_t *vfo)
{
char ackbuf[ACKBUF_LEN];
- int retval,ack_len=ACKBUF_LEN;
+ int retval;
+ size_t ack_len=ACKBUF_LEN;
int vch;
retval = kenwood_transaction(rig, "VMC 0"EOM , 6, ackbuf, &ack_len);
@@ -382,7 +386,8 @@
int thg71_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
{
char ackbuf[ACKBUF_LEN];
- int retval,ack_len=ACKBUF_LEN;
+ int retval;
+ size_t ack_len=ACKBUF_LEN;
if(func != RIG_FUNC_TBURST)
return -RIG_EINVAL;
@@ -404,7 +409,8 @@
int thg71_open(RIG *rig)
{
char ackbuf[ACKBUF_LEN],*strl,*stru;
- int retval,i,ack_len=ACKBUF_LEN;
+ int retval,i;
+ size_t ack_len=ACKBUF_LEN;
const freq_range_t frend=RIG_FRNG_END;
/* just to be sure it's a THG-71 */

85
comms/hamlib/files/patch-kenwood__tmv7.c
View file

@ -1,85 +0,0 @@
--- kenwood/tmv7.c.orig Mon Apr 10 01:16:47 2006
+++ kenwood/tmv7.c Mon Apr 10 02:15:58 2006
@@ -216,7 +216,8 @@
int tmv7_decode_event (RIG *rig)
{
char asyncbuf[ACKBUF_LEN];
- int retval, asyncbuf_len = ACKBUF_LEN-1;
+ int retval;
+ size_t asyncbuf_len = ACKBUF_LEN-1;
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__);
retval = kenwood_transaction(rig, NULL, 0, asyncbuf, &asyncbuf_len);
@@ -324,7 +325,8 @@
int tmv7_set_vfo (RIG *rig, vfo_t vfo)
{
char vfobuf[16], ackbuf[ACKBUF_LEN];
- int retval,ack_len;
+ int retval;
+ size_t ack_len;
rig_debug(RIG_DEBUG_TRACE, "%s: called %d\n", __FUNCTION__,vfo);
@@ -383,7 +385,8 @@
int tmv7_get_mode (RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
{
char ackbuf[ACKBUF_LEN];
- int retval,ack_len=ACKBUF_LEN;
+ int retval;
+ size_t ack_len=ACKBUF_LEN;
int step;
freq_t freq;
@@ -428,7 +431,8 @@
int tmv7_get_channel(RIG *rig, channel_t *chan)
{
char membuf[64],ackbuf[ACKBUF_LEN];
- int retval,ack_len;
+ int retval;
+ size_t ack_len;
freq_t freq;
char req[16],scf[128];
int step, shift, rev, tone, ctcss, tonefq, ctcssfq;
@@ -540,7 +544,8 @@
int tmv7_set_channel(RIG *rig, const channel_t *chan)
{
char membuf[ACKBUF_LEN],ackbuf[ACKBUF_LEN];
- int retval,ack_len;
+ int retval;
+ size_t ack_len;
char req[64];
long long freq;
int chn, step, shift, tone, ctcss, tonefq, ctcssfq;
@@ -617,11 +622,11 @@
if(chan->channel_num<221)
sprintf(membuf, "%s,%011"PRIll",%01d,%01d,0,%01d,%01d,0,%02d,000,%02d,0,0"EOM,
- req,(long long)freq, step, shift, tone,
+ req,(long)freq, step, shift, tone,
ctcss, tonefq, ctcssfq);
else
sprintf(membuf, "%s,%011"PRIll",%01d,%01d,0,%01d,%01d,0,%02d,000,%02d,"EOM,
- req, (long long)freq, step, shift, tone,
+ req, (long)freq, step, shift, tone,
ctcss, tonefq, ctcssfq);
ack_len=ACKBUF_LEN;
@@ -631,7 +636,7 @@
if(chan->tx_freq!=RIG_FREQ_NONE) {
req[5]='1';
- sprintf(membuf, "%s,%011"PRIll",%01d"EOM, req,(long long)chan->tx_freq, step);
+ sprintf(membuf, "%s,%011"PRIll",%01d"EOM, req,(long)chan->tx_freq, step);
ack_len=ACKBUF_LEN;
retval = kenwood_transaction(rig, membuf, strlen(membuf), ackbuf, &ack_len);
if (retval != RIG_OK)
@@ -656,7 +661,8 @@
int tmv7_open(RIG *rig)
{
char ackbuf[ACKBUF_LEN];
- int retval,ack_len=ACKBUF_LEN;
+ int retval;
+ size_t ack_len=ACKBUF_LEN;
/* just to be sure it's a TM-V7 */
retval = kenwood_transaction(rig, "ID"EOM, 3, ackbuf, &ack_len);

107
comms/hamlib/files/patch-kenwood__ts140.c
View file

@ -1,107 +0,0 @@
--- kenwood/ts140.c.orig Sun Apr 9 23:07:44 2006
+++ kenwood/ts140.c Sun Apr 9 23:08:10 2006
@@ -63,7 +63,8 @@
static int ts140_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
{
unsigned char modebuf[50];
- int mode_len, retval;
+ size_t mode_len;
+ int retval;
mode_len = 50;
retval = kenwood_transaction (rig, "IF;", 3, modebuf, &mode_len);
@@ -98,7 +99,8 @@
static int ts140_set_vfo(RIG *rig, vfo_t vfo)
{
unsigned char cmdbuf[16], ackbuf[16];
- int cmd_len, ack_len, retval;
+ int cmd_len, retval;
+ size_t ack_len;
char vfo_function;
switch (vfo) {
@@ -118,13 +120,14 @@
retval = kenwood_transaction (rig, cmdbuf, cmd_len, ackbuf, &ack_len);
if (retval != RIG_OK)
return retval;
- return RIG_OK;
+ return RIG_OK;
}
static int ts140_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
{
unsigned char freqbuf[50];
- int freq_len, retval;
+ size_t freq_len;
+ int retval;
long long f;
/* We're using IF; here because the TS-140S is incapable of supplying
@@ -143,16 +146,47 @@
}
freqbuf[14] = '\0';
- sscanf(freqbuf+2, "%lld", &f);
+ sscanf(freqbuf+2, "%lld", &f); /* Is a long long int really necessary here? */
*freq = (freq_t)f;
return RIG_OK;
}
+static int ts140_get_mem(RIG *rig, vfo_t vfo, int *ch)
+{
+ unsigned char membuf[50];
+ int m, retval;
+ size_t mem_len;
+
+ mem_len = 50;
+
+/* Again, the TS-140S is incapable of supplying the memory location
+* from MC; so we use IF;. Another awful hack, but it's what the radio
+* forces us to use. Furthermore, the radio will not return the value
+* of an empty memory. */
+
+ retval = kenwood_transaction (rig, "IF;", 3, membuf, &mem_len);
+ if (retval != RIG_OK)
+ return retval;
+
+ if (mem_len != 38 || membuf[1] != 'F') {
+ rig_debug(RIG_DEBUG_ERR,"ts140_get_mem: wrong answer "
+ "len=%d\n", mem_len);
+ return -RIG_ERJCTED;
+ }
+
+ membuf[28] = '\0';
+ sscanf(membuf+25, "%d", &m);
+ *ch = m;
+
+ return RIG_OK;
+}
+
static int ts140_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
{
unsigned char fctbuf[16], ackbuf[16];
- int fct_len, ack_len;
+ int fct_len;
+ size_t ack_len;
ack_len = 0;
switch (func) {
case RIG_FUNC_LOCK:
@@ -170,7 +204,7 @@
/*
* ts140 rig capabilities.
- * MattD.. 2005-01-29
+ * GW0VNR 09042006
*/
const struct rig_caps ts140_caps = {
@@ -275,7 +309,7 @@
.get_func = kenwood_get_func,
.vfo_op = kenwood_vfo_op,
.set_mem = kenwood_set_mem,
-.get_mem = kenwood_get_mem,
+.get_mem = ts140_get_mem,
.reset = kenwood_reset,
};

12
comms/hamlib/files/patch-kenwood__ts2000.c
View file

@ -1,12 +0,0 @@
--- kenwood/ts2000.c.orig Mon Apr 10 01:08:30 2006
+++ kenwood/ts2000.c Mon Apr 10 01:09:48 2006
@@ -259,7 +259,8 @@
int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{
unsigned char lvlbuf[50];
- int lvl_len, retval;
+ int retval;
+ size_t lvl_len;
int lvl;
int i, ret, agclevel;

42
comms/hamlib/files/patch-kenwood__ts450s.c
View file

@ -1,42 +0,0 @@
--- kenwood/ts450s.c.orig Mon Apr 10 01:05:26 2006
+++ kenwood/ts450s.c Mon Apr 10 01:07:44 2006
@@ -78,7 +78,8 @@
ts450s_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
{
unsigned char infobuf[50];
- int info_len, retval;
+ int retval;
+ size_t info_len;
retval = kenwood_transaction (rig, "IF;", 3, infobuf, &info_len);
if (retval != RIG_OK)
@@ -116,7 +117,8 @@
ts450s_get_vfo(RIG *rig, vfo_t *vfo)
{
unsigned char infobuf[50];
- int info_len, retval;
+ int retval;
+ size_t info_len;
retval = kenwood_transaction (rig, "IF;", 3, infobuf, &info_len);
if (retval != RIG_OK)
@@ -145,7 +147,8 @@
ts450s_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{
unsigned char lvlbuf[50];
- int lvl_len, retval;
+ int retval;
+ size_t lvl_len;
lvl_len = 50;
switch (level)
@@ -205,7 +208,8 @@
ts450s_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{
unsigned char levelbuf[16], ackbuf[16];
- int level_len, ack_len, retval;
+ int level_len, retval;
+ size_t ack_len;
int kenwood_val;
if (RIG_LEVEL_IS_FLOAT(level))

68
comms/hamlib/files/patch-kenwood__ts480.c
View file

@ -1,68 +0,0 @@
--- kenwood/ts480.c.orig Mon Apr 10 01:10:22 2006
+++ kenwood/ts480.c Mon Apr 10 01:12:55 2006
@@ -50,7 +50,7 @@
kenwood_ts480_set_ptt (RIG * rig, vfo_t vfo, ptt_t ptt)
{
unsigned char ackbuf[16];
- int ack_len = 0;
+ size_t ack_len = 0;
if (RIG_PTT_ON == ptt)
return kenwood_transaction (rig, "TX1;", 4, ackbuf, &ack_len);
@@ -68,7 +68,7 @@
kenwood_ts480_set_ant (RIG * rig, vfo_t vfo, ant_t ant)
{
unsigned char ackbuf[16];
- int ack_len = 0;
+ size_t ack_len = 0;
if (RIG_ANT_1 == ant)
return kenwood_transaction (rig, "AN1;", 4, ackbuf, &ack_len);
@@ -88,7 +88,7 @@
kenwood_ts480_get_ant (RIG * rig, vfo_t vfo, ant_t * ant)
{
unsigned char ackbuf[16];
- int ack_len = 16;
+ size_t ack_len = 16;
int retval;
retval = kenwood_transaction (rig, "AN;", 3, ackbuf, &ack_len);
@@ -120,7 +120,8 @@
kenwood_ts480_get_info (RIG * rig)
{
unsigned char firmbuf[50];
- int firm_len, retval;
+ int retval;
+ size_t firm_len;
firm_len = 50;
retval = kenwood_transaction (rig, "TY;", 3, firmbuf, &firm_len);
@@ -160,7 +161,8 @@
kenwood_ts480_set_level (RIG * rig, vfo_t vfo, setting_t level, value_t val)
{
unsigned char levelbuf[16], ackbuf[16];
- int level_len, ack_len, retval;
+ int level_len, retval;
+ size_t ack_len;
int kenwood_val;
switch (level)
@@ -227,7 +229,7 @@
kenwood_ts480_get_level (RIG * rig, vfo_t vfo, setting_t level, value_t * val)
{
unsigned char ackbuf[50];
- int ack_len = 50;
+ size_t ack_len = 50;
int levelint;
int retval;
@@ -327,7 +329,8 @@
kenwood_ts480_set_func (RIG * rig, vfo_t vfo, setting_t func, int status)
{
unsigned char fctbuf[16], ackbuf[16];
- int fct_len, ack_len;
+ int fct_len;
+ size_t ack_len;
ack_len = 0;
switch (func)

42
comms/hamlib/files/patch-kenwood__ts570.c
View file

@ -1,42 +0,0 @@
--- kenwood/ts570.c.orig Mon Apr 10 00:54:20 2006
+++ kenwood/ts570.c Mon Apr 10 01:04:43 2006
@@ -65,7 +65,8 @@
static int ts570_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
{
unsigned char buf[50];
- int buf_len, retval;
+ int retval;
+ size_t buf_len;
buf_len = 50;
@@ -146,7 +147,8 @@
static int ts570_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
{
unsigned char buf[16],ackbuf[16];
- int buf_len, ack_len, kmode, retval;
+ int buf_len, kmode, retval;
+ size_t ack_len;
switch (mode)
{
@@ -203,7 +205,8 @@
static int ts570_set_ant(RIG *rig, vfo_t vfo, ant_t ant)
{
unsigned char buf[6], ackbuf[16];
- int len, ack_len, retval;
+ int len, retval;
+ size_t ack_len;
len = sprintf(buf,"AN%c;", ant==RIG_ANT_1?'1':'2');
@@ -220,7 +223,8 @@
static int ts570_get_ant(RIG *rig, vfo_t vfo, ant_t *ant)
{
unsigned char infobuf[50];
- int info_len, retval;
+ int retval;
+ size_t info_len;
info_len = 5;
retval = kenwood_transaction (rig, "AN;", 3, infobuf, &info_len);

105
comms/hamlib/files/patch-kenwood__ts680.c
View file

@ -1,105 +0,0 @@
--- kenwood/ts680.c.orig Mon Apr 10 01:50:28 2006
+++ kenwood/ts680.c Mon Apr 10 01:46:44 2006
@@ -63,7 +63,8 @@
static int ts680_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
{
unsigned char modebuf[50];
- int mode_len, retval;
+ size_t mode_len;
+ int retval;
mode_len = 50;
retval = kenwood_transaction (rig, "IF;", 3, modebuf, &mode_len);
@@ -98,7 +99,8 @@
static int ts680_set_vfo(RIG *rig, vfo_t vfo)
{
unsigned char cmdbuf[16], ackbuf[16];
- int cmd_len, ack_len, retval;
+ int cmd_len, retval;
+ size_t ack_len;
char vfo_function;
switch (vfo) {
@@ -124,7 +126,8 @@
static int ts680_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
{
unsigned char freqbuf[50];
- int freq_len, retval;
+ size_t freq_len;
+ int retval;
long long f;
/* We're using IF; here because the TS-680S is incapable of supplying
@@ -143,16 +146,47 @@
}
freqbuf[14] = '\0';
- sscanf(freqbuf+2, "%lld", &f);
+ sscanf(freqbuf+2, "%lld", &f); /* Is a long long int really necessary here? */
*freq = (freq_t)f;
return RIG_OK;
}
+static int ts680_get_mem(RIG *rig, vfo_t vfo, int *ch)
+{
+ unsigned char membuf[50];
+ int m, retval;
+ size_t mem_len;
+
+ mem_len = 50;
+
+ /* Again, the TS-680S is incapable of supplying the memory location
+ * from MC; so we use IF;. Another awful hack, but it's what the radio
+ * forces us to use. Furthermore, the radio will not return the value
+ * of an empty memory. */
+
+ retval = kenwood_transaction (rig, "IF;", 3, membuf, &mem_len);
+ if (retval != RIG_OK)
+ return retval;
+
+ if (mem_len != 38 || membuf[1] != 'F') {
+ rig_debug(RIG_DEBUG_ERR,"ts680_get_mem: wrong answer "
+ "len=%d\n", mem_len);
+ return -RIG_ERJCTED;
+ }
+
+ membuf[28] = '\0';
+ sscanf(membuf+25, "%d", &m);
+ *ch = m;
+
+ return RIG_OK;
+}
+
static int ts680_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
{
unsigned char fctbuf[16], ackbuf[16];
- int fct_len, ack_len;
+ int fct_len;
+ size_t ack_len;
ack_len = 0;
switch (func) {
case RIG_FUNC_LOCK:
@@ -170,11 +204,11 @@
/*
* ts680 rig capabilities.
- * MattD.. 2005-01-29
+ * GW0VNR 09042006
*/
const struct rig_caps ts680s_caps = {
-.rig_model = RIG_MODEL_TS680S, /* Returns ID of 006. Suggest this is added to kenwood.c */
+.rig_model = RIG_MODEL_TS680S,
.model_name = "TS-680S",
.mfg_name = "Kenwood",
.version = BACKEND_VER ".0",
@@ -281,7 +315,7 @@
.get_func = kenwood_get_func,
.vfo_op = kenwood_vfo_op,
.set_mem = kenwood_set_mem,
-.get_mem = kenwood_get_mem,
+.get_mem = ts680_get_mem,
.reset = kenwood_reset,
};

122
comms/hamlib/files/patch-kenwood__ts850.c
View file

@ -1,122 +0,0 @@
--- kenwood/ts850.c.orig Sun Apr 9 23:36:11 2006
+++ kenwood/ts850.c Sun Apr 9 23:49:51 2006
@@ -226,7 +226,8 @@
int ts850_set_rit(RIG * rig, vfo_t vfo, shortfreq_t rit)
{
unsigned char buf[50], infobuf[50], c;
- int retval, info_len, len, i;
+ int retval, len, i;
+ size_t info_len;
info_len = 0;
@@ -255,7 +256,8 @@
int ts850_set_xit(RIG * rig, vfo_t vfo, shortfreq_t xit)
{
unsigned char buf[50], infobuf[50], c;
- int retval, info_len, len, i;
+ int retval, len, i;
+ size_t info_len;
info_len = 0;
if (xit == 0)
@@ -297,7 +299,8 @@
int ts850_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
{
unsigned char infobuf[50];
- int info_len, retval;
+ int retval;
+ size_t info_len;
int f,f1,f2;
info_len = 50;
@@ -387,7 +390,8 @@
int ts850_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
{
unsigned char mdbuf[16],ackbuf[16];
- int mdbuf_len, ack_len, kmode, retval;
+ int mdbuf_len, kmode, retval;
+ size_t ack_len;
kmode=mode_to_char(mode);
if(kmode==RIG_MODE_NONE) {
@@ -426,7 +430,8 @@
{
const struct rig_caps *caps;
unsigned char tonebuf[16], ackbuf[16];
- int tone_len, ack_len;
+ int tone_len;
+ size_t ack_len;
int i;
caps = rig->caps;
@@ -447,7 +452,8 @@
int ts850_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
{
unsigned char fctbuf[16], ackbuf[16];
- int fct_len, ack_len;
+ int fct_len;
+ size_t ack_len;
if (vfo != RIG_VFO_CURR)
return -RIG_EINVAL;
@@ -474,7 +480,8 @@
int ts850_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
{
unsigned char fctbuf[16], ackbuf[16];
- int retval, fct_len, ack_len;
+ int retval, fct_len;
+ size_t ack_len;
if (vfo != RIG_VFO_CURR)
return -RIG_EINVAL;
@@ -505,7 +512,8 @@
int ts850_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{
unsigned char lvlbuf[50];
- int i, lvl_len, retval;
+ int i, retval;
+ size_t lvl_len;
if(vfo!=RIG_VFO_CURR)
return -RIG_EINVAL;
@@ -587,7 +595,8 @@
int ts850_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{
unsigned char lvlbuf[16], ackbuf[16];
- int lvl_len, ack_len;
+ int lvl_len;
+ size_t ack_len;
if(level != RIG_LEVEL_CWPITCH)
return -RIG_EINVAL;
@@ -604,7 +613,8 @@
int ts850_get_mem(RIG *rig, vfo_t vfo, int *ch)
{
unsigned char infobuf[50];
- int info_len, retval;
+ int retval;
+ size_t info_len;
info_len = 50;
retval = kenwood_transaction (rig, "IF;", 3, infobuf, &info_len)
@@ -642,7 +652,8 @@
int ts850_get_channel (RIG * rig, channel_t * chan)
{
unsigned char cmdbuf[16], membuf[30];
- int retval, cmd_len,mem_len,num;
+ int retval, cmd_len, num;
+ size_t mem_len;
num=chan->channel_num;
@@ -693,7 +704,8 @@
int ts850_set_channel (RIG * rig, const channel_t * chan)
{
unsigned char cmdbuf[30], membuf[30];
- int retval, cmd_len,mem_len;
+ int retval, cmd_len;
+ size_t mem_len;
int num,freq,tx_freq,tone;
char mode,tx_mode,split,tones;

192
comms/hamlib/files/patch-kenwood__ts870s.c
View file

@ -1,192 +0,0 @@
--- kenwood/ts870s.c.orig Mon Apr 10 00:08:29 2006
+++ kenwood/ts870s.c Mon Apr 10 00:08:39 2006
@@ -74,7 +74,8 @@
static int ts870s_get_vfo(RIG *rig, vfo_t *vfo)
{
unsigned char vfobuf[50];
- int vfo_len, retval;
+ int retval;
+ size_t vfo_len;
/* query RX VFO */
@@ -104,98 +105,100 @@
static int ts870s_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
{
- unsigned char buf[50];
- int buf_len, retval;
-
-
- buf_len = 50;
- retval = kenwood_transaction (rig, "MD;", 3, buf, &buf_len);
- if (retval != RIG_OK)
- return retval;
-
- if (buf_len != 4 || buf[1] != 'D')
- {
- rig_debug(RIG_DEBUG_ERR,"%s: unexpected MD answer, len=%d\n",
- __FUNCTION__,buf_len);
- return -RIG_ERJCTED;
- }
-
- switch (buf[2])
- {
- case MD_CW: *mode = RIG_MODE_CW; break;
- case MD_CWR: *mode = RIG_MODE_CWR; break;
- case MD_USB: *mode = RIG_MODE_USB; break;
- case MD_LSB: *mode = RIG_MODE_LSB; break;
- case MD_FM: *mode = RIG_MODE_FM; break;
- case MD_AM: *mode = RIG_MODE_AM; break;
- case MD_FSK: *mode = RIG_MODE_RTTY; break;
- case MD_FSKR: *mode = RIG_MODE_RTTYR; break;
- case MD_NONE: *mode = RIG_MODE_NONE; break;
- default:
- rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode '%c'\n",
- __FUNCTION__,buf[2]);
- return -RIG_EINVAL;
- }
-
- buf_len = 50;
- retval = kenwood_transaction (rig, "FW;", 3, buf, &buf_len);
- if (retval != RIG_OK)
- return retval;
-
- if (buf_len != 7 || buf[1] != 'W')
- {
- rig_debug(RIG_DEBUG_ERR,"%s: unexpected FW answer, len=%d\n",
+ unsigned char buf[50];
+ int retval;
+ size_t buf_len;
+
+ buf_len = 50;
+ retval = kenwood_transaction (rig, "MD;", 3, buf, &buf_len);
+ if (retval != RIG_OK)
+ return retval;
+
+ if (buf_len != 4 || buf[1] != 'D')
+ {
+ rig_debug(RIG_DEBUG_ERR,"%s: unexpected MD answer, len=%d\n",
+ __FUNCTION__,buf_len);
+ return -RIG_ERJCTED;
+ }
+
+ switch (buf[2])
+ {
+ case MD_CW: *mode = RIG_MODE_CW; break;
+ case MD_CWR: *mode = RIG_MODE_CWR; break;
+ case MD_USB: *mode = RIG_MODE_USB; break;
+ case MD_LSB: *mode = RIG_MODE_LSB; break;
+ case MD_FM: *mode = RIG_MODE_FM; break;
+ case MD_AM: *mode = RIG_MODE_AM; break;
+ case MD_FSK: *mode = RIG_MODE_RTTY; break;
+ case MD_FSKR: *mode = RIG_MODE_RTTYR; break;
+ case MD_NONE: *mode = RIG_MODE_NONE; break;
+ default:
+ rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode '%c'\n",
+ __FUNCTION__,buf[2]);
+ return -RIG_EINVAL;
+ }
+
+ buf_len = 50;
+ retval = kenwood_transaction (rig, "FW;", 3, buf, &buf_len);
+ if (retval != RIG_OK)
+ return retval;
+
+ if (buf_len != 7 || buf[1] != 'W')
+ {
+ rig_debug(RIG_DEBUG_ERR,"%s: unexpected FW answer, len=%d\n",
__FUNCTION__,buf_len);
- return -RIG_ERJCTED;
- }
+ return -RIG_ERJCTED;
+ }
- *width = 10 * atoi(&buf[2]);
+ *width = 10 * atoi(&buf[2]);
- return RIG_OK;
+ return RIG_OK;
}
static int ts870s_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
{
- unsigned char buf[16],ackbuf[16];
- int buf_len, ack_len, kmode, retval;
-
- switch (mode)
- {
- case RIG_MODE_CW: kmode = MD_CW; break;
- case RIG_MODE_CWR: kmode = MD_CWR; break;
- case RIG_MODE_USB: kmode = MD_USB; break;
- case RIG_MODE_LSB: kmode = MD_LSB; break;
- case RIG_MODE_FM: kmode = MD_FM; break;
- case RIG_MODE_AM: kmode = MD_AM; break;
- case RIG_MODE_RTTY: kmode = MD_FSK; break;
- case RIG_MODE_RTTYR: kmode = MD_FSKR; break;
- default:
- rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode %d\n",
- __FUNCTION__,mode);
- return -RIG_EINVAL;
- }
-
- buf_len = sprintf(buf, "MD%c;", kmode);
- ack_len = 0;
- retval = kenwood_transaction (rig, buf, buf_len, ackbuf, &ack_len);
- if (retval != RIG_OK) return retval;
-
-/*
- * This rig will simply use an IF bandpass which is closest to width,
- * so we don't need to check the value...
- */
- buf_len = sprintf(buf, "FW%04d;", (int)width/10);
- ack_len = 0;
- retval = kenwood_transaction (rig, buf, buf_len, ackbuf, &ack_len);
- if (retval != RIG_OK) return retval;
+ unsigned char buf[16],ackbuf[16];
+ int buf_len, kmode, retval;
+ size_t ack_len;
+
+ switch (mode)
+ {
+ case RIG_MODE_CW: kmode = MD_CW; break;
+ case RIG_MODE_CWR: kmode = MD_CWR; break;
+ case RIG_MODE_USB: kmode = MD_USB; break;
+ case RIG_MODE_LSB: kmode = MD_LSB; break;
+ case RIG_MODE_FM: kmode = MD_FM; break;
+ case RIG_MODE_AM: kmode = MD_AM; break;
+ case RIG_MODE_RTTY: kmode = MD_FSK; break;
+ case RIG_MODE_RTTYR: kmode = MD_FSKR; break;
+ default:
+ rig_debug(RIG_DEBUG_ERR,"%s: unsupported mode %d\n",
+ __FUNCTION__,mode);
+ return -RIG_EINVAL;
+ }
+
+ buf_len = sprintf(buf, "MD%c;", kmode);
+ ack_len = 0;
+ retval = kenwood_transaction (rig, buf, buf_len, ackbuf, &ack_len);
+ if (retval != RIG_OK) return retval;
+
+ /*
+ * This rig will simply use an IF bandpass which is closest to width,
+ * so we don't need to check the value...
+ */
+ buf_len = sprintf(buf, "FW%04d;", (int)width/10);
+ ack_len = 0;
+ retval = kenwood_transaction (rig, buf, buf_len, ackbuf, &ack_len);
+ if (retval != RIG_OK) return retval;
- return RIG_OK;
+ return RIG_OK;
}
static int ts870s_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{
unsigned char lvlbuf[50];
- int lvl_len, retval;
+ int retval;
+ size_t lvl_len;
int lvl;
int i, ret, agclevel;

11
comms/hamlib/files/patch-yaesu__ft817.c
View file

@ -1,11 +0,0 @@
--- yaesu/ft817.c.orig Tue Apr 18 23:15:31 2006
+++ yaesu/ft817.c Tue Apr 18 23:16:15 2006
@@ -288,8 +288,6 @@
.get_tone = NULL,
.set_ctcss_tone = ft817_set_ctcss_tone,
.get_ctcss_tone = NULL,
- .set_tone = NULL,
- .get_tone = NULL,
.set_dcs_sql = ft817_set_dcs_sql,
.get_dcs_sql = NULL,
.set_tone_sql = NULL,

10
comms/hamlib/pkg-plist
View file

@ -104,16 +104,14 @@ lib/hamlib-yaesu.so
%%TCL%%lib/hamlibtcl.la
%%TCL%%lib/hamlibtcl.so
%%TCL%%lib/tcl8.4/hamlib/pkgIndex.tcl
lib/libhamlib++-%%VER%%.so
lib/libhamlib++-%%VER%%.so.2
lib/libhamlib++.so
lib/libhamlib++.so.2
lib/libhamlib++.a
lib/libhamlib++.la
lib/libhamlib++.so
lib/libhamlib-%%VER%%.so
lib/libhamlib-%%VER%%.so.2
lib/libhamlib.so
lib/libhamlib.so.2
lib/libhamlib.a
lib/libhamlib.la
lib/libhamlib.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hamlib/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hamlib/Hamlib.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hamlib/Hamlib.bs