X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fbasic-test%2Fyaffs_norif1.c;h=7be629542f3a6ace80ae18397cf6b2ab5761d466;hp=ff8674784847964e6a371a92fd8371be07441b2a;hb=7b53d290e92e619a315399ba49aadf6b40e13660;hpb=4a700fe570d217c2c5df87070db7c2652bc0eaaf diff --git a/direct/basic-test/yaffs_norif1.c b/direct/basic-test/yaffs_norif1.c index ff86747..7be6295 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 @@ -70,12 +68,12 @@ const char *yaffs_norif1_c_version = "$Id: yaffs_norif1.c,v 1.6 2010-02-18 01:18 /* Compile this for a simulation */ #include "ynorsim.h" -#define ynorif1_FlashInit() ynorsim_Initialise() -#define ynorif1_FlashDeinit() ynorsim_Shutdown() -#define ynorif1_FlashWrite32(addr,buf,nwords) ynorsim_Write32(addr,buf,nwords) -#define ynorif1_FlashRead32(addr,buf,nwords) ynorsim_Read32(addr,buf,nwords) -#define ynorif1_FlashEraseBlock(addr) ynorsim_EraseBlock(addr) -#define DEVICE_BASE ynorsim_GetBase() +#define ynorif1_FlashInit() ynorsim_initialise() +#define ynorif1_FlashDeinit() ynorsim_shutdown() +#define ynorif1_FlashWrite32(addr,buf,nwords) ynorsim_wr32(addr,buf,nwords) +#define ynorif1_FlashRead32(addr,buf,nwords) ynorsim_rd32(addr,buf,nwords) +#define ynorif1_FlashEraseBlock(addr) ynorsim_erase(addr) +#define DEVICE_BASE ynorsim_get_base() #else /* Compile this for running on blob, hacked for yaffs access */ @@ -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_Device *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_Device *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_Device *dev,int chunkId) +u32 *Chunk2DataAddr(struct yaffs_dev *dev,int chunk_id) { unsigned block; unsigned chunkInBlock; - __u32 addr; + u32 addr; - block = chunkId/dev->param.nChunksPerBlock; - chunkInBlock = chunkId % dev->param.nChunksPerBlock; + 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_Device *dev,int chunkId) +u32 *Chunk2SpareAddr(struct yaffs_dev *dev,int chunk_id) { unsigned block; unsigned chunkInBlock; - __u32 addr; + u32 addr; - block = chunkId/dev->param.nChunksPerBlock; - chunkInBlock = chunkId % dev->param.nChunksPerBlock; + 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_Device *dev,int chunkInNAND,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,chunkInNAND); - __u32 *spareAddr = Chunk2SpareAddr(dev,chunkInNAND); + 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,40 +160,40 @@ int ynorif1_WriteChunkToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data, * 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) { - if(spare->pageStatus != 0xff) + if(spare->page_status != 0xff) YBUG(); /* Write a pre-marker */ memset(&tmpSpare,0xff,sizeof(tmpSpare)); - tmpSpare.pageStatus = YNOR_PREMARKER; - ynorif1_FlashWrite32(spareAddr,(__u32 *)&tmpSpare,sizeof(yaffs_Spare)/4); + tmpSpare.page_status = YNOR_PREMARKER; + ynorif1_FlashWrite32(spareAddr,(u32 *)&tmpSpare,sizeof(struct yaffs_spare)/4); /* Write the data */ - ynorif1_FlashWrite32(dataAddr,(__u32 *)data,dev->param.totalBytesPerChunk / 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.pageStatus = YNOR_PREMARKER; - ynorif1_FlashWrite32(spareAddr,(__u32 *)&tmpSpare,sizeof(yaffs_Spare)/4); + tmpSpare.page_status = YNOR_PREMARKER; + ynorif1_FlashWrite32(spareAddr,(u32 *)&tmpSpare,sizeof(struct yaffs_spare)/4); /* Write a post-marker */ - tmpSpare.pageStatus = YNOR_POSTMARKER; - ynorif1_FlashWrite32(spareAddr,(__u32 *)&tmpSpare,sizeof(tmpSpare)/4); + tmpSpare.page_status = YNOR_POSTMARKER; + 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,29 +204,29 @@ int ynorif1_WriteChunkToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data, } -int ynorif1_ReadChunkFromNAND(yaffs_Device *dev,int chunkInNAND, __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,chunkInNAND); - __u32 *spareAddr = Chunk2SpareAddr(dev,chunkInNAND); + u32 *dataAddr = Chunk2DataAddr(dev,nand_chunk); + u32 *spareAddr = Chunk2SpareAddr(dev,nand_chunk); if(data) { - ynorif1_FlashRead32(dataAddr,(__u32 *)data,dev->param.totalBytesPerChunk / 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. */ - if(spare->pageStatus == YNOR_POSTMARKER) - spare->pageStatus = 0xFF; - else if(spare->pageStatus != 0xff && - (spare->pageStatus | YNOR_PREMARKER) != 0xff) - spare->pageStatus = YNOR_PREMARKER; + if(spare->page_status == YNOR_POSTMARKER) + spare->page_status = 0xFF; + else if(spare->page_status != 0xff && + (spare->page_status | YNOR_PREMARKER) != 0xff) + spare->page_status = YNOR_PREMARKER; } @@ -236,11 +234,11 @@ int ynorif1_ReadChunkFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaf } -static int ynorif1_FormatBlock(yaffs_Device *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_Device *dev, int blockNumber) return YAFFS_OK; } -static int ynorif1_UnformatBlock(yaffs_Device *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_Device *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,7 +267,7 @@ static int ynorif1_IsBlockFormatted(yaffs_Device *dev, int blockNumber) return (formatValue == FORMAT_VALUE); } -int ynorif1_EraseBlockInNAND(yaffs_Device *dev, int blockNumber) +int ynorif1_EraseBlockInNAND(struct yaffs_dev *dev, int blockNumber) { if(blockNumber < 0 || blockNumber >= BLOCKS_IN_DEVICE) @@ -286,13 +284,13 @@ int ynorif1_EraseBlockInNAND(yaffs_Device *dev, int blockNumber) } -int ynorif1_InitialiseNAND(yaffs_Device *dev) +int ynorif1_InitialiseNAND(struct yaffs_dev *dev) { int i; ynorif1_FlashInit(); /* Go through the blocks formatting them if they are not formatted */ - for(i = dev->param.startBlock; i <= dev->param.endBlock; i++){ + for(i = dev->param.start_block; i <= dev->param.end_block; i++){ if(!ynorif1_IsBlockFormatted(dev,i)){ ynorif1_FormatBlock(dev,i); } @@ -300,7 +298,7 @@ int ynorif1_InitialiseNAND(yaffs_Device *dev) return YAFFS_OK; } -int ynorif1_DeinitialiseNAND(yaffs_Device *dev) +int ynorif1_Deinitialise_flash_fn(struct yaffs_dev *dev) { dev=dev; ynorif1_FlashDeinit();