dm820/dm7080: s2x activated

Duckbox-Developers · Jun 18, 2024 · 8578762 · 8578762
1 parent 459a314
commit 8578762
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp
@@ -133,7 +133,7 @@ const CMenuOptionChooser::keyval TERRSETUP_SCANTP_DELSYS[TERRSETUP_SCANTP_DELSYS
 	{ ISDBT,		LOCALE_EXTRA_TP_DELSYS_ISDBT }
 };
 
-#if !defined (HAVE_SH4_HARDWARE) && !defined (HAVE_MIPS_HARDWARE)
+#if (!defined (HAVE_SH4_HARDWARE) && !defined (HAVE_MIPS_HARDWARE)) || (defined (BOXMODEL_DM820) || defined (BOXMODEL_DM7080))
 #define SATSETUP_SCANTP_FEC_COUNT 28
 #else
 #define SATSETUP_SCANTP_FEC_COUNT 10
@@ -152,7 +152,7 @@ const CMenuOptionChooser::keyval SATSETUP_SCANTP_FEC[SATSETUP_SCANTP_FEC_COUNT]
 	{ FEC_4_5, LOCALE_EXTRA_FEC_4_5         },
 	{ FEC_8_9, LOCALE_EXTRA_FEC_8_9         },
 	{ FEC_9_10, LOCALE_EXTRA_FEC_9_10       }
-#if !defined (HAVE_SH4_HARDWARE) && !defined (HAVE_MIPS_HARDWARE)
+#if (!defined (HAVE_SH4_HARDWARE) && !defined (HAVE_MIPS_HARDWARE)) || (defined (BOXMODEL_DM820) || defined (BOXMODEL_DM7080))
 	// S2X
 	,
 	{ FEC_13_45, LOCALE_EXTRA_FEC_13_45     },
@@ -270,7 +270,7 @@ const CMenuOptionChooser::keyval TERRSETUP_SCANTP_TRANSMIT_MODE[TERRSETUP_SCANTP
 	{ TRANSMISSION_MODE_AUTO,  LOCALE_EXTRA_TP_TRANSMIT_MODE_AUTO  }
 };
 
-#if !defined (HAVE_SH4_HARDWARE) && !defined (HAVE_MIPS_HARDWARE)
+#if (!defined (HAVE_SH4_HARDWARE) && !defined (HAVE_MIPS_HARDWARE)) || (defined (BOXMODEL_DM820) || defined (BOXMODEL_DM7080))
 #define SATSETUP_SCANTP_MOD_COUNT 6
 #else
 #define SATSETUP_SCANTP_MOD_COUNT 5
