projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2
[yaffs2.git]
/
yaffs_bitmap.c
diff --git
a/yaffs_bitmap.c
b/yaffs_bitmap.c
index c7e9e8c4d8e8aa26f837f98defffc616c975c3a1..85c8c1d83c032dfcb834a29c3a0ab54765ad5d7e 100644
(file)
--- a/
yaffs_bitmap.c
+++ b/
yaffs_bitmap.c
@@
-17,22
+17,22
@@
* Chunk bitmap manipulations
*/
* 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->internal
StartBlock || blk > dev->internalEndB
lock) {
+ if (blk < dev->internal
_start_block || blk > dev->internal_end_b
lock) {
T(YAFFS_TRACE_ERROR,
(TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
blk));
YBUG();
}
T(YAFFS_TRACE_ERROR,
(TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
blk));
YBUG();
}
- return dev->chunk
B
its +
- (dev->chunk
BitmapStride * (blk - dev->internalStartB
lock));
+ return dev->chunk
_b
its +
+ (dev->chunk
_bit_stride * (blk - dev->internal_start_b
lock));
}
}
-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->internal
StartBlock || blk > dev->internalEndB
lock ||
- chunk < 0 || chunk >= dev->param.
nChunksPerB
lock) {
+ if (blk < dev->internal
_start_block || blk > dev->internal_end_b
lock ||
+ chunk < 0 || chunk >= dev->param.
chunks_per_b
lock) {
T(YAFFS_TRACE_ERROR,
(TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),
blk, chunk));
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 *blk
Bits = yaffs_BlockB
its(dev, blk);
+ __u8 *blk
_bits = yaffs_block_b
its(dev, blk);
- memset(blk
Bits, 0, dev->chunkBitmapS
tride);
+ memset(blk
_bits, 0, dev->chunk_bit_s
tride);
}
}
-void yaffs_
ClearChunkBit(yaffs_Device
*dev, int blk, int chunk)
+void yaffs_
clear_chunk_bit(yaffs_dev_t
*dev, int blk, int chunk)
{
{
- __u8 *blk
Bits = yaffs_BlockB
its(dev, blk);
+ __u8 *blk
_bits = yaffs_block_b
its(dev, blk);
- yaffs_
VerifyChunkBitI
d(dev, blk, chunk);
+ yaffs_
verify_chunk_bit_i
d(dev, blk, chunk);
- blk
B
its[chunk / 8] &= ~(1 << (chunk & 7));
+ blk
_b
its[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 *blk
Bits = yaffs_BlockB
its(dev, blk);
+ __u8 *blk
_bits = yaffs_block_b
its(dev, blk);
- yaffs_
VerifyChunkBitI
d(dev, blk, chunk);
+ yaffs_
verify_chunk_bit_i
d(dev, blk, chunk);
- blk
B
its[chunk / 8] |= (1 << (chunk & 7));
+ blk
_b
its[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 *blk
Bits = yaffs_BlockB
its(dev, blk);
- yaffs_
VerifyChunkBitI
d(dev, blk, chunk);
+ __u8 *blk
_bits = yaffs_block_b
its(dev, blk);
+ yaffs_
verify_chunk_bit_i
d(dev, blk, chunk);
- return (blk
B
its[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
+ return (blk
_b
its[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 *blk
Bits = yaffs_BlockB
its(dev, blk);
+ __u8 *blk
_bits = yaffs_block_b
its(dev, blk);
int i;
int i;
- for (i = 0; i < dev->chunk
BitmapS
tride; i++) {
- if (*blk
B
its)
+ for (i = 0; i < dev->chunk
_bit_s
tride; i++) {
+ if (*blk
_b
its)
return 1;
return 1;
- blk
B
its++;
+ blk
_b
its++;
}
return 0;
}
}
return 0;
}
-int yaffs_
CountChunkBits(yaffs_Device
*dev, int blk)
+int yaffs_
count_chunk_bits(yaffs_dev_t
*dev, int blk)
{
{
- __u8 *blk
Bits = yaffs_BlockB
its(dev, blk);
+ __u8 *blk
_bits = yaffs_block_b
its(dev, blk);
int i;
int n = 0;
int i;
int n = 0;
- for (i = 0; i < dev->chunk
BitmapS
tride; i++) {
- __u8 x = *blk
B
its;
+ for (i = 0; i < dev->chunk
_bit_s
tride; i++) {
+ __u8 x = *blk
_b
its;
while (x) {
if (x & 1)
n++;
x >>= 1;
}
while (x) {
if (x & 1)
n++;
x >>= 1;
}
- blk
B
its++;
+ blk
_b
its++;
}
return n;
}
}
return n;
}