From 534689511a25c0503e39aae44215f1c2833823c3 Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Thu, 9 Feb 2023 11:28:40 +0000
Subject: [PATCH] Fix SDRplay RSPdx LNA table, to have correct number of
 entries, for #1532

---
 plugins/samplesource/sdrplayv3/sdrplayv3input.cpp | 7 ++++---
 plugins/samplesource/sdrplayv3/sdrplayv3input.h   | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/samplesource/sdrplayv3/sdrplayv3input.cpp b/plugins/samplesource/sdrplayv3/sdrplayv3input.cpp
index 68304b6f9..dbe382fd2 100644
--- a/plugins/samplesource/sdrplayv3/sdrplayv3input.cpp
+++ b/plugins/samplesource/sdrplayv3/sdrplayv3input.cpp
@@ -1282,15 +1282,16 @@ const int SDRPlayV3LNA::rspDuoAttenuation[5][11] =
     {10, 0, 6, 12, 18, 20, 26, 32, 38, 57, 62},
     {10, 0, 7, 13, 19, 20, 27, 33, 39, 45, 64},
     { 9, 0, 6, 12, 20, 26, 32, 38, 43, 62},
-    { 5, 0, 6, 12, 18, 37}
+    { 5, 0, 6, 12, 18, 37}         // HiZ port
 };
 
-const int SDRPlayV3LNA::rspDxAttenuation[6][28] =
+const int SDRPlayV3LNA::rspDxAttenuation[7][29] =
 {
     {22, 0, 3,  6,  9, 12, 15, 18, 21, 24, 25, 27, 30, 33, 36, 39, 42, 45, 48, 51, 54, 57, 60},
     {19, 0, 3,  6,  9, 12, 15, 24, 27, 30, 33, 36, 39, 42, 45, 48, 51, 54, 57, 60},
     {20, 0, 3,  6,  9, 12, 15, 18, 24, 27, 30, 33, 36, 39, 42, 45, 48, 51, 54, 57, 60},
     {27, 0, 3,  6,  9, 12, 15, 24, 27, 30, 33, 36, 39, 42, 45, 48, 51, 54, 57, 60, 63, 66, 69, 72, 75, 78, 81, 84},
+    {28, 0, 3,  6,  9, 12, 15, 18, 24, 27, 30, 33, 36, 39, 42, 45, 48, 51, 54, 57, 60, 63, 66, 69, 72, 75, 78, 81, 84},
     {21, 0, 7, 10, 13, 16, 19, 22, 25, 31, 34, 37, 40, 43, 46, 49, 52, 55, 58, 61, 64, 67},
     {19, 0, 5,  8, 11, 14, 17, 20, 32, 35, 38, 41, 44, 47, 50, 53, 56, 59, 62, 65}
 };
@@ -1343,7 +1344,7 @@ const int *SDRPlayV3LNA::getAttenuations(int deviceId, qint64 frequency)
         lnaAttenuation = &rspDuoAttenuation[row][0];
         break;
     case SDRPLAY_RSPdx_ID:
-        if (frequency < 2)
+        if (frequency < 2000000)
             row = 0;
         else if (frequency < 12000000)
             row = 1;
diff --git a/plugins/samplesource/sdrplayv3/sdrplayv3input.h b/plugins/samplesource/sdrplayv3/sdrplayv3input.h
index 4c4b234e8..d08a5288b 100644
--- a/plugins/samplesource/sdrplayv3/sdrplayv3input.h
+++ b/plugins/samplesource/sdrplayv3/sdrplayv3input.h
@@ -196,7 +196,7 @@ private:
     static const int rsp1AAttenuation[4][11];
     static const int rsp2Attenuation[3][10];
     static const int rspDuoAttenuation[5][11];
-    static const int rspDxAttenuation[6][28];
+    static const int rspDxAttenuation[7][29];
 };
 
 #endif /* PLUGINS_SAMPLESOURCE_SDRPLAYV3_SDRPLAYV3INPUT_H_ */