This is an automated email from the ASF dual-hosted git repository. pkarashchenko pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push: new 84059a949c Revert "lib/math32.h: support LOG2_CEIL/LOG2_FLOOR function at compile time" 84059a949c is described below commit 84059a949c658416e99b9256a6b0dae44d16e2ec Author: Xiang Xiao <xiaoxi...@xiaomi.com> AuthorDate: Mon Feb 13 01:54:58 2023 +0800 Revert "lib/math32.h: support LOG2_CEIL/LOG2_FLOOR function at compile time" avoid the duplicated FLSxx and LOG2xx macro This reverts commit 224f53fe0270a03c58d167ef2ea1c0e974e86a7f. --- include/nuttx/lib/math32.h | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/include/nuttx/lib/math32.h b/include/nuttx/lib/math32.h index 587fdab1c3..c8c79e1037 100644 --- a/include/nuttx/lib/math32.h +++ b/include/nuttx/lib/math32.h @@ -29,36 +29,6 @@ #include <inttypes.h> #include <stdint.h> -#include <inttypes.h> - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* Returns one plus the index of the most significant 1-bit of n, - * or if n is zero, returns zero. - */ - -#if UINTPTR_MAX > UINT32_MAX -# define FLS(n) ((n) & UINT64_C(0xffffffff00000000) ? 32 + \ - FLS32((size_t)(n) >> 32) : FLS32(n)) -#else -# define FLS(n) FLS32(n) -#endif - -#define FLS32(n) ((n) & 0xffff0000 ? 16 + FLS16((n) >> 16) : FLS16(n)) -#define FLS16(n) ((n) & 0xff00 ? 8 + FLS8 ((n) >> 8) : FLS8 (n)) -#define FLS8(n) ((n) & 0xf0 ? 4 + FLS4 ((n) >> 4) : FLS4 (n)) -#define FLS4(n) ((n) & 0xc ? 2 + FLS2 ((n) >> 2) : FLS2 (n)) -#define FLS2(n) ((n) & 0x2 ? 1 + FLS1 ((n) >> 1) : FLS1 (n)) -#define FLS1(n) ((n) & 0x1 ? 1 : 0) - -/* Returns round up and round down value of log2(n). Note: it can be used at - * compile time. - */ - -#define LOG2_CEIL(n) ((n) & (n - 1) ? FLS(n) : FLS(n) - 1) -#define LOG2_FLOOR(n) (FLS(n) - 1) /**************************************************************************** * Pre-processor Definitions