diff --git a/yaesu/ft100.c b/yaesu/ft100.c index bd0937aea..42507180b 100644 --- a/yaesu/ft100.c +++ b/yaesu/ft100.c @@ -7,7 +7,7 @@ * The starting point for this code was Frank's ft847 implementation. * * - * $Id: ft100.c,v 1.16 2005-01-25 00:21:58 fillods Exp $ + * $Id: ft100.c,v 1.17 2005-04-03 19:27:59 fillods Exp $ * * * This library is free software; you can redistribute it and/or @@ -684,6 +684,7 @@ int ft100_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt) { } +#if 0 /* TODO: all of this */ int ft100_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt) { return -RIG_ENIMPL; @@ -734,6 +735,7 @@ int ft100_set_parm(RIG *rig, setting_t parm, value_t val) { int ft100_get_parm(RIG *rig, setting_t parm, value_t *val) { return -RIG_ENIMPL; } +#endif /* kc2ivl */ @@ -883,17 +885,17 @@ int ft100_get_info(RIG *rig, FT100_STATUS_INFO *ft100_status, FT100_METER_INFO * cmd_index=FT100_NATIVE_CAT_READ_STATUS; ft100_send_priv_cmd(rig,cmd_index); - n = read_block( &rig->state.rigport, ft100_status, sizeof(FT100_STATUS_INFO)); + n = read_block( &rig->state.rigport, (char*)ft100_status, sizeof(FT100_STATUS_INFO)); rig_debug(RIG_DEBUG_VERBOSE,"ft100: read status=%i \n",n); cmd_index=FT100_NATIVE_CAT_READ_METERS; ft100_send_priv_cmd(rig,cmd_index); - n = read_block( &rig->state.rigport, ft100_meter, sizeof(FT100_METER_INFO)); + n = read_block( &rig->state.rigport, (char*)ft100_meter, sizeof(FT100_METER_INFO)); rig_debug(RIG_DEBUG_VERBOSE,"ft100: read meters=%i \n",n); cmd_index=FT100_NATIVE_CAT_READ_FLAGS; ft100_send_priv_cmd(rig,cmd_index); - n = read_block( &rig->state.rigport, ft100_flags, sizeof(FT100_FLAG_INFO)); + n = read_block( &rig->state.rigport, (char*)ft100_flags, sizeof(FT100_FLAG_INFO)); rig_debug(RIG_DEBUG_VERBOSE,"ft100: read flags=%i \n",n); return RIG_OK; diff --git a/yaesu/ft100.h b/yaesu/ft100.h index b83546c11..2d76c8cdd 100644 --- a/yaesu/ft100.h +++ b/yaesu/ft100.h @@ -7,7 +7,7 @@ * The starting point for this code was Frank's ft847 implementation. * * - * $Id: ft100.h,v 1.5 2003-04-06 18:40:35 fillods Exp $ + * $Id: ft100.h,v 1.6 2005-04-03 19:27:59 fillods Exp $ * * * This library is free software; you can redistribute it and/or @@ -137,53 +137,46 @@ typedef struct } FT100_FLAG_INFO; -int ft100_init(RIG *rig); -int ft100_open(RIG *rig); -int ft100_cleanup(RIG *rig); -int ft100_close(RIG *rig); +static int ft100_init(RIG *rig); +static int ft100_open(RIG *rig); +static int ft100_cleanup(RIG *rig); +static int ft100_close(RIG *rig); -int ft100_set_freq(RIG *rig, vfo_t vfo, freq_t freq); -int ft100_get_freq(RIG *rig, vfo_t vfo, freq_t *freq); +static int ft100_set_freq(RIG *rig, vfo_t vfo, freq_t freq); +static int ft100_get_freq(RIG *rig, vfo_t vfo, freq_t *freq); -int ft100_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width); -int ft100_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width); +static int ft100_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width); +static int ft100_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width); -int ft100_set_vfo(RIG *rig, vfo_t vfo); -int ft100_get_vfo(RIG *rig, vfo_t *vfo); +static int ft100_set_vfo(RIG *rig, vfo_t vfo); +static int ft100_get_vfo(RIG *rig, vfo_t *vfo); -int ft100_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt); -int ft100_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt); +static int ft100_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt); +#if 0 +static int ft100_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt); -int ft100_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val); -int ft100_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val); +static int ft100_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val); +static int ft100_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val); -int ft100_set_func(RIG *rig, vfo_t vfo, setting_t func, int status); -int ft100_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status); +static int ft100_set_func(RIG *rig, vfo_t vfo, setting_t func, int status); +static int ft100_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status); -int ft100_set_parm(RIG *rig, setting_t parm, value_t val); -int ft100_get_parm(RIG *rig, setting_t parm, value_t *val); +static int ft100_set_parm(RIG *rig, setting_t parm, value_t val); +static int ft100_get_parm(RIG *rig, setting_t parm, value_t *val); +#endif -int ft100_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo); -int ft100_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split, vfo_t *tx_vfo); +static int ft100_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo); +//static int ft100_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split, vfo_t *tx_vfo); -int ft100_set_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t shift); -int ft100_get_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t *shift); +static int ft100_set_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t shift); +//static int ft100_get_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t *shift); -int ft100_set_dcs_code(RIG *rig, vfo_t vfo, tone_t code); -int ft100_get_dcs_code(RIG *rig, vfo_t vfo, tone_t *code); +static int ft100_set_dcs_code(RIG *rig, vfo_t vfo, tone_t code); +//static int ft100_get_dcs_code(RIG *rig, vfo_t vfo, tone_t *code); -int ft100_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone); -int ft100_get_ctcss_tone(RIG *rig, vfo_t vfo, tone_t *tone); +static int ft100_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone); +//static int ft100_get_ctcss_tone(RIG *rig, vfo_t vfo, tone_t *tone); -int ft100_get_info(RIG *rig, FT100_STATUS_INFO *ft100_status, FT100_METER_INFO *ft100_meter, FT100_FLAG_INFO *ft100_flags); +static int ft100_get_info(RIG *rig, FT100_STATUS_INFO *ft100_status, FT100_METER_INFO *ft100_meter, FT100_FLAG_INFO *ft100_flags); #endif /* _FT100_H */ - - - - - - - - - diff --git a/yaesu/ft747.h b/yaesu/ft747.h index e8b1d0188..c2b81d571 100644 --- a/yaesu/ft747.h +++ b/yaesu/ft747.h @@ -7,7 +7,7 @@ * box (FIF-232C) or similar (max232 + some capacitors :-) * * - * $Id: ft747.h,v 1.4 2002-12-01 03:08:05 n0nb Exp $ + * $Id: ft747.h,v 1.5 2005-04-03 19:27:59 fillods Exp $ * * * This library is free software; you can redistribute it and/or @@ -178,22 +178,22 @@ typedef enum ft747_native_cmd_e ft747_native_cmd_t; * API local implementation */ -int ft747_init(RIG *rig); -int ft747_cleanup(RIG *rig); -int ft747_open(RIG *rig); -int ft747_close(RIG *rig); +static int ft747_init(RIG *rig); +static int ft747_cleanup(RIG *rig); +static int ft747_open(RIG *rig); +static int ft747_close(RIG *rig); -int ft747_set_freq(RIG *rig, vfo_t vfo, freq_t freq); -int ft747_get_freq(RIG *rig, vfo_t vfo, freq_t *freq); +static int ft747_set_freq(RIG *rig, vfo_t vfo, freq_t freq); +static int ft747_get_freq(RIG *rig, vfo_t vfo, freq_t *freq); -int ft747_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width); /* select mode */ -int ft747_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width); /* get mode */ +static int ft747_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width); /* select mode */ +static int ft747_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width); /* get mode */ -int ft747_set_vfo(RIG *rig, vfo_t vfo); /* select vfo */ -int ft747_get_vfo(RIG *rig, vfo_t *vfo); /* get vfo */ +static int ft747_set_vfo(RIG *rig, vfo_t vfo); /* select vfo */ +static int ft747_get_vfo(RIG *rig, vfo_t *vfo); /* get vfo */ -int ft747_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt); -int ft747_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt); +static int ft747_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt); +static int ft747_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt); diff --git a/yaesu/ft817.c b/yaesu/ft817.c index b47440639..b519bf289 100644 --- a/yaesu/ft817.c +++ b/yaesu/ft817.c @@ -7,7 +7,7 @@ * The starting point for this code was Frank's ft847 implementation. * * - * $Id: ft817.c,v 1.10 2005-01-25 00:21:58 fillods Exp $ + * $Id: ft817.c,v 1.11 2005-04-03 19:27:59 fillods Exp $ * * * This library is free software; you can redistribute it and/or @@ -206,7 +206,7 @@ const struct rig_caps ft817_caps = { .set_vfo = ft817_set_vfo, .get_vfo = ft817_get_vfo, .set_ptt = ft817_set_ptt, - .get_ptt = ft817_get_ptt, + .get_ptt = NULL, .get_dcd = NULL, .set_rptr_shift = NULL, .get_rptr_shift = NULL, @@ -544,6 +544,7 @@ int ft817_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt) { } +#if 0 /* TODO: all of this */ int ft817_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt) { return -RIG_ENIMPL; @@ -594,7 +595,5 @@ int ft817_set_parm(RIG *rig, setting_t parm, value_t val) { int ft817_get_parm(RIG *rig, setting_t parm, value_t *val) { return -RIG_ENIMPL; } - - - +#endif diff --git a/yaesu/ft817.h b/yaesu/ft817.h index f352a4594..e5be017bb 100644 --- a/yaesu/ft817.h +++ b/yaesu/ft817.h @@ -7,7 +7,7 @@ * The starting point for this code was Frank's ft847 implementation. * * - * $Id: ft817.h,v 1.3 2002-12-01 03:08:05 n0nb Exp $ + * $Id: ft817.h,v 1.4 2005-04-03 19:27:59 fillods Exp $ * * * This library is free software; you can redistribute it and/or @@ -89,24 +89,26 @@ struct ft817_priv_data { }; -int ft817_init(RIG *rig); -int ft817_open(RIG *rig); -int ft817_cleanup(RIG *rig); -int ft817_close(RIG *rig); -int ft817_set_freq(RIG *rig, vfo_t vfo, freq_t freq); -int ft817_get_freq(RIG *rig, vfo_t vfo, freq_t *freq); -int ft817_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width); -int ft817_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width); -int ft817_set_vfo(RIG *rig, vfo_t vfo); -int ft817_get_vfo(RIG *rig, vfo_t *vfo); -int ft817_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt); -int ft817_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt); -int ft817_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val); -int ft817_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val); -int ft817_set_func(RIG *rig, vfo_t vfo, setting_t func, int status); -int ft817_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status); -int ft817_set_parm(RIG *rig, setting_t parm, value_t val); -int ft817_get_parm(RIG *rig, setting_t parm, value_t *val); +static int ft817_init(RIG *rig); +static int ft817_open(RIG *rig); +static int ft817_cleanup(RIG *rig); +static int ft817_close(RIG *rig); +static int ft817_set_freq(RIG *rig, vfo_t vfo, freq_t freq); +static int ft817_get_freq(RIG *rig, vfo_t vfo, freq_t *freq); +static int ft817_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width); +static int ft817_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width); +static int ft817_set_vfo(RIG *rig, vfo_t vfo); +static int ft817_get_vfo(RIG *rig, vfo_t *vfo); +static int ft817_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt); +#if 0 +static int ft817_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt); +static int ft817_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val); +static int ft817_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val); +static int ft817_set_func(RIG *rig, vfo_t vfo, setting_t func, int status); +static int ft817_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status); +static int ft817_set_parm(RIG *rig, setting_t parm, value_t val); +static int ft817_get_parm(RIG *rig, setting_t parm, value_t *val); +#endif #endif /* _FT817_H */ diff --git a/yaesu/ft847.h b/yaesu/ft847.h index fc87f0c1a..0732afab8 100644 --- a/yaesu/ft847.h +++ b/yaesu/ft847.h @@ -6,7 +6,7 @@ * via serial interface to an FT-847 using the "CAT" interface. * * - * $Id: ft847.h,v 1.5 2003-03-10 08:26:20 fillods Exp $ + * $Id: ft847.h,v 1.6 2005-04-03 19:27:59 fillods Exp $ * * * This library is free software; you can redistribute it and/or @@ -167,34 +167,23 @@ struct ft847_priv_data { * API local implementation */ -int ft847_init(RIG *rig); -int ft847_open(RIG *rig); +static int ft847_init(RIG *rig); +static int ft847_open(RIG *rig); -int ft847_cleanup(RIG *rig); -int ft847_close(RIG *rig); +static int ft847_cleanup(RIG *rig); +static int ft847_close(RIG *rig); -int ft847_set_freq(RIG *rig, vfo_t vfo, freq_t freq); -int ft847_get_freq(RIG *rig, vfo_t vfo, freq_t *freq); +static int ft847_set_freq(RIG *rig, vfo_t vfo, freq_t freq); +static int ft847_get_freq(RIG *rig, vfo_t vfo, freq_t *freq); -int ft847_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width); /* select mode */ -int ft847_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width); /* get mode */ - -int ft847_set_vfo(RIG *rig, vfo_t vfo); /* select vfo */ -int ft847_get_vfo(RIG *rig, vfo_t *vfo); /* get vfo */ - -int ft847_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt); -int ft847_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt); +static int ft847_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width); /* select mode */ +static int ft847_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width); /* get mode */ +static int ft847_set_vfo(RIG *rig, vfo_t vfo); /* select vfo */ +static int ft847_get_vfo(RIG *rig, vfo_t *vfo); /* get vfo */ +static int ft847_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt); +static int ft847_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt); #endif /* _FT847_H */ - - - - - - - - - diff --git a/yaesu/ft857.h b/yaesu/ft857.h index 13f270398..2a2c095cf 100644 --- a/yaesu/ft857.h +++ b/yaesu/ft857.h @@ -12,7 +12,7 @@ * The starting point for this code was Frank's ft847 implementation. * * - * $Id: ft857.h,v 1.3 2003-09-21 11:08:06 fillods Exp $ + * $Id: ft857.h,v 1.4 2005-04-03 19:27:59 fillods Exp $ * * * This library is free software; you can redistribute it and/or @@ -137,32 +137,32 @@ struct ft857_priv_data { }; -int ft857_init(RIG *rig); -int ft857_open(RIG *rig); -int ft857_cleanup(RIG *rig); -int ft857_close(RIG *rig); -int ft857_set_freq(RIG *rig, vfo_t vfo, freq_t freq); -int ft857_get_freq(RIG *rig, vfo_t vfo, freq_t *freq); -int ft857_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width); -int ft857_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width); -// int ft857_set_vfo(RIG *rig, vfo_t vfo); -// int ft857_get_vfo(RIG *rig, vfo_t *vfo); -int ft857_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt); -int ft857_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt); -// int ft857_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val); -int ft857_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val); -int ft857_set_func(RIG *rig, vfo_t vfo, setting_t func, int status); -// int ft857_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status); -// int ft857_set_parm(RIG *rig, setting_t parm, value_t val); -// int ft857_get_parm(RIG *rig, setting_t parm, value_t *val); -int ft857_set_dcs_code(RIG *rig, vfo_t vfo, tone_t code); -int ft857_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t code); -int ft857_set_dcs_sql(RIG *rig, vfo_t vfo, tone_t code); -int ft857_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone); -int ft857_set_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t rptr_shift); -int ft857_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t offs); -int ft857_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit); -int ft857_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd); -// int ft857_set_powerstat(RIG *rig, powerstat_t status); +static int ft857_init(RIG *rig); +static int ft857_open(RIG *rig); +static int ft857_cleanup(RIG *rig); +static int ft857_close(RIG *rig); +static int ft857_set_freq(RIG *rig, vfo_t vfo, freq_t freq); +static int ft857_get_freq(RIG *rig, vfo_t vfo, freq_t *freq); +static int ft857_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width); +static int ft857_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width); +// static int ft857_set_vfo(RIG *rig, vfo_t vfo); +// static int ft857_get_vfo(RIG *rig, vfo_t *vfo); +static int ft857_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt); +static int ft857_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt); +// static int ft857_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val); +static int ft857_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val); +static int ft857_set_func(RIG *rig, vfo_t vfo, setting_t func, int status); +// static int ft857_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status); +// static int ft857_set_parm(RIG *rig, setting_t parm, value_t val); +// static int ft857_get_parm(RIG *rig, setting_t parm, value_t *val); +static int ft857_set_dcs_code(RIG *rig, vfo_t vfo, tone_t code); +static int ft857_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t code); +static int ft857_set_dcs_sql(RIG *rig, vfo_t vfo, tone_t code); +static int ft857_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone); +static int ft857_set_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t rptr_shift); +static int ft857_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t offs); +static int ft857_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit); +static int ft857_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd); +// static int ft857_set_powerstat(RIG *rig, powerstat_t status); #endif /* _FT857_H */