[Hamlib-cvs-digest] CVS: hamlib/include/hamlib rig.h,1.5,1.6

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

Update of /cvsroot/hamlib/hamlib/include/hamlib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv22294

Modified Files:
	rig.h 
Log Message:
* added rig_set_bank() to the API
* added struct timeval post_write_date to rig_state, so the post_write_delay
  may not be an active wait loop.
* cleanup


Index: rig.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/include/hamlib/rig.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** rig.h	2000/10/22 16:02:21	1.5
--- rig.h	2000/10/23 19:53:03	1.6
***************
*** 30,33 ****
--- 30,34 ----
  #include <hamlib/riglist.h>	/* list in another file to not mess up w/ this one */
  #include <stdio.h>		/* required for FILE definition */
+ #include <sys/time.h>		/* required for struct timeval */
  
  /*
***************
*** 453,460 ****
    int (*get_ts)(RIG *rig, unsigned long *ts); /* get tuning step */
  
!   int (*set_dcs)(RIG *rig, unsigned int tone);	/* set tone */
!   int (*get_dcs)(RIG *rig, unsigned int *tone);	/* get tone */
!   int (*set_ctcss)(RIG *rig, unsigned int tone);	/* set tone squelch */
!   int (*get_ctcss)(RIG *rig, unsigned int *tone);	/* get tone squelch */
  
    /*
--- 454,461 ----
    int (*get_ts)(RIG *rig, unsigned long *ts); /* get tuning step */
  
!   int (*set_dcs)(RIG *rig, unsigned int code);
!   int (*get_dcs)(RIG *rig, unsigned int *code);
!   int (*set_ctcss)(RIG *rig, unsigned int tone);
!   int (*get_ctcss)(RIG *rig, unsigned int *tone);
  
    /*
***************
*** 476,479 ****
--- 477,481 ----
    int (*get_func)(RIG *rig, setting_t *func); /* get the setting from rig */
  
+   int (*set_bank)(RIG *rig, int bank);			/* set memory bank number */
    int (*set_mem)(RIG *rig, int ch);			/* set memory channel number */
    int (*get_mem)(RIG *rig, int *ch);		/* get memory channel number */
***************
*** 515,518 ****
--- 517,521 ----
    int write_delay;        /* delay in ms between each byte sent out */
    int post_write_delay;		/* for some yaesu rigs */
+   struct timeval post_write_date;		/* hamlib internal use */
    int timeout;	/* in ms */
    int retry;		/* maximum number of retries, 0 to disable */
***************
*** 597,602 ****
  extern int rig_set_ctcss(RIG *rig, unsigned int tone);
  extern int rig_get_ctcss(RIG *rig, unsigned int *tone);
! extern int rig_set_dcs(RIG *rig, unsigned int tone);
! extern int rig_get_dcs(RIG *rig, unsigned int *tone);
  
  extern int rig_set_split_freq(RIG *rig, freq_t rx_freq, freq_t tx_freq);
--- 600,605 ----
  extern int rig_set_ctcss(RIG *rig, unsigned int tone);
  extern int rig_get_ctcss(RIG *rig, unsigned int *tone);
! extern int rig_set_dcs(RIG *rig, unsigned int code);
! extern int rig_get_dcs(RIG *rig, unsigned int *code);
  
  extern int rig_set_split_freq(RIG *rig, freq_t rx_freq, freq_t tx_freq);
***************
*** 613,636 ****
  extern int rig_mW2power(RIG *rig, float *power, unsigned int mwpower, freq_t freq, rmode_t mode);
  
- #if 0
- extern int rig_set_volume(RIG *rig, float vol);
- extern int rig_get_volume(RIG *rig, float *vol);
- extern int rig_set_squelch(RIG *rig, float sql);
- extern int rig_get_squelch(RIG *rig, float *sql);
- extern int rig_get_squelch_status(RIG *rig, int *sql_status);
- extern int rig_get_strength(RIG *rig, int *strength);
- extern int rig_set_ant(RIG *rig, int ant);
- extern int rig_get_ant(RIG *rig, int *ant);
- extern int rig_set_att(RIG *rig, int att);
- extern int rig_get_att(RIG *rig, int *att);
- extern int rig_set_preamp(RIG *rig, int preamp);
- extern int rig_get_preamp(RIG *rig, int *preamp);
- #else
- 
  extern int rig_set_level(RIG *rig, setting_t level, value_t val);
  extern int rig_get_level(RIG *rig, setting_t level, value_t *val);
  
  #define rig_get_strength(r,s) rig_get_level((r), RIG_LEVEL_STRENGTH, (value_t*)(s))
- #endif
  
  extern int rig_set_poweron(RIG *rig);
--- 616,623 ----
***************
*** 651,654 ****
--- 638,642 ----
  extern int rig_get_func(RIG *rig, setting_t *func); /* get the setting from rig */
  
+ extern int rig_set_bank(RIG *rig, int bank);	/* set memory bank number */
  extern int rig_set_mem(RIG *rig, int ch);		/* set memory channel number */
  extern int rig_get_mem(RIG *rig, int *ch);		/* get memory channel number */