Changeset 10285ad in mainline

Timestamp:

2010-11-10T00:10:57Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4fe18151

Parents:

8c441bd

Message:

Backout the previous change as it breaks ega.

File:

• kernel/generic/src/adt/bitmap.c (modified) (4 diffs)

kernel/generic/src/adt/bitmap.c

@@ -69 +69 @@
 void bitmap_set_range(bitmap_t *bitmap, size_t start, size_t bits)
 {
-        size_t i;
+        size_t i = 0;
         size_t aligned_start;
         size_t lub;     /* leading unaligned bits */
@@ -81 +81 @@
         amb = bits > lub ? bits - lub : 0;
         tab = amb % 8;
+        
+        if (start + bits < aligned_start) {
+                /* Set bits in the middle of byte. */
+                bitmap->map[start / 8] |= ((1 << lub) - 1) << (start & 7);
+                return;
+        }
         
         if (lub) {
@@ -105 +111 @@
 void bitmap_clear_range(bitmap_t *bitmap, size_t start, size_t bits)
 {
-        size_t i;
+        size_t i = 0;
         size_t aligned_start;
         size_t lub;     /* leading unaligned bits */
@@ -117 +123 @@
         amb = bits > lub ? bits - lub : 0;
         tab = amb % 8;
+
+        if (start + bits < aligned_start) {
+                /* Set bits in the middle of byte */
+                bitmap->map[start / 8] &= ~(((1 << lub) - 1) << (start & 7));
+                return;
+        }
 
         if (lub) {