[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r11476 - in gnuradio/branches/developers/nldudok1/tvrx
|
From: |
nldudok1 |
|
Subject: |
[Commit-gnuradio] r11476 - in gnuradio/branches/developers/nldudok1/tvrx_mimo_wip: gr-usrp/src usrp/host/apps usrp/host/lib/legacy |
|
Date: |
Sat, 25 Jul 2009 08:57:02 -0600 (MDT) |
Author: nldudok1
Date: 2009-07-25 08:57:01 -0600 (Sat, 25 Jul 2009)
New Revision: 11476
Added:
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/usrp/host/lib/legacy/db_tv_rx_mimo.cc
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/usrp/host/lib/legacy/db_tv_rx_mimo.h
Modified:
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/gr-usrp/src/usrp_source_base.cc
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/usrp/host/apps/burn-db-eeprom
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/usrp/host/lib/legacy/Makefile.am
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/usrp/host/lib/legacy/db_boards.cc
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/usrp/host/lib/legacy/usrp_dbid.dat
Log:
add mimo capable TVRX db_tv_rx_mimo which gets its refclock from the FPGA in
stead of using its own internal 4 Mhz crystal
Modified:
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/gr-usrp/src/usrp_source_base.cc
===================================================================
---
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/gr-usrp/src/usrp_source_base.cc
2009-07-25 14:55:06 UTC (rev 11475)
+++
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/gr-usrp/src/usrp_source_base.cc
2009-07-25 14:57:01 UTC (rev 11476)
@@ -292,6 +292,10 @@
USRP_DBID_FLEX_2400_RX,
USRP_DBID_TV_RX,
USRP_DBID_TV_RX_REV_2,
+ USRP_DBID_TV_RX_REV_3,
+ USRP_DBID_TV_RX_MIMO,
+ USRP_DBID_TV_RX_REV_2_MIMO,
+ USRP_DBID_TV_RX_REV_3_MIMO,
USRP_DBID_DBS_RX,
USRP_DBID_BASIC_RX
};
Modified:
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/usrp/host/apps/burn-db-eeprom
===================================================================
---
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/usrp/host/apps/burn-db-eeprom
2009-07-25 14:55:06 UTC (rev 11475)
+++
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/usrp/host/apps/burn-db-eeprom
2009-07-25 14:57:01 UTC (rev 11476)
@@ -36,6 +36,9 @@
'tvrx' : (None, (TV_RX, 0x0000)),
'tvrx2' : (None, (TV_RX_REV_2, 0x0000)),
'tvrx3' : (None, (TV_RX_REV_3, 0x0000)),
+ 'tvrx_mimo' : (None, (TV_RX_MIMO, 0x0000)),
+ 'tvrx2_mimo' : (None, (TV_RX_REV_2_MIMO,
0x0000)),
+ 'tvrx3_mimo' : (None, (TV_RX_REV_3_MIMO,
0x0000)),
'dtt754' : (None, (DTT754, 0x0000)),
'dtt768' : (None, (DTT768, 0x0000)),
'rfx400' : ((FLEX_400_TX, 0x0000), (FLEX_400_RX, 0x0000)),
Modified:
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/usrp/host/lib/legacy/Makefile.am
===================================================================
---
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/usrp/host/lib/legacy/Makefile.am
2009-07-25 14:55:06 UTC (rev 11475)
+++
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/usrp/host/lib/legacy/Makefile.am
2009-07-25 14:57:01 UTC (rev 11476)
@@ -110,6 +110,7 @@
db_base.cc \
db_basic.cc \
db_tv_rx.cc \
+ db_tv_rx_mimo.cc \
db_flexrf.cc \
db_flexrf_mimo.cc \
db_dbs_rx.cc \
@@ -150,6 +151,7 @@
db_flexrf.h \
db_flexrf_mimo.h \
db_tv_rx.h \
+ db_tv_rx_mimo.h \
db_util.h \
db_xcvr2450.h \
usrp_basic.h \
Modified:
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/usrp/host/lib/legacy/db_boards.cc
===================================================================
---
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/usrp/host/lib/legacy/db_boards.cc
2009-07-25 14:55:06 UTC (rev 11475)
+++
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/usrp/host/lib/legacy/db_boards.cc
2009-07-25 14:57:01 UTC (rev 11476)
@@ -24,6 +24,7 @@
#include <usrp_dbid.h>
#include <db_basic.h>
#include <db_tv_rx.h>
+#include <db_tv_rx_mimo.h>
#include <db_dbs_rx.h>
#include <db_flexrf.h>
#include <db_flexrf_mimo.h>
@@ -73,6 +74,15 @@
case(USRP_DBID_TV_RX_REV_3):
db.push_back(db_base_sptr(new db_tv_rx(usrp, which_side, 44e6, 20e6)));
break;
+ case(USRP_DBID_TV_RX_MIMO):
+ db.push_back(db_base_sptr(new db_tv_rx_mimo(usrp, which_side, 43.75e6,
5.75e6)));
+ break;
+ case(USRP_DBID_TV_RX_REV_2_MIMO):
+ db.push_back(db_base_sptr(new db_tv_rx_mimo(usrp, which_side, 44e6,
20e6)));
+ break;
+ case(USRP_DBID_TV_RX_REV_3_MIMO):
+ db.push_back(db_base_sptr(new db_tv_rx_mimo(usrp, which_side, 44e6,
20e6)));
+ break;
case(USRP_DBID_FLEX_2400_TX):
db.push_back(db_base_sptr(new db_flexrf_2400_tx(usrp, which_side)));
Added:
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/usrp/host/lib/legacy/db_tv_rx_mimo.cc
===================================================================
---
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/usrp/host/lib/legacy/db_tv_rx_mimo.cc
(rev 0)
+++
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/usrp/host/lib/legacy/db_tv_rx_mimo.cc
2009-07-25 14:57:01 UTC (rev 11476)
@@ -0,0 +1,35 @@
+//
+// Copyright 2008 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.
+
+#include <db_tv_rx_mimo.h>
+
+db_tv_rx_mimo::db_tv_rx_mimo(usrp_basic_sptr usrp, int which,
+ double first_IF, double second_IF)
+ : db_tv_rx(usrp, which,first_IF,second_IF)
+{
+ _enable_refclk(true);//enable FPGA refclock output on gpio 0
+}
+
+int
+db_tv_rx_mimo::_refclk_divisor()
+{
+ return 16;// 64/16=> 4 Mhz refclock
+}
+
Added:
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/usrp/host/lib/legacy/db_tv_rx_mimo.h
===================================================================
---
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/usrp/host/lib/legacy/db_tv_rx_mimo.h
(rev 0)
+++
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/usrp/host/lib/legacy/db_tv_rx_mimo.h
2009-07-25 14:57:01 UTC (rev 11476)
@@ -0,0 +1,34 @@
+/* -*- c++ -*- */
+//
+// Copyright 2008 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 <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
Modified:
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/usrp/host/lib/legacy/usrp_dbid.dat
===================================================================
---
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/usrp/host/lib/legacy/usrp_dbid.dat
2009-07-25 14:55:06 UTC (rev 11475)
+++
gnuradio/branches/developers/nldudok1/tvrx_mimo_wip/usrp/host/lib/legacy/usrp_dbid.dat
2009-07-25 14:57:01 UTC (rev 11476)
@@ -71,6 +71,9 @@
"TV Rx Rev 3" 0x0040
"DTT754" 0x0041
"DTT768" 0x0042
+"TV Rx MIMO" 0x0043
+"TV Rx Rev 2 MIMO" 0x0044
+"TV Rx Rev 3 MIMO" 0x0045
"WBX LO TX" 0x0050
"WBX LO RX" 0x0051
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r11476 - in gnuradio/branches/developers/nldudok1/tvrx_mimo_wip: gr-usrp/src usrp/host/apps usrp/host/lib/legacy,
nldudok1 <=