X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Flpc3180_nand_controller.c;h=4a15e3645625c6f9c22ab3ee5618460b8271d999;hp=016fa70cbf5c82d45c75eed939d6733782ba4fec;hb=2f6e56e38320350bb300b363d0b3737fa8d1f3ea;hpb=86053523875d18151f3dd0b53bf30e07eec2acf2 diff --git a/src/flash/lpc3180_nand_controller.c b/src/flash/lpc3180_nand_controller.c index 016fa70cbf..4a15e36456 100644 --- a/src/flash/lpc3180_nand_controller.c +++ b/src/flash/lpc3180_nand_controller.c @@ -24,8 +24,8 @@ #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 */ @@ -37,7 +37,7 @@ NAND_DEVICE_COMMAND_HANDLER(lpc3180_nand_device_command) return ERROR_FLASH_BANK_INVALID; } - target_t *target = get_target(args[1]); + struct target *target = get_target(args[1]); if (NULL == target) { LOG_ERROR("target '%s' not defined", args[1]); @@ -96,7 +96,7 @@ static int lpc3180_pll(int fclkin, uint32_t pll_ctrl) static float lpc3180_cycle_time(struct lpc3180_nand_controller *lpc3180_info) { - target_t *target = lpc3180_info->target; + struct target *target = lpc3180_info->target; uint32_t sysclk_ctrl, pwr_ctrl, hclkdiv_ctrl, hclkpll_ctrl; int sysclk; int hclk; @@ -144,10 +144,10 @@ 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; - target_t *target = lpc3180_info->target; + struct target *target = lpc3180_info->target; int bus_width = nand->bus_width ? : 8; int address_cycles = nand->address_cycles ? : 3; int page_size = nand->page_size ? : 512; @@ -274,10 +274,10 @@ 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; - target_t *target = lpc3180_info->target; + struct target *target = lpc3180_info->target; if (target->state != TARGET_HALTED) { @@ -316,10 +316,10 @@ 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; - target_t *target = lpc3180_info->target; + struct target *target = lpc3180_info->target; if (target->state != TARGET_HALTED) { @@ -346,10 +346,10 @@ 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; - target_t *target = lpc3180_info->target; + struct target *target = lpc3180_info->target; if (target->state != TARGET_HALTED) { @@ -376,10 +376,10 @@ 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; - target_t *target = lpc3180_info->target; + struct target *target = lpc3180_info->target; if (target->state != TARGET_HALTED) { @@ -406,10 +406,10 @@ 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; - target_t *target = lpc3180_info->target; + struct target *target = lpc3180_info->target; if (target->state != TARGET_HALTED) { @@ -468,10 +468,10 @@ 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; - target_t *target = lpc3180_info->target; + struct target *target = lpc3180_info->target; int retval; uint8_t status; @@ -607,10 +607,10 @@ 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; - target_t *target = lpc3180_info->target; + struct target *target = lpc3180_info->target; if (target->state != TARGET_HALTED) { @@ -754,10 +754,10 @@ 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; - target_t *target = lpc3180_info->target; + struct target *target = lpc3180_info->target; uint8_t status = 0x0; if (target->state != TARGET_HALTED) @@ -788,10 +788,10 @@ 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; - target_t *target = lpc3180_info->target; + struct target *target = lpc3180_info->target; if (target->state != TARGET_HALTED) { @@ -843,7 +843,7 @@ COMMAND_HANDLER(handle_lpc3180_select_command) 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]);