- add osmio4k / osmio4kplus not yet ready

Conflicts:
	acinclude.m4
	libarmbox/hardware_caps.c

Signed-off-by: Thilo Graf <dbt@novatux.de>

osmio4k only
This commit is contained in:
max_10
2020-02-19 21:57:08 +01:00
committed by Thilo Graf
parent 67110fb054
commit 55839b5f87
6 changed files with 76 additions and 23 deletions

View File

@@ -1,4 +1,10 @@
#if HAVE_DUCKBOX_HARDWARE || (HAVE_ARM_HARDWARE && !BOXMODEL_HD60) || HAVE_MIPS_HARDWARE
#if HAVE_DUCKBOX_HARDWARE \
|| HAVE_MIPS_HARDWARE \
|| (HAVE_ARM_HARDWARE \
&& !BOXMODEL_HD60 \
&& !BOXMODEL_OSMIO4K \
&& !BOXMODEL_OSMIO4KPLUS \
)
#include "ca_ci.h"
#else
#include "ca.h"

View File

@@ -23,7 +23,13 @@ inline void cs_api_exit()
#define cs_free_uncached free
// Callback function helpers
#if HAVE_DUCKBOX_HARDWARE || (HAVE_ARM_HARDWARE && !BOXMODEL_HD60) || HAVE_MIPS_HARDWARE
#if HAVE_DUCKBOX_HARDWARE \
|| HAVE_MIPS_HARDWARE \
|| (HAVE_ARM_HARDWARE \
&& !BOXMODEL_HD60 \
&& !BOXMODEL_OSMIO4K \
&& !BOXMODEL_OSMIO4KPLUS \
)
void cs_register_messenger(cs_messenger messenger);
#else
static inline void cs_register_messenger(cs_messenger) { return; };