添加与删除 opsbits

Author: htl5241

components/drivers/virtio/virtio_input.h

@@ -86,19 +86,6 @@ struct virtio_input_event
     rt_uint32_t value;
 };
 
-#ifdef ARCH_CPU_64BIT
-#define BITS_PER_LONG 64
-#else
-#define BITS_PER_LONG 32
-#endif
-#define BIT_MASK(nr)        (1UL << ((nr) % BITS_PER_LONG))
-#define BIT_WORD(nr)        ((nr) / BITS_PER_LONG)
-#define DIV_ROUND_UP(n, d)  (((n) + (d) - 1) / (d))
-
-#define BITS_PER_BYTE       8
-#define BITS_PER_TYPE(type) (sizeof(type) * BITS_PER_BYTE)
-#define BITS_TO_BYTES(nr)   DIV_ROUND_UP(nr, BITS_PER_TYPE(char))
-#define BITS_TO_LONGS(nr)   DIV_ROUND_UP(nr, BITS_PER_TYPE(long))
 
 struct virtio_input_device
 {

include/rtdef.h

@@ -1450,6 +1450,35 @@ typedef struct rt_channel *rt_channel_t;
 /**@}*/
 #endif /* RT_USING_DEVICE */
 
+/* BITOPS */
+
+#if defined (ARCH_CPU_64BIT)
+#define BITS_PER_LONG 64
+#else
+#define BITS_PER_LONG 32
+#endif 
+#define BITS_PER_LONG_LONG 64
+
+#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
+
+#define BIT(nr)			(1UL << (nr))
+#define BIT_ULL(nr)		(1ULL << (nr))
+#define BIT_MASK(nr)		(1UL << ((nr) % BITS_PER_LONG))
+#define BIT_WORD(nr)		((nr) / BITS_PER_LONG)
+#define BIT_ULL_MASK(nr)	(1ULL << ((nr) % BITS_PER_LONG_LONG))
+#define BIT_ULL_WORD(nr)	((nr) / BITS_PER_LONG_LONG)
+#define BITS_PER_BYTE		8
+#define BITS_PER_TYPE(type) (sizeof(type) * BITS_PER_BYTE)
+#define BITS_TO_BYTES(nr)   DIV_ROUND_UP(nr, BITS_PER_TYPE(char))
+#define BITS_TO_LONGS(nr)   DIV_ROUND_UP(nr, BITS_PER_TYPE(long))
+
+#define GENMASK(h, l) \
+	(((~0UL) << (l)) & (~0UL >> (BITS_PER_LONG - 1 - (h))))
+
+#define GENMASK_ULL(h, l) \
+	(((~0ULL) << (l)) & (~0ULL >> (BITS_PER_LONG_LONG - 1 - (h))))
+
+
 #ifdef __cplusplus
 }
 #endif