remove unused aduc702x structure.

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

diff --git a/src/flash/nand.h b/src/flash/nand.h
index d96e288939750270fd36620c91a60a6fcce48def..c6d4075187a4f3176dd15b27687c0257a1ce569a 100644 (file)
--- a/src/flash/nand.h
+++ b/src/flash/nand.h
@@ -29,10 +29,13 @@
 
 struct nand_device_s;
 
-typedef struct nand_flash_controller_s
+#define __NAND_DEVICE_COMMAND(name) \
+               COMMAND_HELPER(name, struct nand_device_s *nand)
+
+struct nand_flash_controller
 {
        char *name;
-       int (*nand_device_command)(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct nand_device_s *nand);
+       __NAND_DEVICE_COMMAND((*nand_device_command));
        int (*register_commands)(struct command_context_s *cmd_ctx);
        int (*init)(struct nand_device_s *nand);
        int (*reset)(struct nand_device_s *nand);
@@ -46,41 +49,43 @@ typedef struct nand_flash_controller_s
        int (*read_page)(struct nand_device_s *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size);
        int (*controller_ready)(struct nand_device_s *nand, int timeout);
        int (*nand_ready)(struct nand_device_s *nand, int timeout);
-} nand_flash_controller_t;
+};
 
-typedef struct nand_block_s
+#define NAND_DEVICE_COMMAND_HANDLER(name) static __NAND_DEVICE_COMMAND(name)
+
+struct nand_block
 {
        uint32_t offset;
        uint32_t size;
        int is_erased;
        int is_bad;
-} nand_block_t;
+};
 
 struct nand_oobfree {
        int offset;
        int length;
 };
 
-typedef struct nand_ecclayout_s {
+struct nand_ecclayout {
        int eccbytes;
        int eccpos[64];
        int oobavail;
        struct nand_oobfree oobfree[2];
-} nand_ecclayout_t;
+};
 
 typedef struct nand_device_s
 {
-       nand_flash_controller_t *controller;
+       struct nand_flash_controller *controller;
        void *controller_priv;
-       struct nand_manufacturer_s *manufacturer;
-       struct nand_info_s *device;
+       struct nand_manufacturer *manufacturer;
+       struct nand_info *device;
        int bus_width;
        int address_cycles;
        int page_size;
        int erase_size;
        int use_raw;
        int num_blocks;
-       nand_block_t *blocks;
+       struct nand_block *blocks;
        struct nand_device_s *next;
 } nand_device_t;
 
@@ -98,13 +103,13 @@ enum
        NAND_MFR_MICRON = 0x2c,
 };
 
-typedef struct nand_manufacturer_s
+struct nand_manufacturer
 {
        int id;
        char *name;
-} nand_manufacturer_t;
+};
 
-typedef struct nand_info_s
+struct nand_info
 {
        char *name;
        int id;
@@ -112,7 +117,7 @@ typedef struct nand_info_s
        int chip_size;
        int erase_size;
        int options;
-} nand_info_t;
+};
 
 /* Option constants for bizarre disfunctionality and real features
  */