diff options
author | Nishanth Menon <x0nishan@ti.com> | 2008-08-14 20:29:51 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2008-08-15 08:47:50 +0200 |
commit | cb3f2e34c45e928205de8d37a8f21b36de5e2098 (patch) | |
tree | 7e7854d783acce3e5b6aa1ffa2b29389db365dcd /include/linux/bitops.h | |
parent | 31f9cb365ee738ab77ca5dfe629e9691231803b4 (diff) | |
download | barebox-cb3f2e34c45e928205de8d37a8f21b36de5e2098.tar.gz barebox-cb3f2e34c45e928205de8d37a8f21b36de5e2098.tar.xz |
Bitops:Remove generic_funcs
Use asm-generic/bitops/xyz.h instead of using
generic_xyz functions.
Signed-off-by: Nishanth Menon <x0nishan@ti.com>
Diffstat (limited to 'include/linux/bitops.h')
-rw-r--r-- | include/linux/bitops.h | 71 |
1 files changed, 7 insertions, 64 deletions
diff --git a/include/linux/bitops.h b/include/linux/bitops.h index 7d41ae62cc..e8ff23b6e0 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -1,70 +1,13 @@ #ifndef _LINUX_BITOPS_H #define _LINUX_BITOPS_H - -/* - * ffs: find first bit set. This is defined the same way as - * the libc and compiler builtin ffs routines, therefore - * differs in spirit from the above ffz (man ffs). - */ - -static inline int generic_ffs(int x) -{ - int r = 1; - - if (!x) - return 0; - if (!(x & 0xffff)) { - x >>= 16; - r += 16; - } - if (!(x & 0xff)) { - x >>= 8; - r += 8; - } - if (!(x & 0xf)) { - x >>= 4; - r += 4; - } - if (!(x & 3)) { - x >>= 2; - r += 2; - } - if (!(x & 1)) { - x >>= 1; - r += 1; - } - return r; -} - -/* - * hweightN: returns the hamming weight (i.e. the number - * of bits set) of a N-bit word - */ - -static inline unsigned int generic_hweight32(unsigned int w) -{ - unsigned int res = (w & 0x55555555) + ((w >> 1) & 0x55555555); - res = (res & 0x33333333) + ((res >> 2) & 0x33333333); - res = (res & 0x0F0F0F0F) + ((res >> 4) & 0x0F0F0F0F); - res = (res & 0x00FF00FF) + ((res >> 8) & 0x00FF00FF); - return (res & 0x0000FFFF) + ((res >> 16) & 0x0000FFFF); -} - -static inline unsigned int generic_hweight16(unsigned int w) -{ - unsigned int res = (w & 0x5555) + ((w >> 1) & 0x5555); - res = (res & 0x3333) + ((res >> 2) & 0x3333); - res = (res & 0x0F0F) + ((res >> 4) & 0x0F0F); - return (res & 0x00FF) + ((res >> 8) & 0x00FF); -} - -static inline unsigned int generic_hweight8(unsigned int w) -{ - unsigned int res = (w & 0x55) + ((w >> 1) & 0x55); - res = (res & 0x33) + ((res >> 2) & 0x33); - return (res & 0x0F) + ((res >> 4) & 0x0F); -} +#ifdef __U_BOOT__ +#define BIT(nr) (1UL << (nr)) +#define BIT_MASK(nr) (1UL << ((nr) % BITS_PER_LONG)) +#define BIT_WORD(nr) ((nr) / BITS_PER_LONG) +#define BITS_PER_BYTE 8 +#define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long)) +#endif #include <asm/bitops.h> |