projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs direct: Add EROFS error for hundling chmod on a read-only fs
[yaffs2.git]
/
direct
/
basic-test
/
yaffs_ramdisk.c
diff --git
a/direct/basic-test/yaffs_ramdisk.c
b/direct/basic-test/yaffs_ramdisk.c
index 0b47adfa131b761cd69bf40026726750c7eeb99f..babddde3eda963e0a7189d6d3f4df2cb27f52047 100644
(file)
--- a/
direct/basic-test/yaffs_ramdisk.c
+++ b/
direct/basic-test/yaffs_ramdisk.c
@@
-15,7
+15,7
@@
* yaffs_ramdisk.c: yaffs ram disk component
* This provides a ram disk under yaffs.
* NB this is not intended for NAND emulation.
* yaffs_ramdisk.c: yaffs ram disk component
* This provides a ram disk under yaffs.
* NB this is not intended for NAND emulation.
- * Use this with dev->use
NANDECC
enabled, then ECC overheads are not required.
+ * Use this with dev->use
_nand_ecc
enabled, then ECC overheads are not required.
*/
const char *yaffs_ramdisk_c_version = "$Id: yaffs_ramdisk.c,v 1.6 2010-01-11 04:06:47 charles Exp $";
*/
const char *yaffs_ramdisk_c_version = "$Id: yaffs_ramdisk.c,v 1.6 2010-01-11 04:06:47 charles Exp $";
@@
-26,7
+26,6
@@
const char *yaffs_ramdisk_c_version = "$Id: yaffs_ramdisk.c,v 1.6 2010-01-11 04:
#include "yaffs_ramdisk.h"
#include "yaffs_guts.h"
#include "yaffs_ramdisk.h"
#include "yaffs_guts.h"
-#include "devextras.h"
#include "yaffs_packedtags1.h"
#include "yaffs_packedtags1.h"
@@
-42,26
+41,26
@@
const char *yaffs_ramdisk_c_version = "$Id: yaffs_ramdisk.c,v 1.6 2010-01-11 04:
typedef struct
{
typedef struct
{
-
__
u8 data[528]; // Data + spare
-} yramdisk_
P
age;
+ u8 data[528]; // Data + spare
+} yramdisk_
p
age;
typedef struct
{
typedef struct
{
- yramdisk_
P
age page[32]; // The pages in the block
+ yramdisk_
p
age page[32]; // The pages in the block
-} yramdisk_
B
lock;
+} yramdisk_
b
lock;
typedef struct
{
typedef struct
{
- yramdisk_
B
lock **block;
+ yramdisk_
b
lock **block;
int nBlocks;
int nBlocks;
-} yramdisk_
D
evice;
+} yramdisk_
d
evice;
-static yramdisk_
D
evice ramdisk;
+static yramdisk_
d
evice ramdisk;
-static int CheckInit(
yaffs_Device
*dev)
+static int CheckInit(
struct yaffs_dev
*dev)
{
static int initialised = 0;
{
static int initialised = 0;
@@
-80,7
+79,7
@@
static int CheckInit(yaffs_Device *dev)
ramdisk.nBlocks = (SIZE_IN_MB * 1024 * 1024)/(16 * 1024);
ramdisk.nBlocks = (SIZE_IN_MB * 1024 * 1024)/(16 * 1024);
- ramdisk.block = YMALLOC(sizeof(yramdisk_
B
lock *) * ramdisk.nBlocks);
+ ramdisk.block = YMALLOC(sizeof(yramdisk_
b
lock *) * ramdisk.nBlocks);
if(!ramdisk.block) return 0;
if(!ramdisk.block) return 0;
@@
-91,13
+90,13
@@
static int CheckInit(yaffs_Device *dev)
for(i=0; i <ramdisk.nBlocks && !fail; i++)
{
for(i=0; i <ramdisk.nBlocks && !fail; i++)
{
- if((ramdisk.block[i] = YMALLOC(sizeof(yramdisk_
B
lock))) == 0)
+ if((ramdisk.block[i] = YMALLOC(sizeof(yramdisk_
b
lock))) == 0)
{
fail = 1;
}
else
{
{
fail = 1;
}
else
{
- yramdisk_
EraseBlockInNAND
(dev,i);
+ yramdisk_
erase
(dev,i);
nAllocated++;
}
}
nAllocated++;
}
}
@@
-119,7
+118,7
@@
static int CheckInit(yaffs_Device *dev)
return 1;
}
return 1;
}
-int yramdisk_
WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const yaffs_ExtendedT
ags *tags)
+int yramdisk_
wr_chunk(struct yaffs_dev *dev,int nand_chunk,const u8 *data, const struct yaffs_ext_t
ags *tags)
{
int blk;
int pg;
{
int blk;
int pg;
@@
-127,8
+126,8
@@
int yramdisk_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __
CheckInit(dev);
CheckInit(dev);
- blk =
chunkInNAND
/32;
- pg =
chunkInNAND
%32;
+ blk =
nand_chunk
/32;
+ pg =
nand_chunk
%32;
if(data)
if(data)
@@
-139,9
+138,9
@@
int yramdisk_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __
if(tags)
{
if(tags)
{
-
yaffs_PackedT
ags1 pt;
+
struct yaffs_packed_t
ags1 pt;
- yaffs_
PackT
ags1(&pt,tags);
+ yaffs_
pack_t
ags1(&pt,tags);
memcpy(&ramdisk.block[blk]->page[pg].data[512],&pt,sizeof(pt));
}
memcpy(&ramdisk.block[blk]->page[pg].data[512],&pt,sizeof(pt));
}
@@
-150,7
+149,7
@@
int yramdisk_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __
}
}
-int yramdisk_
ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaffs_ExtendedT
ags *tags)
+int yramdisk_
rd_chunk(struct yaffs_dev *dev,int nand_chunk, u8 *data, struct yaffs_ext_t
ags *tags)
{
int blk;
int pg;
{
int blk;
int pg;
@@
-158,8
+157,8
@@
int yramdisk_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *
CheckInit(dev);
CheckInit(dev);
- blk =
chunkInNAND
/32;
- pg =
chunkInNAND
%32;
+ blk =
nand_chunk
/32;
+ pg =
nand_chunk
%32;
if(data)
if(data)
@@
-170,7
+169,7
@@
int yramdisk_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *
if(tags)
{
if(tags)
{
-
yaffs_PackedT
ags1 pt;
+
struct yaffs_packed_t
ags1 pt;
memcpy(&pt,&ramdisk.block[blk]->page[pg].data[512],sizeof(pt));
yaffs_unpack_tags1(tags,&pt);
memcpy(&pt,&ramdisk.block[blk]->page[pg].data[512],sizeof(pt));
yaffs_unpack_tags1(tags,&pt);
@@
-181,7
+180,7
@@
int yramdisk_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *
}
}
-int yramdisk_
CheckChunkErased(yaffs_Device *dev,int chunkInNAND
)
+int yramdisk_
check_chunk_erased(struct yaffs_dev *dev,int nand_chunk
)
{
int blk;
int pg;
{
int blk;
int pg;
@@
-190,8
+189,8
@@
int yramdisk_CheckChunkErased(yaffs_Device *dev,int chunkInNAND)
CheckInit(dev);
CheckInit(dev);
- blk =
chunkInNAND
/32;
- pg =
chunkInNAND
%32;
+ blk =
nand_chunk
/32;
+ pg =
nand_chunk
%32;
for(i = 0; i < 528; i++)
for(i = 0; i < 528; i++)
@@
-206,7
+205,7
@@
int yramdisk_CheckChunkErased(yaffs_Device *dev,int chunkInNAND)
}
}
-int yramdisk_
EraseBlockInNAND(yaffs_Device
*dev, int blockNumber)
+int yramdisk_
erase(struct yaffs_dev
*dev, int blockNumber)
{
CheckInit(dev);
{
CheckInit(dev);
@@
-218,15
+217,15
@@
int yramdisk_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
}
else
{
}
else
{
- memset(ramdisk.block[blockNumber],0xFF,sizeof(yramdisk_
B
lock));
+ memset(ramdisk.block[blockNumber],0xFF,sizeof(yramdisk_
b
lock));
return YAFFS_OK;
}
}
return YAFFS_OK;
}
}
-int yramdisk_
InitialiseNAND(yaffs_Device
*dev)
+int yramdisk_
initialise(struct yaffs_dev
*dev)
{
{
- //dev->use
NANDECC = 1; // force on useNANDECC
which gets faked.
+ //dev->use
_nand_ecc = 1; // force on use_nand_ecc
which gets faked.
// This saves us doing ECC checks.
return YAFFS_OK;
// This saves us doing ECC checks.
return YAFFS_OK;