1. add mtd nor files. 2 fixed include head files in rtdevice.h and mtd_nand.c

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

components/drivers/include/drivers/mtd_nor.h

+/*
+ * File      : mtd_nor.h
+ * This file is part of RT-Thread RTOS
+ * COPYRIGHT (C) 2012, Shanghai Real-Thread Technology Co., Ltd
+ *
+ * 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
+ * 2012-5-30     Bernard      the first version
+ */
+
+#ifndef __MTD_NOR_H__
+#define __MTD_NOR_H__
+
+#include <rtdevice.h>
+
+struct rt_mtd_nor_driver_ops;
+#define RT_MTD_NOR_DEVICE(device)	((struct rt_mtd_nor_device*)(device))
+
+struct rt_mtd_nor_device
+{
+	struct rt_device parent;
+
+	rt_uint32_t block_size;			/* The Block size in the flash */
+	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_nor_driver_ops* ops;
+};
+
+struct rt_mtd_nor_driver_ops
+{
+	rt_err_t (*read_id) (struct rt_mtd_nor_device* device);
+
+	rt_size_t (*read)    (struct rt_mtd_nor_device* device, rt_off_t offset, rt_uint8_t* data, rt_uint32_t length);
+	rt_size_t (*write)   (struct rt_mtd_nor_device* device, rt_off_t offset, const rt_uint8_t* data, rt_uint32_t length);
+
+	rt_err_t (*erase_block)(struct rt_mtd_nor_device* device, rt_off_t offset, rt_uint32_t length);
+};
+
+rt_err_t rt_mtd_nor_register_device(const char* name, struct rt_mtd_nor_device* device);
+
+rt_inline rt_uint32_t rt_mtd_nor_read_id(struct rt_mtd_nor_device* device)
+{
+	return device->ops->read_id(device);
+}
+
+rt_inline rt_size_t rt_mtd_nor_read(
+	struct rt_mtd_nor_device* device,
+	rt_off_t offset, rt_uint8_t* data, rt_uint32_t length)
+{
+	return device->ops->read(device, offset, data, length);
+}
+
+rt_inline rt_size_t rt_mtd_nor_write(
+	struct rt_mtd_nor_device* device,
+	rt_off_t offset, const rt_uint8_t* data, rt_uint32_t length)
+{
+	return device->ops->write(device, offset, data, length);
+}
+
+rt_inline rt_err_t rt_mtd_nor_erase_block(struct rt_mtd_nor_device* device, rt_off_t offset, rt_size_t length)
+{
+	return device->ops->erase_block(device, offset, length);
+}
+
+#endif

components/drivers/include/rtdevice.h

@@ -47,8 +47,8 @@ rt_size_t rt_ringbuffer_emptry_size(struct rt_ringbuffer* rb);
 #include "drivers/spi.h"
 #endif
 
-#ifdef RT_USING_MTD
-#include "drivers/mtd.h"
+#ifdef RT_USING_MTD_NOR
+#include "drivers/mtd_nor.h"
 #endif
 
 #ifdef RT_USING_MTD_NAND

components/drivers/mtd/mtd_nand.c

@@ -16,7 +16,7 @@
  * COPYRIGHT (C) 2012, Shanghai Real Thread
  */
 
-#include <drivers/mtd.h>
+#include <drivers/mtd_nand.h>
 
 #ifdef RT_USING_MTD_NAND
 

components/drivers/mtd/mtd_nor.c

+/*
+ * File      : mtd_nor.c
+ * This file is part of RT-Thread RTOS
+ * COPYRIGHT (C) 2012, Shanghai Real-Thread Technology Co., Ltd
+ *
+ * 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
+ * 2012-5-30     Bernard      the first version
+ */
+
+#include <drivers/mtd_nor.h>
+
+#ifdef RT_USING_MTD_NOR
+
+/*
+ * 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_nor_register_device(const char* name, struct rt_mtd_nor_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