Changeset 0773396 in mainline for kernel/generic/include/adt/bitmap.h

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• kernel/generic/include/adt/bitmap.h (modified) (1 diff)

kernel/generic/include/adt/bitmap.h

@@ -38 +38 @@
 #include <typedefs.h>
 
-#define BITS2BYTES(bits)        (bits ? ((((bits)-1)>>3)+1) : 0)
+#define BITMAP_ELEMENT   8
+#define BITMAP_REMAINER  7
 
 typedef struct {
-        uint8_t *map;
-        size_t bits;
+        size_t elements;
+        uint8_t *bits;
+        size_t next_fit;
 } bitmap_t;
 
-extern void bitmap_initialize(bitmap_t *bitmap, uint8_t *map, size_t bits);
-extern void bitmap_set_range(bitmap_t *bitmap, size_t start, size_t bits);
-extern void bitmap_clear_range(bitmap_t *bitmap, size_t start, size_t bits);
-extern void bitmap_copy(bitmap_t *dst, bitmap_t *src, size_t bits);
+static inline void bitmap_set(bitmap_t *bitmap, size_t element,
+    unsigned int value)
+{
+        if (element >= bitmap->elements)
+                return;
+        
+        size_t byte = element / BITMAP_ELEMENT;
+        uint8_t mask = 1 << (element & BITMAP_REMAINER);
+        
+        if (value) {
+                bitmap->bits[byte] |= mask;
+        } else {
+                bitmap->bits[byte] &= ~mask;
+                bitmap->next_fit = byte;
+        }
+}
 
-static inline int bitmap_get(bitmap_t *bitmap, size_t bit)
+static inline unsigned int bitmap_get(bitmap_t *bitmap, size_t element)
 {
-        if(bit >= bitmap->bits)
+        if (element >= bitmap->elements)
                 return 0;
         
-        return !! ((bitmap->map)[bit/8] & (1 << (bit & 7)));
+        size_t byte = element / BITMAP_ELEMENT;
+        uint8_t mask = 1 << (element & BITMAP_REMAINER);
+        
+        return !!((bitmap->bits)[byte] & mask);
 }
 
+extern size_t bitmap_size(size_t);
+extern void bitmap_initialize(bitmap_t *, size_t, void *);
+
+extern void bitmap_set_range(bitmap_t *, size_t, size_t);
+extern void bitmap_clear_range(bitmap_t *, size_t, size_t);
+
+extern int bitmap_allocate_range(bitmap_t *, size_t, size_t, size_t, size_t,
+    size_t *);
+extern void bitmap_copy(bitmap_t *, bitmap_t *, size_t);
 
 #endif