[Hamlib-cvs-digest] CVS: hamlib/yaesu ft100.c,1.7,1.8 ft817.c,1.5,1.6 ft847.h,1.4,1.5

[Stephane F. <fi...@us...>]

Update of /cvsroot/hamlib/hamlib/yaesu
In directory sc8-pr-cvs1:/tmp/cvs-serv26991

Modified Files:
	ft100.c ft817.c ft847.h 
Log Message:
misc fixes of macros should not be used or incorrect type

Index: ft100.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/yaesu/ft100.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** ft100.c	14 Feb 2003 15:23:00 -0000	1.7
--- ft100.c	10 Mar 2003 08:26:20 -0000	1.8
***************
*** 326,330 ****
    memcpy(p->pcs,ncmd,sizeof(ncmd));
  
!   p->current_vfo = RIG_VFO1;	/* no clue which VFO is active, so guess VFO 1 */
    rig->state.priv = (void*)p;
    
--- 326,330 ----
    memcpy(p->pcs,ncmd,sizeof(ncmd));
  
!   p->current_vfo = RIG_VFO_A;	/* no clue which VFO is active, so guess VFO 1 */
    rig->state.priv = (void*)p;
    
***************
*** 417,422 ****
    switch( vfo ) {
    case RIG_VFO_CURR:
!   case RIG_VFO1:
!   case RIG_VFO2:
      cmd_index = FT100_NATIVE_CAT_SET_FREQ;
      break;
--- 417,422 ----
    switch( vfo ) {
    case RIG_VFO_CURR:
!   case RIG_VFO_A:
!   case RIG_VFO_B:
      cmd_index = FT100_NATIVE_CAT_SET_FREQ;
      break;
***************
*** 581,586 ****
  
    switch(vfo) {
!   case RIG_VFO1:
!   case RIG_VFO2:
      if( p->current_vfo != vfo ) {
        if( ft100_send_priv_cmd( rig, FT100_NATIVE_CAT_SET_VFOAB ) == RIG_OK ) {
--- 581,586 ----
  
    switch(vfo) {
!   case RIG_VFO_A:
!   case RIG_VFO_B:
      if( p->current_vfo != vfo ) {
        if( ft100_send_priv_cmd( rig, FT100_NATIVE_CAT_SET_VFOAB ) == RIG_OK ) {
***************
*** 758,763 ****
    switch( vfo ) {
    case RIG_VFO_CURR:
!   case RIG_VFO1:
!   case RIG_VFO2:
      cmd_index = FT100_NATIVE_CAT_SET_DCS_CODE;
      break;
--- 758,763 ----
    switch( vfo ) {
    case RIG_VFO_CURR:
!   case RIG_VFO_A:
!   case RIG_VFO_B:
      cmd_index = FT100_NATIVE_CAT_SET_DCS_CODE;
      break;
***************
*** 799,804 ****
    switch( vfo ) {
    case RIG_VFO_CURR:
!   case RIG_VFO1:
!   case RIG_VFO2:
      cmd_index = FT100_NATIVE_CAT_SET_CTCSS_FREQ;
      break;
--- 799,804 ----
    switch( vfo ) {
    case RIG_VFO_CURR:
!   case RIG_VFO_A:
!   case RIG_VFO_B:
      cmd_index = FT100_NATIVE_CAT_SET_CTCSS_FREQ;
      break;

Index: ft817.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/yaesu/ft817.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** ft817.c	1 Dec 2002 03:08:05 -0000	1.5
--- ft817.c	10 Mar 2003 08:26:20 -0000	1.6
***************
*** 274,278 ****
    memcpy(p->pcs,ncmd,sizeof(ncmd));
  
!   p->current_vfo = RIG_VFO1;	/* no clue which VFO is active, so guess VFO 1 */
    rig->state.priv = (void*)p;
    
--- 274,278 ----
    memcpy(p->pcs,ncmd,sizeof(ncmd));
  
!   p->current_vfo = RIG_VFO_A;	/* no clue which VFO is active, so guess VFO 1 */
    rig->state.priv = (void*)p;
    
***************
*** 356,361 ****
    switch( vfo ) {
    case RIG_VFO_CURR:
!   case RIG_VFO1:
!   case RIG_VFO2:
      cmd_index = FT817_NATIVE_CAT_SET_FREQ;
      break;
--- 356,361 ----
    switch( vfo ) {
    case RIG_VFO_CURR:
!   case RIG_VFO_A:
!   case RIG_VFO_B:
      cmd_index = FT817_NATIVE_CAT_SET_FREQ;
      break;
***************
*** 502,507 ****
  
    switch(vfo) {
!   case RIG_VFO1:
!   case RIG_VFO2:
      if( p->current_vfo != vfo ) {
        if( ft817_send_priv_cmd( rig, FT817_NATIVE_CAT_SET_VFOAB ) == RIG_OK ) {
--- 502,507 ----
  
    switch(vfo) {
!   case RIG_VFO_A:
!   case RIG_VFO_B:
      if( p->current_vfo != vfo ) {
        if( ft817_send_priv_cmd( rig, FT817_NATIVE_CAT_SET_VFOAB ) == RIG_OK ) {

Index: ft847.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/yaesu/ft847.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ft847.h	1 Dec 2002 03:08:05 -0000	1.4
--- ft847.h	10 Mar 2003 08:26:20 -0000	1.5
***************
*** 151,155 ****
  
  struct ft847_priv_data {
!   unsigned char 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 */
    yaesu_cmd_set_t pcs[FT_847_NATIVE_SIZE];		/* private cmd set */
--- 151,155 ----
  
  struct ft847_priv_data {
!   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 */
    yaesu_cmd_set_t pcs[FT_847_NATIVE_SIZE];		/* private cmd set */