From 46aadbb2e9ca5aaccec4698824c2016772f3e1f7 Mon Sep 17 00:00:00 2001
From: jcorgan
Date: Tue, 28 Jul 2009 23:01:46 +0000
Subject: Merged -r11480:11507, r11508 from nldudok1/tvrx_mimo_merge_with_trunk
 into trunk.  This branch was created with a corrupted merge tracking
 database, so manual merge and remove of merge info properties was needed.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11513 221aa14e-8319-0410-a670-987f0aec2ac5
---
 usrp/host/include/usrp/Makefile.am     |  1 +
 usrp/host/include/usrp/db_tv_rx_mimo.h | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 usrp/host/include/usrp/db_tv_rx_mimo.h

(limited to 'usrp/host/include')

diff --git a/usrp/host/include/usrp/Makefile.am b/usrp/host/include/usrp/Makefile.am
index 91d439234..d580d8a75 100644
--- a/usrp/host/include/usrp/Makefile.am
+++ b/usrp/host/include/usrp/Makefile.am
@@ -32,6 +32,7 @@ usrpinclude_HEADERS = \
 	db_flexrf.h \
 	db_flexrf_mimo.h \
 	db_tv_rx.h \
+ 	db_tv_rx_mimo.h	\
 	db_xcvr2450.h \
 	usrp_basic.h \
 	usrp_bytesex.h \
diff --git a/usrp/host/include/usrp/db_tv_rx_mimo.h b/usrp/host/include/usrp/db_tv_rx_mimo.h
new file mode 100644
index 000000000..0a9bb486e
--- /dev/null
+++ b/usrp/host/include/usrp/db_tv_rx_mimo.h
@@ -0,0 +1,34 @@
+/* -*- c++ -*- */
+//
+// Copyright 2009 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 asversion 3, 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., 51 Franklin Street,
+// Boston, MA 02110-1301, USA.
+
+#ifndef DB_TV_RX_MIMO_H
+#define DB_TV_RX_MIMO_H
+
+#include <usrp/db_tv_rx.h>
+
+class db_tv_rx_mimo : public db_tv_rx
+{
+ public:
+  db_tv_rx_mimo(usrp_basic_sptr usrp, int which,double first_IF, double second_IF);
+  int _refclk_divisor();
+};
+
+#endif
-- 
cgit