14 files changed, 13 insertions, 317 deletions

diff --git a/package/mtd/Makefile b/package/mtd/Makefile
index f416d6bb18..49a760be23 100644
--- a/package/mtd/Makefile
+++ b/package/mtd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mtd
-PKG_RELEASE:=16
+PKG_RELEASE:=17
 
 PKG_BUILD_DIR := $(KERNEL_BUILD_DIR)/$(PKG_NAME)
 STAMP_PREPARED := $(STAMP_PREPARED)_$(call confvar,CONFIG_MTD_REDBOOT_PARTS)
diff --git a/package/mtd/src/imagetag.c b/package/mtd/src/imagetag.c
index f6095be44a..a4ce86d6e9 100644
--- a/package/mtd/src/imagetag.c
+++ b/package/mtd/src/imagetag.c
@@ -31,7 +31,7 @@
 #include <errno.h>
 
 #include <sys/ioctl.h>
-#include "mtd-api.h"
+#include <mtd/mtd-user.h>
 #include "mtd.h"
 #include "crc32.h"
 #include "bcm_tag.h"
diff --git a/package/mtd/src/mtd-api.h b/package/mtd/src/mtd-api.h
deleted file mode 100644
index 272043ddb2..0000000000
--- a/package/mtd/src/mtd-api.h
+++ /dev/null
@@ -1,304 +0,0 @@
-
-
-#ifndef __MTD_MTD_H__
-#define __MTD_MTD_H__
-
-#ifdef __KERNEL__
-
-#include <linux/config.h>
-#include <linux/version.h>
-#include <linux/types.h>
-#include <linux/mtd/compatmac.h>
-#include <linux/notifier.h>
-#include <linux/module.h>
-#include <linux/uio.h>
-
-#endif /* __KERNEL__ */
-
-struct erase_info_user {
-	u_int32_t start;
-	u_int32_t length;
-};
-
-struct mtd_oob_buf {
-	u_int32_t start;
-	u_int32_t length;
-	unsigned char *ptr;
-};
-
-
-#define MTD_CHAR_MAJOR 90
-#define MTD_BLOCK_MAJOR 31
-#define MAX_MTD_DEVICES 16
-
-
-
-#define MTD_ABSENT		0
-#define MTD_RAM			1
-#define MTD_ROM			2
-#define MTD_NORFLASH		3
-#define MTD_NANDFLASH		4
-#define MTD_PEROM		5
-#define MTD_OTHER		14
-#define MTD_UNKNOWN		15
-
-
-
-#define MTD_CLEAR_BITS		1       // Bits can be cleared (flash)
-#define MTD_SET_BITS		2       // Bits can be set
-#define MTD_ERASEABLE		4       // Has an erase function
-#define MTD_WRITEB_WRITEABLE	8       // Direct IO is possible
-#define MTD_VOLATILE		16      // Set for RAMs
-#define MTD_XIP			32	// eXecute-In-Place possible
-#define MTD_OOB			64	// Out-of-band data (NAND flash)
-#define MTD_ECC			128	// Device capable of automatic ECC
-
-// Some common devices / combinations of capabilities
-#define MTD_CAP_ROM		0
-#define MTD_CAP_RAM		(MTD_CLEAR_BITS|MTD_SET_BITS|MTD_WRITEB_WRITEABLE)
-#define MTD_CAP_NORFLASH        (MTD_CLEAR_BITS|MTD_ERASEABLE)
-#define MTD_CAP_NANDFLASH       (MTD_CLEAR_BITS|MTD_ERASEABLE|MTD_OOB)
-#define MTD_WRITEABLE		(MTD_CLEAR_BITS|MTD_SET_BITS)
-
-
-// Types of automatic ECC/Checksum available
-#define MTD_ECC_NONE		0 	// No automatic ECC available
-#define MTD_ECC_RS_DiskOnChip	1	// Automatic ECC on DiskOnChip
-#define MTD_ECC_SW		2	// SW ECC for Toshiba & Samsung devices
-
-struct mtd_info_user {
-	u_char type;
-	u_int32_t flags;
-	u_int32_t size;	 // Total size of the MTD
-	u_int32_t erasesize;
-	u_int32_t oobblock;  // Size of OOB blocks (e.g. 512)
-	u_int32_t oobsize;   // Amount of OOB data per block (e.g. 16)
-	u_int32_t ecctype;
-	u_int32_t eccsize;
-};
-
-struct region_info_user {
-	u_int32_t offset;		/* At which this region starts, 
-					 * from the beginning of the MTD */
-	u_int32_t erasesize;		/* For this region */
-	u_int32_t numblocks;		/* Number of blocks in this region */
-	u_int32_t regionindex;
-};
-
-#define MEMGETINFO              _IOR('M', 1, struct mtd_info_user)
-#define MEMERASE                _IOW('M', 2, struct erase_info_user)
-#define MEMWRITEOOB             _IOWR('M', 3, struct mtd_oob_buf)
-#define MEMREADOOB              _IOWR('M', 4, struct mtd_oob_buf)
-#define MEMLOCK                 _IOW('M', 5, struct erase_info_user)
-#define MEMUNLOCK               _IOW('M', 6, struct erase_info_user)
-#define MEMGETREGIONCOUNT	_IOR('M', 7, int)
-#define MEMGETREGIONINFO	_IOWR('M', 8, struct region_info_user)
-#define	MEMREADDATA             _IOWR('M', 9, struct mtd_oob_buf)
-#define	MEMWRITEDATA            _IOWR('M', 10, struct mtd_oob_buf)
-#define MTDREFRESH				_IO('M', 23)
-
-#ifndef __KERNEL__
-
-typedef struct mtd_info_user mtd_info_t;
-typedef struct erase_info_user erase_info_t;
-typedef struct region_info_user region_info_t;
-
-	/* User-space ioctl definitions */
-
-
-#else /* __KERNEL__ */
-
-
-#define MTD_ERASE_PENDING      	0x01
-#define MTD_ERASING		0x02
-#define MTD_ERASE_SUSPEND	0x04
-#define MTD_ERASE_DONE          0x08
-#define MTD_ERASE_FAILED        0x10
-
-struct erase_info {
-	struct mtd_info *mtd;
-	u_int32_t addr;
-	u_int32_t len;
-	u_long time;
-	u_long retries;
-	u_int dev;
-	u_int cell;
-	void (*callback) (struct erase_info *self);
-	u_long priv;
-	u_char state;
-	struct erase_info *next;
-};
-
-struct mtd_erase_region_info {
-	u_int32_t offset;			/* At which this region starts, from the beginning of the MTD */
-	u_int32_t erasesize;		/* For this region */
-	u_int32_t numblocks;		/* Number of blocks of erasesize in this region */
-};
-
-struct mtd_info {
-	u_char type;
-	u_int32_t flags;
-	u_int32_t size;	 // Total size of the MTD
-
-	/* "Major" erase size for the device. Naïve users may take this
-	 * to be the only erase size available, or may use the more detailed
-	 * information below if they desire
-	 */
-	u_int32_t erasesize;
-
-	u_int32_t oobblock;  // Size of OOB blocks (e.g. 512)
-	u_int32_t oobsize;   // Amount of OOB data per block (e.g. 16)
-	u_int32_t ecctype;
-	u_int32_t eccsize;
-
-	// Kernel-only stuff starts here.
-	char *name;
-	int index;
-
-	/* Data for variable erase regions. If numeraseregions is zero,
-	 * it means that the whole device has erasesize as given above. 
-	 */
-	int numeraseregions;
-	struct mtd_erase_region_info *eraseregions; 
-
-	/* This really shouldn't be here. It can go away in 2.5 */
-	u_int32_t bank_size;
-
-	struct module *module;
-	int (*erase) (struct mtd_info *mtd, struct erase_info *instr);
-
-	/* This stuff for eXecute-In-Place */
-	int (*point) (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char **mtdbuf);
-
-	/* We probably shouldn't allow XIP if the unpoint isn't a NULL */
-	void (*unpoint) (struct mtd_info *mtd, u_char * addr, loff_t from, size_t len);
-
-
-	int (*read) (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf);
-	int (*write) (struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf);
-
-	int (*read_ecc) (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf, u_char *eccbuf, int oobsel);
-	int (*write_ecc) (struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf, u_char *eccbuf, int oobsel);
-
-	int (*read_oob) (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf);
-	int (*write_oob) (struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf);
-
-	/* 
-	 * Methods to access the protection register area, present in some 
-	 * flash devices. The user data is one time programmable but the
-	 * factory data is read only. 
-	 */
-	int (*read_user_prot_reg) (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf);
-
-	int (*read_fact_prot_reg) (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf);
-
-	/* This function is not yet implemented */
-	int (*write_user_prot_reg) (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf);
-
-	/* iovec-based read/write methods. We need these especially for NAND flash,
-	   with its limited number of write cycles per erase.
-	   NB: The 'count' parameter is the number of _vectors_, each of 
-	   which contains an (ofs, len) tuple.
-	*/
-	int (*readv) (struct mtd_info *mtd, struct iovec *vecs, unsigned long count, loff_t from, size_t *retlen);
-	int (*readv_ecc) (struct mtd_info *mtd, struct iovec *vecs, unsigned long count, loff_t from, 
-		size_t *retlen, u_char *eccbuf, int oobsel);
-	int (*writev) (struct mtd_info *mtd, const struct iovec *vecs, unsigned long count, loff_t to, size_t *retlen);
-	int (*writev_ecc) (struct mtd_info *mtd, const struct iovec *vecs, unsigned long count, loff_t to, 
-		size_t *retlen, u_char *eccbuf, int oobsel);
-
-	/* Sync */
-	void (*sync) (struct mtd_info *mtd);
-
-	/* Chip-supported device locking */
-	int (*lock) (struct mtd_info *mtd, loff_t ofs, size_t len);
-	int (*unlock) (struct mtd_info *mtd, loff_t ofs, size_t len);
-
-	/* Power Management functions */
-	int (*suspend) (struct mtd_info *mtd);
-	void (*resume) (struct mtd_info *mtd);
-
-	struct notifier_block reboot_notifier;
-
-	void *priv;
-};
-
-
-	/* Kernel-side ioctl definitions */
-
-extern int add_mtd_device(struct mtd_info *mtd);
-extern int del_mtd_device (struct mtd_info *mtd);
-
-extern struct mtd_info *__get_mtd_device(struct mtd_info *mtd, int num);
-
-static inline struct mtd_info *get_mtd_device(struct mtd_info *mtd, int num)
-{
-	struct mtd_info *ret;
-	
-	ret = __get_mtd_device(mtd, num);
-
-	if (ret && ret->module && !try_inc_mod_count(ret->module))
-		return NULL;
-
-	return ret;
-}
-
-static inline void put_mtd_device(struct mtd_info *mtd)
-{
-       if (mtd->module)
-	       __MOD_DEC_USE_COUNT(mtd->module);
-}
-
-
-struct mtd_notifier {
-	void (*add)(struct mtd_info *mtd);
-	void (*remove)(struct mtd_info *mtd);
-	struct mtd_notifier *next;
-};
-
-
-extern void register_mtd_user (struct mtd_notifier *new);
-extern int unregister_mtd_user (struct mtd_notifier *old);
-
-int default_mtd_writev(struct mtd_info *mtd, const struct iovec *vecs,
-		       unsigned long count, loff_t to, size_t *retlen);
-
-int default_mtd_readv(struct mtd_info *mtd, struct iovec *vecs,
-		      unsigned long count, loff_t from, size_t *retlen);
-
-#ifndef MTDC
-#define MTD_ERASE(mtd, args...) (*(mtd->erase))(mtd, args)
-#define MTD_POINT(mtd, a,b,c,d) (*(mtd->point))(mtd, a,b,c, (u_char **)(d))
-#define MTD_UNPOINT(mtd, arg) (*(mtd->unpoint))(mtd, (u_char *)arg)
-#define MTD_READ(mtd, args...) (*(mtd->read))(mtd, args)
-#define MTD_WRITE(mtd, args...) (*(mtd->write))(mtd, args)
-#define MTD_READV(mtd, args...) (*(mtd->readv))(mtd, args)
-#define MTD_WRITEV(mtd, args...) (*(mtd->writev))(mtd, args)
-#define MTD_READECC(mtd, args...) (*(mtd->read_ecc))(mtd, args)
-#define MTD_WRITEECC(mtd, args...) (*(mtd->write_ecc))(mtd, args)
-#define MTD_READOOB(mtd, args...) (*(mtd->read_oob))(mtd, args)
-#define MTD_WRITEOOB(mtd, args...) (*(mtd->write_oob))(mtd, args)
-#define MTD_SYNC(mtd) do { if (mtd->sync) (*(mtd->sync))(mtd);  } while (0) 
-#endif /* MTDC */
-
-/*
- * Debugging macro and defines
- */
-#define MTD_DEBUG_LEVEL0	(0)	/* Quiet   */
-#define MTD_DEBUG_LEVEL1	(1)	/* Audible */
-#define MTD_DEBUG_LEVEL2	(2)	/* Loud    */
-#define MTD_DEBUG_LEVEL3	(3)	/* Noisy   */
-
-#ifdef CONFIG_MTD_DEBUG
-#define DEBUG(n, args...)				\
- 	do {						\
-		if (n <= CONFIG_MTD_DEBUG_VERBOSE)	\
-			printk(KERN_INFO args);		\
-	} while(0)
-#else /* CONFIG_MTD_DEBUG */
-#define DEBUG(n, args...)
-#endif /* CONFIG_MTD_DEBUG */
-
-#endif /* __KERNEL__ */
-
-#endif /* __MTD_MTD_H__ */
diff --git a/package/mtd/src/mtd.c b/package/mtd/src/mtd.c
index b33582668f..5fa260b91a 100644
--- a/package/mtd/src/mtd.c
+++ b/package/mtd/src/mtd.c
@@ -41,7 +41,7 @@
 #include <sys/stat.h>
 #include <sys/reboot.h>
 #include <linux/reboot.h>
