X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=mtdemul%2Fnandemul2k.c;h=d1028ffc7e122bd9f00e7f468dfd43f9a96417f8;hp=4d25aaabf08fc0b15d246d98a7c48fac4dbe3b5c;hb=8e0281ff8c5904d1dbb5b41f3cfadfb05f139437;hpb=e1ac494e05a5dc7ab61d799af815d103a11d318c diff --git a/mtdemul/nandemul2k.c b/mtdemul/nandemul2k.c index 4d25aaa..d1028ff 100644 --- a/mtdemul/nandemul2k.c +++ b/mtdemul/nandemul2k.c @@ -1,7 +1,7 @@ /* * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. * - * Copyright (C) 2002-2007 Aleph One Ltd. + * Copyright (C) 2002-2011 Aleph One Ltd. * for Toby Churchill Ltd and Brightstar Engineering * * Created by Charles Manning @@ -15,7 +15,7 @@ * This version hacked for emulating 2kpage NAND for YAFFS2 testing. */ -#include +//#include #include #include #include @@ -66,7 +66,7 @@ static struct mtd_info nandemul2k_mtd; typedef struct { - __u8 data[PAGE_TOTAL_SIZE]; // Data + spare + u8 data[PAGE_TOTAL_SIZE]; // Data + spare int empty; // is this empty? } nandemul_Page; @@ -99,32 +99,32 @@ static void nandemul_yield(int n) } -static void nandemul2k_Read(void *buffer, int page, int start, int nBytes) +static void nandemul2k_Read(void *buffer, int page, int start, int n_bytes) { int pg = page%PAGES_PER_BLOCK; int blk = page/PAGES_PER_BLOCK; - if(buffer && nBytes > 0) + if(buffer && n_bytes > 0) { - memcpy(buffer,&ned.block[blk]->page[pg]->data[start],nBytes); + memcpy(buffer,&ned.block[blk]->page[pg]->data[start],n_bytes); } } -static void nandemul2k_Program(const void *buffer, int page, int start, int nBytes) +static void nandemul2k_Program(const void *buffer, int page, int start, int n_bytes) { int pg = page%PAGES_PER_BLOCK; int blk = page/PAGES_PER_BLOCK; - __u8 *p; - __u8 *b = (__u8 *)buffer; + u8 *p; + u8 *b = (u8 *)buffer; p = &ned.block[blk]->page[pg]->data[start]; - while(buffer && nBytes>0) + while(buffer && n_bytes>0) { *p = *p & *b; p++; b++; - nBytes--; + n_bytes--; } } @@ -255,7 +255,7 @@ int nandemul2k_GetNumberOfBlocks(void) {return nandemul2k_CalcNBlocks();} -static int nandemul2k_ReadId(__u8 *vendorId, __u8 *deviceId) +static int nandemul2k_ReadId(u8 *vendorId, u8 *deviceId) { *vendorId = 'Y'; *deviceId = '2'; @@ -264,7 +264,7 @@ static int nandemul2k_ReadId(__u8 *vendorId, __u8 *deviceId) } -static int nandemul2k_ReadStatus(__u8 *status) +static int nandemul2k_ReadStatus(u8 *status) { *status = 0; return 1; @@ -280,15 +280,10 @@ static int nandemul2k_ReadStatus(__u8 *status) */ static int nand_read (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf); -static int nand_read_ecc (struct mtd_info *mtd, loff_t from, size_t len, - size_t *retlen, u_char *buf, u_char *oob_buf, struct nand_oobinfo *dummy); static int nand_read_oob (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf); static int nand_write (struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf); -static int nand_write_ecc (struct mtd_info *mtd, loff_t to, size_t len, - size_t *retlen, const u_char *buf, - u_char *oob_buf, struct nand_oobinfo *dummy); static int nand_write_oob (struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf); #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,7)) @@ -343,17 +338,17 @@ static int nand_read_ecc (struct mtd_info *mtd, loff_t from, size_t len, /* Get raw starting column */ - start = from & (mtd->oobblock-1); + start = from & (PAGE_DATA_SIZE - 1); // OK now check for the curveball where the start and end are in // the same page - if((start + n) < mtd->oobblock) + if((start + n) < PAGE_DATA_SIZE) { nToCopy = n; } else { - nToCopy = mtd->oobblock - start; + nToCopy = PAGE_DATA_SIZE - start; } nandemul2k_Read(buf, page, start, nToCopy); @@ -386,7 +381,7 @@ static int nand_read_oob (struct mtd_info *mtd, loff_t from, size_t len, page = ((int) from) >> NAND_SHIFT; /* Mask to get column */ - col = from & 0x0f; + col = from & (PAGE_SPARE_SIZE-1) /* Initialize return length value */ *retlen = 0; @@ -447,17 +442,17 @@ static int nand_write_ecc (struct mtd_info *mtd, loff_t to, size_t len, /* Get raw starting column */ - start = to & (mtd->oobblock - 1); + start = to & (PAGE_DATA_SIZE - 1); // OK now check for the curveball where the start and end are in // the same page - if((start + n) < mtd->oobblock) + if((start + n) < PAGE_DATA_SIZE) { nToCopy = n; } else { - nToCopy = mtd->oobblock - start; + nToCopy = PAGE_DATA_SIZE - start; } nandemul2k_Program(buf, page, start, nToCopy); @@ -492,7 +487,7 @@ static int nand_write_oob (struct mtd_info *mtd, loff_t to, size_t len, page = ((int) to) >> NAND_SHIFT; /* Mask to get column */ - col = to & 0x0f; + col = to & PAGE_SPARE_SIZE; /* Initialize return length value */ *retlen = 0; @@ -567,8 +562,9 @@ static int nand_erase (struct mtd_info *mtd, struct erase_info *instr) nandemul2k_DoErase(block); block++; } - - + + instr->state = MTD_ERASE_DONE; /* Changed state to done */ + instr->callback(instr); /* ... and wake up */ return 0; @@ -601,8 +597,9 @@ static void nand_sync (struct mtd_info *mtd) */ static int nandemul2k_scan (struct mtd_info *mtd,int nchips) { - mtd->oobblock = PAGE_DATA_SIZE; - mtd->oobsize = PAGE_SPARE_SIZE; + mtd->writesize = PAGE_DATA_SIZE; + mtd->oobsize = PAGE_SPARE_SIZE; + mtd->oobavail = PAGE_SPARE_SIZE/2; /* Simulate using up some for other uses */ mtd->erasesize = PAGE_DATA_SIZE * PAGES_PER_BLOCK; mtd->size = sizeInMB * 1024*1024; @@ -612,14 +609,13 @@ static int nandemul2k_scan (struct mtd_info *mtd,int nchips) mtd->type = MTD_NANDFLASH; mtd->flags = MTD_CAP_NANDFLASH; mtd->owner = THIS_MODULE; - mtd->ecctype = MTD_ECC_NONE; mtd->erase = nand_erase; mtd->point = NULL; mtd->unpoint = NULL; mtd->read = nand_read; mtd->write = nand_write; - mtd->read_ecc = nand_read_ecc; - mtd->write_ecc = nand_write_ecc; + mtd->read_oob = nand_read_oob; + mtd->write_oob = nand_write_oob; mtd->read_oob = nand_read_oob; mtd->write_oob = nand_write_oob; mtd->block_isbad = nand_block_isbad;