summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2011-08-31 05:45:39 +0400
committerArtem Bityutskiy <artem.bityutskiy@intel.com>2011-09-11 16:26:20 +0400
commit905c6bcdb42616da717a9bd6c0c5870dbd90b09e (patch)
tree211f0068cb67463d4e2120c5457a81b4b6e56ff9 /include
parentc46f6483d21e93400e4a110de7902830173d53b0 (diff)
downloadlinux-905c6bcdb42616da717a9bd6c0c5870dbd90b09e.tar.xz
mtd: move mtd_oob_mode_t to shared kernel/user space
We will want to use the MTD_OOB_{PLACE,AUTO,RAW} modes in user-space applications through the introduction of new ioctls, so we should make this enum a shared type. This enum is now anonymous. Artem: tweaked the patch. Signed-off-by: Brian Norris <computersforpeace@gmail.com> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@intel.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/mtd/mtd.h16
-rw-r--r--include/mtd/mtd-abi.h15
2 files changed, 16 insertions, 15 deletions
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index ff7bae08c5e0..6882cd968a3e 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -68,20 +68,6 @@ struct mtd_erase_region_info {
unsigned long *lockmap; /* If keeping bitmap of locks */
};
-/*
- * oob operation modes
- *
- * MTD_OOB_PLACE: oob data are placed at the given offset
- * MTD_OOB_AUTO: oob data are automatically placed at the free areas
- * which are defined by the ecclayout
- * MTD_OOB_RAW: mode to read oob and data without doing ECC checking
- */
-typedef enum {
- MTD_OOB_PLACE,
- MTD_OOB_AUTO,
- MTD_OOB_RAW,
-} mtd_oob_mode_t;
-
/**
* struct mtd_oob_ops - oob operation operands
* @mode: operation mode
@@ -102,7 +88,7 @@ typedef enum {
* OOB area.
*/
struct mtd_oob_ops {
- mtd_oob_mode_t mode;
+ unsigned int mode;
size_t len;
size_t retlen;
size_t ooblen;
diff --git a/include/mtd/mtd-abi.h b/include/mtd/mtd-abi.h
index 3bdda5c426bd..af42c7a34805 100644
--- a/include/mtd/mtd-abi.h
+++ b/include/mtd/mtd-abi.h
@@ -45,6 +45,21 @@ struct mtd_oob_buf64 {
__u64 usr_ptr;
};
+/*
+ * oob operation modes
+ *
+ * MTD_OOB_PLACE: oob data are placed at the given offset (default)
+ * MTD_OOB_AUTO: oob data are automatically placed at the free areas
+ * which are defined by the internal ecclayout
+ * MTD_OOB_RAW: mode to read or write oob and data without doing ECC
+ * checking
+ */
+enum {
+ MTD_OOB_PLACE = 0,
+ MTD_OOB_AUTO = 1,
+ MTD_OOB_RAW = 2,
+};
+
#define MTD_ABSENT 0
#define MTD_RAM 1
#define MTD_ROM 2