fix to account for struct chan_list change

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@1251 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.1.4
Stéphane Fillod, F8CFE 2002-11-04 22:40:55 +00:00
rodzic cf781224f4
commit d2bede454c
23 zmienionych plików z 73 dodań i 76 usunięć

Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Alinco backend - DX77 description
* Copyright (c) 2001,2002 by Stephane Fillod
*
* $Id: dx77.c,v 1.4 2002-08-16 17:43:01 fillods Exp $
* $Id: dx77.c,v 1.5 2002-11-04 22:40:54 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
@ -119,7 +119,7 @@ const struct rig_caps dx77_caps = {
.chan_desc_sz = 0,
.chan_list = {
{ 0, 99, RIG_MTYPE_MEM, 0 },
{ 0, 99, RIG_MTYPE_MEM },
RIG_CHAN_END,
},

Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib CI-V backend - description of IC-275 and variations
* Copyright (c) 2000-2002 by Stephane Fillod
*
* $Id: ic275.c,v 1.3 2002-08-16 17:43:01 fillods Exp $
* $Id: ic275.c,v 1.4 2002-11-04 22:40:54 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
@ -91,9 +91,9 @@ const struct rig_caps ic275_caps = {
.chan_desc_sz = 0,
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM, 0 },
{ 100, 101, RIG_MTYPE_EDGE, 0 },
{ 102, 102, RIG_MTYPE_CALL, 0 },
{ 1, 99, RIG_MTYPE_MEM },
{ 100, 101, RIG_MTYPE_EDGE },
{ 102, 102, RIG_MTYPE_CALL },
RIG_CHAN_END,
},

Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib CI-V backend - description of IC-475 and variations
* Copyright (c) 2000-2002 by Stephane Fillod
*
* $Id: ic475.c,v 1.3 2002-08-16 17:43:01 fillods Exp $
* $Id: ic475.c,v 1.4 2002-11-04 22:40:54 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
@ -91,9 +91,9 @@ const struct rig_caps ic475_caps = {
.chan_desc_sz = 0,
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM, 0 },
{ 100, 101, RIG_MTYPE_EDGE, 0 },
{ 102, 102, RIG_MTYPE_CALL, 0 },
{ 1, 99, RIG_MTYPE_MEM },
{ 100, 101, RIG_MTYPE_EDGE },
{ 102, 102, RIG_MTYPE_CALL },
RIG_CHAN_END,
},

Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib CI-V backend - description of IC-706 and variations
* Copyright (c) 2000-2002 by Stephane Fillod
*
* $Id: ic706.c,v 1.29 2002-08-16 17:43:01 fillods Exp $
* $Id: ic706.c,v 1.30 2002-11-04 22:40:54 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
@ -27,7 +27,6 @@
#include <hamlib/rig.h>
#include "icom.h"
#define IC706_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_FM|RIG_MODE_WFM)
#define IC706_1MHZ_TS_MODES (RIG_MODE_AM|RIG_MODE_FM|RIG_MODE_WFM)
#define IC706_1HZ_TS_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_RTTY)
@ -95,8 +94,6 @@
{ 204, 60 } /* +60 */ \
} }
/*
* ic706 rigs capabilities.
* Notice that some rigs share the same functions.
@ -420,9 +417,9 @@ const struct rig_caps ic706mkiig_caps = {
.chan_desc_sz = 0,
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM, 0 },
{ 100, 105, RIG_MTYPE_EDGE, 0 }, /* two by two */
{ 106, 107, RIG_MTYPE_CALL, 0 },
{ 1, 99, RIG_MTYPE_MEM, IC_MEM_CAP },
{ 100, 105, RIG_MTYPE_EDGE }, /* two by two */
{ 106, 107, RIG_MTYPE_CALL },
RIG_CHAN_END,
},

Wyświetl plik

