From 4123ec776d3769728e1e12379887da34c12ee8f8 Mon Sep 17 00:00:00 2001 From: Kimplul Date: Tue, 24 May 2022 21:25:15 +0300 Subject: change bit utils to not be __* --- include/apos/bits.h | 18 +++++++++--------- include/apos/mem_regions.h | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'include/apos') diff --git a/include/apos/bits.h b/include/apos/bits.h index 66a495c..f99d5b4 100644 --- a/include/apos/bits.h +++ b/include/apos/bits.h @@ -9,20 +9,20 @@ #include #include -#define __is_set(x, y) ((x) & (y)) -#define __set_bit(x, y) ((x) |= (y)) -#define __clear_bit(x, y) ((x) &= ~(y)) +#define is_set(x, y) ((x) & (y)) +#define set_bit(x, y) ((x) |= (y)) +#define clear_bit(x, y) ((x) &= ~(y)) -#define __is_nset(x, y) (__is_set((x), 1UL << (y))) -#define __set_nbit(x, y) (__set_bit((x), 1UL << (y))) -#define __clear_nbit(x, y) (__clear_bit((x), 1UL << (y))) +#define is_nset(x, y) (is_set((x), 1UL << (y))) +#define set_nbit(x, y) (set_bit((x), 1UL << (y))) +#define clear_nbit(x, y) (clear_bit((x), 1UL << (y))) static inline bool bitmap_is_set(void *bmap, size_t n) { uint8_t *bitmap = bmap; size_t i = n / 8; size_t r = n - (i * 8); - return __is_nset(bitmap[i], r); + return is_nset(bitmap[i], r); } static inline void bitmap_set(void *bmap, size_t n) @@ -30,7 +30,7 @@ static inline void bitmap_set(void *bmap, size_t n) uint8_t *bitmap = bmap; size_t i = n / 8; size_t r = n - (i * 8); - __set_nbit(bitmap[i], r); + set_nbit(bitmap[i], r); } static inline void bitmap_clear(void *bmap, size_t n) @@ -38,7 +38,7 @@ static inline void bitmap_clear(void *bmap, size_t n) uint8_t *bitmap = bmap; size_t i = n / 8; size_t r = n - (i * 8); - __clear_nbit(bitmap[i], r); + clear_nbit(bitmap[i], r); } uint16_t __bswap16(uint16_t u); diff --git a/include/apos/mem_regions.h b/include/apos/mem_regions.h index bd1ce2b..c9c4a5c 100644 --- a/include/apos/mem_regions.h +++ b/include/apos/mem_regions.h @@ -13,10 +13,10 @@ #include #define mem_container(ptr) container_of(ptr, struct mem_region, sp_n) -#define is_region_used(r) __is_set(r->flags, MR_USED) -#define is_region_owned(r) __is_set(r->flags, MR_OWNED) -#define is_region_shared(r) __is_set(r->flags, MR_SHARED) -#define is_region_kept(r) __is_set(r->flags, MR_KEEP) +#define is_region_used(r) is_set(r->flags, MR_USED) +#define is_region_owned(r) is_set(r->flags, MR_OWNED) +#define is_region_shared(r) is_set(r->flags, MR_SHARED) +#define is_region_kept(r) is_set(r->flags, MR_KEEP) struct mem_region_root { struct sp_root free_regions; -- cgit v1.3