diff --git a/Makefile.am b/Makefile.am index 44b1f175d..b5ebaaf51 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,19 +14,16 @@ doc_DATA = ChangeLog COPYING COPYING.LIB LICENSE \ SUBDIRS = macros include lib \ $(BACKEND_LIST) \ + $(RIG_BACKEND_LIST) \ $(ROT_BACKEND_LIST) \ $(AMP_BACKEND_LIST) \ src \ $(BINDINGS) \ tests doc -## Static list of distributed directories. $(BACKEND_LIST) is dynamically -## assigned by 'configure' so list rig backends statically. -DIST_SUBDIRS = macros include lib src c++ bindings tests doc android scripts\ - adat alinco aor barrett drake dorji dummy elad flexradio icom icmarine jrc\ - kachina kenwood kit lowe pcr prm80 racal rft rs skanti tapr tentec\ - tuner uniden wj yaesu winradio\ - $(ROT_BACKEND_LIST) $(AMP_BACKEND_LIST) +## Static list of distributed directories. +DIST_SUBDIRS = macros include lib src c++ bindings tests doc android scripts \ + $(BACKEND_LIST) $(RIG_BACKEND_LIST) $(ROT_BACKEND_LIST) $(AMP_BACKEND_LIST) # Install any third party macros into our tree for distribution ACLOCAL_AMFLAGS = -I macros --install diff --git a/NEWS b/NEWS index 1b43c3842..9ae6a6253 100644 --- a/NEWS +++ b/NEWS @@ -6,7 +6,7 @@ Copyright (C) 2000-2018 Stephane Fillod, and others Please send Hamlib bug reports to hamlib-developer@lists.sourceforge.net Version 4.0 - 2019-??-?? + 2020-??-?? * API/ABI changes, advance ABI to 4 0 0. * Add GPIO and GPION options for DCD. Jeroen Vreeken * New backend: ELAD FDM DUO. Giovanni, HB9EIK. @@ -15,6 +15,9 @@ Version 4.0 * New utility: rigctlcom. Mike, W9MDB * New model: FT847UNI for unidirectional early serial numbers. Mike, W9MDB * Remove GNU Texinfo files and build system dependency. + * Fix a lot of static code analysis errors and warnings. Mike, W9MDB + * Rearrange directory structure to put rigs and rotators sources + under their own subdirectories. Mike, W9MDB Version 3.3 2018-08-12 diff --git a/README.developer b/README.developer index 40989368a..f94cf53db 100644 --- a/README.developer +++ b/README.developer @@ -38,75 +38,89 @@ utility), and USB. Other connectivity will follow afterwards. General Guidelines. ------------------- -0. The top level directory looks like this as of 07 May 2013 -(Note, it has grown considerably). +0. The top level directory looks like this as of 2020-01-18 $ tree -d -I .git . -├── adat -├── alinco -├── amsat +├── amplifiers +│   └── elecraft ├── android -├── aor -├── ars +├── autom4te.cache ├── bindings +├── build-aux ├── c++ -├── celestron ├── doc -├── drake +│   ├── man1 +│   └── man7 ├── dummy -├── easycomm -├── flexradio -├── fodtrack -├── gnuradio -├── gs232a -├── heathkit -├── icom +├── extra +│   ├── gnuradio +│   └── kylix +│   └── tests ├── include -│ └── hamlib -├── jrc -├── kachina -├── kenwood -├── kit -├── kylix -│ └── tests +│   └── hamlib ├── lib -├── lowe -├── m2 ├── macros -├── microtune -├── miniVNA -├── pcr ├── perl -├── prm80 -├── racal -├── rft -├── rotorez -├── rs -├── sartek +├── rigs +│   ├── adat +│   ├── alinco +│   ├── aor +│   ├── barrett +│   ├── dorji +│   ├── drake +│   ├── elad +│   ├── flexradio +│   ├── icmarine +│   ├── icom +│   ├── jrc +│   ├── kachina +│   ├── kenwood +│   ├── kit +│   ├── lowe +│   ├── pcr +│   ├── prm80 +│   ├── racal +│   ├── rft +│   ├── rs +│   ├── skanti +│   ├── tapr +│   ├── tentec +│   ├── tuner +│   ├── uniden +│   ├── winradio +│   │   └── linradio +│   ├── wj +│   └── yaesu +├── rotators +│   ├── amsat +│   ├── ars +│   ├── celestron +│   ├── cnctrk +│   ├── easycomm +│   ├── ether6 +│   ├── fodtrack +│   ├── gs232a +│   ├── heathkit +│   ├── ioptron +│   ├── m2 +│   ├── meade +│   ├── prosistel +│   ├── rotorez +│   ├── sartek +│   ├── spid +│   └── ts7400 +│   └── include ├── scripts -├── skanti -├── spid ├── src -├── tapr -├── tentec -├── tests -│ ├── config -│ ├── rigctl.test -│ ├── testbcd.test -│ ├── testfreq.test -│ └── testloc.test -├── ts7400 -│ └── include -├── tuner -├── uniden -├── winradio -│ └── linradio -├── wj -└── yaesu - -61 directories +└── tests + ├── config + ├── rigctl.test + ├── testbcd.test + ├── testfreq.test + └── testloc.test +77 directories 1. Building diff --git a/configure.ac b/configure.ac index 7646bf2d9..a7f043788 100644 --- a/configure.ac +++ b/configure.ac @@ -51,8 +51,9 @@ dnl added to AC_CONFIG_FILES near the end of this file. See README.developer dnl Beware of duplication should a backend directory include both rig and dnl rotor definitions, e.g. "dummy". Optional backends will not be listed dnl here but will be added later, e.g. "winradio". -BACKEND_LIST="adat alinco aor barrett dorji drake dummy elad flexradio icom icmarine jrc kachina kenwood kit lowe pcr prm80 racal rft rs skanti tapr tentec tuner uniden wj yaesu" -ROT_BACKEND_LIST="amsat ars celestron cnctrk easycomm ether6 fodtrack gs232a heathkit m2 meade rotorez sartek spid ts7400 prosistel ioptron" +BACKEND_LIST="dummy" +RIG_BACKEND_LIST="rigs/adat rigs/alinco rigs/aor rigs/barrett rigs/dorji rigs/drake rigs/elad rigs/flexradio rigs/icom rigs/icmarine rigs/jrc rigs/kachina rigs/kenwood rigs/kit rigs/lowe rigs/pcr rigs/prm80 rigs/racal rigs/rft rigs/rs rigs/skanti rigs/tapr rigs/tentec rigs/tuner rigs/uniden rigs/winradio rigs/wj rigs/yaesu" +ROT_BACKEND_LIST="rotators/amsat rotators/ars rotators/celestron rotators/cnctrk rotators/easycomm rotators/ether6 rotators/fodtrack rotators/gs232a rotators/heathkit rotators/m2 rotators/meade rotators/rotorez rotators/sartek rotators/spid rotators/ts7400 rotators/prosistel rotators/ioptron" # Amplifiers are all in the amplifiers directory AMP_BACKEND_LIST="amplifiers/elecraft" @@ -653,7 +654,7 @@ AC_MSG_RESULT([$cf_with_winradio]) DL_LIBS="" AS_IF([test x"${cf_with_winradio}" = "xyes"], - [BACKEND_LIST="$BACKEND_LIST winradio" + [RIGS_BACKEND_LIST="$RIGS_BACKEND_LIST rigs/winradio" dnl Check for libdl and set DL_LIBS if found--used for linradio WR-G313 backend. AC_CHECK_LIB([dl], [dlopen], [DL_LIBS="-ldl"], [AC_MSG_WARN([dlopen was not found in libdl--linradio backend will be disabled])]) @@ -704,6 +705,10 @@ AM_CONDITIONAL([HAVE_USRP], [test x"${cf_with_usrp}" = "xyes"]) dnl otherwise parallel 'make -jn' will fail +## ---------------------------------- ## +## Prepare toplevel backend dependencies ## +## ---------------------------------- ## + for be in ${BACKEND_LIST} ; do BACKENDEPS="${BACKENDEPS} \$(top_builddir)/${be}/libhamlib-${be}.la" done @@ -711,6 +716,18 @@ done AC_SUBST([BACKEND_LIST]) AC_SUBST([BACKENDEPS]) +## ---------------------------------- ## +## Prepare rig backend dependencies ## +## ---------------------------------- ## + +for be in ${RIG_BACKEND_LIST} ; do + RIGDIR=`echo $be | awk -F "/" '{print $2}'` + RIG_BACKENDEPS="${RIG_BACKENDEPS} \$(top_builddir)/rigs/${RIGDIR}/libhamlib-${RIGDIR}.la" +done + +AC_SUBST([RIG_BACKEND_LIST]) +AC_SUBST([RIG_BACKENDEPS]) + ## ---------------------------------- ## ## Prepare rotor backend dependencies ## @@ -719,7 +736,8 @@ AC_SUBST([BACKENDEPS]) # otherwise parallel 'make -jn' will fail for be in ${ROT_BACKEND_LIST} ; do - ROT_BACKENDEPS="${ROT_BACKENDEPS} \$(top_builddir)/${be}/libhamlib-${be}.la" + ROTDIR=`echo $be | awk -F "/" '{print $2}'` + ROT_BACKENDEPS="${ROT_BACKENDEPS} \$(top_builddir)/rotators/${ROTDIR}/libhamlib-${ROTDIR}.la" done AC_SUBST([ROT_BACKEND_LIST]) @@ -756,59 +774,59 @@ macros/Makefile include/Makefile lib/Makefile dummy/Makefile -elad/Makefile -yaesu/Makefile -icom/Makefile -icmarine/Makefile -aor/Makefile -kenwood/Makefile -winradio/Makefile -pcr/Makefile -alinco/Makefile -uniden/Makefile -tentec/Makefile -kachina/Makefile -jrc/Makefile -drake/Makefile -lowe/Makefile -rft/Makefile -rs/Makefile -kit/Makefile -tapr/Makefile -skanti/Makefile -prm80/Makefile -wj/Makefile -racal/Makefile -tuner/Makefile -ars/Makefile -easycomm/Makefile -fodtrack/Makefile -gs232a/Makefile -heathkit/Makefile -spid/Makefile -sartek/Makefile src/Makefile c++/Makefile bindings/Makefile -tests/Makefile doc/Makefile doc/hamlib.cfg -rotorez/Makefile -flexradio/Makefile -m2/Makefile -amsat/Makefile -adat/Makefile -ts7400/Makefile -celestron/Makefile -cnctrk/Makefile -ether6/Makefile +rotators/amsat/Makefile +rotators/ars/Makefile +rotators/celestron/Makefile +rotators/cnctrk/Makefile +rotators/easycomm/Makefile +rotators/ether6/Makefile +rotators/fodtrack/Makefile +rotators/gs232a/Makefile +rotators/heathkit/Makefile +rotators/ioptron/Makefile +rotators/m2/Makefile +rotators/meade/Makefile +rotators/prosistel/Makefile +rotators/rotorez/Makefile +rotators/sartek/Makefile +rotators/spid/Makefile +rotators/ts7400/Makefile +rigs/adat/Makefile +rigs/alinco/Makefile +rigs/aor/Makefile +rigs/barrett/Makefile +rigs/dorji/Makefile +rigs/drake/Makefile +rigs/elad/Makefile +rigs/flexradio/Makefile +rigs/icmarine/Makefile +rigs/icom/Makefile +rigs/jrc/Makefile +rigs/kachina/Makefile +rigs/kenwood/Makefile +rigs/kit/Makefile +rigs/lowe/Makefile +rigs/pcr/Makefile +rigs/prm80/Makefile +rigs/racal/Makefile +rigs/rft/Makefile +rigs/rs/Makefile +rigs/skanti/Makefile +rigs/tapr/Makefile +rigs/tentec/Makefile +rigs/tuner/Makefile +rigs/uniden/Makefile +rigs/winradio/Makefile +rigs/wj/Makefile +rigs/yaesu/Makefile +tests/Makefile scripts/Makefile android/Makefile -prosistel/Makefile -dorji/Makefile -barrett/Makefile -meade/Makefile -ioptron/Makefile amplifiers/elecraft/Makefile hamlib.pc ]) diff --git a/cppcheck.sh b/cppcheck.sh index 9834a08da..c8028fb9e 100755 --- a/cppcheck.sh +++ b/cppcheck.sh @@ -6,6 +6,6 @@ echo "As of cppcheck v1.90 should be one message about missing include files" echo "This takes several minutes to run" # We do suppress some errors which are expected or other code # There are quite a few C++ items to take care of still if anybody cares -SUPPRESS="-i bindings -i lib/getopt.c -i lib/getopt_long.c --suppress=*:gnuradio/demod.h --suppress=*:gnuradio/HrAGC.h --suppress=*:gnuradio/nfm.h --suppress=*:gnuradio/am.h --suppress=*:gnuradio/ssb.h --suppress=*:gnuradio/wfm.h --suppress=*:gnuradio/wfm.h --suppress=*:microtune/i2c.h --suppress=*:microtune/i2cio.h --suppress=*:microtune/i2cio_pp.h --suppress=*:microtune/microtune_4702.h --suppress=*:microtune/microtune_4937.h --suppress=*:microtune/microtune_eval_board.h -i microtune/microtune_eval_board.cc --suppress=*:gnuradio/HrAGC.h --suppress=knownConditionTrueFalse:tests/rotctl.c --suppress=knownConditionTrueFalse:tests/rigctl.c --suppress=knownConditionTrueFalse:tests/ampctl.c --suppress=knownConditionTrueFalse:tests/rotctl_parse.c --suppress=knownConditionTrueFalse:tests/rigctl_parse.c --suppress=knownConditionTrueFalse:tests/ampctl_parse.c" +SUPPRESS="-i bindings -i lib/getopt.c -i lib/getopt_long.c --suppress=*:extra/gnuradio/demod.h --suppress=*:extra/gnuradio/HrAGC.h --suppress=*:extra/gnuradio/nfm.h --suppress=*:extra/gnuradio/am.h --suppress=*:extra/gnuradio/ssb.h --suppress=*:extra/gnuradio/wfm.h --suppress=*:extra/gnuradio/wfm.h --suppress=*:extra/gnuradio/HrAGC.h --suppress=knownConditionTrueFalse:tests/rotctl.c --suppress=knownConditionTrueFalse:tests/rigctl.c --suppress=knownConditionTrueFalse:tests/ampctl.c --suppress=knownConditionTrueFalse:tests/rotctl_parse.c --suppress=knownConditionTrueFalse:tests/rigctl_parse.c --suppress=knownConditionTrueFalse:tests/ampctl_parse.c" CHECK="-D RIG_LEVEL_LINEOUT=1 -D SIGPIPE -D SIGINT -D IPV6_V6ONLY -D RIG_MODE_WFM -D ABI_VERSION=4 -D F_SETSIG=1 -U O_ASYNC -U SA_SIGINFO -U HASH_BLOOM -U HASH_EMIT_KEYS -U HASH_FUNCTION -U __USEP5P6__" cppcheck -q --force --enable=all --std=c99 $SUPPRESS $CHECK . &>cppcheck.log diff --git a/dummy/flrig.c b/dummy/flrig.c index 5aae7711c..b59186629 100644 --- a/dummy/flrig.c +++ b/dummy/flrig.c @@ -869,8 +869,6 @@ static int flrig_close(RIG *rig) { rig_debug(RIG_DEBUG_TRACE, "%s\n", __func__); - if (rig->state.priv) { free(rig->state.priv); } - return RIG_OK; } @@ -892,7 +890,12 @@ static int flrig_cleanup(RIG *rig) for (i = 0; modeMap[i].mode_hamlib != 0; ++i) { - if (modeMap[i].mode_flrig) { free(modeMap[i].mode_flrig); } + if (modeMap[i].mode_flrig) + { + free(modeMap[i].mode_flrig); + modeMap[i].mode_flrig = NULL; + } + } return RIG_OK; diff --git a/gnuradio/HrAGC.h b/extra/gnuradio/HrAGC.h similarity index 100% rename from gnuradio/HrAGC.h rename to extra/gnuradio/HrAGC.h diff --git a/gnuradio/Makefile.am b/extra/gnuradio/Makefile.am similarity index 100% rename from gnuradio/Makefile.am rename to extra/gnuradio/Makefile.am diff --git a/gnuradio/am.h b/extra/gnuradio/am.h similarity index 100% rename from gnuradio/am.h rename to extra/gnuradio/am.h diff --git a/gnuradio/demod.h b/extra/gnuradio/demod.h similarity index 100% rename from gnuradio/demod.h rename to extra/gnuradio/demod.h diff --git a/gnuradio/gnuradio.cc b/extra/gnuradio/gnuradio.cc similarity index 100% rename from gnuradio/gnuradio.cc rename to extra/gnuradio/gnuradio.cc diff --git a/gnuradio/gnuradio.h b/extra/gnuradio/gnuradio.h similarity index 100% rename from gnuradio/gnuradio.h rename to extra/gnuradio/gnuradio.h diff --git a/gnuradio/gr.c b/extra/gnuradio/gr.c similarity index 100% rename from gnuradio/gr.c rename to extra/gnuradio/gr.c diff --git a/gnuradio/gr_priv.h b/extra/gnuradio/gr_priv.h similarity index 100% rename from gnuradio/gr_priv.h rename to extra/gnuradio/gr_priv.h diff --git a/gnuradio/graudio.c b/extra/gnuradio/graudio.c similarity index 100% rename from gnuradio/graudio.c rename to extra/gnuradio/graudio.c diff --git a/gnuradio/mc4020.c b/extra/gnuradio/mc4020.c similarity index 100% rename from gnuradio/mc4020.c rename to extra/gnuradio/mc4020.c diff --git a/gnuradio/nfm.h b/extra/gnuradio/nfm.h similarity index 100% rename from gnuradio/nfm.h rename to extra/gnuradio/nfm.h diff --git a/gnuradio/ssb.h b/extra/gnuradio/ssb.h similarity index 100% rename from gnuradio/ssb.h rename to extra/gnuradio/ssb.h diff --git a/gnuradio/testgr.cc b/extra/gnuradio/testgr.cc similarity index 100% rename from gnuradio/testgr.cc rename to extra/gnuradio/testgr.cc diff --git a/gnuradio/wfm.h b/extra/gnuradio/wfm.h similarity index 100% rename from gnuradio/wfm.h rename to extra/gnuradio/wfm.h diff --git a/kylix/HamlibComponents.pas b/extra/kylix/HamlibComponents.pas similarity index 100% rename from kylix/HamlibComponents.pas rename to extra/kylix/HamlibComponents.pas diff --git a/kylix/Makefile.am b/extra/kylix/Makefile.am similarity index 100% rename from kylix/Makefile.am rename to extra/kylix/Makefile.am diff --git a/kylix/README b/extra/kylix/README similarity index 100% rename from kylix/README rename to extra/kylix/README diff --git a/kylix/hamlib_rigapi.pas b/extra/kylix/hamlib_rigapi.pas similarity index 100% rename from kylix/hamlib_rigapi.pas rename to extra/kylix/hamlib_rigapi.pas diff --git a/kylix/hamlib_rotapi.pas b/extra/kylix/hamlib_rotapi.pas similarity index 100% rename from kylix/hamlib_rotapi.pas rename to extra/kylix/hamlib_rotapi.pas diff --git a/kylix/tests/DemoProject.dpr b/extra/kylix/tests/DemoProject.dpr similarity index 100% rename from kylix/tests/DemoProject.dpr rename to extra/kylix/tests/DemoProject.dpr diff --git a/kylix/tests/DemoProject.res b/extra/kylix/tests/DemoProject.res similarity index 100% rename from kylix/tests/DemoProject.res rename to extra/kylix/tests/DemoProject.res diff --git a/kylix/tests/HamlibRadioForm.pas b/extra/kylix/tests/HamlibRadioForm.pas similarity index 100% rename from kylix/tests/HamlibRadioForm.pas rename to extra/kylix/tests/HamlibRadioForm.pas diff --git a/kylix/tests/HamlibRadioForm.xfm b/extra/kylix/tests/HamlibRadioForm.xfm similarity index 100% rename from kylix/tests/HamlibRadioForm.xfm rename to extra/kylix/tests/HamlibRadioForm.xfm diff --git a/kylix/tests/HamlibSelectionDlg.pas b/extra/kylix/tests/HamlibSelectionDlg.pas similarity index 100% rename from kylix/tests/HamlibSelectionDlg.pas rename to extra/kylix/tests/HamlibSelectionDlg.pas diff --git a/kylix/tests/HamlibSelectionDlg.xfm b/extra/kylix/tests/HamlibSelectionDlg.xfm similarity index 100% rename from kylix/tests/HamlibSelectionDlg.xfm rename to extra/kylix/tests/HamlibSelectionDlg.xfm diff --git a/kylix/tests/TestForm.pas b/extra/kylix/tests/TestForm.pas similarity index 100% rename from kylix/tests/TestForm.pas rename to extra/kylix/tests/TestForm.pas diff --git a/kylix/tests/TestForm.xfm b/extra/kylix/tests/TestForm.xfm similarity index 100% rename from kylix/tests/TestForm.xfm rename to extra/kylix/tests/TestForm.xfm diff --git a/microtune/Makefile.am b/microtune/Makefile.am deleted file mode 100644 index 6295dc790..000000000 --- a/microtune/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright 2001 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - -MTSRC = module_4937.c module_4702.c - -GRIO_SOURCES = \ - i2cio.cc i2cio.h \ - i2cio_pp.cc i2cio_pp.h \ - i2c.cc i2c.h \ - microtune_4937.cc microtune_4937.h \ - microtune_4702.cc microtune_4702.h \ - microtune_eval_board.cc microtune_eval_board.h \ - microtune_eval_board_defs.h - -noinst_LTLIBRARIES = libhamlib-microtune.la -libhamlib_microtune_la_SOURCES = $(MTSRC) $(GRIO_SOURCES) microtune.cc microtune.h -hamlib_microtune_la_LIBADD = -lstdc++ diff --git a/microtune/i2c.cc b/microtune/i2c.cc deleted file mode 100644 index 8d262c610..000000000 --- a/microtune/i2c.cc +++ /dev/null @@ -1,146 +0,0 @@ -/* -*-C++-*- -******************************************************************************* -* -* File: i2c.cc -* Description: generic i2c bus controller -* -******************************************************************************* -*/ - -/* - * Copyright 2001 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "i2c.h" - -i2c::i2c (i2cio *io) -{ - d_io = io; - d_io->lock (); - - stop (); // get bus in known state - - d_io->unlock (); -} - - -// start: -// entry: SCL = 1, SDA = 1 -// exit: SCL = 0, SDA = 0 - -void -i2c::start () -{ - set_sda (1); - set_scl (1); - set_sda (0); // SDA high -> low while SCL high - set_scl (0); -} - - -// stop: -// entry: SCL = X, SDA = X -// exit: SCL = 1, SDA = 1 - -void -i2c::stop () -{ - set_scl (0); - set_sda (0); - set_scl (1); - set_sda (1); // SDA low -> high while SCL high -} - - -// write_bit: -// entry: SCL = 0, SDA = X -// exit: SCL = 0, SDA = X - -void -i2c::write_bit (bool bit) -{ - set_sda (bit); - set_scl (1); - set_scl (0); -} - - -// write_byte: -// entry: SCL = 0, SDA = X -// exit: SCL = 0, SDA = 1 - -bool -i2c::write_byte (char t) -{ - int i; - bool ack_bit; - - for (i = 0; i < 8; i++){ - write_bit (t & 0x80); - t <<= 1; - } - - // clock #9. This is the ACK bit. - - set_sda (1); // tristate SDA - set_scl (1); - ack_bit = get_sda (); // slave should pull SDA line low - set_scl (0); - - return ack_bit == 0; -} - - -// write: the high level entry point... -// entry: SCL = 1, SDA = 1 -// exit: SCL = 1, SDA = 1 - -bool -i2c::write (int addr, const unsigned char *buf, int nbytes) -{ - bool ok = true; - - d_io->lock (); - start (); - ok = write_byte ((addr << 1) | 0); // addr plus "read opcode" - - for (int i = 0; i < nbytes; i++) - ok &= write_byte (buf[i]); - - stop (); - d_io->unlock (); - return ok; -} - - -// read: the high level entry point... -// entry: SCL = 1, SDA = 1 -// exit: SCL = 1, SDA = 1 - -int -i2c::read (int addr, unsigned char *buf, int max_bytes) -{ - d_io->lock (); - - // FIXME - - d_io->unlock (); - return 0; -} diff --git a/microtune/i2c.h b/microtune/i2c.h deleted file mode 100644 index b75bb6c5e..000000000 --- a/microtune/i2c.h +++ /dev/null @@ -1,66 +0,0 @@ -/* -*-C++-*- -******************************************************************************* -* -* File: i2c.h -* Description: -* -******************************************************************************* -*/ - -/* - * Copyright 2001 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef _I2C_H_ -#define _I2C_H_ - -#include "i2cio.h" - -/*! - * \brief class for controlling i2c bus - */ -class i2c { - public: - - /*! i2c does not control lifetime of a_io */ - i2c (i2cio *io); - ~i2c () {}; - - //! \returns true iff successful - bool write (int addr, const unsigned char *buf, int nbytes); - - //! \returns number of bytes read or -1 if error - int read (int addr, unsigned char *buf, int max_bytes); - - -private: - void start (); - void stop (); - void write_bit (bool bit); - bool write_byte (char byte); - - void set_sda (bool bit) { d_io->set_sda (bit); } - void set_scl (bool bit) { d_io->set_scl (bit); } - bool get_sda () { return d_io->get_sda (); } - - i2cio *d_io; -}; - -#endif /* _I2C_H_ */ diff --git a/microtune/i2cio.cc b/microtune/i2cio.cc deleted file mode 100644 index b89718e19..000000000 --- a/microtune/i2cio.cc +++ /dev/null @@ -1,33 +0,0 @@ -/* -*-C++-*- -******************************************************************************* -* -* File: i2cio.cc -* Description: -* -******************************************************************************* -*/ - -/* - * Copyright 2001 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "i2cio.h" - -i2cio::~i2cio(){} diff --git a/microtune/i2cio.h b/microtune/i2cio.h deleted file mode 100644 index 889844752..000000000 --- a/microtune/i2cio.h +++ /dev/null @@ -1,71 +0,0 @@ -/* -*-C++-*- -******************************************************************************* -* -* File: i2cio.h -* Description: -* -******************************************************************************* -*/ - -/* - * Copyright 2001 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef _I2CIO_H_ -#define _I2CIO_H_ - -/*! - * \brief abstract class that implements low level i/o for i2c bus. - */ -class i2cio { - public: - - i2cio () : - udelay_scl_lo(0), udelay_scl_hi(0), - udelay_sda_lo(0), udelay_sda_hi(0) {}; - - virtual ~i2cio (); - - virtual void set_scl (bool state) = 0; - virtual void set_sda (bool state) = 0; - virtual bool get_sda () = 0; - - void set_udelay_scl_lo (int usecs) { udelay_scl_lo = usecs; } - void set_udelay_scl_hi (int usecs) { udelay_scl_hi = usecs; } - void set_udelay_sda_lo (int usecs) { udelay_sda_lo = usecs; } - void set_udelay_sda_hi (int usecs) { udelay_sda_hi = usecs; } - - int get_udelay_scl_lo () { return udelay_scl_lo; } - int get_udelay_scl_hi () { return udelay_scl_hi; } - int get_udelay_sda_lo () { return udelay_sda_lo; } - int get_udelay_sda_hi () { return udelay_sda_hi; } - - virtual void lock () = 0; - virtual void unlock () = 0; - - private: - int udelay_scl_lo; - int udelay_scl_hi; - int udelay_sda_lo; - int udelay_sda_hi; -}; - - -#endif /* _I2CIO_H_ */ diff --git a/microtune/i2cio_pp.cc b/microtune/i2cio_pp.cc deleted file mode 100644 index aedf58f0a..000000000 --- a/microtune/i2cio_pp.cc +++ /dev/null @@ -1,94 +0,0 @@ -/* -*-C++-*- -******************************************************************************* -* -* File: i2cio_pp.cc -* Description: -* -******************************************************************************* -*/ - -/* - * Copyright 2001 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "i2cio_pp.h" -#include "microtune_eval_board_defs.h" - -i2cio_pp::i2cio_pp (hamlib_port_t *pp) -{ - unsigned char r; - d_pp = pp; - par_lock (d_pp); - par_read_control (d_pp, &r); - par_write_control (d_pp, r & ~UT_CP_MUST_BE_ZERO); // output, no interrupts - par_unlock (d_pp); -} - -void -i2cio_pp::set_scl (bool state) -{ - unsigned char r; - par_read_control(d_pp, &r); - - if (!state){ // active low - par_write_control (d_pp, r | UT_CP_TUNER_SCL); - } - else { - par_write_control (d_pp, r & ~UT_CP_TUNER_SCL); - } - par_read_control (d_pp, &r); // use for 1us delay - par_read_control (d_pp, &r); // use for 1us delay -} - -void -i2cio_pp::set_sda (bool state) -{ - unsigned char r; - par_read_data (d_pp, &r); - - if (!state){ // active low - par_write_data (d_pp, r | UT_DP_TUNER_SDA_OUT); - } - else { - par_write_data (d_pp, r & ~UT_DP_TUNER_SDA_OUT); - } - par_read_data (d_pp, &r); // use for 1us delay - par_read_data (d_pp, &r); // use for 1us delay -} - -bool -i2cio_pp::get_sda () -{ - unsigned char r; - par_read_status (d_pp, &r); - return (r & UT_SP_TUNER_SDA_IN) == 0; // eval board has an inverter on it -} - -void -i2cio_pp::lock () -{ - par_lock (d_pp); -} - -void -i2cio_pp::unlock () -{ - par_unlock (d_pp); -} diff --git a/microtune/i2cio_pp.h b/microtune/i2cio_pp.h deleted file mode 100644 index 771a82225..000000000 --- a/microtune/i2cio_pp.h +++ /dev/null @@ -1,56 +0,0 @@ -/* -*-C-*- -******************************************************************************* -* -* File: i2cio_pp.h -* Description: i2cio class for parallel port -* -******************************************************************************* -*/ - -/* - * Copyright 2001 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef _I2CIO_PP_H_ -#define _I2CIO_PP_H_ - -#include "i2cio.h" -#include "parallel.h" - -/*! - * \brief concrete class that implements low level i/o for i2c bus using parallel port - */ -class i2cio_pp : public i2cio { - public: - - i2cio_pp (hamlib_port_t *a_pp); - - virtual void set_scl (bool state); - virtual void set_sda (bool state); - virtual bool get_sda (); - - virtual void lock (); - virtual void unlock (); - - private: - hamlib_port_t *d_pp; -}; - -#endif /* _I2CIO_PP_H_ */ diff --git a/microtune/microtune.cc b/microtune/microtune.cc deleted file mode 100644 index a77c69fa3..000000000 --- a/microtune/microtune.cc +++ /dev/null @@ -1,192 +0,0 @@ -/* - * Hamlib Microtune backend - main file - * Copyright (c) 2003 by Stephane Fillod - * - * - * This library is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include - -#include - -#include "register.h" - -#include "microtune.h" -#include "microtune_eval_board.h" - -#include "microtune_4937.h" -#include "microtune_4702.h" - -/* - * TODO: allow these to be modifiable through rig_set_conf - int i2c_addr; - int reference_divider; - bool fast_tuning_p; if set, higher charge pump current: - faster tuning, worse phase noise - for distance < 10kHz to the carrier - */ - -struct microtune_priv_data { - microtune_eval_board *board; - freq_t actual_freq; -}; - -/* - * TODO: - * - status iff PLL is locked - * - returns the output frequency of the tuner in Hz (->5.75e6) //3x7702. - * or 36.00e6 - */ - -int microtune_init(RIG *rig) -{ - struct microtune_priv_data *priv; - - rig->state.priv = (struct microtune_priv_data*)malloc(sizeof(struct microtune_priv_data)); - if (!rig->state.priv) { - /* whoops! memory shortage! */ - return -RIG_ENOMEM; - } - priv = rig->state.priv; - - priv->actual_freq = RIG_FREQ_NONE; - - - return RIG_OK; -} - -int module_4937_open(RIG *rig) -{ - struct microtune_priv_data *priv = (struct microtune_priv_data *)rig->state.priv; - - priv->board = new microtune_4937(&rig->state.rigport); - if (!priv->board) { - return -RIG_ENOMEM; - } - - if (!priv->board->board_present_p()) { - rig_debug(RIG_DEBUG_WARN, "microtune: eval board is NOT present\n"); - delete priv->board; - return -RIG_EPROTO; - } - - return RIG_OK; -} - -int module_4702_open(RIG *rig) -{ - struct microtune_priv_data *priv = (struct microtune_priv_data *)rig->state.priv; - - priv->board = new microtune_4702(&rig->state.rigport); - if (!priv->board) { - return -RIG_ENOMEM; - } - - if (!priv->board->board_present_p()) { - rig_debug(RIG_DEBUG_WARN, "microtune: eval board is NOT present\n"); - delete priv->board; - return -RIG_EPROTO; - } - - return RIG_OK; -} - -int microtune_close(RIG *rig) -{ - struct microtune_priv_data *priv = (struct microtune_priv_data *)rig->state.priv; - - delete priv->board; - - return RIG_OK; -} - -int microtune_cleanup(RIG *rig) -{ - struct microtune_priv_data *priv = (struct microtune_priv_data *)rig->state.priv; - - if (priv) { - free(priv); - } - rig->state.priv = NULL; - - return RIG_OK; -} - -/* - * It takes about 100 ms for the PLL to settle. - */ -int microtune_set_freq(RIG *rig, vfo_t vfo, freq_t freq) -{ - double actual_freq; - bool status; - - struct microtune_priv_data *priv = (struct microtune_priv_data *)rig->state.priv; - - status = priv->board->set_RF_freq((double)freq, &actual_freq); - - if (!status) - return -RIG_EIO; - - priv->actual_freq = (freq_t)actual_freq; - return RIG_OK; -} - - -int microtune_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) -{ - struct microtune_priv_data *priv = (struct microtune_priv_data *)rig->state.priv; - - *freq = priv->actual_freq; - - return RIG_OK; -} - - -/* - * Assumes rig!=NULL, rig->state.priv!=NULL - */ -int microtune_set_ext_level(RIG *rig, vfo_t vfo, token_t token, value_t val) -{ - struct microtune_priv_data *priv = (struct microtune_priv_data *)rig->state.priv; - - switch(token) { - case TOK_AGCGAIN: - priv->board->set_AGC(val.f*1000); - break; - default: - return -RIG_EINVAL; - } - return RIG_OK; -} - - - - -DECLARE_INITRIG_BACKEND(microtune) -{ - rig_debug(RIG_DEBUG_VERBOSE, "microtune: _init called\n"); - - rig_register(&module_4937_caps); - rig_register(&module_4702_caps); - - return RIG_OK; -} diff --git a/microtune/microtune.h b/microtune/microtune.h deleted file mode 100644 index 200852b6f..000000000 --- a/microtune/microtune.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Hamlib Microtune backend - main header - * Copyright (c) 2001-2003 by Stephane Fillod - * - * - * This library is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - */ - -#ifndef _MICRTOUNE_H -#define _MICRTOUNE_H 1 - -#include -#include - -__BEGIN_DECLS - -#define TOK_AGCGAIN TOKEN_BACKEND(1) - - -int microtune_init(RIG *rig); -int microtune_cleanup(RIG *rig); -int module_4937_open(RIG *rig); -int module_4702_open(RIG *rig); -int microtune_close(RIG *rig); -int microtune_set_freq(RIG *rig, vfo_t vfo, freq_t freq); -int microtune_get_freq(RIG *rig, vfo_t vfo, freq_t *freq); -int microtune_set_ext_level(RIG *rig, vfo_t vfo, token_t token, value_t val); - - -extern const struct rig_caps module_4937_caps; -extern const struct rig_caps module_4702_caps; - - -__END_DECLS - -#endif /* _MICRTOUNE_H */ diff --git a/microtune/microtune_4702.cc b/microtune/microtune_4702.cc deleted file mode 100644 index 25ce36e4e..000000000 --- a/microtune/microtune_4702.cc +++ /dev/null @@ -1,177 +0,0 @@ -/* -*- c++-*- */ -/* - * Copyright 2001,2003 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "microtune_4702.h" -#include -#include - -static const double first_IF = 36.00e6; - -// The tuner internally has 3 bands: VHF Low, VHF High & UHF. -// These are the recommened boundaries -static const double VHF_High_takeover = 174e6; -static const double UHF_takeover = 470e6; - -static int PLL_I2C_ADDR = 0x60; - -static unsigned char -control_byte_1 (bool prescaler, int reference_divisor) -{ - int c = 0x80; - //Note: Last two divider bits (bits 2 and 3 of this byte) determined later - if (prescaler) - c |= 0x10; - - switch (reference_divisor){ - case 2: - c |= 0x00; break; - case 4: - c |= 0x01; break; - case 8: - c |= 0x02; break; - case 16: - c |= 0x03; break; - case 32: - c |= 0x04; break; - case 64: - c |= 0x05; break; - case 128: - c |= 0x06; break; - case 256: - c |= 0x07; break; - case 24: - c |= 0x08; break; - case 5: - c |= 0x09; break; - case 10: - c |= 0x0A; break; - case 20: - c |= 0x0B; break; - case 40: - c |= 0x0C; break; - case 80: - c |= 0x0D; break; - case 160: - c |= 0x0E; break; - case 320: - c |= 0x0F; break; - default: - abort (); - } - return c; -} - -static unsigned char -control_byte_2 (double target_freq) -{ - int c; - - if (target_freq < VHF_High_takeover) // VHF low - c = 0x8E; - else if (target_freq < UHF_takeover) // VHF high - { - c = 0x05; - if (target_freq < 390e6) - c |= 0x40; - else - c |= 0x80; - } - else - { // UHF - c = 0x03; - if (target_freq < 750e6) - c |= 0x80; - else - c |= 0xC0; - } - - return c; -} - - -/*! - * \brief select RF frequency to be tuned to output frequency. - * \p target_freq is the requested frequency in Hz, \p actual_freq - * is set to the actual frequency tuned. It takes about 100 ms - * for the PLL to settle. - * - * \returns true iff sucessful. - */ -bool -microtune_4702::set_RF_freq (double target_freq, double *p_actual_freq) -{ - unsigned char buf[4]; - - double target_f_osc = target_freq + first_IF; - - double f_ref = 4e6 / d_reference_divider; - - //int divisor = (int) ((target_f_osc + (f_ref * 4)) / (f_ref * 8)); - - long int divisor = (long int) (target_f_osc / f_ref); - double actual_freq = (f_ref * divisor) - first_IF; - if (p_actual_freq != 0) - *p_actual_freq = actual_freq; - - if ((divisor & ~0x1ffff) != 0) // >17 bit divisor - return false; - - buf[0] = ((divisor & 0x07f00) >> 8) & 0xff; // DB1 - buf[1] = divisor & 0xff; // DB2 - buf[2] = control_byte_1 (prescaler, d_reference_divider); - buf[2] = (buf[2]|(((divisor & 0x18000) >> 10)) & 0xff); - buf[3] = control_byte_2 (target_freq); - - printf ("%x\n", PLL_I2C_ADDR); -//#if 0 - printf ("set_RF_freq: target: %g MHz actual: %g MHz %02x %02x %02x %02x\n", - target_freq/1e6, actual_freq/1e6, buf[0], buf[1], buf[2], buf[3]); -//#endif - - return i2c_write (PLL_I2C_ADDR, buf, sizeof (buf)); -} - - -bool -microtune_4702::read_info (unsigned char* buf) -{ - return i2c_write (PLL_I2C_ADDR, buf, 2); -} - -/*! - * \returns true iff PLL is locked - */ -bool -microtune_4702::pll_locked_p () -{ - // FIXME - return true; -} - -/*! - * \returns the output frequency of the tuner in Hz. - */ -double -microtune_4702::get_output_freq () -{ - return 36.00e6; -} diff --git a/microtune/microtune_4702.h b/microtune/microtune_4702.h deleted file mode 100644 index f2f282717..000000000 --- a/microtune/microtune_4702.h +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2001,2003 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef _MICROTUNE_4702_H_ -#define _MICROTUNE_4702_H_ - -#include -#include "microtune_eval_board.h" - -/*! - * \brief abstract class for controlling microtune 4702 tuner module - */ -class microtune_4702 : public microtune_eval_board { -public: - - microtune_4702(hamlib_port_t *port) : microtune_eval_board (port), d_reference_divider(320), prescaler(false) {} - ~microtune_4702() {} - - /*! - * \brief select RF frequency to be tuned to output frequency. - * \p freq is the requested frequency in Hz, \p actual_freq - * is set to the actual frequency tuned. It takes about 100 ms - * for the PLL to settle. - * - * \returns true iff sucessful. - */ - bool set_RF_freq (double freq, double *actual_freq); - bool read_info (unsigned char* buf); - - double get_output_freq (); - bool pll_locked_p (); - - private: - int d_reference_divider; - bool prescaler; /* if set, higher charge pump current: - faster tuning, worse phase noise - for distance < 10kHz to the carrier */ -}; - -#endif /* _MICROTUNE_4702_H_ */ diff --git a/microtune/microtune_4937.cc b/microtune/microtune_4937.cc deleted file mode 100644 index fed6d8d7c..000000000 --- a/microtune/microtune_4937.cc +++ /dev/null @@ -1,134 +0,0 @@ -/* -*- c++-*- */ -/* - * Copyright 2001,2003 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "microtune_4937.h" -#include -#include - -static const double first_IF = 43.75e6; - -// The tuner internally has 3 bands: VHF Low, VHF High & UHF. -// These are the recommened boundaries -static const double VHF_High_takeover = 158e6; -static const double UHF_takeover = 464e6; - -static int PLL_I2C_ADDR = 0x61; - -static unsigned char -control_byte_1 (bool fast_tuning_p, int reference_divisor) -{ - int c = 0x88; - - if (fast_tuning_p) - c |= 0x40; - - switch (reference_divisor){ - case 512: - c |= 0x3 << 1; break; - case 640: - c |= 0x0 << 1; break; - case 1024: - c |= 0x1 << 1; break; - default: - abort (); - } - return c; -} - -static unsigned char -control_byte_2 (double target_freq, bool shutdown_tx_PGA) -{ - int c; - - if (target_freq < VHF_High_takeover) // VHF low - c = 0xa0; - else if (target_freq < UHF_takeover) // VHF high - c = 0x90; - else // UHF - c = 0x30; - - if (shutdown_tx_PGA) - c |= 0x08; - - return c; -} - -/*! - * \brief select RF frequency to be tuned to output frequency. - * \p target_freq is the requested frequency in Hz, \p actual_freq - * is set to the actual frequency tuned. It takes about 100 ms - * for the PLL to settle. - * - * \returns true iff sucessful. - */ -bool -microtune_4937::set_RF_freq (double target_freq, double *p_actual_freq) -{ - unsigned char buf[4]; - - double target_f_osc = target_freq + first_IF; - - double f_ref = 4e6 / d_reference_divider; - - // f_osc = f_ref * 8 * divisor - // divisor = f_osc / (f_ref * 8) - - int divisor = (int) ((target_f_osc + (f_ref * 4)) / (f_ref * 8)); - double actual_freq = (f_ref * 8 * divisor) - first_IF; - if (p_actual_freq != 0) - *p_actual_freq = actual_freq; - - if ((divisor & ~0x7fff) != 0) // 15 bit divisor - return false; - - buf[0] = (divisor >> 8) & 0xff; // DB1 - buf[1] = divisor & 0xff; // DB2 - buf[2] = control_byte_1 (d_fast_tuning_p, d_reference_divider); - buf[3] = control_byte_2 (target_freq, true); - -#if 0 - printf ("set_RF_freq: target: %g MHz actual: %g MHz %02x %02x %02x %02x\n", - target_freq/1e6, actual_freq/1e6, buf[0], buf[1], buf[2], buf[3]); -#endif - - return i2c_write (PLL_I2C_ADDR, buf, 4); -} - - -/*! - * \returns true iff PLL is locked - */ -bool -microtune_4937::pll_locked_p () -{ - // FIXME - return true; -} - -/*! - * \returns the output frequency of the tuner in Hz. - */ -double -microtune_4937::get_output_freq () -{ - return 5.75e6; // 3x7702 -} diff --git a/microtune/microtune_4937.h b/microtune/microtune_4937.h deleted file mode 100644 index e31f5b25d..000000000 --- a/microtune/microtune_4937.h +++ /dev/null @@ -1,64 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2001,2003 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef _MICROTUNE_4937_H_ -#define _MICROTUNE_4937_H_ - -#include -#include "microtune_eval_board.h" - -/*! - * \brief abstract class for controlling microtune 4937 tuner module - */ -class microtune_4937 : public microtune_eval_board { -public: - microtune_4937(hamlib_port_t *port) : microtune_eval_board (port), d_reference_divider(640), d_fast_tuning_p(false) {} - ~microtune_4937() {} - - /*! - * \brief select RF frequency to be tuned to output frequency. - * \p freq is the requested frequency in Hz, \p actual_freq - * is set to the actual frequency tuned. It takes about 100 ms - * for the PLL to settle. - * - * \returns true iff sucessful. - */ - bool set_RF_freq (double freq, double *actual_freq); - - /*! - * \returns true iff PLL is locked - */ - bool pll_locked_p (); - - /*! - * \returns the output frequency (IF center freq) of the tuner in Hz. - */ - double get_output_freq (); - - private: - int d_reference_divider; - bool d_fast_tuning_p; /* if set, higher charge pump current: - faster tuning, worse phase noise - for distance < 10kHz to the carrier */ -}; - -#endif /* _MICROTUNE_4937_H_ */ diff --git a/microtune/microtune_eval_board.cc b/microtune/microtune_eval_board.cc deleted file mode 100644 index 2b776eb26..000000000 --- a/microtune/microtune_eval_board.cc +++ /dev/null @@ -1,194 +0,0 @@ -/* -*-C++-*- -******************************************************************************* -* -* File: microtune_eval_board.cc -* Description: -* -******************************************************************************* -*/ - -/* - * Copyright 2001 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "microtune_eval_board.h" -#include "microtune_eval_board_defs.h" -#include "serial.h" -#include "i2cio_pp.h" -#include "i2c.h" -#include - -static int AGC_DAC_I2C_ADDR = 0x2C; - -microtune_eval_board::microtune_eval_board (hamlib_port_t *port) -{ - m_ppio = port; - m_i2cio = new i2cio_pp (m_ppio); - m_i2c = new i2c (m_i2cio); - - // disable upstream amplifier - par_lock (m_ppio); - unsigned char t; - par_read_data (m_ppio, &t); - t &= ~(UT_DP_TX_ENABLE | UT_DP_TX_SDA | UT_DP_TX_SCL); - t |= UT_DP_TX_AS; - par_write_data (m_ppio, t); - par_unlock (m_ppio); -} - -microtune_eval_board::~microtune_eval_board () -{ - delete m_i2c; - delete m_i2cio; -} - - -//! is the eval board present? -bool -microtune_eval_board::board_present_p () -{ - bool result = true; - par_lock (m_ppio); - - unsigned char t; - par_read_status (m_ppio, &t); - if ((t & UT_SP_SHOULD_BE_ZERO) != 0 - || (t & UT_SP_SHOULD_BE_ONE) != UT_SP_SHOULD_BE_ONE) - result = false; - - // could also see if SCL is looped back or not, but that seems like overkill - - par_unlock (m_ppio); - return result; -} - -// returns true iff successful -bool -microtune_eval_board::i2c_write (int addr, const unsigned char *buf, int nbytes) -{ - return m_i2c->write (addr, buf, nbytes); -} - -// returns number of bytes read or -1 if error -int -microtune_eval_board::i2c_read (int addr, unsigned char *buf, int max_bytes) -{ - return m_i2c->read (addr, buf, max_bytes); -} - -/* - * ---------------------------------------------------------------- - * AGC stuff - * - * We're using a MAX518 8-bit 5V dual dac for setting the AGC's - * ---------------------------------------------------------------- - */ -void -microtune_eval_board::write_dac (int which, int value) -{ - unsigned char cmd[2]; - cmd[0] = which & 1; - cmd[1] = value; - i2c_write (AGC_DAC_I2C_ADDR, cmd, sizeof (cmd)); -} - -void -microtune_eval_board::write_both_dacs (int value0, int value1) -{ - unsigned char cmd[4]; - cmd[0] = 0; - cmd[1] = value0; - cmd[2] = 1; - cmd[3] = value1; - i2c_write (AGC_DAC_I2C_ADDR, cmd, sizeof (cmd)); -} - -static int scale_volts (float volts) -{ - int n; - n = (int) rint (volts * (256 / 5.0)); - if (n < 0) - n = 0; - if (n > 255) - n = 255; - - return n; -} - -void -microtune_eval_board::set_RF_AGC_voltage (float volts) -{ - write_dac (0, scale_volts (volts)); -} - -void -microtune_eval_board::set_IF_AGC_voltage (float volts) -{ - write_dac (1, scale_volts (volts)); -} - -static const float RF_MIN_V = 1.5; // RF AGC control voltages -static const float RF_MAX_V = 4.0; -static const float IF_MIN_V = 2.0; // IF AGC control voltages -static const float IF_MAX_V = 4.0; - -static const float MIN_AGC = 0; // bottom of synthetic range -static const float MAX_AGC = 1000; // top of synthetic range - -static const float CUTOVER_POINT = 667; - - -// linear is in the range MIN_AGC to MAX_AGC - -static float -linear_to_RF_AGC_voltage (float linear) -{ - if (linear >= CUTOVER_POINT) - return RF_MAX_V; - - float slope = (RF_MAX_V - RF_MIN_V) / CUTOVER_POINT; - return RF_MIN_V + linear * slope; -} - -static float -linear_to_IF_AGC_voltage (float linear) -{ - if (linear < CUTOVER_POINT) - return IF_MIN_V; - - float slope = (IF_MAX_V - IF_MIN_V) / (MAX_AGC - CUTOVER_POINT); - return IF_MIN_V + (linear - CUTOVER_POINT) * slope; -} - -void -microtune_eval_board::set_AGC (float v) -{ - if (v < MIN_AGC) - v = MIN_AGC; - - if (v > MAX_AGC) - v = MAX_AGC; - - float rf_agc_voltage = linear_to_RF_AGC_voltage (v); - float if_agc_voltage = linear_to_IF_AGC_voltage (v); - - set_RF_AGC_voltage (rf_agc_voltage); - set_IF_AGC_voltage (if_agc_voltage); -} diff --git a/microtune/microtune_eval_board.h b/microtune/microtune_eval_board.h deleted file mode 100644 index c7858eb46..000000000 --- a/microtune/microtune_eval_board.h +++ /dev/null @@ -1,105 +0,0 @@ -/* -*-C++-*- -******************************************************************************* -* -* File: microtune_eval_board.h -* Description: -* -******************************************************************************* -*/ - -/* - * Copyright 2001 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef _MICROTUNE_EVAL_BOARD_H_ -#define _MICROTUNE_EVAL_BOARD_H_ - -#include "serial.h" - -class i2cio; -class i2c; - -/*! - * \brief concrete class for controlling a microtune eval board attached to parallel port - */ -class microtune_eval_board { -public: - microtune_eval_board (hamlib_port_t *port); - virtual ~microtune_eval_board (); - - //! is the eval board present? - virtual bool board_present_p (); - - - /*! - * \brief select RF frequency to be tuned to output frequency. - * \p freq is the requested frequency in Hz, \p actual_freq - * is set to the actual frequency tuned. It takes about 100 ms - * for the PLL to settle. - * - * \returns true iff sucessful. - */ - virtual bool set_RF_freq (double freq, double *actual_freq) = 0; - - /*! - * \returns true iff PLL is locked - */ - virtual bool pll_locked_p () = 0; - - - /*! - * \returns the output frequency (IF center freq) of the tuner in Hz. - */ - virtual double get_output_freq () = 0; - - /*! - * \brief set RF and IF AGC control voltages ([0, 5] volts) - */ - void set_RF_AGC_voltage (float volts); - void set_IF_AGC_voltage (float volts); - - /*! - * \brief set RF and IF AGC levels together (scale [0, 1000]) - * - * This provides a simple linear interface for adjusting both - * the RF and IF gain in consort. This is the easy to use interface. - * 0 corresponds to minimum gain. 1000 corresponds to maximum gain. - */ - void set_AGC (float value_0_1000); - - -protected: - //! \returns true iff successful - virtual bool i2c_write (int addr, const unsigned char *buf, int nbytes); - - //! \returns number of bytes read or -1 if error - virtual int i2c_read (int addr, unsigned char *buf, int max_bytes); - -private: - void write_dac (int which, int value); - void write_both_dacs (int val0, int val1); - - hamlib_port_t *m_ppio; - i2cio *m_i2cio; - i2c *m_i2c; -}; - - -#endif /* _MICROTUNE_EVAL_BOARD_H_ */ diff --git a/microtune/microtune_eval_board_defs.h b/microtune/microtune_eval_board_defs.h deleted file mode 100644 index 30452622f..000000000 --- a/microtune/microtune_eval_board_defs.h +++ /dev/null @@ -1,71 +0,0 @@ -/* -*-C-*- -******************************************************************************* -* -* File: microtune_eval_board_defs.h -* Description: defines for parallel port control of eval board -* -******************************************************************************* -*/ - -/* - * Copyright 2001 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef _MICROTUNE_EVAL_BOARD_DEFS_H_ -#define _MICROTUNE_EVAL_BOARD_DEFS_H_ - -/* - * The Microtune 4937DI5/4702DT5 cable modem tuner eval board is controlled - * by bit banging the PC parallel port. This file defines the relevant - * bits. - * - * The parallel port has an 8 bit data port (output), - * an 8 bit control port (output) and - * an 8 bit status port (input). - * - * Not all bits of the control and status ports may be arbitrarily used. - */ - - -// parallel port data port constants (output) - -static const int UT_DP_TX_SDA = 0x01; // upstream control bus -static const int UT_DP_TX_SCL = 0x02; // upstream control bus -static const int UT_DP_TX_AS = 0x04; // upstream control bus -static const int UT_DP_TX_ENABLE = 0x08; // upstream h/w enable -// bits 4,5,6 not used -static const int UT_DP_TUNER_SDA_OUT = 0x80; // tuner i2c bus data - -// parallel port control port constants (output) - -static const int UT_CP_TUNER_SCL = 0x08; // tuner i2c bus clock -static const int UT_CP_MUST_BE_ZERO = 0xf0; // must be zero - -// parallel port status port constants (input) - -// bits 0,1,2 not used -static const int UT_SP_TUNER_SCL_LOOP_BACK= 0x08; // inverted SCL loop back -static const int UT_SP_SHOULD_BE_ZERO = 0x10; // reads as zero -static const int UT_SP_SHOULD_BE_ONE = 0x20; // reads as one -// bit 6 not used -static const int UT_SP_TUNER_SDA_IN = 0x80; - - -#endif /* _MICROTUNE_EVAL_BOARD_DEFS_H_ */ diff --git a/microtune/module_4702.c b/microtune/module_4702.c deleted file mode 100644 index e10d13f83..000000000 --- a/microtune/module_4702.c +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Hamlib microtune backend - 4702 file - * Copyright (c) 2003 by Stephane Fillod - * - * - * This library is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include - -#include - -#include "microtune.h" - -/* - * Microtune 4702 rig capabilities. - */ - -#define M4702_FUNC RIG_FUNC_NONE -#define M4702_LEVEL RIG_LEVEL_NONE -#define M4702_PARM RIG_PARM_NONE - -#define M4702_MODES (RIG_MODE_NONE) /* FIXME: IF */ - -#define M4702_VFO RIG_VFO_A - -static const struct confparams module_4702_ext_parms[] = -{ - { - TOK_AGCGAIN, "agcgain", "AGC gain level", "RF and IF AGC levels", - NULL, RIG_CONF_NUMERIC, { .n = { 0, 1, .001 } } - }, - { RIG_CONF_END, NULL, } -}; - - -const struct rig_caps module_4702_caps = -{ - .rig_model = RIG_MODEL_MICROTUNE_4702, - .model_name = "4702 DT5 tuner module", - .mfg_name = "Microtune", - .version = "0.2.1", - .copyright = "GPL", - .status = RIG_STATUS_UNTESTED, - .rig_type = RIG_TYPE_TUNER, - .targetable_vfo = 0, - .ptt_type = RIG_PTT_RIG, - .dcd_type = RIG_DCD_NONE, - .port_type = RIG_PORT_PARALLEL, - .has_get_func = M4702_FUNC, - .has_set_func = M4702_FUNC, - .has_get_level = M4702_LEVEL, - .has_set_level = RIG_LEVEL_SET(M4702_LEVEL), - .has_get_parm = M4702_PARM, - .has_set_parm = RIG_PARM_SET(M4702_PARM), - .chan_list = { - RIG_CHAN_END, - }, - .scan_ops = RIG_SCAN_NONE, - .vfo_ops = RIG_OP_NONE, - .transceive = RIG_TRN_OFF, - .attenuator = { RIG_DBLST_END, }, - .preamp = { RIG_DBLST_END, }, - .rx_range_list2 = { { - .start = MHz(50), .end = MHz(860), .modes = M4702_MODES, - .low_power = -1, .high_power = -1, M4702_VFO - }, - RIG_FRNG_END, - }, - .tx_range_list2 = { RIG_FRNG_END, }, - - /* minimum tuning step with a reference divider of 640? (see Advance data sheet) */ - .tuning_steps = { {M4702_MODES, kHz(50)}, - RIG_TS_END, - }, - .extparms = module_4702_ext_parms, - .priv = NULL, /* priv */ - - .rig_init = microtune_init, - .rig_cleanup = microtune_cleanup, - .rig_open = module_4702_open, - .rig_close = microtune_close, - - .set_freq = microtune_set_freq, - .get_freq = microtune_get_freq, - .set_ext_level = microtune_set_ext_level, -}; - - diff --git a/microtune/module_4937.c b/microtune/module_4937.c deleted file mode 100644 index 727773928..000000000 --- a/microtune/module_4937.c +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Hamlib microtune backend - 4937 file - * Copyright (c) 2003 by Stephane Fillod - * - * - * This library is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include - -#include - -#include "microtune.h" - -/* - * Microtune 4937 rig capabilities. - * - * TODO: set_ptt - */ - -#define M4937_FUNC RIG_FUNC_NONE -#define M4937_LEVEL RIG_LEVEL_NONE -#define M4937_PARM RIG_PARM_NONE - -#define M4937_MODES (RIG_MODE_NONE) /* FIXME: IF */ - -#define M4937_VFO RIG_VFO_A - -static const struct confparams module_4937_ext_parms[] = -{ - { - TOK_AGCGAIN, "agcgain", "AGC gain level", "RF and IF AGC levels", - NULL, RIG_CONF_NUMERIC, { .n = { 0, 1, .001 } } - }, - { RIG_CONF_END, NULL, } -}; - - -const struct rig_caps module_4937_caps = -{ - .rig_model = RIG_MODEL_MICROTUNE_4937, - .model_name = "4937 DI5 tuner module", - .mfg_name = "Microtune", - .version = "0.2.1", - .copyright = "GPL", - .status = RIG_STATUS_UNTESTED, - .rig_type = RIG_TYPE_TUNER, - .targetable_vfo = 0, - .ptt_type = RIG_PTT_RIG, - .dcd_type = RIG_DCD_NONE, - .port_type = RIG_PORT_PARALLEL, - .has_get_func = M4937_FUNC, - .has_set_func = M4937_FUNC, - .has_get_level = M4937_LEVEL, - .has_set_level = RIG_LEVEL_SET(M4937_LEVEL), - .has_get_parm = M4937_PARM, - .has_set_parm = RIG_PARM_SET(M4937_PARM), - .chan_list = { - RIG_CHAN_END, - }, - .scan_ops = RIG_SCAN_NONE, - .vfo_ops = RIG_OP_NONE, - .transceive = RIG_TRN_OFF, - .attenuator = { RIG_DBLST_END, }, - .preamp = { RIG_DBLST_END, }, - .rx_range_list2 = { { - .start = MHz(55), .end = MHz(860), .modes = M4937_MODES, - .low_power = -1, .high_power = -1, M4937_VFO - }, - RIG_FRNG_END, - }, - .tx_range_list2 = { { - .start = MHz(5), .end = MHz(42), .modes = M4937_MODES, - .low_power = mW(1), .high_power = W(1), M4937_VFO - }, /* FIXME: power */ - RIG_FRNG_END, - }, - - /* minimum tuning step with a reference divider of 640 (see Advance data sheet) */ - .tuning_steps = { {M4937_MODES, kHz(50)}, - RIG_TS_END, - }, - .extparms = module_4937_ext_parms, - .priv = NULL, /* priv */ - - .rig_init = microtune_init, - .rig_cleanup = microtune_cleanup, - .rig_open = module_4937_open, - .rig_close = microtune_close, - - .set_freq = microtune_set_freq, - .get_freq = microtune_get_freq, - .set_ext_level = microtune_set_ext_level, -}; - diff --git a/adat/Android.mk b/rigs/adat/Android.mk similarity index 100% rename from adat/Android.mk rename to rigs/adat/Android.mk diff --git a/adat/Makefile.am b/rigs/adat/Makefile.am similarity index 100% rename from adat/Makefile.am rename to rigs/adat/Makefile.am diff --git a/adat/adat.c b/rigs/adat/adat.c similarity index 100% rename from adat/adat.c rename to rigs/adat/adat.c diff --git a/adat/adat.h b/rigs/adat/adat.h similarity index 100% rename from adat/adat.h rename to rigs/adat/adat.h diff --git a/adat/adt_200a.c b/rigs/adat/adt_200a.c similarity index 100% rename from adat/adt_200a.c rename to rigs/adat/adt_200a.c diff --git a/adat/adt_200a.h b/rigs/adat/adt_200a.h similarity index 100% rename from adat/adt_200a.h rename to rigs/adat/adt_200a.h diff --git a/alinco/Android.mk b/rigs/alinco/Android.mk similarity index 100% rename from alinco/Android.mk rename to rigs/alinco/Android.mk diff --git a/alinco/Makefile.am b/rigs/alinco/Makefile.am similarity index 100% rename from alinco/Makefile.am rename to rigs/alinco/Makefile.am diff --git a/alinco/alinco.c b/rigs/alinco/alinco.c similarity index 100% rename from alinco/alinco.c rename to rigs/alinco/alinco.c diff --git a/alinco/alinco.h b/rigs/alinco/alinco.h similarity index 100% rename from alinco/alinco.h rename to rigs/alinco/alinco.h diff --git a/alinco/dx77.c b/rigs/alinco/dx77.c similarity index 100% rename from alinco/dx77.c rename to rigs/alinco/dx77.c diff --git a/aor/Android.mk b/rigs/aor/Android.mk similarity index 100% rename from aor/Android.mk rename to rigs/aor/Android.mk diff --git a/aor/Makefile.am b/rigs/aor/Makefile.am similarity index 100% rename from aor/Makefile.am rename to rigs/aor/Makefile.am diff --git a/aor/README.aor b/rigs/aor/README.aor similarity index 100% rename from aor/README.aor rename to rigs/aor/README.aor diff --git a/aor/README.ar5000 b/rigs/aor/README.ar5000 similarity index 100% rename from aor/README.ar5000 rename to rigs/aor/README.ar5000 diff --git a/aor/README.ar7030 b/rigs/aor/README.ar7030 similarity index 100% rename from aor/README.ar7030 rename to rigs/aor/README.ar7030 diff --git a/aor/aor.c b/rigs/aor/aor.c similarity index 100% rename from aor/aor.c rename to rigs/aor/aor.c diff --git a/aor/aor.h b/rigs/aor/aor.h similarity index 100% rename from aor/aor.h rename to rigs/aor/aor.h diff --git a/aor/ar2700.c b/rigs/aor/ar2700.c similarity index 100% rename from aor/ar2700.c rename to rigs/aor/ar2700.c diff --git a/aor/ar3000.c b/rigs/aor/ar3000.c similarity index 100% rename from aor/ar3000.c rename to rigs/aor/ar3000.c diff --git a/aor/ar3030.c b/rigs/aor/ar3030.c similarity index 100% rename from aor/ar3030.c rename to rigs/aor/ar3030.c diff --git a/aor/ar5000.c b/rigs/aor/ar5000.c similarity index 100% rename from aor/ar5000.c rename to rigs/aor/ar5000.c diff --git a/aor/ar7030.c b/rigs/aor/ar7030.c similarity index 100% rename from aor/ar7030.c rename to rigs/aor/ar7030.c diff --git a/aor/ar7030p.c b/rigs/aor/ar7030p.c similarity index 100% rename from aor/ar7030p.c rename to rigs/aor/ar7030p.c diff --git a/aor/ar7030p.h b/rigs/aor/ar7030p.h similarity index 100% rename from aor/ar7030p.h rename to rigs/aor/ar7030p.h diff --git a/aor/ar7030p_utils.c b/rigs/aor/ar7030p_utils.c similarity index 100% rename from aor/ar7030p_utils.c rename to rigs/aor/ar7030p_utils.c diff --git a/aor/ar8000.c b/rigs/aor/ar8000.c similarity index 100% rename from aor/ar8000.c rename to rigs/aor/ar8000.c diff --git a/aor/ar8200.c b/rigs/aor/ar8200.c similarity index 100% rename from aor/ar8200.c rename to rigs/aor/ar8200.c diff --git a/aor/ar8600.c b/rigs/aor/ar8600.c similarity index 100% rename from aor/ar8600.c rename to rigs/aor/ar8600.c diff --git a/aor/sr2200.c b/rigs/aor/sr2200.c similarity index 100% rename from aor/sr2200.c rename to rigs/aor/sr2200.c diff --git a/barrett/Android.mk b/rigs/barrett/Android.mk similarity index 100% rename from barrett/Android.mk rename to rigs/barrett/Android.mk diff --git a/barrett/Makefile.am b/rigs/barrett/Makefile.am similarity index 100% rename from barrett/Makefile.am rename to rigs/barrett/Makefile.am diff --git a/barrett/README.barrett b/rigs/barrett/README.barrett similarity index 100% rename from barrett/README.barrett rename to rigs/barrett/README.barrett diff --git a/barrett/barrett.c b/rigs/barrett/barrett.c similarity index 100% rename from barrett/barrett.c rename to rigs/barrett/barrett.c diff --git a/barrett/barrett.h b/rigs/barrett/barrett.h similarity index 100% rename from barrett/barrett.h rename to rigs/barrett/barrett.h diff --git a/dorji/Android.mk b/rigs/dorji/Android.mk similarity index 100% rename from dorji/Android.mk rename to rigs/dorji/Android.mk diff --git a/dorji/Makefile.am b/rigs/dorji/Makefile.am similarity index 100% rename from dorji/Makefile.am rename to rigs/dorji/Makefile.am diff --git a/dorji/dorji.c b/rigs/dorji/dorji.c similarity index 100% rename from dorji/dorji.c rename to rigs/dorji/dorji.c diff --git a/dorji/dorji.h b/rigs/dorji/dorji.h similarity index 100% rename from dorji/dorji.h rename to rigs/dorji/dorji.h diff --git a/dorji/dra818.c b/rigs/dorji/dra818.c similarity index 100% rename from dorji/dra818.c rename to rigs/dorji/dra818.c diff --git a/dorji/dra818.h b/rigs/dorji/dra818.h similarity index 100% rename from dorji/dra818.h rename to rigs/dorji/dra818.h diff --git a/drake/Android.mk b/rigs/drake/Android.mk similarity index 100% rename from drake/Android.mk rename to rigs/drake/Android.mk diff --git a/drake/Makefile.am b/rigs/drake/Makefile.am similarity index 100% rename from drake/Makefile.am rename to rigs/drake/Makefile.am diff --git a/drake/drake.c b/rigs/drake/drake.c similarity index 100% rename from drake/drake.c rename to rigs/drake/drake.c diff --git a/drake/drake.h b/rigs/drake/drake.h similarity index 100% rename from drake/drake.h rename to rigs/drake/drake.h diff --git a/drake/r8a.c b/rigs/drake/r8a.c similarity index 100% rename from drake/r8a.c rename to rigs/drake/r8a.c diff --git a/drake/r8b.c b/rigs/drake/r8b.c similarity index 100% rename from drake/r8b.c rename to rigs/drake/r8b.c diff --git a/elad/Android.mk b/rigs/elad/Android.mk similarity index 100% rename from elad/Android.mk rename to rigs/elad/Android.mk diff --git a/elad/Makefile.am b/rigs/elad/Makefile.am similarity index 100% rename from elad/Makefile.am rename to rigs/elad/Makefile.am diff --git a/elad/elad.c b/rigs/elad/elad.c similarity index 100% rename from elad/elad.c rename to rigs/elad/elad.c diff --git a/elad/elad.h b/rigs/elad/elad.h similarity index 100% rename from elad/elad.h rename to rigs/elad/elad.h diff --git a/elad/fdm_duo.c b/rigs/elad/fdm_duo.c similarity index 100% rename from elad/fdm_duo.c rename to rigs/elad/fdm_duo.c diff --git a/flexradio/Android.mk b/rigs/flexradio/Android.mk similarity index 100% rename from flexradio/Android.mk rename to rigs/flexradio/Android.mk diff --git a/flexradio/Makefile.am b/rigs/flexradio/Makefile.am similarity index 100% rename from flexradio/Makefile.am rename to rigs/flexradio/Makefile.am diff --git a/flexradio/dttsp.c b/rigs/flexradio/dttsp.c similarity index 100% rename from flexradio/dttsp.c rename to rigs/flexradio/dttsp.c diff --git a/flexradio/flexradio.c b/rigs/flexradio/flexradio.c similarity index 100% rename from flexradio/flexradio.c rename to rigs/flexradio/flexradio.c diff --git a/flexradio/flexradio.h b/rigs/flexradio/flexradio.h similarity index 100% rename from flexradio/flexradio.h rename to rigs/flexradio/flexradio.h diff --git a/flexradio/sdr1k.c b/rigs/flexradio/sdr1k.c similarity index 100% rename from flexradio/sdr1k.c rename to rigs/flexradio/sdr1k.c diff --git a/icmarine/Android.mk b/rigs/icmarine/Android.mk similarity index 100% rename from icmarine/Android.mk rename to rigs/icmarine/Android.mk diff --git a/icmarine/Makefile.am b/rigs/icmarine/Makefile.am similarity index 100% rename from icmarine/Makefile.am rename to rigs/icmarine/Makefile.am diff --git a/icmarine/icm700pro.c b/rigs/icmarine/icm700pro.c similarity index 100% rename from icmarine/icm700pro.c rename to rigs/icmarine/icm700pro.c diff --git a/icmarine/icm710.c b/rigs/icmarine/icm710.c similarity index 100% rename from icmarine/icm710.c rename to rigs/icmarine/icm710.c diff --git a/icmarine/icm710.h b/rigs/icmarine/icm710.h similarity index 100% rename from icmarine/icm710.h rename to rigs/icmarine/icm710.h diff --git a/icmarine/icm802.c b/rigs/icmarine/icm802.c similarity index 100% rename from icmarine/icm802.c rename to rigs/icmarine/icm802.c diff --git a/icmarine/icmarine.c b/rigs/icmarine/icmarine.c similarity index 100% rename from icmarine/icmarine.c rename to rigs/icmarine/icmarine.c diff --git a/icmarine/icmarine.h b/rigs/icmarine/icmarine.h similarity index 100% rename from icmarine/icmarine.h rename to rigs/icmarine/icmarine.h diff --git a/icom/Android.mk b/rigs/icom/Android.mk similarity index 100% rename from icom/Android.mk rename to rigs/icom/Android.mk diff --git a/icom/Makefile.am b/rigs/icom/Makefile.am similarity index 100% rename from icom/Makefile.am rename to rigs/icom/Makefile.am diff --git a/icom/README.icom b/rigs/icom/README.icom similarity index 100% rename from icom/README.icom rename to rigs/icom/README.icom diff --git a/icom/TODO.icom b/rigs/icom/TODO.icom similarity index 100% rename from icom/TODO.icom rename to rigs/icom/TODO.icom diff --git a/icom/delta2.c b/rigs/icom/delta2.c similarity index 100% rename from icom/delta2.c rename to rigs/icom/delta2.c diff --git a/icom/frame.c b/rigs/icom/frame.c similarity index 100% rename from icom/frame.c rename to rigs/icom/frame.c diff --git a/icom/frame.h b/rigs/icom/frame.h similarity index 100% rename from icom/frame.h rename to rigs/icom/frame.h diff --git a/icom/ic1275.c b/rigs/icom/ic1275.c similarity index 98% rename from icom/ic1275.c rename to rigs/icom/ic1275.c index 64c5f7288..601b1a99d 100644 --- a/icom/ic1275.c +++ b/rigs/icom/ic1275.c @@ -128,8 +128,8 @@ const struct rig_caps ic1275_caps = .priv = (void *)& ic1275_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic271.c b/rigs/icom/ic271.c similarity index 98% rename from icom/ic271.c rename to rigs/icom/ic271.c index 3fc3cae2f..90af50f4b 100644 --- a/icom/ic271.c +++ b/rigs/icom/ic271.c @@ -138,8 +138,8 @@ const struct rig_caps ic271_caps = .priv = (void *)& ic271_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic2730.c b/rigs/icom/ic2730.c similarity index 98% rename from icom/ic2730.c rename to rigs/icom/ic2730.c index 3bf9e9c9e..e3a973525 100644 --- a/icom/ic2730.c +++ b/rigs/icom/ic2730.c @@ -168,8 +168,8 @@ const struct rig_caps ic2730_caps = .priv = (void *)& ic2730_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic275.c b/rigs/icom/ic275.c similarity index 98% rename from icom/ic275.c rename to rigs/icom/ic275.c index 729c17568..bcb8af87a 100644 --- a/icom/ic275.c +++ b/rigs/icom/ic275.c @@ -131,8 +131,8 @@ const struct rig_caps ic275_caps = .priv = (void *)& ic275_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic471.c b/rigs/icom/ic471.c similarity index 98% rename from icom/ic471.c rename to rigs/icom/ic471.c index 1c2ba7c98..1320096c1 100644 --- a/icom/ic471.c +++ b/rigs/icom/ic471.c @@ -137,8 +137,8 @@ const struct rig_caps ic471_caps = .priv = (void *)& ic471_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic475.c b/rigs/icom/ic475.c similarity index 98% rename from icom/ic475.c rename to rigs/icom/ic475.c index 123ac6283..d667a5168 100644 --- a/icom/ic475.c +++ b/rigs/icom/ic475.c @@ -131,8 +131,8 @@ const struct rig_caps ic475_caps = .priv = (void *)& ic475_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic7000.c b/rigs/icom/ic7000.c similarity index 99% rename from icom/ic7000.c rename to rigs/icom/ic7000.c index 3a5688d31..037af1d4a 100644 --- a/icom/ic7000.c +++ b/rigs/icom/ic7000.c @@ -284,8 +284,8 @@ const struct rig_caps ic7000_caps = .priv = (void *)& IC7000_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic703.c b/rigs/icom/ic703.c similarity index 99% rename from icom/ic703.c rename to rigs/icom/ic703.c index c510a678b..086781a00 100644 --- a/icom/ic703.c +++ b/rigs/icom/ic703.c @@ -193,8 +193,8 @@ const struct rig_caps ic703_caps = .priv = (void *)& ic703_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic706.c b/rigs/icom/ic706.c similarity index 99% rename from icom/ic706.c rename to rigs/icom/ic706.c index edc92d684..abaaa3433 100644 --- a/icom/ic706.c +++ b/rigs/icom/ic706.c @@ -251,7 +251,7 @@ const struct rig_caps ic706_caps = .rig_init = icom_init, .rig_cleanup = icom_cleanup, .rig_open = icom_rig_open, - .rig_close = NULL, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, @@ -393,7 +393,7 @@ const struct rig_caps ic706mkii_caps = .rig_init = icom_init, .rig_cleanup = icom_cleanup, .rig_open = icom_rig_open, - .rig_close = NULL, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, @@ -583,7 +583,7 @@ const struct rig_caps ic706mkiig_caps = .rig_init = icom_init, .rig_cleanup = icom_cleanup, .rig_open = icom_rig_open, - .rig_close = NULL, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic707.c b/rigs/icom/ic707.c similarity index 98% rename from icom/ic707.c rename to rigs/icom/ic707.c index 3a8b83f35..1ac22042c 100644 --- a/icom/ic707.c +++ b/rigs/icom/ic707.c @@ -148,8 +148,8 @@ const struct rig_caps ic707_caps = .priv = (void *)& ic707_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic7100.c b/rigs/icom/ic7100.c similarity index 99% rename from icom/ic7100.c rename to rigs/icom/ic7100.c index fe878d6e1..178990099 100644 --- a/icom/ic7100.c +++ b/rigs/icom/ic7100.c @@ -342,8 +342,8 @@ const struct rig_caps ic7100_caps = .priv = (void *)& ic7100_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .cfgparams = icom_cfg_params, .set_conf = icom_set_conf, diff --git a/icom/ic718.c b/rigs/icom/ic718.c similarity index 99% rename from icom/ic718.c rename to rigs/icom/ic718.c index 3722fc708..6a01fe858 100644 --- a/icom/ic718.c +++ b/rigs/icom/ic718.c @@ -177,8 +177,8 @@ const struct rig_caps ic718_caps = .priv = (void *)& IC718_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic7200.c b/rigs/icom/ic7200.c similarity index 99% rename from icom/ic7200.c rename to rigs/icom/ic7200.c index a30906728..3b5d1bff4 100644 --- a/icom/ic7200.c +++ b/rigs/icom/ic7200.c @@ -225,8 +225,8 @@ const struct rig_caps ic7200_caps = .priv = (void *)& IC7200_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic725.c b/rigs/icom/ic725.c similarity index 98% rename from icom/ic725.c rename to rigs/icom/ic725.c index 8a786a8f1..95d7a27b0 100644 --- a/icom/ic725.c +++ b/rigs/icom/ic725.c @@ -144,8 +144,8 @@ const struct rig_caps ic725_caps = .priv = (void *)& ic725_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic726.c b/rigs/icom/ic726.c similarity index 98% rename from icom/ic726.c rename to rigs/icom/ic726.c index ebe590060..cdf0aa3cc 100644 --- a/icom/ic726.c +++ b/rigs/icom/ic726.c @@ -152,8 +152,8 @@ const struct rig_caps ic726_caps = .priv = (void *)& ic726_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic728.c b/rigs/icom/ic728.c similarity index 98% rename from icom/ic728.c rename to rigs/icom/ic728.c index 8b09b2bfa..ad4f110f8 100644 --- a/icom/ic728.c +++ b/rigs/icom/ic728.c @@ -146,8 +146,8 @@ const struct rig_caps ic728_caps = .priv = (void *)& ic728_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic7300.c b/rigs/icom/ic7300.c similarity index 99% rename from icom/ic7300.c rename to rigs/icom/ic7300.c index bcbed2d9a..32f79e420 100644 --- a/icom/ic7300.c +++ b/rigs/icom/ic7300.c @@ -347,7 +347,7 @@ const struct rig_caps ic7300_caps = .rig_init = icom_init, .rig_cleanup = icom_cleanup, .rig_open = icom_rig_open, - .rig_close = NULL, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, @@ -525,7 +525,7 @@ const struct rig_caps ic9700_caps = .rig_init = icom_init, .rig_cleanup = icom_cleanup, .rig_open = icom_rig_open, - .rig_close = NULL, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic735.c b/rigs/icom/ic735.c similarity index 98% rename from icom/ic735.c rename to rigs/icom/ic735.c index aea24029d..694027af8 100644 --- a/icom/ic735.c +++ b/rigs/icom/ic735.c @@ -157,8 +157,8 @@ const struct rig_caps ic735_caps = .priv = (void *)& ic735_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic736.c b/rigs/icom/ic736.c similarity index 98% rename from icom/ic736.c rename to rigs/icom/ic736.c index 2170d3f45..28f9732c6 100644 --- a/icom/ic736.c +++ b/rigs/icom/ic736.c @@ -169,8 +169,8 @@ const struct rig_caps ic736_caps = .priv = (void *)& ic736_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic737.c b/rigs/icom/ic737.c similarity index 98% rename from icom/ic737.c rename to rigs/icom/ic737.c index 48d83d6f1..ff4c023b3 100644 --- a/icom/ic737.c +++ b/rigs/icom/ic737.c @@ -158,8 +158,8 @@ const struct rig_caps ic737_caps = .priv = (void *)& ic737_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_open, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic738.c b/rigs/icom/ic738.c similarity index 98% rename from icom/ic738.c rename to rigs/icom/ic738.c index bd00fd619..699a2b4e6 100644 --- a/icom/ic738.c +++ b/rigs/icom/ic738.c @@ -165,8 +165,8 @@ const struct rig_caps ic738_caps = .priv = (void *)& ic738_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_open, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic7410.c b/rigs/icom/ic7410.c similarity index 99% rename from icom/ic7410.c rename to rigs/icom/ic7410.c index 2930dd8f0..c64770197 100644 --- a/icom/ic7410.c +++ b/rigs/icom/ic7410.c @@ -226,8 +226,8 @@ const struct rig_caps ic7410_caps = .priv = (void *)& ic7410_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_open, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic746.c b/rigs/icom/ic746.c similarity index 99% rename from icom/ic746.c rename to rigs/icom/ic746.c index e588f1c86..7261fc1b4 100644 --- a/icom/ic746.c +++ b/rigs/icom/ic746.c @@ -293,8 +293,8 @@ const struct rig_caps ic746_caps = .priv = (void *)& ic746_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_open, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic751.c b/rigs/icom/ic751.c similarity index 99% rename from icom/ic751.c rename to rigs/icom/ic751.c index 425e6d010..185e3a8c9 100644 --- a/icom/ic751.c +++ b/rigs/icom/ic751.c @@ -212,8 +212,8 @@ const struct rig_caps ic751_caps = .priv = (void *)& ic751_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_open, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic756.c b/rigs/icom/ic756.c similarity index 99% rename from icom/ic756.c rename to rigs/icom/ic756.c index c8943125e..37a17443b 100644 --- a/icom/ic756.c +++ b/rigs/icom/ic756.c @@ -237,8 +237,8 @@ const struct rig_caps ic756_caps = .priv = (void *)& ic756_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, @@ -394,8 +394,8 @@ const struct rig_caps ic756pro_caps = .priv = (void *)& ic756pro_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, @@ -627,8 +627,8 @@ const struct rig_caps ic756pro2_caps = .priv = (void *)& ic756pro2_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, @@ -1054,8 +1054,8 @@ const struct rig_caps ic756pro3_caps = .priv = (void *)& ic756pro3_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic7600.c b/rigs/icom/ic7600.c similarity index 99% rename from icom/ic7600.c rename to rigs/icom/ic7600.c index 1ec95e931..d4929ee7c 100644 --- a/icom/ic7600.c +++ b/rigs/icom/ic7600.c @@ -282,8 +282,8 @@ const struct rig_caps ic7600_caps = .priv = (void *)& ic7600_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_open, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic761.c b/rigs/icom/ic761.c similarity index 99% rename from icom/ic761.c rename to rigs/icom/ic761.c index 36bfec48e..a48b59f63 100644 --- a/icom/ic761.c +++ b/rigs/icom/ic761.c @@ -178,8 +178,8 @@ const struct rig_caps ic761_caps = .priv = (void *)& ic761_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_open, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic7610.c b/rigs/icom/ic7610.c similarity index 99% rename from icom/ic7610.c rename to rigs/icom/ic7610.c index cc2fac54c..ccb084edc 100644 --- a/icom/ic7610.c +++ b/rigs/icom/ic7610.c @@ -290,7 +290,7 @@ const struct rig_caps ic7610_caps = .rig_init = icom_init, .rig_cleanup = icom_cleanup, .rig_open = icom_rig_open, - .rig_close = NULL, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic765.c b/rigs/icom/ic765.c similarity index 98% rename from icom/ic765.c rename to rigs/icom/ic765.c index 92e8b1551..82d248461 100644 --- a/icom/ic765.c +++ b/rigs/icom/ic765.c @@ -166,8 +166,8 @@ const struct rig_caps ic765_caps = .priv = (void *)& ic765_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic7700.c b/rigs/icom/ic7700.c similarity index 99% rename from icom/ic7700.c rename to rigs/icom/ic7700.c index 1e29d75b6..68e01342d 100644 --- a/icom/ic7700.c +++ b/rigs/icom/ic7700.c @@ -274,8 +274,8 @@ const struct rig_caps ic7700_caps = .priv = (void *)& ic7700_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic775.c b/rigs/icom/ic775.c similarity index 99% rename from icom/ic775.c rename to rigs/icom/ic775.c index 7b8a9f18d..c90da7e12 100644 --- a/icom/ic775.c +++ b/rigs/icom/ic775.c @@ -170,8 +170,8 @@ const struct rig_caps ic775_caps = .priv = (void *)& ic775_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic78.c b/rigs/icom/ic78.c similarity index 98% rename from icom/ic78.c rename to rigs/icom/ic78.c index 85c791f44..c8e08ae26 100644 --- a/icom/ic78.c +++ b/rigs/icom/ic78.c @@ -167,8 +167,8 @@ const struct rig_caps ic78_caps = .priv = (void *)& ic78_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic7800.c b/rigs/icom/ic7800.c similarity index 99% rename from icom/ic7800.c rename to rigs/icom/ic7800.c index d543788f2..58606dfef 100644 --- a/icom/ic7800.c +++ b/rigs/icom/ic7800.c @@ -274,8 +274,8 @@ const struct rig_caps ic7800_caps = .priv = (void *)& ic7800_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic781.c b/rigs/icom/ic781.c similarity index 99% rename from icom/ic781.c rename to rigs/icom/ic781.c index 89878f7eb..80fbf7ddc 100644 --- a/icom/ic781.c +++ b/rigs/icom/ic781.c @@ -168,8 +168,8 @@ const struct rig_caps ic781_caps = .priv = (void *)& ic781_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic785x.c b/rigs/icom/ic785x.c similarity index 99% rename from icom/ic785x.c rename to rigs/icom/ic785x.c index 1600b7e68..e50ba77c3 100644 --- a/icom/ic785x.c +++ b/rigs/icom/ic785x.c @@ -280,7 +280,7 @@ const struct rig_caps ic785x_caps = .rig_init = icom_init, .rig_cleanup = icom_cleanup, .rig_open = icom_rig_open, - .rig_close = NULL, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic820h.c b/rigs/icom/ic820h.c similarity index 98% rename from icom/ic820h.c rename to rigs/icom/ic820h.c index 45b2b2230..382095717 100644 --- a/icom/ic820h.c +++ b/rigs/icom/ic820h.c @@ -160,8 +160,8 @@ const struct rig_caps ic820h_caps = .priv = (void *)& ic820h_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic821h.c b/rigs/icom/ic821h.c similarity index 98% rename from icom/ic821h.c rename to rigs/icom/ic821h.c index be7c8e15c..b8fa1645a 100644 --- a/icom/ic821h.c +++ b/rigs/icom/ic821h.c @@ -160,8 +160,8 @@ const struct rig_caps ic821h_caps = .priv = (void *)& ic821h_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/ic910.c b/rigs/icom/ic910.c similarity index 99% rename from icom/ic910.c rename to rigs/icom/ic910.c index 2dbe4913e..ed4dfb3f4 100644 --- a/icom/ic910.c +++ b/rigs/icom/ic910.c @@ -579,6 +579,8 @@ const struct rig_caps ic910_caps = .scan = icom_scan, .get_dcd = icom_get_dcd, .decode_event = icom_decode_event, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_split_vfo = icom_set_split_vfo, .set_split_freq = icom_set_split_freq, .get_split_freq = icom_get_split_freq, diff --git a/icom/ic9100.c b/rigs/icom/ic9100.c similarity index 99% rename from icom/ic9100.c rename to rigs/icom/ic9100.c index 5c7ed320b..60e36f173 100644 --- a/icom/ic9100.c +++ b/rigs/icom/ic9100.c @@ -223,8 +223,8 @@ const struct rig_caps ic9100_caps = .priv = (void *)& ic9100_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .cfgparams = icom_cfg_params, .set_conf = icom_set_conf, diff --git a/icom/ic92d.c b/rigs/icom/ic92d.c similarity index 99% rename from icom/ic92d.c rename to rigs/icom/ic92d.c index a36c49bb9..7b9781631 100644 --- a/icom/ic92d.c +++ b/rigs/icom/ic92d.c @@ -211,8 +211,8 @@ const struct rig_caps ic92d_caps = .priv = (void *)& ic92d_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .get_info = ic92d_get_info, diff --git a/icom/ic970.c b/rigs/icom/ic970.c similarity index 98% rename from icom/ic970.c rename to rigs/icom/ic970.c index 893f16874..f532bf88d 100644 --- a/icom/ic970.c +++ b/rigs/icom/ic970.c @@ -147,8 +147,8 @@ const struct rig_caps ic970_caps = .priv = (void *)& ic970_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/icom.c b/rigs/icom/icom.c similarity index 99% rename from icom/icom.c rename to rigs/icom/icom.c index b8fd534f2..76dd50eb1 100644 --- a/icom/icom.c +++ b/rigs/icom/icom.c @@ -740,6 +740,16 @@ icom_rig_open(RIG *rig) return retval; } +/* + * ICOM rig close routine + */ +int +icom_rig_close(RIG *rig) +{ + // Nothing to do yet + rig_debug(RIG_DEBUG_TRACE,"%s: called\n", __func__); + return RIG_OK; +} /* * icom_set_freq diff --git a/icom/icom.h b/rigs/icom/icom.h similarity index 99% rename from icom/icom.h rename to rigs/icom/icom.h index 8c34d2a65..bf53c9b50 100644 --- a/icom/icom.h +++ b/rigs/icom/icom.h @@ -30,7 +30,7 @@ #include #endif -#define BACKEND_VER "0.22" +#define BACKEND_VER "0.23" /* * defines used by comp_cal_str in rig.c @@ -187,6 +187,7 @@ pbwidth_t icom_get_dsp_flt(RIG *rig, rmode_t mode); int icom_init(RIG *rig); int icom_rig_open(RIG *rig); +int icom_rig_close(RIG *rig); int icom_cleanup(RIG *rig); int icom_set_freq(RIG *rig, vfo_t vfo, freq_t freq); int icom_get_freq(RIG *rig, vfo_t vfo, freq_t *freq); diff --git a/icom/icom_defs.h b/rigs/icom/icom_defs.h similarity index 100% rename from icom/icom_defs.h rename to rigs/icom/icom_defs.h diff --git a/icom/icr10.c b/rigs/icom/icr10.c similarity index 98% rename from icom/icr10.c rename to rigs/icom/icr10.c index f8b7d69b8..6209ca92c 100644 --- a/icom/icr10.c +++ b/rigs/icom/icr10.c @@ -139,8 +139,8 @@ const struct rig_caps icr10_caps = .priv = (void *)& icr10_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/icr20.c b/rigs/icom/icr20.c similarity index 98% rename from icom/icr20.c rename to rigs/icom/icr20.c index 9e7569a3e..f3824a88d 100644 --- a/icom/icr20.c +++ b/rigs/icom/icr20.c @@ -144,8 +144,8 @@ const struct rig_caps icr20_caps = .priv = (void *)& icr20_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/icr30.c b/rigs/icom/icr30.c similarity index 96% rename from icom/icr30.c rename to rigs/icom/icr30.c index 1691a1a73..6f0497679 100644 --- a/icom/icr30.c +++ b/rigs/icom/icr30.c @@ -231,17 +231,17 @@ const struct rig_caps icr30_caps = .set_powerstat = icom_set_powerstat, .priv = (void *)& icr30_priv_caps, - .rig_init = icom_init, - .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_init = icom_init, + .rig_cleanup = icom_cleanup, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, - .set_freq = icom_set_freq, - .get_freq = icom_get_freq, - .set_mode = icr30_set_mode, - .get_mode = icom_get_mode, - .vfo_op = icom_vfo_op, - .set_vfo = icom_set_vfo, + .set_freq = icom_set_freq, + .get_freq = icom_get_freq, + .set_mode = icr30_set_mode, + .get_mode = icom_get_mode, + .vfo_op = icom_vfo_op, + .set_vfo = icom_set_vfo, .set_rptr_offs = icom_set_rptr_offs, .get_rptr_offs = icom_get_rptr_offs, .set_rptr_shift = icom_set_rptr_shift, diff --git a/icom/icr6.c b/rigs/icom/icr6.c similarity index 98% rename from icom/icr6.c rename to rigs/icom/icr6.c index e0c1dfe59..250546a70 100644 --- a/icom/icr6.c +++ b/rigs/icom/icr6.c @@ -151,8 +151,8 @@ const struct rig_caps icr6_caps = .priv = (void *)& icr6_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/icr7000.c b/rigs/icom/icr7000.c similarity index 99% rename from icom/icr7000.c rename to rigs/icom/icr7000.c index 420a1b863..d5c7e5f08 100644 --- a/icom/icr7000.c +++ b/rigs/icom/icr7000.c @@ -149,8 +149,8 @@ const struct rig_caps icr7000_caps = .priv = (void *)& icr7000_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = r7000_set_freq, .get_freq = icom_get_freq, diff --git a/icom/icr71.c b/rigs/icom/icr71.c similarity index 98% rename from icom/icr71.c rename to rigs/icom/icr71.c index 794cb65b7..739812c22 100644 --- a/icom/icr71.c +++ b/rigs/icom/icr71.c @@ -128,8 +128,8 @@ const struct rig_caps icr71_caps = .priv = (void *)& icr71_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/icr72.c b/rigs/icom/icr72.c similarity index 98% rename from icom/icr72.c rename to rigs/icom/icr72.c index bac7ae91a..cfb97bed4 100644 --- a/icom/icr72.c +++ b/rigs/icom/icr72.c @@ -139,8 +139,8 @@ const struct rig_caps icr72_caps = .priv = (void *)& icr72_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/icr75.c b/rigs/icom/icr75.c similarity index 99% rename from icom/icr75.c rename to rigs/icom/icr75.c index 8d23e64e8..dc4ce1fde 100644 --- a/icom/icr75.c +++ b/rigs/icom/icr75.c @@ -211,8 +211,8 @@ const struct rig_caps icr75_caps = .priv = (void *)& icr75_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/icr8500.c b/rigs/icom/icr8500.c similarity index 99% rename from icom/icr8500.c rename to rigs/icom/icr8500.c index e77726eeb..e836367a2 100644 --- a/icom/icr8500.c +++ b/rigs/icom/icr8500.c @@ -181,8 +181,8 @@ const struct rig_caps icr8500_caps = .priv = (void *)& icr8500_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/icr8600.c b/rigs/icom/icr8600.c similarity index 99% rename from icom/icr8600.c rename to rigs/icom/icr8600.c index aae5ff0cd..9cabcf525 100644 --- a/icom/icr8600.c +++ b/rigs/icom/icr8600.c @@ -225,8 +225,8 @@ const struct rig_caps icr8600_caps = .priv = (void *)& icr8600_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = icom_rig_open, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/icr9000.c b/rigs/icom/icr9000.c similarity index 96% rename from icom/icr9000.c rename to rigs/icom/icr9000.c index ae61b255a..237eb5625 100644 --- a/icom/icr9000.c +++ b/rigs/icom/icr9000.c @@ -65,8 +65,6 @@ static const struct icom_priv_caps icr9000_priv_caps = r9000_ts_sc_list }; -static int icr9000_open(RIG *rig); - /* * ICR9000A rig capabilities. */ @@ -166,8 +164,8 @@ const struct rig_caps icr9000_caps = .priv = (void *)& icr9000_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = icr9000_open, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, @@ -194,14 +192,3 @@ const struct rig_caps icr9000_caps = .scan = icom_scan, .get_dcd = icom_get_dcd, }; - - -/* - * Function definitions below - */ - -int icr9000_open(RIG *rig) -{ - return icom_scan(rig, RIG_VFO_CURR, RIG_SCAN_STOP, 0); -} - diff --git a/icom/icr9500.c b/rigs/icom/icr9500.c similarity index 94% rename from icom/icr9500.c rename to rigs/icom/icr9500.c index e814f8d53..d0b6cc939 100644 --- a/icom/icr9500.c +++ b/rigs/icom/icr9500.c @@ -59,7 +59,19 @@ /* TODO: S-Meter measurements */ -#define ICR9500_STR_CAL UNKNOWN_IC_STR_CAL +/* This is just a copy if IC9700_STR_CAL */ +/* Hope it's correct */ +#define ICR9500_STR_CAL { 7, \ + { \ + { 0, -54 }, \ + { 10, -48 }, \ + { 30, -36 }, \ + { 60, -24 }, \ + { 90, -12 }, \ + { 120, 0 }, \ + { 241, 64 } \ + } } + static const struct icom_priv_caps icr9500_priv_caps = { @@ -77,9 +89,9 @@ const struct rig_caps icr9500_caps = .rig_model = RIG_MODEL_ICR9500, .model_name = "IC-R9500", .mfg_name = "Icom", - .version = BACKEND_VER ".1", + .version = BACKEND_VER ".2", .copyright = "LGPL", - .status = RIG_STATUS_UNTESTED, + .status = RIG_STATUS_BETA, .rig_type = RIG_TYPE_RECEIVER, .ptt_type = RIG_PTT_NONE, .dcd_type = RIG_DCD_RIG, @@ -176,8 +188,8 @@ const struct rig_caps icr9500_caps = .priv = (void *)& icr9500_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/icrx7.c b/rigs/icom/icrx7.c similarity index 98% rename from icom/icrx7.c rename to rigs/icom/icrx7.c index 53ffff74d..0d010c81f 100644 --- a/icom/icrx7.c +++ b/rigs/icom/icrx7.c @@ -136,8 +136,8 @@ const struct rig_caps icrx7_caps = .priv = (void *)& icrx7_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_close, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/id1.c b/rigs/icom/id1.c similarity index 98% rename from icom/id1.c rename to rigs/icom/id1.c index f906663ca..5328c514b 100644 --- a/icom/id1.c +++ b/rigs/icom/id1.c @@ -172,8 +172,8 @@ const struct rig_caps id1_caps = .priv = (void *)& id1_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_open, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/id31.c b/rigs/icom/id31.c similarity index 98% rename from icom/id31.c rename to rigs/icom/id31.c index 5a13eadc0..661357b33 100644 --- a/icom/id31.c +++ b/rigs/icom/id31.c @@ -170,8 +170,8 @@ const struct rig_caps id31_caps = .priv = (void *)& id31_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_open, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/id4100.c b/rigs/icom/id4100.c similarity index 99% rename from icom/id4100.c rename to rigs/icom/id4100.c index d2ac3509d..50b84d01f 100644 --- a/icom/id4100.c +++ b/rigs/icom/id4100.c @@ -178,8 +178,8 @@ const struct rig_caps id4100_caps = .priv = (void *)& id4100_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_open, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/id51.c b/rigs/icom/id51.c similarity index 99% rename from icom/id51.c rename to rigs/icom/id51.c index 28f041e29..44cb26cb3 100644 --- a/icom/id51.c +++ b/rigs/icom/id51.c @@ -183,8 +183,8 @@ const struct rig_caps id51_caps = .priv = (void *)& id51_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_open, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/id5100.c b/rigs/icom/id5100.c similarity index 99% rename from icom/id5100.c rename to rigs/icom/id5100.c index 0e6f0c8f8..c28c948e1 100644 --- a/icom/id5100.c +++ b/rigs/icom/id5100.c @@ -178,8 +178,8 @@ const struct rig_caps id5100_caps = .priv = (void *)& id5100_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_open, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/omni.c b/rigs/icom/omni.c similarity index 99% rename from icom/omni.c rename to rigs/icom/omni.c index e630b667c..933815bf5 100644 --- a/icom/omni.c +++ b/rigs/icom/omni.c @@ -162,6 +162,8 @@ const struct rig_caps omnivip_caps = .rig_init = icom_init, .rig_cleanup = icom_cleanup, + .rig_open = icom_rig_open, + .rig_close = icom_rig_open, .set_freq = icom_set_freq, .get_freq = icom_get_freq, .set_mode = icom_set_mode, diff --git a/icom/optoscan.c b/rigs/icom/optoscan.c similarity index 100% rename from icom/optoscan.c rename to rigs/icom/optoscan.c diff --git a/icom/optoscan.h b/rigs/icom/optoscan.h similarity index 100% rename from icom/optoscan.h rename to rigs/icom/optoscan.h diff --git a/icom/os456.c b/rigs/icom/os456.c similarity index 100% rename from icom/os456.c rename to rigs/icom/os456.c diff --git a/icom/os535.c b/rigs/icom/os535.c similarity index 100% rename from icom/os535.c rename to rigs/icom/os535.c diff --git a/icom/perseus.c b/rigs/icom/perseus.c similarity index 98% rename from icom/perseus.c rename to rigs/icom/perseus.c index 0b1adeae5..738dab17d 100644 --- a/icom/perseus.c +++ b/rigs/icom/perseus.c @@ -160,8 +160,8 @@ const struct rig_caps perseus_caps = .priv = (void *)& perseus_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_open, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/icom/x108g.c b/rigs/icom/x108g.c similarity index 99% rename from icom/x108g.c rename to rigs/icom/x108g.c index 89c4a5aa4..e7611d9d6 100644 --- a/icom/x108g.c +++ b/rigs/icom/x108g.c @@ -260,8 +260,8 @@ const struct rig_caps x108g_caps = .priv = (void *)& x108g_priv_caps, .rig_init = icom_init, .rig_cleanup = icom_cleanup, - .rig_open = NULL, - .rig_close = NULL, + .rig_open = icom_rig_open, + .rig_close = icom_rig_open, .set_freq = icom_set_freq, .get_freq = icom_get_freq, diff --git a/jrc/Android.mk b/rigs/jrc/Android.mk similarity index 100% rename from jrc/Android.mk rename to rigs/jrc/Android.mk diff --git a/jrc/Makefile.am b/rigs/jrc/Makefile.am similarity index 100% rename from jrc/Makefile.am rename to rigs/jrc/Makefile.am diff --git a/jrc/jrc.c b/rigs/jrc/jrc.c similarity index 100% rename from jrc/jrc.c rename to rigs/jrc/jrc.c diff --git a/jrc/jrc.h b/rigs/jrc/jrc.h similarity index 100% rename from jrc/jrc.h rename to rigs/jrc/jrc.h diff --git a/jrc/nrd525.c b/rigs/jrc/nrd525.c similarity index 100% rename from jrc/nrd525.c rename to rigs/jrc/nrd525.c diff --git a/jrc/nrd535.c b/rigs/jrc/nrd535.c similarity index 100% rename from jrc/nrd535.c rename to rigs/jrc/nrd535.c diff --git a/jrc/nrd545.c b/rigs/jrc/nrd545.c similarity index 100% rename from jrc/nrd545.c rename to rigs/jrc/nrd545.c diff --git a/kachina/505dsp.c b/rigs/kachina/505dsp.c similarity index 100% rename from kachina/505dsp.c rename to rigs/kachina/505dsp.c diff --git a/kachina/Android.mk b/rigs/kachina/Android.mk similarity index 100% rename from kachina/Android.mk rename to rigs/kachina/Android.mk diff --git a/kachina/Makefile.am b/rigs/kachina/Makefile.am similarity index 100% rename from kachina/Makefile.am rename to rigs/kachina/Makefile.am diff --git a/kachina/kachina.c b/rigs/kachina/kachina.c similarity index 100% rename from kachina/kachina.c rename to rigs/kachina/kachina.c diff --git a/kachina/kachina.h b/rigs/kachina/kachina.h similarity index 100% rename from kachina/kachina.h rename to rigs/kachina/kachina.h diff --git a/kenwood/Android.mk b/rigs/kenwood/Android.mk similarity index 100% rename from kenwood/Android.mk rename to rigs/kenwood/Android.mk diff --git a/kenwood/Makefile.am b/rigs/kenwood/Makefile.am similarity index 100% rename from kenwood/Makefile.am rename to rigs/kenwood/Makefile.am diff --git a/kenwood/README.flex b/rigs/kenwood/README.flex similarity index 100% rename from kenwood/README.flex rename to rigs/kenwood/README.flex diff --git a/kenwood/README.k2 b/rigs/kenwood/README.k2 similarity index 100% rename from kenwood/README.k2 rename to rigs/kenwood/README.k2 diff --git a/kenwood/README.k3 b/rigs/kenwood/README.k3 similarity index 100% rename from kenwood/README.k3 rename to rigs/kenwood/README.k3 diff --git a/kenwood/README.kenwood b/rigs/kenwood/README.kenwood similarity index 100% rename from kenwood/README.kenwood rename to rigs/kenwood/README.kenwood diff --git a/kenwood/README.ts2k b/rigs/kenwood/README.ts2k similarity index 100% rename from kenwood/README.ts2k rename to rigs/kenwood/README.ts2k diff --git a/kenwood/elecraft.c b/rigs/kenwood/elecraft.c similarity index 100% rename from kenwood/elecraft.c rename to rigs/kenwood/elecraft.c diff --git a/kenwood/elecraft.h b/rigs/kenwood/elecraft.h similarity index 100% rename from kenwood/elecraft.h rename to rigs/kenwood/elecraft.h diff --git a/kenwood/flex.c b/rigs/kenwood/flex.c similarity index 100% rename from kenwood/flex.c rename to rigs/kenwood/flex.c diff --git a/kenwood/flex.h b/rigs/kenwood/flex.h similarity index 100% rename from kenwood/flex.h rename to rigs/kenwood/flex.h diff --git a/kenwood/flex6xxx.c b/rigs/kenwood/flex6xxx.c similarity index 100% rename from kenwood/flex6xxx.c rename to rigs/kenwood/flex6xxx.c diff --git a/kenwood/ic10.c b/rigs/kenwood/ic10.c similarity index 100% rename from kenwood/ic10.c rename to rigs/kenwood/ic10.c diff --git a/kenwood/ic10.h b/rigs/kenwood/ic10.h similarity index 100% rename from kenwood/ic10.h rename to rigs/kenwood/ic10.h diff --git a/kenwood/k2.c b/rigs/kenwood/k2.c similarity index 100% rename from kenwood/k2.c rename to rigs/kenwood/k2.c diff --git a/kenwood/k3.c b/rigs/kenwood/k3.c similarity index 100% rename from kenwood/k3.c rename to rigs/kenwood/k3.c diff --git a/kenwood/kenwood.c b/rigs/kenwood/kenwood.c similarity index 100% rename from kenwood/kenwood.c rename to rigs/kenwood/kenwood.c diff --git a/kenwood/kenwood.h b/rigs/kenwood/kenwood.h similarity index 100% rename from kenwood/kenwood.h rename to rigs/kenwood/kenwood.h diff --git a/kenwood/pihpsdr.c b/rigs/kenwood/pihpsdr.c similarity index 100% rename from kenwood/pihpsdr.c rename to rigs/kenwood/pihpsdr.c diff --git a/kenwood/r5000.c b/rigs/kenwood/r5000.c similarity index 100% rename from kenwood/r5000.c rename to rigs/kenwood/r5000.c diff --git a/kenwood/th.c b/rigs/kenwood/th.c similarity index 100% rename from kenwood/th.c rename to rigs/kenwood/th.c diff --git a/kenwood/th.h b/rigs/kenwood/th.h similarity index 100% rename from kenwood/th.h rename to rigs/kenwood/th.h diff --git a/kenwood/thd7.c b/rigs/kenwood/thd7.c similarity index 100% rename from kenwood/thd7.c rename to rigs/kenwood/thd7.c diff --git a/kenwood/thd72.c b/rigs/kenwood/thd72.c similarity index 100% rename from kenwood/thd72.c rename to rigs/kenwood/thd72.c diff --git a/kenwood/thd74.c b/rigs/kenwood/thd74.c similarity index 100% rename from kenwood/thd74.c rename to rigs/kenwood/thd74.c diff --git a/kenwood/thf6a.c b/rigs/kenwood/thf6a.c similarity index 100% rename from kenwood/thf6a.c rename to rigs/kenwood/thf6a.c diff --git a/kenwood/thf7.c b/rigs/kenwood/thf7.c similarity index 100% rename from kenwood/thf7.c rename to rigs/kenwood/thf7.c diff --git a/kenwood/thg71.c b/rigs/kenwood/thg71.c similarity index 100% rename from kenwood/thg71.c rename to rigs/kenwood/thg71.c diff --git a/kenwood/tmd700.c b/rigs/kenwood/tmd700.c similarity index 100% rename from kenwood/tmd700.c rename to rigs/kenwood/tmd700.c diff --git a/kenwood/tmd710.c b/rigs/kenwood/tmd710.c similarity index 100% rename from kenwood/tmd710.c rename to rigs/kenwood/tmd710.c diff --git a/kenwood/tmv7.c b/rigs/kenwood/tmv7.c similarity index 100% rename from kenwood/tmv7.c rename to rigs/kenwood/tmv7.c diff --git a/kenwood/transfox.c b/rigs/kenwood/transfox.c similarity index 100% rename from kenwood/transfox.c rename to rigs/kenwood/transfox.c diff --git a/kenwood/trc80.c b/rigs/kenwood/trc80.c similarity index 100% rename from kenwood/trc80.c rename to rigs/kenwood/trc80.c diff --git a/kenwood/ts140.c b/rigs/kenwood/ts140.c similarity index 100% rename from kenwood/ts140.c rename to rigs/kenwood/ts140.c diff --git a/kenwood/ts2000.c b/rigs/kenwood/ts2000.c similarity index 100% rename from kenwood/ts2000.c rename to rigs/kenwood/ts2000.c diff --git a/kenwood/ts2000.txt b/rigs/kenwood/ts2000.txt similarity index 100% rename from kenwood/ts2000.txt rename to rigs/kenwood/ts2000.txt diff --git a/kenwood/ts440.c b/rigs/kenwood/ts440.c similarity index 100% rename from kenwood/ts440.c rename to rigs/kenwood/ts440.c diff --git a/kenwood/ts450s.c b/rigs/kenwood/ts450s.c similarity index 100% rename from kenwood/ts450s.c rename to rigs/kenwood/ts450s.c diff --git a/kenwood/ts480.c b/rigs/kenwood/ts480.c similarity index 100% rename from kenwood/ts480.c rename to rigs/kenwood/ts480.c diff --git a/kenwood/ts50s.c b/rigs/kenwood/ts50s.c similarity index 100% rename from kenwood/ts50s.c rename to rigs/kenwood/ts50s.c diff --git a/kenwood/ts570.c b/rigs/kenwood/ts570.c similarity index 100% rename from kenwood/ts570.c rename to rigs/kenwood/ts570.c diff --git a/kenwood/ts590.c b/rigs/kenwood/ts590.c similarity index 100% rename from kenwood/ts590.c rename to rigs/kenwood/ts590.c diff --git a/kenwood/ts680.c b/rigs/kenwood/ts680.c similarity index 100% rename from kenwood/ts680.c rename to rigs/kenwood/ts680.c diff --git a/kenwood/ts690.c b/rigs/kenwood/ts690.c similarity index 100% rename from kenwood/ts690.c rename to rigs/kenwood/ts690.c diff --git a/kenwood/ts711.c b/rigs/kenwood/ts711.c similarity index 100% rename from kenwood/ts711.c rename to rigs/kenwood/ts711.c diff --git a/kenwood/ts790.c b/rigs/kenwood/ts790.c similarity index 100% rename from kenwood/ts790.c rename to rigs/kenwood/ts790.c diff --git a/kenwood/ts811.c b/rigs/kenwood/ts811.c similarity index 100% rename from kenwood/ts811.c rename to rigs/kenwood/ts811.c diff --git a/kenwood/ts850.c b/rigs/kenwood/ts850.c similarity index 100% rename from kenwood/ts850.c rename to rigs/kenwood/ts850.c diff --git a/kenwood/ts870s.c b/rigs/kenwood/ts870s.c similarity index 100% rename from kenwood/ts870s.c rename to rigs/kenwood/ts870s.c diff --git a/kenwood/ts930.c b/rigs/kenwood/ts930.c similarity index 100% rename from kenwood/ts930.c rename to rigs/kenwood/ts930.c diff --git a/kenwood/ts940.c b/rigs/kenwood/ts940.c similarity index 100% rename from kenwood/ts940.c rename to rigs/kenwood/ts940.c diff --git a/kenwood/ts950.c b/rigs/kenwood/ts950.c similarity index 100% rename from kenwood/ts950.c rename to rigs/kenwood/ts950.c diff --git a/kenwood/ts990s.c b/rigs/kenwood/ts990s.c similarity index 100% rename from kenwood/ts990s.c rename to rigs/kenwood/ts990s.c diff --git a/kenwood/ts990s.h b/rigs/kenwood/ts990s.h similarity index 100% rename from kenwood/ts990s.h rename to rigs/kenwood/ts990s.h diff --git a/kenwood/xg3.c b/rigs/kenwood/xg3.c similarity index 100% rename from kenwood/xg3.c rename to rigs/kenwood/xg3.c diff --git a/kit/Android.mk b/rigs/kit/Android.mk similarity index 100% rename from kit/Android.mk rename to rigs/kit/Android.mk diff --git a/kit/Makefile.am b/rigs/kit/Makefile.am similarity index 100% rename from kit/Makefile.am rename to rigs/kit/Makefile.am diff --git a/kit/README.funcubedongle b/rigs/kit/README.funcubedongle similarity index 100% rename from kit/README.funcubedongle rename to rigs/kit/README.funcubedongle diff --git a/kit/dds60.c b/rigs/kit/dds60.c similarity index 100% rename from kit/dds60.c rename to rigs/kit/dds60.c diff --git a/kit/drt1.c b/rigs/kit/drt1.c similarity index 100% rename from kit/drt1.c rename to rigs/kit/drt1.c diff --git a/kit/dwt.c b/rigs/kit/dwt.c similarity index 100% rename from kit/dwt.c rename to rigs/kit/dwt.c diff --git a/kit/elektor304.c b/rigs/kit/elektor304.c similarity index 100% rename from kit/elektor304.c rename to rigs/kit/elektor304.c diff --git a/kit/elektor507.c b/rigs/kit/elektor507.c similarity index 100% rename from kit/elektor507.c rename to rigs/kit/elektor507.c diff --git a/kit/fifisdr.c b/rigs/kit/fifisdr.c similarity index 100% rename from kit/fifisdr.c rename to rigs/kit/fifisdr.c diff --git a/kit/funcube.c b/rigs/kit/funcube.c similarity index 100% rename from kit/funcube.c rename to rigs/kit/funcube.c diff --git a/kit/funcube.h b/rigs/kit/funcube.h similarity index 100% rename from kit/funcube.h rename to rigs/kit/funcube.h diff --git a/kit/hiqsdr.c b/rigs/kit/hiqsdr.c similarity index 100% rename from kit/hiqsdr.c rename to rigs/kit/hiqsdr.c diff --git a/kit/kit.c b/rigs/kit/kit.c similarity index 100% rename from kit/kit.c rename to rigs/kit/kit.c diff --git a/kit/kit.h b/rigs/kit/kit.h similarity index 100% rename from kit/kit.h rename to rigs/kit/kit.h diff --git a/kit/miniVNA.c b/rigs/kit/miniVNA.c similarity index 100% rename from kit/miniVNA.c rename to rigs/kit/miniVNA.c diff --git a/kit/pcrotor.c b/rigs/kit/pcrotor.c similarity index 100% rename from kit/pcrotor.c rename to rigs/kit/pcrotor.c diff --git a/kit/rs_hfiq.c b/rigs/kit/rs_hfiq.c similarity index 100% rename from kit/rs_hfiq.c rename to rigs/kit/rs_hfiq.c diff --git a/kit/si570avrusb.c b/rigs/kit/si570avrusb.c similarity index 100% rename from kit/si570avrusb.c rename to rigs/kit/si570avrusb.c diff --git a/kit/si570avrusb.h b/rigs/kit/si570avrusb.h similarity index 100% rename from kit/si570avrusb.h rename to rigs/kit/si570avrusb.h diff --git a/kit/usrp.c b/rigs/kit/usrp.c similarity index 100% rename from kit/usrp.c rename to rigs/kit/usrp.c diff --git a/kit/usrp_impl.cc b/rigs/kit/usrp_impl.cc similarity index 100% rename from kit/usrp_impl.cc rename to rigs/kit/usrp_impl.cc diff --git a/kit/usrp_impl.h b/rigs/kit/usrp_impl.h similarity index 100% rename from kit/usrp_impl.h rename to rigs/kit/usrp_impl.h diff --git a/lowe/Android.mk b/rigs/lowe/Android.mk similarity index 100% rename from lowe/Android.mk rename to rigs/lowe/Android.mk diff --git a/lowe/Makefile.am b/rigs/lowe/Makefile.am similarity index 100% rename from lowe/Makefile.am rename to rigs/lowe/Makefile.am diff --git a/lowe/hf235.c b/rigs/lowe/hf235.c similarity index 100% rename from lowe/hf235.c rename to rigs/lowe/hf235.c diff --git a/lowe/lowe.c b/rigs/lowe/lowe.c similarity index 100% rename from lowe/lowe.c rename to rigs/lowe/lowe.c diff --git a/lowe/lowe.h b/rigs/lowe/lowe.h similarity index 100% rename from lowe/lowe.h rename to rigs/lowe/lowe.h diff --git a/pcr/Android.mk b/rigs/pcr/Android.mk similarity index 100% rename from pcr/Android.mk rename to rigs/pcr/Android.mk diff --git a/pcr/Makefile.am b/rigs/pcr/Makefile.am similarity index 100% rename from pcr/Makefile.am rename to rigs/pcr/Makefile.am diff --git a/pcr/pcr.c b/rigs/pcr/pcr.c similarity index 100% rename from pcr/pcr.c rename to rigs/pcr/pcr.c diff --git a/pcr/pcr.h b/rigs/pcr/pcr.h similarity index 100% rename from pcr/pcr.h rename to rigs/pcr/pcr.h diff --git a/pcr/pcr100.c b/rigs/pcr/pcr100.c similarity index 100% rename from pcr/pcr100.c rename to rigs/pcr/pcr100.c diff --git a/pcr/pcr1000.c b/rigs/pcr/pcr1000.c similarity index 100% rename from pcr/pcr1000.c rename to rigs/pcr/pcr1000.c diff --git a/pcr/pcr1500.c b/rigs/pcr/pcr1500.c similarity index 100% rename from pcr/pcr1500.c rename to rigs/pcr/pcr1500.c diff --git a/pcr/pcr2500.c b/rigs/pcr/pcr2500.c similarity index 100% rename from pcr/pcr2500.c rename to rigs/pcr/pcr2500.c diff --git a/prm80/Android.mk b/rigs/prm80/Android.mk similarity index 100% rename from prm80/Android.mk rename to rigs/prm80/Android.mk diff --git a/prm80/Makefile.am b/rigs/prm80/Makefile.am similarity index 100% rename from prm80/Makefile.am rename to rigs/prm80/Makefile.am diff --git a/prm80/prm80.c b/rigs/prm80/prm80.c similarity index 100% rename from prm80/prm80.c rename to rigs/prm80/prm80.c diff --git a/prm80/prm80.h b/rigs/prm80/prm80.h similarity index 100% rename from prm80/prm80.h rename to rigs/prm80/prm80.h diff --git a/prm80/prm8060.c b/rigs/prm80/prm8060.c similarity index 100% rename from prm80/prm8060.c rename to rigs/prm80/prm8060.c diff --git a/racal/Android.mk b/rigs/racal/Android.mk similarity index 100% rename from racal/Android.mk rename to rigs/racal/Android.mk diff --git a/racal/Makefile.am b/rigs/racal/Makefile.am similarity index 100% rename from racal/Makefile.am rename to rigs/racal/Makefile.am diff --git a/racal/ra3702.c b/rigs/racal/ra3702.c similarity index 100% rename from racal/ra3702.c rename to rigs/racal/ra3702.c diff --git a/racal/ra37xx.c b/rigs/racal/ra37xx.c similarity index 100% rename from racal/ra37xx.c rename to rigs/racal/ra37xx.c diff --git a/racal/ra37xx.h b/rigs/racal/ra37xx.h similarity index 100% rename from racal/ra37xx.h rename to rigs/racal/ra37xx.h diff --git a/racal/ra6790.c b/rigs/racal/ra6790.c similarity index 100% rename from racal/ra6790.c rename to rigs/racal/ra6790.c diff --git a/racal/racal.c b/rigs/racal/racal.c similarity index 100% rename from racal/racal.c rename to rigs/racal/racal.c diff --git a/racal/racal.h b/rigs/racal/racal.h similarity index 100% rename from racal/racal.h rename to rigs/racal/racal.h diff --git a/rft/Android.mk b/rigs/rft/Android.mk similarity index 100% rename from rft/Android.mk rename to rigs/rft/Android.mk diff --git a/rft/Makefile.am b/rigs/rft/Makefile.am similarity index 100% rename from rft/Makefile.am rename to rigs/rft/Makefile.am diff --git a/rft/ekd500.c b/rigs/rft/ekd500.c similarity index 100% rename from rft/ekd500.c rename to rigs/rft/ekd500.c diff --git a/rft/rft.c b/rigs/rft/rft.c similarity index 100% rename from rft/rft.c rename to rigs/rft/rft.c diff --git a/rft/rft.h b/rigs/rft/rft.h similarity index 100% rename from rft/rft.h rename to rigs/rft/rft.h diff --git a/rs/Android.mk b/rigs/rs/Android.mk similarity index 100% rename from rs/Android.mk rename to rigs/rs/Android.mk diff --git a/rs/Makefile.am b/rigs/rs/Makefile.am similarity index 100% rename from rs/Makefile.am rename to rigs/rs/Makefile.am diff --git a/rs/eb200.c b/rigs/rs/eb200.c similarity index 100% rename from rs/eb200.c rename to rigs/rs/eb200.c diff --git a/rs/esmc.c b/rigs/rs/esmc.c similarity index 100% rename from rs/esmc.c rename to rigs/rs/esmc.c diff --git a/rs/gp2000.c b/rigs/rs/gp2000.c similarity index 100% rename from rs/gp2000.c rename to rigs/rs/gp2000.c diff --git a/rs/gp2000.h b/rigs/rs/gp2000.h similarity index 100% rename from rs/gp2000.h rename to rigs/rs/gp2000.h diff --git a/rs/rs.c b/rigs/rs/rs.c similarity index 100% rename from rs/rs.c rename to rigs/rs/rs.c diff --git a/rs/rs.h b/rigs/rs/rs.h similarity index 100% rename from rs/rs.h rename to rigs/rs/rs.h diff --git a/rs/xk2100.c b/rigs/rs/xk2100.c similarity index 100% rename from rs/xk2100.c rename to rigs/rs/xk2100.c diff --git a/skanti/Android.mk b/rigs/skanti/Android.mk similarity index 100% rename from skanti/Android.mk rename to rigs/skanti/Android.mk diff --git a/skanti/Makefile.am b/rigs/skanti/Makefile.am similarity index 100% rename from skanti/Makefile.am rename to rigs/skanti/Makefile.am diff --git a/skanti/skanti.c b/rigs/skanti/skanti.c similarity index 100% rename from skanti/skanti.c rename to rigs/skanti/skanti.c diff --git a/skanti/skanti.h b/rigs/skanti/skanti.h similarity index 100% rename from skanti/skanti.h rename to rigs/skanti/skanti.h diff --git a/skanti/trp8000.c b/rigs/skanti/trp8000.c similarity index 100% rename from skanti/trp8000.c rename to rigs/skanti/trp8000.c diff --git a/skanti/trp8255.c b/rigs/skanti/trp8255.c similarity index 100% rename from skanti/trp8255.c rename to rigs/skanti/trp8255.c diff --git a/tapr/Android.mk b/rigs/tapr/Android.mk similarity index 100% rename from tapr/Android.mk rename to rigs/tapr/Android.mk diff --git a/tapr/Makefile.am b/rigs/tapr/Makefile.am similarity index 100% rename from tapr/Makefile.am rename to rigs/tapr/Makefile.am diff --git a/tapr/dsp10.c b/rigs/tapr/dsp10.c similarity index 100% rename from tapr/dsp10.c rename to rigs/tapr/dsp10.c diff --git a/tapr/tapr.c b/rigs/tapr/tapr.c similarity index 100% rename from tapr/tapr.c rename to rigs/tapr/tapr.c diff --git a/tapr/tapr.h b/rigs/tapr/tapr.h similarity index 100% rename from tapr/tapr.h rename to rigs/tapr/tapr.h diff --git a/tentec/Android.mk b/rigs/tentec/Android.mk similarity index 100% rename from tentec/Android.mk rename to rigs/tentec/Android.mk diff --git a/tentec/Makefile.am b/rigs/tentec/Makefile.am similarity index 100% rename from tentec/Makefile.am rename to rigs/tentec/Makefile.am diff --git a/tentec/README b/rigs/tentec/README similarity index 100% rename from tentec/README rename to rigs/tentec/README diff --git a/tentec/argonaut.c b/rigs/tentec/argonaut.c similarity index 100% rename from tentec/argonaut.c rename to rigs/tentec/argonaut.c diff --git a/tentec/jupiter.c b/rigs/tentec/jupiter.c similarity index 100% rename from tentec/jupiter.c rename to rigs/tentec/jupiter.c diff --git a/tentec/omnivii.c b/rigs/tentec/omnivii.c similarity index 100% rename from tentec/omnivii.c rename to rigs/tentec/omnivii.c diff --git a/tentec/orion.c b/rigs/tentec/orion.c similarity index 100% rename from tentec/orion.c rename to rigs/tentec/orion.c diff --git a/tentec/orion.h b/rigs/tentec/orion.h similarity index 100% rename from tentec/orion.h rename to rigs/tentec/orion.h diff --git a/tentec/paragon.c b/rigs/tentec/paragon.c similarity index 100% rename from tentec/paragon.c rename to rigs/tentec/paragon.c diff --git a/tentec/pegasus.c b/rigs/tentec/pegasus.c similarity index 100% rename from tentec/pegasus.c rename to rigs/tentec/pegasus.c diff --git a/tentec/rx320.c b/rigs/tentec/rx320.c similarity index 100% rename from tentec/rx320.c rename to rigs/tentec/rx320.c diff --git a/tentec/rx331.c b/rigs/tentec/rx331.c similarity index 100% rename from tentec/rx331.c rename to rigs/tentec/rx331.c diff --git a/tentec/rx331.h b/rigs/tentec/rx331.h similarity index 100% rename from tentec/rx331.h rename to rigs/tentec/rx331.h diff --git a/tentec/rx340.c b/rigs/tentec/rx340.c similarity index 100% rename from tentec/rx340.c rename to rigs/tentec/rx340.c diff --git a/tentec/rx350.c b/rigs/tentec/rx350.c similarity index 100% rename from tentec/rx350.c rename to rigs/tentec/rx350.c diff --git a/tentec/tentec.c b/rigs/tentec/tentec.c similarity index 100% rename from tentec/tentec.c rename to rigs/tentec/tentec.c diff --git a/tentec/tentec.h b/rigs/tentec/tentec.h similarity index 100% rename from tentec/tentec.h rename to rigs/tentec/tentec.h diff --git a/tentec/tentec2.c b/rigs/tentec/tentec2.c similarity index 100% rename from tentec/tentec2.c rename to rigs/tentec/tentec2.c diff --git a/tentec/tentec2.h b/rigs/tentec/tentec2.h similarity index 100% rename from tentec/tentec2.h rename to rigs/tentec/tentec2.h diff --git a/tentec/tt550.c b/rigs/tentec/tt550.c similarity index 100% rename from tentec/tt550.c rename to rigs/tentec/tt550.c diff --git a/tentec/tt550.h b/rigs/tentec/tt550.h similarity index 100% rename from tentec/tt550.h rename to rigs/tentec/tt550.h diff --git a/tuner/Android.mk b/rigs/tuner/Android.mk similarity index 100% rename from tuner/Android.mk rename to rigs/tuner/Android.mk diff --git a/tuner/Makefile.am b/rigs/tuner/Makefile.am similarity index 100% rename from tuner/Makefile.am rename to rigs/tuner/Makefile.am diff --git a/tuner/tuner.c b/rigs/tuner/tuner.c similarity index 100% rename from tuner/tuner.c rename to rigs/tuner/tuner.c diff --git a/tuner/tuner.h b/rigs/tuner/tuner.h similarity index 100% rename from tuner/tuner.h rename to rigs/tuner/tuner.h diff --git a/tuner/v4l.c b/rigs/tuner/v4l.c similarity index 100% rename from tuner/v4l.c rename to rigs/tuner/v4l.c diff --git a/tuner/v4l2.c b/rigs/tuner/v4l2.c similarity index 100% rename from tuner/v4l2.c rename to rigs/tuner/v4l2.c diff --git a/tuner/videodev.h b/rigs/tuner/videodev.h similarity index 100% rename from tuner/videodev.h rename to rigs/tuner/videodev.h diff --git a/tuner/videodev2.h b/rigs/tuner/videodev2.h similarity index 100% rename from tuner/videodev2.h rename to rigs/tuner/videodev2.h diff --git a/uniden/Android.mk b/rigs/uniden/Android.mk similarity index 100% rename from uniden/Android.mk rename to rigs/uniden/Android.mk diff --git a/uniden/Makefile.am b/rigs/uniden/Makefile.am similarity index 100% rename from uniden/Makefile.am rename to rigs/uniden/Makefile.am diff --git a/uniden/bc245.c b/rigs/uniden/bc245.c similarity index 100% rename from uniden/bc245.c rename to rigs/uniden/bc245.c diff --git a/uniden/bc250.c b/rigs/uniden/bc250.c similarity index 100% rename from uniden/bc250.c rename to rigs/uniden/bc250.c diff --git a/uniden/bc780.c b/rigs/uniden/bc780.c similarity index 100% rename from uniden/bc780.c rename to rigs/uniden/bc780.c diff --git a/uniden/bc895.c b/rigs/uniden/bc895.c similarity index 100% rename from uniden/bc895.c rename to rigs/uniden/bc895.c diff --git a/uniden/bc898.c b/rigs/uniden/bc898.c similarity index 100% rename from uniden/bc898.c rename to rigs/uniden/bc898.c diff --git a/uniden/bcd396t.c b/rigs/uniden/bcd396t.c similarity index 100% rename from uniden/bcd396t.c rename to rigs/uniden/bcd396t.c diff --git a/uniden/bcd996t.c b/rigs/uniden/bcd996t.c similarity index 100% rename from uniden/bcd996t.c rename to rigs/uniden/bcd996t.c diff --git a/uniden/pro2052.c b/rigs/uniden/pro2052.c similarity index 100% rename from uniden/pro2052.c rename to rigs/uniden/pro2052.c diff --git a/uniden/uniden.c b/rigs/uniden/uniden.c similarity index 100% rename from uniden/uniden.c rename to rigs/uniden/uniden.c diff --git a/uniden/uniden.h b/rigs/uniden/uniden.h similarity index 100% rename from uniden/uniden.h rename to rigs/uniden/uniden.h diff --git a/uniden/uniden_digital.c b/rigs/uniden/uniden_digital.c similarity index 100% rename from uniden/uniden_digital.c rename to rigs/uniden/uniden_digital.c diff --git a/uniden/uniden_digital.h b/rigs/uniden/uniden_digital.h similarity index 100% rename from uniden/uniden_digital.h rename to rigs/uniden/uniden_digital.h diff --git a/winradio/Android.mk b/rigs/winradio/Android.mk similarity index 100% rename from winradio/Android.mk rename to rigs/winradio/Android.mk diff --git a/winradio/Makefile.am b/rigs/winradio/Makefile.am similarity index 100% rename from winradio/Makefile.am rename to rigs/winradio/Makefile.am diff --git a/winradio/NOTES b/rigs/winradio/NOTES similarity index 100% rename from winradio/NOTES rename to rigs/winradio/NOTES diff --git a/winradio/g303.c b/rigs/winradio/g303.c similarity index 100% rename from winradio/g303.c rename to rigs/winradio/g303.c diff --git a/winradio/g305.c b/rigs/winradio/g305.c similarity index 100% rename from winradio/g305.c rename to rigs/winradio/g305.c diff --git a/winradio/g313-posix.c b/rigs/winradio/g313-posix.c similarity index 100% rename from winradio/g313-posix.c rename to rigs/winradio/g313-posix.c diff --git a/winradio/g313-win.c b/rigs/winradio/g313-win.c similarity index 100% rename from winradio/g313-win.c rename to rigs/winradio/g313-win.c diff --git a/winradio/linradio/radio_ioctl.h b/rigs/winradio/linradio/radio_ioctl.h similarity index 100% rename from winradio/linradio/radio_ioctl.h rename to rigs/winradio/linradio/radio_ioctl.h diff --git a/winradio/linradio/wrapi.h b/rigs/winradio/linradio/wrapi.h similarity index 100% rename from winradio/linradio/wrapi.h rename to rigs/winradio/linradio/wrapi.h diff --git a/winradio/linradio/wrg313api.c b/rigs/winradio/linradio/wrg313api.c similarity index 100% rename from winradio/linradio/wrg313api.c rename to rigs/winradio/linradio/wrg313api.c diff --git a/winradio/linradio/wrg313api.h b/rigs/winradio/linradio/wrg313api.h similarity index 100% rename from winradio/linradio/wrg313api.h rename to rigs/winradio/linradio/wrg313api.h diff --git a/winradio/winradio.c b/rigs/winradio/winradio.c similarity index 100% rename from winradio/winradio.c rename to rigs/winradio/winradio.c diff --git a/winradio/winradio.h b/rigs/winradio/winradio.h similarity index 100% rename from winradio/winradio.h rename to rigs/winradio/winradio.h diff --git a/winradio/wr1000.c b/rigs/winradio/wr1000.c similarity index 100% rename from winradio/wr1000.c rename to rigs/winradio/wr1000.c diff --git a/winradio/wr1500.c b/rigs/winradio/wr1500.c similarity index 100% rename from winradio/wr1500.c rename to rigs/winradio/wr1500.c diff --git a/winradio/wr1550.c b/rigs/winradio/wr1550.c similarity index 100% rename from winradio/wr1550.c rename to rigs/winradio/wr1550.c diff --git a/winradio/wr3100.c b/rigs/winradio/wr3100.c similarity index 100% rename from winradio/wr3100.c rename to rigs/winradio/wr3100.c diff --git a/winradio/wr3150.c b/rigs/winradio/wr3150.c similarity index 100% rename from winradio/wr3150.c rename to rigs/winradio/wr3150.c diff --git a/winradio/wr3500.c b/rigs/winradio/wr3500.c similarity index 100% rename from winradio/wr3500.c rename to rigs/winradio/wr3500.c diff --git a/winradio/wr3700.c b/rigs/winradio/wr3700.c similarity index 100% rename from winradio/wr3700.c rename to rigs/winradio/wr3700.c diff --git a/wj/Android.mk b/rigs/wj/Android.mk similarity index 100% rename from wj/Android.mk rename to rigs/wj/Android.mk diff --git a/wj/Makefile.am b/rigs/wj/Makefile.am similarity index 100% rename from wj/Makefile.am rename to rigs/wj/Makefile.am diff --git a/wj/wj.c b/rigs/wj/wj.c similarity index 100% rename from wj/wj.c rename to rigs/wj/wj.c diff --git a/wj/wj.h b/rigs/wj/wj.h similarity index 100% rename from wj/wj.h rename to rigs/wj/wj.h diff --git a/wj/wj8888.c b/rigs/wj/wj8888.c similarity index 100% rename from wj/wj8888.c rename to rigs/wj/wj8888.c diff --git a/yaesu/Android.mk b/rigs/yaesu/Android.mk similarity index 100% rename from yaesu/Android.mk rename to rigs/yaesu/Android.mk diff --git a/yaesu/Makefile.am b/rigs/yaesu/Makefile.am similarity index 100% rename from yaesu/Makefile.am rename to rigs/yaesu/Makefile.am diff --git a/yaesu/README.ft890 b/rigs/yaesu/README.ft890 similarity index 100% rename from yaesu/README.ft890 rename to rigs/yaesu/README.ft890 diff --git a/yaesu/README.ft920 b/rigs/yaesu/README.ft920 similarity index 100% rename from yaesu/README.ft920 rename to rigs/yaesu/README.ft920 diff --git a/yaesu/frg100.c b/rigs/yaesu/frg100.c similarity index 100% rename from yaesu/frg100.c rename to rigs/yaesu/frg100.c diff --git a/yaesu/frg100.h b/rigs/yaesu/frg100.h similarity index 100% rename from yaesu/frg100.h rename to rigs/yaesu/frg100.h diff --git a/yaesu/frg8800.c b/rigs/yaesu/frg8800.c similarity index 100% rename from yaesu/frg8800.c rename to rigs/yaesu/frg8800.c diff --git a/yaesu/frg9600.c b/rigs/yaesu/frg9600.c similarity index 100% rename from yaesu/frg9600.c rename to rigs/yaesu/frg9600.c diff --git a/yaesu/ft100.c b/rigs/yaesu/ft100.c similarity index 100% rename from yaesu/ft100.c rename to rigs/yaesu/ft100.c diff --git a/yaesu/ft100.h b/rigs/yaesu/ft100.h similarity index 100% rename from yaesu/ft100.h rename to rigs/yaesu/ft100.h diff --git a/yaesu/ft1000d.c b/rigs/yaesu/ft1000d.c similarity index 100% rename from yaesu/ft1000d.c rename to rigs/yaesu/ft1000d.c diff --git a/yaesu/ft1000d.h b/rigs/yaesu/ft1000d.h similarity index 100% rename from yaesu/ft1000d.h rename to rigs/yaesu/ft1000d.h diff --git a/yaesu/ft1000mp.c b/rigs/yaesu/ft1000mp.c similarity index 100% rename from yaesu/ft1000mp.c rename to rigs/yaesu/ft1000mp.c diff --git a/yaesu/ft1000mp.h b/rigs/yaesu/ft1000mp.h similarity index 100% rename from yaesu/ft1000mp.h rename to rigs/yaesu/ft1000mp.h diff --git a/yaesu/ft1200.c b/rigs/yaesu/ft1200.c similarity index 100% rename from yaesu/ft1200.c rename to rigs/yaesu/ft1200.c diff --git a/yaesu/ft1200.h b/rigs/yaesu/ft1200.h similarity index 100% rename from yaesu/ft1200.h rename to rigs/yaesu/ft1200.h diff --git a/yaesu/ft2000.c b/rigs/yaesu/ft2000.c similarity index 100% rename from yaesu/ft2000.c rename to rigs/yaesu/ft2000.c diff --git a/yaesu/ft2000.h b/rigs/yaesu/ft2000.h similarity index 100% rename from yaesu/ft2000.h rename to rigs/yaesu/ft2000.h diff --git a/yaesu/ft450.c b/rigs/yaesu/ft450.c similarity index 100% rename from yaesu/ft450.c rename to rigs/yaesu/ft450.c diff --git a/yaesu/ft450.h b/rigs/yaesu/ft450.h similarity index 100% rename from yaesu/ft450.h rename to rigs/yaesu/ft450.h diff --git a/yaesu/ft5000.c b/rigs/yaesu/ft5000.c similarity index 100% rename from yaesu/ft5000.c rename to rigs/yaesu/ft5000.c diff --git a/yaesu/ft5000.h b/rigs/yaesu/ft5000.h similarity index 100% rename from yaesu/ft5000.h rename to rigs/yaesu/ft5000.h diff --git a/yaesu/ft600.c b/rigs/yaesu/ft600.c similarity index 100% rename from yaesu/ft600.c rename to rigs/yaesu/ft600.c diff --git a/yaesu/ft600.h b/rigs/yaesu/ft600.h similarity index 100% rename from yaesu/ft600.h rename to rigs/yaesu/ft600.h diff --git a/yaesu/ft736.c b/rigs/yaesu/ft736.c similarity index 100% rename from yaesu/ft736.c rename to rigs/yaesu/ft736.c diff --git a/yaesu/ft747.c b/rigs/yaesu/ft747.c similarity index 100% rename from yaesu/ft747.c rename to rigs/yaesu/ft747.c diff --git a/yaesu/ft747.h b/rigs/yaesu/ft747.h similarity index 100% rename from yaesu/ft747.h rename to rigs/yaesu/ft747.h diff --git a/yaesu/ft757gx.c b/rigs/yaesu/ft757gx.c similarity index 100% rename from yaesu/ft757gx.c rename to rigs/yaesu/ft757gx.c diff --git a/yaesu/ft757gx.h b/rigs/yaesu/ft757gx.h similarity index 100% rename from yaesu/ft757gx.h rename to rigs/yaesu/ft757gx.h diff --git a/yaesu/ft767gx.c b/rigs/yaesu/ft767gx.c similarity index 100% rename from yaesu/ft767gx.c rename to rigs/yaesu/ft767gx.c diff --git a/yaesu/ft767gx.h b/rigs/yaesu/ft767gx.h similarity index 100% rename from yaesu/ft767gx.h rename to rigs/yaesu/ft767gx.h diff --git a/yaesu/ft817.c b/rigs/yaesu/ft817.c similarity index 100% rename from yaesu/ft817.c rename to rigs/yaesu/ft817.c diff --git a/yaesu/ft817.h b/rigs/yaesu/ft817.h similarity index 100% rename from yaesu/ft817.h rename to rigs/yaesu/ft817.h diff --git a/yaesu/ft840.c b/rigs/yaesu/ft840.c similarity index 100% rename from yaesu/ft840.c rename to rigs/yaesu/ft840.c diff --git a/yaesu/ft840.h b/rigs/yaesu/ft840.h similarity index 100% rename from yaesu/ft840.h rename to rigs/yaesu/ft840.h diff --git a/yaesu/ft847.c b/rigs/yaesu/ft847.c similarity index 100% rename from yaesu/ft847.c rename to rigs/yaesu/ft847.c diff --git a/yaesu/ft847.h b/rigs/yaesu/ft847.h similarity index 100% rename from yaesu/ft847.h rename to rigs/yaesu/ft847.h diff --git a/yaesu/ft857.c b/rigs/yaesu/ft857.c similarity index 100% rename from yaesu/ft857.c rename to rigs/yaesu/ft857.c diff --git a/yaesu/ft857.h b/rigs/yaesu/ft857.h similarity index 100% rename from yaesu/ft857.h rename to rigs/yaesu/ft857.h diff --git a/yaesu/ft890.c b/rigs/yaesu/ft890.c similarity index 100% rename from yaesu/ft890.c rename to rigs/yaesu/ft890.c diff --git a/yaesu/ft890.h b/rigs/yaesu/ft890.h similarity index 100% rename from yaesu/ft890.h rename to rigs/yaesu/ft890.h diff --git a/yaesu/ft891.c b/rigs/yaesu/ft891.c similarity index 100% rename from yaesu/ft891.c rename to rigs/yaesu/ft891.c diff --git a/yaesu/ft891.h b/rigs/yaesu/ft891.h similarity index 100% rename from yaesu/ft891.h rename to rigs/yaesu/ft891.h diff --git a/yaesu/ft897.c b/rigs/yaesu/ft897.c similarity index 100% rename from yaesu/ft897.c rename to rigs/yaesu/ft897.c diff --git a/yaesu/ft897.h b/rigs/yaesu/ft897.h similarity index 100% rename from yaesu/ft897.h rename to rigs/yaesu/ft897.h diff --git a/yaesu/ft900.c b/rigs/yaesu/ft900.c similarity index 100% rename from yaesu/ft900.c rename to rigs/yaesu/ft900.c diff --git a/yaesu/ft900.h b/rigs/yaesu/ft900.h similarity index 100% rename from yaesu/ft900.h rename to rigs/yaesu/ft900.h diff --git a/yaesu/ft9000.c b/rigs/yaesu/ft9000.c similarity index 100% rename from yaesu/ft9000.c rename to rigs/yaesu/ft9000.c diff --git a/yaesu/ft9000.h b/rigs/yaesu/ft9000.h similarity index 100% rename from yaesu/ft9000.h rename to rigs/yaesu/ft9000.h diff --git a/yaesu/ft920.c b/rigs/yaesu/ft920.c similarity index 100% rename from yaesu/ft920.c rename to rigs/yaesu/ft920.c diff --git a/yaesu/ft920.h b/rigs/yaesu/ft920.h similarity index 100% rename from yaesu/ft920.h rename to rigs/yaesu/ft920.h diff --git a/yaesu/ft950.c b/rigs/yaesu/ft950.c similarity index 100% rename from yaesu/ft950.c rename to rigs/yaesu/ft950.c diff --git a/yaesu/ft950.h b/rigs/yaesu/ft950.h similarity index 100% rename from yaesu/ft950.h rename to rigs/yaesu/ft950.h diff --git a/yaesu/ft980.c b/rigs/yaesu/ft980.c similarity index 100% rename from yaesu/ft980.c rename to rigs/yaesu/ft980.c diff --git a/yaesu/ft990.c b/rigs/yaesu/ft990.c similarity index 100% rename from yaesu/ft990.c rename to rigs/yaesu/ft990.c diff --git a/yaesu/ft990.h b/rigs/yaesu/ft990.h similarity index 100% rename from yaesu/ft990.h rename to rigs/yaesu/ft990.h diff --git a/yaesu/ft991.c b/rigs/yaesu/ft991.c similarity index 100% rename from yaesu/ft991.c rename to rigs/yaesu/ft991.c diff --git a/yaesu/ft991.h b/rigs/yaesu/ft991.h similarity index 100% rename from yaesu/ft991.h rename to rigs/yaesu/ft991.h diff --git a/yaesu/newcat.c b/rigs/yaesu/newcat.c similarity index 100% rename from yaesu/newcat.c rename to rigs/yaesu/newcat.c diff --git a/yaesu/newcat.h b/rigs/yaesu/newcat.h similarity index 100% rename from yaesu/newcat.h rename to rigs/yaesu/newcat.h diff --git a/yaesu/vr5000.c b/rigs/yaesu/vr5000.c similarity index 100% rename from yaesu/vr5000.c rename to rigs/yaesu/vr5000.c diff --git a/yaesu/vx1700.c b/rigs/yaesu/vx1700.c similarity index 100% rename from yaesu/vx1700.c rename to rigs/yaesu/vx1700.c diff --git a/yaesu/vx1700.h b/rigs/yaesu/vx1700.h similarity index 100% rename from yaesu/vx1700.h rename to rigs/yaesu/vx1700.h diff --git a/yaesu/yaesu.c b/rigs/yaesu/yaesu.c similarity index 100% rename from yaesu/yaesu.c rename to rigs/yaesu/yaesu.c diff --git a/yaesu/yaesu.h b/rigs/yaesu/yaesu.h similarity index 100% rename from yaesu/yaesu.h rename to rigs/yaesu/yaesu.h diff --git a/amsat/Android.mk b/rotators/amsat/Android.mk similarity index 100% rename from amsat/Android.mk rename to rotators/amsat/Android.mk diff --git a/amsat/Makefile.am b/rotators/amsat/Makefile.am similarity index 100% rename from amsat/Makefile.am rename to rotators/amsat/Makefile.am diff --git a/amsat/if100.c b/rotators/amsat/if100.c similarity index 100% rename from amsat/if100.c rename to rotators/amsat/if100.c diff --git a/ars/Android.mk b/rotators/ars/Android.mk similarity index 100% rename from ars/Android.mk rename to rotators/ars/Android.mk diff --git a/ars/Makefile.am b/rotators/ars/Makefile.am similarity index 100% rename from ars/Makefile.am rename to rotators/ars/Makefile.am diff --git a/ars/ars.c b/rotators/ars/ars.c similarity index 100% rename from ars/ars.c rename to rotators/ars/ars.c diff --git a/ars/ars.h b/rotators/ars/ars.h similarity index 100% rename from ars/ars.h rename to rotators/ars/ars.h diff --git a/celestron/Android.mk b/rotators/celestron/Android.mk similarity index 100% rename from celestron/Android.mk rename to rotators/celestron/Android.mk diff --git a/celestron/Makefile.am b/rotators/celestron/Makefile.am similarity index 100% rename from celestron/Makefile.am rename to rotators/celestron/Makefile.am diff --git a/celestron/celestron.c b/rotators/celestron/celestron.c similarity index 100% rename from celestron/celestron.c rename to rotators/celestron/celestron.c diff --git a/celestron/celestron.h b/rotators/celestron/celestron.h similarity index 100% rename from celestron/celestron.h rename to rotators/celestron/celestron.h diff --git a/cnctrk/Android.mk b/rotators/cnctrk/Android.mk similarity index 100% rename from cnctrk/Android.mk rename to rotators/cnctrk/Android.mk diff --git a/cnctrk/Makefile.am b/rotators/cnctrk/Makefile.am similarity index 100% rename from cnctrk/Makefile.am rename to rotators/cnctrk/Makefile.am diff --git a/cnctrk/cnctrk.c b/rotators/cnctrk/cnctrk.c similarity index 100% rename from cnctrk/cnctrk.c rename to rotators/cnctrk/cnctrk.c diff --git a/easycomm/Android.mk b/rotators/easycomm/Android.mk similarity index 100% rename from easycomm/Android.mk rename to rotators/easycomm/Android.mk diff --git a/easycomm/Makefile.am b/rotators/easycomm/Makefile.am similarity index 100% rename from easycomm/Makefile.am rename to rotators/easycomm/Makefile.am diff --git a/easycomm/easycomm.c b/rotators/easycomm/easycomm.c similarity index 100% rename from easycomm/easycomm.c rename to rotators/easycomm/easycomm.c diff --git a/easycomm/easycomm.h b/rotators/easycomm/easycomm.h similarity index 100% rename from easycomm/easycomm.h rename to rotators/easycomm/easycomm.h diff --git a/easycomm/easycomm.txt b/rotators/easycomm/easycomm.txt similarity index 100% rename from easycomm/easycomm.txt rename to rotators/easycomm/easycomm.txt diff --git a/ether6/Android.mk b/rotators/ether6/Android.mk similarity index 100% rename from ether6/Android.mk rename to rotators/ether6/Android.mk diff --git a/ether6/Makefile.am b/rotators/ether6/Makefile.am similarity index 100% rename from ether6/Makefile.am rename to rotators/ether6/Makefile.am diff --git a/ether6/README.ether6 b/rotators/ether6/README.ether6 similarity index 100% rename from ether6/README.ether6 rename to rotators/ether6/README.ether6 diff --git a/ether6/ether6.c b/rotators/ether6/ether6.c similarity index 100% rename from ether6/ether6.c rename to rotators/ether6/ether6.c diff --git a/ether6/ether6.h b/rotators/ether6/ether6.h similarity index 100% rename from ether6/ether6.h rename to rotators/ether6/ether6.h diff --git a/ether6/ether6.txt b/rotators/ether6/ether6.txt similarity index 100% rename from ether6/ether6.txt rename to rotators/ether6/ether6.txt diff --git a/fodtrack/Android.mk b/rotators/fodtrack/Android.mk similarity index 100% rename from fodtrack/Android.mk rename to rotators/fodtrack/Android.mk diff --git a/fodtrack/Makefile.am b/rotators/fodtrack/Makefile.am similarity index 100% rename from fodtrack/Makefile.am rename to rotators/fodtrack/Makefile.am diff --git a/fodtrack/fodtrack.c b/rotators/fodtrack/fodtrack.c similarity index 100% rename from fodtrack/fodtrack.c rename to rotators/fodtrack/fodtrack.c diff --git a/fodtrack/fodtrack.h b/rotators/fodtrack/fodtrack.h similarity index 100% rename from fodtrack/fodtrack.h rename to rotators/fodtrack/fodtrack.h diff --git a/gs232a/Android.mk b/rotators/gs232a/Android.mk similarity index 100% rename from gs232a/Android.mk rename to rotators/gs232a/Android.mk diff --git a/gs232a/Makefile.am b/rotators/gs232a/Makefile.am similarity index 100% rename from gs232a/Makefile.am rename to rotators/gs232a/Makefile.am diff --git a/gs232a/gs232.c b/rotators/gs232a/gs232.c similarity index 100% rename from gs232a/gs232.c rename to rotators/gs232a/gs232.c diff --git a/gs232a/gs232a.c b/rotators/gs232a/gs232a.c similarity index 100% rename from gs232a/gs232a.c rename to rotators/gs232a/gs232a.c diff --git a/gs232a/gs232a.h b/rotators/gs232a/gs232a.h similarity index 100% rename from gs232a/gs232a.h rename to rotators/gs232a/gs232a.h diff --git a/gs232a/gs232b.c b/rotators/gs232a/gs232b.c similarity index 100% rename from gs232a/gs232b.c rename to rotators/gs232a/gs232b.c diff --git a/heathkit/Android.mk b/rotators/heathkit/Android.mk similarity index 100% rename from heathkit/Android.mk rename to rotators/heathkit/Android.mk diff --git a/heathkit/Makefile.am b/rotators/heathkit/Makefile.am similarity index 100% rename from heathkit/Makefile.am rename to rotators/heathkit/Makefile.am diff --git a/heathkit/hd1780.c b/rotators/heathkit/hd1780.c similarity index 100% rename from heathkit/hd1780.c rename to rotators/heathkit/hd1780.c diff --git a/heathkit/hd1780.h b/rotators/heathkit/hd1780.h similarity index 100% rename from heathkit/hd1780.h rename to rotators/heathkit/hd1780.h diff --git a/ioptron/Android.mk b/rotators/ioptron/Android.mk similarity index 100% rename from ioptron/Android.mk rename to rotators/ioptron/Android.mk diff --git a/ioptron/Makefile.am b/rotators/ioptron/Makefile.am similarity index 100% rename from ioptron/Makefile.am rename to rotators/ioptron/Makefile.am diff --git a/ioptron/README_ioptron b/rotators/ioptron/README_ioptron similarity index 100% rename from ioptron/README_ioptron rename to rotators/ioptron/README_ioptron diff --git a/ioptron/rot_ioptron.c b/rotators/ioptron/rot_ioptron.c similarity index 100% rename from ioptron/rot_ioptron.c rename to rotators/ioptron/rot_ioptron.c diff --git a/ioptron/rot_ioptron.h b/rotators/ioptron/rot_ioptron.h similarity index 100% rename from ioptron/rot_ioptron.h rename to rotators/ioptron/rot_ioptron.h diff --git a/m2/Android.mk b/rotators/m2/Android.mk similarity index 100% rename from m2/Android.mk rename to rotators/m2/Android.mk diff --git a/m2/Makefile.am b/rotators/m2/Makefile.am similarity index 100% rename from m2/Makefile.am rename to rotators/m2/Makefile.am diff --git a/m2/rc2800.c b/rotators/m2/rc2800.c similarity index 100% rename from m2/rc2800.c rename to rotators/m2/rc2800.c diff --git a/m2/rc2800.h b/rotators/m2/rc2800.h similarity index 100% rename from m2/rc2800.h rename to rotators/m2/rc2800.h diff --git a/meade/Android.mk b/rotators/meade/Android.mk similarity index 100% rename from meade/Android.mk rename to rotators/meade/Android.mk diff --git a/meade/Makefile.am b/rotators/meade/Makefile.am similarity index 100% rename from meade/Makefile.am rename to rotators/meade/Makefile.am diff --git a/meade/README.md b/rotators/meade/README.md similarity index 100% rename from meade/README.md rename to rotators/meade/README.md diff --git a/meade/meade.c b/rotators/meade/meade.c similarity index 100% rename from meade/meade.c rename to rotators/meade/meade.c diff --git a/meade/meade.h b/rotators/meade/meade.h similarity index 100% rename from meade/meade.h rename to rotators/meade/meade.h diff --git a/prosistel/Android.mk b/rotators/prosistel/Android.mk similarity index 100% rename from prosistel/Android.mk rename to rotators/prosistel/Android.mk diff --git a/prosistel/Makefile.am b/rotators/prosistel/Makefile.am similarity index 100% rename from prosistel/Makefile.am rename to rotators/prosistel/Makefile.am diff --git a/prosistel/prosistel.c b/rotators/prosistel/prosistel.c similarity index 100% rename from prosistel/prosistel.c rename to rotators/prosistel/prosistel.c diff --git a/prosistel/prosistel.h b/rotators/prosistel/prosistel.h similarity index 100% rename from prosistel/prosistel.h rename to rotators/prosistel/prosistel.h diff --git a/rotorez/Android.mk b/rotators/rotorez/Android.mk similarity index 100% rename from rotorez/Android.mk rename to rotators/rotorez/Android.mk diff --git a/rotorez/Makefile.am b/rotators/rotorez/Makefile.am similarity index 100% rename from rotorez/Makefile.am rename to rotators/rotorez/Makefile.am diff --git a/rotorez/README.rotorez b/rotators/rotorez/README.rotorez similarity index 100% rename from rotorez/README.rotorez rename to rotators/rotorez/README.rotorez diff --git a/rotorez/rotorez.c b/rotators/rotorez/rotorez.c similarity index 100% rename from rotorez/rotorez.c rename to rotators/rotorez/rotorez.c diff --git a/rotorez/rotorez.h b/rotators/rotorez/rotorez.h similarity index 100% rename from rotorez/rotorez.h rename to rotators/rotorez/rotorez.h diff --git a/rotorez/rotorez.txt b/rotators/rotorez/rotorez.txt similarity index 100% rename from rotorez/rotorez.txt rename to rotators/rotorez/rotorez.txt diff --git a/sartek/Android.mk b/rotators/sartek/Android.mk similarity index 100% rename from sartek/Android.mk rename to rotators/sartek/Android.mk diff --git a/sartek/Makefile.am b/rotators/sartek/Makefile.am similarity index 100% rename from sartek/Makefile.am rename to rotators/sartek/Makefile.am diff --git a/sartek/sartek.c b/rotators/sartek/sartek.c similarity index 100% rename from sartek/sartek.c rename to rotators/sartek/sartek.c diff --git a/sartek/sartek.h b/rotators/sartek/sartek.h similarity index 100% rename from sartek/sartek.h rename to rotators/sartek/sartek.h diff --git a/spid/Android.mk b/rotators/spid/Android.mk similarity index 100% rename from spid/Android.mk rename to rotators/spid/Android.mk diff --git a/spid/Makefile.am b/rotators/spid/Makefile.am similarity index 100% rename from spid/Makefile.am rename to rotators/spid/Makefile.am diff --git a/spid/spid.c b/rotators/spid/spid.c similarity index 100% rename from spid/spid.c rename to rotators/spid/spid.c diff --git a/spid/spid.h b/rotators/spid/spid.h similarity index 100% rename from spid/spid.h rename to rotators/spid/spid.h diff --git a/spid/spid.txt b/rotators/spid/spid.txt similarity index 100% rename from spid/spid.txt rename to rotators/spid/spid.txt diff --git a/ts7400/Android.mk b/rotators/ts7400/Android.mk similarity index 100% rename from ts7400/Android.mk rename to rotators/ts7400/Android.mk diff --git a/ts7400/Makefile.am b/rotators/ts7400/Makefile.am similarity index 100% rename from ts7400/Makefile.am rename to rotators/ts7400/Makefile.am diff --git a/ts7400/include/ep93xx_adc.h b/rotators/ts7400/include/ep93xx_adc.h similarity index 100% rename from ts7400/include/ep93xx_adc.h rename to rotators/ts7400/include/ep93xx_adc.h diff --git a/ts7400/include/io.c b/rotators/ts7400/include/io.c similarity index 100% rename from ts7400/include/io.c rename to rotators/ts7400/include/io.c diff --git a/ts7400/include/io.h b/rotators/ts7400/include/io.h similarity index 100% rename from ts7400/include/io.h rename to rotators/ts7400/include/io.h diff --git a/ts7400/include/peekpoke.c b/rotators/ts7400/include/peekpoke.c similarity index 100% rename from ts7400/include/peekpoke.c rename to rotators/ts7400/include/peekpoke.c diff --git a/ts7400/include/peekpoke.h b/rotators/ts7400/include/peekpoke.h similarity index 100% rename from ts7400/include/peekpoke.h rename to rotators/ts7400/include/peekpoke.h diff --git a/ts7400/include/readADC.c b/rotators/ts7400/include/readADC.c similarity index 100% rename from ts7400/include/readADC.c rename to rotators/ts7400/include/readADC.c diff --git a/ts7400/include/readADC.h b/rotators/ts7400/include/readADC.h similarity index 100% rename from ts7400/include/readADC.h rename to rotators/ts7400/include/readADC.h diff --git a/ts7400/include/test7400ADC.c b/rotators/ts7400/include/test7400ADC.c similarity index 100% rename from ts7400/include/test7400ADC.c rename to rotators/ts7400/include/test7400ADC.c diff --git a/ts7400/ts7400.c b/rotators/ts7400/ts7400.c similarity index 100% rename from ts7400/ts7400.c rename to rotators/ts7400/ts7400.c diff --git a/ts7400/ts7400.h b/rotators/ts7400/ts7400.h similarity index 100% rename from ts7400/ts7400.h rename to rotators/ts7400/ts7400.h diff --git a/src/Makefile.am b/src/Makefile.am index 552fe2f7d..35dd67e68 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,8 +12,8 @@ libhamlib_la_SOURCES = $(RIGSRC) libhamlib_la_LDFLAGS = $(WINLDFLAGS) $(OSXLDFLAGS) -no-undefined -version-info $(ABI_VERSION):$(ABI_REVISION):$(ABI_AGE) libhamlib_la_LIBADD = $(top_builddir)/lib/libmisc.la \ - $(BACKENDEPS) $(ROT_BACKENDEPS) $(AMP_BACKENDEPS) $(NET_LIBS) $(MATH_LIBS) $(LIBUSB_LIBS) + $(BACKENDEPS) $(RIG_BACKENDEPS) $(ROT_BACKENDEPS) $(AMP_BACKENDEPS) $(NET_LIBS) $(MATH_LIBS) $(LIBUSB_LIBS) -libhamlib_la_DEPENDENCIES = $(top_builddir)/lib/libmisc.la $(BACKENDEPS) $(ROT_BACKENDEPS) $(AMP_BACKENDEPS) +libhamlib_la_DEPENDENCIES = $(top_builddir)/lib/libmisc.la $(BACKENDEPS) $(RIG_BACKEND_DEPS) $(ROT_BACKENDEPS) $(AMP_BACKENDEPS) EXTRA_DIST = Android.mk