From 4b1d94b4359789210c4f6b7d305446154cdb1632 Mon Sep 17 00:00:00 2001 From: David Karoly Date: Fri, 8 Apr 2022 21:13:50 +0200 Subject: [PATCH] debug_uart fixup for arm64 Change-Id: I872e822c48d0b4675064991ba890ce6d74d15118 Reviewed-on: https://review.haiku-os.org/c/haiku/+/5186 Reviewed-by: Reviewed-by: Adrien Destugues Tested-by: Commit checker robot --- src/system/kernel/arch/generic/debug_uart.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/system/kernel/arch/generic/debug_uart.cpp b/src/system/kernel/arch/generic/debug_uart.cpp index b6b54d877d..54c55e77f4 100644 --- a/src/system/kernel/arch/generic/debug_uart.cpp +++ b/src/system/kernel/arch/generic/debug_uart.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2006-2021, Haiku, Inc. All rights reserved. + * Copyright 2006-2022, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. */ @@ -10,7 +10,7 @@ void DebugUART::Out8(int reg, uint8 value) { -#ifdef __ARM__ +#if defined(__ARM__) || defined(__aarch64__) // 32-bit aligned *((uint8 *)Base() + reg * sizeof(uint32)) = value; #else @@ -22,7 +22,7 @@ DebugUART::Out8(int reg, uint8 value) uint8 DebugUART::In8(int reg) { -#ifdef __ARM__ +#if defined(__ARM__) || defined(__aarch64__) // 32-bit aligned return *((uint8 *)Base() + reg * sizeof(uint32)); #else @@ -37,7 +37,7 @@ DebugUART::Barrier() // Simple memory barriers #if defined(__POWERPC__) asm volatile("eieio; sync"); -#elif defined(__ARM__) +#elif defined(__ARM__) || defined(__aarch64__) asm volatile ("" : : : "memory"); #endif }