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

Do rigs/tuner/, rigs/uniden/, rigs/winradio/ & rigs/wj/ 

This leaves only rigs/yaesu
pull/1508/head
George Baltz N3GB 2024-02-04 13:53:08 -05:00
rodzic a2abc25416
commit 12552bff64
10 zmienionych plików z 84 dodań i 71 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

32
rigs/tuner/v4l.c
Wyświetl plik

@ -151,8 +151,8 @@ struct rig_caps v4l_caps =
int v4l_init(RIG *rig) int v4l_init(RIG *rig)
{ {
rig->state.rigport.type.rig = RIG_PORT_DEVICE; RIGPORT(rig)->type.rig = RIG_PORT_DEVICE;
strncpy(rig->state.rigport.pathname, DEFAULT_V4L_PATH, HAMLIB_FILPATHLEN - 1); strncpy(RIGPORT(rig)->pathname, DEFAULT_V4L_PATH, HAMLIB_FILPATHLEN - 1);
return RIG_OK; return RIG_OK;
} }
@ -168,7 +168,7 @@ int v4l_open(RIG *rig)
int ret; int ret;
double fact; double fact;
vt.tuner = i; vt.tuner = i;
ret = ioctl(rig->state.rigport.fd, VIDIOCGTUNER, &vt); ret = ioctl(RIGPORT(rig)->fd, VIDIOCGTUNER, &vt);
if (ret < 0) if (ret < 0)
{ {
@ -191,6 +191,7 @@ int v4l_open(RIG *rig)
int v4l_set_freq(RIG *rig, vfo_t vfo, freq_t freq) int v4l_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
{ {
const struct rig_state *rs = &rig->state; const struct rig_state *rs = &rig->state;
hamlib_port_t *rp = RIGPORT(rig);
struct video_tuner vt; struct video_tuner vt;
const freq_range_t *range; const freq_range_t *range;
unsigned long f; unsigned long f;
@ -209,7 +210,7 @@ int v4l_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
vt.tuner = (rs->rx_range_list - range) / sizeof(freq_range_t); vt.tuner = (rs->rx_range_list - range) / sizeof(freq_range_t);
ret = ioctl(rig->state.rigport.fd, VIDIOCSTUNER, &vt); /* set tuner # */ ret = ioctl(rp->fd, VIDIOCSTUNER, &vt); /* set tuner # */
if (ret < 0) if (ret < 0)
{ {
@ -222,7 +223,7 @@ int v4l_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
f = rint(freq * fact); /* rounding to nearest int */ f = rint(freq * fact); /* rounding to nearest int */
ret = ioctl(rig->state.rigport.fd, VIDIOCSFREQ, &f); ret = ioctl(rp->fd, VIDIOCSFREQ, &f);
if (ret < 0) if (ret < 0)
{ {
@ -242,7 +243,7 @@ int v4l_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
double fact; double fact;
int ret; int ret;
ret = ioctl(rig->state.rigport.fd, VIDIOCGFREQ, &f); ret = ioctl(RIGPORT(rig)->fd, VIDIOCGFREQ, &f);
if (ret < 0) if (ret < 0)
{ {
@ -270,12 +271,13 @@ int v4l_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
int v4l_set_func(RIG *rig, vfo_t vfo, setting_t func, int status) int v4l_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
{ {
struct video_audio va; struct video_audio va;
hamlib_port_t *rp = RIGPORT(rig);
int ret; int ret;
switch (func) switch (func)
{ {
case RIG_FUNC_MUTE: case RIG_FUNC_MUTE:
ret = ioctl(rig->state.rigport.fd, VIDIOCGAUDIO, &va); ret = ioctl(rp->fd, VIDIOCGAUDIO, &va);
if (ret < 0) if (ret < 0)
{ {
@ -285,7 +287,7 @@ int v4l_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
} }
va.flags = status ? VIDEO_AUDIO_MUTE : 0; va.flags = status ? VIDEO_AUDIO_MUTE : 0;
ret = ioctl(rig->state.rigport.fd, VIDIOCSAUDIO, &va); ret = ioctl(rp->fd, VIDIOCSAUDIO, &va);
if (ret < 0) if (ret < 0)
{ {
@ -311,7 +313,7 @@ int v4l_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
switch (func) switch (func)
{ {
case RIG_FUNC_MUTE: case RIG_FUNC_MUTE:
ret = ioctl(rig->state.rigport.fd, VIDIOCGAUDIO, &va); ret = ioctl(RIGPORT(rig)->fd, VIDIOCGAUDIO, &va);
if (ret < 0) if (ret < 0)
{ {
@ -334,9 +336,10 @@ int v4l_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
int v4l_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) int v4l_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{ {
struct video_audio va; struct video_audio va;
hamlib_port_t *rp = RIGPORT(rig);
int ret; int ret;
ret = ioctl(rig->state.rigport.fd, VIDIOCGAUDIO, &va); ret = ioctl(rp->fd, VIDIOCGAUDIO, &va);
if (ret < 0) if (ret < 0)
{ {
@ -355,7 +358,7 @@ int v4l_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return -RIG_EINVAL; return -RIG_EINVAL;
} }
ret = ioctl(rig->state.rigport.fd, VIDIOCSAUDIO, &va); ret = ioctl(rp->fd, VIDIOCSAUDIO, &va);
if (ret < 0) if (ret < 0)
{ {
@ -371,12 +374,13 @@ int v4l_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{ {
struct video_audio va; struct video_audio va;
struct video_tuner vt; struct video_tuner vt;
hamlib_port_t *rp = RIGPORT(rig);
int ret; int ret;
switch (level) switch (level)
{ {
case RIG_LEVEL_AF: case RIG_LEVEL_AF:
ret = ioctl(rig->state.rigport.fd, VIDIOCGAUDIO, &va); ret = ioctl(rp->fd, VIDIOCGAUDIO, &va);
if (ret < 0) if (ret < 0)
{ {
@ -389,7 +393,7 @@ int v4l_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break; break;
case RIG_LEVEL_RAWSTR: case RIG_LEVEL_RAWSTR:
ret = ioctl(rig->state.rigport.fd, VIDIOCGTUNER, &vt); /* get info */ ret = ioctl(rp->fd, VIDIOCGTUNER, &vt); /* get info */
if (ret < 0) if (ret < 0)
{ {
@ -417,7 +421,7 @@ const char *v4l_get_info(RIG *rig)
int ret; int ret;
vt.tuner = 0; vt.tuner = 0;
ret = ioctl(rig->state.rigport.fd, VIDIOCGTUNER, &vt); ret = ioctl(RIGPORT(rig)->fd, VIDIOCGTUNER, &vt);
if (ret < 0) if (ret < 0)
{ {

32
rigs/tuner/v4l2.c
Wyświetl plik

@ -151,8 +151,8 @@ struct rig_caps v4l2_caps =
int v4l2_init(RIG *rig) int v4l2_init(RIG *rig)
{ {
rig->state.rigport.type.rig = RIG_PORT_DEVICE; RIGPORT(rig)->type.rig = RIG_PORT_DEVICE;
strncpy(rig->state.rigport.pathname, DEFAULT_V4L2_PATH, HAMLIB_FILPATHLEN - 1); strncpy(RIGPORT(rig)->pathname, DEFAULT_V4L2_PATH, HAMLIB_FILPATHLEN - 1);
return RIG_OK; return RIG_OK;
} }
@ -168,7 +168,7 @@ int v4l2_open(RIG *rig)
int ret; int ret;
double fact; double fact;
vt.index = i; vt.index = i;
ret = ioctl(rig->state.rigport.fd, VIDIOC_G_TUNER, &vt); ret = ioctl(RIGPORT(rig)->fd, VIDIOC_G_TUNER, &vt);
if (ret < 0) if (ret < 0)
{ {
@ -191,6 +191,7 @@ int v4l2_open(RIG *rig)
int v4l2_set_freq(RIG *rig, vfo_t vfo, freq_t freq) int v4l2_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
{ {
const struct rig_state *rs = &rig->state; const struct rig_state *rs = &rig->state;
hamlib_port_t *rp = RIGPORT(rig);
struct v4l2_tuner vt; struct v4l2_tuner vt;
const freq_range_t *range; const freq_range_t *range;
unsigned long f; unsigned long f;
@ -209,7 +210,7 @@ int v4l2_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
vt.index = (rs->rx_range_list - range) / sizeof(freq_range_t); vt.index = (rs->rx_range_list - range) / sizeof(freq_range_t);
ret = ioctl(rig->state.rigport.fd, VIDIOC_S_TUNER, &vt); /* set tuner # */ ret = ioctl(rp->fd, VIDIOC_S_TUNER, &vt); /* set tuner # */
if (ret < 0) if (ret < 0)
{ {
@ -222,7 +223,7 @@ int v4l2_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
f = rint(freq * fact); /* rounding to nearest int */ f = rint(freq * fact); /* rounding to nearest int */
ret = ioctl(rig->state.rigport.fd, VIDIOC_S_FREQUENCY, &f); ret = ioctl(rp->fd, VIDIOC_S_FREQUENCY, &f);
if (ret < 0) if (ret < 0)
{ {
@ -243,7 +244,7 @@ int v4l2_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
int ret; int ret;
/* FIXME */ /* FIXME */
ret = ioctl(rig->state.rigport.fd, VIDIOC_G_FREQUENCY, &f); ret = ioctl(RIGPORT(rig)->fd, VIDIOC_G_FREQUENCY, &f);
if (ret < 0) if (ret < 0)
{ {
@ -271,12 +272,13 @@ int v4l2_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
int v4l2_set_func(RIG *rig, vfo_t vfo, setting_t func, int status) int v4l2_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
{ {
struct v4l2_audio va; struct v4l2_audio va;
hamlib_port_t *rp = RIGPORT(rig);
int ret; int ret;
switch (func) switch (func)
{ {
case RIG_FUNC_MUTE: case RIG_FUNC_MUTE:
ret = ioctl(rig->state.rigport.fd, VIDIOC_G_AUDIO, &va); ret = ioctl(rp->fd, VIDIOC_G_AUDIO, &va);
if (ret < 0) if (ret < 0)
{ {
@ -286,7 +288,7 @@ int v4l2_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
} }
va.capability = status ? V4L2_CID_AUDIO_MUTE : 0; va.capability = status ? V4L2_CID_AUDIO_MUTE : 0;
ret = ioctl(rig->state.rigport.fd, VIDIOC_S_AUDIO, &va); ret = ioctl(rp->fd, VIDIOC_S_AUDIO, &va);
if (ret < 0) if (ret < 0)
{ {
@ -312,7 +314,7 @@ int v4l2_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
switch (func) switch (func)
{ {
case RIG_FUNC_MUTE: case RIG_FUNC_MUTE:
ret = ioctl(rig->state.rigport.fd, VIDIOC_G_AUDIO, &va); ret = ioctl(RIGPORT(rig)->fd, VIDIOC_G_AUDIO, &va);
if (ret < 0) if (ret < 0)
{ {
@ -335,9 +337,10 @@ int v4l2_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
int v4l2_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) int v4l2_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{ {
struct v4l2_audio va; struct v4l2_audio va;
hamlib_port_t *rp = RIGPORT(rig);
int ret; int ret;
ret = ioctl(rig->state.rigport.fd, VIDIOC_G_AUDIO, &va); ret = ioctl(rp->fd, VIDIOC_G_AUDIO, &va);
if (ret < 0) if (ret < 0)
{ {
@ -358,7 +361,7 @@ int v4l2_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return -RIG_EINVAL; return -RIG_EINVAL;
} }
ret = ioctl(rig->state.rigport.fd, VIDIOC_S_AUDIO, &va); ret = ioctl(rp->fd, VIDIOC_S_AUDIO, &va);
if (ret < 0) if (ret < 0)
{ {
@ -374,12 +377,13 @@ int v4l2_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{ {
struct v4l2_audio va; struct v4l2_audio va;
struct v4l2_tuner vt; struct v4l2_tuner vt;
hamlib_port_t *rp = RIGPORT(rig);
int ret; int ret;
switch (level) switch (level)
{ {
case RIG_LEVEL_AF: case RIG_LEVEL_AF:
ret = ioctl(rig->state.rigport.fd, VIDIOC_G_AUDIO, &va); ret = ioctl(rp->fd, VIDIOC_G_AUDIO, &va);
if (ret < 0) if (ret < 0)
{ {
@ -393,7 +397,7 @@ int v4l2_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_RAWSTR: case RIG_LEVEL_RAWSTR:
/* FE_READ_SIGNAL_STRENGTH ? */ /* FE_READ_SIGNAL_STRENGTH ? */
ret = ioctl(rig->state.rigport.fd, VIDIOC_G_TUNER, &vt); /* get info */ ret = ioctl(rp->fd, VIDIOC_G_TUNER, &vt); /* get info */
if (ret < 0) if (ret < 0)
{ {
@ -421,7 +425,7 @@ const char *v4l2_get_info(RIG *rig)
int ret; int ret;
vt.index = 0; vt.index = 0;
ret = ioctl(rig->state.rigport.fd, VIDIOC_G_TUNER, &vt); ret = ioctl(RIGPORT(rig)->fd, VIDIOC_G_TUNER, &vt);
if (ret < 0) if (ret < 0)
{ {

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

@ -116,6 +116,7 @@ uniden_transaction(RIG *rig, const char *cmdstr, int cmd_len,
char *data, size_t *datasize) char *data, size_t *datasize)
{ {
struct rig_state *rs; struct rig_state *rs;
hamlib_port_t *rp = RIGPORT(rig);
int retval; int retval;
int retry_read = 0; int retry_read = 0;
char replybuf[BUFSZ]; char replybuf[BUFSZ];
@ -126,11 +127,11 @@ uniden_transaction(RIG *rig, const char *cmdstr, int cmd_len,
transaction_write: transaction_write:
rig_flush(&rs->rigport); rig_flush(rp);
if (cmdstr) if (cmdstr)
{ {
retval = write_block(&rs->rigport, (unsigned char *) cmdstr, strlen(cmdstr)); retval = write_block(rp, (unsigned char *) cmdstr, strlen(cmdstr));
if (retval != RIG_OK) if (retval != RIG_OK)
{ {
@ -150,12 +151,12 @@ transaction_write:
} }
memset(data, 0, *datasize); memset(data, 0, *datasize);
retval = read_string(&rs->rigport, (unsigned char *) data, *datasize, EOM, retval = read_string(rp, (unsigned char *) data, *datasize, EOM,
strlen(EOM), 0, 1); strlen(EOM), 0, 1);
if (retval < 0) if (retval < 0)
{ {
if (retry_read++ < rig->state.rigport.retry) if (retry_read++ < rp->retry)
{ {
goto transaction_write; goto transaction_write;
} }
@ -173,7 +174,7 @@ transaction_write:
rig_debug(RIG_DEBUG_ERR, "%s: Command is not correctly terminated '%s'\n", rig_debug(RIG_DEBUG_ERR, "%s: Command is not correctly terminated '%s'\n",
__func__, data); __func__, data);
if (retry_read++ < rig->state.rigport.retry) if (retry_read++ < rp->retry)
{ {
goto transaction_write; goto transaction_write;
} }
@ -251,7 +252,7 @@ transaction_write:
*/ */
rig_debug(RIG_DEBUG_ERR, "%s: Unexpected reply '%s'\n", __func__, data); rig_debug(RIG_DEBUG_ERR, "%s: Unexpected reply '%s'\n", __func__, data);
if (retry_read++ < rig->state.rigport.retry) if (retry_read++ < rp->retry)
{ {
goto transaction_write; goto transaction_write;
} }

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

@ -97,6 +97,7 @@ uniden_digital_transaction(RIG *rig, const char *cmdstr, int cmd_len,
char *data, size_t *datasize) char *data, size_t *datasize)
{ {
struct rig_state *rs; struct rig_state *rs;
hamlib_port_t *rp = RIGPORT(rig);
int retval; int retval;
int retry_read = 0; int retry_read = 0;
char replybuf[BUFSZ]; char replybuf[BUFSZ];
@ -107,11 +108,11 @@ uniden_digital_transaction(RIG *rig, const char *cmdstr, int cmd_len,
transaction_write: transaction_write:
rig_flush(&rs->rigport); rig_flush(rp);
if (cmdstr) if (cmdstr)
{ {
retval = write_block(&rs->rigport, (unsigned char *) cmdstr, strlen(cmdstr)); retval = write_block(rp, (unsigned char *) cmdstr, strlen(cmdstr));
if (retval != RIG_OK) if (retval != RIG_OK)
{ {
@ -131,12 +132,12 @@ transaction_write:
} }
memset(data, 0, *datasize); memset(data, 0, *datasize);
retval = read_string(&rs->rigport, (unsigned char *) data, *datasize, EOM, retval = read_string(rp, (unsigned char *) data, *datasize, EOM,
strlen(EOM), 0, 1); strlen(EOM), 0, 1);
if (retval < 0) if (retval < 0)
{ {
if (retry_read++ < rig->state.rigport.retry) if (retry_read++ < rp->retry)
{ {
goto transaction_write; goto transaction_write;
} }
@ -154,7 +155,7 @@ transaction_write:
* ie: STS command will not return either "\r" or "\n"! */ * ie: STS command will not return either "\r" or "\n"! */
/*if (strchr(EOM, data[strlen(data)-1])==NULL) { /*if (strchr(EOM, data[strlen(data)-1])==NULL) {
rig_debug(RIG_DEBUG_ERR, "%s: Command is not correctly terminated '%s'\n", __func__, data); rig_debug(RIG_DEBUG_ERR, "%s: Command is not correctly terminated '%s'\n", __func__, data);
if (retry_read++ < rig->state.rigport.retry) if (retry_read++ < rp->retry)
goto transaction_write; goto transaction_write;
retval = -RIG_EPROTO; retval = -RIG_EPROTO;
goto transaction_quit; goto transaction_quit;
@ -245,7 +246,7 @@ transaction_write:
*/ */
rig_debug(RIG_DEBUG_ERR, "%s: Unexpected reply '%s'\n", __func__, data); rig_debug(RIG_DEBUG_ERR, "%s: Unexpected reply '%s'\n", __func__, data);
if (retry_read++ < rig->state.rigport.retry) if (retry_read++ < rp->retry)
{ {
goto transaction_write; goto transaction_write;
} }

2
rigs/winradio/g303.c
Wyświetl plik

@ -243,7 +243,7 @@ int g3_open(RIG *rig)
struct g3_priv_data *priv = (struct g3_priv_data *)rig->state.priv; struct g3_priv_data *priv = (struct g3_priv_data *)rig->state.priv;
int device_num; int device_num;
device_num = atoi(rig->state.rigport.pathname); device_num = atoi(RIGPORT(rig)->pathname);
/* Open Winradio receiver handle */ /* Open Winradio receiver handle */
priv->hRadio = priv->OpenRadioDevice(device_num); priv->hRadio = priv->OpenRadioDevice(device_num);

2
rigs/winradio/g305.c
Wyświetl plik

@ -244,7 +244,7 @@ int g3_open(RIG *rig)
struct g3_priv_data *priv = (struct g3_priv_data *)rig->state.priv; struct g3_priv_data *priv = (struct g3_priv_data *)rig->state.priv;
int device_num; int device_num;
device_num = atoi(rig->state.rigport.pathname); device_num = atoi(RIGPORT(rig)->pathname);
/* Open Winradio receiver handle */ /* Open Winradio receiver handle */
priv->hRadio = priv->OpenRadioDevice(device_num); priv->hRadio = priv->OpenRadioDevice(device_num);

4
rigs/winradio/g313-posix.c
Wyświetl plik

@ -178,9 +178,9 @@ int g313_open(RIG *rig)
rig_debug(RIG_DEBUG_VERBOSE, "%s: found %d rigs 0 is %s\n", __func__, Count, rig_debug(RIG_DEBUG_VERBOSE, "%s: found %d rigs 0 is %s\n", __func__, Count,
List[0].Path); List[0].Path);
if (rig->state.rigport.pathname[0]) if (RIGPORT(rig)->pathname[0])
{ {
priv->hRadio = OpenDevice(rig->state.rigport.pathname); priv->hRadio = OpenDevice(RIGPORT(rig)->pathname);
} }
else else
{ {

2
rigs/winradio/g313-win.c
Wyświetl plik

@ -379,7 +379,7 @@ int g313_open(RIG *rig)
int Count; int Count;
int id; int id;
device_num = atoi(rig->state.rigport.pathname); device_num = atoi(RIGPORT(rig)->pathname);
Count = priv->waveOutGetNumDevs(); Count = priv->waveOutGetNumDevs();

48
rigs/winradio/winradio.c
Wyświetl plik

@ -44,9 +44,9 @@
int wr_rig_init(RIG *rig) int wr_rig_init(RIG *rig)
{ {
rig->state.rigport.type.rig = RIG_PORT_DEVICE; hamlib_port_t *rp = RIGPORT(rig);
strncpy(rig->state.rigport.pathname, DEFAULT_WINRADIO_PATH, rp->type.rig = RIG_PORT_DEVICE;
HAMLIB_FILPATHLEN - 1); strncpy(rp->pathname, DEFAULT_WINRADIO_PATH, HAMLIB_FILPATHLEN - 1);
return RIG_OK; return RIG_OK;
} }
@ -62,7 +62,7 @@ int wr_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
f = (unsigned long)freq; f = (unsigned long)freq;
if (ioctl(rig->state.rigport.fd, RADIO_SET_FREQ, &f)) { return -RIG_EINVAL; } if (ioctl(RIGPORT(rig)->fd, RADIO_SET_FREQ, &f)) { return -RIG_EINVAL; }
return RIG_OK; return RIG_OK;
} }
@ -71,7 +71,7 @@ int wr_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
{ {
unsigned long f; unsigned long f;
if (ioctl(rig->state.rigport.fd, RADIO_GET_FREQ, &f) < 0) { return -RIG_EINVAL; } if (ioctl(RIGPORT(rig)->fd, RADIO_GET_FREQ, &f) < 0) { return -RIG_EINVAL; }
*freq = (freq_t)f; *freq = (freq_t)f;
return RIG_OK; return RIG_OK;
@ -112,7 +112,7 @@ int wr_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
default: return -RIG_EINVAL; default: return -RIG_EINVAL;
} }
if (ioctl(rig->state.rigport.fd, RADIO_SET_MODE, &m)) { return -RIG_EINVAL; } if (ioctl(RIGPORT(rig)->fd, RADIO_SET_MODE, &m)) { return -RIG_EINVAL; }
return RIG_OK; return RIG_OK;
} }
@ -121,7 +121,7 @@ int wr_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
{ {
unsigned long m; unsigned long m;
if (ioctl(rig->state.rigport.fd, RADIO_GET_MODE, &m)) { return -RIG_EINVAL; } if (ioctl(RIGPORT(rig)->fd, RADIO_GET_MODE, &m)) { return -RIG_EINVAL; }
*width = RIG_PASSBAND_NORMAL; *width = RIG_PASSBAND_NORMAL;
@ -159,7 +159,7 @@ int wr_set_powerstat(RIG *rig, powerstat_t status)
unsigned long p = 1; unsigned long p = 1;
p = status == RIG_POWER_ON ? 1 : 0; p = status == RIG_POWER_ON ? 1 : 0;
if (ioctl(rig->state.rigport.fd, RADIO_SET_POWER, &p)) { return -RIG_EINVAL; } if (ioctl(RIGPORT(rig)->fd, RADIO_SET_POWER, &p)) { return -RIG_EINVAL; }
return RIG_OK; return RIG_OK;
} }
@ -167,7 +167,7 @@ int wr_get_powerstat(RIG *rig, powerstat_t *status)
{ {
unsigned long p; unsigned long p;
if (ioctl(rig->state.rigport.fd, RADIO_GET_POWER, &p)) { return -RIG_EINVAL; } if (ioctl(RIGPORT(rig)->fd, RADIO_GET_POWER, &p)) { return -RIG_EINVAL; }
*status = p ? RIG_POWER_ON : RIG_POWER_OFF; *status = p ? RIG_POWER_ON : RIG_POWER_OFF;
return RIG_OK; return RIG_OK;
@ -181,7 +181,7 @@ int wr_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
{ {
unsigned long v = status ? 1 : 0; unsigned long v = status ? 1 : 0;
if (ioctl(rig->state.rigport.fd, RADIO_SET_AGC, &v)) { return -RIG_EINVAL; } if (ioctl(RIGPORT(rig)->fd, RADIO_SET_AGC, &v)) { return -RIG_EINVAL; }
return RIG_OK; return RIG_OK;
} }
@ -199,7 +199,7 @@ int wr_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
{ {
unsigned long v; unsigned long v;
if (ioctl(rig->state.rigport.fd, RADIO_GET_AGC, &v)) { return -RIG_EINVAL; } if (ioctl(RIGPORT(rig)->fd, RADIO_GET_AGC, &v)) { return -RIG_EINVAL; }
*status = v; *status = v;
return RIG_OK; return RIG_OK;
@ -213,17 +213,18 @@ int wr_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
int wr_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) int wr_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{ {
hamlib_port_t *rp = RIGPORT(rig);
switch (level) switch (level)
{ {
case RIG_LEVEL_AF: case RIG_LEVEL_AF:
{ {
unsigned long v; unsigned long v;
if (ioctl(rig->state.rigport.fd, RADIO_GET_MAXVOL, &v)) { return -RIG_EINVAL; } if (ioctl(rp->fd, RADIO_GET_MAXVOL, &v)) { return -RIG_EINVAL; }
v *= val.f; v *= val.f;
if (ioctl(rig->state.rigport.fd, RADIO_SET_VOL, &v)) { return -RIG_EINVAL; } if (ioctl(rp->fd, RADIO_SET_VOL, &v)) { return -RIG_EINVAL; }
return RIG_OK; return RIG_OK;
} }
@ -232,7 +233,7 @@ int wr_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{ {
unsigned long v = val.i ? 1 : 0; unsigned long v = val.i ? 1 : 0;
if (ioctl(rig->state.rigport.fd, RADIO_SET_ATTN, &v)) { return -RIG_EINVAL; } if (ioctl(rp->fd, RADIO_SET_ATTN, &v)) { return -RIG_EINVAL; }
return RIG_OK; return RIG_OK;
} }
@ -241,7 +242,7 @@ int wr_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{ {
long v = val.i; long v = val.i;
if (ioctl(rig->state.rigport.fd, RADIO_SET_IFS, &v)) { return -RIG_EINVAL; } if (ioctl(rp->fd, RADIO_SET_IFS, &v)) { return -RIG_EINVAL; }
return RIG_OK; return RIG_OK;
} }
@ -250,7 +251,7 @@ int wr_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{ {
long v = val.f * 100; /* iMaxIFGain on wHWVer > RHV_3150 */ long v = val.f * 100; /* iMaxIFGain on wHWVer > RHV_3150 */
if (ioctl(rig->state.rigport.fd, RADIO_SET_IFG, &v)) { return -RIG_EINVAL; } if (ioctl(rp->fd, RADIO_SET_IFG, &v)) { return -RIG_EINVAL; }
return RIG_OK; return RIG_OK;
} }
@ -262,15 +263,16 @@ int wr_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
int wr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) int wr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{ {
hamlib_port_t *rp = RIGPORT(rig);
switch (level) switch (level)
{ {
case RIG_LEVEL_AF: case RIG_LEVEL_AF:
{ {
unsigned long v, mv; unsigned long v, mv;
if (ioctl(rig->state.rigport.fd, RADIO_GET_MAXVOL, &mv)) { return -RIG_EINVAL; } if (ioctl(rp->fd, RADIO_GET_MAXVOL, &mv)) { return -RIG_EINVAL; }
if (ioctl(rig->state.rigport.fd, RADIO_GET_VOL, &v)) { return -RIG_EINVAL; } if (ioctl(rp->fd, RADIO_GET_VOL, &v)) { return -RIG_EINVAL; }
val->f = (float)v / mv; val->f = (float)v / mv;
return RIG_OK; return RIG_OK;
@ -280,7 +282,7 @@ int wr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{ {
unsigned long v; unsigned long v;
if (ioctl(rig->state.rigport.fd, RADIO_GET_VOL, &v)) { return -RIG_EINVAL; } if (ioctl(rp->fd, RADIO_GET_VOL, &v)) { return -RIG_EINVAL; }
val->i = v ? rig->state.attenuator[0] : 0; val->i = v ? rig->state.attenuator[0] : 0;
return RIG_OK; return RIG_OK;
@ -290,7 +292,7 @@ int wr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{ {
unsigned long v; unsigned long v;
if (ioctl(rig->state.rigport.fd, RADIO_GET_SS, &v)) { return -RIG_EINVAL; } if (ioctl(rp->fd, RADIO_GET_SS, &v)) { return -RIG_EINVAL; }
val->i = v - 60; /* 0..120, Hamlib assumes S9 = 0dB */ val->i = v - 60; /* 0..120, Hamlib assumes S9 = 0dB */
return RIG_OK; return RIG_OK;
@ -300,7 +302,7 @@ int wr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{ {
long v; long v;
if (ioctl(rig->state.rigport.fd, RADIO_GET_IFS, &v)) { return -RIG_EINVAL; } if (ioctl(rp->fd, RADIO_GET_IFS, &v)) { return -RIG_EINVAL; }
val->i = v; val->i = v;
return RIG_OK; return RIG_OK;
@ -310,7 +312,7 @@ int wr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{ {
long v; long v;
if (ioctl(rig->state.rigport.fd, RADIO_GET_IFG, &v)) { return -RIG_EINVAL; } if (ioctl(rp->fd, RADIO_GET_IFG, &v)) { return -RIG_EINVAL; }
val->f = (float)v / 100; /* iMaxIFGain on wHWVer > RHV_3150 */ val->f = (float)v / 100; /* iMaxIFGain on wHWVer > RHV_3150 */
return RIG_OK; return RIG_OK;
@ -328,7 +330,7 @@ const char *wr_get_info(RIG *rig)
{ {
static char buf[100]; static char buf[100];
if (ioctl(rig->state.rigport.fd, RADIO_GET_DESCR, buf) < 0) { return "?"; } if (ioctl(RIGPORT(rig)->fd, RADIO_GET_DESCR, buf) < 0) { return "?"; }
return buf; return buf;
} }

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

@ -67,6 +67,7 @@ const struct confparams wj_cfg_params[] =
static int wj_transaction(RIG *rig, int monitor) static int wj_transaction(RIG *rig, int monitor)
{ {
struct wj_priv_data *priv = (struct wj_priv_data *)rig->state.priv; struct wj_priv_data *priv = (struct wj_priv_data *)rig->state.priv;
hamlib_port_t *rp = RIGPORT(rig);
unsigned char buf[CMDSZ] = { 0x8, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; unsigned char buf[CMDSZ] = { 0x8, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
unsigned char rxbuf[CMDSZ]; unsigned char rxbuf[CMDSZ];
@ -169,9 +170,9 @@ static int wj_transaction(RIG *rig, int monitor)
/* buf[9]: not used if command byte, but must be transmitted */ /* buf[9]: not used if command byte, but must be transmitted */
rig_flush(&rig->state.rigport); rig_flush(rp);
retval = write_block(&rig->state.rigport, buf, CMDSZ); retval = write_block(rp, buf, CMDSZ);
if (retval != RIG_OK) if (retval != RIG_OK)
{ {
@ -183,7 +184,7 @@ static int wj_transaction(RIG *rig, int monitor)
/* /*
* Transceiver sends back ">" * Transceiver sends back ">"
*/ */
retval = read_block(&rig->state.rigport, rxbuf, CMDSZ); retval = read_block(rp, rxbuf, CMDSZ);
if (retval < 0 || retval > CMDSZ) if (retval < 0 || retval > CMDSZ)
{ {