X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_bitmap.c;h=85c8c1d83c032dfcb834a29c3a0ab54765ad5d7e;hp=c7e9e8c4d8e8aa26f837f98defffc616c975c3a1;hb=a5bab2056ca3c68d3e15568f81a6e1d697d23da5;hpb=780469359d1051ab37ab281b0520137d73fee2e9

diff --git a/yaffs_bitmap.c b/yaffs_bitmap.c
index c7e9e8c..85c8c1d 100644
--- a/yaffs_bitmap.c
+++ b/yaffs_bitmap.c
@@ -17,22 +17,22 @@
  * Chunk bitmap manipulations
  */
 
-static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device *dev, int blk)
+static Y_INLINE __u8 *yaffs_block_bits(yaffs_dev_t *dev, int blk)
 {
-	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
+	if (blk < dev->internal_start_block || blk > dev->internal_end_block) {
 		T(YAFFS_TRACE_ERROR,
 			(TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
 			blk));
 		YBUG();
 	}
-	return dev->chunkBits +
-		(dev->chunkBitmapStride * (blk - dev->internalStartBlock));
+	return dev->chunk_bits +
+		(dev->chunk_bit_stride * (blk - dev->internal_start_block));
 }
 
-void yaffs_VerifyChunkBitId(yaffs_Device *dev, int blk, int chunk)
+void yaffs_verify_chunk_bit_id(yaffs_dev_t *dev, int blk, int chunk)
 {
-	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock ||
-			chunk < 0 || chunk >= dev->param.nChunksPerBlock) {
+	if (blk < dev->internal_start_block || blk > dev->internal_end_block ||
+			chunk < 0 || chunk >= dev->param.chunks_per_block) {
 		T(YAFFS_TRACE_ERROR,
 		(TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),
 			blk, chunk));
@@ -40,65 +40,65 @@ void yaffs_VerifyChunkBitId(yaffs_Device *dev, int blk, int chunk)
 	}
 }
 
-void yaffs_ClearChunkBits(yaffs_Device *dev, int blk)
+void yaffs_clear_chunk_bits(yaffs_dev_t *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_ClearChunkBit(yaffs_Device *dev, int blk, int chunk)
+void yaffs_clear_chunk_bit(yaffs_dev_t *dev, int blk, int chunk)
 {
-	__u8 *blkBits = yaffs_BlockBits(dev, blk);
+	__u8 *blk_bits = yaffs_block_bits(dev, blk);
 
-	yaffs_VerifyChunkBitId(dev, blk, chunk);
+	yaffs_verify_chunk_bit_id(dev, blk, chunk);
 
-	blkBits[chunk / 8] &= ~(1 << (chunk & 7));
+	blk_bits[chunk / 8] &= ~(1 << (chunk & 7));
 }
 
-void yaffs_SetChunkBit(yaffs_Device *dev, int blk, int chunk)
+void yaffs_set_chunk_bit(yaffs_dev_t *dev, int blk, int chunk)
 {
-	__u8 *blkBits = yaffs_BlockBits(dev, blk);
+	__u8 *blk_bits = yaffs_block_bits(dev, blk);
 
-	yaffs_VerifyChunkBitId(dev, blk, chunk);
+	yaffs_verify_chunk_bit_id(dev, blk, chunk);
 
-	blkBits[chunk / 8] |= (1 << (chunk & 7));
+	blk_bits[chunk / 8] |= (1 << (chunk & 7));
 }
 
-int yaffs_CheckChunkBit(yaffs_Device *dev, int blk, int chunk)
+int yaffs_check_chunk_bit(yaffs_dev_t *dev, int blk, int chunk)
 {
-	__u8 *blkBits = yaffs_BlockBits(dev, blk);
-	yaffs_VerifyChunkBitId(dev, blk, chunk);
+	__u8 *blk_bits = yaffs_block_bits(dev, blk);
+	yaffs_verify_chunk_bit_id(dev, blk, chunk);
 
-	return (blkBits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
+	return (blk_bits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
 }
 
-int yaffs_StillSomeChunkBits(yaffs_Device *dev, int blk)
+int yaffs_still_some_chunks(yaffs_dev_t *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_CountChunkBits(yaffs_Device *dev, int blk)
+int yaffs_count_chunk_bits(yaffs_dev_t *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;
+	for (i = 0; i < dev->chunk_bit_stride; i++) {
+		__u8 x = *blk_bits;
 		while (x) {
 			if (x & 1)
 				n++;
 			x >>= 1;
 		}
 
-		blkBits++;
+		blk_bits++;
 	}
 	return n;
 }