From 64d853f2458a61ceab6efda66785251a287fb88d Mon Sep 17 00:00:00 2001 From: Frankenstone Date: Wed, 12 Feb 2020 16:27:07 +0100 Subject: [PATCH] ca_ci.cpp: fix -fpermissive error on aarch64 only arm/mips hardware, thx flk ;-) --- common/ca_ci.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/common/ca_ci.cpp b/common/ca_ci.cpp index 8247e7a..7c17252 100644 --- a/common/ca_ci.cpp +++ b/common/ca_ci.cpp @@ -56,7 +56,11 @@ static cCA* pcCAInstance = NULL; /* nur diese Message wird vom CI aus neutrinoMessages.h benutzt */ /* für den CamMsgHandler, darum hier einfach mal definiert */ /* die Feinheiten werden ja in CA_MESSAGE verpackt */ +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE +uintptr_t EVT_CA_MESSAGE = 0x80000000 + 60; +#else uint32_t EVT_CA_MESSAGE = 0x80000000 + 60; +#endif static cs_messenger cam_messenger = NULL; @@ -479,7 +483,12 @@ bool cCA::SendMessage(const CA_MESSAGE *msg) { hal_debug("%s\n", __func__); if(cam_messenger) +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE + cam_messenger(EVT_CA_MESSAGE, (uintptr_t) msg); +#else cam_messenger(EVT_CA_MESSAGE, (uint32_t) msg); +#endif + #if z_debug printf("*******Message\n"); printf("msg: %p\n", msg);