hamradio/Hamlib
1
0
Fork 0
mirror of https://github.com/Hamlib/Hamlib.git synced 2024-09-22 02:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

misc fixes of macros should not be used or incorrect type

Browse Source 
git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@1406 7ae35d74-ebe9-4afe-98af-79ac388436b8
This commit is contained in:
Stéphane Fillod, F8CFE 2003-03-10 08:26:20 +00:00
parent fdabf14513
commit 4a7e555f13
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
yaesu/ft100.c
View File

@ -7,7 +7,7 @@
* The starting point for this code was Frank's ft847 implementation. * The starting point for this code was Frank's ft847 implementation.
* *
* *
* $Id: ft100.c,v 1.7 2003-02-14 15:23:00 avflinsch Exp $ * $Id: ft100.c,v 1.8 2003-03-10 08:26:20 fillods Exp $
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -325,7 +325,7 @@ int ft100_init(RIG *rig) {
memcpy(p->pcs,ncmd,sizeof(ncmd)); memcpy(p->pcs,ncmd,sizeof(ncmd));
p->current_vfo = RIG_VFO1; /* no clue which VFO is active, so guess VFO 1 */ p->current_vfo = RIG_VFO_A; /* no clue which VFO is active, so guess VFO 1 */
rig->state.priv = (void*)p; rig->state.priv = (void*)p;
return RIG_OK; return RIG_OK;
@ -416,8 +416,8 @@ int ft100_set_freq(RIG *rig, vfo_t vfo, freq_t freq) {
switch( vfo ) { switch( vfo ) {
case RIG_VFO_CURR: case RIG_VFO_CURR:
case RIG_VFO1: case RIG_VFO_A:
case RIG_VFO2: case RIG_VFO_B:
cmd_index = FT100_NATIVE_CAT_SET_FREQ; cmd_index = FT100_NATIVE_CAT_SET_FREQ;
break; break;
default: default:
@ -580,8 +580,8 @@ int ft100_set_vfo(RIG *rig, vfo_t vfo) {
if (!rig) return -RIG_EINVAL; if (!rig) return -RIG_EINVAL;
switch(vfo) { switch(vfo) {
case RIG_VFO1: case RIG_VFO_A:
case RIG_VFO2: case RIG_VFO_B:
if( p->current_vfo != vfo ) { if( p->current_vfo != vfo ) {
if( ft100_send_priv_cmd( rig, FT100_NATIVE_CAT_SET_VFOAB ) == RIG_OK ) { if( ft100_send_priv_cmd( rig, FT100_NATIVE_CAT_SET_VFOAB ) == RIG_OK ) {
p->current_vfo = vfo; p->current_vfo = vfo;
@ -757,8 +757,8 @@ int ft100_set_dcs_code(RIG *rig, vfo_t vfo, tone_t code) {
switch( vfo ) { switch( vfo ) {
case RIG_VFO_CURR: case RIG_VFO_CURR:
case RIG_VFO1: case RIG_VFO_A:
case RIG_VFO2: case RIG_VFO_B:
cmd_index = FT100_NATIVE_CAT_SET_DCS_CODE; cmd_index = FT100_NATIVE_CAT_SET_DCS_CODE;
break; break;
default: default:
@ -798,8 +798,8 @@ int ft100_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone) {
switch( vfo ) { switch( vfo ) {
case RIG_VFO_CURR: case RIG_VFO_CURR:
case RIG_VFO1: case RIG_VFO_A:
case RIG_VFO2: case RIG_VFO_B:
cmd_index = FT100_NATIVE_CAT_SET_CTCSS_FREQ; cmd_index = FT100_NATIVE_CAT_SET_CTCSS_FREQ;
break; break;
default: default:

12
yaesu/ft817.c
View File

@ -7,7 +7,7 @@
* The starting point for this code was Frank's ft847 implementation. * The starting point for this code was Frank's ft847 implementation.
* *
* *
* $Id: ft817.c,v 1.5 2002-12-01 03:08:05 n0nb Exp $ * $Id: ft817.c,v 1.6 2003-03-10 08:26:20 fillods Exp $
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -273,7 +273,7 @@ int ft817_init(RIG *rig) {
memcpy(p->pcs,ncmd,sizeof(ncmd)); memcpy(p->pcs,ncmd,sizeof(ncmd));
p->current_vfo = RIG_VFO1; /* no clue which VFO is active, so guess VFO 1 */ p->current_vfo = RIG_VFO_A; /* no clue which VFO is active, so guess VFO 1 */
rig->state.priv = (void*)p; rig->state.priv = (void*)p;
return RIG_OK; return RIG_OK;
@ -355,8 +355,8 @@ int ft817_set_freq(RIG *rig, vfo_t vfo, freq_t freq) {
switch( vfo ) { switch( vfo ) {
case RIG_VFO_CURR: case RIG_VFO_CURR:
case RIG_VFO1: case RIG_VFO_A:
case RIG_VFO2: case RIG_VFO_B:
cmd_index = FT817_NATIVE_CAT_SET_FREQ; cmd_index = FT817_NATIVE_CAT_SET_FREQ;
break; break;
default: default:
@ -501,8 +501,8 @@ int ft817_set_vfo(RIG *rig, vfo_t vfo) {
if (!rig) return -RIG_EINVAL; if (!rig) return -RIG_EINVAL;
switch(vfo) { switch(vfo) {
case RIG_VFO1: case RIG_VFO_A:
case RIG_VFO2: case RIG_VFO_B:
if( p->current_vfo != vfo ) { if( p->current_vfo != vfo ) {
if( ft817_send_priv_cmd( rig, FT817_NATIVE_CAT_SET_VFOAB ) == RIG_OK ) { if( ft817_send_priv_cmd( rig, FT817_NATIVE_CAT_SET_VFOAB ) == RIG_OK ) {
p->current_vfo = vfo; p->current_vfo = vfo;

4
yaesu/ft847.h
View File

@ -6,7 +6,7 @@
* via serial interface to an FT-847 using the "CAT" interface. * via serial interface to an FT-847 using the "CAT" interface.
* *
* *
* $Id: ft847.h,v 1.4 2002-12-01 03:08:05 n0nb Exp $ * $Id: ft847.h,v 1.5 2003-03-10 08:26:20 fillods Exp $
* *
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -150,7 +150,7 @@ typedef enum ft847_native_cmd_e ft847_native_cmd_t;
*/ */
struct ft847_priv_data { struct ft847_priv_data {
unsigned char current_vfo; /* active VFO from last cmd , can be either RIG_VFO_A, SAT_RX, SAT_TX */ vfo_t current_vfo; /* active VFO from last cmd , can be either RIG_VFO_A, SAT_RX, SAT_TX */
unsigned char p_cmd[YAESU_CMD_LENGTH]; /* private copy of 1 constructed CAT cmd */ unsigned char p_cmd[YAESU_CMD_LENGTH]; /* private copy of 1 constructed CAT cmd */
yaesu_cmd_set_t pcs[FT_847_NATIVE_SIZE]; /* private cmd set */ yaesu_cmd_set_t pcs[FT_847_NATIVE_SIZE]; /* private cmd set */
unsigned char rx_status; /* tx returned data */ unsigned char rx_status; /* tx returned data */