- hw_caps: simplify and unify initialized handling

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-05-29 20:49:47 +02:00
committed by Thilo Graf
parent 94909d2085
commit 5d10ee9095
6 changed files with 13 additions and 37 deletions

View File

@@ -33,7 +33,6 @@ hw_caps_t *get_hwcaps(void)
caps.can_pip = 1; caps.can_pip = 1;
#if BOXMODEL_VUSOLO4K #if BOXMODEL_VUSOLO4K
initialized = 1;
caps.has_CI = 1; caps.has_CI = 1;
caps.can_cec = 1; caps.can_cec = 1;
caps.can_cpufreq = 0; caps.can_cpufreq = 0;
@@ -55,7 +54,6 @@ hw_caps_t *get_hwcaps(void)
strcpy(caps.boxarch, "BCM7376"); strcpy(caps.boxarch, "BCM7376");
#endif #endif
#if BOXMODEL_VUDUO4K #if BOXMODEL_VUDUO4K
initialized = 1;
caps.has_CI = 2; caps.has_CI = 2;
caps.can_cec = 1; caps.can_cec = 1;
caps.can_cpufreq = 0; caps.can_cpufreq = 0;
@@ -78,7 +76,6 @@ hw_caps_t *get_hwcaps(void)
strcpy(caps.boxarch, "BCM7278"); strcpy(caps.boxarch, "BCM7278");
#endif #endif
#if BOXMODEL_VUDUO4KSE #if BOXMODEL_VUDUO4KSE
initialized = 1;
caps.has_CI = 2; caps.has_CI = 2;
caps.can_cec = 1; caps.can_cec = 1;
caps.can_shutdown = 1; caps.can_shutdown = 1;
@@ -100,7 +97,6 @@ hw_caps_t *get_hwcaps(void)
strcpy(caps.boxarch, "BCM7444S"); strcpy(caps.boxarch, "BCM7444S");
#endif #endif
#if BOXMODEL_VUULTIMO4K #if BOXMODEL_VUULTIMO4K
initialized = 1;
caps.has_CI = 2; caps.has_CI = 2;
caps.can_cec = 1; caps.can_cec = 1;
caps.can_cpufreq = 0; caps.can_cpufreq = 0;
@@ -123,7 +119,6 @@ hw_caps_t *get_hwcaps(void)
strcpy(caps.boxarch, "BCM7444S"); strcpy(caps.boxarch, "BCM7444S");
#endif #endif
#if BOXMODEL_VUZERO4K #if BOXMODEL_VUZERO4K
initialized = 1;
caps.has_CI = 1; caps.has_CI = 1;
caps.can_cec = 1; caps.can_cec = 1;
caps.can_cpufreq = 0; caps.can_cpufreq = 0;
@@ -143,7 +138,6 @@ hw_caps_t *get_hwcaps(void)
strcpy(caps.boxarch, "BCM72604"); strcpy(caps.boxarch, "BCM72604");
#endif #endif
#if BOXMODEL_VUUNO4KSE #if BOXMODEL_VUUNO4KSE
initialized = 1;
caps.has_CI = 1; caps.has_CI = 1;
caps.can_cec = 1; caps.can_cec = 1;
caps.can_cpufreq = 0; caps.can_cpufreq = 0;
@@ -166,7 +160,6 @@ hw_caps_t *get_hwcaps(void)
strcpy(caps.boxarch, "BCM7252S"); strcpy(caps.boxarch, "BCM7252S");
#endif #endif
#if BOXMODEL_VUUNO4K #if BOXMODEL_VUUNO4K
initialized = 1;
caps.has_CI = 1; caps.has_CI = 1;
caps.can_cec = 1; caps.can_cec = 1;
caps.can_cpufreq = 0; caps.can_cpufreq = 0;
@@ -186,7 +179,6 @@ hw_caps_t *get_hwcaps(void)
strcpy(caps.boxarch, "BCM7252S"); strcpy(caps.boxarch, "BCM7252S");
#endif #endif
#if BOXMODEL_HD51 #if BOXMODEL_HD51
initialized = 1;
caps.has_CI = 1; caps.has_CI = 1;
caps.can_cec = 1; caps.can_cec = 1;
caps.can_cpufreq = 0; caps.can_cpufreq = 0;
@@ -207,7 +199,6 @@ hw_caps_t *get_hwcaps(void)
strcpy(caps.boxarch, "BCM7251S"); strcpy(caps.boxarch, "BCM7251S");
#endif #endif
#if BOXMODEL_BRE2ZE4K #if BOXMODEL_BRE2ZE4K
initialized = 1;
caps.has_CI = 1; caps.has_CI = 1;
caps.can_cec = 1; caps.can_cec = 1;
caps.can_cpufreq = 0; caps.can_cpufreq = 0;
@@ -228,7 +219,6 @@ hw_caps_t *get_hwcaps(void)
strcpy(caps.boxarch, "BCM7251S"); strcpy(caps.boxarch, "BCM7251S");
#endif #endif
#if BOXMODEL_H7 #if BOXMODEL_H7
initialized = 1;
caps.has_CI = 1; caps.has_CI = 1;
caps.can_cec = 1; caps.can_cec = 1;
caps.can_cpufreq = 0; caps.can_cpufreq = 0;
@@ -249,7 +239,6 @@ hw_caps_t *get_hwcaps(void)
strcpy(caps.boxarch, "BCM7251S"); strcpy(caps.boxarch, "BCM7251S");
#endif #endif
#if BOXMODEL_HD60 #if BOXMODEL_HD60
initialized = 1;
caps.has_CI = 0; caps.has_CI = 0;
caps.can_cec = 1; caps.can_cec = 1;
caps.can_cpufreq = 0; caps.can_cpufreq = 0;
@@ -270,7 +259,6 @@ hw_caps_t *get_hwcaps(void)
strcpy(caps.boxarch, "HI3798M"); strcpy(caps.boxarch, "HI3798M");
#endif #endif
#if BOXMODEL_HD61 #if BOXMODEL_HD61
initialized = 1;
caps.has_CI = 2; caps.has_CI = 2;
caps.can_cec = 1; caps.can_cec = 1;
caps.can_shutdown = 1; caps.can_shutdown = 1;
@@ -289,7 +277,6 @@ hw_caps_t *get_hwcaps(void)
strcpy(caps.boxarch, "HI3798M"); strcpy(caps.boxarch, "HI3798M");
#endif #endif
#if BOXMODEL_MULTIBOXSE #if BOXMODEL_MULTIBOXSE
initialized = 1;
caps.has_CI = 0; caps.has_CI = 0;
caps.can_cec = 1; caps.can_cec = 1;
caps.can_cpufreq = 0; caps.can_cpufreq = 0;
@@ -310,7 +297,6 @@ hw_caps_t *get_hwcaps(void)
strcpy(caps.boxarch, "HI3798M"); strcpy(caps.boxarch, "HI3798M");
#endif #endif
#if BOXMODEL_OSMINI4K #if BOXMODEL_OSMINI4K
initialized = 1;
caps.has_CI = 0; caps.has_CI = 0;
caps.can_cec = 1; caps.can_cec = 1;
caps.can_cpufreq = 0; caps.can_cpufreq = 0;
@@ -331,7 +317,6 @@ hw_caps_t *get_hwcaps(void)
strcpy(caps.boxarch, "BCM72604"); strcpy(caps.boxarch, "BCM72604");
#endif #endif
#if BOXMODEL_OSMIO4K #if BOXMODEL_OSMIO4K
initialized = 1;
caps.has_CI = 0; caps.has_CI = 0;
caps.can_cec = 1; caps.can_cec = 1;
caps.can_cpufreq = 0; caps.can_cpufreq = 0;
@@ -352,7 +337,6 @@ hw_caps_t *get_hwcaps(void)
strcpy(caps.boxarch, "BCM72604"); strcpy(caps.boxarch, "BCM72604");
#endif #endif
#if BOXMODEL_OSMIO4KPLUS #if BOXMODEL_OSMIO4KPLUS
initialized = 1;
caps.has_CI = 0; caps.has_CI = 0;
caps.can_cec = 1; caps.can_cec = 1;
caps.can_cpufreq = 0; caps.can_cpufreq = 0;
@@ -373,5 +357,7 @@ hw_caps_t *get_hwcaps(void)
strcpy(caps.boxname, "OS mio+ 4K"); strcpy(caps.boxname, "OS mio+ 4K");
strcpy(caps.boxarch, "BCM72604"); strcpy(caps.boxarch, "BCM72604");
#endif #endif
initialized = 1;
return &caps; return &caps;
} }

