[Hamlib-cvs-digest] CVS: hamlib/include/hamlib rig.h,1.9,1.10

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

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

Modified Files:
	rig.h 
Log Message:
* removed [sg]et_passband in favor of an enhanced [sg]et_mode which
  includes the passband, since most rigs tie these parameters together
  quite often. For exemple, WFM is (RIG_MODE_FM,RIG_PASSBAND_WIDE) in Hamlib.
  Another set of functions will be needed to fine tune aditional 
  frequency response/filters.


Index: rig.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/include/hamlib/rig.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** rig.h	2000/11/28 22:31:40	1.9
--- rig.h	2000/12/04 23:39:17	1.10
***************
*** 239,243 ****
  #define RIG_LEVEL_STRENGTH	(1<<31)	/* Signal strength, arg int (db) */
  
! typedef unsigned long setting_t;	/* at least 32 bits */
  
  /*
--- 239,243 ----
  #define RIG_LEVEL_STRENGTH	(1<<31)	/* Signal strength, arg int (db) */
  
! typedef unsigned long setting_t;	/* 32 bits might not be enough.. */
  
  /*
***************
*** 285,289 ****
  typedef unsigned int rmode_t;	/* radio mode  */
  
! /* Do not use an enum since this will be used w/ rig_mode_t bit fields */
  #define RIG_MODE_NONE  	0
  #define RIG_MODE_AM    	(1<<0)
--- 285,293 ----
  typedef unsigned int rmode_t;	/* radio mode  */
  
! /*
!  * Do not use an enum since this will be used w/ rig_mode_t bit fields.
!  * Also, how should CW reverse sideband and RTTY reverse
!  * sideband be handled?
!  * */
  #define RIG_MODE_NONE  	0
  #define RIG_MODE_AM    	(1<<0)
***************
*** 294,316 ****
  #define RIG_MODE_FM    	(1<<5)
  
- /* The following are deprecated */
- /* use the get/set_filter to manipulate these bits */
- #if 0
- #define RIG_MODE_WFM	(1<<6)
- #define RIG_MODE_CWR	(1<<7)	/* CW reverse sideband*/
- #define RIG_MODE_RTTYR	(1<<8)	/* RTTY reverse sideband */
- 
- #define RIG_MODE_NFM	(1<<19)	/* should we distinguish modes w/ filers? */
- #define RIG_MODE_NAM	(1<<20)	/* Narrow AM */
- #define RIG_MODE_WAM	(1<<9)	/* Wide AM */
- #define RIG_MODE_NCW	(1<<10)	
- #define RIG_MODE_WCW	(1<<11)	
- #define RIG_MODE_NUSB	(1<<13)	
- #define RIG_MODE_WUSB	(1<<14)	
- #define RIG_MODE_NLSB	(1<<15)	
- #define RIG_MODE_WLSB	(1<<16)	
- #define RIG_MODE_NRTTY	(1<<17)	
- #define RIG_MODE_WRTTY	(1<<18)	
- #endif
  
  
--- 298,301 ----
***************
*** 432,437 ****
    int (*get_freq)(RIG *rig, freq_t *freq); /* get freq */
  
!   int (*set_mode)(RIG *rig, rmode_t mode); /* select mode */
!   int (*get_mode)(RIG *rig, rmode_t *mode); /* get mode */
  
    int (*set_vfo)(RIG *rig, vfo_t vfo); /* select vfo (A,B, etc.) */
--- 417,422 ----
    int (*get_freq)(RIG *rig, freq_t *freq); /* get freq */
  
!   int (*set_mode)(RIG *rig, rmode_t mode, pbwidth_t width); /* select mode */
!   int (*get_mode)(RIG *rig, rmode_t *mode, pbwidth_t *width); /* get mode */
  
    int (*set_vfo)(RIG *rig, vfo_t vfo); /* select vfo (A,B, etc.) */
***************
*** 441,447 ****
    int (*get_ptt)(RIG *rig, ptt_t *ptt); /* get ptt status */
  
-   int (*set_passband)(RIG *rig, pbwidth_t width); /* select width */
-   int (*get_passband)(RIG *rig, pbwidth_t *width); /* get width */
- 
    int (*set_rptr_shift)(RIG *rig, rptr_shift_t rptr_shift);	/* set repeater shift */
    int (*get_rptr_shift)(RIG *rig, rptr_shift_t *rptr_shift);	/* get repeater shift */
--- 426,429 ----
***************
*** 565,569 ****
  struct rig_callbacks {
  	int (*freq_event)(RIG *rig, freq_t freq); 
! 	int (*mode_event)(RIG *rig, rmode_t mode); 
  	int (*vfo_event)(RIG *rig, vfo_t vfo); 
  	int (*ptt_event)(RIG *rig, ptt_t mode); 
--- 547,551 ----
  struct rig_callbacks {
  	int (*freq_event)(RIG *rig, freq_t freq); 
! 	int (*mode_event)(RIG *rig, rmode_t mode, pbwidth_t width); 
  	int (*vfo_event)(RIG *rig, vfo_t vfo); 
  	int (*ptt_event)(RIG *rig, ptt_t mode); 
***************
*** 595,604 ****
  extern int rig_set_freq(RIG *rig, freq_t freq); /* select freq */
  extern int rig_get_freq(RIG *rig, freq_t *freq); /* get freq */
- 
- extern int rig_set_mode(RIG *rig, rmode_t mode); /* select mode */
- extern int rig_get_mode(RIG *rig, rmode_t *mode); /* get mode */
  
! extern int rig_set_passband(RIG *rig, pbwidth_t width); /* select width */
! extern int rig_get_passband(RIG *rig, pbwidth_t *width); /* get width */
  
  extern int rig_set_vfo(RIG *rig, vfo_t vfo); /* select vfo */
--- 577,583 ----
  extern int rig_set_freq(RIG *rig, freq_t freq); /* select freq */
  extern int rig_get_freq(RIG *rig, freq_t *freq); /* get freq */
  
! extern int rig_set_mode(RIG *rig, rmode_t mode, pbwidth_t width); /* select mode */
! extern int rig_get_mode(RIG *rig, rmode_t *mode, pbwidth_t *width); /* get mode */
  
  extern int rig_set_vfo(RIG *rig, vfo_t vfo); /* select vfo */