-#include "mtd-api.h"
+#include <mtd/mtd-user.h>
 #include "fis.h"
 #include "mtd.h"
 
diff --git a/package/mtd/src/trx.c b/package/mtd/src/trx.c
index b8d9e2bf05..d1aab36923 100644
--- a/package/mtd/src/trx.c
+++ b/package/mtd/src/trx.c
@@ -30,7 +30,7 @@
 #include <errno.h>
 
 #include <sys/ioctl.h>
-#include "mtd-api.h"
+#include <mtd/mtd-user.h>
 #include "mtd.h"
 #include "crc32.h"
 
diff --git a/target/linux/generic/patches-2.6.30/065-rootfs_split.patch b/target/linux/generic/patches-2.6.30/065-rootfs_split.patch
index 5caf0aaff7..24aad52ef8 100644
--- a/target/linux/generic/patches-2.6.30/065-rootfs_split.patch
+++ b/target/linux/generic/patches-2.6.30/065-rootfs_split.patch
@@ -629,7 +629,7 @@
  #define ECCGETLAYOUT		_IOR('M', 17, struct nand_ecclayout)
  #define ECCGETSTATS		_IOR('M', 18, struct mtd_ecc_stats)
  #define MTDFILEMODE		_IO('M', 19)
-+#define MTDREFRESH		_IO('M', 23)
++#define MTDREFRESH		_IO('M', 50)
  
  /*
   * Obsolete legacy interface. Keep it in order not to break userspace
diff --git a/target/linux/generic/patches-2.6.31/065-rootfs_split.patch b/target/linux/generic/patches-2.6.31/065-rootfs_split.patch
index fd69e3ffaf..c585775332 100644
--- a/target/linux/generic/patches-2.6.31/065-rootfs_split.patch
+++ b/target/linux/generic/patches-2.6.31/065-rootfs_split.patch
@@ -621,7 +621,7 @@
  #define MEMERASE64		_IOW('M', 20, struct erase_info_user64)
  #define MEMWRITEOOB64		_IOWR('M', 21, struct mtd_oob_buf64)
  #define MEMREADOOB64		_IOWR('M', 22, struct mtd_oob_buf64)
-+#define MTDREFRESH		_IO('M', 23)
++#define MTDREFRESH		_IO('M', 50)
  
  /*
   * Obsolete legacy interface. Keep it in order not to break userspace
diff --git a/target/linux/generic/patches-2.6.32/065-rootfs_split.patch b/target/linux/generic/patches-2.6.32/065-rootfs_split.patch
index 1d92ebeae8..288336dd45 100644
--- a/target/linux/generic/patches-2.6.32/065-rootfs_split.patch
+++ b/target/linux/generic/patches-2.6.32/065-rootfs_split.patch
@@ -621,7 +621,7 @@
  #define MEMERASE64		_IOW('M', 20, struct erase_info_user64)
  #define MEMWRITEOOB64		_IOWR('M', 21, struct mtd_oob_buf64)
  #define MEMREADOOB64		_IOWR('M', 22, struct mtd_oob_buf64)
-+#define MTDREFRESH		_IO('M', 23)
++#define MTDREFRESH		_IO('M', 50)
  
  /*
   * Obsolete legacy interface. Keep it in order not to break userspace
diff --git a/target/linux/generic/patches-2.6.36/065-rootfs_split.patch b/target/linux/generic/patches-2.6.36/065-rootfs_split.patch
index 31eb71617b..7e1fab106d 100644
--- a/target/linux/generic/patches-2.6.36/065-rootfs_split.patch
+++ b/target/linux/generic/patches-2.6.36/065-rootfs_split.patch
@@ -621,7 +621,7 @@
  #define MEMWRITEOOB64		_IOWR('M', 21, struct mtd_oob_buf64)
  #define MEMREADOOB64		_IOWR('M', 22, struct mtd_oob_buf64)
  #define MEMISLOCKED		_IOR('M', 23, struct erase_info_user)
-+#define MTDREFRESH		_IO('M', 24)
++#define MTDREFRESH		_IO('M', 50)
  
  /*
   * Obsolete legacy interface. Keep it in order not to break userspace
diff --git a/target/linux/generic/patches-2.6.37/400-rootfs_split.patch b/target/linux/generic/patches-2.6.37/400-rootfs_split.patch
index 788e1f3594..0eeef62dea 100644
--- a/target/linux/generic/patches-2.6.37/400-rootfs_split.patch
+++ b/target/linux/generic/patches-2.6.37/400-rootfs_split.patch
@@ -325,7 +325,7 @@
  #define MEMWRITEOOB64		_IOWR('M', 21, struct mtd_oob_buf64)
  #define MEMREADOOB64		_IOWR('M', 22, struct mtd_oob_buf64)
  #define MEMISLOCKED		_IOR('M', 23, struct erase_info_user)
-+#define MTDREFRESH		_IO('M', 24)
++#define MTDREFRESH		_IO('M', 50)
  
  /*
   * Obsolete legacy interface. Keep it in order not to break userspace
diff --git a/target/linux/generic/patches-2.6.38/400-rootfs_split.patch b/target/linux/generic/patches-2.6.38/400-rootfs_split.patch
index 630cdd9a8a..9b7c2dc0b7 100644
--- a/target/linux/generic/patches-2.6.38/400-rootfs_split.patch
+++ b/target/linux/generic/patches-2.6.38/400-rootfs_split.patch
@@ -326,7 +326,7 @@
  #define MEMWRITEOOB64		_IOWR('M', 21, struct mtd_oob_buf64)
  #define MEMREADOOB64		_IOWR('M', 22, struct mtd_oob_buf64)
  #define MEMISLOCKED		_IOR('M', 23, struct erase_info_user)
-+#define MTDREFRESH		_IO('M', 24)
++#define MTDREFRESH		_IO('M', 50)
  
  /*
   * Obsolete legacy interface. Keep it in order not to break userspace
diff --git a/target/linux/generic/patches-2.6.39/400-rootfs_split.patch b/target/linux/generic/patches-2.6.39/400-rootfs_split.patch
index 545081403d..226118986f 100644
--- a/target/linux/generic/patches-2.6.39/400-rootfs_split.patch
+++ b/target/linux/generic/patches-2.6.39/400-rootfs_split.patch
@@ -325,7 +325,7 @@
  #define MEMWRITEOOB64		_IOWR('M', 21, struct mtd_oob_buf64)
  #define MEMREADOOB64		_IOWR('M', 22, struct mtd_oob_buf64)
  #define MEMISLOCKED		_IOR('M', 23, struct erase_info_user)
-+#define MTDREFRESH		_IO('M', 24)
++#define MTDREFRESH		_IO('M', 50)
  
  /*
   * Obsolete legacy interface. Keep it in order not to break userspace
diff --git a/target/linux/generic/patches-3.0/400-rootfs_split.patch b/target/linux/generic/patches-3.0/400-rootfs_split.patch
index db736c3bc5..ccbe83ea3c 100644
--- a/target/linux/generic/patches-3.0/400-rootfs_split.patch
+++ b/target/linux/generic/patches-3.0/400-rootfs_split.patch
@@ -321,7 +321,7 @@
  #define MEMWRITEOOB64		_IOWR('M', 21, struct mtd_oob_buf64)
  #define MEMREADOOB64		_IOWR('M', 22, struct mtd_oob_buf64)
  #define MEMISLOCKED		_IOR('M', 23, struct erase_info_user)
-+#define MTDREFRESH		_IO('M', 24)
++#define MTDREFRESH		_IO('M', 50)
  
  /*
   * Obsolete legacy interface. Keep it in order not to break userspace
diff --git a/target/linux/generic/patches-3.1/400-rootfs_split.patch b/target/linux/generic/patches-3.1/400-rootfs_split.patch
index db736c3bc5..ccbe83ea3c 100644
--- a/target/linux/generic/patches-3.1/400-rootfs_split.patch
+++ b/target/linux/generic/patches-3.1/400-rootfs_split.patch
@@ -321,7 +321,7 @@
  #define MEMWRITEOOB64		_IOWR('M', 21, struct mtd_oob_buf64)
  #define MEMREADOOB64		_IOWR('M', 22, struct mtd_oob_buf64)
  #define MEMISLOCKED		_IOR('M', 23, struct erase_info_user)
-+#define MTDREFRESH		_IO('M', 24)
++#define MTDREFRESH		_IO('M', 50)
  
  /*
   * Obsolete legacy interface. Keep it in order not to break userspace