Reorganize NAND flash table

[openocd.git] / src / flash / nand / core.h

diff --git a/src/flash/nand/core.h b/src/flash/nand/core.h
index d2d157151327b07625e322c64c43b12028148e5a..8a76d487bdcd50047c5d45a2d26e7e3f260a94e5 100644 (file)
--- 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,15 +199,6 @@ 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,
@@ -230,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,