From 312bc6b191b9efdc794cc48e830bb05150b0d6e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Fillod=2C=20F8CFE?= Date: Tue, 1 Nov 2005 23:14:41 +0000 Subject: [PATCH] added DWT and USRP models git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@2049 7ae35d74-ebe9-4afe-98af-79ac388436b8 --- kit/Makefile.am | 11 +++++++++-- kit/kit.c | 14 ++++++++++++-- kit/kit.h | 7 +++++-- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/kit/Makefile.am b/kit/Makefile.am index 14591c4e0..2035ada54 100644 --- a/kit/Makefile.am +++ b/kit/Makefile.am @@ -1,10 +1,17 @@ -KITSRCLIST = elektor304.c drt1.c +AM_CFLAGS = @LIBUSB_CFLAGS@ +AM_CXXFLAGS = @USRP_CFLAGS@ + +# FIXME: compile usrp only if CXX available +KITSRCLIST = elektor304.c drt1.c dwt.c usrp.c usrp_impl.cc lib_LTLIBRARIES = hamlib-kit.la hamlib_kit_la_SOURCES = $(KITSRCLIST) kit.c hamlib_kit_la_LDFLAGS = -no-undefined -module -avoid-version hamlib_kit_la_LIBADD = $(top_builddir)/lib/libmisc.la \ + $(USRP_LIBS) \ + $(LIBUSB_LIBS) \ + @MATH_LIBS@ \ $(top_builddir)/src/libhamlib.la -noinst_HEADERS = kit.h +noinst_HEADERS = kit.h usrp_impl.h diff --git a/kit/kit.c b/kit/kit.c index 3621a179b..ba1e37191 100644 --- a/kit/kit.c +++ b/kit/kit.c @@ -1,8 +1,8 @@ /* * Hamlib KIT backend - main file - * Copyright (c) 2004 by Stephane Fillod + * Copyright (c) 2004-2005 by Stephane Fillod * - * $Id: kit.c,v 1.2 2004-08-19 21:02:47 fillods Exp $ + * $Id: kit.c,v 1.3 2005-11-01 23:14:41 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -32,6 +32,7 @@ #include "register.h" #include "kit.h" +#include "usrp_impl.h" /* * initrigs_kit is called by rig_backend_load @@ -43,6 +44,15 @@ DECLARE_INITRIG_BACKEND(kit) rig_register(&elektor304_caps); rig_register(&drt1_caps); +#if defined(HAVE_LIBUSB) || defined(_WIN32) + rig_register(&dwt_caps); +#endif + +#ifdef HAVE_USRP + //rig_register(&usrp0_caps); + rig_register(&usrp_caps); +#endif + return RIG_OK; } diff --git a/kit/kit.h b/kit/kit.h index a7fc53ffa..e26054931 100644 --- a/kit/kit.h +++ b/kit/kit.h @@ -1,8 +1,8 @@ /* * Hamlib KIT backend - main header - * Copyright (c) 2004 by Stephane Fillod + * Copyright (c) 2004-2005 by Stephane Fillod * - * $Id: kit.h,v 1.2 2004-08-19 21:02:47 fillods Exp $ + * $Id: kit.h,v 1.3 2005-11-01 23:14:41 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -27,5 +27,8 @@ extern const struct rig_caps elektor304_caps; extern const struct rig_caps drt1_caps; +extern const struct rig_caps dwt_caps; +extern const struct rig_caps usrp0_caps; +extern const struct rig_caps usrp_caps; #endif /* _KIT_H */