head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.32
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.30
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.28
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.26
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.24
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.22
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.20
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.18
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.16
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.14
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.12
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.10
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.8
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.6
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.4
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.2
	pkgsrc-2022Q2-base:1.1;
locks; strict;
comment	@// @;


1.1
date	2022.04.12.20.10.46;	author tnn;	state Exp;
branches;
next	;
commitid	0JFhzU6kI4eUWWzD;


desc
@@


1.1
log
@uhd: fix some code portability issues
@
text
@$NetBSD$

Don't conflict with system's offset_t.

--- lib/usrp/common/lmx2592.cpp.orig	2021-12-14 18:37:20.000000000 +0000
+++ lib/usrp/common/lmx2592.cpp
@@@@ -104,10 +104,10 @@@@ inline bool abs_less_than_compare(const 
     return std::abs(a) < std::abs(b);
 }
 
-typedef std::pair<double, intermediate_frequency_t> offset_t;
+typedef std::pair<double, intermediate_frequency_t> lmx2592_offset_t;
 
-// comparator that uses absolute value on the first value of an offset_t
-inline bool offset_abs_less_than_compare(const offset_t a, const offset_t b)
+// comparator that uses absolute value on the first value of an lmx2592_offset_t
+inline bool offset_abs_less_than_compare(const lmx2592_offset_t a, const lmx2592_offset_t b)
 {
     return std::abs(a.first) < std::abs(b.first);
 }
@@@@ -607,7 +607,7 @@@@ private: // Members
     // 3. Reference to Fvco spur
     // 4. Reference to Flo spur
     // A negative offset indicates the closest spur is at a lower frequency
-    offset_t _get_min_offset_frequency(const uint16_t N,
+    lmx2592_offset_t _get_min_offset_frequency(const uint16_t N,
         const uint32_t fnum,
         const uint32_t fden,
         const int prescaler,
@@@@ -626,16 +626,16 @@@@ private: // Members
         // in order to calculate the necessary frequency shift
 
         // Integer Boundary:
-        const offset_t ib_spur = {_get_closest_spur_offset(frf_in, pfd_freq), FRF_IN};
+        const lmx2592_offset_t ib_spur = {_get_closest_spur_offset(frf_in, pfd_freq), FRF_IN};
 
         // PFD Offset Spur:
-        const offset_t pfd_offset_spur = {_get_closest_spur_offset(fvco, pfd_freq), FVCO};
+        const lmx2592_offset_t pfd_offset_spur = {_get_closest_spur_offset(fvco, pfd_freq), FVCO};
 
         // Reference to Fvco Spur:
-        const offset_t fvco_spur = {_get_closest_spur_offset(fvco, fref), FVCO};
+        const lmx2592_offset_t fvco_spur = {_get_closest_spur_offset(fvco, fref), FVCO};
 
         // Reference to F_lo Spur:
-        const offset_t flo_spur = {_get_closest_spur_offset(flo, fref), FLO};
+        const lmx2592_offset_t flo_spur = {_get_closest_spur_offset(flo, fref), FLO};
 
         // use min with special comparator for minimal absolute value
         return std::min({ib_spur, pfd_offset_spur, fvco_spur, flo_spur},
@