yaffs: Change all yaffs, YAFFS and Yaffs in Kconfig to yaffs

[yaffs2.git] / yaffs_bitmap.c

diff --git a/yaffs_bitmap.c b/yaffs_bitmap.c
index a24dbb7c91a9eece9e51c5c5be017c657316f61f..55c721360464692e135c41e5137b5993b9b5e434 100644 (file)
--- a/yaffs_bitmap.c
+++ b/yaffs_bitmap.c
@@ -17,89 +17,81 @@
  * Chunk bitmap manipulations
  */
 
-static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device *dev, int blk)
+static inline u8 *yaffs_block_bits(struct yaffs_dev *dev, int blk)
 {
-       if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
-               T(YAFFS_TRACE_ERROR,
-                       (TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
-                       blk));
-               YBUG();
+       if (blk < dev->internal_start_block || blk > dev->internal_end_block) {
+               yaffs_trace(YAFFS_TRACE_ERROR,
+                       "BlockBits block %d is not valid",
+                       blk);
+               BUG();
        }
-       return dev->chunkBits +
-               (dev->chunkBitmapStride * (blk - dev->internalStartBlock));
+       return dev->chunk_bits +
+           (dev->chunk_bit_stride * (blk - dev->internal_start_block));
 }
 
-void yaffs_verify_chunk_bit_id(yaffs_Device *dev, int blk, int chunk)
+void yaffs_verify_chunk_bit_id(struct yaffs_dev *dev, int blk, int chunk)
 {
-       if (blk < dev->internalStartBlock || blk > dev->internalEndBlock ||
-                       chunk < 0 || chunk >= dev->param.nChunksPerBlock) {
-               T(YAFFS_TRACE_ERROR,
-               (TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),
-                       blk, chunk));
-               YBUG();
+       if (blk < dev->internal_start_block || blk > dev->internal_end_block ||
+           chunk < 0 || chunk >= dev->param.chunks_per_block) {
+               yaffs_trace(YAFFS_TRACE_ERROR,
+                       "Chunk Id (%d:%d) invalid",
+                       blk, chunk);
+               BUG();
        }
 }
 
-void yaffs_clear_chunk_bits(yaffs_Device *dev, int blk)
+void yaffs_clear_chunk_bits(struct yaffs_dev *dev, int blk)
 {
-       __u8 *blkBits = yaffs_BlockBits(dev, blk);
+       u8 *blk_bits = yaffs_block_bits(dev, blk);
 
-       memset(blkBits, 0, dev->chunkBitmapStride);
+       memset(blk_bits, 0, dev->chunk_bit_stride);
 }
 
-void yaffs_clear_chunk_bit(yaffs_Device *dev, int blk, int chunk)
+void yaffs_clear_chunk_bit(struct yaffs_dev *dev, int blk, int chunk)
 {
-       __u8 *blkBits = yaffs_BlockBits(dev, blk);
+       u8 *blk_bits = yaffs_block_bits(dev, blk);
 
        yaffs_verify_chunk_bit_id(dev, blk, chunk);
-
-       blkBits[chunk / 8] &= ~(1 << (chunk & 7));
+       blk_bits[chunk / 8] &= ~(1 << (chunk & 7));
 }
 
-void yaffs_set_chunk_bit(yaffs_Device *dev, int blk, int chunk)
+void yaffs_set_chunk_bit(struct yaffs_dev *dev, int blk, int chunk)
 {
-       __u8 *blkBits = yaffs_BlockBits(dev, blk);
+       u8 *blk_bits = yaffs_block_bits(dev, blk);
 
        yaffs_verify_chunk_bit_id(dev, blk, chunk);
-
-       blkBits[chunk / 8] |= (1 << (chunk & 7));
+       blk_bits[chunk / 8] |= (1 << (chunk & 7));
 }
 
-int yaffs_check_chunk_bit(yaffs_Device *dev, int blk, int chunk)
+int yaffs_check_chunk_bit(struct yaffs_dev *dev, int blk, int chunk)
 {
-       __u8 *blkBits = yaffs_BlockBits(dev, blk);
-       yaffs_verify_chunk_bit_id(dev, blk, chunk);
+       u8 *blk_bits = yaffs_block_bits(dev, blk);
 
-       return (blkBits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
+       yaffs_verify_chunk_bit_id(dev, blk, chunk);
+       return (blk_bits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
 }
 
-int yaffs_still_some_chunks(yaffs_Device *dev, int blk)
+int yaffs_still_some_chunks(struct yaffs_dev *dev, int blk)
 {
-       __u8 *blkBits = yaffs_BlockBits(dev, blk);
+       u8 *blk_bits = yaffs_block_bits(dev, blk);
        int i;
-       for (i = 0; i < dev->chunkBitmapStride; i++) {
-               if (*blkBits)
+
+       for (i = 0; i < dev->chunk_bit_stride; i++) {
+               if (*blk_bits)
                        return 1;
-               blkBits++;
+               blk_bits++;
        }
        return 0;
 }
 
-int yaffs_count_chunk_bits(yaffs_Device *dev, int blk)
+int yaffs_count_chunk_bits(struct yaffs_dev *dev, int blk)
 {
-       __u8 *blkBits = yaffs_BlockBits(dev, blk);
+       u8 *blk_bits = yaffs_block_bits(dev, blk);
        int i;
        int n = 0;
-       for (i = 0; i < dev->chunkBitmapStride; i++) {
-               __u8 x = *blkBits;
-               while (x) {
-                       if (x & 1)
-                               n++;
-                       x >>= 1;
-               }
-
-               blkBits++;
-       }
+
+       for (i = 0; i < dev->chunk_bit_stride; i++, blk_bits++)
+               n += hweight8(*blk_bits);
+
        return n;
 }
-