projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2
[yaffs2.git]
/
yaffs_mtdif.c
diff --git
a/yaffs_mtdif.c
b/yaffs_mtdif.c
index 4fc765ce38a467550487a998b432582a0388a80c..4fd89943eebabed9a5e141016b8c1563a2eea287 100644
(file)
--- a/
yaffs_mtdif.c
+++ b/
yaffs_mtdif.c
@@
-1,7
+1,7
@@
/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
- * Copyright (C) 2002-20
07
Aleph One Ltd.
+ * Copyright (C) 2002-20
10
Aleph One Ltd.
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
@@
-11,9
+11,6
@@
* published by the Free Software Foundation.
*/
* published by the Free Software Foundation.
*/
-const char *yaffs_mtdif_c_version =
- "$Id: yaffs_mtdif.c,v 1.25 2010-02-19 01:06:31 charles Exp $";
-
#include "yportenv.h"
#include "yportenv.h"
@@
-26,19
+23,19
@@
const char *yaffs_mtdif_c_version =
#include "yaffs_linux.h"
#include "yaffs_linux.h"
-int nandmtd_
EraseBlockInNAND(yaffs_Device *dev, int blockNumber
)
+int nandmtd_
erase_block(yaffs_dev_t *dev, int block_no
)
{
{
- struct mtd_info *mtd = yaffs_
DeviceToContext(dev)->mtd
;
+ struct mtd_info *mtd = yaffs_
dev_to_mtd(dev)
;
__u32 addr =
__u32 addr =
- ((loff_t) block
Number) * dev->param.totalBytesPerC
hunk
- * dev->param.
nChunksPerB
lock;
+ ((loff_t) block
_no) * dev->param.total_bytes_per_c
hunk
+ * dev->param.
chunks_per_b
lock;
struct erase_info ei;
int retval = 0;
ei.mtd = mtd;
ei.addr = addr;
struct erase_info ei;
int retval = 0;
ei.mtd = mtd;
ei.addr = addr;
- ei.len = dev->param.total
BytesPerChunk * dev->param.nChunksPerB
lock;
+ ei.len = dev->param.total
_bytes_per_chunk * dev->param.chunks_per_b
lock;
ei.time = 1000;
ei.retries = 2;
ei.callback = NULL;
ei.time = 1000;
ei.retries = 2;
ei.callback = NULL;
@@
-52,7
+49,7
@@
int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
return YAFFS_FAIL;
}
return YAFFS_FAIL;
}
-int nandmtd_
InitialiseNAND(yaffs_Device
*dev)
+int nandmtd_
initialise(yaffs_dev_t
*dev)
{
return YAFFS_OK;
}
{
return YAFFS_OK;
}