projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs direct: Fix opening of a directory.
[yaffs2.git]
/
direct
/
test-framework
/
yaffs_m18_drv.c
diff --git
a/direct/test-framework/yaffs_m18_drv.c
b/direct/test-framework/yaffs_m18_drv.c
index eca97ecaa1889b6d1f4ad8c83cfcfcc4b6b3a2d7..da425e0c8c44b4bff236c004b9179f2785c99151 100644
(file)
--- a/
direct/test-framework/yaffs_m18_drv.c
+++ b/
direct/test-framework/yaffs_m18_drv.c
@@
-92,10
+92,10
@@
static struct nor_sim *nor_sim;
static u32 *Block2Addr(struct yaffs_dev *dev, int blockNumber)
{
static u32 *Block2Addr(struct yaffs_dev *dev, int blockNumber)
{
- u
32
addr;
+ u
8 *
addr;
dev=dev;
dev=dev;
- addr = (u
32
) DEVICE_BASE;
+ addr = (u
8*
) DEVICE_BASE;
addr += blockNumber * BLOCK_SIZE_IN_BYTES;
return (u32 *) addr;
addr += blockNumber * BLOCK_SIZE_IN_BYTES;
return (u32 *) addr;
@@
-103,9
+103,9
@@
static u32 *Block2Addr(struct yaffs_dev *dev, int blockNumber)
static u32 *Block2FormatAddr(struct yaffs_dev *dev,int blockNumber)
{
static u32 *Block2FormatAddr(struct yaffs_dev *dev,int blockNumber)
{
- u
32
addr;
+ u
8 *
addr;
- addr = (u
32
) Block2Addr(dev,blockNumber);
+ addr = (u
8*
) Block2Addr(dev,blockNumber);
addr += FORMAT_OFFSET;
return (u32 *)addr;
addr += FORMAT_OFFSET;
return (u32 *)addr;
@@
-115,12
+115,12
@@
static u32 *Chunk2DataAddr(struct yaffs_dev *dev,int chunk_id)
{
unsigned block;
unsigned chunkInBlock;
{
unsigned block;
unsigned chunkInBlock;
- u
32
addr;
+ u
8 *
addr;
block = chunk_id/dev->param.chunks_per_block;
chunkInBlock = chunk_id % dev->param.chunks_per_block;
block = chunk_id/dev->param.chunks_per_block;
chunkInBlock = chunk_id % dev->param.chunks_per_block;
- addr = (u
32
) Block2Addr(dev,block);
+ addr = (u
8*
) Block2Addr(dev,block);
addr += chunkInBlock * DATA_BYTES_PER_CHUNK;
return (u32 *)addr;
addr += chunkInBlock * DATA_BYTES_PER_CHUNK;
return (u32 *)addr;
@@
-130,12
+130,12
@@
static u32 *Chunk2SpareAddr(struct yaffs_dev *dev,int chunk_id)
{
unsigned block;
unsigned chunkInBlock;
{
unsigned block;
unsigned chunkInBlock;
- u
32
addr;
+ u
8 *
addr;
block = chunk_id/dev->param.chunks_per_block;
chunkInBlock = chunk_id % dev->param.chunks_per_block;
block = chunk_id/dev->param.chunks_per_block;
chunkInBlock = chunk_id % dev->param.chunks_per_block;
- addr = (u
32
) Block2Addr(dev,block);
+ addr = (u
8*
) Block2Addr(dev,block);
addr += SPARE_AREA_OFFSET;
addr += chunkInBlock * (SPARE_BYTES_PER_CHUNK + M18_SKIP);
return (u32 *)addr;
addr += SPARE_AREA_OFFSET;
addr += chunkInBlock * (SPARE_BYTES_PER_CHUNK + M18_SKIP);
return (u32 *)addr;
@@
-224,6
+224,8
@@
static int m18_drv_ReadChunkFromNAND(struct yaffs_dev *dev,int nand_chunk,
u32 *dataAddr = Chunk2DataAddr(dev,nand_chunk);
u32 *spareAddr = Chunk2SpareAddr(dev,nand_chunk);
u32 *dataAddr = Chunk2DataAddr(dev,nand_chunk);
u32 *spareAddr = Chunk2SpareAddr(dev,nand_chunk);
+ (void) data_len;
+
if(data)
{
m18_drv_FlashRead32(dataAddr,(u32 *)data,dev->param.total_bytes_per_chunk / 4);
if(data)
{
m18_drv_FlashRead32(dataAddr,(u32 *)data,dev->param.total_bytes_per_chunk / 4);
@@
-305,7
+307,7
@@
static int m18_drv_EraseBlockInNAND(struct yaffs_dev *dev, int blockNumber)
static int m18_drv_InitialiseNAND(struct yaffs_dev *dev)
{
static int m18_drv_InitialiseNAND(struct yaffs_dev *dev)
{
-
int
i;
+
u32
i;
m18_drv_FlashInit();
/* Go through the blocks formatting them if they are not formatted */
m18_drv_FlashInit();
/* Go through the blocks formatting them if they are not formatted */