[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r9754 - gnuradio/branches/developers/eb/cppdb-wip/usrp
From: |
eb |
Subject: |
[Commit-gnuradio] r9754 - gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy |
Date: |
Wed, 8 Oct 2008 16:17:38 -0600 (MDT) |
Author: eb
Date: 2008-10-08 16:17:37 -0600 (Wed, 08 Oct 2008)
New Revision: 9754
Modified:
gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/db_flexrf.cc
gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/db_flexrf.h
Log:
Applied patch from Stefan Br?\195?\188ns <address@hidden>
dated 30 September 2008.
Move identical implementations from inherited classes to base class
* db_flexrf-move-freq_minmax.diff
Modified:
gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/db_flexrf.cc
===================================================================
--- gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/db_flexrf.cc
2008-10-08 22:10:18 UTC (rev 9753)
+++ gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/db_flexrf.cc
2008-10-08 22:17:37 UTC (rev 9754)
@@ -286,6 +286,18 @@
return true;
}
+double
+flexrf_base::freq_min()
+{
+ return d_common->freq_min();
+}
+
+double
+flexrf_base::freq_max()
+{
+ return d_common->freq_max();
+}
+
// ----------------------------------------------------------------
flexrf_base_tx::flexrf_base_tx(usrp_basic *usrp, int which, int _power_on)
@@ -840,18 +852,6 @@
{
}
-double
-db_flexrf_2400_tx::freq_min()
-{
- return d_common->freq_min();
-}
-
-double
-db_flexrf_2400_tx::freq_max()
-{
- return d_common->freq_max();
-}
-
bool
db_flexrf_2400_tx::_compute_regs(double freq, int &retR, int &retcontrol,
int &retN, double &retfreq)
@@ -897,18 +897,6 @@
return true;
}
-double
-db_flexrf_2400_rx::freq_min()
-{
- return d_common->freq_min();
-}
-
-double
-db_flexrf_2400_rx::freq_max()
-{
- return d_common->freq_max();
-}
-
bool
db_flexrf_2400_rx::_compute_regs(double freq, int &retR, int &retcontrol,
int &retN, double &retfreq)
@@ -930,18 +918,6 @@
{
}
-double
-db_flexrf_1200_tx::freq_min()
-{
- return d_common->freq_min();
-}
-
-double
-db_flexrf_1200_tx::freq_max()
-{
- return d_common->freq_max();
-}
-
bool
db_flexrf_1200_tx::_compute_regs(double freq, int &retR, int &retcontrol,
int &retN, double &retfreq)
@@ -987,18 +963,6 @@
return true;
}
-double
-db_flexrf_1200_rx::freq_min()
-{
- return d_common->freq_min();
-}
-
-double
-db_flexrf_1200_rx::freq_max()
-{
- return d_common->freq_max();
-}
-
bool
db_flexrf_1200_rx::_compute_regs(double freq, int &retR, int &retcontrol,
int &retN, double &retfreq)
@@ -1021,18 +985,6 @@
{
}
-double
-db_flexrf_1800_tx::freq_min()
-{
- return d_common->freq_min();
-}
-
-double
-db_flexrf_1800_tx::freq_max()
-{
- return d_common->freq_max();
-}
-
bool
db_flexrf_1800_tx::_compute_regs(double freq, int &retR, int &retcontrol,
int &retN, double &retfreq)
@@ -1078,18 +1030,6 @@
return true;
}
-double
-db_flexrf_1800_rx::freq_min()
-{
- return d_common->freq_min();
-}
-
-double
-db_flexrf_1800_rx::freq_max()
-{
- return d_common->freq_max();
-}
-
bool
db_flexrf_1800_rx::_compute_regs(double freq, int &retR, int &retcontrol,
int &retN, double &retfreq)
@@ -1112,18 +1052,6 @@
{
}
-double
-db_flexrf_900_tx::freq_min()
-{
- return d_common->freq_min();
-}
-
-double
-db_flexrf_900_tx::freq_max()
-{
- return d_common->freq_max();
-}
-
bool
db_flexrf_900_tx::_compute_regs(double freq, int &retR, int &retcontrol,
int &retN, double &retfreq)
@@ -1167,18 +1095,6 @@
return true;
}
-double
-db_flexrf_900_rx::freq_min()
-{
- return d_common->freq_min();
-}
-
-double
-db_flexrf_900_rx::freq_max()
-{
- return d_common->freq_max();
-}
-
bool
db_flexrf_900_rx::_compute_regs(double freq, int &retR, int &retcontrol,
int &retN, double &retfreq)
@@ -1200,18 +1116,6 @@
{
}
-double
-db_flexrf_400_tx::freq_min()
-{
- return d_common->freq_min();
-}
-
-double
-db_flexrf_400_tx::freq_max()
-{
- return d_common->freq_max();
-}
-
bool
db_flexrf_400_tx::_compute_regs(double freq, int &retR, int &retcontrol,
int &retN, double &retfreq)
@@ -1258,18 +1162,6 @@
return true;
}
-double
-db_flexrf_400_rx::freq_min()
-{
- return d_common->freq_min();
-}
-
-double
-db_flexrf_400_rx::freq_max()
-{
- return d_common->freq_max();
-}
-
bool
db_flexrf_400_rx::_compute_regs(double freq, int &retR, int &retcontrol,
int &retN, double &retfreq)
Modified:
gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/db_flexrf.h
===================================================================
--- gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/db_flexrf.h
2008-10-08 22:10:18 UTC (rev 9753)
+++ gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/db_flexrf.h
2008-10-08 22:17:37 UTC (rev 9754)
@@ -42,6 +42,8 @@
float gain_db_per_step();
bool set_gain(float gain);
bool is_quadrature();
+ double freq_min();
+ double freq_max();
protected:
void _write_all(int R, int control, int N);
@@ -221,8 +223,6 @@
// Wrapper calls to d_common functions
bool _compute_regs(double freq, int &retR, int &retcontrol,
int &retN, double &retfreq);
- double freq_min();
- double freq_max();
};
class db_flexrf_2400_rx : public flexrf_base_rx
@@ -236,8 +236,6 @@
float gain_db_per_step();
bool i_and_q_swapped();
- double freq_min();
- double freq_max();
bool _compute_regs(double freq, int &retR, int &retcontrol,
int &retN, double &retfreq);
};
@@ -253,8 +251,6 @@
// Wrapper calls to d_common functions
bool _compute_regs(double freq, int &retR, int &retcontrol,
int &retN, double &retfreq);
- double freq_min();
- double freq_max();
};
class db_flexrf_1200_rx : public flexrf_base_rx
@@ -268,8 +264,6 @@
float gain_db_per_step();
bool i_and_q_swapped();
- double freq_min();
- double freq_max();
bool _compute_regs(double freq, int &retR, int &retcontrol,
int &retN, double &retfreq);
};
@@ -285,8 +279,6 @@
// Wrapper calls to d_common functions
bool _compute_regs(double freq, int &retR, int &retcontrol,
int &retN, double &retfreq);
- double freq_min();
- double freq_max();
};
class db_flexrf_1800_rx : public flexrf_base_rx
@@ -300,8 +292,6 @@
float gain_db_per_step();
bool i_and_q_swapped();
- double freq_min();
- double freq_max();
bool _compute_regs(double freq, int &retR, int &retcontrol,
int &retN, double &retfreq);
};
@@ -317,8 +307,6 @@
// Wrapper calls to d_common functions
bool _compute_regs(double freq, int &retR, int &retcontrol,
int &retN, double &retfreq);
- double freq_min();
- double freq_max();
};
class db_flexrf_900_rx : public flexrf_base_rx
@@ -332,8 +320,6 @@
float gain_db_per_step();
bool i_and_q_swapped();
- double freq_min();
- double freq_max();
bool _compute_regs(double freq, int &retR, int &retcontrol,
int &retN, double &retfreq);
};
@@ -350,8 +336,6 @@
// Wrapper calls to d_common functions
bool _compute_regs(double freq, int &retR, int &retcontrol,
int &retN, double &retfreq);
- double freq_min();
- double freq_max();
};
class db_flexrf_400_rx : public flexrf_base_rx
@@ -365,8 +349,6 @@
float gain_db_per_step();
bool i_and_q_swapped();
- double freq_min();
- double freq_max();
bool _compute_regs(double freq, int &retR, int &retcontrol,
int &retN, double &retfreq);
};
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r9754 - gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy,
eb <=