X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_tagscompat.c;h=1ab054faf61743f8e99e600f83ce78a3f5168a57;hp=f6c40535088c05a9317c19a8324980ef6d5fa028;hb=a48028210bd3547399ecaed7b0138d6c43a1f547;hpb=49942b13d7cfbdba72c18de0f37d16d81b4372a8 diff --git a/yaffs_tagscompat.c b/yaffs_tagscompat.c index f6c4053..1ab054f 100644 --- a/yaffs_tagscompat.c +++ b/yaffs_tagscompat.c @@ -15,16 +15,17 @@ #include "yaffs_tagscompat.h" #include "yaffs_ecc.h" #include "yaffs_getblockinfo.h" +#include "yaffs_trace.h" -static void yaffs_HandleReadDataError(yaffs_Device * dev, int chunkInNAND); +static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND); #ifdef NOTYET -static void yaffs_CheckWrittenBlock(yaffs_Device * dev, int chunkInNAND); -static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND, - const __u8 * data, - const yaffs_Spare * spare); -static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND, - const yaffs_Spare * spare); -static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND); +static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND); +static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND, + const __u8 *data, + const yaffs_Spare *spare); +static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND, + const yaffs_Spare *spare); +static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND); #endif static const char yaffs_countBitsTable[256] = { @@ -55,13 +56,13 @@ int yaffs_CountBits(__u8 x) /********** Tags ECC calculations *********/ -void yaffs_CalcECC(const __u8 * data, yaffs_Spare * spare) +void yaffs_CalcECC(const __u8 *data, yaffs_Spare *spare) { yaffs_ECCCalculate(data, spare->ecc1); yaffs_ECCCalculate(&data[256], spare->ecc2); } -void yaffs_CalcTagsECC(yaffs_Tags * tags) +void yaffs_CalcTagsECC(yaffs_Tags *tags) { /* Calculate an ecc */ @@ -75,9 +76,8 @@ void yaffs_CalcTagsECC(yaffs_Tags * tags) for (i = 0; i < 8; i++) { for (j = 1; j & 0xff; j <<= 1) { bit++; - if (b[i] & j) { + if (b[i] & j) ecc ^= bit; - } } } @@ -85,7 +85,7 @@ void yaffs_CalcTagsECC(yaffs_Tags * tags) } -int yaffs_CheckECCOnTags(yaffs_Tags * tags) +int yaffs_CheckECCOnTags(yaffs_Tags *tags) { unsigned ecc = tags->ecc; @@ -116,8 +116,8 @@ int yaffs_CheckECCOnTags(yaffs_Tags * tags) /********** Tags **********/ -static void yaffs_LoadTagsIntoSpare(yaffs_Spare * sparePtr, - yaffs_Tags * tagsPtr) +static void yaffs_LoadTagsIntoSpare(yaffs_Spare *sparePtr, + yaffs_Tags *tagsPtr) { yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr; @@ -133,8 +133,8 @@ static void yaffs_LoadTagsIntoSpare(yaffs_Spare * sparePtr, sparePtr->tagByte7 = tu->asBytes[7]; } -static void yaffs_GetTagsFromSpare(yaffs_Device * dev, yaffs_Spare * sparePtr, - yaffs_Tags * tagsPtr) +static void yaffs_GetTagsFromSpare(yaffs_Device *dev, yaffs_Spare *sparePtr, + yaffs_Tags *tagsPtr) { yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr; int result; @@ -149,53 +149,49 @@ static void yaffs_GetTagsFromSpare(yaffs_Device * dev, yaffs_Spare * sparePtr, tu->asBytes[7] = sparePtr->tagByte7; result = yaffs_CheckECCOnTags(tagsPtr); - if (result > 0) { + if (result > 0) dev->tagsEccFixed++; - } else if (result < 0) { + else if (result < 0) dev->tagsEccUnfixed++; - } } -static void yaffs_SpareInitialise(yaffs_Spare * spare) +static void yaffs_SpareInitialise(yaffs_Spare *spare) { memset(spare, 0xFF, sizeof(yaffs_Spare)); } static int yaffs_WriteChunkToNAND(struct yaffs_DeviceStruct *dev, - int chunkInNAND, const __u8 * data, - yaffs_Spare * spare) + int chunkInNAND, const __u8 *data, + yaffs_Spare *spare) { - if (chunkInNAND < dev->startBlock * dev->nChunksPerBlock) { + if (chunkInNAND < dev->param.startBlock * dev->param.nChunksPerBlock) { T(YAFFS_TRACE_ERROR, (TSTR("**>> yaffs chunk %d is not valid" TENDSTR), chunkInNAND)); return YAFFS_FAIL; } - dev->nPageWrites++; - return dev->writeChunkToNAND(dev, chunkInNAND, data, spare); + return dev->param.writeChunkToNAND(dev, chunkInNAND, data, spare); } static int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev, int chunkInNAND, - __u8 * data, - yaffs_Spare * spare, - yaffs_ECCResult * eccResult, + __u8 *data, + yaffs_Spare *spare, + yaffs_ECCResult *eccResult, int doErrorCorrection) { int retVal; yaffs_Spare localSpare; - dev->nPageReads++; - if (!spare && data) { /* If we don't have a real spare, then we use a local one. */ /* Need this for the calculation of the ecc */ spare = &localSpare; } - if (!dev->useNANDECC) { - retVal = dev->readChunkFromNAND(dev, chunkInNAND, data, spare); + if (!dev->param.useNANDECC) { + retVal = dev->param.readChunkFromNAND(dev, chunkInNAND, data, spare); if (data && doErrorCorrection) { /* Do ECC correction */ /* Todo handle any errors */ @@ -253,12 +249,11 @@ static int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev, /* Must allocate enough memory for spare+2*sizeof(int) */ /* for ecc results from device. */ struct yaffs_NANDSpare nspare; - - memset(&nspare,0,sizeof(nspare)); - - retVal = - dev->readChunkFromNAND(dev, chunkInNAND, data, - (yaffs_Spare *) & nspare); + + memset(&nspare, 0, sizeof(nspare)); + + retVal = dev->param.readChunkFromNAND(dev, chunkInNAND, data, + (yaffs_Spare *) &nspare); memcpy(spare, &nspare, sizeof(yaffs_Spare)); if (data && doErrorCorrection) { if (nspare.eccres1 > 0) { @@ -306,15 +301,14 @@ static int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev, static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev, int chunkInNAND) { - - static int init = 0; + static int init; static __u8 cmpbuf[YAFFS_BYTES_PER_CHUNK]; static __u8 data[YAFFS_BYTES_PER_CHUNK]; /* Might as well always allocate the larger size for */ - /* dev->useNANDECC == true; */ + /* dev->param.useNANDECC == true; */ static __u8 spare[sizeof(struct yaffs_NANDSpare)]; - dev->readChunkFromNAND(dev, chunkInNAND, data, (yaffs_Spare *) spare); + dev->param.readChunkFromNAND(dev, chunkInNAND, data, (yaffs_Spare *) spare); if (!init) { memset(cmpbuf, 0xff, YAFFS_BYTES_PER_CHUNK); @@ -335,9 +329,9 @@ static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev, * Functions for robustisizing */ -static void yaffs_HandleReadDataError(yaffs_Device * dev, int chunkInNAND) +static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND) { - int blockInNAND = chunkInNAND / dev->nChunksPerBlock; + int blockInNAND = chunkInNAND / dev->param.nChunksPerBlock; /* Mark the block for retirement */ yaffs_GetBlockInfo(dev, blockInNAND + dev->blockOffset)->needsRetiring = 1; @@ -352,24 +346,24 @@ static void yaffs_HandleReadDataError(yaffs_Device * dev, int chunkInNAND) } #ifdef NOTYET -static void yaffs_CheckWrittenBlock(yaffs_Device * dev, int chunkInNAND) +static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND) { } -static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND, - const __u8 * data, - const yaffs_Spare * spare) +static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND, + const __u8 *data, + const yaffs_Spare *spare) { } -static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND, - const yaffs_Spare * spare) +static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND, + const yaffs_Spare *spare) { } -static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND) +static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND) { - int blockInNAND = chunkInNAND / dev->nChunksPerBlock; + int blockInNAND = chunkInNAND / dev->param.nChunksPerBlock; /* Mark the block for retirement */ yaffs_GetBlockInfo(dev, blockInNAND)->needsRetiring = 1; @@ -377,8 +371,8 @@ static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND) yaffs_DeleteChunk(dev, chunkInNAND, 1, __LINE__); } -static int yaffs_VerifyCompare(const __u8 * d0, const __u8 * d1, - const yaffs_Spare * s0, const yaffs_Spare * s1) +static int yaffs_VerifyCompare(const __u8 *d0, const __u8 *d1, + const yaffs_Spare *s0, const yaffs_Spare *s1) { if (memcmp(d0, d1, YAFFS_BYTES_PER_CHUNK) != 0 || @@ -402,37 +396,35 @@ static int yaffs_VerifyCompare(const __u8 * d0, const __u8 * d1, } #endif /* NOTYET */ -int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device * dev, - int chunkInNAND, - const __u8 * data, - const yaffs_ExtendedTags * - eTags) +int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev, + int chunkInNAND, + const __u8 *data, + const yaffs_ExtendedTags *eTags) { yaffs_Spare spare; yaffs_Tags tags; yaffs_SpareInitialise(&spare); - if (eTags->chunkDeleted) { + if (eTags->chunkDeleted) spare.pageStatus = 0; - } else { + else { tags.objectId = eTags->objectId; tags.chunkId = eTags->chunkId; tags.byteCountLSB = eTags->byteCount & 0x3ff; - - if(dev->nDataBytesPerChunk >= 1024){ + + if (dev->nDataBytesPerChunk >= 1024) tags.byteCountMSB = (eTags->byteCount >> 10) & 3; - } else { + else tags.byteCountMSB = 3; - } - + tags.serialNumber = eTags->serialNumber; - if (!dev->useNANDECC && data) { + if (!dev->param.useNANDECC && data) yaffs_CalcECC(data, &spare); - } + yaffs_LoadTagsIntoSpare(&spare, &tags); } @@ -440,10 +432,10 @@ int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device * dev, return yaffs_WriteChunkToNAND(dev, chunkInNAND, data, &spare); } -int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device * dev, +int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND, - __u8 * data, - yaffs_ExtendedTags * eTags) + __u8 *data, + yaffs_ExtendedTags *eTags) { yaffs_Spare spare; @@ -451,7 +443,7 @@ int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device * dev, yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_UNKNOWN; static yaffs_Spare spareFF; - static int init = 0; + static int init; if (!init) { memset(&spareFF, 0xFF, sizeof(spareFF)); @@ -481,7 +473,7 @@ int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device * dev, eTags->chunkId = tags.chunkId; eTags->byteCount = tags.byteCountLSB; - if(dev->nDataBytesPerChunk >= 1024) + if (dev->nDataBytesPerChunk >= 1024) eTags->byteCount |= (((unsigned) tags.byteCountMSB) << 10); eTags->serialNumber = tags.serialNumber; @@ -504,9 +496,9 @@ int yaffs_TagsCompatabilityMarkNANDBlockBad(struct yaffs_DeviceStruct *dev, spare.blockStatus = 'Y'; - yaffs_WriteChunkToNAND(dev, blockInNAND * dev->nChunksPerBlock, NULL, + yaffs_WriteChunkToNAND(dev, blockInNAND * dev->param.nChunksPerBlock, NULL, &spare); - yaffs_WriteChunkToNAND(dev, blockInNAND * dev->nChunksPerBlock + 1, + yaffs_WriteChunkToNAND(dev, blockInNAND * dev->param.nChunksPerBlock + 1, NULL, &spare); return YAFFS_OK; @@ -531,9 +523,9 @@ int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev, *sequenceNumber = 0; - yaffs_ReadChunkFromNAND(dev, blockNo * dev->nChunksPerBlock, NULL, + yaffs_ReadChunkFromNAND(dev, blockNo * dev->param.nChunksPerBlock, NULL, &spare0, &dummy, 1); - yaffs_ReadChunkFromNAND(dev, blockNo * dev->nChunksPerBlock + 1, NULL, + yaffs_ReadChunkFromNAND(dev, blockNo * dev->param.nChunksPerBlock + 1, NULL, &spare1, &dummy, 1); if (yaffs_CountBits(spare0.blockStatus & spare1.blockStatus) < 7)