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

Merge pull request #769 from wutje/yaesu_private 

Move priv_data structs of ft100, ft600, ft817, ft857, ft897 to the C file
pull/772/head
Michael Black 2021-08-17 15:36:47 -05:00 zatwierdzone przez GitHub
rodzic 658599930e 485612008f
commit b2de21426f
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
12 zmienionych plików z 140 dodań i 107 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -41,6 +41,13 @@
#include "misc.h"
#include "bandplan.h"
struct ft100_priv_data {
/* TODO: make use of cached data */
FT100_STATUS_INFO status;
FT100_FLAG_INFO flags;
};
/* prototypes */
static int ft100_send_priv_cmd(RIG *rig, unsigned char cmd_index);

7
rigs/yaesu/ft100.h
Wyświetl plik

@ -127,13 +127,6 @@ typedef struct
FT100_FLAG_INFO;
struct ft100_priv_data {
/* TODO: make use of cached data */
FT100_STATUS_INFO status;
FT100_FLAG_INFO flags;
};
static int ft100_init(RIG *rig);
static int ft100_open(RIG *rig);
static int ft100_cleanup(RIG *rig);

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

@ -41,6 +41,14 @@
#include "misc.h"
#include "bandplan.h"
struct ft600_priv_data {
FT600_STATUS_INFO status;
FT600_FLAG_INFO flags;
unsigned char s_meter;
};
/* prototypes */
static int ft600_send_priv_cmd(RIG *rig, unsigned char cmd_index);

8
rigs/yaesu/ft600.h
Wyświetl plik

@ -112,14 +112,6 @@ typedef struct
FT600_FLAG_INFO;
struct ft600_priv_data {
FT600_STATUS_INFO status;
FT600_FLAG_INFO flags;
unsigned char s_meter;
};
static int ft600_init(RIG *rig);
static int ft600_open(RIG *rig);
static int ft600_cleanup(RIG *rig);

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

