projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs: More clean up
[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 9ca963be12a8f252d3670bf8de388d2507f9bbd4..e9fe6dcbc6417e317c291d07a64d3261f155f004 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 $";
@@
-42,7
+42,7
@@
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
+ u8 data[528]; // Data + spare
} yramdisk_page;
typedef struct
} yramdisk_page;
typedef struct
@@
-61,7
+61,7
@@
typedef struct
static yramdisk_device ramdisk;
static yramdisk_device ramdisk;
-static int CheckInit(
yaffs_Device
*dev)
+static int CheckInit(
struct yaffs_dev
*dev)
{
static int initialised = 0;
{
static int initialised = 0;
@@
-119,7
+119,7
@@
static int CheckInit(yaffs_Device *dev)
return 1;
}
return 1;
}
-int yramdisk_wr_chunk(
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
+127,8
@@
int yramdisk_wr_chunk(yaffs_Device *dev,int chunkInNAND,const __u8 *data, 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
+139,9
@@
int yramdisk_wr_chunk(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const
if(tags)
{
if(tags)
{
- yaffs_
PackedT
ags1 pt;
+ 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
+150,7
@@
int yramdisk_wr_chunk(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const
}
}
-int yramdisk_rd_chunk(
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
+158,8
@@
int yramdisk_rd_chunk(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaffs_Exten
CheckInit(dev);
CheckInit(dev);
- blk =
chunkInNAND
/32;
- pg =
chunkInNAND
%32;
+ blk =
nand_chunk
/32;
+ pg =
nand_chunk
%32;
if(data)
if(data)
@@
-170,7
+170,7
@@
int yramdisk_rd_chunk(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaffs_Exten
if(tags)
{
if(tags)
{
- yaffs_
PackedT
ags1 pt;
+ 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
+181,7
@@
int yramdisk_rd_chunk(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaffs_Exten
}
}
-int yramdisk_check_chunk_erased(
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
+190,8
@@
int yramdisk_check_chunk_erased(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
+206,7
@@
int yramdisk_check_chunk_erased(yaffs_Device *dev,int chunkInNAND)
}
}
-int yramdisk_erase(
yaffs_Device
*dev, int blockNumber)
+int yramdisk_erase(
struct yaffs_dev
*dev, int blockNumber)
{
CheckInit(dev);
{
CheckInit(dev);
@@
-224,9
+224,9
@@
int yramdisk_erase(yaffs_Device *dev, int blockNumber)
}
}
-int yramdisk_initialise(
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;