Change return value on error.

[fw/openocd] / src / flash / nand / orion.c

diff --git a/src/flash/nand/orion.c b/src/flash/nand/orion.c
index 3ab2364d64ff9ad2f06ec98ab23d4f7e8beedd50..e6a33eb680c7b35d9a699e73f51f07755abe4701 100644 (file)
--- a/src/flash/nand/orion.c
+++ b/src/flash/nand/orion.c
@@ -33,8 +33,6 @@
 
 struct orion_nand_controller
 {
-       struct target   *target;
-
        struct arm_nand_data    io;
 
        uint32_t                cmd;
@@ -53,7 +51,7 @@ struct orion_nand_controller
 static int orion_nand_command(struct nand_device *nand, uint8_t command)
 {
        struct orion_nand_controller *hw = nand->controller_priv;
-       struct target *target = hw->target;
+       struct target *target = nand->target;
 
        CHECK_HALTED;
        target_write_u8(target, hw->cmd, command);
@@ -63,7 +61,7 @@ static int orion_nand_command(struct nand_device *nand, uint8_t command)
 static int orion_nand_address(struct nand_device *nand, uint8_t address)
 {
        struct orion_nand_controller *hw = nand->controller_priv;
-       struct target *target = hw->target;
+       struct target *target = nand->target;
 
        CHECK_HALTED;
        target_write_u8(target, hw->addr, address);
@@ -73,7 +71,7 @@ static int orion_nand_address(struct nand_device *nand, uint8_t address)
 static int orion_nand_read(struct nand_device *nand, void *data)
 {
        struct orion_nand_controller *hw = nand->controller_priv;
-       struct target *target = hw->target;
+       struct target *target = nand->target;
 
        CHECK_HALTED;
        target_read_u8(target, hw->data, data);
@@ -83,7 +81,7 @@ static int orion_nand_read(struct nand_device *nand, void *data)
 static int orion_nand_write(struct nand_device *nand, uint16_t data)
 {
        struct orion_nand_controller *hw = nand->controller_priv;
-       struct target *target = hw->target;
+       struct target *target = nand->target;
 
        CHECK_HALTED;
        target_write_u8(target, hw->data, data);
@@ -123,23 +121,16 @@ NAND_DEVICE_COMMAND_HANDLER(orion_nand_device_command)
        uint8_t ale, cle;
 
        if (CMD_ARGC != 3) {
-               LOG_ERROR("arguments must be: <target_id> <NAND_address>\n");
-               return ERROR_NAND_DEVICE_INVALID;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        hw = calloc(1, sizeof(*hw));
        if (!hw) {
-               LOG_ERROR("no memory for nand controller\n");
+               LOG_ERROR("no memory for nand controller");
                return ERROR_NAND_DEVICE_INVALID;
        }
 
        nand->controller_priv = hw;
-       hw->target = get_target(CMD_ARGV[1]);
-       if (!hw->target) {
-               LOG_ERROR("target '%s' not defined", CMD_ARGV[1]);
-               free(hw);
-               return ERROR_NAND_DEVICE_INVALID;
-       }
 
        COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], base);
        cle = 0;
@@ -149,7 +140,7 @@ NAND_DEVICE_COMMAND_HANDLER(orion_nand_device_command)
        hw->cmd = base + (1 << cle);
        hw->addr = base + (1 << ale);
 
-       hw->io.target = hw->target;
+       hw->io.target = nand->target;
        hw->io.data = hw->data;
        hw->io.op = ARM_NAND_NONE;
 
@@ -164,6 +155,7 @@ static int orion_nand_init(struct nand_device *nand)
 struct nand_flash_controller orion_nand_controller =
 {
        .name                   = "orion",
+       .usage                  = "<target_id> <NAND_address>",
        .command                = orion_nand_command,
        .address                = orion_nand_address,
        .read_data              = orion_nand_read,