From 6f60a729c9fd51a0af60ad9767d80837fefd42ca Mon Sep 17 00:00:00 2001 From: Frankenstone Date: Tue, 11 Feb 2020 15:10:40 +0100 Subject: [PATCH] Revert "ca_ci.cpp: fix -fpermissive error on aarch64" Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/187573afa59a63429e8f8f5a2a6c55486033bea7 Author: Frankenstone Date: 2020-02-11 (Tue, 11 Feb 2020) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- common/ca_ci.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/ca_ci.cpp b/common/ca_ci.cpp index 2e22db9..8247e7a 100644 --- a/common/ca_ci.cpp +++ b/common/ca_ci.cpp @@ -56,7 +56,7 @@ 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 */ -uintptr_t EVT_CA_MESSAGE = 0x80000000 + 60; +uint32_t EVT_CA_MESSAGE = 0x80000000 + 60; static cs_messenger cam_messenger = NULL; @@ -479,7 +479,7 @@ bool cCA::SendMessage(const CA_MESSAGE *msg) { hal_debug("%s\n", __func__); if(cam_messenger) - cam_messenger(EVT_CA_MESSAGE, (uintptr_t) msg); + cam_messenger(EVT_CA_MESSAGE, (uint32_t) msg); #if z_debug printf("*******Message\n"); printf("msg: %p\n", msg);