Test k2_md_rtty flag

Test k2_md_rtty flag when k2_set_mode() is passed RIG_MODE_RTTY or
RIG_MODE_RTTYR to avoid erroneously attempting to set RTTY when
k2_md_rtty is unset.

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@3024 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.2.13
Nate Bargmann, N0NB 2011-01-21 18:38:39 +00:00
rodzic 749ababe13
commit 15cc6999cc
1 zmienionych plików z 5 dodań i 2 usunięć

Wyświetl plik

@ -237,7 +237,6 @@ int k2_open(RIG *rig)
return -RIG_EINVAL; return -RIG_EINVAL;
int err; int err;
struct kenwood_priv_data *priv = rig->state.priv; struct kenwood_priv_data *priv = rig->state.priv;
err = elecraft_open(rig); err = elecraft_open(rig);
@ -269,6 +268,7 @@ int k2_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
char f; char f;
char fcmd[16]; char fcmd[16];
struct k2_filt_lst_s *flt; struct k2_filt_lst_s *flt;
struct kenwood_priv_data *priv = rig->state.priv;
shortfreq_t freq = 0; shortfreq_t freq = 0;
/* Select the filter array per mode. */ /* Select the filter array per mode. */
@ -283,7 +283,10 @@ int k2_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
break; break;
case RIG_MODE_RTTY: case RIG_MODE_RTTY:
case RIG_MODE_RTTYR: case RIG_MODE_RTTYR:
flt = &k2_fwmd_rtty; if (priv->k2_md_rtty == 0)
return -RIG_EINVAL; /* RTTY module not installed */
else
flt = &k2_fwmd_rtty;
break; break;
default: default:
return -RIG_EINVAL; return -RIG_EINVAL;