projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mainlining'
[yaffs2.git]
/
patches
/
yaffs_mtdif2.c
diff --git
a/patches/yaffs_mtdif2.c
b/patches/yaffs_mtdif2.c
index 71fb027b18c49171e4f32d756c21a3ebc17ef10f..19677ad47afd524d93a7be86f913a3b75da3ff94 100644
(file)
--- a/
patches/yaffs_mtdif2.c
+++ b/
patches/yaffs_mtdif2.c
@@
-1,7
+1,7
@@
/*
* YAFFS: Yet another FFS. A NAND-flash specific file system.
*
/*
* YAFFS: Yet another FFS. A NAND-flash specific file system.
*
- * Copyright (C) 2002 Aleph One Ltd.
+ * Copyright (C) 2002
-2010
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>
@@
-28,10
+28,10
@@
const char *yaffs_mtdif2_c_version =
#include "yaffs_packedtags2.h"
#include "yaffs_packedtags2.h"
-void nandmtd2_pt2buf(
yaffs_dev_t
*dev, yaffs_PackedTags2 *pt, int is_raw)
+void nandmtd2_pt2buf(
struct yaffs_dev
*dev, yaffs_PackedTags2 *pt, int is_raw)
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
-
__u8 *ptab = (__
u8 *)pt; /* packed tags as bytes */
+
u8 *ptab = (
u8 *)pt; /* packed tags as bytes */
int i, j = 0, k, n;
int i, j = 0, k, n;
@@
-69,11
+69,11
@@
void nandmtd2_pt2buf(yaffs_dev_t *dev, yaffs_PackedTags2 *pt, int is_raw)
}
}
-void nandmtd2_buf2pt(
yaffs_dev_t
*dev, yaffs_PackedTags2 *pt, int is_raw)
+void nandmtd2_buf2pt(
struct yaffs_dev
*dev, yaffs_PackedTags2 *pt, int is_raw)
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
int i, j = 0, k, n;
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
int i, j = 0, k, n;
-
__u8 *ptab = (__
u8 *)pt; /* packed tags as bytes */
+
u8 *ptab = (
u8 *)pt; /* packed tags as bytes */
if (!is_raw) {
if (!is_raw) {
@@
-107,9
+107,9
@@
void nandmtd2_buf2pt(yaffs_dev_t *dev, yaffs_PackedTags2 *pt, int is_raw)
}
}
-int nandmtd2_WriteChunkWithTagsToNAND(
yaffs_dev_t
* dev, int nand_chunk,
- const
__
u8 * data,
- const yaffs_ext_tags * tags)
+int nandmtd2_WriteChunkWithTagsToNAND(
struct yaffs_dev
* dev, int nand_chunk,
+ const u8 * data,
+ const
struct
yaffs_ext_tags * tags)
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
size_t dummy;
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
size_t dummy;
@@
-149,8
+149,8
@@
int nandmtd2_WriteChunkWithTagsToNAND(yaffs_dev_t * dev, int nand_chunk,
return YAFFS_FAIL;
}
return YAFFS_FAIL;
}
-int nandmtd2_ReadChunkWithTagsFromNAND(
yaffs_dev_t
* dev, int nand_chunk,
-
__u8 * data,
yaffs_ext_tags * tags)
+int nandmtd2_ReadChunkWithTagsFromNAND(
struct yaffs_dev
* dev, int nand_chunk,
+
u8 * data, struct
yaffs_ext_tags * tags)
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
size_t dummy;
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
size_t dummy;
@@
-193,7
+193,7
@@
int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_dev_t * dev, int nand_chunk,
return YAFFS_FAIL;
}
return YAFFS_FAIL;
}
-int nandmtd2_MarkNANDBlockBad(struct yaffs_dev
_s
*dev, int block_no)
+int nandmtd2_MarkNANDBlockBad(struct yaffs_dev *dev, int block_no)
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
int retval;
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
int retval;
@@
-212,8
+212,8
@@
int nandmtd2_MarkNANDBlockBad(struct yaffs_dev_s *dev, int block_no)
}
}
-int nandmtd2_QueryNANDBlock(struct yaffs_dev
_s
*dev, int block_no,
-
yaffs_block_state_t
* state, int *seq_number)
+int nandmtd2_QueryNANDBlock(struct yaffs_dev *dev, int block_no,
+
enum yaffs_block_state
* state, int *seq_number)
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
int retval;
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
int retval;
@@
-231,7
+231,7
@@
int nandmtd2_QueryNANDBlock(struct yaffs_dev_s *dev, int block_no,
*state = YAFFS_BLOCK_STATE_DEAD;
*seq_number = 0;
} else {
*state = YAFFS_BLOCK_STATE_DEAD;
*seq_number = 0;
} else {
- yaffs_ext_tags t;
+
struct
yaffs_ext_tags t;
nandmtd2_ReadChunkWithTagsFromNAND(dev,
block_no *
dev->chunks_per_block, NULL,
nandmtd2_ReadChunkWithTagsFromNAND(dev,
block_no *
dev->chunks_per_block, NULL,