aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@gmail.com>2006-05-30 20:32:26 -0500
committerJosh Boyer <jwboyer@gmail.com>2006-05-30 20:32:26 -0500
commitf414377bdee822e1835bb26b2c3fd43a04ef46c3 (patch)
treed19a907db553cf1cb52970f59ff8c444b60486b5
parent3beba17eab553b0fdd35c0c1656535b4d08143dc (diff)
Update yet again to latest mtd-abi.h from kernel tree. And fix mtd_debug.c.
Again. Signed-off-by: Josh Boyer <jwboyer@gmail.com>
-rw-r--r--include/mtd/mtd-abi.h6
-rw-r--r--mtd_debug.c9
2 files changed, 6 insertions, 9 deletions
diff --git a/include/mtd/mtd-abi.h b/include/mtd/mtd-abi.h
index c11a589..7ccadb1 100644
--- a/include/mtd/mtd-abi.h
+++ b/include/mtd/mtd-abi.h
@@ -24,18 +24,18 @@ struct mtd_oob_buf {
};
#define MTD_ABSENT 0
-#define MTD_RAM 1
-#define MTD_ROM 2
#define MTD_NORFLASH 3
#define MTD_NANDFLASH 4
#define MTD_DATAFLASH 6
+#define MTD_GENERIC_TYPE 7
#define MTD_WRITEABLE 0x400 /* Device is writeable */
#define MTD_BIT_WRITEABLE 0x800 /* Single bits can be flipped */
+#define MTD_NO_ERASE 0x1000 /* No erase necessary */
// Some common devices / combinations of capabilities
#define MTD_CAP_ROM 0
-#define MTD_CAP_RAM (MTD_WRITEABLE | MTD_BIT_WRITEABLE)
+#define MTD_CAP_RAM (MTD_WRITEABLE | MTD_BIT_WRITEABLE | MTD_NO_ERASE)
#define MTD_CAP_NORFLASH (MTD_WRITEABLE | MTD_BIT_WRITEABLE)
#define MTD_CAP_NANDFLASH (MTD_WRITEABLE)
diff --git a/mtd_debug.c b/mtd_debug.c
index 6ef7e31..ee3c67c 100644
--- a/mtd_debug.c
+++ b/mtd_debug.c
@@ -260,18 +260,15 @@ int showinfo (int fd)
case MTD_ABSENT:
printf ("MTD_ABSENT");
break;
- case MTD_RAM:
- printf ("MTD_RAM");
- break;
- case MTD_ROM:
- printf ("MTD_ROM");
- break;
case MTD_NORFLASH:
printf ("MTD_NORFLASH");
break;
case MTD_NANDFLASH:
printf ("MTD_NANDFLASH");
break;
+ case MTD_GENERIC_TYPE:
+ printf ("MTD_GENERIC_TYPE");
+ break;
default:
printf ("(unknown type - new MTD API maybe?)");
}