[Hamlib-cvs-digest] CVS: hamlib/src rig.c,1.7,1.8

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

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

Modified Files:
	rig.c 
Log Message:
* addded wrapper for rig_set_bank
* misc fixups


Index: rig.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/src/rig.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** rig.c	2000/10/23 19:56:29	1.7
--- rig.c	2000/10/29 16:30:43	1.8
***************
*** 31,35 ****
  #include <hamlib/rig.h>
  #include <hamlib/riglist.h>
! #include "serial.h"
  #include "event.h"
  
--- 31,35 ----
  #include <hamlib/rig.h>
  #include <hamlib/riglist.h>
! #include <serial.h>
  #include "event.h"
  
***************
*** 590,596 ****
  		case RIG_PTT_SERIAL:
  		case RIG_PTT_PARALLEL:
  		case RIG_PTT_NONE:
  		default:
! 				return -RIG_ENIMPL;	/* not implemented */
  		}
  }
--- 590,598 ----
  		case RIG_PTT_SERIAL:
  		case RIG_PTT_PARALLEL:
+ 				return -RIG_ENIMPL;	/* not implemented */
+ 
  		case RIG_PTT_NONE:
  		default:
! 				return -RIG_ENAVAIL;	/* not available */
  		}
  }
***************
*** 870,874 ****
   *      SEE ALSO: rig_mW2power()
   */
! int rig_power2mW(RIG *rig, unsigned int *mwpower, float power, freq_t freq, mode_t mode)
  {
  		const freq_range_t *txrange;
--- 872,876 ----
   *      SEE ALSO: rig_mW2power()
   */
! int rig_power2mW(RIG *rig, unsigned int *mwpower, float power, freq_t freq, rmode_t mode)
  {
  		const freq_range_t *txrange;
***************
*** 885,889 ****
  				return -RIG_ECONF; /* could be RIG_EINVAL ? */
  			}
! 			*mwpower = (unsigned long)(power*txrange->high_power);
  			return RIG_OK;
  		} else
--- 887,891 ----
  				return -RIG_ECONF; /* could be RIG_EINVAL ? */
  			}
! 			*mwpower = (unsigned int)(power * txrange->high_power);
  			return RIG_OK;
  		} else
***************
*** 912,916 ****
   *      SEE ALSO: rig_power2mW()
   */
! int rig_mW2power(RIG *rig, float *power, unsigned int mwpower, freq_t freq, mode_t mode)
  {
  		const freq_range_t *txrange;
--- 914,918 ----
   *      SEE ALSO: rig_power2mW()
   */
! int rig_mW2power(RIG *rig, float *power, unsigned int mwpower, freq_t freq, rmode_t mode)
  {
  		const freq_range_t *txrange;
***************
*** 1393,1396 ****
--- 1395,1426 ----
  
  /**
+  *      rig_set_bank - set the current memory bank
+  *      @rig:	The rig handle
+  *      @bank:	The memory bank
+  *
+  *      The rig_set_bank() function sets the current memory bank.
+  *      It is not mandatory for the radio to be in memory mode. Actually
+  *      it depends on rigs. YMMV.
+  *
+  *      RETURN VALUE: The rig_set_bank() function returns %RIG_OK
+  *      if the operation has been sucessful, or a negative value
+  *      if an error occured (in which case, cause is set appropriately).
+  *
+  *      SEE ALSO: rig_set_mem()
+  */
+ 
+ int rig_set_bank(RIG *rig, int bank)
+ {
+ 		if (!rig || !rig->caps)
+ 			return -RIG_EINVAL;
+ 
+ 		if (rig->caps->set_bank == NULL)
+ 			return -RIG_ENAVAIL;	/* not implemented */
+ 		else
+ 			return rig->caps->set_bank(rig, bank);
+ }
+ 
+ 
+ /**
   *      rig_set_channel - set channel data
   *      @rig:	The rig handle
***************
*** 1468,1474 ****
  				return NULL;
  		}
! 		if ((freq >= range_list[i].start && freq <= range_list[i].end) &&
  				(range_list[i].modes & mode)) {
! 				return (&range_list[i]);
  		}
  	}
--- 1498,1504 ----
  				return NULL;
  		}
! 		if (freq >= range_list[i].start && freq <= range_list[i].end &&
  				(range_list[i].modes & mode)) {
! 				return &range_list[i];
  		}
  	}