sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gregory Nutt 2013-11-15 11:22:23 -06:00
parent f1671bb6a7
commit 897572a552
59 changed files with 93 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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).

2
Documentation/NuttxPortingGuide.html
View File

@ -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>

2
arch/arm/src/lm/lm_flash.c
View File

@ -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"

2
arch/arm/src/lpc43xx/lpc43_spifi.c
View File

@ -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>

2
arch/arm/src/lpc43xx/lpc43_spifi.h
View File

@ -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"

8
arch/arm/src/sama5/Kconfig
View File

@ -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

15
arch/arm/src/sama5/sam_nand.c
View File

@ -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
* used to endorse or promote products derived from this software
* 3. Neither the names NuttX nor Atmel nor the names of its contributors
* 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"

2
configs/cloudctrl/src/up_w25.c
View File

@ -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

2
configs/ea3131/src/up_fillpage.c
View File

@ -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
/****************************************************************************

2
configs/ea3152/src/up_fillpage.c
View File

@ -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
/****************************************************************************

2
configs/fire-stm32v2/src/up_w25.c
View File

@ -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

2
configs/hymini-stm32v/src/up_nsh.c
View File

@ -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

2
configs/lpc4330-xplorer/src/up_nsh.c
View File

@ -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

2
configs/mikroe-stm32f4/src/up_nsh.c
View File

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

2
configs/mirtoo/src/up_nsh.c
View File

@ -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

2
configs/sama5d3x-ek/src/sam_at24.c
View File

@ -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"

2
configs/sama5d3x-ek/src/sam_at25.c
View File

@ -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"

2
configs/shenzhou/src/up_w25.c
View File

@ -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

2
configs/spark/src/up_composite.c
View File

@ -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

2
configs/spark/src/up_nsh.c
View File

@ -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

2
configs/stm3210e-eval/src/up_nsh.c
View File

@ -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

2
configs/stm3220g-eval/src/up_nsh.c
View File

@ -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

2
configs/stm3240g-eval/src/up_nsh.c
View File

@ -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

2
drivers/Kconfig
View File

@ -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

2
drivers/README.txt
View File

@ -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

11
drivers/mtd/Kconfig
View File

@ -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

2
drivers/mtd/at24xx.c
View File

@ -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

2
drivers/mtd/at25.c
View File

@ -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

2
drivers/mtd/at45db.c
View File

@ -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

2
drivers/mtd/flash_eraseall.c
View File

@ -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

2
drivers/mtd/ftl.c
View File

@ -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>
/****************************************************************************

2
drivers/mtd/m25px.c
View File

@ -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

2
drivers/mtd/mtd_config.c
View File

@ -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

2
drivers/mtd/mtd_partition.c
View File

@ -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>

2
drivers/mtd/rammtd.c
View File

@ -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

2
drivers/mtd/ramtron.c
View File

@ -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

2
drivers/mtd/skeleton.c
View File

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

2
drivers/mtd/smart.c
View File

@ -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>
/****************************************************************************

2
drivers/mtd/sst25.c
View File

@ -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

2
drivers/mtd/sst39vf.c
View File

@ -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

2
drivers/mtd/w25.c
View File

@ -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

2
fs/nxffs/nxffs.h
View File

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

2
fs/nxffs/nxffs_block.c
View File

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

2
fs/nxffs/nxffs_blockstats.c
View File

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

2
fs/nxffs/nxffs_cache.c
View File

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

2
fs/nxffs/nxffs_dirent.c
View File

@ -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"

2
fs/nxffs/nxffs_dump.c
View File

@ -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"

2
fs/nxffs/nxffs_initialize.c
View File

@ -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>

2
fs/nxffs/nxffs_inode.c
View File

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

2
fs/nxffs/nxffs_ioctl.c
View File

@ -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"

2
fs/nxffs/nxffs_open.c
View File

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

2
fs/nxffs/nxffs_read.c
View File

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

2
fs/nxffs/nxffs_reformat.c
View File

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

2
fs/nxffs/nxffs_stat.c
View File

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

2
fs/nxffs/nxffs_unlink.c
View File

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

2
fs/nxffs/nxffs_write.c
View File

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

2
fs/smartfs/smartfs.h
View File

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

2
fs/smartfs/smartfs_smart.c
View File

@ -57,7 +57,7 @@
#include <nuttx/fs/fat.h>
#include <nuttx/fs/dirent.h>
#include <nuttx/fs/ioctl.h>
#include <nuttx/mtd.h>
#include <nuttx/mtd/mtd.h>
#include <nuttx/smart.h>
#include "smartfs.h"

8
include/nuttx/mtd.h → include/nuttx/mtd/mtd.h
View File

@ -1,5 +1,5 @@
/****************************************************************************
* include/nuttx/mtd.h
* include/nuttx/mtd/mtd.h
* Memory Technology Device (MTD) interface
*
* Copyright (C) 2009-2013 Gregory Nutt. All rights reserved.
@ -34,8 +34,8 @@
*
****************************************************************************/
#ifndef __INCLUDE_NUTTX_MTD_H
#define __INCLUDE_NUTTX_MTD_H
#ifndef __INCLUDE_NUTTX_MTD_MTD_H
#define __INCLUDE_NUTTX_MTD_MTD_H
/****************************************************************************
* Included Files
@ -346,4 +346,4 @@ FAR struct mtd_dev_s *up_flashinitialize(void);
#endif
#endif /* __ASSEMBLY__ */
#endif /* __INCLUDE_NUTTX_MTD_H */
#endif /* __INCLUDE_NUTTX_MTD_MTD_H */