From ff96f10d40bcadddce32e9ac9afdd157400deebe Mon Sep 17 00:00:00 2001 From: Sateallia Date: Sat, 28 Oct 2023 23:54:55 +0300 Subject: [PATCH] Of course, fixing warnings mean nothing if the code doesn't work. --- arch/aarch64/hal.c | 5 +++-- arch/aarch64/hal.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/aarch64/hal.c b/arch/aarch64/hal.c index 094c8d2..a2b7390 100644 --- a/arch/aarch64/hal.c +++ b/arch/aarch64/hal.c @@ -28,8 +28,9 @@ void delay(int32_t count) { : "=r"(count): [count]"0"(count) : "cc"); } -uint32_t mmio_read(uint32_t reg) { - return (uintptr_t)reg; +uint32_t mmio_read(uint64_t reg) { + uint64_t *p_reg = (uint64_t*)reg; + return *p_reg; } void mmio_write(uint64_t reg, uint32_t data) { diff --git a/arch/aarch64/hal.h b/arch/aarch64/hal.h index 1674ce6..257e7bc 100644 --- a/arch/aarch64/hal.h +++ b/arch/aarch64/hal.h @@ -26,7 +26,7 @@ void hcf(); void delay(int32_t); -uint32_t mmio_read(uint32_t); +uint32_t mmio_read(uint64_t); void mmio_write(uint64_t, uint32_t); #endif