diff --git a/libarmbox/hardware_caps.c b/libarmbox/hardware_caps.c index a4e2bdb..46354b9 100644 --- a/libarmbox/hardware_caps.c +++ b/libarmbox/hardware_caps.c @@ -33,7 +33,6 @@ hw_caps_t *get_hwcaps(void) caps.can_pip = 1; #if BOXMODEL_VUSOLO4K - initialized = 1; caps.has_CI = 1; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -55,7 +54,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "BCM7376"); #endif #if BOXMODEL_VUDUO4K - initialized = 1; caps.has_CI = 2; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -78,7 +76,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "BCM7278"); #endif #if BOXMODEL_VUDUO4KSE - initialized = 1; caps.has_CI = 2; caps.can_cec = 1; caps.can_shutdown = 1; @@ -100,7 +97,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "BCM7444S"); #endif #if BOXMODEL_VUULTIMO4K - initialized = 1; caps.has_CI = 2; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -123,7 +119,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "BCM7444S"); #endif #if BOXMODEL_VUZERO4K - initialized = 1; caps.has_CI = 1; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -143,7 +138,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "BCM72604"); #endif #if BOXMODEL_VUUNO4KSE - initialized = 1; caps.has_CI = 1; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -166,7 +160,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "BCM7252S"); #endif #if BOXMODEL_VUUNO4K - initialized = 1; caps.has_CI = 1; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -186,7 +179,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "BCM7252S"); #endif #if BOXMODEL_HD51 - initialized = 1; caps.has_CI = 1; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -207,7 +199,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "BCM7251S"); #endif #if BOXMODEL_BRE2ZE4K - initialized = 1; caps.has_CI = 1; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -228,7 +219,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "BCM7251S"); #endif #if BOXMODEL_H7 - initialized = 1; caps.has_CI = 1; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -249,7 +239,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "BCM7251S"); #endif #if BOXMODEL_HD60 - initialized = 1; caps.has_CI = 0; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -270,7 +259,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "HI3798M"); #endif #if BOXMODEL_HD61 - initialized = 1; caps.has_CI = 2; caps.can_cec = 1; caps.can_shutdown = 1; @@ -289,7 +277,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "HI3798M"); #endif #if BOXMODEL_MULTIBOXSE - initialized = 1; caps.has_CI = 0; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -310,7 +297,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "HI3798M"); #endif #if BOXMODEL_OSMINI4K - initialized = 1; caps.has_CI = 0; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -331,7 +317,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "BCM72604"); #endif #if BOXMODEL_OSMIO4K - initialized = 1; caps.has_CI = 0; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -352,7 +337,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxarch, "BCM72604"); #endif #if BOXMODEL_OSMIO4KPLUS - initialized = 1; caps.has_CI = 0; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -373,5 +357,7 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxname, "OS mio+ 4K"); strcpy(caps.boxarch, "BCM72604"); #endif + + initialized = 1; return ∩︀ } diff --git a/libduckbox/hardware_caps.c b/libduckbox/hardware_caps.c index e97ccb9..6a2cb1b 100644 --- a/libduckbox/hardware_caps.c +++ b/libduckbox/hardware_caps.c @@ -30,7 +30,6 @@ hw_caps_t *get_hwcaps(void) caps.can_pip = 1; #if BOXMODEL_UFS910 - initialized = 1; strcpy(caps.boxvendor, "KATHREIN"); strcpy(caps.boxname, "UFS910"); strcpy(caps.boxarch, "STX7100"); @@ -48,7 +47,6 @@ hw_caps_t *get_hwcaps(void) caps.display_xres = 16; #endif #if BOXMODEL_UFS912 - initialized = 1; strcpy(caps.boxvendor, "KATHREIN"); strcpy(caps.boxname, "UFS912"); strcpy(caps.boxarch, "STX7111"); @@ -66,7 +64,6 @@ hw_caps_t *get_hwcaps(void) caps.display_xres = 16; #endif #if BOXMODEL_UFS913 - initialized = 1; strcpy(caps.boxvendor, "KATHREIN"); strcpy(caps.boxname, "UFS913"); strcpy(caps.boxarch, "STX7105"); @@ -84,7 +81,6 @@ hw_caps_t *get_hwcaps(void) caps.display_xres = 16; #endif #if BOXMODEL_UFS922 - initialized = 1; strcpy(caps.boxvendor, "KATHREIN"); strcpy(caps.boxname, "UFS922"); strcpy(caps.boxarch, "STX7109"); @@ -101,7 +97,6 @@ hw_caps_t *get_hwcaps(void) caps.display_xres = 16; #endif #if BOXMODEL_ATEVIO7500 - initialized = 1; strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, "ATEVIO7500"); strcpy(caps.boxarch, "STX7105"); @@ -119,7 +114,6 @@ hw_caps_t *get_hwcaps(void) caps.display_xres = 12; #endif #if BOXMODEL_FORTIS_HDBOX - initialized = 1; strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, "HDBOX"); strcpy(caps.boxarch, "STX7109"); @@ -137,7 +131,6 @@ hw_caps_t *get_hwcaps(void) caps.display_xres = 12; #endif #if BOXMODEL_OCTAGON1008 - initialized = 1; strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, "OCTAGON1008"); strcpy(caps.boxarch, "STX7109"); @@ -154,7 +147,6 @@ hw_caps_t *get_hwcaps(void) caps.display_xres = 8; #endif #if BOXMODEL_CUBEREVO - initialized = 1; strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, "CUBEREVO"); strcpy(caps.boxarch, "STX7109"); @@ -169,7 +161,6 @@ hw_caps_t *get_hwcaps(void) caps.has_CI = 2; #endif #if BOXMODEL_CUBEREVO_MINI - initialized = 1; strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, "CUBEREVO-MINI"); strcpy(caps.boxarch, "STX7109"); @@ -184,7 +175,6 @@ hw_caps_t *get_hwcaps(void) caps.has_CI = 2; #endif #if BOXMODEL_CUBEREVO_MINI2 - initialized = 1; strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, "CUBEREVO-MINI2"); strcpy(caps.boxarch, "STX7109"); @@ -201,7 +191,6 @@ hw_caps_t *get_hwcaps(void) caps.display_xres = 14; #endif #if BOXMODEL_CUBEREVO_250HD - initialized = 1; strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, "CUBEREVO-250HD"); strcpy(caps.boxarch, "STX7109"); @@ -216,7 +205,6 @@ hw_caps_t *get_hwcaps(void) caps.has_CI = 0; #endif #if BOXMODEL_CUBEREVO_2000HD - initialized = 1; strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, "CUBEREVO-2000HD"); strcpy(caps.boxarch, "STX7109"); @@ -231,7 +219,6 @@ hw_caps_t *get_hwcaps(void) caps.has_CI = 0; #endif #if BOXMODEL_CUBEREVO_3000HD - initialized = 1; strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, "CUBEREVO-3000HD"); strcpy(caps.boxarch, "STX7109"); @@ -246,7 +233,6 @@ hw_caps_t *get_hwcaps(void) caps.has_CI = 2; #endif #if BOXMODEL_IPBOX9900 - initialized = 1; strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, "IPBOX9900"); strcpy(caps.boxarch, "STX7109"); @@ -261,7 +247,6 @@ hw_caps_t *get_hwcaps(void) caps.has_CI = 2; #endif #if BOXMODEL_IPBOX99 - initialized = 1; strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, "IPBOX99"); strcpy(caps.boxarch, "STX7109"); @@ -276,7 +261,6 @@ hw_caps_t *get_hwcaps(void) caps.has_CI = 0; #endif #if BOXMODEL_IPBOX55 - initialized = 1; strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, "IPBOX55"); strcpy(caps.boxarch, "STX7109"); @@ -291,7 +275,6 @@ hw_caps_t *get_hwcaps(void) caps.has_CI = 0; #endif #if BOXMODEL_TF7700 - initialized = 1; strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxname, "TF7700"); strcpy(caps.boxarch, "STX7109"); @@ -305,5 +288,7 @@ hw_caps_t *get_hwcaps(void) caps.has_fan = 0; caps.has_CI = 2; #endif + + initialized = 1; return ∩︀ } diff --git a/libgeneric-pc/hardware_caps.c b/libgeneric-pc/hardware_caps.c index 824f28d..5b5afa3 100644 --- a/libgeneric-pc/hardware_caps.c +++ b/libgeneric-pc/hardware_caps.c @@ -30,7 +30,6 @@ hw_caps_t *get_hwcaps(void) if (access("/dev/dvb/adapter0/video1", F_OK) != -1) caps.can_pip = 1; - initialized = 1; caps.can_cpufreq = 0; caps.can_shutdown = 1; /* for testing */ caps.display_type = HW_DISPLAY_LINE_TEXT; @@ -51,5 +50,6 @@ hw_caps_t *get_hwcaps(void) else fprintf(stderr, "%s: uname() failed: %m\n", __func__); + initialized = 1; return ∩︀ } diff --git a/libmipsbox/hardware_caps.c b/libmipsbox/hardware_caps.c index 914c9a1..422b159 100644 --- a/libmipsbox/hardware_caps.c +++ b/libmipsbox/hardware_caps.c @@ -33,7 +33,6 @@ hw_caps_t *get_hwcaps(void) caps.can_pip = 1; #if BOXMODEL_VUDUO - initialized = 1; caps.has_CI = 2; caps.can_cec = 1; caps.can_cpufreq = 0; @@ -54,5 +53,7 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxname, "DUO"); strcpy(caps.boxarch, "BCM7335"); #endif + + initialized = 1; return ∩︀ } diff --git a/libraspi/hardware_caps.c b/libraspi/hardware_caps.c index 69d5be3..6b9009a 100644 --- a/libraspi/hardware_caps.c +++ b/libraspi/hardware_caps.c @@ -25,7 +25,9 @@ hw_caps_t *get_hwcaps(void) 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_shutdown = 1; /* for testing */ caps.display_type = HW_DISPLAY_LINE_TEXT; @@ -37,5 +39,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxvendor, "Raspberry"); strcpy(caps.boxname, "Pi"); + initialized = 1; return ∩︀ } diff --git a/libspark/hardware_caps.c b/libspark/hardware_caps.c index 41a52dc..8500d47 100644 --- a/libspark/hardware_caps.c +++ b/libspark/hardware_caps.c @@ -32,7 +32,6 @@ hw_caps_t *get_hwcaps(void) if (access("/dev/dvb/adapter0/video1", F_OK) != -1) caps.can_pip = 1; - initialized = 1; caps.has_CI = 0; caps.can_cec = 1; caps.can_cpufreq = 1; @@ -176,5 +175,7 @@ hw_caps_t *get_hwcaps(void) tmp = "(NO STB_ID FOUND)"; strcpy(caps.boxname, tmp); } + + initialized = 1; return ∩︀ }