From fe258661a47b6b92d2fe2720b700ab2f48a07deb Mon Sep 17 00:00:00 2001 From: TangoCash Date: Sat, 3 Oct 2020 20:39:02 +0200 Subject: [PATCH] HD61 has ci Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/b61cc635b4baacbb6de4796b85d8c6bd7ca01267 Author: TangoCash Date: 2020-10-03 (Sat, 03 Oct 2020) Origin message was: ------------------ - HD61 has ci ------------------ 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 +- include/cs_api.h | 2 +- libarmbox/hardware_caps.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/Makefile.am b/common/Makefile.am index 4926a03..e847a54 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_HISILICON +if BOXMODEL_HD60 libcommon_la_SOURCES = \ ca.cpp else diff --git a/include/ca_hal.h b/include/ca_hal.h index 1da4eda..71217e6 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_HISILICON \ + && !BOXMODEL_HD60 \ && !BOXMODEL_OSMIO4K \ && !BOXMODEL_OSMIO4KPLUS \ ) diff --git a/include/cs_api.h b/include/cs_api.h index 6986e50..38134f6 100644 --- a/include/cs_api.h +++ b/include/cs_api.h @@ -26,7 +26,7 @@ inline void cs_api_exit() #if HAVE_DUCKBOX_HARDWARE \ || HAVE_MIPS_HARDWARE \ || (HAVE_ARM_HARDWARE \ - && !BOXMODEL_HISILICON \ + && !BOXMODEL_HD60 \ && !BOXMODEL_OSMIO4K \ && !BOXMODEL_OSMIO4KPLUS \ ) diff --git a/libarmbox/hardware_caps.c b/libarmbox/hardware_caps.c index 3cf07a9..a2ac331 100644 --- a/libarmbox/hardware_caps.c +++ b/libarmbox/hardware_caps.c @@ -185,7 +185,7 @@ hw_caps_t *get_hwcaps(void) #endif #if BOXMODEL_HD61 initialized = 1; - caps.has_CI = 0; + caps.has_CI = 2; caps.can_cec = 1; caps.can_shutdown = 1; caps.display_xres = 4;