View File

@@ -30,7 +30,6 @@ hw_caps_t *get_hwcaps(void)
caps.can_pip = 1; caps.can_pip = 1;
#if BOXMODEL_UFS910 #if BOXMODEL_UFS910
initialized = 1;
strcpy(caps.boxvendor, "KATHREIN"); strcpy(caps.boxvendor, "KATHREIN");
strcpy(caps.boxname, "UFS910"); strcpy(caps.boxname, "UFS910");
strcpy(caps.boxarch, "STX7100"); strcpy(caps.boxarch, "STX7100");
@@ -48,7 +47,6 @@ hw_caps_t *get_hwcaps(void)
caps.display_xres = 16; caps.display_xres = 16;
#endif #endif
#if BOXMODEL_UFS912 #if BOXMODEL_UFS912
initialized = 1;
strcpy(caps.boxvendor, "KATHREIN"); strcpy(caps.boxvendor, "KATHREIN");
strcpy(caps.boxname, "UFS912"); strcpy(caps.boxname, "UFS912");
strcpy(caps.boxarch, "STX7111"); strcpy(caps.boxarch, "STX7111");
@@ -66,7 +64,6 @@ hw_caps_t *get_hwcaps(void)
caps.display_xres = 16; caps.display_xres = 16;
#endif #endif
#if BOXMODEL_UFS913 #if BOXMODEL_UFS913
initialized = 1;
strcpy(caps.boxvendor, "KATHREIN"); strcpy(caps.boxvendor, "KATHREIN");
strcpy(caps.boxname, "UFS913"); strcpy(caps.boxname, "UFS913");
strcpy(caps.boxarch, "STX7105"); strcpy(caps.boxarch, "STX7105");
@@ -84,7 +81,6 @@ hw_caps_t *get_hwcaps(void)
caps.display_xres = 16; caps.display_xres = 16;
#endif #endif
#if BOXMODEL_UFS922 #if BOXMODEL_UFS922
initialized = 1;
strcpy(caps.boxvendor, "KATHREIN"); strcpy(caps.boxvendor, "KATHREIN");
strcpy(caps.boxname, "UFS922"); strcpy(caps.boxname, "UFS922");
strcpy(caps.boxarch, "STX7109"); strcpy(caps.boxarch, "STX7109");
@@ -101,7 +97,6 @@ hw_caps_t *get_hwcaps(void)
caps.display_xres = 16; caps.display_xres = 16;
#endif #endif
#if BOXMODEL_ATEVIO7500 #if BOXMODEL_ATEVIO7500
initialized = 1;
strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxvendor, "DUCKBOX");
strcpy(caps.boxname, "ATEVIO7500"); strcpy(caps.boxname, "ATEVIO7500");
strcpy(caps.boxarch, "STX7105"); strcpy(caps.boxarch, "STX7105");
@@ -119,7 +114,6 @@ hw_caps_t *get_hwcaps(void)
caps.display_xres = 12; caps.display_xres = 12;
#endif #endif
#if BOXMODEL_FORTIS_HDBOX #if BOXMODEL_FORTIS_HDBOX
initialized = 1;
strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxvendor, "DUCKBOX");
strcpy(caps.boxname, "HDBOX"); strcpy(caps.boxname, "HDBOX");
strcpy(caps.boxarch, "STX7109"); strcpy(caps.boxarch, "STX7109");
@@ -137,7 +131,6 @@ hw_caps_t *get_hwcaps(void)
caps.display_xres = 12; caps.display_xres = 12;
#endif #endif
#if BOXMODEL_OCTAGON1008 #if BOXMODEL_OCTAGON1008
initialized = 1;
strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxvendor, "DUCKBOX");
strcpy(caps.boxname, "OCTAGON1008"); strcpy(caps.boxname, "OCTAGON1008");
strcpy(caps.boxarch, "STX7109"); strcpy(caps.boxarch, "STX7109");
@@ -154,7 +147,6 @@ hw_caps_t *get_hwcaps(void)
caps.display_xres = 8; caps.display_xres = 8;
#endif #endif
#if BOXMODEL_CUBEREVO #if BOXMODEL_CUBEREVO
initialized = 1;
strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxvendor, "DUCKBOX");
strcpy(caps.boxname, "CUBEREVO"); strcpy(caps.boxname, "CUBEREVO");
strcpy(caps.boxarch, "STX7109"); strcpy(caps.boxarch, "STX7109");
@@ -169,7 +161,6 @@ hw_caps_t *get_hwcaps(void)
caps.has_CI = 2; caps.has_CI = 2;
#endif #endif
#if BOXMODEL_CUBEREVO_MINI #if BOXMODEL_CUBEREVO_MINI
initialized = 1;
strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxvendor, "DUCKBOX");
strcpy(caps.boxname, "CUBEREVO-MINI"); strcpy(caps.boxname, "CUBEREVO-MINI");
strcpy(caps.boxarch, "STX7109"); strcpy(caps.boxarch, "STX7109");
@@ -184,7 +175,6 @@ hw_caps_t *get_hwcaps(void)
caps.has_CI = 2; caps.has_CI = 2;
#endif #endif
#if BOXMODEL_CUBEREVO_MINI2 #if BOXMODEL_CUBEREVO_MINI2
initialized = 1;
strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxvendor, "DUCKBOX");
strcpy(caps.boxname, "CUBEREVO-MINI2"); strcpy(caps.boxname, "CUBEREVO-MINI2");
strcpy(caps.boxarch, "STX7109"); strcpy(caps.boxarch, "STX7109");
@@ -201,7 +191,6 @@ hw_caps_t *get_hwcaps(void)
caps.display_xres = 14; caps.display_xres = 14;
#endif #endif
#if BOXMODEL_CUBEREVO_250HD #if BOXMODEL_CUBEREVO_250HD
initialized = 1;
strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxvendor, "DUCKBOX");
strcpy(caps.boxname, "CUBEREVO-250HD"); strcpy(caps.boxname, "CUBEREVO-250HD");
strcpy(caps.boxarch, "STX7109"); strcpy(caps.boxarch, "STX7109");
@@ -216,7 +205,6 @@ hw_caps_t *get_hwcaps(void)
caps.has_CI = 0; caps.has_CI = 0;
#endif #endif
#if BOXMODEL_CUBEREVO_2000HD #if BOXMODEL_CUBEREVO_2000HD
initialized = 1;
strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxvendor, "DUCKBOX");
strcpy(caps.boxname, "CUBEREVO-2000HD"); strcpy(caps.boxname, "CUBEREVO-2000HD");
strcpy(caps.boxarch, "STX7109"); strcpy(caps.boxarch, "STX7109");
@@ -231,7 +219,6 @@ hw_caps_t *get_hwcaps(void)
caps.has_CI = 0; caps.has_CI = 0;
#endif #endif
#if BOXMODEL_CUBEREVO_3000HD #if BOXMODEL_CUBEREVO_3000HD
initialized = 1;
strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxvendor, "DUCKBOX");
strcpy(caps.boxname, "CUBEREVO-3000HD"); strcpy(caps.boxname, "CUBEREVO-3000HD");
strcpy(caps.boxarch, "STX7109"); strcpy(caps.boxarch, "STX7109");
@@ -246,7 +233,6 @@ hw_caps_t *get_hwcaps(void)
caps.has_CI = 2; caps.has_CI = 2;
#endif #endif
#if BOXMODEL_IPBOX9900 #if BOXMODEL_IPBOX9900
initialized = 1;
strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxvendor, "DUCKBOX");
strcpy(caps.boxname, "IPBOX9900"); strcpy(caps.boxname, "IPBOX9900");
strcpy(caps.boxarch, "STX7109"); strcpy(caps.boxarch, "STX7109");
@@ -261,7 +247,6 @@ hw_caps_t *get_hwcaps(void)
caps.has_CI = 2; caps.has_CI = 2;
#endif #endif
#if BOXMODEL_IPBOX99 #if BOXMODEL_IPBOX99
initialized = 1;
strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxvendor, "DUCKBOX");
strcpy(caps.boxname, "IPBOX99"); strcpy(caps.boxname, "IPBOX99");
strcpy(caps.boxarch, "STX7109"); strcpy(caps.boxarch, "STX7109");
@@ -276,7 +261,6 @@ hw_caps_t *get_hwcaps(void)
caps.has_CI = 0; caps.has_CI = 0;
#endif #endif
#if BOXMODEL_IPBOX55 #if BOXMODEL_IPBOX55
initialized = 1;
strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxvendor, "DUCKBOX");
strcpy(caps.boxname, "IPBOX55"); strcpy(caps.boxname, "IPBOX55");
strcpy(caps.boxarch, "STX7109"); strcpy(caps.boxarch, "STX7109");
@@ -291,7 +275,6 @@ hw_caps_t *get_hwcaps(void)
caps.has_CI = 0; caps.has_CI = 0;
#endif #endif
#if BOXMODEL_TF7700 #if BOXMODEL_TF7700
initialized = 1;
strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxvendor, "DUCKBOX");
strcpy(caps.boxname, "TF7700"); strcpy(caps.boxname, "TF7700");
strcpy(caps.boxarch, "STX7109"); strcpy(caps.boxarch, "STX7109");
@@ -305,5 +288,7 @@ hw_caps_t *get_hwcaps(void)
caps.has_fan = 0; caps.has_fan = 0;
caps.has_CI = 2; caps.has_CI = 2;
#endif #endif
initialized = 1;
return &caps; return &caps;
} }

