rename nand.h to flash//nand/core.h

Rename nand.h as flash/nand/core.h, chase consumers.  The public APIs
need to be sorted out with imp.h, but this allows other changes to
begin improving the separation between policy and mechanism.

Moves #include <target/target.h> and #include "driver.h" into the
internal headers or source files, removing it from <flash/nand/core.h>.

diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index f8d7088386353ab63001a382a3e242804e2d75bf..646889e1deb130a6da3dc3c879f0d2c037350798 100644 (file)
--- a/src/flash/Makefile.am
+++ b/src/flash/Makefile.am
@@ -17,8 +17,7 @@ libflash_la_LIBADD = \
 
 noinst_HEADERS = \
        common.h \
-       mflash.h \
-       nand.h
+       mflash.h
 
 EXTRA_DIST = startup.tcl
 

diff --git a/src/flash/nand/Makefile.am b/src/flash/nand/Makefile.am
index 667ef8fdf71658fbb17eb909aaad282f4a52a998..a48b726ac768f3f75beb07f015ea4c64c1db104a 100644 (file)
--- a/src/flash/nand/Makefile.am
+++ b/src/flash/nand/Makefile.am
@@ -26,6 +26,7 @@ NAND_DRIVERS = \
 
 noinst_HEADERS = \
        arm_io.h \
+       core.h \
        lpc3180.h \
        driver.h \
        mx3.h \

diff --git a/src/flash/nand/arm_io.c b/src/flash/nand/arm_io.c
index cc565dcbc023592214c2f61d7d686878e4012157..4c746757cf841b6311411766d4e61f1744aafe94 100644 (file)
--- a/src/flash/nand/arm_io.c
+++ b/src/flash/nand/arm_io.c
@@ -24,10 +24,13 @@
 #include "config.h"
 #endif
 
+#include "core.h"
 #include "arm_io.h"
+#include <helper/binarybuffer.h>
 #include <target/armv4_5.h>
 #include <target/algorithm.h>
 
+
 /**
  * Copies code to a working area.  This will allocate room for the code plus the
  * additional amount requested if the working area pointer is null.

diff --git a/src/flash/nand/arm_io.h b/src/flash/nand/arm_io.h
index d3504f434d7a5a62d4b962ca1030ba9684d86fc9..2e825bf801c185ea6c0aa2e789a9712181117fc4 100644 (file)
--- a/src/flash/nand/arm_io.h
+++ b/src/flash/nand/arm_io.h
@@ -19,9 +19,6 @@
 #ifndef __ARM_NANDIO_H
 #define __ARM_NANDIO_H
 
-#include <flash/nand.h>
-#include <helper/binarybuffer.h>
-
 /**
  * Available operational states the arm_nand_data struct can be in.
  */

diff --git a/src/flash/nand/core.c b/src/flash/nand/core.c
index 46f545469daef649b86dee61de409271754d5248..d52cf5df69a0e8836789c816050103130a9061b1 100644 (file)
--- a/src/flash/nand/core.c
+++ b/src/flash/nand/core.c
@@ -24,8 +24,6 @@
 #include "config.h"
 #endif
 
-#include <flash/nand.h>
-#include <flash/common.h>
 #include "imp.h"
 
 /* configured NAND devices and NAND Flash command handler */

diff --git a/src/flash/nand.h b/src/flash/nand/core.h
similarity index 96%
rename from src/flash/nand.h
rename to src/flash/nand/core.h
index d675b295c559295a64c73ce22b5f182eea6a546b..b8dc01c76c49dd722676fae6f115df5051976f87 100644 (file)
--- a/src/flash/nand.h
+++ b/src/flash/nand/core.h
@@ -1,6 +1,6 @@
 /***************************************************************************
- *   Copyright (C) 2007 by Dominic Rath                                    *
- *   Dominic.Rath@gmx.de                                                   *
+ *   Copyright (C) 2007 by Dominic Rath <Dominic.Rath@gmx.de>              *
+ *   Copyright (C) 2009 Zachary T Welch <zw@superlucidity.net>             *
  *                                                                         *
  *   Partially based on linux/include/linux/mtd/nand.h                     *
  *   Copyright (C) 2000 David Woodhouse <dwmw2@mvhi.com>                   *
@@ -22,14 +22,10 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#ifndef NAND_H
-#define NAND_H
+#ifndef FLASH_NAND_CORE_H
+#define FLASH_NAND_CORE_H
 
 #include <flash/common.h>
-// to be removed later
-#include <target/target.h>
-// to be removed later
-#include <flash/nand/driver.h>
 
 /**
  * Representation of a single NAND block in a NAND device.
@@ -243,4 +239,5 @@ COMMAND_HELPER(nand_command_get_device, unsigned name_index,
 #define                ERROR_NAND_ERROR_CORRECTION_FAILED      (-1105)
 #define                ERROR_NAND_NO_BUFFER                    (-1106)
 
-#endif /* NAND_H */
+#endif // FLASH_NAND_CORE_H
+

