more unsigned char->char and int->size_t transitions

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@2091 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.2.6rc1
Joop Stakenborg, PG4I 2006-03-12 09:02:38 +00:00
rodzic 28b6776472
commit 8ff672d34c
5 zmienionych plików z 67 dodań i 47 usunięć

Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Kenwood backend - TM-V7 description * Hamlib Kenwood backend - TM-V7 description
* Copyright (c) 2004-2005 by Stephane Fillod * Copyright (c) 2004-2005 by Stephane Fillod
* *
* $Id: tmv7.c,v 1.12 2005-04-03 20:40:21 fillods Exp $ * $Id: tmv7.c,v 1.13 2006-03-12 09:02:38 pa4tu Exp $
* *
* This library is free software; you can redistribute it and/or modify * This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as * it under the terms of the GNU Library General Public License as
@ -216,7 +216,8 @@ const struct rig_caps tmv7_caps = {
int tmv7_decode_event (RIG *rig) int tmv7_decode_event (RIG *rig)
{ {
char asyncbuf[ACKBUF_LEN]; char asyncbuf[ACKBUF_LEN];
int retval, asyncbuf_len = ACKBUF_LEN-1; int retval;
size_t asyncbuf_len = ACKBUF_LEN;
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__); rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__);
retval = kenwood_transaction(rig, NULL, 0, asyncbuf, &asyncbuf_len); retval = kenwood_transaction(rig, NULL, 0, asyncbuf, &asyncbuf_len);
@ -324,7 +325,8 @@ int tmv7_decode_event (RIG *rig)
int tmv7_set_vfo (RIG *rig, vfo_t vfo) int tmv7_set_vfo (RIG *rig, vfo_t vfo)
{ {
char vfobuf[16], ackbuf[ACKBUF_LEN]; 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); rig_debug(RIG_DEBUG_TRACE, "%s: called %d\n", __FUNCTION__,vfo);
@ -383,7 +385,8 @@ int tmv7_set_vfo (RIG *rig, vfo_t vfo)
int tmv7_get_mode (RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) int tmv7_get_mode (RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
{ {
char ackbuf[ACKBUF_LEN]; char ackbuf[ACKBUF_LEN];
int retval,ack_len=ACKBUF_LEN; int retval;
size_t ack_len=ACKBUF_LEN;
int step; int step;
freq_t freq; freq_t freq;
@ -428,7 +431,8 @@ int tmv7_get_powerstat (RIG *rig, powerstat_t *status)
int tmv7_get_channel(RIG *rig, channel_t *chan) int tmv7_get_channel(RIG *rig, channel_t *chan)
{ {
char membuf[64],ackbuf[ACKBUF_LEN]; char membuf[64],ackbuf[ACKBUF_LEN];
int retval,ack_len; int retval;
size_t ack_len;
freq_t freq; freq_t freq;
char req[16],scf[128]; char req[16],scf[128];
int step, shift, rev, tone, ctcss, tonefq, ctcssfq; int step, shift, rev, tone, ctcss, tonefq, ctcssfq;
@ -540,7 +544,8 @@ int tmv7_get_channel(RIG *rig, channel_t *chan)
int tmv7_set_channel(RIG *rig, const channel_t *chan) int tmv7_set_channel(RIG *rig, const channel_t *chan)
{ {
char membuf[ACKBUF_LEN],ackbuf[ACKBUF_LEN]; char membuf[ACKBUF_LEN],ackbuf[ACKBUF_LEN];
int retval,ack_len; int retval;
size_t ack_len;
char req[64]; char req[64];
long long freq; long long freq;
int chn, step, shift, tone, ctcss, tonefq, ctcssfq; int chn, step, shift, tone, ctcss, tonefq, ctcssfq;
@ -656,7 +661,8 @@ int tmv7_set_channel(RIG *rig, const channel_t *chan)
int tmv7_open(RIG *rig) int tmv7_open(RIG *rig)
{ {
char ackbuf[ACKBUF_LEN]; 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 */ /* just to be sure it's a TM-V7 */
retval = kenwood_transaction(rig, "ID"EOM, 3, ackbuf, &ack_len); retval = kenwood_transaction(rig, "ID"EOM, 3, ackbuf, &ack_len);

Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Kenwood backend - TS140 description * Hamlib Kenwood backend - TS140 description
* Copyright (c) 2000-2005 by Stephane Fillod * Copyright (c) 2000-2005 by Stephane Fillod
* *
* $Id: ts140.c,v 1.5 2005-04-03 20:14:26 fillods Exp $ * $Id: ts140.c,v 1.6 2006-03-12 09:02:38 pa4tu Exp $
* *
* This library is free software; you can redistribute it and/or modify * This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as * it under the terms of the GNU Library General Public License as
@ -62,8 +62,9 @@ static const struct kenwood_priv_caps ts140_priv_caps = {
static int ts140_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) static int ts140_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
{ {
unsigned char modebuf[50]; char modebuf[50];
int mode_len, retval; int retval;
size_t mode_len;
mode_len = 50; mode_len = 50;
retval = kenwood_transaction (rig, "IF;", 3, modebuf, &mode_len); retval = kenwood_transaction (rig, "IF;", 3, modebuf, &mode_len);
@ -97,10 +98,12 @@ static int ts140_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
static int ts140_set_vfo(RIG *rig, vfo_t vfo) static int ts140_set_vfo(RIG *rig, vfo_t vfo)
{ {
unsigned char cmdbuf[16], ackbuf[16]; char cmdbuf[16], ackbuf[50];
int cmd_len, ack_len, retval; int cmd_len, retval;
size_t ack_len;
char vfo_function; char vfo_function;
ack_len = 50;
switch (vfo) { switch (vfo) {
case RIG_VFO_VFO: case RIG_VFO_VFO:
case RIG_VFO_A: vfo_function = VFO_A; break; case RIG_VFO_A: vfo_function = VFO_A; break;
@ -123,8 +126,9 @@ static int ts140_set_vfo(RIG *rig, vfo_t vfo)
static int ts140_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) static int ts140_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
{ {
unsigned char freqbuf[50]; char freqbuf[50];
int freq_len, retval; size_t freq_len;
int retval;
long long f; long long f;
/* We're using IF; here because the TS-140S is incapable of supplying /* We're using IF; here because the TS-140S is incapable of supplying
@ -151,9 +155,11 @@ static int ts140_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
static int ts140_set_func(RIG *rig, vfo_t vfo, setting_t func, int status) static int ts140_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
{ {
unsigned char fctbuf[16], ackbuf[16]; char fctbuf[16], ackbuf[50];
int fct_len, ack_len; int fct_len;
ack_len = 0; size_t ack_len;
ack_len = 50;
switch (func) { switch (func) {
case RIG_FUNC_LOCK: case RIG_FUNC_LOCK:
if (status > 1) status = 1; if (status > 1) status = 1;

Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Kenwood backend - TS2000 description * Hamlib Kenwood backend - TS2000 description
* Copyright (c) 2000-2006 by Stephane Fillod * Copyright (c) 2000-2006 by Stephane Fillod
* *
* $Id: ts2000.c,v 1.20 2006-02-20 22:28:23 fillods Exp $ * $Id: ts2000.c,v 1.21 2006-03-12 09:02:38 pa4tu Exp $
* *
* This library is free software; you can redistribute it and/or modify * This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as * it under the terms of the GNU Library General Public License as
@ -258,10 +258,9 @@ const struct rig_caps ts2000_caps = {
int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{ {
unsigned char lvlbuf[50]; char lvlbuf[50];
int lvl_len, retval; size_t lvl_len;
int lvl; int lvl, retval, ret, agclevel;
int i, ret, agclevel;
lvl_len = 50; lvl_len = 50;
switch (level) { switch (level) {

Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Kenwood backend - TS450S description * Hamlib Kenwood backend - TS450S description
* Copyright (c) 2000-2004 by Stephane Fillod * Copyright (c) 2000-2004 by Stephane Fillod
* *
* $Id: ts450s.c,v 1.22 2005-04-03 20:14:26 fillods Exp $ * $Id: ts450s.c,v 1.23 2006-03-12 09:02:38 pa4tu Exp $
* *
* This library is free software; you can redistribute it and/or modify * This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as * it under the terms of the GNU Library General Public License as
@ -77,9 +77,11 @@ static const struct kenwood_priv_caps ts450_priv_caps = {
static int static int
ts450s_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) ts450s_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
{ {
unsigned char infobuf[50]; char infobuf[50];
int info_len, retval; size_t info_len;
int retval;
info_len = 50;
retval = kenwood_transaction (rig, "IF;", 3, infobuf, &info_len); retval = kenwood_transaction (rig, "IF;", 3, infobuf, &info_len);
if (retval != RIG_OK) if (retval != RIG_OK)
return retval; return retval;
@ -115,9 +117,11 @@ ts450s_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
static int static int
ts450s_get_vfo(RIG *rig, vfo_t *vfo) ts450s_get_vfo(RIG *rig, vfo_t *vfo)
{ {
unsigned char infobuf[50]; char infobuf[50];
int info_len, retval; size_t info_len;
int retval;
info_len = 50;
retval = kenwood_transaction (rig, "IF;", 3, infobuf, &info_len); retval = kenwood_transaction (rig, "IF;", 3, infobuf, &info_len);
if (retval != RIG_OK) if (retval != RIG_OK)
return retval; return retval;
@ -144,8 +148,9 @@ ts450s_get_vfo(RIG *rig, vfo_t *vfo)
static int static int
ts450s_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) ts450s_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{ {
unsigned char lvlbuf[50]; char lvlbuf[50];
int lvl_len, retval; size_t lvl_len;
int retval;
lvl_len = 50; lvl_len = 50;
switch (level) switch (level)
@ -204,10 +209,11 @@ ts450s_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
static int static int
ts450s_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) ts450s_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{ {
unsigned char levelbuf[16], ackbuf[16]; char levelbuf[16], ackbuf[50];
int level_len, ack_len, retval; size_t level_len, ack_len;
int kenwood_val; int kenwood_val, retval;
ack_len = 50;
if (RIG_LEVEL_IS_FLOAT(level)) if (RIG_LEVEL_IS_FLOAT(level))
kenwood_val = val.f * 255; kenwood_val = val.f * 255;
else else

Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Kenwood backend - TS480 description * Hamlib Kenwood backend - TS480 description
* Copyright (c) 2000-2004 by Stephane Fillod and Juergen Rinas * Copyright (c) 2000-2004 by Stephane Fillod and Juergen Rinas
* *
* $Id: ts480.c,v 1.4 2005-04-03 20:14:26 fillods Exp $ * $Id: ts480.c,v 1.5 2006-03-12 09:02:38 pa4tu Exp $
* *
* This library is free software; you can redistribute it and/or modify * This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as * it under the terms of the GNU Library General Public License as
@ -49,8 +49,8 @@
static int static int
kenwood_ts480_set_ptt (RIG * rig, vfo_t vfo, ptt_t ptt) kenwood_ts480_set_ptt (RIG * rig, vfo_t vfo, ptt_t ptt)
{ {
unsigned char ackbuf[16]; char ackbuf[50];
int ack_len = 0; size_t ack_len = 50;
if (RIG_PTT_ON == ptt) if (RIG_PTT_ON == ptt)
return kenwood_transaction (rig, "TX1;", 4, ackbuf, &ack_len); return kenwood_transaction (rig, "TX1;", 4, ackbuf, &ack_len);
@ -67,8 +67,8 @@ kenwood_ts480_set_ptt (RIG * rig, vfo_t vfo, ptt_t ptt)
static int static int
kenwood_ts480_set_ant (RIG * rig, vfo_t vfo, ant_t ant) kenwood_ts480_set_ant (RIG * rig, vfo_t vfo, ant_t ant)
{ {
unsigned char ackbuf[16]; char ackbuf[50];
int ack_len = 0; size_t ack_len = 50;
if (RIG_ANT_1 == ant) if (RIG_ANT_1 == ant)
return kenwood_transaction (rig, "AN1;", 4, ackbuf, &ack_len); return kenwood_transaction (rig, "AN1;", 4, ackbuf, &ack_len);
@ -87,8 +87,8 @@ kenwood_ts480_set_ant (RIG * rig, vfo_t vfo, ant_t ant)
static int static int
kenwood_ts480_get_ant (RIG * rig, vfo_t vfo, ant_t * ant) kenwood_ts480_get_ant (RIG * rig, vfo_t vfo, ant_t * ant)
{ {
unsigned char ackbuf[16]; char ackbuf[50];
int ack_len = 16; size_t ack_len = 50;
int retval; int retval;
retval = kenwood_transaction (rig, "AN;", 3, ackbuf, &ack_len); retval = kenwood_transaction (rig, "AN;", 3, ackbuf, &ack_len);
@ -119,8 +119,9 @@ kenwood_ts480_get_ant (RIG * rig, vfo_t vfo, ant_t * ant)
static const char * static const char *
kenwood_ts480_get_info (RIG * rig) kenwood_ts480_get_info (RIG * rig)
{ {
unsigned char firmbuf[50]; char firmbuf[50];
int firm_len, retval; size_t firm_len;
int retval;
firm_len = 50; firm_len = 50;
retval = kenwood_transaction (rig, "TY;", 3, firmbuf, &firm_len); retval = kenwood_transaction (rig, "TY;", 3, firmbuf, &firm_len);
@ -159,8 +160,9 @@ kenwood_ts480_get_info (RIG * rig)
int int
kenwood_ts480_set_level (RIG * rig, vfo_t vfo, setting_t level, value_t val) kenwood_ts480_set_level (RIG * rig, vfo_t vfo, setting_t level, value_t val)
{ {
unsigned char levelbuf[16], ackbuf[16]; char levelbuf[16], ackbuf[50];
int level_len, ack_len, retval; int level_len, retval;
size_t ack_len = 50;
int kenwood_val; int kenwood_val;
switch (level) switch (level)
@ -226,8 +228,8 @@ kenwood_ts480_set_level (RIG * rig, vfo_t vfo, setting_t level, value_t val)
int int
kenwood_ts480_get_level (RIG * rig, vfo_t vfo, setting_t level, value_t * val) kenwood_ts480_get_level (RIG * rig, vfo_t vfo, setting_t level, value_t * val)
{ {
unsigned char ackbuf[50]; char ackbuf[50];
int ack_len = 50; size_t ack_len = 50;
int levelint; int levelint;
int retval; int retval;
@ -326,8 +328,9 @@ kenwood_ts480_get_level (RIG * rig, vfo_t vfo, setting_t level, value_t * val)
int int
kenwood_ts480_set_func (RIG * rig, vfo_t vfo, setting_t func, int status) kenwood_ts480_set_func (RIG * rig, vfo_t vfo, setting_t func, int status)
{ {
unsigned char fctbuf[16], ackbuf[16]; char fctbuf[16], ackbuf[50];
int fct_len, ack_len; int fct_len;
size_t ack_len;
ack_len = 0; ack_len = 0;
switch (func) switch (func)