View File

@@ -30,7 +30,6 @@ hw_caps_t *get_hwcaps(void)
if (access("/dev/dvb/adapter0/video1", F_OK) != -1) if (access("/dev/dvb/adapter0/video1", F_OK) != -1)
caps.can_pip = 1; caps.can_pip = 1;
initialized = 1;
caps.can_cpufreq = 0; caps.can_cpufreq = 0;
caps.can_shutdown = 1; /* for testing */ caps.can_shutdown = 1; /* for testing */
caps.display_type = HW_DISPLAY_LINE_TEXT; caps.display_type = HW_DISPLAY_LINE_TEXT;
@@ -51,5 +50,6 @@ hw_caps_t *get_hwcaps(void)
else else
fprintf(stderr, "%s: uname() failed: %m\n", __func__); fprintf(stderr, "%s: uname() failed: %m\n", __func__);
initialized = 1;
return &caps; return &caps;
} }

View File

@@ -33,7 +33,6 @@ hw_caps_t *get_hwcaps(void)
caps.can_pip = 1; caps.can_pip = 1;
#if BOXMODEL_VUDUO #if BOXMODEL_VUDUO
initialized = 1;
caps.has_CI = 2; caps.has_CI = 2;
caps.can_cec = 1; caps.can_cec = 1;
caps.can_cpufreq = 0; caps.can_cpufreq = 0;
@@ -54,5 +53,7 @@ hw_caps_t *get_hwcaps(void)
strcpy(caps.boxname, "DUO"); strcpy(caps.boxname, "DUO");
strcpy(caps.boxarch, "BCM7335"); strcpy(caps.boxarch, "BCM7335");
#endif #endif
initialized = 1;
return &caps; return &caps;
} }

