diff --git a/aor/ar8200.c b/aor/ar8200.c index 1132d3496..ac49ba1c9 100644 --- a/aor/ar8200.c +++ b/aor/ar8200.c @@ -7,7 +7,7 @@ * using the serial interface. * * - * $Id: ar8200.c,v 1.2 2001-01-05 18:18:17 f4cfe Exp $ + * $Id: ar8200.c,v 1.3 2001-02-11 23:11:29 f4cfe Exp $ * * * @@ -41,7 +41,7 @@ #include "aor.h" -#define AR8200_ALL_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_USB|RIG_MODE_LSB|RIG_MODE_FM) +#define AR8200_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_USB|RIG_MODE_LSB|RIG_MODE_FM) #define AR8200_FUNC_ALL (RIG_FUNC_TSQL) @@ -53,29 +53,39 @@ * Also this struct is READONLY! */ const struct rig_caps ar8200_caps = { - RIG_MODEL_AR8200, "AR8200", "AOR", "0.1", RIG_STATUS_UNTESTED, - RIG_TYPE_SCANNER, RIG_PTT_NONE, 9600, 19200, 8, 2, RIG_PARITY_NONE, - RIG_HANDSHAKE_XONXOFF, 0, 0, 2000, 3, AR8200_FUNC_ALL, AR8200_LEVEL_ALL, - AR8200_LEVEL_ALL, 0, 1000, RIG_TRN_ON, + RIG_MODEL_AR8200, "AR8200", "AOR", "0.1", "GPL", + RIG_STATUS_UNTESTED, RIG_TYPE_SCANNER, + RIG_PTT_NONE, 9600, 19200, 8, 2, RIG_PARITY_NONE, RIG_HANDSHAKE_XONXOFF, + 0, 0, 200, 3, + RIG_FUNC_NONE, AR8200_FUNC_ALL, AR8200_LEVEL_ALL, AR8200_LEVEL_ALL, + { RIG_DBLST_END, }, + { RIG_DBLST_END, }, + 0, + 0, RIG_TRN_ON, + 1000, 0, 0, + + { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ + { RIG_FRNG_END, }, { - {KHz(100),MHz(2040),AR8200_ALL_MODES,-1,-1}, - {0,0,0,0,0}, + {KHz(100),MHz(2040),AR8200_MODES,-1,-1}, + RIG_FRNG_END, }, /* rx range */ - { {0,0,0,0,0} }, /* no tx range, this is a scanner! */ - { - {AR8200_ALL_MODES,50}, - {AR8200_ALL_MODES,100}, - {AR8200_ALL_MODES,KHz(1)}, - {AR8200_ALL_MODES,KHz(5)}, - {AR8200_ALL_MODES,KHz(9)}, - {AR8200_ALL_MODES,KHz(10)}, - {AR8200_ALL_MODES,12500}, - {AR8200_ALL_MODES,KHz(20)}, - {AR8200_ALL_MODES,KHz(25)}, - {AR8200_ALL_MODES,KHz(100)}, - {AR8200_ALL_MODES,MHz(1)}, - {AR8200_ALL_MODES,0}, /* any tuning step */ - {0,0} + { RIG_FRNG_END, }, /* no tx range, this is a scanner! */ + + { + {AR8200_MODES,50}, + {AR8200_MODES,100}, + {AR8200_MODES,KHz(1)}, + {AR8200_MODES,KHz(5)}, + {AR8200_MODES,KHz(9)}, + {AR8200_MODES,KHz(10)}, + {AR8200_MODES,12500}, + {AR8200_MODES,KHz(20)}, + {AR8200_MODES,KHz(25)}, + {AR8200_MODES,KHz(100)}, + {AR8200_MODES,MHz(1)}, + {AR8200_MODES,0}, /* any tuning step */ + RIG_TS_END, }, NULL, NULL, NULL, aor_close, NULL /* probe not supported yet */, aor_set_freq, aor_get_freq, aor_set_mode, aor_get_mode, NULL, diff --git a/icom/ic706.c b/icom/ic706.c index 28c24986e..ddf1133ad 100644 --- a/icom/ic706.c +++ b/icom/ic706.c @@ -7,7 +7,7 @@ * using the "CI-V" interface. * * - * $Id: ic706.c,v 1.11 2001-02-07 23:38:54 f4cfe Exp $ + * $Id: ic706.c,v 1.12 2001-02-11 23:13:13 f4cfe Exp $ * * * @@ -61,11 +61,20 @@ * Also this struct is READONLY! */ const struct rig_caps ic706_caps = { - RIG_MODEL_IC706, "IC-706", "Icom", "0.2", RIG_STATUS_UNTESTED, - RIG_TYPE_MOBILE, RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE, - RIG_HANDSHAKE_NONE, 0, 0, 200, 3, IC706_FUNC_ALL, IC706_LEVEL_ALL, - IC706_LEVEL_ALL, 0, 101, RIG_TRN_ON, - { {KHz(30),199999999,IC706_ALL_RX_MODES,-1,-1},{0,0,0,0,0}, }, /* rx range */ + RIG_MODEL_IC706, "IC-706", "Icom", "0.2", "GPL", + RIG_STATUS_UNTESTED, RIG_TYPE_MOBILE, + RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE, RIG_HANDSHAKE_NONE, + 0, 0, 200, 3, + RIG_FUNC_NONE, IC706_FUNC_ALL, RIG_FUNC_NONE, IC706_LEVEL_ALL, + { 20, RIG_DBLST_END, }, + { 20, RIG_DBLST_END, }, + 0, /* TBC: RIT controllable? */ + 0, RIG_TRN_ON, + 101, 0, 0, + + { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ + { RIG_FRNG_END, }, + { {KHz(30),199999999,IC706_ALL_RX_MODES,-1,-1},RIG_FRNG_END, }, /* rx range */ { {KHz(1800),1999999,IC706_OTHER_TX_MODES,5000,100000}, /* 100W class */ {KHz(1800),1999999,IC706_AM_TX_MODES,2000,40000}, /* 40W class */ {KHz(3500),3999999,IC706_OTHER_TX_MODES,5000,100000}, @@ -88,7 +97,8 @@ const struct rig_caps ic706_caps = { {MHz(50),MHz(54),IC706_AM_TX_MODES,2000,40000}, {MHz(144),MHz(148),IC706_OTHER_TX_MODES,5000,20000}, /* not sure.. */ {MHz(144),MHz(148),IC706_AM_TX_MODES,2000,8000}, /* anyone? */ - {0,0,0,0,0} }, + RIG_FRNG_END, }, + {{IC706_1HZ_TS_MODES,1}, {IC706_ALL_RX_MODES,10}, {IC706_ALL_RX_MODES,100}, @@ -101,41 +111,52 @@ const struct rig_caps ic706_caps = { {IC706_ALL_RX_MODES,KHz(25)}, {IC706_ALL_RX_MODES,KHz(100)}, {IC706_1MHZ_TS_MODES,MHz(1)}, - {0,0} + RIG_TS_END, }, icom_init, icom_cleanup, NULL, NULL, NULL /* probe not supported yet */, - icom_set_freq, icom_get_freq, icom_set_mode, icom_get_mode, icom_set_vfo, NULL, + icom_set_freq, icom_get_freq, icom_set_mode, icom_get_mode, icom_set_vfo, + NULL, }; const struct rig_caps ic706mkii_caps = { - RIG_MODEL_IC706MKII, "IC-706MKII", "Icom", "0.2", RIG_STATUS_UNTESTED, - RIG_TYPE_MOBILE, RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE, - RIG_HANDSHAKE_NONE, 0, 0, 200, 3, IC706_FUNC_ALL, IC706_LEVEL_ALL, - IC706_LEVEL_ALL, 0, 101, RIG_TRN_ON, - { {30000,199999999,IC706_ALL_RX_MODES,-1,-1}, {0,0,0,0,0}, }, /* rx range */ - { {1800000,1999999,IC706_OTHER_TX_MODES,5000,100000}, /* 100W class */ - {1800000,1999999,IC706_AM_TX_MODES,2000,40000}, /* 40W class */ - {3500000,3999999,IC706_OTHER_TX_MODES,5000,100000}, - {3500000,3999999,IC706_AM_TX_MODES,2000,40000}, - {7000000,7300000,IC706_OTHER_TX_MODES,5000,100000}, - {7000000,7300000,IC706_AM_TX_MODES,2000,40000}, - {10100000,10150000,IC706_OTHER_TX_MODES,5000,100000}, - {10100000,10150000,IC706_AM_TX_MODES,2000,40000}, - {14000000,14350000,IC706_OTHER_TX_MODES,5000,100000}, - {14000000,14350000,IC706_AM_TX_MODES,2000,40000}, - {18068000,18168000,IC706_OTHER_TX_MODES,5000,100000}, - {18068000,18168000,IC706_AM_TX_MODES,2000,40000}, - {21000000,21450000,IC706_OTHER_TX_MODES,5000,100000}, - {21000000,21450000,IC706_AM_TX_MODES,2000,40000}, - {24890000,24990000,IC706_OTHER_TX_MODES,5000,100000}, - {24890000,24990000,IC706_AM_TX_MODES,2000,40000}, - {28000000,29700000,IC706_OTHER_TX_MODES,5000,100000}, - {28000000,29700000,IC706_AM_TX_MODES,2000,40000}, - {50000000,54000000,IC706_OTHER_TX_MODES,5000,100000}, - {50000000,54000000,IC706_AM_TX_MODES,2000,40000}, - {144000000,148000000,IC706_OTHER_TX_MODES,5000,20000}, /* not sure.. */ - {144000000,148000000,IC706_AM_TX_MODES,2000,8000}, /* anyone? */ - {0,0,0,0,0} }, + RIG_MODEL_IC706MKII, "IC-706MKII", "Icom", "0.2", "GPL", + RIG_STATUS_UNTESTED, RIG_TYPE_MOBILE, + RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE, RIG_HANDSHAKE_NONE, + 0, 0, 200, 3, + RIG_FUNC_NONE, IC706_FUNC_ALL, RIG_FUNC_NONE, IC706_LEVEL_ALL, + { 20, RIG_DBLST_END, }, + { 20, RIG_DBLST_END, }, + 0, /* TBC: RIT controllable? */ + 0, RIG_TRN_ON, + 101, 0, 0, + + { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ + { RIG_FRNG_END, }, + { {KHz(30),199999999,IC706_ALL_RX_MODES,-1,-1},RIG_FRNG_END, }, /* rx range */ + { {KHz(1800),1999999,IC706_OTHER_TX_MODES,5000,100000}, /* 100W class */ + {KHz(1800),1999999,IC706_AM_TX_MODES,2000,40000}, /* 40W class */ + {KHz(3500),3999999,IC706_OTHER_TX_MODES,5000,100000}, + {KHz(3500),3999999,IC706_AM_TX_MODES,2000,40000}, + {MHz(7),KHz(7300),IC706_OTHER_TX_MODES,5000,100000}, + {MHz(7),KHz(7300),IC706_AM_TX_MODES,2000,40000}, + {KHz(10100),KHz(10150),IC706_OTHER_TX_MODES,5000,100000}, + {KHz(10100),KHz(10150),IC706_AM_TX_MODES,2000,40000}, + {MHz(14),KHz(14350),IC706_OTHER_TX_MODES,5000,100000}, + {MHz(14),KHz(14350),IC706_AM_TX_MODES,2000,40000}, + {KHz(18068),KHz(18168),IC706_OTHER_TX_MODES,5000,100000}, + {KHz(18068),KHz(18168),IC706_AM_TX_MODES,2000,40000}, + {MHz(21),KHz(21450),IC706_OTHER_TX_MODES,5000,100000}, + {MHz(21),KHz(21450),IC706_AM_TX_MODES,2000,40000}, + {KHz(24890),KHz(24990),IC706_OTHER_TX_MODES,5000,100000}, + {KHz(24890),KHz(24990),IC706_AM_TX_MODES,2000,40000}, + {MHz(28),KHz(29700),IC706_OTHER_TX_MODES,5000,100000}, + {MHz(28),KHz(29700),IC706_AM_TX_MODES,2000,40000}, + {MHz(50),MHz(54),IC706_OTHER_TX_MODES,5000,100000}, + {MHz(50),MHz(54),IC706_AM_TX_MODES,2000,40000}, + {MHz(144),MHz(148),IC706_OTHER_TX_MODES,5000,20000}, /* not sure.. */ + {MHz(144),MHz(148),IC706_AM_TX_MODES,2000,8000}, /* anyone? */ + RIG_FRNG_END, }, + {{IC706_1HZ_TS_MODES,1}, {IC706_ALL_RX_MODES,10}, {IC706_ALL_RX_MODES,100}, @@ -148,10 +169,12 @@ const struct rig_caps ic706mkii_caps = { {IC706_ALL_RX_MODES,KHz(25)}, {IC706_ALL_RX_MODES,KHz(100)}, {IC706_1MHZ_TS_MODES,MHz(1)}, - {0,0} + RIG_TS_END, }, + icom_init, icom_cleanup, NULL, NULL, NULL /* probe not supported yet */, - icom_set_freq, icom_get_freq, icom_set_mode, icom_get_mode, icom_set_vfo, NULL, + icom_set_freq, icom_get_freq, icom_set_mode, icom_get_mode, icom_set_vfo, + NULL, }; /* @@ -159,13 +182,22 @@ const struct rig_caps ic706mkii_caps = { * and 50W VHF */ const struct rig_caps ic706mkiig_caps = { - RIG_MODEL_IC706MKIIG, "IC-706MKIIG", "Icom", "0.2", RIG_STATUS_ALPHA, - RIG_TYPE_MOBILE, RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE, - RIG_HANDSHAKE_NONE, 0, 0, 200, 3, IC706_FUNC_ALL|RIG_FUNC_NR|RIG_FUNC_ANF, - IC706_LEVEL_ALL, IC706_LEVEL_ALL, 0, 101, RIG_TRN_ON, + RIG_MODEL_IC706MKIIG, "IC-706MKIIG", "Icom", "0.2", "GPL", + RIG_STATUS_ALPHA, RIG_TYPE_MOBILE, + RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE, RIG_HANDSHAKE_NONE, + 0, 0, 200, 3, + RIG_FUNC_NONE, IC706_FUNC_ALL|RIG_FUNC_NR|RIG_FUNC_ANF, IC706_LEVEL_ALL, IC706_LEVEL_ALL, + { 20, RIG_DBLST_END, }, + { 20, RIG_DBLST_END, }, + 9999, + 0, RIG_TRN_ON, + 101, 0, 0, + + { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ + { RIG_FRNG_END, }, { {KHz(30),MHz(200)-1,IC706_ALL_RX_MODES,-1,-1}, /* this trx also has UHF */ {MHz(400),MHz(470),IC706_ALL_RX_MODES,-1,-1}, - {0,0,0,0,0}, }, + RIG_FRNG_END, }, { {KHz(1800),MHz(2)-1,IC706_OTHER_TX_MODES,5000,100000}, /* 100W class */ {KHz(1800),MHz(2)-1,IC706_AM_TX_MODES,2000,40000}, /* 40W class */ {KHz(3500),MHz(4)-1,IC706_OTHER_TX_MODES,5000,100000}, @@ -190,7 +222,7 @@ const struct rig_caps ic706mkiig_caps = { {MHz(144),MHz(148),IC706_AM_TX_MODES,2000,20000}, /* AM VHF is 20W */ {MHz(430),MHz(450),IC706_OTHER_TX_MODES,5000,20000}, {MHz(430),MHz(450),IC706_AM_TX_MODES,2000,8000}, - {0,0,0,0,0}, }, + RIG_FRNG_END, }, {{IC706_1HZ_TS_MODES,1}, {IC706_ALL_RX_MODES,10}, {IC706_ALL_RX_MODES,100}, @@ -203,7 +235,7 @@ const struct rig_caps ic706mkiig_caps = { {IC706_ALL_RX_MODES,KHz(25)}, {IC706_ALL_RX_MODES,KHz(100)}, {IC706_1MHZ_TS_MODES,MHz(1)}, - {0,0} + RIG_TS_END, }, icom_init, icom_cleanup, NULL, NULL, NULL /* probe not supported yet */, icom_set_freq, icom_get_freq, icom_set_mode, icom_get_mode, icom_set_vfo, diff --git a/icom/icr8500.c b/icom/icr8500.c index 6de8ce282..28443d692 100644 --- a/icom/icr8500.c +++ b/icom/icr8500.c @@ -7,7 +7,7 @@ * using the "CI-V" interface. * * - * $Id: icr8500.c,v 1.2 2001-01-30 22:57:23 f4cfe Exp $ + * $Id: icr8500.c,v 1.3 2001-02-11 23:13:13 f4cfe Exp $ * * * @@ -41,7 +41,7 @@ #include "icom.h" -#define ICR8500_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_USB|RIG_MODE_LSB|RIG_MODE_RTTY|RIG_MODE_FM) +#define ICR8500_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_USB|RIG_MODE_LSB|RIG_MODE_RTTY|RIG_MODE_FM) #define ICR8500_1MHZ_TS_MODES (RIG_MODE_AM|RIG_MODE_FM) #define ICR8500_FUNC_ALL (RIG_FUNC_FAGC|RIG_FUNC_NB|RIG_FUNC_TSQL|RIG_FUNC_APF) @@ -52,29 +52,41 @@ * ICR8500 rigs capabilities. */ const struct rig_caps icr8500_caps = { - RIG_MODEL_ICR8500, "ICR-8500", "Icom", "0.2", RIG_STATUS_UNTESTED, - RIG_TYPE_RECEIVER, RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE, - RIG_HANDSHAKE_NONE, 0, 0, 2000, 3, ICR8500_FUNC_ALL, - ICR8500_LEVEL_ALL, ICR8500_LEVEL_ALL, 0, 999, RIG_TRN_ON, - { {KHz(100),MHz(824)-10,ICR8500_ALL_RX_MODES,-1,-1}, - {MHz(849)+10,MHz(869)-10,ICR8500_ALL_RX_MODES,-1,-1}, - {MHz(894)+10,GHz(2)-10,ICR8500_ALL_RX_MODES,-1,-1}, - {0,0,0,0,0}, }, - { {0,0,0,0,0}, }, /* no TX ranges, this is a receiver */ - {{ICR8500_ALL_RX_MODES,10}, - {ICR8500_ALL_RX_MODES,50}, - {ICR8500_ALL_RX_MODES,100}, - {ICR8500_ALL_RX_MODES,KHz(1)}, - {ICR8500_ALL_RX_MODES,2500}, - {ICR8500_ALL_RX_MODES,KHz(5)}, - {ICR8500_ALL_RX_MODES,KHz(9)}, - {ICR8500_ALL_RX_MODES,KHz(10)}, - {ICR8500_ALL_RX_MODES,12500}, - {ICR8500_ALL_RX_MODES,KHz(20)}, - {ICR8500_ALL_RX_MODES,KHz(25)}, - {ICR8500_ALL_RX_MODES,KHz(100)}, + RIG_MODEL_ICR8500, "ICR-8500", "Icom", "0.2", "GPL", + RIG_STATUS_UNTESTED, RIG_TYPE_RECEIVER, + + RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE, RIG_HANDSHAKE_NONE, + 0, 0, 200, 3, + RIG_FUNC_NONE, ICR8500_FUNC_ALL, ICR8500_LEVEL_ALL, ICR8500_LEVEL_ALL, + { 20, RIG_DBLST_END, }, + { 20, RIG_DBLST_END, }, + 9999, + 0, RIG_TRN_ON, + 999, 12, 0, + + { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ + { RIG_FRNG_END, }, + + { {KHz(100),MHz(824)-10,ICR8500_MODES,-1,-1}, + {MHz(849)+10,MHz(869)-10,ICR8500_MODES,-1,-1}, + {MHz(894)+10,GHz(2)-10,ICR8500_MODES,-1,-1}, + RIG_FRNG_END, }, + { RIG_FRNG_END, }, /* no TX ranges, this is a receiver */ + + { {ICR8500_MODES,10}, + {ICR8500_MODES,50}, + {ICR8500_MODES,100}, + {ICR8500_MODES,KHz(1)}, + {ICR8500_MODES,2500}, + {ICR8500_MODES,KHz(5)}, + {ICR8500_MODES,KHz(9)}, + {ICR8500_MODES,KHz(10)}, + {ICR8500_MODES,12500}, + {ICR8500_MODES,KHz(20)}, + {ICR8500_MODES,KHz(25)}, + {ICR8500_MODES,KHz(100)}, {ICR8500_1MHZ_TS_MODES,MHz(1)}, - {0,0} + RIG_TS_END, }, icom_init, icom_cleanup, NULL, NULL, NULL /* probe not supported yet */, icom_set_freq, icom_get_freq, icom_set_mode, icom_get_mode, icom_set_vfo, diff --git a/kenwood/ts870s.c b/kenwood/ts870s.c index 4faea7416..7facf6101 100644 --- a/kenwood/ts870s.c +++ b/kenwood/ts870s.c @@ -7,7 +7,7 @@ * using the serial interface. * * - * $Id: ts870s.c,v 1.4 2001-02-07 23:43:03 f4cfe Exp $ + * $Id: ts870s.c,v 1.5 2001-02-11 23:13:13 f4cfe Exp $ * * * @@ -56,13 +56,22 @@ * RIT: Variable Range ±9.99 kHz */ const struct rig_caps ts870s_caps = { - RIG_MODEL_TS870S, "TS-870S", "Kenwood", "0.1", RIG_STATUS_UNTESTED, - RIG_TYPE_TRANSCEIVER, RIG_PTT_RIG, 1200, 57600, 8, 1, RIG_PARITY_NONE, - RIG_HANDSHAKE_NONE, 0, 0, 2000, 3, TS870S_FUNC_ALL, TS870S_LEVEL_ALL, - TS870S_LEVEL_ALL, 0, 1000, RIG_TRN_ON, + RIG_MODEL_TS870S, "TS-870S", "Kenwood", "0.1", "GPL", + RIG_STATUS_UNTESTED, RIG_TYPE_TRANSCEIVER, + RIG_PTT_RIG, 1200, 57600, 8, 1, RIG_PARITY_NONE, RIG_HANDSHAKE_NONE, + 0, 0, 200, 3, + RIG_FUNC_NONE, TS870S_FUNC_ALL, TS870S_LEVEL_ALL, TS870S_LEVEL_ALL, + { RIG_DBLST_END, }, /* FIXME! */ + { RIG_DBLST_END, }, + 9999, + 0, RIG_TRN_ON, + 1000, 0, 0, + + { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ + { RIG_FRNG_END, }, { {KHz(100),MHz(30),TS870S_ALL_MODES,-1,-1}, - {0,0,0,0,0}, + RIG_FRNG_END, }, /* rx range */ { {KHz(1800),MHz(2)-1,TS870S_OTHER_TX_MODES,5000,100000}, /* 100W class */ @@ -82,9 +91,10 @@ const struct rig_caps ts870s_caps = { {KHz(24890),KHz(24990),TS870S_OTHER_TX_MODES,5000,100000}, {KHz(24890),KHz(24990),TS870S_AM_TX_MODES,2000,25000}, {MHz(28),KHz(29700),TS870S_OTHER_TX_MODES,5000,100000}, - {MHz(28),KHz(29700),TS870S_AM_TX_MODES,2000,25000} + {MHz(28),KHz(29700),TS870S_AM_TX_MODES,2000,25000}, + RIG_FRNG_END, }, /* tx range */ - { + { {TS870S_ALL_MODES,50}, {TS870S_ALL_MODES,100}, {TS870S_ALL_MODES,KHz(1)}, @@ -97,7 +107,7 @@ const struct rig_caps ts870s_caps = { {TS870S_ALL_MODES,KHz(100)}, {TS870S_ALL_MODES,MHz(1)}, {TS870S_ALL_MODES,0}, /* any tuning step */ - {0,0} + RIG_TS_END, }, NULL, NULL, NULL, NULL, NULL /* probe not supported yet */, kenwood_set_freq, kenwood_get_freq, kenwood_set_mode, kenwood_get_mode, NULL, diff --git a/winradio/winradio.c b/winradio/winradio.c index 6a3419ca5..b31a2a040 100644 --- a/winradio/winradio.c +++ b/winradio/winradio.c @@ -8,7 +8,7 @@ * /dev/winradio API. * * - * $Id: winradio.c,v 1.1 2001-02-07 23:54:14 f4cfe Exp $ + * $Id: winradio.c,v 1.2 2001-02-11 23:13:13 f4cfe Exp $ * * * This program is free software; you can redistribute it and/or @@ -45,9 +45,12 @@ #include #include +#define DEFAULT_WINRADIO_PATH "/dev/winradio0" static int wr_rig_init(RIG *rig) { rig->state.port_type = RIG_PORT_DEVICE; + strncpy(rig->state.rig_path, DEFAULT_WINRADIO_PATH, FILPATHLEN); + return RIG_OK; } @@ -157,6 +160,9 @@ static int wr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) { } } +/* + * FIXME: static buf does not allow reentrancy! + */ static unsigned char *wr_get_info(RIG *rig) { static char buf[100]; if ( ioctl(rig->state.fd, RADIO_GET_DESCR, buf) < 0 ) return "?"; @@ -179,19 +185,22 @@ const struct rig_caps wr1500_caps = { model_name: "WR-1500", mfg_name: "Winradio", version: "0.6", + copyright: "GPL?", status: RIG_STATUS_NEW, - rig_type: RIG_TYPE_RECEIVER, + rig_type: RIG_TYPE_PCRECEIVER, targetable_vfo: 0, ptt_type: RIG_PTT_NONE, - has_func: WR1500_FUNC, - has_level: WR1500_LEVEL, + has_get_func: WR1500_FUNC, + has_set_func: WR1500_FUNC, + has_get_level: WR1500_LEVEL, has_set_level: WR1500_SET_LEVEL, transceive: RIG_TRN_OFF, - rx_range_list: { {start:KHz(150),end:MHz(1500),modes:WR1500_MODES, + attenuator: { 20, RIG_DBLST_END, }, + rx_range_list2: { {start:KHz(150),end:MHz(1500),modes:WR1500_MODES, low_power:-1,high_power:-1}, - {0,}, }, - tx_range_list: { {0,}, }, - tuning_steps: { {WR1500_MODES,1}, {0,} }, + RIG_FRNG_END, }, + tx_range_list2: { RIG_FRNG_END, }, + tuning_steps: { {WR1500_MODES,1}, RIG_TS_END, }, rig_init: wr_rig_init, /* diff --git a/yaesu/ft747.c b/yaesu/ft747.c index 1d1bdd330..13d9616a9 100644 --- a/yaesu/ft747.c +++ b/yaesu/ft747.c @@ -7,7 +7,7 @@ * box (FIF-232C) or similar * * - * $Id: ft747.c,v 1.4 2001-01-06 06:49:40 javabear Exp $ + * $Id: ft747.c,v 1.5 2001-02-11 23:13:13 f4cfe Exp $ * * * This program is free software; you can redistribute it and/or @@ -126,10 +126,20 @@ static const yaesu_cmd_set_t ncmd[] = { */ const struct rig_caps ft747_caps = { - RIG_MODEL_FT747, "FT-747GX", "Yaesu", "0.1", RIG_STATUS_ALPHA, - RIG_TYPE_MOBILE, RIG_PTT_RIG, 4800, 4800, 8, 2, RIG_PARITY_NONE, - RIG_HANDSHAKE_NONE, FT747_WRITE_DELAY, FT747_POST_WRITE_DELAY, 2000, 0,FT747_FUNC_ALL,0,0,0,20,RIG_TRN_OFF, - { {100000,29999900,FT747_ALL_RX_MODES,-1,-1}, {0,0,0,0,0}, }, /* rx range */ + RIG_MODEL_FT747, "FT-747GX", "Yaesu", "0.1", "GPL?", + RIG_STATUS_ALPHA, RIG_TYPE_MOBILE, + RIG_PTT_RIG, 4800, 4800, 8, 2, RIG_PARITY_NONE, RIG_HANDSHAKE_NONE, + FT747_WRITE_DELAY, FT747_POST_WRITE_DELAY, 2000, 0, + FT747_FUNC_ALL, FT747_FUNC_ALL, RIG_LEVEL_NONE, RIG_LEVEL_NONE, + { RIG_DBLST_END, }, /* FIXME! */ + { RIG_DBLST_END, }, + 9999, + 0, RIG_TRN_OFF, + 20, 0, 0, + + { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ + { RIG_FRNG_END, }, + { {100000,29999900,FT747_ALL_RX_MODES,-1,-1}, RIG_FRNG_END, }, /* rx range */ { {1500000,1999900,FT747_OTHER_TX_MODES,5000,100000}, /* 100W class */ {1500000,1999900,FT747_AM_TX_MODES,2000,25000}, /* 25W class */ @@ -158,7 +168,7 @@ const struct rig_caps ft747_caps = { {28000000,29999900,FT747_OTHER_TX_MODES,5000,100000}, {28000000,29999900,FT747_AM_TX_MODES,2000,25000}, - {0,0,0,0,0} }, + RIG_FRNG_END, }, { {FT747_SSB_CW_RX_MODES,25}, /* fast off */ {FT747_SSB_CW_RX_MODES,2500}, /* fast on */ @@ -169,7 +179,7 @@ const struct rig_caps ft747_caps = { {FT747_FM_RX_MODES,KHz(5)}, /* fast off */ {FT747_FM_RX_MODES,12500}, /* fast on */ - {0,0} + RIG_TS_END, }, ft747_init, ft747_cleanup, diff --git a/yaesu/ft847.c b/yaesu/ft847.c index 63b5dbfef..4ecc01fd5 100644 --- a/yaesu/ft847.c +++ b/yaesu/ft847.c @@ -6,7 +6,7 @@ * via serial interface to an FT-847 using the "CAT" interface. * * - * $Id: ft847.c,v 1.4 2001-01-07 23:02:09 javabear Exp $ + * $Id: ft847.c,v 1.5 2001-02-11 23:13:13 f4cfe Exp $ * * * @@ -183,14 +183,24 @@ static const yaesu_cmd_set_t ncmd[] = { const struct rig_caps ft847_caps = { - RIG_MODEL_FT847, "FT-847", "Yaesu", "0.1", RIG_STATUS_ALPHA, - RIG_TYPE_TRANSCEIVER,RIG_PTT_RIG, 4800, 57600, 8, 2, RIG_PARITY_NONE, - RIG_HANDSHAKE_NONE,FT847_WRITE_DELAY ,FT847_POST_WRITE_DELAY, 100, 0, FT847_FUNC_ALL, 0, 0, 1, 78, RIG_TRN_OFF, + RIG_MODEL_FT847, "FT-847", "Yaesu", "0.1", "GPL?", + RIG_STATUS_ALPHA, RIG_TYPE_TRANSCEIVER, + RIG_PTT_RIG, 4800, 57600, 8, 2, RIG_PARITY_NONE, RIG_HANDSHAKE_NONE, + FT847_WRITE_DELAY, FT847_POST_WRITE_DELAY, 100, 0, + RIG_FUNC_NONE, FT847_FUNC_ALL, RIG_LEVEL_NONE, RIG_LEVEL_NONE, + { RIG_DBLST_END, }, /* FIXME! */ + { RIG_DBLST_END, }, + 9999, + 1, RIG_TRN_OFF, + 78, 0, 0, + + { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ + { RIG_FRNG_END, }, { {100000,76000000,FT847_ALL_RX_MODES,-1,-1}, /* rx range begin */ {108000000,174000000,FT847_ALL_RX_MODES,-1,-1}, {420000000,512000000,FT847_ALL_RX_MODES,-1,-1}, - {0,0,0,0,0}, }, /* rx range end */ + RIG_FRNG_END, }, /* rx range end */ { {1800000,1999999,FT847_OTHER_TX_MODES,5000,100000}, /* 5-100W class */ {1800000,1999999,FT847_AM_TX_MODES,1000,25000}, /* 1-5W class */ @@ -228,7 +238,7 @@ const struct rig_caps ft847_caps = { {430000000,44000000,FT847_OTHER_TX_MODES,1000,50000}, /* check range */ {430000000,440000000,FT847_AM_TX_MODES,1000,12500}, - {0,0,0,0,0} }, + RIG_FRNG_END, }, { {FT847_SSB_CW_RX_MODES,1}, /* normal */ {FT847_SSB_CW_RX_MODES,10}, /* fast */ @@ -238,7 +248,7 @@ const struct rig_caps ft847_caps = { {FT847_AM_FM_RX_MODES,10}, /* normal */ {FT847_AM_FM_RX_MODES,100}, /* fast */ - {0,0}, + RIG_TS_END, }, ft847_init, ft847_cleanup,