@@ -279,7 +279,7 @@ const CMenuOptionChooser::keyval SATSETUP_SCANTP_MOD[SATSETUP_SCANTP_MOD_COUNT]
 {
 	{ QPSK,     LOCALE_EXTRA_TP_MOD_4    },
 	{ PSK_8,    LOCALE_EXTRA_TP_MOD_8    },
-#if !defined (HAVE_SH4_HARDWARE) && !defined (HAVE_MIPS_HARDWARE)
+#if (!defined (HAVE_SH4_HARDWARE) && !defined (HAVE_MIPS_HARDWARE)) || (defined (BOXMODEL_DM820) || defined (BOXMODEL_DM7080))
 	{ APSK_8,   LOCALE_EXTRA_TP_MOD_8A   },
 #endif
 	{ APSK_16,  LOCALE_EXTRA_TP_MOD_16A  },

diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp
@@ -96,7 +96,7 @@ typedef enum dvb_fec {
 	f4_5,
 	f9_10,
 	fNone = 15
-#if !defined (HAVE_SH4_HARDWARE) && !defined (HAVE_MIPS_HARDWARE)
+#if (!defined (HAVE_SH4_HARDWARE) && !defined (HAVE_MIPS_HARDWARE)) || (defined (BOXMODEL_DM820) || defined (BOXMODEL_DM7080))
 	,
 	f13_45,
 	f9_20,
@@ -301,13 +301,13 @@ void CFrontend::getFEInfo(void)
 				printf("[fe%d/%d] add delivery system DVB-S (delivery_system: %d)\n", adapter, fenumber, (fe_delivery_system_t)prop[0].u.buffer.data[i]);
 				break;
 			case SYS_DVBS2:
-#if !defined (HAVE_SH4_HARDWARE) && !defined (HAVE_MIPS_HARDWARE)
+#if (!defined (HAVE_SH4_HARDWARE) && !defined (HAVE_MIPS_HARDWARE)) || (defined (BOXMODEL_DM820) || defined (BOXMODEL_DM7080))
 			case SYS_DVBS2X:
 #endif
 				deliverySystemMask |= DVB_S2;
 				fe_can_multistream = info.caps & FE_CAN_MULTISTREAM;
 				printf("[fe%d/%d] add delivery system DVB-S2 (delivery_system: %d / Multistream: %s)\n", adapter, fenumber, (fe_delivery_system_t)prop[0].u.buffer.data[i], fe_can_multistream ? "yes" :"no");
-#if !defined (HAVE_SH4_HARDWARE) && !defined (HAVE_MIPS_HARDWARE)
+#if (!defined (HAVE_SH4_HARDWARE) && !defined (HAVE_MIPS_HARDWARE)) || (defined (BOXMODEL_DM820) || defined (BOXMODEL_DM7080))
 				if (fe_can_multistream)
 				{
 					deliverySystemMask |= DVB_S2X;
@@ -501,7 +501,7 @@ fe_code_rate_t CFrontend::getCodeRate(const uint8_t fec_inner, delivery_system_t
 		case f9_10:
 			fec = FEC_9_10;
 			break;
-#if !defined (HAVE_SH4_HARDWARE) && !defined (HAVE_MIPS_HARDWARE)
+#if (!defined (HAVE_SH4_HARDWARE) && !defined (HAVE_MIPS_HARDWARE)) || (defined (BOXMODEL_DM820) || defined (BOXMODEL_DM7080))
 		case f13_45:
 			fec = FEC_13_45;
 			break;
@@ -1021,7 +1021,7 @@ void CFrontend::getDelSys(delivery_system_t delsys, int f, int m, const char *&f
 		case PSK_8:
 			mod = "8PSK";
 			break;
-#if !defined (HAVE_SH4_HARDWARE) && !defined (HAVE_MIPS_HARDWARE)
+#if (!defined (HAVE_SH4_HARDWARE) && !defined (HAVE_MIPS_HARDWARE)) || (defined (BOXMODEL_DM820) || defined (BOXMODEL_DM7080))
 		case APSK_8:
 			mod = "8APSK";
 			break;
@@ -1139,7 +1139,7 @@ void CFrontend::getDelSys(delivery_system_t delsys, int f, int m, const char *&f
 		fec = "0";
 		break;
 #endif
-#if !defined (HAVE_SH4_HARDWARE) && !defined (HAVE_MIPS_HARDWARE)
+#if (!defined (HAVE_SH4_HARDWARE) && !defined (HAVE_MIPS_HARDWARE)) || (defined (BOXMODEL_DM820) || defined (BOXMODEL_DM7080))
 	case FEC_13_45:
 		fec = "13/45";
 		break;
@@ -1434,7 +1434,7 @@ int CFrontend::setFrontend(const FrontendParameters *feparams, bool nowait)
 		fec = FEC_NONE;
 		break;
 #endif
-#if !defined (HAVE_SH4_HARDWARE) && !defined (HAVE_MIPS_HARDWARE)
+#if (!defined (HAVE_SH4_HARDWARE) && !defined (HAVE_MIPS_HARDWARE)) || (defined (BOXMODEL_DM820) || defined (BOXMODEL_DM7080))
 	case FEC_13_45:
 		fec = FEC_13_45;
 		break;