imi415
/
openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>.
This commit is contained in:
Zachary T Welch 2009-12-04 22:04:37 -08:00
parent da3bcb392e
commit 899c9975e7
20 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/flash/Makefile.am
View File

@ -17,8 +17,7 @@ libflash_la_LIBADD = \
noinst_HEADERS = \
common.h \
mflash.h \
nand.h
mflash.h
EXTRA_DIST = startup.tcl

1
src/flash/nand/Makefile.am
View File

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

3
src/flash/nand/arm_io.c
View File

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

3
src/flash/nand/arm_io.h
View File

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

2
src/flash/nand/core.c
View File

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

15
src/flash/nand.h → src/flash/nand/core.h
View File

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

3
src/flash/nand/davinci.c
View File

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

2
src/flash/nand/driver.c
View File

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

2
src/flash/nand/ecc.c
View File

@ -41,7 +41,7 @@
#include "config.h"
#endif
#include <flash/nand.h>
#include "core.h"
/*
* Pre-calculated 256-way 1 byte column parity

2
src/flash/nand/ecc_kw.c
View File

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

2
src/flash/nand/fileio.c
View File

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

3
src/flash/nand/imp.h
View File

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

4
src/flash/nand/lpc3180.c
View File

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

2
src/flash/nand/mx3.c
View File

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

1
src/flash/nand/mx3.h
View File

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

3
src/flash/nand/nonce.c
View File

@ -20,7 +20,8 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <flash/nand.h>
#include "imp.h"
#include "hello.h"

1
src/flash/nand/orion.c
View File

@ -26,6 +26,7 @@
#include "config.h"
#endif
#include "imp.h"
#include "arm_io.h"
#include <target/armv4_5.h>

5
src/flash/nand/s3c24xx.h
View File

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

2
src/flash/nand/tcl.c
View File

@ -24,7 +24,7 @@
#include "config.h"
#endif
#include <flash/nand.h>
#include "core.h"
#include "imp.h"
#include "fileio.h"

2
src/openocd.c
View File

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