[Hamlib-cvs-digest] CVS: hamlib/aor aor.c,1.1,1.2 aor.h,1.1,1.2

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

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

Modified Files:
	aor.c aor.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: aor.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/aor/aor.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** aor.c	2000/11/01 23:23:56	1.1
--- aor.c	2000/12/04 23:39:17	1.2
***************
*** 160,164 ****
   * Assumes rig!=NULL
   */
! int aor_set_mode(RIG *rig, rmode_t mode)
  {
  		unsigned char mdbuf[16],ackbuf[16];
--- 160,164 ----
   * Assumes rig!=NULL
   */
! int aor_set_mode(RIG *rig, rmode_t mode, pbwidth_t width)
  {
  		unsigned char mdbuf[16],ackbuf[16];
***************
*** 166,174 ****
  
  		switch (mode) {
! 			case RIG_MODE_AM:       aormode = MD_AM; break;
  			case RIG_MODE_CW:       aormode = MD_CW; break;
  			case RIG_MODE_USB:      aormode = MD_USB; break;
  			case RIG_MODE_LSB:      aormode = MD_LSB; break;
! 			case RIG_MODE_FM:       aormode = MD_NFM; break;
  			case RIG_MODE_RTTY:
  			default:
--- 166,196 ----
  
  		switch (mode) {
! 			case RIG_MODE_AM:       
! 					switch(width) {
! 						case RIG_PASSBAND_NORMAL: aormode = MD_AM; break;
! 						case RIG_PASSBAND_WIDE: aormode = MD_WAM; break;
! 						case RIG_PASSBAND_NARROW: aormode = MD_NAM; break;
! 						default:
! 							rig_debug(RIG_DEBUG_ERR,
! 								"aor_set_mode: unsupported passband %d %d\n",
! 								mode, width);
! 						return -RIG_EINVAL;
! 					}
! 					break;
  			case RIG_MODE_CW:       aormode = MD_CW; break;
  			case RIG_MODE_USB:      aormode = MD_USB; break;
  			case RIG_MODE_LSB:      aormode = MD_LSB; break;
! 			case RIG_MODE_FM:
! 					switch(width) {
! 						case RIG_PASSBAND_NORMAL: aormode = MD_NFM; break;
! 						case RIG_PASSBAND_WIDE: aormode = MD_WFM; break;
! 						case RIG_PASSBAND_NARROW: aormode = MD_SFM; break;
! 						default:
! 							rig_debug(RIG_DEBUG_ERR,
! 								"aor_set_mode: unsupported passband %d %d\n",
! 								mode, width);
! 						return -RIG_EINVAL;
! 					}
! 					break;
  			case RIG_MODE_RTTY:
  			default:
***************
*** 194,198 ****
   * Assumes rig!=NULL, mode!=NULL
   */
! int aor_get_mode(RIG *rig, rmode_t *mode)
  {
  		unsigned char ackbuf[16];
--- 216,220 ----
   * Assumes rig!=NULL, mode!=NULL
   */
! int aor_get_mode(RIG *rig, rmode_t *mode, pbwidth_t *width)
  {
  		unsigned char ackbuf[16];
***************
*** 208,217 ****
--- 230,255 ----
  		}
  
+ 		*width = RIG_PASSBAND_NORMAL;
  		switch (ackbuf[0]) {
  			case MD_AM:		*mode = RIG_MODE_AM; break;
+ 			case MD_NAM:	
+ 							*mode = RIG_MODE_AM;
+ 							*width = RIG_PASSBAND_NARROW; 
+ 							break;
+ 			case MD_WAM:	
+ 							*mode = RIG_MODE_AM;
+ 							*width = RIG_PASSBAND_WIDE; 
+ 							break;
  			case MD_CW:		*mode = RIG_MODE_CW; break;
  			case MD_USB:	*mode = RIG_MODE_USB; break;
  			case MD_LSB:	*mode = RIG_MODE_LSB; break;
  			case MD_NFM:	*mode = RIG_MODE_FM; break;
+ 			case MD_SFM:	
+ 							*mode = RIG_MODE_FM;
+ 							*width = RIG_PASSBAND_NARROW; 
+ 							break;
+ 			case MD_WFM:	*mode = RIG_MODE_FM;
+ 							*width = RIG_PASSBAND_WIDE; 
+ 							break;
  			default:
  				rig_debug(RIG_DEBUG_ERR,"aor_get_mode: unsupported mode %d\n",

Index: aor.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/aor/aor.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** aor.h	2000/11/01 23:23:56	1.1
--- aor.h	2000/12/04 23:39:17	1.2
***************
*** 34,39 ****
  int aor_set_freq(RIG *rig, freq_t freq);
  int aor_get_freq(RIG *rig, freq_t *freq);
! int aor_set_mode(RIG *rig, rmode_t mode);
! int aor_get_mode(RIG *rig, rmode_t *mode);
  
  int aor_set_ts(RIG *rig, unsigned long ts);
--- 34,39 ----
  int aor_set_freq(RIG *rig, freq_t freq);
  int aor_get_freq(RIG *rig, freq_t *freq);
! int aor_set_mode(RIG *rig, rmode_t mode, pbwidth_t width);
! int aor_get_mode(RIG *rig, rmode_t *mode, pbwidth_t *width);
  
  int aor_set_ts(RIG *rig, unsigned long ts);