Merge branch 'master' of github.com:Duckbox-Developers/libstb-hal-cst-next

Origin commit data
------------------
Branch: master
Commit: 4b716df43c
Author: TangoCash <eric@loxat.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
TangoCash
2017-11-03 13:44:12 +01:00
4 changed files with 13 additions and 12 deletions

View File

@@ -36,7 +36,8 @@ typedef struct hw_caps
display_type_t display_type; display_type_t display_type;
int display_xres; /* x resolution or chars per line */ int display_xres; /* x resolution or chars per line */
int display_yres; int display_yres;
int can_set_display_brightness; int display_can_set_brightness;
int display_can_deepstandby;
char boxvendor[64]; char boxvendor[64];
char boxname[64]; char boxname[64];
char boxarch[64]; char boxarch[64];

View File

@@ -34,7 +34,7 @@ hw_caps_t *get_hwcaps(void)
caps.can_shutdown = 1; caps.can_shutdown = 1;
caps.display_xres = 16; caps.display_xres = 16;
caps.display_type = HW_DISPLAY_LINE_TEXT; caps.display_type = HW_DISPLAY_LINE_TEXT;
caps.can_set_display_brightness = 1; caps.display_can_set_brightness = 1;
caps.has_HDMI = 1; caps.has_HDMI = 1;
strcpy(caps.boxvendor, "AX-Technologies"); strcpy(caps.boxvendor, "AX-Technologies");
strcpy(caps.boxname, "HD51"); strcpy(caps.boxname, "HD51");

View File

@@ -29,7 +29,7 @@ hw_caps_t *get_hwcaps(void)
char buf[64]; char buf[64];
int len = -1; int len = -1;
int fd = open("/proc/stb/info/model", O_RDONLY); int fd = open("/proc/stb/info/model", O_RDONLY);
caps.can_set_display_brightness = 0; caps.display_can_set_brightness = 0;
if (fd != -1) { if (fd != -1) {
len = read(fd, buf, sizeof(buf) - 1); len = read(fd, buf, sizeof(buf) - 1);
close(fd); close(fd);
@@ -55,7 +55,7 @@ hw_caps_t *get_hwcaps(void)
caps.can_cec = 1; caps.can_cec = 1;
caps.has_fan = 0; caps.has_fan = 0;
caps.has_CI = 2; caps.has_CI = 2;
caps.can_set_display_brightness = 1; caps.display_can_set_brightness = 1;
} }
else if (!strncmp(buf, "ufs913", 6)) { else if (!strncmp(buf, "ufs913", 6)) {
strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxvendor, "DUCKBOX");
@@ -66,7 +66,7 @@ hw_caps_t *get_hwcaps(void)
caps.can_cec = 1; caps.can_cec = 1;
caps.has_fan = 0; caps.has_fan = 0;
caps.has_CI = 2; caps.has_CI = 2;
caps.can_set_display_brightness = 1; caps.display_can_set_brightness = 1;
} }
else if (!strncmp(buf, "ufs922", 6)) { else if (!strncmp(buf, "ufs922", 6)) {
strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxvendor, "DUCKBOX");
@@ -87,7 +87,7 @@ hw_caps_t *get_hwcaps(void)
caps.can_cec = 0; caps.can_cec = 0;
caps.has_fan = 0; caps.has_fan = 0;
caps.has_CI = 2; caps.has_CI = 2;
caps.can_set_display_brightness = 1; caps.display_can_set_brightness = 1;
} }
else if (!strncmp(buf, "hdbox", 5)) { else if (!strncmp(buf, "hdbox", 5)) {
strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxvendor, "DUCKBOX");
@@ -273,7 +273,7 @@ hw_caps_t *get_hwcaps(void)
caps.can_cec = 1; caps.can_cec = 1;
caps.has_fan = 0; caps.has_fan = 0;
caps.has_CI = 2; caps.has_CI = 2;
caps.can_set_display_brightness = 0; caps.display_can_set_brightness = 0;
} }
else if ((!strncasecmp(buf, "nbox", 4)) || else if ((!strncasecmp(buf, "nbox", 4)) ||
(!strncasecmp(buf, "adb_box", 7))) { (!strncasecmp(buf, "adb_box", 7))) {
@@ -285,7 +285,7 @@ hw_caps_t *get_hwcaps(void)
caps.can_cec = 1; caps.can_cec = 1;
caps.has_fan = 1; caps.has_fan = 1;
caps.has_CI = 2; caps.has_CI = 2;
caps.can_set_display_brightness = 1; caps.display_can_set_brightness = 1;
} }
else if ((!strncasecmp(buf, "sagemcom88", 10)) || else if ((!strncasecmp(buf, "sagemcom88", 10)) ||
(!strncasecmp(buf, "esi_88", 6)) || (!strncasecmp(buf, "esi_88", 6)) ||
@@ -299,7 +299,7 @@ hw_caps_t *get_hwcaps(void)
caps.can_cec = 1; caps.can_cec = 1;
caps.has_fan = 1; caps.has_fan = 1;
caps.has_CI = 0; caps.has_CI = 0;
caps.can_set_display_brightness = 1; caps.display_can_set_brightness = 1;
} }
else if (!strncasecmp(buf, "dsi87", 5)) { else if (!strncasecmp(buf, "dsi87", 5)) {
strcpy(caps.boxvendor, "DUCKBOX"); strcpy(caps.boxvendor, "DUCKBOX");
@@ -310,7 +310,7 @@ hw_caps_t *get_hwcaps(void)
caps.can_cec = 1; caps.can_cec = 1;
caps.has_fan = 0; caps.has_fan = 0;
caps.has_CI = 0; caps.has_CI = 0;
caps.can_set_display_brightness = 0; caps.display_can_set_brightness = 0;
} }
else { else {
strcpy(caps.boxvendor, "unknown"); strcpy(caps.boxvendor, "unknown");

View File

@@ -34,7 +34,7 @@ hw_caps_t *get_hwcaps(void)
caps.can_cec = 1; caps.can_cec = 1;
caps.can_shutdown = 1; caps.can_shutdown = 1;
caps.display_type = HW_DISPLAY_LED_NUM; caps.display_type = HW_DISPLAY_LED_NUM;
caps.can_set_display_brightness = 0; caps.display_can_set_brightness = 0;
caps.has_HDMI = 1; caps.has_HDMI = 1;
caps.has_SCART = 1; caps.has_SCART = 1;
caps.display_xres = 4; caps.display_xres = 4;
@@ -50,7 +50,7 @@ hw_caps_t *get_hwcaps(void)
else if (val & 1) { /* VFD = 1, DVFD = 3 */ else if (val & 1) { /* VFD = 1, DVFD = 3 */
caps.display_type = HW_DISPLAY_LINE_TEXT; caps.display_type = HW_DISPLAY_LINE_TEXT;
caps.display_xres = 8; caps.display_xres = 8;
caps.can_set_display_brightness = 1; caps.display_can_set_brightness = 1;
} }
close(fd); close(fd);
} }