Moved include/nuttx/mtd.h to include/nuttx/mtd/mtd.h

ChangeLog

@@ -6059,6 +6059,9 @@
 	  compilation for the set of writable file systems.  Noted by
 	  Daniel Palmer (2013-11-15).
 	* arch/arm/src/sama5/sam_nand.c and .h:  Framework for an MTD driver
-	  that will provide raw access to NAND (2013-11015).
+	  that will provide raw access to NAND (2013-11-15).
 	* configs/sama5d3x-ek/src/sam_nandflash.c:  Provides board-specific
-	  memory controller initialize for NAND flash (2013-11015).
+	  memory controller initialize for NAND flash (2013-11-15).
+	* include/nuttx/mtd/mtd.h:  Move include/nutt/mtd.h to
+	  include/nuttx/mtd/mtd.h where it will, hopefully, soon be joined by
+	  other MTD-related header files (2013-11-15).

Documentation/NuttxPortingGuide.html

@@ -3246,7 +3246,7 @@ extern void up_ledoff(int led);
 <ul>
   <li>
     <p>
-      <b><code>include/nuttx/mtd.h</code></b>.
+      <b><code>include/nuttx/mtd/mtd.h</code></b>.
       All structures and APIs needed to work with MTD drivers are provided in this header file.
     </p>
   </li>

arch/arm/src/lm/lm_flash.c

@@ -52,7 +52,7 @@
 #include <debug.h>
 
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #include "up_arch.h"
 #include "chip.h"

arch/arm/src/lpc43xx/lpc43_spifi.c

@@ -51,7 +51,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #include <arch/irq.h>
 #include <arch/board/board.h>

arch/arm/src/lpc43xx/lpc43_spifi.h

@@ -41,7 +41,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #include "chip.h"
 #include "chip/lpc43_spifi.h"

arch/arm/src/sama5/Kconfig

@@ -3033,6 +3033,8 @@ config SAMA5_EBICS0_NOR
 
 config SAMA5_EBICS0_NAND
 	bool "NAND Flash"
+	select MTD
+	select MTD_NAND
 
 endchoice # CS0 Memory Type
 endif # SAMA5_EBICS0
@@ -3082,6 +3084,8 @@ config SAMA5_EBICS1_NOR
 
 config SAMA5_EBICS1_NAND
 	bool "NAND Flash"
+	select MTD
+	select MTD_NAND
 
 endchoice # CS1 Memory Type
 endif # SAMA5_EBICS1
@@ -3131,6 +3135,8 @@ config SAMA5_EBICS2_NOR
 
 config SAMA5_EBICS2_NAND
 	bool "NAND Flash"
+	select MTD
+	select MTD_NAND
 
 endchoice # CS2 Memory Type
 endif # SAMA5_EBICS2
@@ -3180,6 +3186,8 @@ config SAMA5_EBICS3_NOR
 
 config SAMA5_EBICS3_NAND
 	bool "NAND Flash"
+	select MTD
+	select MTD_NAND
 
 endchoice # CS3 Memory Type
 endif # SAMA5_EBICS3

arch/arm/src/sama5/sam_nand.c

@@ -4,6 +4,15 @@
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
+ * References:
+ *   SAMA5D3 Series Data Sheet
+ *   Atmel NoOS sample code.
+ *
+ * The Atmel sample code has a BSD compatibile license that requires this
+ * copyright notice:
+ *
+ *   Copyright (c) 2011, 2012, Atmel Corporation
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -14,8 +23,8 @@
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
+ * 3. Neither the names NuttX nor Atmel nor the names of its contributors
- *    used to endorse or promote products derived from this software
+ *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -46,7 +55,7 @@
 #include <debug.h>
 
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #include "sam_nand.h"
 

configs/cloudctrl/src/up_w25.c

@@ -50,7 +50,7 @@
 
 #ifdef CONFIG_STM32_SPI1
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #  include <nuttx/fs/nxffs.h>
 #endif
 

configs/ea3131/src/up_fillpage.c

