projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace KERNEL_VERSION with MTD_VERSION so that builds which don't use
[yaffs2.git]
/
yaffs_mtdif.c
diff --git
a/yaffs_mtdif.c
b/yaffs_mtdif.c
index 6e2a9de22267318f34bb7c42deabdea3a3e8dca8..a1025a1177972b5c88372dc891380463d0377ef5 100644
(file)
--- a/
yaffs_mtdif.c
+++ b/
yaffs_mtdif.c
@@
-12,7
+12,7
@@
*/
const char *yaffs_mtdif_c_version =
*/
const char *yaffs_mtdif_c_version =
- "$Id: yaffs_mtdif.c,v 1.
19 2007-02-14 01:09:06 wookey
Exp $";
+ "$Id: yaffs_mtdif.c,v 1.
20 2007-12-12 18:08:15 colin
Exp $";
#include "yportenv.h"
#include "yportenv.h"
@@
-24,7
+24,7
@@
const char *yaffs_mtdif_c_version =
#include "linux/time.h"
#include "linux/mtd/nand.h"
#include "linux/time.h"
#include "linux/mtd/nand.h"
-#if (
LINUX_VERSION_CODE < KERNEL
_VERSION(2,6,18))
+#if (
MTD_VERSION_CODE < MTD
_VERSION(2,6,18))
static struct nand_oobinfo yaffs_oobinfo = {
.useecc = 1,
.eccbytes = 6,
static struct nand_oobinfo yaffs_oobinfo = {
.useecc = 1,
.eccbytes = 6,
@@
-36,7
+36,7
@@
static struct nand_oobinfo yaffs_noeccinfo = {
};
#endif
};
#endif
-#if (
LINUX_VERSION_CODE > KERNEL
_VERSION(2,6,17))
+#if (
MTD_VERSION_CODE > MTD
_VERSION(2,6,17))
static inline void translate_spare2oob(const yaffs_Spare *spare, __u8 *oob)
{
oob[0] = spare->tagByte0;
static inline void translate_spare2oob(const yaffs_Spare *spare, __u8 *oob)
{
oob[0] = spare->tagByte0;
@@
-75,14
+75,14
@@
int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
const __u8 * data, const yaffs_Spare * spare)
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
const __u8 * data, const yaffs_Spare * spare)
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
-#if (
LINUX_VERSION_CODE > KERNEL
_VERSION(2,6,17))
+#if (
MTD_VERSION_CODE > MTD
_VERSION(2,6,17))
struct mtd_oob_ops ops;
#endif
size_t dummy;
int retval = 0;
loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
struct mtd_oob_ops ops;
#endif
size_t dummy;
int retval = 0;
loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-#if (
LINUX_VERSION_CODE > KERNEL
_VERSION(2,6,17))
+#if (
MTD_VERSION_CODE > MTD
_VERSION(2,6,17))
__u8 spareAsBytes[8]; /* OOB */
if (data && !spare)
__u8 spareAsBytes[8]; /* OOB */
if (data && !spare)
@@
-139,14
+139,14
@@
int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
yaffs_Spare * spare)
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
yaffs_Spare * spare)
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
-#if (
LINUX_VERSION_CODE > KERNEL
_VERSION(2,6,17))
+#if (
MTD_VERSION_CODE > MTD
_VERSION(2,6,17))
struct mtd_oob_ops ops;
#endif
size_t dummy;
int retval = 0;
loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
struct mtd_oob_ops ops;
#endif
size_t dummy;
int retval = 0;
loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-#if (
LINUX_VERSION_CODE > KERNEL
_VERSION(2,6,17))
+#if (
MTD_VERSION_CODE > MTD
_VERSION(2,6,17))
__u8 spareAsBytes[8]; /* OOB */
if (data && !spare)
__u8 spareAsBytes[8]; /* OOB */
if (data && !spare)