From 899c9975e750ff0144d4a4f63e0f2a619c0b0e58 Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Fri, 4 Dec 2009 22:04:37 -0800 Subject: [PATCH] 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 and #include "driver.h" into the internal headers or source files, removing it from . --- src/flash/Makefile.am | 3 +-- src/flash/nand/Makefile.am | 1 + src/flash/nand/arm_io.c | 3 +++ src/flash/nand/arm_io.h | 3 --- src/flash/nand/core.c | 2 -- src/flash/{nand.h => nand/core.h} | 15 ++++++--------- src/flash/nand/davinci.c | 3 ++- src/flash/nand/driver.c | 2 +- src/flash/nand/ecc.c | 2 +- src/flash/nand/ecc_kw.c | 2 +- src/flash/nand/fileio.c | 2 +- src/flash/nand/imp.h | 3 +++ src/flash/nand/lpc3180.c | 4 +++- src/flash/nand/mx3.c | 2 ++ src/flash/nand/mx3.h | 1 - src/flash/nand/nonce.c | 3 ++- src/flash/nand/orion.c | 1 + src/flash/nand/s3c24xx.h | 5 +++-- src/flash/nand/tcl.c | 2 +- src/openocd.c | 2 +- 20 files changed, 33 insertions(+), 28 deletions(-) rename src/flash/{nand.h => nand/core.h} (96%) diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am index f8d70883..646889e1 100644 --- 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 667ef8fd..a48b726a 100644 --- 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 cc565dcb..4c746757 100644 --- 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 #include #include + /** * 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 d3504f43..2e825bf8 100644 --- 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 -#include - /** * 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 46f54546..d52cf5df 100644 --- a/src/flash/nand/core.c +++ b/src/flash/nand/core.c @@ -24,8 +24,6 @@ #include "config.h" #endif -#include -#include #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 d675b295..b8dc01c7 100644 --- 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 * + * Copyright (C) 2009 Zachary T Welch * * * * Partially based on linux/include/linux/mtd/nand.h * * Copyright (C) 2000 David Woodhouse * @@ -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 -// to be removed later -#include -// to be removed later -#include /** * 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 0152b4d9..96cbfeae 100644 --- 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 enum ecc { HWECC1, /* all controllers support 1-bit ECC */ diff --git a/src/flash/nand/driver.c b/src/flash/nand/driver.c index 717f5aaa..1ccc4f44 100644 --- a/src/flash/nand/driver.c +++ b/src/flash/nand/driver.c @@ -23,7 +23,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#include +#include "core.h" #include "driver.h" /* NAND flash controller diff --git a/src/flash/nand/ecc.c b/src/flash/nand/ecc.c index 1e103d00..2de12d42 100644 --- a/src/flash/nand/ecc.c +++ b/src/flash/nand/ecc.c @@ -41,7 +41,7 @@ #include "config.h" #endif -#include +#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 55273c58..1c1a8ea6 100644 --- a/src/flash/nand/ecc_kw.c +++ b/src/flash/nand/ecc_kw.c @@ -20,7 +20,7 @@ #include "config.h" #endif -#include +#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 fbaa8b42..3e397ebd 100644 --- a/src/flash/nand/fileio.c +++ b/src/flash/nand/fileio.c @@ -24,7 +24,7 @@ #include "config.h" #endif -#include +#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 b381b538..e0d411fa 100644 --- 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 80284cc6..4268b66e 100644 --- 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 +#include + 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 21577a6e..4823534c 100644 --- 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 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 94dbf0cb..f37fc323 100644 --- 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 #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 8d15040f..ab490aea 100644 --- 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 + +#include "imp.h" #include "hello.h" diff --git a/src/flash/nand/orion.c b/src/flash/nand/orion.c index 4b174da3..01d4a082 100644 --- 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 diff --git a/src/flash/nand/s3c24xx.h b/src/flash/nand/s3c24xx.h index f89bf6e9..9424cb3e 100644 --- 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 -#include +#include "imp.h" +#include "s3c24xx_regs.h" +#include struct s3c24xx_nand_controller { diff --git a/src/flash/nand/tcl.c b/src/flash/nand/tcl.c index 75a416f1..e69882bb 100644 --- a/src/flash/nand/tcl.c +++ b/src/flash/nand/tcl.c @@ -24,7 +24,7 @@ #include "config.h" #endif -#include +#include "core.h" #include "imp.h" #include "fileio.h" diff --git a/src/openocd.c b/src/openocd.c index e500ba60..8cb86746 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include -- 2.39.5