Merge branch 'master' of git://git.denx.de/u-boot-onenand

[u-boot] / include / linux / mtd / nftl.h

diff --git a/include/linux/mtd/nftl.h b/include/linux/mtd/nftl.h
index 04963a52e5e3c7f24cd0a4b3051ff926b4f3f08c..fe22e0dceb16cc8ae7549733f8b75e5c66d67c98 100644 (file)
--- a/include/linux/mtd/nftl.h
+++ b/include/linux/mtd/nftl.h
@@ -1,6 +1,4 @@
 /*
- * $Id: nftl.h,v 1.16 2004/06/30 14:49:00 dbrown Exp $
- *
  * (C) 1999-2003 David Woodhouse <dwmw2@infradead.org>
  */
 
@@ -13,10 +11,10 @@
 #include <linux/mtd/nftl-user.h>
 
 /* these info are used in ReplUnitTable */
-#define BLOCK_NIL          0xffff /* last block of a chain */
-#define BLOCK_FREE         0xfffe /* free block */
+#define BLOCK_NIL         0xffff /* last block of a chain */
+#define BLOCK_FREE        0xfffe /* free block */
 #define BLOCK_NOTEXPLORED  0xfffd /* non explored block, only used during mounting */
-#define BLOCK_RESERVED     0xfffc /* bios block or bad block */
+#define BLOCK_RESERVED    0xfffc /* bios block or bad block */
 
 struct NFTLrecord {
        struct mtd_blktrans_dev mbd;
@@ -28,21 +26,26 @@ struct NFTLrecord {
        unsigned char sectors;
        unsigned short cylinders;
        __u16 numvunits;
-       __u16 lastEUN;                  /* should be suppressed */
+       __u16 lastEUN;                  /* should be suppressed */
        __u16 numfreeEUNs;
        __u16 LastFreeEUN;              /* To speed up finding a free EUN */
        int head,sect,cyl;
        __u16 *EUNtable;                /* [numvunits]: First EUN for each virtual unit  */
        __u16 *ReplUnitTable;           /* [numEUNs]: ReplUnitNumber for each */
-        unsigned int nb_blocks;                /* number of physical blocks */
-        unsigned int nb_boot_blocks;   /* number of blocks used by the bios */
-        struct erase_info instr;
+       unsigned int nb_blocks;         /* number of physical blocks */
+       unsigned int nb_boot_blocks;    /* number of blocks used by the bios */
+       struct erase_info instr;
        struct nand_ecclayout oobinfo;
 };
 
 int NFTL_mount(struct NFTLrecord *s);
 int NFTL_formatblock(struct NFTLrecord *s, int block);
 
+int nftl_read_oob(struct mtd_info *mtd, loff_t offs, size_t len,
+                 size_t *retlen, uint8_t *buf);
+int nftl_write_oob(struct mtd_info *mtd, loff_t offs, size_t len,
+                  size_t *retlen, uint8_t *buf);
+
 #ifndef NFTL_MAJOR
 #define NFTL_MAJOR 93
 #endif