X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffs_nandif.c;h=b93b55ac98f1788b60b4781272de3d034a318ac0;hp=9a22f7fdd3bf552debff1f880ac6cb4050e44bba;hb=121c055437f23d9d6bc7b57d36ecf128b447013f;hpb=5409719091c79983abc45bcc3070bce6786c8278 diff --git a/direct/yaffs_nandif.c b/direct/yaffs_nandif.c index 9a22f7f..b93b55a 100644 --- a/direct/yaffs_nandif.c +++ b/direct/yaffs_nandif.c @@ -1,7 +1,7 @@ /* * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. * - * Copyright (C) 2002-2010 Aleph One Ltd. + * Copyright (C) 2002-2011 Aleph One Ltd. * for Toby Churchill Ltd and Brightstar Engineering * * Created by Charles Manning @@ -39,10 +39,9 @@ int ynandif_WriteChunkWithTagsToNAND(struct yaffs_dev * dev, int nand_chunk, unsigned spareSize = 0; ynandif_Geometry *geometry = (ynandif_Geometry *)(dev->driver_context); - T(YAFFS_TRACE_MTD, - (TSTR - ("nandmtd2_WriteChunkWithTagsToNAND chunk %d data %p tags %p" - TENDSTR), nand_chunk, data, tags)); + yaffs_trace(YAFFS_TRACE_MTD, + "nandmtd2_WriteChunkWithTagsToNAND chunk %d data %p tags %p", + nand_chunk, data, tags); /* For yaffs2 writing there must be both data and tags. @@ -52,7 +51,8 @@ int ynandif_WriteChunkWithTagsToNAND(struct yaffs_dev * dev, int nand_chunk, if(dev->param.inband_tags){ struct yaffs_packed_tags2_tags_only *pt2tp; - pt2tp = (struct yaffs_packed_tags2_tags_only *)(data + dev->data_bytes_per_chunk); + pt2tp = (struct yaffs_packed_tags2_tags_only *) + (data + dev->data_bytes_per_chunk); yaffs_pack_tags2_tags_only(pt2tp,tags); spare = NULL; spareSize = 0; @@ -64,7 +64,8 @@ int ynandif_WriteChunkWithTagsToNAND(struct yaffs_dev * dev, int nand_chunk, } retval = geometry->writeChunk(dev,nand_chunk, - data, dev->param.total_bytes_per_chunk, spare, spareSize); + data, dev->param.total_bytes_per_chunk, + spare, spareSize); return retval; } @@ -80,10 +81,9 @@ int ynandif_ReadChunkWithTagsFromNAND(struct yaffs_dev * dev, int nand_chunk, int eccStatus; //0 = ok, 1 = fixed, -1 = unfixed ynandif_Geometry *geometry = (ynandif_Geometry *)(dev->driver_context); - T(YAFFS_TRACE_MTD, - (TSTR - ("nandmtd2_ReadChunkWithTagsFromNAND chunk %d data %p tags %p" - TENDSTR), nand_chunk, data, tags)); + yaffs_trace(YAFFS_TRACE_MTD, + "nandmtd2_ReadChunkWithTagsFromNAND chunk %d data %p tags %p", + nand_chunk, data, tags); if(!tags){ spare = NULL; @@ -92,7 +92,7 @@ int ynandif_ReadChunkWithTagsFromNAND(struct yaffs_dev * dev, int nand_chunk, if(!data) { localData = 1; - data = yaffs_get_temp_buffer(dev,__LINE__); + data = yaffs_get_temp_buffer(dev); } spare = NULL; spareSize = 0; @@ -133,7 +133,7 @@ int ynandif_ReadChunkWithTagsFromNAND(struct yaffs_dev * dev, int nand_chunk, } if(localData) - yaffs_release_temp_buffer(dev,data,__LINE__); + yaffs_release_temp_buffer(dev, data); return retval; } @@ -161,7 +161,8 @@ static int ynandif_IsBlockOk(struct yaffs_dev *dev, int blockId) return geometry->checkBlockOk(dev,blockId); } -int ynandif_QueryNANDBlock(struct yaffs_dev *dev, int blockId, enum yaffs_block_state *state, u32 *seq_number) +int ynandif_QueryNANDBlock(struct yaffs_dev *dev, int blockId, + enum yaffs_block_state *state, u32 *seq_number) { unsigned chunkNo; struct yaffs_ext_tags tags; @@ -183,7 +184,7 @@ int ynandif_QueryNANDBlock(struct yaffs_dev *dev, int blockId, enum yaffs_block_ } else { - *state = YAFFS_BLOCK_STATE_NEEDS_SCANNING; + *state = YAFFS_BLOCK_STATE_NEEDS_SCAN; *seq_number = tags.seq_number; } } @@ -215,31 +216,31 @@ struct yaffs_dev * yaffs_add_dev_from_geometry(const YCHAR *name, const ynandif_Geometry *geometry) { - YCHAR *clonedName = YMALLOC(sizeof(YCHAR) * (yaffs_strnlen(name,YAFFS_MAX_NAME_LENGTH)+1)); - struct yaffs_dev *dev = YMALLOC(sizeof(struct yaffs_dev)); + YCHAR *clonedName = malloc(sizeof(YCHAR) * (strnlen(name,YAFFS_MAX_NAME_LENGTH)+1)); + struct yaffs_dev *dev = malloc(sizeof(struct yaffs_dev)); if(dev && clonedName){ memset(dev,0,sizeof(struct yaffs_dev)); - yaffs_strcpy(clonedName,name); + strcpy(clonedName,name); dev->param.name = clonedName; - dev->param.write_chunk_tags_fn = ynandif_WriteChunkWithTagsToNAND; + dev->param.write_chunk_tags_fn = ynandif_WriteChunkWithTagsToNAND; dev->param.read_chunk_tags_fn = ynandif_ReadChunkWithTagsFromNAND; - dev->param.erase_fn = ynandif_EraseBlockInNAND; - dev->param.initialise_flash_fn = ynandif_InitialiseNAND; - dev->param.query_block_fn = ynandif_QueryNANDBlock; - dev->param.bad_block_fn = ynandif_MarkNANDBlockBad; - dev->param.n_caches = 20; - dev->param.start_block = geometry->start_block; - dev->param.end_block = geometry->end_block; - dev->param.total_bytes_per_chunk = geometry->dataSize; - dev->param.spare_bytes_per_chunk = geometry->spareSize; - dev->param.inband_tags = geometry->inband_tags; - dev->param.chunks_per_block = geometry->pagesPerBlock; - dev->param.use_nand_ecc = geometry->hasECC; - dev->param.is_yaffs2 = geometry->useYaffs2; - dev->param.n_reserved_blocks = 5; - dev->driver_context = (void *)geometry; + dev->param.erase_fn = ynandif_EraseBlockInNAND; + dev->param.initialise_flash_fn = ynandif_InitialiseNAND; + dev->param.query_block_fn = ynandif_QueryNANDBlock; + dev->param.bad_block_fn = ynandif_MarkNANDBlockBad; + dev->param.n_caches = 20; + dev->param.start_block = geometry->start_block; + dev->param.end_block = geometry->end_block; + dev->param.total_bytes_per_chunk = geometry->dataSize; + dev->param.spare_bytes_per_chunk = geometry->spareSize; + dev->param.inband_tags = geometry->inband_tags; + dev->param.chunks_per_block = geometry->pagesPerBlock; + dev->param.use_nand_ecc = geometry->hasECC; + dev->param.is_yaffs2 = geometry->useYaffs2; + dev->param.n_reserved_blocks = 5; + dev->driver_context = (void *)geometry; yaffs_add_device(dev); @@ -247,9 +248,10 @@ struct yaffs_dev * } if(dev) - YFREE(dev); + free(dev); if(clonedName) - YFREE(clonedName); + free(clonedName); return NULL; } +