X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=yaffs_bitmap.c;h=41af707970b945a630697952539a6a9eca2412d8;hb=refs%2Fheads%2Fclean-up;hp=dc673e8430f20e8c0d956132333d5a93453cdcb1;hpb=46eb953ecab322d3385ccf84c75d969de8542317;p=yaffs2.git

diff --git a/yaffs_bitmap.c b/yaffs_bitmap.c
index dc673e8..41af707 100644
--- a/yaffs_bitmap.c
+++ b/yaffs_bitmap.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -17,37 +17,38 @@
  * Chunk bitmap manipulations
  */
 
-static inline u8 *yaffs_block_bits(struct yaffs_dev *dev, int blk)
+static inline u8 *yaffs_block_bits(struct yaffs_dev *dev, u32 blk)
 {
 	if (blk < dev->internal_start_block || blk > dev->internal_end_block) {
 		yaffs_trace(YAFFS_TRACE_ERROR,
 			"BlockBits block %d is not valid",
 			blk);
-		YBUG();
+		BUG();
 	}
 	return dev->chunk_bits +
 	    (dev->chunk_bit_stride * (blk - dev->internal_start_block));
 }
 
-void yaffs_verify_chunk_bit_id(struct yaffs_dev *dev, int blk, int chunk)
+void yaffs_verify_chunk_bit_id(struct yaffs_dev *dev, u32 blk, u32 chunk)
 {
-	if (blk < dev->internal_start_block || blk > dev->internal_end_block ||
-	    chunk < 0 || chunk >= dev->param.chunks_per_block) {
+	if (blk < dev->internal_start_block ||
+	    blk > dev->internal_end_block ||
+	    chunk >= dev->param.chunks_per_block) {
 		yaffs_trace(YAFFS_TRACE_ERROR,
 			"Chunk Id (%d:%d) invalid",
 			blk, chunk);
-		YBUG();
+		BUG();
 	}
 }
 
-void yaffs_clear_chunk_bits(struct yaffs_dev *dev, int blk)
+void yaffs_clear_chunk_bits(struct yaffs_dev *dev, u32 blk)
 {
 	u8 *blk_bits = yaffs_block_bits(dev, blk);
 
 	memset(blk_bits, 0, dev->chunk_bit_stride);
 }
 
-void yaffs_clear_chunk_bit(struct yaffs_dev *dev, int blk, int chunk)
+void yaffs_clear_chunk_bit(struct yaffs_dev *dev, u32 blk, u32 chunk)
 {
 	u8 *blk_bits = yaffs_block_bits(dev, blk);
 
@@ -55,7 +56,7 @@ void yaffs_clear_chunk_bit(struct yaffs_dev *dev, int blk, int chunk)
 	blk_bits[chunk / 8] &= ~(1 << (chunk & 7));
 }
 
-void yaffs_set_chunk_bit(struct yaffs_dev *dev, int blk, int chunk)
+void yaffs_set_chunk_bit(struct yaffs_dev *dev, u32 blk, u32 chunk)
 {
 	u8 *blk_bits = yaffs_block_bits(dev, blk);
 
@@ -63,7 +64,7 @@ void yaffs_set_chunk_bit(struct yaffs_dev *dev, int blk, int chunk)
 	blk_bits[chunk / 8] |= (1 << (chunk & 7));
 }
 
-int yaffs_check_chunk_bit(struct yaffs_dev *dev, int blk, int chunk)
+int yaffs_check_chunk_bit(struct yaffs_dev *dev, u32 blk, u32 chunk)
 {
 	u8 *blk_bits = yaffs_block_bits(dev, blk);
 
@@ -71,10 +72,10 @@ int yaffs_check_chunk_bit(struct yaffs_dev *dev, int blk, int chunk)
 	return (blk_bits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
 }
 
-int yaffs_still_some_chunks(struct yaffs_dev *dev, int blk)
+int yaffs_still_some_chunks(struct yaffs_dev *dev, u32 blk)
 {
 	u8 *blk_bits = yaffs_block_bits(dev, blk);
-	int i;
+	u32 i;
 
 	for (i = 0; i < dev->chunk_bit_stride; i++) {
 		if (*blk_bits)
@@ -84,10 +85,10 @@ int yaffs_still_some_chunks(struct yaffs_dev *dev, int blk)
 	return 0;
 }
 
-int yaffs_count_chunk_bits(struct yaffs_dev *dev, int blk)
+int yaffs_count_chunk_bits(struct yaffs_dev *dev, u32 blk)
 {
 	u8 *blk_bits = yaffs_block_bits(dev, blk);
-	int i;
+	u32 i;
 	int n = 0;
 
 	for (i = 0; i < dev->chunk_bit_stride; i++, blk_bits++)