[Hamlib-cvs-digest] CVS: hamlib/dummy dummy.c,1.16,1.17

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

Update of /cvsroot/hamlib/hamlib/dummy
In directory usw-pr-cvs1:/tmp/cvs-serv15602

Modified Files:
	dummy.c 
Log Message:
return last set freq/mode/width

Index: dummy.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/dummy/dummy.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** dummy.c	2001/08/08 06:04:48	1.16
--- dummy.c	2001/11/18 14:16:57	1.17
***************
*** 50,53 ****
--- 50,59 ----
  #include "dummy.h"
  
+ struct dummy_priv_data {
+ 		freq_t curr_freq;
+ 		rmode_t curr_mode;
+ 		pbwidth_t curr_width;
+ 		/* current vfo already in rig_state */
+ };
  
  static unsigned char *decode_vfo(vfo_t vfo)
***************
*** 127,133 ****
--- 133,150 ----
  
  static int dummy_init(RIG *rig) {
+   struct dummy_priv_data *priv;
+ 
+   priv = (struct dummy_priv_data*)malloc(sizeof(struct dummy_priv_data));
+   if (!priv)
+ 		  return -RIG_ENOMEM;
+   rig->state.priv = (void*)priv;
+ 
    rig_debug(RIG_DEBUG_VERBOSE,__FUNCTION__ " called\n");
    rig->state.rigport.type.rig = RIG_PORT_NONE;
  
+   priv->curr_freq = MHz(145);
+   priv->curr_mode = RIG_MODE_FM;
+   priv->curr_width = rig_passband_normal(rig, RIG_MODE_FM);
+ 
    return RIG_OK;
  }
***************
*** 136,139 ****
--- 153,161 ----
    rig_debug(RIG_DEBUG_VERBOSE,__FUNCTION__ " called\n");
  
+   if (rig->state.priv)
+   	free(rig->state.priv);
+ 
+   rig->state.priv = NULL;
+ 
    return RIG_OK;
  }
***************
*** 155,160 ****
--- 177,185 ----
  static int dummy_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
  {
+   struct dummy_priv_data *priv = (struct dummy_priv_data *)rig->state.priv;
+ 
    rig_debug(RIG_DEBUG_VERBOSE,__FUNCTION__ " called: %s %s\n", 
   			decode_vfo(vfo), decode_freq(freq));
+   priv->curr_freq = freq;
  
    return RIG_OK;
***************
*** 164,169 ****
--- 189,198 ----
  static int dummy_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
  {
+   struct dummy_priv_data *priv = (struct dummy_priv_data *)rig->state.priv;
+ 
    rig_debug(RIG_DEBUG_VERBOSE,__FUNCTION__ " called: %s\n", decode_vfo(vfo));
  
+   *freq = priv->curr_freq;
+ 
    return RIG_OK;
  }
***************
*** 172,178 ****
--- 201,212 ----
  static int dummy_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
  {
+   struct dummy_priv_data *priv = (struct dummy_priv_data *)rig->state.priv;
+ 
    rig_debug(RIG_DEBUG_VERBOSE,__FUNCTION__ " called: %s %s\n", 
    		decode_vfo(vfo), decode_mode(mode, width));
  
+   priv->curr_mode = mode;
+   priv->curr_width = width;
+ 
    return RIG_OK;
  }
***************
*** 181,186 ****
--- 215,225 ----
  static int dummy_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
  {
+   struct dummy_priv_data *priv = (struct dummy_priv_data *)rig->state.priv;
+ 
    rig_debug(RIG_DEBUG_VERBOSE,__FUNCTION__ " called: %s\n", decode_vfo(vfo));
  
+   *mode = priv->curr_mode;
+   *width = priv->curr_width;
+ 
    return RIG_OK;
  }
***************
*** 415,434 ****
  
  
- static int dummy_power2mW(RIG *rig, unsigned int *mwpower, float power, freq_t freq, rmode_t mode)
- {
-   rig_debug(RIG_DEBUG_VERBOSE,__FUNCTION__ " called\n");
- 
-   return RIG_OK;
- }
- 
- 
- static int dummy_mW2power(RIG *rig, float *power, unsigned int mwpower, freq_t freq, rmode_t mode)
- {
-   rig_debug(RIG_DEBUG_VERBOSE,__FUNCTION__ " called\n");
- 
-   return RIG_OK;
- }
- 
- 
  static int dummy_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
  {
--- 454,457 ----
***************
*** 621,625 ****
    version:       "0.1",
    copyright:	 "LGPL",
!   status:        RIG_STATUS_NEW,
    rig_type:      RIG_TYPE_OTHER,
    targetable_vfo:	 0,
--- 644,648 ----
    version:       "0.1",
    copyright:	 "LGPL",
!   status:        RIG_STATUS_BETA,
    rig_type:      RIG_TYPE_OTHER,
    targetable_vfo:	 0,
***************
*** 696,701 ****
    set_ts:	dummy_set_ts,
    get_ts:	dummy_get_ts,
-   power2mW:	dummy_power2mW,
-   mW2power:	dummy_mW2power,
    set_ant:	dummy_set_ant,
    get_ant:	dummy_get_ant,
--- 719,722 ----