@ -3,7 +3,7 @@
* Copyright (c) 2000-2002 by Stephane Fillod
* Caps submitted by Chuck Gilkes WD0FCL/4
*
* $Id: ic718.c,v 1.2 2002-08-16 17:43:01 fillods Exp $
* $Id: ic718.c,v 1.3 2002-11-04 22:40:54 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
@ -103,8 +103,8 @@ const struct rig_caps ic718_caps = {
.chan_desc_sz = 0,
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM, 0 },
{ 100, 101, RIG_MTYPE_EDGE, 0 }, /* two by two */
{ 1, 99, RIG_MTYPE_MEM },
{ 100, 101, RIG_MTYPE_EDGE }, /* two by two */
RIG_CHAN_END,
},

Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib CI-V backend - description of IC-735 and variations
* Copyright (c) 2000-2002 by Stephane Fillod
*
* $Id: ic735.c,v 1.3 2002-08-16 17:43:01 fillods Exp $
* $Id: ic735.c,v 1.4 2002-11-04 22:40:54 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
@ -95,8 +95,8 @@ const struct rig_caps ic735_caps = {
.chan_desc_sz = 0,
.chan_list = {
{ 1, 10, RIG_MTYPE_MEM, 0 },
{ 11, 12, RIG_MTYPE_EDGE, 0 },
{ 1, 10, RIG_MTYPE_MEM },
{ 11, 12, RIG_MTYPE_EDGE },
RIG_CHAN_END,
},

Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib CI-V backend - description of IC-756 and variations
* Copyright (c) 2000-2002 by Stephane Fillod
*
* $Id: ic756.c,v 1.5 2002-10-07 21:48:11 fillods Exp $
* $Id: ic756.c,v 1.6 2002-11-04 22:40:54 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
@ -128,8 +128,8 @@ const struct rig_caps ic756_caps = {
.chan_desc_sz = 0,
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM, 0 },
{ 100, 101, RIG_MTYPE_EDGE, 0 }, /* two by two */
{ 1, 99, RIG_MTYPE_MEM },
{ 100, 101, RIG_MTYPE_EDGE }, /* two by two */
RIG_CHAN_END,
},
@ -276,8 +276,8 @@ const struct rig_caps ic756pro_caps = {
.chan_desc_sz = 0,
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM, 0 },
{ 100, 101, RIG_MTYPE_EDGE, 0 }, /* two by two */
{ 1, 99, RIG_MTYPE_MEM },
{ 100, 101, RIG_MTYPE_EDGE }, /* two by two */
RIG_CHAN_END,
},
@ -465,8 +465,8 @@ const struct rig_caps ic756pro2_caps = {
.chan_desc_sz = 0,
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM, 0 },
{ 100, 101, RIG_MTYPE_EDGE, 0 }, /* two by two */
{ 1, 99, RIG_MTYPE_MEM },
{ 100, 101, RIG_MTYPE_EDGE }, /* two by two */
RIG_CHAN_END,
},

Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib CI-V backend - description of IC-775 and variations
* Copyright (c) 2000-2002 by Stephane Fillod
*
* $Id: ic775.c,v 1.2 2002-08-16 17:43:01 fillods Exp $
* $Id: ic775.c,v 1.3 2002-11-04 22:40:54 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
@ -97,8 +97,8 @@ const struct rig_caps ic775_caps = {
.chan_desc_sz = 0,
.chan_list = {
{ 1, 10, RIG_MTYPE_MEM, 0 },
{ 11, 12, RIG_MTYPE_EDGE, 0 },
{ 1, 10, RIG_MTYPE_MEM },
{ 11, 12, RIG_MTYPE_EDGE },
RIG_CHAN_END,
},

Wyświetl plik

@ -3,7 +3,7 @@
* Contributed by Francois Retief <fgretief@sun.ac.za>
* Copyright (c) 2000-2002 by Stephane Fillod
*
* $Id: ic821h.c,v 1.2 2002-08-16 17:43:01 fillods Exp $
* $Id: ic821h.c,v 1.3 2002-11-04 22:40:54 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
@ -97,8 +97,8 @@ const struct rig_caps ic821h_caps = {
.chan_list = {
/* FIXME: Each band has 80 channels (2*80) */
{ 1, 80, RIG_MTYPE_MEM, 0 },
{ 81, 82, RIG_MTYPE_EDGE, 0 },
{ 1, 80, RIG_MTYPE_MEM },
{ 81, 82, RIG_MTYPE_EDGE },
RIG_CHAN_END,
},

Wyświetl plik

@ -3,7 +3,7 @@
* Contributed by Francois Retief <fgretief@sun.ac.za>
* Copyright (c) 2000-2002 by Stephane Fillod
*
* $Id: ic910.c,v 1.6 2002-09-21 13:54:24 fillods Exp $
* $Id: ic910.c,v 1.7 2002-11-04 22:40:54 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
@ -69,7 +69,7 @@ static int compareFrequencies (RIG* rig, freq_t freq1, freq_t freq2) {
freq1 <= rig->caps->rx_range_list1[freq1band].end)
break;
++freq1band;
fprintf(stderr, "%i\n", freq1band);
//fprintf(stderr, "%i\n", freq1band);
}
while (rig->caps->rx_range_list1[freq2band].start!=noband.start) {
@ -247,9 +247,9 @@ const struct rig_caps ic910_caps = {
.chan_desc_sz = 0,
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM, 0 },
{ 100, 105, RIG_MTYPE_EDGE, 0 },
{ 106, 106, RIG_MTYPE_CALL, 0 },
{ 1, 99, RIG_MTYPE_MEM },
{ 100, 105, RIG_MTYPE_EDGE },
{ 106, 106, RIG_MTYPE_CALL },
RIG_CHAN_END, },
.rx_range_list1 = { /* USA */

Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib CI-V backend - description of IC-970 and variations
* Copyright (c) 2000-2002 by Stephane Fillod
*
* $Id: ic970.c,v 1.2 2002-08-16 17:43:01 fillods Exp $
* $Id: ic970.c,v 1.3 2002-11-04 22:40:54 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
@ -91,9 +91,9 @@ const struct rig_caps ic970_caps = {
.chan_desc_sz = 0,
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM, 0 },
{ 100, 101, RIG_MTYPE_EDGE, 0 },
{ 102, 102, RIG_MTYPE_CALL, 0 },
{ 1, 99, RIG_MTYPE_MEM },
{ 100, 101, RIG_MTYPE_EDGE },
{ 102, 102, RIG_MTYPE_CALL },
RIG_CHAN_END,
},

Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib CI-V backend - IC-R7000 description
* Copyright (c) 2000-2002 by Stephane Fillod
*
* $Id: icr7000.c,v 1.3 2002-08-16 17:43:01 fillods Exp $
* $Id: icr7000.c,v 1.4 2002-11-04 22:40:54 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
@ -93,7 +93,7 @@ const struct rig_caps icr7000_caps = {
.chan_desc_sz = 0,
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM, 0 },
{ 1, 99, RIG_MTYPE_MEM },
RIG_CHAN_END, },
.rx_range_list1 = {

Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib JRC backend - NRD-545 DSP description
* Copyright (c) 2001-2002 by Stephane Fillod
*
* $Id: nrd545.c,v 1.3 2002-08-16 17:43:01 fillods Exp $
* $Id: nrd545.c,v 1.4 2002-11-04 22:40:54 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
@ -100,7 +100,7 @@ const struct rig_caps nrd545_caps = {
.chan_desc_sz = 0,
.chan_list = {
{ 0, 999, RIG_MTYPE_MEM, 0 },
{ 0, 999, RIG_MTYPE_MEM },
RIG_CHAN_END,
},

Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Kenwood backend - TH-D7 description
* Copyright (c) 2000-2002 by Stephane Fillod
*
* $Id: thd7.c,v 1.7 2002-08-16 17:43:01 fillods Exp $
* $Id: thd7.c,v 1.8 2002-11-04 22:40:54 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
@ -114,7 +114,7 @@ const struct rig_caps thd7a_caps = {
.chan_desc_sz = 0,
.chan_list = { { 1, 200, RIG_MTYPE_MEM, 0 },
.chan_list = { { 1, 200, RIG_MTYPE_MEM },
RIG_CHAN_END,
}, /* FIXME: memory channel list: 200 memories */

Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Kenwood backend - TH-F7 description
* Copyright (c) 2001-2002 by Stephane Fillod
*
* $Id: thf7.c,v 1.5 2002-08-16 17:43:02 fillods Exp $
* $Id: thf7.c,v 1.6 2002-11-04 22:40:54 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
@ -93,7 +93,7 @@ const struct rig_caps thf7e_caps = {
.chan_desc_sz = 0,
.chan_list = { { 1, 435, RIG_MTYPE_MEM, 0 },
.chan_list = { { 1, 435, RIG_MTYPE_MEM },
RIG_CHAN_END,
}, /* FIXME: memory channel list: 435? memories */

Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Kenwood backend - TS440 description
* Copyright (c) 2000-2002 by Stephane Fillod
*
* $Id: ts440.c,v 1.7 2002-09-13 19:00:36 pa4tu Exp $
* $Id: ts440.c,v 1.8 2002-11-04 22:40:55 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
@ -100,7 +100,7 @@ const struct rig_caps ts440_caps = {
.chan_desc_sz = 0,
.chan_list = { { 0, 99, RIG_MTYPE_MEM, 0 },
.chan_list = { { 0, 99, RIG_MTYPE_MEM },
RIG_CHAN_END, },
.rx_range_list1 = { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */

Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Kenwood backend - TS50 description
* Copyright (c) 2002 by Stephane Fillod
*
* $Id: ts50s.c,v 1.9 2002-09-13 19:00:36 pa4tu Exp $
* $Id: ts50s.c,v 1.10 2002-11-04 22:40:55 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
@ -95,8 +95,8 @@ const struct rig_caps ts50s_caps = {
.chan_list = {
{ 0, 89, RIG_MTYPE_MEM, 0 },
{ 90, 99, RIG_MTYPE_EDGE, 0 },
{ 0, 89, RIG_MTYPE_MEM },
{ 90, 99, RIG_MTYPE_EDGE },
RIG_CHAN_END,
},
.rx_range_list1 = {

Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Kenwood backend - TS570 description
* Copyright (c) 2001,2002 by Stephane Fillod
*
* $Id: ts570.c,v 1.14 2002-09-21 13:52:09 fillods Exp $
* $Id: ts570.c,v 1.15 2002-11-04 22:40:55 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
@ -98,8 +98,8 @@ const struct rig_caps ts570s_caps = {
.chan_list = {
{ 0, 89, RIG_MTYPE_MEM, 0 },
{ 90, 99, RIG_MTYPE_EDGE, 0 },
{ 0, 89, RIG_MTYPE_MEM },
{ 90, 99, RIG_MTYPE_EDGE },
RIG_CHAN_END,
},
.rx_range_list1 = {
@ -265,8 +265,8 @@ const struct rig_caps ts570d_caps = {
.chan_desc_sz = 0,
.chan_list = {
{ 0, 89, RIG_MTYPE_MEM, 0 },
{ 90, 99, RIG_MTYPE_EDGE, 0 },
{ 0, 89, RIG_MTYPE_MEM },
{ 90, 99, RIG_MTYPE_EDGE },
RIG_CHAN_END,
},
.rx_range_list1 = {

Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Kenwood backend - TS-790 description
* Copyright (c) 2000-2002 by Stephane Fillod
*
* $Id: ts790.c,v 1.9 2002-09-13 19:00:36 pa4tu Exp $
* $Id: ts790.c,v 1.10 2002-11-04 22:40:55 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
@ -95,7 +95,7 @@ const struct rig_caps ts790_caps = {
.chan_desc_sz = 0,
/* FIXME: split memories, call channel, etc. */
.chan_list = { { 1, 59, RIG_MTYPE_MEM, 0 },
.chan_list = { { 1, 59, RIG_MTYPE_MEM },
RIG_CHAN_END,
},

Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Kenwood backend - TS850 description
* Copyright (c) 2000-2002 by Stephane Fillod
*
* $Id: ts850.c,v 1.7 2002-09-13 19:00:36 pa4tu Exp $
* $Id: ts850.c,v 1.8 2002-11-04 22:40:55 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
@ -93,8 +93,8 @@ const struct rig_caps ts850_caps = {
.chan_list = {
{ 0, 89, RIG_MTYPE_MEM, 0 }, /* TBC */
{ 90, 99, RIG_MTYPE_EDGE, 0 },
{ 0, 89, RIG_MTYPE_MEM }, /* TBC */
{ 90, 99, RIG_MTYPE_EDGE },
RIG_CHAN_END,
},

Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Kenwood backend - TS870S description
* Copyright (c) 2000-2002 by Stephane Fillod
*
* $Id: ts870s.c,v 1.28 2002-09-13 19:00:36 pa4tu Exp $
* $Id: ts870s.c,v 1.29 2002-11-04 22:40:55 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
@ -94,8 +94,8 @@ const struct rig_caps ts870s_caps = {
.chan_list = {
{ 0, 89, RIG_MTYPE_MEM, 0 }, /* TBC */
{ 90, 99, RIG_MTYPE_EDGE, 0 },
{ 0, 89, RIG_MTYPE_MEM }, /* TBC */
{ 90, 99, RIG_MTYPE_EDGE },
RIG_CHAN_END,
},

Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Kenwood backend - TS950 description
* Copyright (c) 2002 by Stephane Fillod
*
* $Id: ts950.c,v 1.9 2002-09-13 19:00:36 pa4tu Exp $
* $Id: ts950.c,v 1.10 2002-11-04 22:40:55 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
@ -90,8 +90,8 @@ const struct rig_caps ts950sdx_caps = {
.chan_desc_sz = 0,
.chan_list = {
{ 0, 89, RIG_MTYPE_MEM, 0 }, /* TBC */
{ 90, 99, RIG_MTYPE_EDGE, 0 },
{ 0, 89, RIG_MTYPE_MEM }, /* TBC */
{ 90, 99, RIG_MTYPE_EDGE },
RIG_CHAN_END,
},

Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Uniden backend - BC895 description
* Copyright (c) 2001-2002 by Stephane Fillod
*
* $Id: bc895.c,v 1.2 2002-08-16 17:43:02 fillods Exp $
* $Id: bc895.c,v 1.3 2002-11-04 22:40:55 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
@ -86,7 +86,7 @@ const struct rig_caps bc895_caps = {
.chan_desc_sz = 0,
.chan_list = {
{ 1, 300, RIG_MTYPE_MEM, 0 },
{ 1, 300, RIG_MTYPE_MEM },
RIG_CHAN_END,
},