Changeset ca62f86 in mainline for kernel/generic/include

Timestamp:

2013-09-09T17:52:40Z (12 years ago)

Author:

Jakub Klama <jakub.klama@…>

Branches:

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

Children:

f7bb6d1

Parents:

6ad185d (diff), a1ecb88 (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.

Location:

kernel/generic/include

Files:

• adt/bitmap.h (modified) (1 diff)
• adt/list.h (modified) (3 diffs)
• mm/as.h (modified) (1 diff)
• mm/frame.h (modified) (3 diffs)

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 block_size;
+        uint8_t *blocks;
 } 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) {
+                /*
+                 * The 2nd level bitmap is conservative.
+                 * Make sure we update it properly.
+                 */
+                
+                if (value) {
+                        bitmap->bits[element / BITMAP_ELEMENT] |=
+                            (1 << (element & BITMAP_REMAINER));
+                } else {
+                        bitmap->bits[element / BITMAP_ELEMENT] &=
+                            ~(1 << (element & BITMAP_REMAINER));
+                        
+                        if (bitmap->block_size > 0) {
+                                size_t block = element / bitmap->block_size;
+                                
+                                bitmap->blocks[block / BITMAP_ELEMENT] &=
+                                    ~(1 << (block & BITMAP_REMAINER));
+                        }
+                }
+        }
+}
 
-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)));
+        return !!((bitmap->bits)[element / BITMAP_ELEMENT] &
+            (1 << (element & BITMAP_REMAINER)));
 }
 
+extern size_t bitmap_size(size_t, size_t);
+extern void bitmap_initialize(bitmap_t *, size_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_find_range(bitmap_t *, size_t, size_t, size_t);
+extern int bitmap_allocate_range(bitmap_t *, size_t, size_t, size_t, size_t *);
+extern void bitmap_free_range(bitmap_t *, size_t, size_t);
+extern void bitmap_copy(bitmap_t *, bitmap_t *, size_t);
 
 #endif

kernel/generic/include/adt/list.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2001-2004 Jakub Jermar
- * Copyright (c) 2011 Jiri Svoboda
+ * Copyright (c) 2013 Jiri Svoboda
  * All rights reserved.
  *
@@ -65 +65 @@
 
 #define list_get_instance(link, type, member) \
-        ((type *) (((void *)(link)) - ((void *) &(((type *) NULL)->member))))
+        ((type *) (((void *)(link)) - list_link_to_void(&(((type *) NULL)->member))))
 
 #define list_foreach(list, iterator) \
@@ -281 +281 @@
 }
 
+/** Verify that argument type is a pointer to link_t (at compile time).
+ *
+ * This can be used to check argument type in a macro.
+ */
+static inline const void *list_link_to_void(const link_t *link)
+{
+        return link;
+}
+
 extern int list_member(const link_t *, const list_t *);
 extern void list_concat(list_t *, list_t *);

kernel/generic/include/mm/as.h

@@ -250 +250 @@
 extern int as_area_change_flags(as_t *, unsigned int, uintptr_t);
 
+//TODO REMOVE!
+extern as_area_t * find_locked_area(as_t *as, uintptr_t va);
+
 extern unsigned int as_area_get_flags(as_area_t *);
 extern bool as_area_check_access(as_area_t *, pf_access_t);

kernel/generic/include/mm/frame.h

@@ -63 +63 @@
 /** Allocate a frame which cannot be identity-mapped. */
 #define FRAME_HIGHMEM     0x20
+/** Allocate a frame which needs to be from DMA zone. */
+#define FRAME_DMA         0x40
 
 typedef uint8_t zone_flags_t;
@@ -77 +79 @@
 /** Zone contains memory that cannot be identity-mapped */
 #define ZONE_HIGHMEM    0x10
+/** Zone contains memory suitable for old ISA DMA */
+#define ZONE_DMA        0x20
 
 /** Mask of zone bits that must be matched exactly. */
@@ -82 +86 @@
 
 #define FRAME_TO_ZONE_FLAGS(ff) \
-        ((((ff) & FRAME_LOWMEM) ? ZONE_LOWMEM : \
+        ((((ff) & FRAME_DMA) ? ZONE_DMA : \
+            (((ff) & FRAME_LOWMEM) ? ZONE_LOWMEM : \
             (((ff) & FRAME_HIGHMEM) ? ZONE_HIGHMEM : \
-            ZONE_LOWMEM /* | ZONE_HIGHMEM */)) | \
-            ZONE_AVAILABLE) 
+            ZONE_LOWMEM /* | ZONE_HIGHMEM */))) | \
+            ZONE_AVAILABLE)
 
 #define ZONE_FLAGS_MATCH(zf, f) \