View File

@@ -25,7 +25,9 @@ hw_caps_t *get_hwcaps(void)
memset(&caps, 0, sizeof(hw_caps_t)); memset(&caps, 0, sizeof(hw_caps_t));
initialized = 1; if (access("/dev/dvb/adapter0/video1", F_OK) != -1)
caps.can_pip = 1;
caps.can_cpufreq = 0; caps.can_cpufreq = 0;
caps.can_shutdown = 1; /* for testing */ caps.can_shutdown = 1; /* for testing */
caps.display_type = HW_DISPLAY_LINE_TEXT; caps.display_type = HW_DISPLAY_LINE_TEXT;
@@ -37,5 +39,6 @@ hw_caps_t *get_hwcaps(void)
strcpy(caps.boxvendor, "Raspberry"); strcpy(caps.boxvendor, "Raspberry");
strcpy(caps.boxname, "Pi"); strcpy(caps.boxname, "Pi");
initialized = 1;
return &caps; return &caps;
} }

View File

@@ -32,7 +32,6 @@ hw_caps_t *get_hwcaps(void)
if (access("/dev/dvb/adapter0/video1", F_OK) != -1) if (access("/dev/dvb/adapter0/video1", F_OK) != -1)
caps.can_pip = 1; caps.can_pip = 1;
initialized = 1;
caps.has_CI = 0; caps.has_CI = 0;
caps.can_cec = 1; caps.can_cec = 1;
caps.can_cpufreq = 1; caps.can_cpufreq = 1;
@@ -176,5 +175,7 @@ hw_caps_t *get_hwcaps(void)
tmp = "(NO STB_ID FOUND)"; tmp = "(NO STB_ID FOUND)";
strcpy(caps.boxname, tmp); strcpy(caps.boxname, tmp);
} }
initialized = 1;
return &caps; return &caps;
} }