flash: fix at91sam3/4 driver typos

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

diff --git a/src/flash/nand/orion.c b/src/flash/nand/orion.c
index b46ffaed1fb8a9bf3baeee8608f995d5301c2c92..52c5a5d1dd6e1be8865c0eedfe4723e1d72f4e8a 100644 (file)
--- a/src/flash/nand/orion.c
+++ b/src/flash/nand/orion.c
@@ -30,11 +30,7 @@
 #include "arm_io.h"
 #include <target/arm.h>
 
-
-struct orion_nand_controller
-{
-       struct target   *target;
-
+struct orion_nand_controller {
        struct arm_nand_data    io;
 
        uint32_t                cmd;
@@ -53,7 +49,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 +59,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 +69,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 +79,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);
@@ -116,35 +112,22 @@ 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 *nand, int timeout)
-{
-       return 1;
-}
-
 NAND_DEVICE_COMMAND_HANDLER(orion_nand_device_command)
 {
        struct orion_nand_controller *hw;
        uint32_t base;
        uint8_t ale, cle;
 
-       if (CMD_ARGC != 3) {
-               LOG_ERROR("arguments must be: <target_id> <NAND_address>\n");
-               return ERROR_NAND_DEVICE_INVALID;
-       }
+       if (CMD_ARGC != 3)
+               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;
@@ -154,7 +137,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;
 
@@ -166,17 +149,15 @@ static int orion_nand_init(struct nand_device *nand)
        return ERROR_OK;
 }
 
-struct nand_flash_controller orion_nand_controller =
-{
-       .name                   = "orion",
-       .command                = orion_nand_command,
-       .address                = orion_nand_address,
-       .read_data              = orion_nand_read,
-       .write_data             = orion_nand_write,
-       .write_block_data       = orion_nand_fast_block_write,
-       .reset                  = orion_nand_reset,
-       .controller_ready       = orion_nand_controller_ready,
-       .nand_device_command    = orion_nand_device_command,
-       .init                   = orion_nand_init,
+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,
+       .write_data = orion_nand_write,
+       .write_block_data = orion_nand_fast_block_write,
+       .reset = orion_nand_reset,
+       .nand_device_command = orion_nand_device_command,
+       .init = orion_nand_init,
 };
-