diff options
author | Zachary T Welch <zw@superlucidity.net> | 2009-11-12 21:19:41 -0800 |
---|---|---|
committer | Zachary T Welch <zw@superlucidity.net> | 2009-11-12 22:25:55 -0800 |
commit | e8e94ab2454566fb9a226693e5c1de2264634a48 (patch) | |
tree | 2a442d8b343a18cfd2da98826943de74b4a6b02e /src/flash/nand.h | |
parent | d47764ff7176b6e3d97b49e82d4db7fe17c8e552 (diff) |
nand: rename device to nand
To be more informative (and consistent with flash and pld trees), change
'device' parameter name to 'nand' in NAND source files. This change
eliminates confusing 'device->device->' instance from the code, and
it simplifies the forthcoming command handler patches.
Diffstat (limited to 'src/flash/nand.h')
-rw-r--r-- | src/flash/nand.h | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/flash/nand.h b/src/flash/nand.h index 5b19d5a9..d96e2889 100644 --- a/src/flash/nand.h +++ b/src/flash/nand.h @@ -32,20 +32,20 @@ struct nand_device_s; typedef struct nand_flash_controller_s { char *name; - int (*nand_device_command)(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct nand_device_s *device); + int (*nand_device_command)(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct nand_device_s *nand); int (*register_commands)(struct command_context_s *cmd_ctx); - int (*init)(struct nand_device_s *device); - int (*reset)(struct nand_device_s *device); - int (*command)(struct nand_device_s *device, uint8_t command); - int (*address)(struct nand_device_s *device, uint8_t address); - int (*write_data)(struct nand_device_s *device, uint16_t data); - int (*read_data)(struct nand_device_s *device, void *data); - int (*write_block_data)(struct nand_device_s *device, uint8_t *data, int size); - int (*read_block_data)(struct nand_device_s *device, uint8_t *data, int size); - int (*write_page)(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size); - int (*read_page)(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size); - int (*controller_ready)(struct nand_device_s *device, int timeout); - int (*nand_ready)(struct nand_device_s *device, int timeout); + int (*init)(struct nand_device_s *nand); + int (*reset)(struct nand_device_s *nand); + int (*command)(struct nand_device_s *nand, uint8_t command); + int (*address)(struct nand_device_s *nand, uint8_t address); + int (*write_data)(struct nand_device_s *nand, uint16_t data); + int (*read_data)(struct nand_device_s *nand, void *data); + int (*write_block_data)(struct nand_device_s *nand, uint8_t *data, int size); + int (*read_block_data)(struct nand_device_s *nand, uint8_t *data, int size); + int (*write_page)(struct nand_device_s *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size); + 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 @@ -209,16 +209,16 @@ enum oob_formats nand_device_t *get_nand_device_by_num(int num); -int nand_read_page_raw(struct nand_device_s *device, uint32_t page, +int nand_read_page_raw(struct nand_device_s *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_s *device, uint32_t page, +int nand_write_page_raw(struct nand_device_s *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size); -int nand_read_status(struct nand_device_s *device, uint8_t *status); +int nand_read_status(struct nand_device_s *nand, uint8_t *status); -int nand_calculate_ecc(struct nand_device_s *device, +int nand_calculate_ecc(struct nand_device_s *nand, const uint8_t *dat, uint8_t *ecc_code); -int nand_calculate_ecc_kw(struct nand_device_s *device, +int nand_calculate_ecc_kw(struct nand_device_s *nand, const uint8_t *dat, uint8_t *ecc_code); int nand_register_commands(struct command_context_s *cmd_ctx); @@ -226,7 +226,7 @@ int nand_init(struct command_context_s *cmd_ctx); /// helper for parsing a nand device command argument string int nand_command_get_device_by_num(struct command_context_s *cmd_ctx, - const char *str, nand_device_t **device); + const char *str, nand_device_t **nand); #define ERROR_NAND_DEVICE_INVALID (-1100) |