add MTD device.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1939 bbd45198-f89e-11dd-88c7-29a3b14d5316

components/drivers/include/drivers/mtd.h

+/*
+ * File      : mtd.h
+ * This file is part of RT-Thread RTOS
+ * COPYRIGHT (C) 2006 - 2012, RT-Thread Development Team
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rt-thread.org/license/LICENSE
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2011-12-05     Bernard      the first version
+ */
+
+/*
+ * COPYRIGHT (C) 2012, Shanghai Real Thread
+ */
+
 #ifndef __MTD_H__
 #define __MTD_H__
 
+#include <rtdevice.h>
+
+struct rt_mtd_driver_ops;
+#define RT_MTD_DEVICE(device)	((struct rt_mtd_device*)(device))
+
 struct rt_mtd_device
 {
+	struct rt_device parent;
+
+	rt_uint32_t page_size;			/* The Page size in the flash */
+	rt_uint32_t block_size;			/* The Block size in the flash */
+
+	rt_uint16_t oob_size;			/* Out of bank size */
+	rt_uint16_t reserve;
+
+	rt_uint32_t block_start;		/* The start of available block*/
+	rt_uint32_t block_end;			/* The end of available block */
+
+	/* operations interface */
 	const struct rt_mtd_driver_ops* ops;
 };
 
 struct rt_mtd_driver_ops
 {
-	rt_uint32_t (*read_id) (rt_mtd_device* device);
-	rt_err_t (*read_page)  (rt_mtd_device* device, rt_uint32_t page, rt_uint8_t *data, rt_uint8_t *spare);
-	rt_err_t (*write_page) (rt_mtd_device* device, rt_uint32_t page, rt_uint8_t *data, rt_uint8_t *spare);
+	rt_uint32_t (*read_id) (struct rt_mtd_device* device);
+
+	int (*read) (struct rt_mtd_device* device, rt_off_t position, rt_uint8_t* data, rt_size_t size);
+	int (*write)(struct rt_mtd_device* device, rt_off_t position, const rt_uint8_t* data, rt_size_t size);
 
-	rt_err_t (*erase_block)(rt_mtd_device* device, rt_uint32_t block);
+	int (*oob_read) (struct rt_mtd_device* device, rt_off_t position, rt_uint8_t* spare);
+	int (*oob_write)(struct rt_mtd_device* device, rt_off_t position, const rt_uint8_t* spare);
+
+	rt_err_t (*erase_block)(struct rt_mtd_device* device, rt_uint32_t block);
 };
 
+rt_err_t rt_mtd_register_device(const char* name, struct rt_mtd_device* device);
+
+rt_inline rt_uint32_t rt_mtd_read_id(struct rt_mtd_device* device)
+{
+	return device->ops->read_id(device);
+}
+
+rt_inline int rt_mtd_read(struct rt_mtd_device* device, rt_off_t position,
+		rt_uint8_t* data, rt_size_t size)
+{
+	return device->ops->read(device, position, data, size);
+}
+
+rt_inline int rt_mtd_write(struct rt_mtd_device* device, rt_off_t position,
+		const rt_uint8_t* data, rt_size_t size)
+{
+	return device->ops->write(device, position, data, size);
+}
+
+rt_inline int rt_mtd_oob_read(struct rt_mtd_device* device, rt_off_t position,
+		rt_uint8_t* data)
+{
+	return device->ops->oob_read(device, position, data);
+}
+
+rt_inline int rt_mtd_oob_write(struct rt_mtd_device* device, rt_off_t position,
+		const rt_uint8_t* data)
+{
+	return device->ops->oob_write(device, position, data);
+}
+
+rt_inline rt_err_t rt_mtd_erase_block(struct rt_mtd_device* device, rt_uint32_t block)
+{
+	return device->ops->erase_block(device, block);
+}
+
 #endif

components/drivers/include/rtdevice.h

@@ -3,6 +3,8 @@
 
 #include <rtthread.h>
 
+#define RT_DEVICE(device)	((rt_device_t)device)
+
 #ifdef RT_USING_SPI
 #include "drivers/spi.h"
 #endif

components/drivers/mtd/SConscript

@@ -3,6 +3,6 @@ from building import *
 cwd     = GetCurrentDir()
 src	= Glob('*.c')
 CPPPATH = [cwd + '/../include']
-group = DefineGroup('Drivers', src, depend = ['RT_USING_MTD'], CPPPATH = CPPPATH)
+group = DefineGroup('DeviceDrivers', src, depend = ['RT_USING_MTD'], CPPPATH = CPPPATH)
 
 Return('group')

components/drivers/mtd/mtd_core.c

+/*
+ * File      : mtd_core.c
+ * This file is part of RT-Thread RTOS
+ * COPYRIGHT (C) 2006 - 2012, RT-Thread Development Team
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rt-thread.org/license/LICENSE
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2011-12-05     Bernard      the first version
+ */
+
+/*
+ * COPYRIGHT (C) 2012, Shanghai Real Thread
+ */
+
+#include <drivers/mtd.h>
+
+#ifdef RT_USING_MTD
+
+/*
+ * RT-Thread Generic Device Interface
+ */
+static rt_err_t _mtd_init(rt_device_t dev)
+{
+	return RT_EOK;
+}
+
+static rt_err_t _mtd_open(rt_device_t dev, rt_uint16_t oflag)
+{
+	return RT_EOK;
+}
+
+static rt_err_t _mtd_close(rt_device_t dev)
+{
+	return RT_EOK;
+}
+
+static rt_size_t _mtd_read(rt_device_t dev, rt_off_t pos, void *buffer, rt_size_t size)
+{
+	return size;
+}
+
+static rt_size_t _mtd_write(rt_device_t dev, rt_off_t pos, const void *buffer, rt_size_t size)
+{
+	return size;
+}
+
+static rt_err_t _mtd_control(rt_device_t dev, rt_uint8_t cmd, void *args)
+{
+	return RT_EOK;
+}
+
+rt_err_t rt_mtd_register_device(const char* name, struct rt_mtd_device* device)
+{
+	rt_device_t dev;
+
+	dev = RT_DEVICE(device);
+	RT_ASSERT(dev != RT_NULL);
+
+	/* set device class and generic device interface */
+	dev->type 		= RT_Device_Class_MTD;
+	dev->init 		= _mtd_init;
+	dev->open 		= _mtd_open;
+	dev->read 		= _mtd_read;
+	dev->write 		= _mtd_write;
+	dev->close      = _mtd_close;
+	dev->control 	= _mtd_control;
+
+	dev->rx_indicate = RT_NULL;
+	dev->tx_complete = RT_NULL;
+
+	/* register to RT-Thread device system */
+	return rt_device_register(dev, name, RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_STANDALONE);
+}
+
+#endif