From 218d9801850f2b7372dc937e3a939f4d64d885b2 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Sat, 3 Oct 2020 13:24:12 +0200 Subject: [PATCH] use new define Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/475c015b54a787771492ee7a5ce100fd741bbf90 Author: TangoCash Date: 2020-10-03 (Sat, 03 Oct 2020) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- common/Makefile.am | 2 +- include/ca_hal.h | 2 +- libarmbox/hardware_caps.c | 27 ++++++++++++++++++++++----- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/common/Makefile.am b/common/Makefile.am index e847a54..4926a03 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -31,7 +31,7 @@ libcommon_la_SOURCES = \ ca_ci.cpp else if BOXTYPE_ARMBOX -if BOXMODEL_HD60 +if BOXMODEL_HISILICON libcommon_la_SOURCES = \ ca.cpp else diff --git a/include/ca_hal.h b/include/ca_hal.h index 71217e6..1da4eda 100644 --- a/include/ca_hal.h +++ b/include/ca_hal.h @@ -1,7 +1,7 @@ #if HAVE_DUCKBOX_HARDWARE \ || HAVE_MIPS_HARDWARE \ || (HAVE_ARM_HARDWARE \ - && !BOXMODEL_HD60 \ + && !BOXMODEL_HISILICON \ && !BOXMODEL_OSMIO4K \ && !BOXMODEL_OSMIO4KPLUS \ ) diff --git a/libarmbox/hardware_caps.c b/libarmbox/hardware_caps.c index f5dc65f..3cf07a9 100644 --- a/libarmbox/hardware_caps.c +++ b/libarmbox/hardware_caps.c @@ -183,6 +183,22 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxname, "HD60"); strcpy(caps.boxarch, "HI3798M"); #endif +#if BOXMODEL_HD61 + initialized = 1; + caps.has_CI = 0; + caps.can_cec = 1; + caps.can_shutdown = 1; + 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.has_button_timer = 1; + caps.has_HDMI = 1; + strcpy(caps.boxvendor, "AX-Technologies"); + strcpy(caps.boxname, "HD61"); + strcpy(caps.boxarch, "HI3798M"); +#endif #if BOXMODEL_BRE2ZE4K initialized = 1; caps.has_CI = 1; @@ -246,11 +262,12 @@ hw_caps_t *get_hwcaps(void) caps.can_cec = 1; caps.can_cpufreq = 0; caps.can_shutdown = 1; - caps.display_xres = 5; - caps.display_type = HW_DISPLAY_LINE_TEXT; - caps.display_can_deepstandby = 0; - caps.display_can_set_brightness = 1; - caps.display_has_statusline = 1; + caps.display_xres = 128; + caps.display_yres = 64; + caps.display_type = HW_DISPLAY_GFX; + 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 = 1;