rename flash and nand command helpers

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

diff --git a/src/flash/orion_nand.c b/src/flash/orion_nand.c
index 82c717ac36614b2502fb3b473efba693de27fdf7..c8fc96988421fdaf7847f609f478e2503ea3e43f 100644 (file)
--- a/src/flash/orion_nand.c
+++ b/src/flash/orion_nand.c
@@ -32,7 +32,7 @@
 
 struct orion_nand_controller
 {
-       struct target_s *target;
+       struct target   *target;
 
        struct arm_nand_data    io;
 
@@ -49,54 +49,54 @@ struct orion_nand_controller
                } \
        } while (0)
 
-static int orion_nand_command(struct nand_device_s *nand, uint8_t command)
+static int orion_nand_command(struct nand_device *nand, uint8_t command)
 {
        struct orion_nand_controller *hw = nand->controller_priv;
-       target_t *target = hw->target;
+       struct target *target = hw->target;
 
        CHECK_HALTED;
        target_write_u8(target, hw->cmd, command);
        return ERROR_OK;
 }
 
-static int orion_nand_address(struct nand_device_s *nand, uint8_t address)
+static int orion_nand_address(struct nand_device *nand, uint8_t address)
 {
        struct orion_nand_controller *hw = nand->controller_priv;
-       target_t *target = hw->target;
+       struct target *target = hw->target;
 
        CHECK_HALTED;
        target_write_u8(target, hw->addr, address);
        return ERROR_OK;
 }
 
-static int orion_nand_read(struct nand_device_s *nand, void *data)
+static int orion_nand_read(struct nand_device *nand, void *data)
 {
        struct orion_nand_controller *hw = nand->controller_priv;
-       target_t *target = hw->target;
+       struct target *target = hw->target;
 
        CHECK_HALTED;
        target_read_u8(target, hw->data, data);
        return ERROR_OK;
 }
 
-static int orion_nand_write(struct nand_device_s *nand, uint16_t data)
+static int orion_nand_write(struct nand_device *nand, uint16_t data)
 {
        struct orion_nand_controller *hw = nand->controller_priv;
-       target_t *target = hw->target;
+       struct target *target = hw->target;
 
        CHECK_HALTED;
        target_write_u8(target, hw->data, data);
        return ERROR_OK;
 }
 
-static int orion_nand_slow_block_write(struct nand_device_s *nand, uint8_t *data, int size)
+static int orion_nand_slow_block_write(struct nand_device *nand, uint8_t *data, int size)
 {
        while (size--)
                orion_nand_write(nand, *data++);
        return ERROR_OK;
 }
 
-static int orion_nand_fast_block_write(struct nand_device_s *nand, uint8_t *data, int size)
+static int orion_nand_fast_block_write(struct nand_device *nand, uint8_t *data, int size)
 {
        struct orion_nand_controller *hw = nand->controller_priv;
        int retval;
@@ -110,17 +110,17 @@ static int orion_nand_fast_block_write(struct nand_device_s *nand, uint8_t *data
        return retval;
 }
 
-static int orion_nand_reset(struct nand_device_s *nand)
+static int orion_nand_reset(struct nand_device *nand)
 {
        return orion_nand_command(nand, NAND_CMD_RESET);
 }
 
-static int orion_nand_controller_ready(struct nand_device_s *nand, int timeout)
+static int orion_nand_controller_ready(struct nand_device *nand, int timeout)
 {
        return 1;
 }
 
-static int orion_nand_register_commands(struct command_context_s *cmd_ctx)
+static int orion_nand_register_commands(struct command_context *cmd_ctx)
 {
        return ERROR_OK;
 }
@@ -131,7 +131,7 @@ NAND_DEVICE_COMMAND_HANDLER(orion_nand_device_command)
        uint32_t base;
        uint8_t ale, cle;
 
-       if (argc != 3) {
+       if (CMD_ARGC != 3) {
                LOG_ERROR("arguments must be: <target_id> <NAND_address>\n");
                return ERROR_NAND_DEVICE_INVALID;
        }
@@ -143,14 +143,14 @@ NAND_DEVICE_COMMAND_HANDLER(orion_nand_device_command)
        }
 
        nand->controller_priv = hw;
-       hw->target = get_target(args[1]);
+       hw->target = get_target(CMD_ARGV[1]);
        if (!hw->target) {
-               LOG_ERROR("target '%s' not defined", args[1]);
+               LOG_ERROR("target '%s' not defined", CMD_ARGV[1]);
                free(hw);
                return ERROR_NAND_DEVICE_INVALID;
        }
 
-       COMMAND_PARSE_NUMBER(u32, args[2], base);
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], base);
        cle = 0;
        ale = 1;
 
@@ -164,7 +164,7 @@ NAND_DEVICE_COMMAND_HANDLER(orion_nand_device_command)
        return ERROR_OK;
 }
 
-static int orion_nand_init(struct nand_device_s *nand)
+static int orion_nand_init(struct nand_device *nand)
 {
        return ERROR_OK;
 }