@@ -66,7 +66,7 @@
 #  include <sys/ioctl.h>
 #  include <nuttx/fs/ioctl.h>
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #endif
 
 /****************************************************************************

configs/ea3152/src/up_fillpage.c

@@ -66,7 +66,7 @@
 #  include <sys/ioctl.h>
 #  include <nuttx/fs/ioctl.h>
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #endif
 
 /****************************************************************************

configs/fire-stm32v2/src/up_w25.c

@@ -49,7 +49,7 @@
 
 #ifdef CONFIG_STM32_SPI1
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #  include <nuttx/fs/nxffs.h>
 #endif
 

configs/hymini-stm32v/src/up_nsh.c

@@ -47,7 +47,7 @@
 
 #ifdef CONFIG_STM32_SPI1
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #endif
 
 #ifdef CONFIG_STM32_SDIO

configs/lpc4330-xplorer/src/up_nsh.c

@@ -47,7 +47,7 @@
 #include "chip.h"
 
 #ifdef CONFIG_LPC43_SPIFI
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #  include "lpc43_spifi.h"
 
 #  ifdef CONFIG_SPFI_NXFFS

configs/mikroe-stm32f4/src/up_nsh.c

@@ -52,7 +52,7 @@
 #endif
 
 #ifdef CONFIG_MTD_M25P
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #endif
 
 #ifdef CONFIG_SYSTEM_USBMONITOR

configs/mirtoo/src/up_nsh.c

@@ -49,7 +49,7 @@
 
 #ifdef CONFIG_PIC32MX_SPI2
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #  include <nuttx/fs/nxffs.h>
 #endif
 

configs/sama5d3x-ek/src/sam_at24.c

@@ -65,7 +65,7 @@
 #include <debug.h>
 
 #include <nuttx/i2c.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 #include <nuttx/fs/nxffs.h>
 
 #include "sama5d3x-ek.h"

configs/sama5d3x-ek/src/sam_at25.c

@@ -47,7 +47,7 @@
 #include <debug.h>
 
 #include <nuttx/spi/spi.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 #include <nuttx/fs/nxffs.h>
 
 #include "sam_spi.h"

configs/shenzhou/src/up_w25.c

@@ -49,7 +49,7 @@
 
 #ifdef CONFIG_STM32_SPI1
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #  include <nuttx/fs/nxffs.h>
 #endif
 

configs/spark/src/up_composite.c

@@ -50,7 +50,7 @@
 
 #ifdef CONFIG_MTD_SST25
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #  include <sys/mount.h>
 #endif
 

configs/spark/src/up_nsh.c

@@ -50,7 +50,7 @@
 
 #ifdef CONFIG_MTD_SST25
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #  include <sys/mount.h>
 #endif
 

configs/stm3210e-eval/src/up_nsh.c

@@ -47,7 +47,7 @@
 
 #ifdef CONFIG_STM32_SPI1
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #endif
 
 #ifdef CONFIG_STM32_SDIO

configs/stm3220g-eval/src/up_nsh.c

@@ -47,7 +47,7 @@
 
 #ifdef CONFIG_STM32_SPI1
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #endif
 
 #ifdef CONFIG_STM32_SDIO

configs/stm3240g-eval/src/up_nsh.c

@@ -47,7 +47,7 @@
 
 #ifdef CONFIG_STM32_SPI1
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #endif
 
 #ifdef CONFIG_STM32_SDIO

drivers/Kconfig

@@ -327,7 +327,7 @@ menuconfig MTD
 	---help---
 		Memory Technology Device (MTD) drivers.  Some simple drivers for
 		memory technologies like FLASH, EEPROM, NVRAM, etc.  See
-		include/nuttx/mtd.h
+		include/nuttx/mtd/mtd.h
 
 		(Note: This is a simple memory interface and should not be
 		confused with the "real" MTD developed at infradead.org.  This

drivers/README.txt

@@ -85,7 +85,7 @@ mmcsd/
 mtd/
   Memory Technology Device (MTD) drivers.  Some simple drivers for
   memory technologies like FLASH, EEPROM, NVRAM, etc.  See
-  include/nuttx/mtd.h
+  include/nuttx/mtd/mtd.h
 
   (Note: This is a simple memory interface and should not be
   confused with the "real" MTD developed at infradead.org.  This

drivers/mtd/Kconfig

@@ -19,7 +19,7 @@ config MTD_PARTITION
 		each managed by a separate MTD driver.  The MTD parition interface
 		is described in:
 
-			include/nuttx/mtd.h
+			include/nuttx/mtd/mtd.h
 			FAR struct mtd_dev_s *mtd_partition(FAR struct mtd_dev_s *mtd, off_t offset, off_t nblocks);
 
 		Each call to mtd_partition() will create a new MTD driver instance
@@ -75,6 +75,15 @@ config MTD_CONFIG_ERASEDVALUE
 
 comment "MTD Device Drivers"
 
+config MTD_NAND
+	bool "Enable NAND support"
+	default n
+	---help---
+		Enable support for NAND FLASH devices.
+
+if MTD_NAND
+endif # MTD_NAND
+
 config RAMMTD
 	bool "RAM-based MTD driver"
 	default n

drivers/mtd/at24xx.c

@@ -60,7 +60,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/i2c.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #ifdef CONFIG_MTD_AT24XX
 

drivers/mtd/at25.c

@@ -52,7 +52,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/spi/spi.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 /************************************************************************************
  * Pre-processor Definitions

drivers/mtd/at45db.c

@@ -63,7 +63,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/spi/spi.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 /************************************************************************************
  * Pre-processor Definitions

drivers/mtd/flash_eraseall.c

@@ -44,7 +44,7 @@
 
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 /****************************************************************************
  * Private Definitions

drivers/mtd/ftl.c

@@ -52,7 +52,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 #include <nuttx/rwbuffer.h>
 
 /****************************************************************************

drivers/mtd/m25px.c

@@ -52,7 +52,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/spi/spi.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 /************************************************************************************
  * Pre-processor Definitions

drivers/mtd/mtd_config.c

@@ -58,7 +58,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 #include <nuttx/configdata.h>
 
 #ifdef CONFIG_MTD_CONFIG

drivers/mtd/mtd_partition.c

@@ -46,7 +46,7 @@
 #include <assert.h>
 #include <debug.h>
 
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
 

drivers/mtd/rammtd.c

@@ -48,7 +48,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 /****************************************************************************
  * Pre-processor Definitions

drivers/mtd/ramtron.c

@@ -69,7 +69,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/spi/spi.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 /************************************************************************************
  * Pre-processor Definitions

drivers/mtd/skeleton.c

@@ -44,7 +44,7 @@
 #include <errno.h>
 
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 /****************************************************************************
  * Pre-processor Definitions

drivers/mtd/smart.c

@@ -55,7 +55,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 #include <nuttx/smart.h>
 
 /****************************************************************************

drivers/mtd/sst25.c

@@ -59,7 +59,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/spi/spi.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 /************************************************************************************
  * Pre-processor Definitions

drivers/mtd/sst39vf.c

@@ -51,7 +51,7 @@
 #include <nuttx/clock.h>
 #include <nuttx/arch.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 /****************************************************************************
  * Pre-processor Definitions

drivers/mtd/w25.c

@@ -54,7 +54,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/spi/spi.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 /************************************************************************************
  * Pre-processor Definitions

fs/nxffs/nxffs.h

@@ -49,7 +49,7 @@
 #include <stdbool.h>
 #include <semaphore.h>
 
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 #include <nuttx/fs/nxffs.h>
 
 /****************************************************************************

fs/nxffs/nxffs_block.c

@@ -46,7 +46,7 @@
 #include <assert.h>
 #include <debug.h>
 
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #include "nxffs.h"
 

fs/nxffs/nxffs_blockstats.c

@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #include "nxffs.h"
 

fs/nxffs/nxffs_cache.c

@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #include "nxffs.h"
 

fs/nxffs/nxffs_dirent.c

@@ -48,7 +48,7 @@
 #include <debug.h>
 
 #include <nuttx/fs/fs.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 #include <nuttx/fs/dirent.h>
 
 #include "nxffs.h"

fs/nxffs/nxffs_dump.c

@@ -48,7 +48,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #include "nxffs.h"
 

fs/nxffs/nxffs_initialize.c

@@ -47,7 +47,7 @@
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/ioctl.h>
 

fs/nxffs/nxffs_inode.c

@@ -48,7 +48,7 @@
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #include "nxffs.h"
 

fs/nxffs/nxffs_ioctl.c

@@ -48,7 +48,7 @@
 
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #include "nxffs.h"