nand_device_t -> struct nand_device

[openocd.git] / src / flash / mx3_nand.c

diff --git a/src/flash/mx3_nand.c b/src/flash/mx3_nand.c
index 07a360f6ceca6c7c44ea54c928399e9a76296acc..6c699179ec461d41a24da2416e549b31c96f55b2 100644 (file)
--- a/src/flash/mx3_nand.c
+++ b/src/flash/mx3_nand.c
@@ -49,17 +49,17 @@ unsigned char sign_of_sequental_byte_read;
 
 static int test_iomux_settings (struct target * target, uint32_t value,
                                uint32_t mask, const char *text);
-static int initialize_nf_controller (struct nand_device_s *nand);
+static int initialize_nf_controller (struct nand_device *nand);
 static int get_next_byte_from_sram_buffer (struct target * target, uint8_t * value);
 static int get_next_halfword_from_sram_buffer (struct target * target,
                                               uint16_t * value);
 static int poll_for_complete_op (struct target * target, const char *text);
-static int validate_target_state (struct nand_device_s *nand);
-static int do_data_output (struct nand_device_s *nand);
+static int validate_target_state (struct nand_device *nand);
+static int do_data_output (struct nand_device *nand);
 
-static int imx31_command (struct nand_device_s *nand, uint8_t command);
-static int imx31_address (struct nand_device_s *nand, uint8_t address);
-static int imx31_controller_ready (struct nand_device_s *nand, int tout);
+static int imx31_command (struct nand_device *nand, uint8_t command);
+static int imx31_address (struct nand_device *nand, uint8_t address);
+static int imx31_controller_ready (struct nand_device *nand, int tout);
 
 NAND_DEVICE_COMMAND_HANDLER(imx31_nand_device_command)
 {
@@ -121,7 +121,7 @@ NAND_DEVICE_COMMAND_HANDLER(imx31_nand_device_command)
        return ERROR_OK;
 }
 
-static int imx31_init (struct nand_device_s *nand)
+static int imx31_init (struct nand_device *nand)
 {
        struct mx3_nf_controller *mx3_nf_info = nand->controller_priv;
        struct target *target = mx3_nf_info->target;
@@ -264,7 +264,7 @@ static int imx31_init (struct nand_device_s *nand)
        return ERROR_OK;
 }
 
-static int imx31_read_data (struct nand_device_s *nand, void *data)
+static int imx31_read_data (struct nand_device *nand, void *data)
 {
        struct mx3_nf_controller *mx3_nf_info = nand->controller_priv;
        struct target *target = mx3_nf_info->target;
@@ -304,13 +304,13 @@ static int imx31_read_data (struct nand_device_s *nand, void *data)
        return ERROR_OK;
 }
 
-static int imx31_write_data (struct nand_device_s *nand, uint16_t data)
+static int imx31_write_data (struct nand_device *nand, uint16_t data)
 {
        LOG_ERROR ("write_data() not implemented");
        return ERROR_NAND_OPERATION_FAILED;
 }
 
-static int imx31_nand_ready (struct nand_device_s *nand, int timeout)
+static int imx31_nand_ready (struct nand_device *nand, int timeout)
 {
        return imx31_controller_ready (nand, timeout);
 }
@@ -320,7 +320,7 @@ static int imx31_register_commands (struct command_context_s *cmd_ctx)
        return ERROR_OK;
 }
 
-static int imx31_reset (struct nand_device_s *nand)
+static int imx31_reset (struct nand_device *nand)
 {
        /*
        * validate target state
@@ -335,7 +335,7 @@ static int imx31_reset (struct nand_device_s *nand)
        return ERROR_OK;
 }
 
-static int imx31_command (struct nand_device_s *nand, uint8_t command)
+static int imx31_command (struct nand_device *nand, uint8_t command)
 {
        struct mx3_nf_controller *mx3_nf_info = nand->controller_priv;
        struct target *target = mx3_nf_info->target;
@@ -409,7 +409,7 @@ static int imx31_command (struct nand_device_s *nand, uint8_t command)
        return ERROR_OK;
 }
 
-static int imx31_address (struct nand_device_s *nand, uint8_t address)
+static int imx31_address (struct nand_device *nand, uint8_t address)
 {
        struct mx3_nf_controller *mx3_nf_info = nand->controller_priv;
        struct target *target = mx3_nf_info->target;
@@ -441,7 +441,7 @@ static int imx31_address (struct nand_device_s *nand, uint8_t address)
        return ERROR_OK;
 }
 
-static int imx31_controller_ready (struct nand_device_s *nand, int tout)
+static int imx31_controller_ready (struct nand_device *nand, int tout)
 {
        uint16_t poll_complete_status;
        struct mx3_nf_controller *mx3_nf_info = nand->controller_priv;
@@ -472,7 +472,7 @@ static int imx31_controller_ready (struct nand_device_s *nand, int tout)
        return tout;
 }
 
-static int imx31_write_page (struct nand_device_s *nand, uint32_t page,
+static int imx31_write_page (struct nand_device *nand, uint32_t page,
                             uint8_t * data, uint32_t data_size, uint8_t * oob,
                             uint32_t oob_size)
 {
@@ -579,7 +579,7 @@ static int imx31_write_page (struct nand_device_s *nand, uint32_t page,
        return ERROR_OK;
 }
 
-static int imx31_read_page (struct nand_device_s *nand, uint32_t page,
+static int imx31_read_page (struct nand_device *nand, uint32_t page,
                            uint8_t * data, uint32_t data_size, uint8_t * oob,
                            uint32_t oob_size)
 {
@@ -656,7 +656,7 @@ static int test_iomux_settings (struct target * target, uint32_t address,
        return ERROR_OK;
 }
 
-static int initialize_nf_controller (struct nand_device_s *nand)
+static int initialize_nf_controller (struct nand_device *nand)
 {
        struct mx3_nf_controller *mx3_nf_info = nand->controller_priv;
        struct target *target = mx3_nf_info->target;
@@ -784,7 +784,7 @@ static int poll_for_complete_op (struct target * target, const char *text)
        return ERROR_OK;
 }
 
-static int validate_target_state (struct nand_device_s *nand)
+static int validate_target_state (struct nand_device *nand)
 {
        struct mx3_nf_controller *mx3_nf_info = nand->controller_priv;
        struct target *target = mx3_nf_info->target;
@@ -806,7 +806,7 @@ static int validate_target_state (struct nand_device_s *nand)
        return ERROR_OK;
 }
 
-static int do_data_output (struct nand_device_s *nand)
+static int do_data_output (struct nand_device *nand)
 {
        struct mx3_nf_controller *mx3_nf_info = nand->controller_priv;
        struct target *target = mx3_nf_info->target;