From 6dd3a1806546b1e193e06055b5e72d8b85dd220c Mon Sep 17 00:00:00 2001 From: Axel Heider Date: Wed, 17 Nov 2021 03:11:19 +0100 Subject: [PATCH] re-use existing functions to avoid redundancy Signed-off-by: Axel Heider --- include/machine.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/include/machine.h b/include/machine.h index 930234f44..ba2a4f3b0 100644 --- a/include/machine.h +++ b/include/machine.h @@ -35,22 +35,25 @@ static inline paddr_t CONST addrFromKPPtr(const void *pptr) return (paddr_t)pptr - KERNEL_ELF_BASE_OFFSET; } +#define paddr_to_pptr(x) ptrFromPAddr(x) +#define pptr_to_paddr(x) addrFromPPtr(x) +#define kpptr_to_paddr(x) addrFromKPPtr(x) + static inline region_t CONST paddr_to_pptr_reg(const p_region_t p_reg) { return (region_t) { - p_reg.start + PPTR_BASE_OFFSET, p_reg.end + PPTR_BASE_OFFSET + .start = (paddr_t)paddr_to_pptr(p_reg.start), + .end = (paddr_t)paddr_to_pptr(p_reg.end) }; } static inline p_region_t CONST pptr_to_paddr_reg(const region_t reg) { return (p_region_t) { - reg.start - PPTR_BASE_OFFSET, reg.end - PPTR_BASE_OFFSET + .start = pptr_to_paddr((const void *)reg.start), + .end = pptr_to_paddr((const void *)reg.end), }; } -#define paddr_to_pptr(x) ptrFromPAddr(x) -#define pptr_to_paddr(x) addrFromPPtr(x) -#define kpptr_to_paddr(x) addrFromKPPtr(x) #include