diff --git a/src/flash/nand/davinci.c b/src/flash/nand/davinci.c
index 0152b4d93787cff8ee7dd3b09045ed37d514936e..96cbfeae75b23ce09a9f106956872932ebe62491 100644 (file)
--- a/src/flash/nand/davinci.c
+++ b/src/flash/nand/davinci.c
@@ -28,8 +28,9 @@
 #include "config.h"
 #endif
 
+#include "imp.h"
 #include "arm_io.h"
-
+#include <target/target.h>
 
 enum ecc {
        HWECC1,         /* all controllers support 1-bit ECC */

diff --git a/src/flash/nand/driver.c b/src/flash/nand/driver.c
index 717f5aaad20261e646cc331e719ec839bd3c5c41..1ccc4f44f9d69911d507767e9ce8a65ce091dda2 100644 (file)
--- a/src/flash/nand/driver.c
+++ b/src/flash/nand/driver.c
@@ -23,7 +23,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <flash/nand.h>
+#include "core.h"
 #include "driver.h"
 
 /* NAND flash controller

diff --git a/src/flash/nand/ecc.c b/src/flash/nand/ecc.c
index 1e103d00210a231e2f5cca96c42633f20f90eced..2de12d424510912e19ca020e6e932b6bb5e6e301 100644 (file)
--- a/src/flash/nand/ecc.c
+++ b/src/flash/nand/ecc.c
@@ -41,7 +41,7 @@
 #include "config.h"
 #endif
 
-#include <flash/nand.h>
+#include "core.h"
 
 /*
  * Pre-calculated 256-way 1 byte column parity

diff --git a/src/flash/nand/ecc_kw.c b/src/flash/nand/ecc_kw.c
index 55273c58f7622e7e0ca2341a9f1de6a2b4a8a968..1c1a8ea64c71d5c95d870299610f94d658892b61 100644 (file)
--- a/src/flash/nand/ecc_kw.c
+++ b/src/flash/nand/ecc_kw.c
@@ -20,7 +20,7 @@
 #include "config.h"
 #endif
 
-#include <flash/nand.h>
+#include "core.h"
 
 /*****************************************************************************
  * Arithmetic in GF(2^10) ("F") modulo x^10 + x^3 + 1.

diff --git a/src/flash/nand/fileio.c b/src/flash/nand/fileio.c
index fbaa8b424faa20a3f098e5eec11da33f0dc02d50..3e397ebd6b70dd60f16fdfdef745f497cd06d354 100644 (file)
--- a/src/flash/nand/fileio.c
+++ b/src/flash/nand/fileio.c
@@ -24,7 +24,7 @@
 #include "config.h"
 #endif
 
-#include <flash/nand.h>
+#include "core.h"
 #include "fileio.h"
 
 static struct nand_ecclayout nand_oob_16 = {

diff --git a/src/flash/nand/imp.h b/src/flash/nand/imp.h
index b381b538ddc9bad7da00642becdc2bc4eadd9d57..e0d411fa4e44cd8b5978e93927f8797c75f3bc14 100644 (file)
--- a/src/flash/nand/imp.h
+++ b/src/flash/nand/imp.h
@@ -19,6 +19,9 @@
 #ifndef FLASH_NAND_IMP_H
 #define FLASH_NAND_IMP_H
 
+#include "core.h"
+#include "driver.h"
+
 int nand_write_page(struct nand_device *nand,
                uint32_t page, uint8_t *data, uint32_t data_size,
                uint8_t *oob, uint32_t oob_size);

diff --git a/src/flash/nand/lpc3180.c b/src/flash/nand/lpc3180.c
index 80284cc62d6728cb446e9715c51a78fc5913ba12..4268b66ebef7e390f2875783b5dfe9f2f30a4d7e 100644 (file)
--- a/src/flash/nand/lpc3180.c
+++ b/src/flash/nand/lpc3180.c
@@ -21,8 +21,10 @@
 #include "config.h"
 #endif
 
+#include "imp.h"
 #include "lpc3180.h"
-#include <flash/nand.h>
+#include <target/target.h>
+
 
 static int lpc3180_reset(struct nand_device *nand);
 static int lpc3180_controller_ready(struct nand_device *nand, int timeout);

diff --git a/src/flash/nand/mx3.c b/src/flash/nand/mx3.c
index 21577a6e9334ff8841abf078359ffcfef1a56847..4823534c04c4c1cc6d1c2337a49d2869bdfd7728 100644 (file)
--- a/src/flash/nand/mx3.c
+++ b/src/flash/nand/mx3.c
@@ -35,7 +35,9 @@ get_next_halfword_from_sram_buffer() not tested
 #include "config.h"
 #endif
 
+#include "imp.h"
 #include "mx3.h"
+#include <target/target.h>
 
 static const char target_not_halted_err_msg[] =
        "target must be halted to use mx3 NAND flash controller";

diff --git a/src/flash/nand/mx3.h b/src/flash/nand/mx3.h
index 94dbf0cba6d94a93dc657143f2c2a05f5346ab13..f37fc323d62b82db70084bd336bdde90d82c49e1 100644 (file)
--- a/src/flash/nand/mx3.h
+++ b/src/flash/nand/mx3.h
@@ -25,7 +25,6 @@
  *
  * Many thanks to Ben Dooks for writing s3c24xx driver.
  */
-#include <flash/nand.h>
 
 #define                MX3_NF_BASE_ADDR                0xb8000000
 #define                MX3_NF_BUFSIZ                   (MX3_NF_BASE_ADDR + 0xe00)

diff --git a/src/flash/nand/nonce.c b/src/flash/nand/nonce.c
index 8d15040ffacb0cca08c432ccc646a797118b1ee0..ab490aeab2e2f83053efffcb84a93c023768275d 100644 (file)
--- a/src/flash/nand/nonce.c
+++ b/src/flash/nand/nonce.c
@@ -20,7 +20,8 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <flash/nand.h>
+
+#include "imp.h"
 #include "hello.h"
 
 

diff --git a/src/flash/nand/orion.c b/src/flash/nand/orion.c
index 4b174da35e549a18376318a7aacb609d628b5b83..01d4a082b31f42dfa95809a72620ce21dc0b4bee 100644 (file)
--- a/src/flash/nand/orion.c
+++ b/src/flash/nand/orion.c
@@ -26,6 +26,7 @@
 #include "config.h"
 #endif
 
+#include "imp.h"
 #include "arm_io.h"
 #include <target/armv4_5.h>
 

diff --git a/src/flash/nand/s3c24xx.h b/src/flash/nand/s3c24xx.h
index f89bf6e91e5c6ae4e68267e030f42b69c9592795..9424cb3eb3adb16e19d7dc67f296d97841bd32ab 100644 (file)
--- a/src/flash/nand/s3c24xx.h
+++ b/src/flash/nand/s3c24xx.h
@@ -27,8 +27,9 @@
  * Many thanks to Simtec Electronics for sponsoring this work.
  */
 
-#include <flash/nand.h>
-#include <flash/nand/s3c24xx_regs.h>
+#include "imp.h"
+#include "s3c24xx_regs.h"
+#include <target/target.h>
 
 struct s3c24xx_nand_controller
 {

diff --git a/src/flash/nand/tcl.c b/src/flash/nand/tcl.c
index 75a416f1986c367ecb24c355c1f50399ba262684..e69882bb5851397b466d2d8a77db70fa752da29c 100644 (file)
--- a/src/flash/nand/tcl.c
+++ b/src/flash/nand/tcl.c
@@ -24,7 +24,7 @@
 #include "config.h"
 #endif
 
-#include <flash/nand.h>
+#include "core.h"
 #include "imp.h"
 #include "fileio.h"
 

diff --git a/src/openocd.c b/src/openocd.c
index e500ba6081a9182dbea9d91127e77ea28411e8f3..8cb86746bf51e61fd5f5a5b7cea4ff3d75e4d9d4 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -35,7 +35,7 @@
 #include <xsvf/xsvf.h>
 #include <svf/svf.h>
 #include <flash/nor/core.h>
-#include <flash/nand.h>
+#include <flash/nand/core.h>
 #include <pld/pld.h>
 #include <flash/mflash.h>