X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fbasic-test%2Fyaffs_norif1.c;h=5394f0ede224d9bbb1907434e2177f77e18d38f2;hp=5657c002f1ac891251f9caf9f84691b939faa2a4;hb=137f935f6d622bffdef2fece0c5194e85f5174e9;hpb=f43976eda35065890e7cf0a008e9518158eb71d6 diff --git a/direct/basic-test/yaffs_norif1.c b/direct/basic-test/yaffs_norif1.c index 5657c00..5394f0e 100644 --- a/direct/basic-test/yaffs_norif1.c +++ b/direct/basic-test/yaffs_norif1.c @@ -45,8 +45,6 @@ const char *yaffs_norif1_c_version = "$Id: yaffs_norif1.c,v 1.6 2010-02-18 01:18 #include "yaffs_flashif.h" #include "yaffs_guts.h" -#include "devextras.h" - #define SPARE_BYTES_PER_CHUNK 16 #define M18_SKIP 16 #define PROG_REGION_SIZE 1024 @@ -88,58 +86,58 @@ const char *yaffs_norif1_c_version = "$Id: yaffs_norif1.c,v 1.6 2010-02-18 01:18 #define DEVICE_BASE (32 * 1024 * 1024) #endif -__u32 *Block2Addr(yaffs_dev_t *dev, int blockNumber) +u32 *Block2Addr(struct yaffs_dev *dev, int blockNumber) { - __u32 addr; + u32 addr; dev=dev; - addr = (__u32) DEVICE_BASE; + addr = (u32) DEVICE_BASE; addr += blockNumber * BLOCK_SIZE_IN_BYTES; - return (__u32 *) addr; + return (u32 *) addr; } -__u32 *Block2FormatAddr(yaffs_dev_t *dev,int blockNumber) +u32 *Block2FormatAddr(struct yaffs_dev *dev,int blockNumber) { - __u32 addr; + u32 addr; - addr = (__u32) Block2Addr(dev,blockNumber); + addr = (u32) Block2Addr(dev,blockNumber); addr += FORMAT_OFFSET; - return (__u32 *)addr; + return (u32 *)addr; } -__u32 *Chunk2DataAddr(yaffs_dev_t *dev,int chunk_id) +u32 *Chunk2DataAddr(struct yaffs_dev *dev,int chunk_id) { unsigned block; unsigned chunkInBlock; - __u32 addr; + u32 addr; block = chunk_id/dev->param.chunks_per_block; chunkInBlock = chunk_id % dev->param.chunks_per_block; - addr = (__u32) Block2Addr(dev,block); + addr = (u32) Block2Addr(dev,block); addr += chunkInBlock * DATA_BYTES_PER_CHUNK; - return (__u32 *)addr; + return (u32 *)addr; } -__u32 *Chunk2SpareAddr(yaffs_dev_t *dev,int chunk_id) +u32 *Chunk2SpareAddr(struct yaffs_dev *dev,int chunk_id) { unsigned block; unsigned chunkInBlock; - __u32 addr; + u32 addr; block = chunk_id/dev->param.chunks_per_block; chunkInBlock = chunk_id % dev->param.chunks_per_block; - addr = (__u32) Block2Addr(dev,block); + addr = (u32) Block2Addr(dev,block); addr += SPARE_AREA_OFFSET; addr += chunkInBlock * (SPARE_BYTES_PER_CHUNK + M18_SKIP); - return (__u32 *)addr; + return (u32 *)addr; } -void ynorif1_AndBytes(__u8*target, const __u8 *src, int nbytes) +void ynorif1_AndBytes(u8*target, const u8 *src, int nbytes) { while(nbytes > 0){ *target &= *src; @@ -149,12 +147,12 @@ void ynorif1_AndBytes(__u8*target, const __u8 *src, int nbytes) } } -int ynorif1_WriteChunkToNAND(yaffs_dev_t *dev,int nand_chunk,const __u8 *data, const yaffs_spare *spare) +int ynorif1_WriteChunkToNAND(struct yaffs_dev *dev,int nand_chunk,const u8 *data, const struct yaffs_spare *spare) { - __u32 *dataAddr = Chunk2DataAddr(dev,nand_chunk); - __u32 *spareAddr = Chunk2SpareAddr(dev,nand_chunk); + u32 *dataAddr = Chunk2DataAddr(dev,nand_chunk); + u32 *spareAddr = Chunk2SpareAddr(dev,nand_chunk); - yaffs_spare tmpSpare; + struct yaffs_spare tmpSpare; /* We should only be getting called for one of 3 reasons: * Writing a chunk: data and spare will not be NULL @@ -162,7 +160,7 @@ int ynorif1_WriteChunkToNAND(yaffs_dev_t *dev,int nand_chunk,const __u8 *data, c * Writing a bad block marker: data will be NULL, spare not NULL */ - if(sizeof(yaffs_spare) != 16) + if(sizeof(struct yaffs_spare) != 16) YBUG(); if(data && spare) @@ -172,30 +170,30 @@ int ynorif1_WriteChunkToNAND(yaffs_dev_t *dev,int nand_chunk,const __u8 *data, c /* Write a pre-marker */ memset(&tmpSpare,0xff,sizeof(tmpSpare)); tmpSpare.page_status = YNOR_PREMARKER; - ynorif1_FlashWrite32(spareAddr,(__u32 *)&tmpSpare,sizeof(yaffs_spare)/4); + ynorif1_FlashWrite32(spareAddr,(u32 *)&tmpSpare,sizeof(struct yaffs_spare)/4); /* Write the data */ - ynorif1_FlashWrite32(dataAddr,(__u32 *)data,dev->param.total_bytes_per_chunk / 4); + ynorif1_FlashWrite32(dataAddr,(u32 *)data,dev->param.total_bytes_per_chunk / 4); - memcpy(&tmpSpare,spare,sizeof(yaffs_spare)); + memcpy(&tmpSpare,spare,sizeof(struct yaffs_spare)); /* Write the real tags, but override the premarker*/ tmpSpare.page_status = YNOR_PREMARKER; - ynorif1_FlashWrite32(spareAddr,(__u32 *)&tmpSpare,sizeof(yaffs_spare)/4); + ynorif1_FlashWrite32(spareAddr,(u32 *)&tmpSpare,sizeof(struct yaffs_spare)/4); /* Write a post-marker */ tmpSpare.page_status = YNOR_POSTMARKER; - ynorif1_FlashWrite32(spareAddr,(__u32 *)&tmpSpare,sizeof(tmpSpare)/4); + ynorif1_FlashWrite32(spareAddr,(u32 *)&tmpSpare,sizeof(tmpSpare)/4); } else if(spare){ /* This has to be a read-modify-write operation to handle NOR-ness */ - ynorif1_FlashRead32(spareAddr,(__u32 *)&tmpSpare,16/ 4); + ynorif1_FlashRead32(spareAddr,(u32 *)&tmpSpare,16/ 4); - ynorif1_AndBytes((__u8 *)&tmpSpare,(__u8 *)spare,sizeof(yaffs_spare)); + ynorif1_AndBytes((u8 *)&tmpSpare,(u8 *)spare,sizeof(struct yaffs_spare)); - ynorif1_FlashWrite32(spareAddr,(__u32 *)&tmpSpare,16/ 4); + ynorif1_FlashWrite32(spareAddr,(u32 *)&tmpSpare,16/ 4); } else { YBUG(); @@ -206,20 +204,20 @@ int ynorif1_WriteChunkToNAND(yaffs_dev_t *dev,int nand_chunk,const __u8 *data, c } -int ynorif1_ReadChunkFromNAND(yaffs_dev_t *dev,int nand_chunk, __u8 *data, yaffs_spare *spare) +int ynorif1_ReadChunkFromNAND(struct yaffs_dev *dev,int nand_chunk, u8 *data, struct yaffs_spare *spare) { - __u32 *dataAddr = Chunk2DataAddr(dev,nand_chunk); - __u32 *spareAddr = Chunk2SpareAddr(dev,nand_chunk); + u32 *dataAddr = Chunk2DataAddr(dev,nand_chunk); + u32 *spareAddr = Chunk2SpareAddr(dev,nand_chunk); if(data) { - ynorif1_FlashRead32(dataAddr,(__u32 *)data,dev->param.total_bytes_per_chunk / 4); + ynorif1_FlashRead32(dataAddr,(u32 *)data,dev->param.total_bytes_per_chunk / 4); } if(spare) { - ynorif1_FlashRead32(spareAddr,(__u32 *)spare,16/ 4); + ynorif1_FlashRead32(spareAddr,(u32 *)spare,16/ 4); /* If the page status is YNOR_POSTMARKER then it was written properly * so change that to 0xFF so that the rest of yaffs is happy. @@ -236,11 +234,11 @@ int ynorif1_ReadChunkFromNAND(yaffs_dev_t *dev,int nand_chunk, __u8 *data, yaffs } -static int ynorif1_FormatBlock(yaffs_dev_t *dev, int blockNumber) +static int ynorif1_FormatBlock(struct yaffs_dev *dev, int blockNumber) { - __u32 *blockAddr = Block2Addr(dev,blockNumber); - __u32 *formatAddr = Block2FormatAddr(dev,blockNumber); - __u32 formatValue = FORMAT_VALUE; + u32 *blockAddr = Block2Addr(dev,blockNumber); + u32 *formatAddr = Block2FormatAddr(dev,blockNumber); + u32 formatValue = FORMAT_VALUE; ynorif1_FlashEraseBlock(blockAddr); ynorif1_FlashWrite32(formatAddr,&formatValue,1); @@ -248,20 +246,20 @@ static int ynorif1_FormatBlock(yaffs_dev_t *dev, int blockNumber) return YAFFS_OK; } -static int ynorif1_UnformatBlock(yaffs_dev_t *dev, int blockNumber) +static int ynorif1_UnformatBlock(struct yaffs_dev *dev, int blockNumber) { - __u32 *formatAddr = Block2FormatAddr(dev,blockNumber); - __u32 formatValue = 0; + u32 *formatAddr = Block2FormatAddr(dev,blockNumber); + u32 formatValue = 0; ynorif1_FlashWrite32(formatAddr,&formatValue,1); return YAFFS_OK; } -static int ynorif1_IsBlockFormatted(yaffs_dev_t *dev, int blockNumber) +static int ynorif1_IsBlockFormatted(struct yaffs_dev *dev, int blockNumber) { - __u32 *formatAddr = Block2FormatAddr(dev,blockNumber); - __u32 formatValue; + u32 *formatAddr = Block2FormatAddr(dev,blockNumber); + u32 formatValue; ynorif1_FlashRead32(formatAddr,&formatValue,1); @@ -269,12 +267,14 @@ static int ynorif1_IsBlockFormatted(yaffs_dev_t *dev, int blockNumber) return (formatValue == FORMAT_VALUE); } -int ynorif1_EraseBlockInNAND(yaffs_dev_t *dev, int blockNumber) +int ynorif1_EraseBlockInNAND(struct yaffs_dev *dev, int blockNumber) { if(blockNumber < 0 || blockNumber >= BLOCKS_IN_DEVICE) { - T(YAFFS_TRACE_ALWAYS,("Attempt to erase non-existant block %d\n",blockNumber)); + yaffs_trace(YAFFS_TRACE_ALWAYS, + "Attempt to erase non-existant block %d\n", + blockNumber); return YAFFS_FAIL; } else @@ -286,7 +286,7 @@ int ynorif1_EraseBlockInNAND(yaffs_dev_t *dev, int blockNumber) } -int ynorif1_InitialiseNAND(yaffs_dev_t *dev) +int ynorif1_InitialiseNAND(struct yaffs_dev *dev) { int i; @@ -300,7 +300,7 @@ int ynorif1_InitialiseNAND(yaffs_dev_t *dev) return YAFFS_OK; } -int ynorif1_Deinitialise_flash_fn(yaffs_dev_t *dev) +int ynorif1_Deinitialise_flash_fn(struct yaffs_dev *dev) { dev=dev; ynorif1_FlashDeinit();