X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnand%2Fcore.h;h=8a76d487bdcd50047c5d45a2d26e7e3f260a94e5;hp=b8dc01c76c49dd722676fae6f115df5051976f87;hb=a17907d1067be45bd2aa4cc9bd108eccaf2e4df2;hpb=899c9975e750ff0144d4a4f63e0f2a619c0b0e58

diff --git a/src/flash/nand/core.h b/src/flash/nand/core.h
index b8dc01c76c..8a76d487bd 100644
--- a/src/flash/nand/core.h
+++ b/src/flash/nand/core.h
@@ -59,7 +59,8 @@ struct nand_ecclayout {
 
 struct nand_device
 {
-	char *name;
+	const char *name;
+	struct target *target;
 	struct nand_flash_controller *controller;
 	void *controller_priv;
 	struct nand_manufacturer *manufacturer;
@@ -91,17 +92,18 @@ enum
 struct nand_manufacturer
 {
 	int id;
-	char *name;
+	const char *name;
 };
 
 struct nand_info
 {
-	char *name;
+	int mfr_id;
 	int id;
 	int page_size;
 	int chip_size;
 	int erase_size;
 	int options;
+	const char *name;
 };
 
 /* Option constants for bizarre disfunctionality and real features
@@ -197,20 +199,17 @@ enum oob_formats
 };
 
 
-/**
- * Returns the flash bank specified by @a name, which matches the
- * driver name and a suffix (option) specify the driver-specific
- * bank number. The suffix consists of the '.' and the driver-specific
- * bank number: when two davinci banks are defined, then 'davinci.1' refers
- * to the second (e.g. DM355EVM).
- */
-struct nand_device *get_nand_device_by_name(const char *name);
-
 struct nand_device *get_nand_device_by_num(int num);
 
 int nand_page_command(struct nand_device *nand, uint32_t page,
 		uint8_t cmd, bool oob_only);
 
+int nand_read_data_page(struct nand_device *nand, uint8_t *data, uint32_t size);
+int nand_write_data_page(struct nand_device *nand,
+		uint8_t *data, uint32_t size);
+
+int nand_write_finish(struct nand_device *nand);
+
 int nand_read_page_raw(struct nand_device *nand, uint32_t page,
 		uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size);
 int nand_write_page_raw(struct nand_device *nand, uint32_t page,
@@ -224,7 +223,6 @@ int nand_calculate_ecc_kw(struct nand_device *nand,
 		const uint8_t *dat, uint8_t *ecc_code);
 
 int nand_register_commands(struct command_context *cmd_ctx);
-int nand_init(struct command_context *cmd_ctx);
 
 /// helper for parsing a nand device command argument string
 COMMAND_HELPER(nand_command_get_device, unsigned name_index,