@ -71,6 +71,23 @@
#include "bandplan.h"
#include "cal.h"
struct ft817_priv_data
{
/* rx status */
struct timeval rx_status_tv;
unsigned char rx_status;
/* tx status */
struct timeval tx_status_tv;
unsigned char tx_status;
/* freq & mode status */
struct timeval fm_status_tv;
unsigned char fm_status[YAESU_CMD_LENGTH + 1];
};
static int ft817_get_vfo(RIG *rig, vfo_t *vfo);
static int ft817_set_vfo(RIG *rig, vfo_t vfo);
/* Native ft817 cmd set prototypes. These are READ ONLY as each */
/* rig instance will copy from these and modify if required . */
@ -308,6 +325,8 @@ const struct rig_caps ft817_caps =
.rig_cleanup = ft817_cleanup,
.rig_open = ft817_open,
.rig_close = ft817_close,
.get_vfo = ft817_get_vfo,
.set_vfo = ft817_set_vfo,
.set_freq = ft817_set_freq,
.get_freq = ft817_get_freq,
.set_mode = ft817_set_mode,
@ -446,6 +465,8 @@ const struct rig_caps ft818_caps =
.rig_cleanup = ft817_cleanup,
.rig_open = ft817_open,
.rig_close = ft817_close,
.get_vfo = ft817_get_vfo,
.set_vfo = ft817_set_vfo,
.set_freq = ft817_set_freq,
.get_freq = ft817_get_freq,
.set_mode = ft817_set_mode,
@ -474,8 +495,6 @@ const struct rig_caps ft818_caps =
int ft817_init(RIG *rig)
{
struct ft817_priv_data *priv;
rig_debug(RIG_DEBUG_VERBOSE, "%s: called, version %s\n", __func__,
rig->caps->version);
@ -486,9 +505,6 @@ int ft817_init(RIG *rig)
priv = rig->state.priv;
/* Copy complete native cmd set to private cmd storage area */
memcpy(priv->pcs, ncmd, sizeof(ncmd));
return RIG_OK;
}
@ -559,12 +575,11 @@ static int check_cache_timeout(struct timeval *tv)
static int ft817_read_eeprom(RIG *rig, unsigned short addr, unsigned char *out)
{
struct ft817_priv_data *p = (struct ft817_priv_data *) rig->state.priv;
unsigned char data[YAESU_CMD_LENGTH];
int n;
rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__);
memcpy(data, (char *)p->pcs[FT817_NATIVE_CAT_EEPROM_READ].nseq,
memcpy(data, ncmd[FT817_NATIVE_CAT_EEPROM_READ].nseq,
YAESU_CMD_LENGTH);
data[0] = addr >> 8;
@ -626,7 +641,7 @@ static int ft817_get_status(RIG *rig, int status)
do
{
rig_flush(&rig->state.rigport);
write_block(&rig->state.rigport, (char *) p->pcs[status].nseq,
write_block(&rig->state.rigport, (char *) ncmd[status].nseq,
YAESU_CMD_LENGTH);
n = read_block(&rig->state.rigport, (char *) data, len);
}
@ -1059,18 +1074,16 @@ int ft817_read_ack(RIG *rig)
*/
static int ft817_send_cmd(RIG *rig, int index)
{
struct ft817_priv_data *p = (struct ft817_priv_data *) rig->state.priv;
rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__);
if (p->pcs[index].ncomp == 0)
if (ncmd[index].ncomp == 0)
{
rig_debug(RIG_DEBUG_VERBOSE, "%s: Incomplete sequence\n", __func__);
return -RIG_EINTERNAL;
}
rig_flush(&rig->state.rigport);
write_block(&rig->state.rigport, (char *) p->pcs[index].nseq, YAESU_CMD_LENGTH);
write_block(&rig->state.rigport, (char *) ncmd[index].nseq, YAESU_CMD_LENGTH);
return ft817_read_ack(rig);
}
@ -1079,18 +1092,17 @@ static int ft817_send_cmd(RIG *rig, int index)
*/
static int ft817_send_icmd(RIG *rig, int index, unsigned char *data)
{
struct ft817_priv_data *p = (struct ft817_priv_data *) rig->state.priv;
unsigned char cmd[YAESU_CMD_LENGTH];
rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__);
if (p->pcs[index].ncomp == 1)
if (ncmd[index].ncomp == 1)
{
rig_debug(RIG_DEBUG_VERBOSE, "%s: Complete sequence\n", __func__);
return -RIG_EINTERNAL;
}
cmd[YAESU_CMD_LENGTH - 1] = p->pcs[index].nseq[YAESU_CMD_LENGTH - 1];
cmd[YAESU_CMD_LENGTH - 1] = ncmd[index].nseq[YAESU_CMD_LENGTH - 1];
memcpy(cmd, data, YAESU_CMD_LENGTH - 1);
write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH);
@ -1098,6 +1110,48 @@ static int ft817_send_icmd(RIG *rig, int index, unsigned char *data)
}
/* ---------------------------------------------------------------------- */
static int ft817_get_vfo(RIG *rig, vfo_t *vfo)
{
unsigned char c;
*vfo = RIG_VFO_B;
rig_debug(RIG_DEBUG_VERBOSE, "%s: called \n", __func__);
if (ft817_read_eeprom(rig, 0x55, &c) < 0) /* get vfo status */
{
return -RIG_EPROTO;
}
if ((c & 0x1) == 0) { *vfo = RIG_VFO_A; }
return RIG_OK;
}
static int ft817_set_vfo(RIG *rig, vfo_t vfo)
{
vfo_t curvfo;
int retval;
rig_debug(RIG_DEBUG_VERBOSE, "%s: called \n", __func__);
retval = ft817_get_vfo(rig, &curvfo);
if (retval != RIG_OK)
{
rig_debug(RIG_DEBUG_ERR, "%s: error get_vfo '%s'\n", __func__,
rigerror(retval));
return retval;
}
if (curvfo == vfo)
{
return RIG_OK;
}
return ft817_send_cmd(rig, FT817_NATIVE_CAT_SET_VFOAB);
}
int ft817_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
{
@ -1447,8 +1501,6 @@ int ft817_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
int ft817_set_powerstat(RIG *rig, powerstat_t status)
{
struct ft817_priv_data *p = (struct ft817_priv_data *) rig->state.priv;
rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__);
switch (status)
@ -1459,9 +1511,9 @@ int ft817_set_powerstat(RIG *rig, powerstat_t status)
case RIG_POWER_ON:
// send 5 bytes first, snooze a bit, then PWR_ON
write_block(&rig->state.rigport,
(char *) p->pcs[FT817_NATIVE_CAT_PWR_WAKE].nseq, YAESU_CMD_LENGTH);
(char *) ncmd[FT817_NATIVE_CAT_PWR_WAKE].nseq, YAESU_CMD_LENGTH);
hl_usleep(200 * 1000);
write_block(&rig->state.rigport, (char *) p->pcs[FT817_NATIVE_CAT_PWR_ON].nseq,
write_block(&rig->state.rigport, (char *) ncmd[FT817_NATIVE_CAT_PWR_ON].nseq,
YAESU_CMD_LENGTH);
return RIG_OK;

17
rigs/yaesu/ft817.h
Wyświetl plik

@ -122,23 +122,6 @@ enum ft817_native_cmd_e
typedef enum ft817_native_cmd_e ft817_native_cmd_t;
struct ft817_priv_data
{
yaesu_cmd_set_t pcs[FT817_NATIVE_SIZE]; /* TODO: why? */
/* rx status */
struct timeval rx_status_tv;
unsigned char rx_status;
/* tx status */
struct timeval tx_status_tv;
unsigned char tx_status;
/* freq & mode status */
struct timeval fm_status_tv;
unsigned char fm_status[YAESU_CMD_LENGTH + 1];
};
/* fixme: why declare static? it has no effect */
static int ft817_init(RIG *rig);
static int ft817_open(RIG *rig);

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

@ -60,8 +60,26 @@
#include "bandplan.h"
#include "tones.h"
/* prototypes */
/*
* ft847 instance - private data
*
*/
struct ft847_priv_data {
split_t sat_mode;
unsigned char rx_status; /* tx returned data */
unsigned char tx_status; /* rx returned data */
/* for early ft847's we keep our own memory items */
/* Early rigs are one-way com to the rig */
freq_t freqA,freqB;
mode_t mode;
pbwidth_t width;
ptt_t ptt;
};
/* prototypes */
static int ft847_send_priv_cmd(RIG *rig, int cmd_index);

20
rigs/yaesu/ft847.h
Wyświetl plik

@ -144,26 +144,6 @@ typedef enum ft847_native_cmd_e ft847_native_cmd_t;
/*
* ft847 instance - private data
*
*/
struct ft847_priv_data {
split_t sat_mode;
unsigned char rx_status; /* tx returned data */
unsigned char tx_status; /* rx returned data */
/* for early ft847's we keep our own memory items */
/* Early rigs are one-way com to the rig */
freq_t freqA,freqB;
mode_t mode;
pbwidth_t width;
ptt_t ptt;
};
/*
* API local implementation
*/

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

@ -74,6 +74,24 @@
#include "tones.h"
#include "bandplan.h"
struct ft857_priv_data {
yaesu_cmd_set_t pcs[FT857_NATIVE_SIZE]; /* TODO: why? */
/* rx status */
struct timeval rx_status_tv;
unsigned char rx_status;
/* tx status */
struct timeval tx_status_tv;
unsigned char tx_status;
/* freq & mode status */
struct timeval fm_status_tv;
unsigned char fm_status[YAESU_CMD_LENGTH+1];
};
/* Native ft857 cmd set prototypes. These are READ ONLY as each */
/* rig instance will copy from these and modify if required . */
/* Complete sequences (1) can be read and used directly as a cmd sequence . */

17
rigs/yaesu/ft857.h
Wyświetl plik

@ -118,23 +118,6 @@ enum ft857_native_cmd_e {
typedef enum ft857_native_cmd_e ft857_native_cmd_t;
struct ft857_priv_data {
yaesu_cmd_set_t pcs[FT857_NATIVE_SIZE]; /* TODO: why? */
/* rx status */
struct timeval rx_status_tv;
unsigned char rx_status;
/* tx status */
struct timeval tx_status_tv;
unsigned char tx_status;
/* freq & mode status */
struct timeval fm_status_tv;
unsigned char fm_status[YAESU_CMD_LENGTH+1];
};
static int ft857_init(RIG *rig);
static int ft857_open(RIG *rig);
static int ft857_cleanup(RIG *rig);

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

@ -79,6 +79,23 @@
#include "tones.h"
#include "bandplan.h"
struct ft897_priv_data {
yaesu_cmd_set_t pcs[FT897_NATIVE_SIZE]; /* TODO: why? */
/* rx status */
struct timeval rx_status_tv;
unsigned char rx_status;
/* tx status */
struct timeval tx_status_tv;
unsigned char tx_status;
/* freq & mode status */
struct timeval fm_status_tv;
unsigned char fm_status[YAESU_CMD_LENGTH+1];
};
static int ft897_init(RIG *rig);
static int ft897_open(RIG *rig);

18
rigs/yaesu/ft897.h
Wyświetl plik

@ -115,22 +115,4 @@ enum ft897_native_cmd_e {
typedef enum ft897_native_cmd_e ft897_native_cmd_t;
struct ft897_priv_data {
yaesu_cmd_set_t pcs[FT897_NATIVE_SIZE]; /* TODO: why? */
/* rx status */
struct timeval rx_status_tv;
unsigned char rx_status;
/* tx status */
struct timeval tx_status_tv;
unsigned char tx_status;
/* freq & mode status */
struct timeval fm_status_tv;
unsigned char fm_status[YAESU_CMD_LENGTH+1];
};
#endif /* _FT897_H */