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

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
 

src/flash/nand/Makefile.am

@@ -26,6 +26,7 @@ NAND_DRIVERS = \
 
 noinst_HEADERS = \
 	arm_io.h \
+	core.h \
 	lpc3180.h \
 	driver.h \
 	mx3.h \

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.

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

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

src/flash/nand.h → 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
+

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

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

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

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.

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 = {

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);

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);

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

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)

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"
 
 

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>
 

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
 {

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"
 

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>