Found by cppcheck:

ft920: fix get_mode(MODE_DATA_UN)
ft990: fix get_xit(RIG_VFO_B)


git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@2962 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.2.12
Stéphane Fillod, F8CFE 2010-08-23 21:24:51 +00:00
rodzic 9224e0dd70
commit 7ebc81b859
2 zmienionych plików z 6 dodań i 8 usunięć

Wyświetl plik

@ -3,7 +3,7 @@
* *
* ft920.c - (C) Frank Singleton 2000 (javabear at users.sourceforge.net) * ft920.c - (C) Frank Singleton 2000 (javabear at users.sourceforge.net)
* (C) Nate Bargmann 2002-2005 (n0nb at arrl.net) * (C) Nate Bargmann 2002-2005 (n0nb at arrl.net)
* (C) Stephane Fillod 2002-2008 (fillods at users.sourceforge.net) * (C) Stephane Fillod 2002-2010 (fillods at users.sourceforge.net)
* *
* This shared library provides an API for communicating * This shared library provides an API for communicating
* via serial interface to an FT-920 using the "CAT" interface * via serial interface to an FT-920 using the "CAT" interface
@ -12,8 +12,6 @@
* pages 86 to 90 * pages 86 to 90
* *
* *
* $Id: ft920.c,v 1.26 2008-11-02 14:53:25 fillods Exp $
*
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -148,7 +146,7 @@ const struct rig_caps ft920_caps = {
.rig_model = RIG_MODEL_FT920, .rig_model = RIG_MODEL_FT920,
.model_name = "FT-920", .model_name = "FT-920",
.mfg_name = "Yaesu", .mfg_name = "Yaesu",
.version = "2010-02-05", /* YYYY-MM-DD */ .version = "2010-08-23", /* YYYY-MM-DD */
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_STABLE, .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
@ -910,6 +908,7 @@ static int ft920_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
case MODE_DATA_UN: case MODE_DATA_UN:
*mode = RIG_MODE_PKTUSB; *mode = RIG_MODE_PKTUSB;
norm = FALSE; norm = FALSE;
break;
case MODE_DATA_U: case MODE_DATA_U:
*mode = RIG_MODE_PKTUSB; *mode = RIG_MODE_PKTUSB;
norm = TRUE; norm = TRUE;

Wyświetl plik

@ -1,5 +1,5 @@
/* /*
* hamlib - (C) Stephane Fillod 2002-2005 (fillods at users.sourceforge.net) * hamlib - (C) Stephane Fillod 2002-2010 (fillods at users.sourceforge.net)
* (C) Terry Embry 2009 * (C) Terry Embry 2009
* *
* ft990.c - (C) Berndt Josef Wulf (wulf at ping.net.au) * ft990.c - (C) Berndt Josef Wulf (wulf at ping.net.au)
@ -8,8 +8,6 @@
* via serial interface to an FT-990 using the "CAT" interface * via serial interface to an FT-990 using the "CAT" interface
* *
* *
* $Id: ft990.c,v 1.19 2009-01-12 12:11:06 mrtembry Exp $
*
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -140,7 +138,7 @@ const struct rig_caps ft990_caps = {
.rig_model = RIG_MODEL_FT990, .rig_model = RIG_MODEL_FT990,
.model_name = "FT-990", .model_name = "FT-990",
.mfg_name = "Yaesu", .mfg_name = "Yaesu",
.version = "0.1", .version = "0.2",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_ALPHA, .status = RIG_STATUS_ALPHA,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
@ -1326,6 +1324,7 @@ int ft990_get_xit(RIG *rig, vfo_t vfo, shortfreq_t *xit)
case RIG_VFO_B: case RIG_VFO_B:
ci = FT990_NATIVE_UPDATE_VFO_DATA; ci = FT990_NATIVE_UPDATE_VFO_DATA;
p = (ft990_op_data_t *) &priv->update_data.vfob; p = (ft990_op_data_t *) &priv->update_data.vfob;
break;
case RIG_VFO_MEM: case RIG_VFO_MEM:
case RIG_VFO_MAIN: case RIG_VFO_MAIN:
ci = FT990_NATIVE_UPDATE_OP_DATA; ci = FT990_NATIVE_UPDATE_OP_DATA;