From ebd34a9ab3809167e16e4107c8e72d1d81faff9c Mon Sep 17 00:00:00 2001 From: Kimplul Date: Mon, 11 Oct 2021 14:02:31 +0300 Subject: Renamed [pv]addr_t to [pv]m_t --- include/apos/init.h | 20 ++++++++++---------- include/apos/mem.h | 6 +++--- include/apos/pmem.h | 14 +++++++------- 3 files changed, 20 insertions(+), 20 deletions(-) (limited to 'include') diff --git a/include/apos/init.h b/include/apos/init.h index 1d687cb..05e24ba 100644 --- a/include/apos/init.h +++ b/include/apos/init.h @@ -4,24 +4,24 @@ #include struct init_data_t { - paddr_t init_base; - paddr_t init_top; + pm_t init_base; + pm_t init_top; - paddr_t initrd_base; - paddr_t initrd_top; + pm_t initrd_base; + pm_t initrd_top; - paddr_t fdt_base; - paddr_t fdt_top; + pm_t fdt_base; + pm_t fdt_top; - paddr_t stack_base; - paddr_t stack_top; + pm_t stack_base; + pm_t stack_top; struct vm_branch_t *kernel_vm_base; /* TODO: is this necessary? - paddr_t pmap_base; - paddr_t pmap_top; + pm_t pmap_base; + pm_t pmap_top; */ }; diff --git a/include/apos/mem.h b/include/apos/mem.h index 4846f5e..5e33e28 100644 --- a/include/apos/mem.h +++ b/include/apos/mem.h @@ -107,13 +107,13 @@ #define MM_OINFO_WIDTH (sizeof(mm_info_t) * 8) #define pnum_to_index(pnum, order) (((pnum) >> __o_offset(order)) & (__o_width(order) - 1)) -#define paddr_to_index(paddr, order) (pnum_to_index(paddr_to_pnum(paddr), (order))) -#define paddr_to_pnum(paddr) ((paddr) >> PAGE_SHIFT) +#define pm_to_index(paddr, order) (pnum_to_index(pm_to_pnum(paddr), (order))) +#define pm_to_pnum(paddr) ((paddr) >> PAGE_SHIFT) #define pnum_to_paddr(pnum) ((pnum) << PAGE_SHIFT) #define move_forward(var, num) (((var) += (num)) - (num)) -#define move_paddr(paddr, base, offset) ((((paddr_t)(paddr)) - (base)) + (offset)) +#define move_paddr(paddr, base, offset) ((((pm_t)(paddr)) - (base)) + (offset)) #define num_elems(num) (((num) + MM_OINFO_WIDTH - 1) / MM_OINFO_WIDTH) #define num_indexes(num) ((num) / MM_OINFO_WIDTH) #define index_elems(num) ((num) / MM_OINFO_WIDTH) diff --git a/include/apos/pmem.h b/include/apos/pmem.h index 884cf5c..38dd670 100644 --- a/include/apos/pmem.h +++ b/include/apos/pmem.h @@ -17,17 +17,17 @@ enum mm_order_t { MM_O9, }; -typedef size_t paddr_t; +typedef size_t pm_t; typedef ssize_t pnum_t; -void update_pmap(paddr_t offset); -void free_page(enum mm_order_t order, paddr_t paddr); -void mark_used(enum mm_order_t order, paddr_t paddr); -paddr_t alloc_page(enum mm_order_t order, paddr_t offset); +void update_pmap(pm_t offset); +void free_page(enum mm_order_t order, pm_t paddr); +void mark_used(enum mm_order_t order, pm_t paddr); +pm_t alloc_page(enum mm_order_t order, pm_t offset); #if defined(INIT) -paddr_t populate_pmap(paddr_t ram_base, size_t ram_size, paddr_t cont); -paddr_t probe_pmap(paddr_t ram_base, size_t ram_size); +pm_t populate_pmap(pm_t ram_base, size_t ram_size, pm_t cont); +pm_t probe_pmap(pm_t ram_base, size_t ram_size); #endif #if defined(KERNEL) -- cgit v1.3