X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Flpc3180_nand_controller.c;h=d7cbe388318ce2b4c77731531c67da7b3efeb293;hp=e4b0475fbea5bdcd051d09c201b56ac7c4370184;hb=7bf1a86e473a12882bf6f71cb4d0d416394b69d4;hpb=0f1163e823c6ca3c2a81fa296157f5dde0635fea diff --git a/src/flash/lpc3180_nand_controller.c b/src/flash/lpc3180_nand_controller.c index e4b0475fbe..d7cbe38831 100644 --- a/src/flash/lpc3180_nand_controller.c +++ b/src/flash/lpc3180_nand_controller.c @@ -24,14 +24,14 @@ #include "lpc3180_nand_controller.h" #include "nand.h" -static int lpc3180_reset(struct nand_device_s *nand); -static int lpc3180_controller_ready(struct nand_device_s *nand, int timeout); +static int lpc3180_reset(struct nand_device *nand); +static int lpc3180_controller_ready(struct nand_device *nand, int timeout); /* nand device lpc3180 */ NAND_DEVICE_COMMAND_HANDLER(lpc3180_nand_device_command) { - if (argc < 3) + if (CMD_ARGC < 3) { LOG_WARNING("incomplete 'lpc3180' nand flash configuration"); return ERROR_FLASH_BANK_INVALID; @@ -144,7 +144,7 @@ static float lpc3180_cycle_time(struct lpc3180_nand_controller *lpc3180_info) return cycle; } -static int lpc3180_init(struct nand_device_s *nand) +static int lpc3180_init(struct nand_device *nand) { struct lpc3180_nand_controller *lpc3180_info = nand->controller_priv; struct target *target = lpc3180_info->target; @@ -274,7 +274,7 @@ static int lpc3180_init(struct nand_device_s *nand) return ERROR_OK; } -static int lpc3180_reset(struct nand_device_s *nand) +static int lpc3180_reset(struct nand_device *nand) { struct lpc3180_nand_controller *lpc3180_info = nand->controller_priv; struct target *target = lpc3180_info->target; @@ -316,7 +316,7 @@ static int lpc3180_reset(struct nand_device_s *nand) return ERROR_OK; } -static int lpc3180_command(struct nand_device_s *nand, uint8_t command) +static int lpc3180_command(struct nand_device *nand, uint8_t command) { struct lpc3180_nand_controller *lpc3180_info = nand->controller_priv; struct target *target = lpc3180_info->target; @@ -346,7 +346,7 @@ static int lpc3180_command(struct nand_device_s *nand, uint8_t command) return ERROR_OK; } -static int lpc3180_address(struct nand_device_s *nand, uint8_t address) +static int lpc3180_address(struct nand_device *nand, uint8_t address) { struct lpc3180_nand_controller *lpc3180_info = nand->controller_priv; struct target *target = lpc3180_info->target; @@ -376,7 +376,7 @@ static int lpc3180_address(struct nand_device_s *nand, uint8_t address) return ERROR_OK; } -static int lpc3180_write_data(struct nand_device_s *nand, uint16_t data) +static int lpc3180_write_data(struct nand_device *nand, uint16_t data) { struct lpc3180_nand_controller *lpc3180_info = nand->controller_priv; struct target *target = lpc3180_info->target; @@ -406,7 +406,7 @@ static int lpc3180_write_data(struct nand_device_s *nand, uint16_t data) return ERROR_OK; } -static int lpc3180_read_data(struct nand_device_s *nand, void *data) +static int lpc3180_read_data(struct nand_device *nand, void *data) { struct lpc3180_nand_controller *lpc3180_info = nand->controller_priv; struct target *target = lpc3180_info->target; @@ -468,7 +468,7 @@ static int lpc3180_read_data(struct nand_device_s *nand, void *data) return ERROR_OK; } -static int lpc3180_write_page(struct nand_device_s *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size) +static int lpc3180_write_page(struct nand_device *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size) { struct lpc3180_nand_controller *lpc3180_info = nand->controller_priv; struct target *target = lpc3180_info->target; @@ -607,7 +607,7 @@ static int lpc3180_write_page(struct nand_device_s *nand, uint32_t page, uint8_t return ERROR_OK; } -static int lpc3180_read_page(struct nand_device_s *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size) +static int lpc3180_read_page(struct nand_device *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size) { struct lpc3180_nand_controller *lpc3180_info = nand->controller_priv; struct target *target = lpc3180_info->target; @@ -754,7 +754,7 @@ static int lpc3180_read_page(struct nand_device_s *nand, uint32_t page, uint8_t return ERROR_OK; } -static int lpc3180_controller_ready(struct nand_device_s *nand, int timeout) +static int lpc3180_controller_ready(struct nand_device *nand, int timeout) { struct lpc3180_nand_controller *lpc3180_info = nand->controller_priv; struct target *target = lpc3180_info->target; @@ -788,7 +788,7 @@ static int lpc3180_controller_ready(struct nand_device_s *nand, int timeout) return 0; } -static int lpc3180_nand_ready(struct nand_device_s *nand, int timeout) +static int lpc3180_nand_ready(struct nand_device *nand, int timeout) { struct lpc3180_nand_controller *lpc3180_info = nand->controller_priv; struct target *target = lpc3180_info->target; @@ -836,14 +836,14 @@ COMMAND_HANDLER(handle_lpc3180_select_command) "no", "mlc", "slc" }; - if ((argc < 1) || (argc > 2)) + if ((CMD_ARGC < 1) || (CMD_ARGC > 2)) { return ERROR_COMMAND_SYNTAX_ERROR; } unsigned num; COMMAND_PARSE_NUMBER(uint, args[1], num); - nand_device_t *nand = get_nand_device_by_num(num); + struct nand_device *nand = get_nand_device_by_num(num); if (!nand) { command_print(cmd_ctx, "nand device '#%s' is out of bounds", args[0]); @@ -852,7 +852,7 @@ COMMAND_HANDLER(handle_lpc3180_select_command) lpc3180_info = nand->controller_priv; - if (argc == 2) + if (CMD_ARGC == 2) { if (strcmp(args[1], "mlc") == 0) { @@ -873,9 +873,9 @@ COMMAND_HANDLER(handle_lpc3180_select_command) return ERROR_OK; } -static int lpc3180_register_commands(struct command_context_s *cmd_ctx) +static int lpc3180_register_commands(struct command_context *cmd_ctx) { - command_t *lpc3180_cmd = register_command(cmd_ctx, NULL, "lpc3180", NULL, COMMAND_ANY, "commands specific to the LPC3180 NAND flash controllers"); + struct command *lpc3180_cmd = register_command(cmd_ctx, NULL, "lpc3180", NULL, COMMAND_ANY, "commands specific to the LPC3180 NAND flash controllers"); register_command(cmd_ctx, lpc3180_cmd, "select", handle_lpc3180_select_command, COMMAND_EXEC, "select <'mlc'|'slc'> controller (default is mlc)");