Merge branch 'bergerspencer-yaesu_cache_invalidation'

yaesu/ft817.c

@@ -754,6 +754,9 @@ int ft817_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
 	/* fill in the frequency */
 	to_bcd_be(data, (freq + 5) / 10, 8);
 
+	rig_force_cache_timeout(
+	    &((struct ft817_priv_data *)rig->state.priv)->fm_status_tv);
+
 	return ft817_send_icmd(rig, FT817_NATIVE_CAT_SET_FREQ, data);
 }
 
@@ -814,6 +817,9 @@ int ft817_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
 /* 	if (width != RIG_PASSBAND_NORMAL) */
 /* 		return -RIG_EINVAL; */
 
+	rig_force_cache_timeout(
+	    &((struct ft817_priv_data *)rig->state.priv)->fm_status_tv);
+
 	return ft817_send_cmd(rig, index);
 }
 
@@ -839,6 +845,9 @@ int ft817_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
 
 	n = ft817_send_cmd(rig, index);
 
+	rig_force_cache_timeout(
+	    &((struct ft817_priv_data *)rig->state.priv)->tx_status_tv);
+
 	if (n < 0 && n != -RIG_ERJCTED)
 		return n;
 

yaesu/ft857.c

@@ -719,6 +719,8 @@ int ft857_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
   /* fill in the frequency */
   to_bcd_be(data, (freq + 5) / 10, 8);
 
+  rig_force_cache_timeout(&((struct ft857_priv_data *) rig->state.priv)->fm_status_tv);
+
   return ft857_send_icmd(rig, FT857_NATIVE_CAT_SET_FREQ, data);
 }
 
@@ -766,6 +768,8 @@ int ft857_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
   if (width != RIG_PASSBAND_NORMAL)
     return -RIG_EINVAL;
 
+  rig_force_cache_timeout(&((struct ft857_priv_data *) rig->state.priv)->fm_status_tv);
+
   return ft857_send_cmd(rig, index);
 }
 
@@ -791,6 +795,8 @@ int ft857_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
 
   n = ft857_send_cmd(rig, index);
 
+  rig_force_cache_timeout(&((struct ft857_priv_data *) rig->state.priv)->tx_status_tv);
+
   if (n < 0 && n != -RIG_ERJCTED)
     return n;
 
@@ -819,6 +825,8 @@ int ft857_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
 
   n = ft857_send_cmd(rig, index);
 
+  rig_force_cache_timeout(&((struct ft857_priv_data *) rig->state.priv)->tx_status_tv);
+
   if (n < 0 && n != -RIG_ERJCTED)
     return n;
 

yaesu/ft897.c

@@ -729,6 +729,9 @@ int ft897_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
   /* fill in the frequency */
   to_bcd_be(data, (freq + 5) / 10, 8);
 
+  /*invalidate frequency cache*/
+  rig_force_cache_timeout(&((struct ft897_priv_data *) rig->state.priv)->fm_status_tv);
+
   return ft897_send_icmd(rig, FT897_NATIVE_CAT_SET_FREQ, data);
 }
 
@@ -776,6 +779,8 @@ int ft897_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
   if (width != RIG_PASSBAND_NORMAL)
     return -RIG_EINVAL;
 
+  rig_force_cache_timeout(&((struct ft897_priv_data *) rig->state.priv)->fm_status_tv);
+
   return ft897_send_cmd(rig, index);
 }
 
@@ -801,6 +806,8 @@ int ft897_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
 
   n = ft897_send_cmd(rig, index);
 
+  rig_force_cache_timeout(&((struct ft897_priv_data *) rig->state.priv)->tx_status_tv);
+
   if (n < 0 && n != -RIG_ERJCTED)
     return n;
 
@@ -854,6 +861,8 @@ int ft897_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
 
   n = ft897_send_cmd(rig, index);
 
+  rig_force_cache_timeout(&((struct ft897_priv_data *) rig->state.priv)->tx_status_tv);
+
   if (n < 0 && n != -RIG_ERJCTED)
     return n;
 

yaesu/ft980.c

@@ -675,6 +675,8 @@ int ft980_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
   /* store bcd format in cmd (MSB) */
   to_bcd(cmd,freq/10,8);
 
+  rig_force_cache_timeout(&priv->status_tv);
+
   /* Frequency set */
   return ft980_transaction(rig, cmd, UPDATE_DATA_OFS(&priv->update_data,5), 5);
 }
@@ -735,6 +737,8 @@ int ft980_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
 
   cmd[3] = md;
 
+  rig_force_cache_timeout(&priv->status_tv);
+
   /* Mode set */
   return ft980_transaction(rig, cmd, UPDATE_DATA_OFS(&priv->update_data,22), 22);
 }