X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;f=direct%2Ftest-framework%2Fyaffs_ramem2k.c;h=73195c9a3f2ba2372b0ac2d55690008275a6aaed;hb=f83f5b03c1eea3fe26a0929583ffbd16df7c64f0;hp=cfb0f4f0b5e1e827e72b97ff73a399fa5f5d89d5;hpb=21b2dedaa32ab309f6d1daec966528b7586bd207;p=yaffs2.git diff --git a/direct/test-framework/yaffs_ramem2k.c b/direct/test-framework/yaffs_ramem2k.c index cfb0f4f..73195c9 100644 --- a/direct/test-framework/yaffs_ramem2k.c +++ b/direct/test-framework/yaffs_ramem2k.c @@ -1,8 +1,7 @@ /* * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. * - * Copyright (C) 2002-2011 Aleph One Ltd. - * for Toby Churchill Ltd and Brightstar Engineering + * Copyright (C) 2002-2018 Aleph One Ltd. * * Created by Charles Manning * @@ -77,6 +76,7 @@ static int sizeInMB = EM_SIZE_IN_MEG; static void nandemul_yield(int n) { + (void)n; #ifdef __KERNEL__ if(n > 0) schedule_timeout(n); #endif @@ -175,9 +175,11 @@ static int CheckInit(void) } kfree(ned.block); + (void) sizeInMB; + yaffs_trace(YAFFS_TRACE_ALWAYS, "Allocation failed, could only allocate %dMB of %dMB requested.\n", - nAllocated/64,sizeInMB); + nAllocated/64, sizeInMB); return 0; } @@ -260,34 +262,9 @@ int nandemul2k_ReadChunkWithTagsFromNAND(struct yaffs_dev *dev,int nand_chunk, u return YAFFS_OK; } - -static int nandemul2k_CheckChunkErased(struct yaffs_dev *dev,int nand_chunk) -{ - int blk; - int pg; - int i; - - - - blk = nand_chunk/PAGES_PER_BLOCK; - pg = nand_chunk%PAGES_PER_BLOCK; - - - for(i = 0; i < PAGE_TOTAL_SIZE; i++) - { - if(ned.block[blk]->page[pg]->data[i] != 0xFF) - { - return YAFFS_FAIL; - } - } - - return YAFFS_OK; - -} - int nandemul2k_EraseBlockInNAND(struct yaffs_dev *dev, int blockNumber) { - + (void) dev; if(blockNumber < 0 || blockNumber >= ned.nBlocks) { @@ -311,6 +288,8 @@ int nandemul2k_EraseBlockInNAND(struct yaffs_dev *dev, int blockNumber) int nandemul2k_InitialiseNAND(struct yaffs_dev *dev) { + (void) dev; + CheckInit(); return YAFFS_OK; } @@ -320,6 +299,8 @@ int nandemul2k_MarkNANDBlockBad(struct yaffs_dev *dev, int block_no) u8 *x; + (void) dev; + x = &ned.block[block_no]->page[0]->data[PAGE_DATA_SIZE]; memset(x,0,sizeof(struct yaffs_packed_tags2));