X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffs_fileem2k.c;h=db90496eea148277f617c0e3aba7d0cc270b598a;hp=1e2cd6b3ef59156d9b4fbb26824414415ebf1a2e;hb=49942b13d7cfbdba72c18de0f37d16d81b4372a8;hpb=e1ac494e05a5dc7ab61d799af815d103a11d318c diff --git a/direct/yaffs_fileem2k.c b/direct/yaffs_fileem2k.c index 1e2cd6b..db90496 100644 --- a/direct/yaffs_fileem2k.c +++ b/direct/yaffs_fileem2k.c @@ -16,12 +16,12 @@ * This is only intended as test code to test persistence etc. */ -const char *yaffs_flashif_c_version = "$Id: yaffs_fileem2k.c,v 1.12 2007-02-14 01:09:06 wookey Exp $"; +const char *yaffs_flashif2_c_version = "$Id: yaffs_fileem2k.c,v 1.15 2008-07-21 01:03:19 charles Exp $"; #include "yportenv.h" -#include "yaffs_flashif.h" +#include "yaffs_flashif2.h" #include "yaffs_guts.h" #include "devextras.h" @@ -35,6 +35,9 @@ const char *yaffs_flashif_c_version = "$Id: yaffs_fileem2k.c,v 1.12 2007-02-14 0 //#define SIMULATE_FAILURES + +#define REPORT_ERROR 0 + typedef struct { __u8 data[PAGE_SIZE]; // Data + spare @@ -68,7 +71,7 @@ static __u8 localBuffer[PAGE_SIZE]; static char *NToName(char *buf,int n) { - sprintf(buf,"emfile%d",n); + sprintf(buf,"emfile2k-%d",n); return buf; } @@ -103,16 +106,10 @@ static int GetBlockFileHandle(int n) static int CheckInit(void) { static int initialised = 0; - int h; int i; - - off_t fSize; - off_t requiredSize; - int written; int blk; - - yflash_Page p; + if(initialised) { @@ -137,14 +134,14 @@ static int CheckInit(void) } -int yflash_GetNumberOfBlocks(void) +int yflash2_GetNumberOfBlocks(void) { CheckInit(); return filedisk.nBlocks; } -int yflash_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data, yaffs_ExtendedTags *tags) +int yflash2_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const yaffs_ExtendedTags *tags) { int written; int pos; @@ -158,90 +155,114 @@ int yflash_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 CheckInit(); - - if(data) - { - pos = (chunkInNAND % (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE)) * PAGE_SIZE; - h = filedisk.handle[(chunkInNAND / (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE))]; + if(dev->inbandTags){ - lseek(h,pos,SEEK_SET); - nRead = read(h, localBuffer,dev->nDataBytesPerChunk); - for(i = error = 0; i < dev->nDataBytesPerChunk && !error; i++){ - if(localBuffer[i] != 0xFF){ - printf("nand simulation: chunk %d data byte %d was %0x2\n", - chunkInNAND,i,localBuffer[i]); - error = 1; - } - } + yaffs_PackedTags2TagsPart * pt2tp; + pt2tp = (yaffs_PackedTags2TagsPart *)&data[dev->nDataBytesPerChunk]; + yaffs_PackTags2TagsPart(pt2tp,tags); - for(i = 0; i < dev->nDataBytesPerChunk; i++) - localBuffer[i] &= data[i]; - - if(memcmp(localBuffer,data,dev->nDataBytesPerChunk)) - printf("nand simulator: data does not match\n"); - + pos = (chunkInNAND % (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE)) * PAGE_SIZE; + h = filedisk.handle[(chunkInNAND / (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE))]; + lseek(h,pos,SEEK_SET); - written = write(h,localBuffer,dev->nDataBytesPerChunk); + written = write(h,data,dev->totalBytesPerChunk); + if(yaffs_testPartialWrite){ close(h); exit(1); } + if(written != dev->totalBytesPerChunk) return YAFFS_FAIL; + + + } + + else { + + if(data) + { + pos = (chunkInNAND % (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE)) * PAGE_SIZE; + h = filedisk.handle[(chunkInNAND / (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE))]; + + lseek(h,pos,SEEK_SET); + nRead = read(h, localBuffer,dev->nDataBytesPerChunk); + for(i = error = 0; i < dev->nDataBytesPerChunk && !error; i++){ + if(REPORT_ERROR && localBuffer[i] != 0xFF){ + printf("nand simulation: chunk %d data byte %d was %0x2\n", + chunkInNAND,i,localBuffer[i]); + error = 1; + } + } + + for(i = 0; i < dev->nDataBytesPerChunk; i++) + localBuffer[i] &= data[i]; + + if(REPORT_ERROR && memcmp(localBuffer,data,dev->nDataBytesPerChunk)) + printf("nand simulator: data does not match\n"); + + lseek(h,pos,SEEK_SET); + written = write(h,localBuffer,dev->nDataBytesPerChunk); + + if(yaffs_testPartialWrite){ + close(h); + exit(1); + } + #ifdef SIMULATE_FAILURES - if((chunkInNAND >> 6) == 100) - written = 0; + if((chunkInNAND >> 6) == 100) + written = 0; - if((chunkInNAND >> 6) == 110) - written = 0; + if((chunkInNAND >> 6) == 110) + written = 0; #endif - if(written != dev->nDataBytesPerChunk) return YAFFS_FAIL; - } + if(written != dev->nDataBytesPerChunk) return YAFFS_FAIL; + } - if(tags) - { - pos = (chunkInNAND % (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE)) * PAGE_SIZE + PAGE_DATA_SIZE ; - h = filedisk.handle[(chunkInNAND / (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE))]; + if(tags) + { + pos = (chunkInNAND % (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE)) * PAGE_SIZE + PAGE_DATA_SIZE ; + h = filedisk.handle[(chunkInNAND / (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE))]; - lseek(h,pos,SEEK_SET); + lseek(h,pos,SEEK_SET); - if( 0 && dev->isYaffs2) - { + if( 0 && dev->isYaffs2) + { - written = write(h,tags,sizeof(yaffs_ExtendedTags)); - if(written != sizeof(yaffs_ExtendedTags)) return YAFFS_FAIL; - } - else - { - yaffs_PackedTags2 pt; - yaffs_PackTags2(&pt,tags); - __u8 * ptab = (__u8 *)&pt; - - nRead = read(h,localBuffer,sizeof(pt)); - for(i = error = 0; i < sizeof(pt) && !error; i++){ - if(localBuffer[i] != 0xFF){ - printf("nand simulation: chunk %d oob byte %d was %0x2\n", - chunkInNAND,i,localBuffer[i]); - error = 1; - } + written = write(h,tags,sizeof(yaffs_ExtendedTags)); + if(written != sizeof(yaffs_ExtendedTags)) return YAFFS_FAIL; } + else + { + yaffs_PackedTags2 pt; + yaffs_PackTags2(&pt,tags); + __u8 * ptab = (__u8 *)&pt; + + nRead = read(h,localBuffer,sizeof(pt)); + for(i = error = 0; REPORT_ERROR && i < sizeof(pt) && !error; i++){ + if(localBuffer[i] != 0xFF){ + printf("nand simulation: chunk %d oob byte %d was %0x2\n", + chunkInNAND,i,localBuffer[i]); + error = 1; + } + } - for(i = 0; i < sizeof(pt); i++) - localBuffer[i] &= ptab[i]; + for(i = 0; i < sizeof(pt); i++) + localBuffer[i] &= ptab[i]; - if(memcmp(localBuffer,&pt,sizeof(pt))) - printf("nand sim: tags corruption\n"); + if(REPORT_ERROR && memcmp(localBuffer,&pt,sizeof(pt))) + printf("nand sim: tags corruption\n"); - lseek(h,pos,SEEK_SET); + lseek(h,pos,SEEK_SET); - written = write(h,localBuffer,sizeof(pt)); - if(written != sizeof(pt)) return YAFFS_FAIL; + written = write(h,localBuffer,sizeof(pt)); + if(written != sizeof(pt)) return YAFFS_FAIL; + } } - } - + } return YAFFS_OK; } @@ -263,11 +284,14 @@ static int fail320 = 1; static int failRead10 = 2; -int yflash_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaffs_ExtendedTags *tags) +int yflash2_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaffs_ExtendedTags *tags) { int nread; int pos; int h; + int localData = 0; + int retval = YAFFS_OK; + int nRead; T(YAFFS_TRACE_MTD,(TSTR("read chunk %d data %x tags %x" TENDSTR),chunkInNAND,(unsigned)data, (unsigned)tags)); @@ -275,73 +299,112 @@ int yflash_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *da - if(data) - { + + if(dev->inbandTags){ + /* Got to suck the tags out of the data area */ + if(!data) { + localData=1; + data = yaffs_GetTempBuffer(dev,__LINE__); + } + + yaffs_PackedTags2TagsPart * pt2tp; + pt2tp = (yaffs_PackedTags2TagsPart *)&data[dev->nDataBytesPerChunk]; + + pos = (chunkInNAND % (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE)) * PAGE_SIZE; - h = filedisk.handle[(chunkInNAND / (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE))]; - lseek(h,pos,SEEK_SET); - nread = read(h,data,dev->nDataBytesPerChunk); + h = filedisk.handle[(chunkInNAND / (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE))]; + lseek(h,pos,SEEK_SET); + + nRead = read(h, data,dev->totalBytesPerChunk); + + yaffs_UnpackTags2TagsPart(tags,pt2tp); - if(nread != dev->nDataBytesPerChunk) return YAFFS_FAIL; + if(nread != dev->totalBytesPerChunk) + retval = YAFFS_FAIL; + + if(localData) + yaffs_ReleaseTempBuffer(dev,data,__LINE__); + + + } - if(tags) - { - pos = (chunkInNAND % (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE)) * PAGE_SIZE + PAGE_DATA_SIZE; - h = filedisk.handle[(chunkInNAND / (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE))]; - lseek(h,pos,SEEK_SET); + else { + + if(data) + { - if(0 && dev->isYaffs2) + pos = (chunkInNAND % (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE)) * PAGE_SIZE; + h = filedisk.handle[(chunkInNAND / (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE))]; + lseek(h,pos,SEEK_SET); + nread = read(h,data,dev->nDataBytesPerChunk); + + + if(nread != dev->nDataBytesPerChunk) + retval = YAFFS_FAIL; + } + + if(tags) { - nread= read(h,tags,sizeof(yaffs_ExtendedTags)); - if(nread != sizeof(yaffs_ExtendedTags)) return YAFFS_FAIL; - if(yaffs_CheckAllFF((__u8 *)tags,sizeof(yaffs_ExtendedTags))) + pos = (chunkInNAND % (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE)) * PAGE_SIZE + PAGE_DATA_SIZE; + h = filedisk.handle[(chunkInNAND / (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE))]; + lseek(h,pos,SEEK_SET); + + if(0 && dev->isYaffs2) { - yaffs_InitialiseTags(tags); + nread= read(h,tags,sizeof(yaffs_ExtendedTags)); + if(nread != sizeof(yaffs_ExtendedTags)) + retval = YAFFS_FAIL; + if(yaffs_CheckAllFF((__u8 *)tags,sizeof(yaffs_ExtendedTags))) + { + yaffs_InitialiseTags(tags); + } + else + { + tags->chunkUsed = 1; + } } else { - tags->chunkUsed = 1; - } - } - else - { - yaffs_PackedTags2 pt; - nread= read(h,&pt,sizeof(pt)); - yaffs_UnpackTags2(tags,&pt); + yaffs_PackedTags2 pt; + nread= read(h,&pt,sizeof(pt)); + yaffs_UnpackTags2(tags,&pt); #ifdef SIMULATE_FAILURES - if((chunkInNAND >> 6) == 100) { - if(fail300 && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR){ - tags->eccResult = YAFFS_ECC_RESULT_FIXED; - fail300 = 0; - } - - } - if((chunkInNAND >> 6) == 110) { - if(fail320 && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR){ - tags->eccResult = YAFFS_ECC_RESULT_FIXED; - fail320 = 0; - } - } + if((chunkInNAND >> 6) == 100) { + if(fail300 && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR){ + tags->eccResult = YAFFS_ECC_RESULT_FIXED; + fail300 = 0; + } + } + + if((chunkInNAND >> 6) == 110) { + if(fail320 && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR){ + tags->eccResult = YAFFS_ECC_RESULT_FIXED; + fail320 = 0; + } + } #endif - if(failRead10>0 && chunkInNAND == 10){ - failRead10--; - nread = 0; - } + if(failRead10>0 && chunkInNAND == 10){ + failRead10--; + nread = 0; + } - if(nread != sizeof(pt)) return YAFFS_FAIL; + if(nread != sizeof(pt)) + retval = YAFFS_FAIL; + } } } - return YAFFS_OK; + + return retval; } -int yflash_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo) +int yflash2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo) { int written; int h; @@ -362,7 +425,7 @@ int yflash_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo) } -int yflash_EraseBlockInNAND(yaffs_Device *dev, int blockNumber) +int yflash2_EraseBlockInNAND(yaffs_Device *dev, int blockNumber) { int i; @@ -403,7 +466,7 @@ int yflash_EraseBlockInNAND(yaffs_Device *dev, int blockNumber) } -int yflash_InitialiseNAND(yaffs_Device *dev) +int yflash2_InitialiseNAND(yaffs_Device *dev) { CheckInit(); @@ -413,7 +476,7 @@ int yflash_InitialiseNAND(yaffs_Device *dev) -int yflash_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo, yaffs_BlockState *state, int *sequenceNumber) +int yflash2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo, yaffs_BlockState *state, __u32 *sequenceNumber) { yaffs_ExtendedTags tags; int chunkNo; @@ -422,7 +485,7 @@ int yflash_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo, yaffs_Blo chunkNo = blockNo * dev->nChunksPerBlock; - yflash_ReadChunkWithTagsFromNAND(dev,chunkNo,NULL,&tags); + yflash2_ReadChunkWithTagsFromNAND(dev,chunkNo,NULL,&tags); if(tags.blockBad) { *state = YAFFS_BLOCK_STATE_DEAD;