From a2c6323728f3dcb59ecb0d7b31651f0f53301dfd Mon Sep 17 00:00:00 2001 From: GetAway Date: Thu, 16 Jul 2020 22:33:12 +0200 Subject: [PATCH] introduce caps.display_has_colon Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/26808f3ccb234990c4c130fcb0ccc6db5e7366a8 Author: GetAway Date: 2020-07-16 (Thu, 16 Jul 2020) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- include/hardware_caps.h | 1 + libarmbox/hardware_caps.c | 20 ++++++++++++++++---- libazbox/hardware_caps.c | 1 + libgeneric-pc/hardware_caps.c | 1 + libmipsbox/hardware_caps.c | 1 + libspark/hardware_caps.c | 1 + 6 files changed, 21 insertions(+), 4 deletions(-) diff --git a/include/hardware_caps.h b/include/hardware_caps.h index 44c3a98..7a54bc3 100644 --- a/include/hardware_caps.h +++ b/include/hardware_caps.h @@ -40,6 +40,7 @@ typedef struct hw_caps int display_can_set_brightness; int display_can_deepstandby; int display_has_statusline; + int display_has_colon; int has_button_timer; int has_button_vformat; char boxvendor[64]; diff --git a/libarmbox/hardware_caps.c b/libarmbox/hardware_caps.c index 0271442..d2e8fa9 100644 --- a/libarmbox/hardware_caps.c +++ b/libarmbox/hardware_caps.c @@ -40,6 +40,7 @@ hw_caps_t *get_hwcaps(void) caps.display_can_deepstandby = 0; // 0 because we use graphlcd/lcd4linux caps.display_can_set_brightness = 0; // 0 because we use graphlcd/lcd4linux caps.display_has_statusline = 0; // 0 because we use graphlcd/lcd4linux + caps.display_has_colon = 0; caps.has_button_timer = 1; caps.has_button_vformat = 0; caps.has_HDMI = 1; @@ -58,6 +59,7 @@ hw_caps_t *get_hwcaps(void) caps.display_can_deepstandby = 0; // 0 because we use graphlcd/lcd4linux caps.display_can_set_brightness = 0; // 0 because we use graphlcd/lcd4linux caps.display_has_statusline = 0; // 0 because we use graphlcd/lcd4linux + caps.display_has_colon = 0; caps.has_button_timer = 1; caps.has_button_vformat = 0; caps.has_HDMI = 2; @@ -76,6 +78,7 @@ hw_caps_t *get_hwcaps(void) caps.display_can_deepstandby = 0; // 0 because we use graphlcd/lcd4linux caps.display_can_set_brightness = 0; // 0 because we use graphlcd/lcd4linux caps.display_has_statusline = 0; // 0 because we use graphlcd/lcd4linux + caps.display_has_colon = 0; caps.has_button_timer = 1; caps.has_button_vformat = 0; caps.has_HDMI = 2; @@ -92,6 +95,7 @@ hw_caps_t *get_hwcaps(void) caps.display_can_deepstandby = 0; caps.display_can_set_brightness = 1; caps.display_has_statusline = 0; + caps.display_has_colon = 0; caps.has_button_timer = 1; caps.has_button_vformat = 0; caps.has_HDMI = 1; @@ -110,6 +114,7 @@ hw_caps_t *get_hwcaps(void) caps.display_can_deepstandby = 0; // 0 because we use graphlcd/lcd4linux caps.display_can_set_brightness = 0; // 0 because we use graphlcd/lcd4linux caps.display_has_statusline = 0; // 0 because we use graphlcd/lcd4linux + caps.display_has_colon = 0; caps.has_button_timer = 1; caps.has_button_vformat = 0; caps.has_HDMI = 2; @@ -126,6 +131,7 @@ hw_caps_t *get_hwcaps(void) caps.display_can_deepstandby = 0; caps.display_can_set_brightness = 1; caps.display_has_statusline = 0; + caps.display_has_colon = 0; caps.has_button_timer = 1; caps.has_button_vformat = 0; caps.has_HDMI = 1; @@ -143,6 +149,7 @@ hw_caps_t *get_hwcaps(void) caps.display_can_deepstandby = 0; caps.display_can_set_brightness = 1; caps.display_has_statusline = 0; + caps.display_has_colon = 0; caps.has_button_timer = 1; caps.has_button_vformat = 0; caps.has_HDMI = 1; @@ -160,6 +167,7 @@ hw_caps_t *get_hwcaps(void) caps.display_can_deepstandby = 0; caps.display_can_set_brightness = 1; caps.display_has_statusline = 0; + caps.display_has_colon = 1; caps.has_button_timer = 1; caps.has_button_vformat = 0; caps.has_HDMI = 1; @@ -172,11 +180,12 @@ hw_caps_t *get_hwcaps(void) caps.has_CI = 1; caps.can_cec = 1; caps.can_shutdown = 1; - caps.display_xres = 5; - caps.display_type = HW_DISPLAY_LINE_TEXT; + caps.display_xres = 4; + caps.display_type = HW_DISPLAY_LED_NUM; caps.display_can_deepstandby = 0; caps.display_can_set_brightness = 1; caps.display_has_statusline = 0; + caps.display_has_colon = 1; caps.has_button_timer = 1; caps.has_button_vformat = 1; caps.has_HDMI = 1; @@ -189,11 +198,12 @@ hw_caps_t *get_hwcaps(void) caps.has_CI = 1; caps.can_cec = 1; caps.can_shutdown = 1; - caps.display_xres = 5; - caps.display_type = HW_DISPLAY_LINE_TEXT; + caps.display_xres = 4; + caps.display_type = HW_DISPLAY_LED_NUM; caps.display_can_deepstandby = 0; caps.display_can_set_brightness = 1; caps.display_has_statusline = 0; + caps.display_has_colon = 1; caps.has_button_timer = 1; caps.has_button_vformat = 0; caps.has_HDMI = 1; @@ -211,6 +221,7 @@ hw_caps_t *get_hwcaps(void) caps.display_can_deepstandby = 0; caps.display_can_set_brightness = 1; caps.display_has_statusline = 1; + caps.display_has_colon = 1; caps.has_button_timer = 1; caps.has_button_vformat = 1; caps.has_HDMI = 1; @@ -228,6 +239,7 @@ hw_caps_t *get_hwcaps(void) caps.display_can_deepstandby = 0; caps.display_can_set_brightness = 1; caps.display_has_statusline = 1; + caps.display_has_colon = 0; caps.has_button_timer = 1; caps.has_button_vformat = 1; caps.has_HDMI = 1; diff --git a/libazbox/hardware_caps.c b/libazbox/hardware_caps.c index a09da2c..b75b858 100644 --- a/libazbox/hardware_caps.c +++ b/libazbox/hardware_caps.c @@ -32,6 +32,7 @@ hw_caps_t *get_hwcaps(void) caps.display_xres = 8; caps.display_can_deepstandby = 0; caps.display_has_statusline = 0; + caps.display_has_colon = 0; strcpy(caps.boxvendor, "AZBox"); const char *tmp; char buf[64]; diff --git a/libgeneric-pc/hardware_caps.c b/libgeneric-pc/hardware_caps.c index a68c89e..3e27276 100644 --- a/libgeneric-pc/hardware_caps.c +++ b/libgeneric-pc/hardware_caps.c @@ -34,6 +34,7 @@ hw_caps_t *get_hwcaps(void) caps.display_xres = 8; caps.display_can_deepstandby = 0; caps.display_has_statusline = 0; + caps.display_has_colon = 0; strcpy(caps.boxvendor, "Generic"); strcpy(caps.boxname, "PC"); if (! uname(&u)){ diff --git a/libmipsbox/hardware_caps.c b/libmipsbox/hardware_caps.c index bb81877..6dbd12c 100644 --- a/libmipsbox/hardware_caps.c +++ b/libmipsbox/hardware_caps.c @@ -39,6 +39,7 @@ hw_caps_t *get_hwcaps(void) caps.display_can_deepstandby = 1; caps.display_can_set_brightness = 1; caps.display_has_statusline = 0; + caps.display_has_colon = 0; caps.has_button_timer = 1; caps.has_HDMI = 1; caps.has_SCART = 1; diff --git a/libspark/hardware_caps.c b/libspark/hardware_caps.c index b17f385..b1ecb47 100644 --- a/libspark/hardware_caps.c +++ b/libspark/hardware_caps.c @@ -37,6 +37,7 @@ hw_caps_t *get_hwcaps(void) caps.display_can_set_brightness = 0; caps.display_can_deepstandby = 0; caps.display_has_statusline = 0; + caps.display_has_colon = 1; caps.has_HDMI = 1; caps.has_SCART = 1; caps.display_xres = 4;