projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup, changed ifc_name() to interface_name()
[debian/gnuradio]
/
usrp2
/
host
/
include
/
usrp2
/
usrp2.h
diff --git
a/usrp2/host/include/usrp2/usrp2.h
b/usrp2/host/include/usrp2/usrp2.h
index 82b1c6449ffd2a1e20791ddc776399244fd69336..70d800bf0f204c9f3d950477f34d524ae7e42675 100644
(file)
--- a/
usrp2/host/include/usrp2/usrp2.h
+++ b/
usrp2/host/include/usrp2/usrp2.h
@@
-1,6
+1,6
@@
/* -*- c++ -*- */
/*
/* -*- c++ -*- */
/*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2008
,2009
Free Software Foundation, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-94,6
+94,11
@@
namespace usrp2 {
*/
std::string mac_addr();
*/
std::string mac_addr();
+ /*!
+ * Returns the GbE interface name associated with this USRP
+ */
+ std::string interface_name();
+
/*
* ----------------------------------------------------------------
* Rx configuration and control
/*
* ----------------------------------------------------------------
* Rx configuration and control
@@
-115,6
+120,11
@@
namespace usrp2 {
//! return Rx gain db_per_step
double rx_gain_db_per_step();
//! return Rx gain db_per_step
double rx_gain_db_per_step();
+ /*!
+ * \brief Set receive daughterboard LO offset frequency
+ */
+ bool set_rx_lo_offset(double frequency);
+
/*!
* Set receiver center frequency
*/
/*!
* Set receiver center frequency
*/
@@
-200,6
+210,11
@@
namespace usrp2 {
//! return Tx gain db_per_step
double tx_gain_db_per_step();
//! return Tx gain db_per_step
double tx_gain_db_per_step();
+ /*
+ * \brief Set transmit daughterboard LO offset frequency
+ */
+ bool set_tx_lo_offset(double frequency);
+
/*!
* Set transmitter center frequency
*/
/*!
* Set transmitter center frequency
*/
@@
-219,6
+234,11
@@
namespace usrp2 {
//! Return current interpolation factor
int tx_interp();
//! Return current interpolation factor
int tx_interp();
+ /*
+ * \brief Calculate default scale_iq for given interpolation rate
+ */
+ void default_tx_scale_iq(int interpolation_factor, int *scale_i, int *scale_q);
+
/*!
* Set transmit IQ magnitude scaling
*/
/*!
* Set transmit IQ magnitude scaling
*/
@@
-357,10
+377,15
@@
namespace usrp2 {
bool burn_mac_addr(const std::string &new_addr);
/*!
bool burn_mac_addr(const std::string &new_addr);
/*!
- * Reset master time to 0 at next PPS
rising
edge
+ * Reset master time to 0 at next PPS edge
*/
bool sync_to_pps();
*/
bool sync_to_pps();
+ /*!
+ * Reset master time to 0 at every PPS edge
+ */
+ bool sync_every_pps(bool enable);
+
/*!
* Read memory from Wishbone bus as 32-bit words. Handles endian swapping if needed.
*
/*!
* Read memory from Wishbone bus as 32-bit words. Handles endian swapping if needed.
*