From 39413a68428ccd3167fb8804a28f0e206e40773c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Fillod=2C=20F8CFE?= Date: Sat, 21 Aug 2010 12:48:01 +0000 Subject: [PATCH] add RIG_VFO_MEM in caps git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@2959 7ae35d74-ebe9-4afe-98af-79ac388436b8 --- icom/delta2.c | 2 +- icom/ic271.c | 5 ++--- icom/ic275.c | 5 ++--- icom/ic471.c | 5 ++--- icom/ic475.c | 5 ++--- icom/ic703.c | 5 ++--- icom/ic706.c | 13 ++++++------- icom/ic707.c | 5 ++--- icom/ic725.c | 5 ++--- icom/ic726.c | 5 ++--- icom/ic728.c | 5 ++--- icom/ic735.c | 5 ++--- icom/ic736.c | 5 ++--- icom/ic737.c | 5 ++--- icom/ic738.c | 2 +- icom/ic746.c | 6 +++--- icom/ic751.c | 5 ++--- icom/ic756.c | 4 ++-- icom/ic761.c | 5 ++--- icom/ic765.c | 5 ++--- icom/ic775.c | 5 ++--- icom/ic781.c | 5 ++--- icom/ic820h.c | 5 ++--- icom/ic821h.c | 5 ++--- icom/ic910.c | 7 +++---- icom/ic970.c | 5 ++--- icom/icom.h | 2 +- icom/icr71.c | 5 ++--- icom/icr72.c | 7 +++---- icom/id1.c | 5 ++--- icom/omni.c | 13 ++++++------- 31 files changed, 70 insertions(+), 96 deletions(-) diff --git a/icom/delta2.c b/icom/delta2.c index cd8079a81..505074aa3 100644 --- a/icom/delta2.c +++ b/icom/delta2.c @@ -43,7 +43,7 @@ #include "frame.h" #include "misc.h" -#define DELTAII_VFO_ALL (RIG_VFO_A|RIG_VFO_B) +#define DELTAII_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM) #define DELTAII_OTHER_TX_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM) diff --git a/icom/ic271.c b/icom/ic271.c index 187c7de76..7e02823ea 100644 --- a/icom/ic271.c +++ b/icom/ic271.c @@ -1,8 +1,7 @@ /* * Hamlib CI-V backend - description of IC-271 and variations - * Copyright (c) 2000-2003 by Stephane Fillod + * Copyright (c) 2000-2010 by Stephane Fillod * - * $Id: ic271.c,v 1.3 2005-04-03 19:53:51 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -32,7 +31,7 @@ #define IC271_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM) -#define IC271_VFO_ALL (RIG_VFO_A|RIG_VFO_B) +#define IC271_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM) #define IC271_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO) diff --git a/icom/ic275.c b/icom/ic275.c index 40e4e6b9f..915a80bdb 100644 --- a/icom/ic275.c +++ b/icom/ic275.c @@ -1,8 +1,7 @@ /* * Hamlib CI-V backend - description of IC-275 and variations - * Copyright (c) 2000-2008 by Stephane Fillod + * Copyright (c) 2000-2010 by Stephane Fillod * - * $Id: ic275.c,v 1.9 2008-10-31 07:49:11 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -32,7 +31,7 @@ #define IC275_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM) -#define IC275_VFO_ALL (RIG_VFO_A|RIG_VFO_B) +#define IC275_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM) #define IC275_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO) diff --git a/icom/ic471.c b/icom/ic471.c index 2f1726f8f..509add764 100644 --- a/icom/ic471.c +++ b/icom/ic471.c @@ -1,8 +1,7 @@ /* * Hamlib CI-V backend - description of IC-471 and variations - * Copyright (c) 2000-2003 by Stephane Fillod + * Copyright (c) 2000-2010 by Stephane Fillod * - * $Id: ic471.c,v 1.3 2005-04-03 19:53:51 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -32,7 +31,7 @@ #define IC471_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM) -#define IC471_VFO_ALL (RIG_VFO_A|RIG_VFO_B) +#define IC471_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM) #define IC471_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO) diff --git a/icom/ic475.c b/icom/ic475.c index 301cfeec7..acfff59a6 100644 --- a/icom/ic475.c +++ b/icom/ic475.c @@ -1,8 +1,7 @@ /* * Hamlib CI-V backend - description of IC-475 and variations - * Copyright (c) 2000-2008 by Stephane Fillod + * Copyright (c) 2000-2010 by Stephane Fillod * - * $Id: ic475.c,v 1.9 2008-10-31 07:49:11 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -32,7 +31,7 @@ #define IC475_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM) -#define IC475_VFO_ALL (RIG_VFO_A|RIG_VFO_B) +#define IC475_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM) #define IC475_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO) diff --git a/icom/ic703.c b/icom/ic703.c index b6302ce73..89a1ee0d5 100644 --- a/icom/ic703.c +++ b/icom/ic703.c @@ -1,8 +1,7 @@ /* * Hamlib CI-V backend - description of IC-703 - * Copyright (c) 2000-2004 by Stephane Fillod + * Copyright (c) 2000-2010 by Stephane Fillod * - * $Id: ic703.c,v 1.4 2004-09-26 08:35:03 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -40,7 +39,7 @@ #define IC703_LEVEL_ALL (RIG_LEVEL_PREAMP|RIG_LEVEL_ATT|RIG_LEVEL_AGC|RIG_LEVEL_RAWSTR|RIG_LEVEL_ALC|RIG_LEVEL_SWR|RIG_LEVEL_METER|RIG_LEVEL_COMP|RIG_LEVEL_RF|RIG_LEVEL_RFPOWER|RIG_LEVEL_MICGAIN|RIG_LEVEL_RF|RIG_LEVEL_AF|RIG_LEVEL_SQL|RIG_LEVEL_NR|RIG_LEVEL_IF|RIG_LEVEL_PBT_IN|RIG_LEVEL_PBT_OUT) -#define IC703_VFO_ALL (RIG_VFO_A|RIG_VFO_B) +#define IC703_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM) #define IC703_VFO_OPS (RIG_OP_CPY|RIG_OP_XCHG|RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_MCL) #define IC703_SCAN_OPS (RIG_SCAN_VFO|RIG_SCAN_MEM) diff --git a/icom/ic706.c b/icom/ic706.c index fbc87ace5..54625658c 100644 --- a/icom/ic706.c +++ b/icom/ic706.c @@ -1,8 +1,7 @@ /* * Hamlib CI-V backend - description of IC-706 and variations - * Copyright (c) 2000-2009 by Stephane Fillod + * Copyright (c) 2000-2010 by Stephane Fillod * - * $Id: ic706.c,v 1.39 2009-02-20 14:20:23 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -39,7 +38,7 @@ * and IC-706MKIIG * (0 - wide, 1 - normal, 2 - narrow) */ -int ic706_r2i_mode(RIG *rig, rmode_t mode, pbwidth_t width, +static int ic706_r2i_mode(RIG *rig, rmode_t mode, pbwidth_t width, unsigned char *md, signed char *pd) { int err; @@ -72,7 +71,7 @@ int ic706_r2i_mode(RIG *rig, rmode_t mode, pbwidth_t width, #define IC706IIG_LEVEL_ALL (RIG_LEVEL_PREAMP|RIG_LEVEL_ATT|RIG_LEVEL_AGC|RIG_LEVEL_RAWSTR) -#define IC706_VFO_ALL (RIG_VFO_A|RIG_VFO_B) +#define IC706_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM) #define IC706_VFO_OPS (RIG_OP_CPY|RIG_OP_XCHG|RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_MCL) #define IC706_SCAN_OPS (RIG_SCAN_MEM) @@ -141,7 +140,7 @@ const struct rig_caps ic706_caps = { .rig_model = RIG_MODEL_IC706, .model_name = "IC-706", .mfg_name = "Icom", -.version = BACKEND_VER, +.version = BACKEND_VER ".1", .copyright = "LGPL", .status = RIG_STATUS_UNTESTED, .rig_type = RIG_TYPE_MOBILE, @@ -273,7 +272,7 @@ const struct rig_caps ic706mkii_caps = { .rig_model = RIG_MODEL_IC706MKII, .model_name = "IC-706MkII", .mfg_name = "Icom", -.version = BACKEND_VER, +.version = BACKEND_VER ".1", .copyright = "LGPL", .status = RIG_STATUS_UNTESTED, .rig_type = RIG_TYPE_MOBILE, @@ -428,7 +427,7 @@ const struct rig_caps ic706mkiig_caps = { .rig_model = RIG_MODEL_IC706MKIIG, .model_name = "IC-706MkIIG", .mfg_name = "Icom", -.version = BACKEND_VER ".1", +.version = BACKEND_VER ".2", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_MOBILE, diff --git a/icom/ic707.c b/icom/ic707.c index f9de0efa8..678dd96dc 100644 --- a/icom/ic707.c +++ b/icom/ic707.c @@ -1,8 +1,7 @@ /* * Hamlib CI-V backend - description of IC-707 - * Copyright (c) 2000-2004 by Stephane Fillod + * Copyright (c) 2000-2010 by Stephane Fillod * - * $Id: ic707.c,v 1.4 2008-10-26 13:45:21 y32kn Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -41,7 +40,7 @@ #define IC707_OTHER_TX_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM) #define IC707_AM_TX_MODES (RIG_MODE_AM) -#define IC707_VFO_ALL (RIG_VFO_A|RIG_VFO_B) +#define IC707_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM) #define IC707_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_CPY|RIG_OP_MCL) diff --git a/icom/ic725.c b/icom/ic725.c index dd63ae0ec..bc76ac3c3 100644 --- a/icom/ic725.c +++ b/icom/ic725.c @@ -1,8 +1,7 @@ /* * Hamlib CI-V backend - description of IC-725 and variations - * Copyright (c) 2000-2008 by Stephane Fillod + * Copyright (c) 2000-2010 by Stephane Fillod * - * $Id: ic725.c,v 1.7 2008-10-25 14:00:52 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -39,7 +38,7 @@ #define IC725_OTHER_TX_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM) #define IC725_AM_TX_MODES (RIG_MODE_AM) -#define IC725_VFO_ALL (RIG_VFO_A|RIG_VFO_B) +#define IC725_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM) #define IC725_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_CPY|RIG_OP_MCL) diff --git a/icom/ic726.c b/icom/ic726.c index 18d6fe123..41052191e 100644 --- a/icom/ic726.c +++ b/icom/ic726.c @@ -1,8 +1,7 @@ /* * Hamlib CI-V backend - description of IC-726 and variations - * Copyright (c) 2000-2004 by Stephane Fillod + * Copyright (c) 2000-2010 by Stephane Fillod * - * $Id: ic726.c,v 1.5 2005-04-03 19:53:51 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -41,7 +40,7 @@ #define IC726_OTHER_TX_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM) #define IC726_AM_TX_MODES (RIG_MODE_AM) -#define IC726_VFO_ALL (RIG_VFO_A|RIG_VFO_B) +#define IC726_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM) #define IC726_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_CPY|RIG_OP_MCL) diff --git a/icom/ic728.c b/icom/ic728.c index 710ad35b1..e56cc835c 100644 --- a/icom/ic728.c +++ b/icom/ic728.c @@ -1,8 +1,7 @@ /* * Hamlib CI-V backend - description of IC-728 - * Copyright (c) 2000-2004 by Stephane Fillod + * Copyright (c) 2000-2010 by Stephane Fillod * - * $Id: ic728.c,v 1.3 2008-10-26 13:45:21 y32kn Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -41,7 +40,7 @@ #define IC728_OTHER_TX_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM) #define IC728_AM_TX_MODES (RIG_MODE_AM) -#define IC728_VFO_ALL (RIG_VFO_A|RIG_VFO_B) +#define IC728_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM) #define IC728_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_CPY|RIG_OP_MCL) diff --git a/icom/ic735.c b/icom/ic735.c index b328ac48a..9fee93811 100644 --- a/icom/ic735.c +++ b/icom/ic735.c @@ -1,8 +1,7 @@ /* * Hamlib CI-V backend - description of IC-735 and variations - * Copyright (c) 2000-2008 by Stephane Fillod + * Copyright (c) 2000-2010 by Stephane Fillod * - * $Id: ic735.c,v 1.8 2008-10-25 14:00:52 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -39,7 +38,7 @@ #define IC735_OTHER_TX_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM) #define IC735_AM_TX_MODES (RIG_MODE_AM) -#define IC735_VFO_ALL (RIG_VFO_A|RIG_VFO_B) +#define IC735_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM) #define IC735_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO) diff --git a/icom/ic736.c b/icom/ic736.c index 01600d357..ac6921029 100644 --- a/icom/ic736.c +++ b/icom/ic736.c @@ -1,8 +1,7 @@ /* * Hamlib CI-V backend - description of IC-736 and variations - * Copyright (c) 2000-2003 by Stephane Fillod + * Copyright (c) 2000-2010 by Stephane Fillod * - * $Id: ic736.c,v 1.6 2008-10-26 13:45:21 y32kn Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -44,7 +43,7 @@ #define IC736_OTHER_TX_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM) #define IC736_AM_TX_MODES (RIG_MODE_AM) -#define IC736_VFO_ALL (RIG_VFO_A|RIG_VFO_B) +#define IC736_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM) #define IC736_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_CPY) #define IC736_SCAN_OPS (RIG_SCAN_MEM|RIG_SCAN_PROG|RIG_SCAN_VFO) diff --git a/icom/ic737.c b/icom/ic737.c index 7b256c221..b98536683 100644 --- a/icom/ic737.c +++ b/icom/ic737.c @@ -1,8 +1,7 @@ /* * Hamlib CI-V backend - description of IC-737 - * Copyright (c) 2000-2003 by Stephane Fillod + * Copyright (c) 2000-2010 by Stephane Fillod * - * $Id: ic737.c,v 1.6 2008-10-26 13:45:21 y32kn Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -44,7 +43,7 @@ #define IC737_OTHER_TX_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM) #define IC737_AM_TX_MODES (RIG_MODE_AM) -#define IC737_VFO_ALL (RIG_VFO_A|RIG_VFO_B) +#define IC737_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM) #define IC737_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_CPY) #define IC737_SCAN_OPS (RIG_SCAN_MEM|RIG_SCAN_PROG|RIG_SCAN_VFO) diff --git a/icom/ic738.c b/icom/ic738.c index a2e763535..8708ee7b8 100644 --- a/icom/ic738.c +++ b/icom/ic738.c @@ -42,7 +42,7 @@ #define IC738_OTHER_TX_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM) #define IC738_AM_TX_MODES (RIG_MODE_AM) -#define IC738_VFO_ALL (RIG_VFO_A|RIG_VFO_B) +#define IC738_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM) #define IC738_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_CPY) #define IC738_SCAN_OPS (RIG_SCAN_MEM|RIG_SCAN_PROG|RIG_SCAN_VFO) diff --git a/icom/ic746.c b/icom/ic746.c index 6564922c0..438811901 100644 --- a/icom/ic746.c +++ b/icom/ic746.c @@ -65,7 +65,7 @@ #define IC746_GET_PARM (RIG_PARM_BACKLIGHT|RIG_PARM_BEEP) #define IC746_SET_PARM (RIG_PARM_BACKLIGHT|RIG_PARM_BEEP|RIG_PARM_ANN) -#define IC746_VFO_ALL (RIG_VFO_A|RIG_VFO_B) +#define IC746_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM) #define IC746_ANTS (RIG_ANT_1|RIG_ANT_2) #define IC746_VFO_OPS (RIG_OP_CPY|RIG_OP_XCHG|RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_MCL|RIG_OP_TUNE) @@ -172,7 +172,7 @@ const struct rig_caps ic746_caps = { .mfg_name = "Icom", .version = BACKEND_VER, .copyright = "LGPL", -.status = RIG_STATUS_UNTESTED, +.status = RIG_STATUS_BETA, .rig_type = RIG_TYPE_TRANSCEIVER, .ptt_type = RIG_PTT_RIG, .dcd_type = RIG_DCD_NONE, @@ -378,7 +378,7 @@ const struct rig_caps ic746pro_caps = { .mfg_name = "Icom", .version = BACKEND_VER, .copyright = "LGPL", -.status = RIG_STATUS_UNTESTED, +.status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, .ptt_type = RIG_PTT_RIG, .dcd_type = RIG_DCD_RIG, diff --git a/icom/ic751.c b/icom/ic751.c index 38b2bce60..afde0c18d 100644 --- a/icom/ic751.c +++ b/icom/ic751.c @@ -1,8 +1,7 @@ /* * Hamlib CI-V backend - description of IC-751 and variations - * Copyright (c) 2000-2006 by Stephane Fillod + * Copyright (c) 2000-2010 by Stephane Fillod * - * $Id: ic751.c,v 1.3 2006-02-26 18:48:07 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -42,7 +41,7 @@ #define IC751_OTHER_TX_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_FM) #define IC751_AM_TX_MODES (RIG_MODE_AM) -#define IC751_VFO_ALL (RIG_VFO_VFO|RIG_VFO_MEM) +#define IC751_VFO_ALL (RIG_VFO_A|RIG_VFO_MEM) #define IC751_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO) diff --git a/icom/ic756.c b/icom/ic756.c index 39d6e7163..00fc63e85 100644 --- a/icom/ic756.c +++ b/icom/ic756.c @@ -54,7 +54,7 @@ * this model. */ -#define IC756_VFO_ALL (RIG_VFO_A|RIG_VFO_B) +#define IC756_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM) #define IC756_VFO_OPS (RIG_OP_CPY|RIG_OP_XCHG|RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_MCL) #define IC756_SCAN_OPS (RIG_SCAN_MEM|RIG_SCAN_VFO|RIG_SCAN_PROG|RIG_SCAN_DELTA|RIG_SCAN_PRIO) @@ -754,7 +754,7 @@ static const struct icom_priv_caps ic756pro3_priv_caps = { #define IC756PROIII_OTHER_TX_MODES (RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_FM) #define IC756PROIII_AM_TX_MODES (RIG_MODE_AM) -#define IC756PROIII_VFO_ALL (RIG_VFO_MAIN|RIG_VFO_SUB) +#define IC756PROIII_VFO_ALL (RIG_VFO_MAIN|RIG_VFO_SUB|RIG_VFO_MEM) #define IC756PROIII_PARMS (RIG_PARM_ANN|RIG_PARM_BACKLIGHT|RIG_PARM_APO|RIG_PARM_TIME|RIG_PARM_BEEP) diff --git a/icom/ic761.c b/icom/ic761.c index e4dec8c1d..e8a6a556d 100644 --- a/icom/ic761.c +++ b/icom/ic761.c @@ -1,8 +1,7 @@ /* * Hamlib CI-V backend - description of IC-761 and variations - * Copyright (c) 2000-2008 by Stephane Fillod + * Copyright (c) 2000-2010 by Stephane Fillod * - * $Id: ic761.c,v 1.4 2008-10-25 14:00:52 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -39,7 +38,7 @@ #define IC761_OTHER_TX_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_FM) #define IC761_AM_TX_MODES (RIG_MODE_AM) -#define IC761_VFO_ALL (RIG_VFO_A) +#define IC761_VFO_ALL (RIG_VFO_A|RIG_VFO_MEM) #define IC761_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO) diff --git a/icom/ic765.c b/icom/ic765.c index 633b52770..39f01f3d8 100644 --- a/icom/ic765.c +++ b/icom/ic765.c @@ -1,8 +1,7 @@ /* * Hamlib CI-V backend - description of IC-765 and variations - * Copyright (c) 2000-2003 by Stephane Fillod + * Copyright (c) 2000-2010 by Stephane Fillod * - * $Id: ic765.c,v 1.5 2008-01-05 12:37:59 csete Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -41,7 +40,7 @@ #define IC765_OTHER_TX_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM|RIG_MODE_RTTY) #define IC765_AM_TX_MODES (RIG_MODE_AM) -#define IC765_VFO_ALL (RIG_VFO_A|RIG_VFO_B) +#define IC765_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM) #define IC765_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_CPY|RIG_OP_MCL) diff --git a/icom/ic775.c b/icom/ic775.c index 7192ff345..c4d5ac270 100644 --- a/icom/ic775.c +++ b/icom/ic775.c @@ -1,8 +1,7 @@ /* * Hamlib CI-V backend - description of IC-775 and variations - * Copyright (c) 2000-2008 by Stephane Fillod + * Copyright (c) 2000-2010 by Stephane Fillod * - * $Id: ic775.c,v 1.7 2008-10-25 14:00:52 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -40,7 +39,7 @@ #define IC775_OTHER_TX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_FM) #define IC775_AM_TX_MODES (RIG_MODE_AM) -#define IC775_VFO_ALL (RIG_VFO_A|RIG_VFO_B) +#define IC775_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM) #define IC775_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO) diff --git a/icom/ic781.c b/icom/ic781.c index 3cec4295e..6768ac009 100644 --- a/icom/ic781.c +++ b/icom/ic781.c @@ -1,8 +1,7 @@ /* * Hamlib CI-V backend - description of IC-781 and variations - * Copyright (c) 2000-2008 by Stephane Fillod + * Copyright (c) 2000-2010 by Stephane Fillod * - * $Id: ic781.c,v 1.4 2008-10-25 14:00:52 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -42,7 +41,7 @@ #define IC781_OTHER_TX_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM|RIG_MODE_RTTY) #define IC781_AM_TX_MODES (RIG_MODE_AM) -#define IC781_VFO_ALL (RIG_VFO_A|RIG_VFO_B) +#define IC781_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM) #define IC781_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_CPY|RIG_OP_MCL|RIG_OP_XCHG) diff --git a/icom/ic820h.c b/icom/ic820h.c index 92068a6fc..e6339a89c 100644 --- a/icom/ic820h.c +++ b/icom/ic820h.c @@ -1,9 +1,8 @@ /* * Hamlib CI-V backend - description of IC-820H (VHF/UHF All-Mode Tranceiver) * Contributed by Francois Retief - * Copyright (c) 2000-2008 by Stephane Fillod + * Copyright (c) 2000-2010 by Stephane Fillod * - * $Id: ic820h.c,v 1.1 2008-02-13 22:04:52 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -33,7 +32,7 @@ #define IC820H_MODES (RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_FM) -#define IC820H_VFO_ALL (RIG_VFO_A|RIG_VFO_C) +#define IC820H_VFO_ALL (RIG_VFO_A|RIG_VFO_C|RIG_VFO_MEM) /* FIXME: What about MAIN/SUB mode? And satellite mode? */ #define IC820H_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_CPY|RIG_OP_MCL) diff --git a/icom/ic821h.c b/icom/ic821h.c index aff5368ff..72e331b98 100644 --- a/icom/ic821h.c +++ b/icom/ic821h.c @@ -1,9 +1,8 @@ /* * Hamlib CI-V backend - description of IC-821H (VHF/UHF All-Mode Tranceiver) * Contributed by Francois Retief - * Copyright (c) 2000-2003 by Stephane Fillod + * Copyright (c) 2000-2010 by Stephane Fillod * - * $Id: ic821h.c,v 1.6 2005-04-03 19:53:51 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -33,7 +32,7 @@ #define IC821H_MODES (RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_FM) -#define IC821H_VFO_ALL (RIG_VFO_A|RIG_VFO_C) +#define IC821H_VFO_ALL (RIG_VFO_A|RIG_VFO_C|RIG_VFO_MEM) /* FIXME: What about MAIN/SUB mode? And satellite mode? */ #define IC821H_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_CPY|RIG_OP_MCL) diff --git a/icom/ic910.c b/icom/ic910.c index b00df3b0a..068d04bc6 100644 --- a/icom/ic910.c +++ b/icom/ic910.c @@ -1,9 +1,8 @@ /* * Hamlib CI-V backend - description of IC-910 (VHF/UHF All-Mode Tranceiver) * Contributed by Francois Retief - * Copyright (c) 2000-2004 by Stephane Fillod + * Copyright (c) 2000-2010 by Stephane Fillod * - * $Id: ic910.c,v 1.16 2008-11-13 20:29:43 y32kn Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -181,7 +180,7 @@ static int ic910_set_freq(RIG* rig, vfo_t vfo, freq_t freq) * This function does the special bandwidth coding for IC-910 * (1 - normal, 2 - narrow) */ -int ic910_r2i_mode(RIG *rig, rmode_t mode, pbwidth_t width, +static int ic910_r2i_mode(RIG *rig, rmode_t mode, pbwidth_t width, unsigned char *md, signed char *pd) { int err; @@ -199,7 +198,7 @@ int ic910_r2i_mode(RIG *rig, rmode_t mode, pbwidth_t width, #define IC910_MODES (RIG_MODE_SSB|RIG_MODE_CW|RIG_MODE_FM) -#define IC910_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MAIN|RIG_VFO_SUB) +#define IC910_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MAIN|RIG_VFO_SUB|RIG_VFO_MEM) #define IC910_SCAN_OPS (RIG_SCAN_MEM) diff --git a/icom/ic970.c b/icom/ic970.c index 785629c4c..999856728 100644 --- a/icom/ic970.c +++ b/icom/ic970.c @@ -1,8 +1,7 @@ /* * Hamlib CI-V backend - description of IC-970 and variations - * Copyright (c) 2000-2003 by Stephane Fillod + * Copyright (c) 2000-2010 by Stephane Fillod * - * $Id: ic970.c,v 1.6 2005-04-03 19:53:51 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -32,7 +31,7 @@ #define IC970_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM) -#define IC970_VFO_ALL (RIG_VFO_A|RIG_VFO_B) +#define IC970_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM) #define IC970_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO) diff --git a/icom/icom.h b/icom/icom.h index 82c3e896f..99cfaf87e 100644 --- a/icom/icom.h +++ b/icom/icom.h @@ -29,7 +29,7 @@ #include #endif -#define BACKEND_VER "0.6" +#define BACKEND_VER "0.7" /* * defines used by comp_cal_str in rig.c diff --git a/icom/icr71.c b/icom/icr71.c index ddaeefbc8..bf42e688b 100644 --- a/icom/icr71.c +++ b/icom/icr71.c @@ -1,8 +1,7 @@ /* * Hamlib CI-V backend - description of IC-R71 - * Copyright (c) 2000-2003 by Stephane Fillod + * Copyright (c) 2000-2010 by Stephane Fillod * - * $Id: icr71.c,v 1.2 2005-04-03 19:53:51 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -36,7 +35,7 @@ #define ICR71_LEVEL_ALL (RIG_LEVEL_NONE) -#define ICR71_VFO_ALL (RIG_VFO_A) +#define ICR71_VFO_ALL (RIG_VFO_A|RIG_VFO_MEM) #define ICR71_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO) #define ICR71_SCAN_OPS (RIG_SCAN_NONE) diff --git a/icom/icr72.c b/icom/icr72.c index 4f80db0c1..f6bf80fb6 100644 --- a/icom/icr72.c +++ b/icom/icr72.c @@ -1,8 +1,7 @@ /* * Hamlib CI-V backend - description of IC-R72 - * Copyright (c) 2000-2004 by Stephane Fillod + * Copyright (c) 2000-2010 by Stephane Fillod * - * $Id: icr72.c,v 1.2 2004-09-26 08:35:03 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -37,7 +36,7 @@ #define ICR72_VFO_OPS (RIG_OP_TO_VFO|RIG_OP_FROM_VFO|RIG_OP_MCL) -#define ICR72_VFO_ALL (RIG_VFO_A) +#define ICR72_VFO_ALL (RIG_VFO_A|RIG_VFO_MEM) #define ICR71_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_MCL) #define ICR72_SCAN_OPS (RIG_SCAN_MEM|RIG_SCAN_VFO|RIG_SCAN_SLCT|RIG_SCAN_PRIO) @@ -60,7 +59,7 @@ const struct rig_caps icr72_caps = { .dcd_type = RIG_DCD_RIG, .port_type = RIG_PORT_SERIAL, .serial_rate_min = 300, -.serial_rate_max = 19200, +.serial_rate_max = 9600, .serial_data_bits = 8, .serial_stop_bits = 1, .serial_parity = RIG_PARITY_NONE, diff --git a/icom/id1.c b/icom/id1.c index cd918f521..69efb6e27 100644 --- a/icom/id1.c +++ b/icom/id1.c @@ -1,8 +1,7 @@ /* * Hamlib CI-V backend - description of ID-1 and variations - * Copyright (c) 2000-2004 by Stephane Fillod + * Copyright (c) 2000-2010 by Stephane Fillod * - * $Id: id1.c,v 1.3 2004-09-26 08:35:03 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -38,7 +37,7 @@ #define ID1_PARM_ALL (RIG_PARM_BEEP|RIG_PARM_BACKLIGHT /* |RIG_PARM_FAN */) -#define ID1_VFO_ALL (RIG_VFO_A) +#define ID1_VFO_ALL (RIG_VFO_A|RIG_VFO_MEM) #define ID1_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_MCL) #define ID1_SCAN_OPS (RIG_SCAN_VFO|RIG_SCAN_MEM) diff --git a/icom/omni.c b/icom/omni.c index 2e6476e48..679a37ee3 100644 --- a/icom/omni.c +++ b/icom/omni.c @@ -1,8 +1,7 @@ /* * Hamlib CI-V backend - description of the TenTenc OMNI VI - * Copyright (c) 2000-2008 by Stephane Fillod + * Copyright (c) 2000-2010 by Stephane Fillod * - * $Id: omni.c,v 1.9 2008-03-31 14:22:58 aa6e Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -42,7 +41,7 @@ #include "frame.h" #include -#define OMNIVIP_VFO_ALL (RIG_VFO_A|RIG_VFO_B) +#define OMNIVIP_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM) #define OMNIVIP_OTHER_TX_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM) @@ -51,14 +50,14 @@ #define OMNIVIP_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO) #define OMNIVIP_STR_CAL { 0, { } } -int omni6_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt); -int omni6_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit); -int omni6_get_rit(RIG *rig, vfo_t vfo, shortfreq_t *rit); +static int omni6_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt); +static int omni6_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit); +static int omni6_get_rit(RIG *rig, vfo_t vfo, shortfreq_t *rit); static const struct icom_priv_caps omnivip_priv_caps = { 0x04, /* default address */ 0, /* 731 mode */ - NULL + NULL /* TODO */ }; const struct rig_caps omnivip_caps = {