Remove whitespace that occurs after '('.

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

diff --git a/src/flash/orion_nand.c b/src/flash/orion_nand.c
index fb5a34037d22f0647305472c76853baed588eaad..6b50f1fb9a421377d214781ad60c9161ef9a521c 100644 (file)
--- a/src/flash/orion_nand.c
+++ b/src/flash/orion_nand.c
@@ -36,9 +36,9 @@ typedef struct orion_nand_controller_s
        struct target_s *target;
        working_area_t *copy_area;
 
-       u32             cmd;
-       u32             addr;
-       u32             data;
+       uint32_t                cmd;
+       uint32_t                addr;
+       uint32_t                data;
 } orion_nand_controller_t;
 
 #define CHECK_HALTED \
@@ -49,7 +49,7 @@ typedef struct orion_nand_controller_s
                } \
        } while (0)
 
-static int orion_nand_command(struct nand_device_s *device, u8 command)
+static int orion_nand_command(struct nand_device_s *device, uint8_t command)
 {
        orion_nand_controller_t *hw = device->controller_priv;
        target_t *target = hw->target;
@@ -59,7 +59,7 @@ static int orion_nand_command(struct nand_device_s *device, u8 command)
        return ERROR_OK;
 }
 
-static int orion_nand_address(struct nand_device_s *device, u8 address)
+static int orion_nand_address(struct nand_device_s *device, uint8_t address)
 {
        orion_nand_controller_t *hw = device->controller_priv;
        target_t *target = hw->target;
@@ -79,7 +79,7 @@ static int orion_nand_read(struct nand_device_s *device, void *data)
        return ERROR_OK;
 }
 
-static int orion_nand_write(struct nand_device_s *device, u16 data)
+static int orion_nand_write(struct nand_device_s *device, uint16_t data)
 {
        orion_nand_controller_t *hw = device->controller_priv;
        target_t *target = hw->target;
@@ -89,23 +89,23 @@ static int orion_nand_write(struct nand_device_s *device, u16 data)
        return ERROR_OK;
 }
 
-static int orion_nand_slow_block_write(struct nand_device_s *device, u8 *data, int size)
+static int orion_nand_slow_block_write(struct nand_device_s *device, uint8_t *data, int size)
 {
        while (size--)
                orion_nand_write(device, *data++);
        return ERROR_OK;
 }
 
-static int orion_nand_fast_block_write(struct nand_device_s *device, u8 *data, int size)
+static int orion_nand_fast_block_write(struct nand_device_s *device, uint8_t *data, int size)
 {
        orion_nand_controller_t *hw = device->controller_priv;
        target_t *target = hw->target;
        armv4_5_algorithm_t algo;
        reg_param_t reg_params[3];
-       u32 target_buf;
+       uint32_t target_buf;
        int retval;
 
-       static const u32 code[] = {
+       static const uint32_t code[] = {
                0xe4d13001,     /* ldrb r3, [r1], #1    */
                0xe5c03000,     /* strb r3, [r0]        */
                0xe2522001,     /* subs r2, r2, #1      */
@@ -115,7 +115,7 @@ static int orion_nand_fast_block_write(struct nand_device_s *device, u8 *data, i
        int code_size = sizeof(code);
 
        if (!hw->copy_area) {
-               u8 code_buf[code_size];
+               uint8_t code_buf[code_size];
                int i;
 
                /* make sure we have a working area */
@@ -131,7 +131,7 @@ static int orion_nand_fast_block_write(struct nand_device_s *device, u8 *data, i
                        target_buffer_set_u32(target, code_buf + i*4, code[i]);
 
                /* write code to working area */
-                retval = target->type->write_memory(target,
+                retval = target_write_memory(target,
                                        hw->copy_area->address,
                                        4, code_size/4, code_buf);
                if (retval != ERROR_OK)
@@ -140,10 +140,9 @@ static int orion_nand_fast_block_write(struct nand_device_s *device, u8 *data, i
 
        /* copy data to target's memory */
        target_buf = hw->copy_area->address + code_size;
-       retval = target->type->bulk_write_memory(target, target_buf,
-                                                size/4, data);
+       retval = target_bulk_write_memory(target, target_buf, size/4, data);
        if (retval == ERROR_OK && size & 3) {
-               retval = target->type->write_memory(target,
+               retval = target_write_memory(target,
                                        target_buf + (size & ~3),
                                        1, size & 3, data + (size & ~3));
        }
@@ -162,7 +161,7 @@ static int orion_nand_fast_block_write(struct nand_device_s *device, u8 *data, i
        buf_set_u32(reg_params[1].value, 0, 32, target_buf);
        buf_set_u32(reg_params[2].value, 0, 32, size);
 
-       retval = target->type->run_algorithm(target, 0, NULL, 3, reg_params,
+       retval = target_run_algorithm(target, 0, NULL, 3, reg_params,
                                        hw->copy_area->address,
                                        hw->copy_area->address + code_size - 4,
                                        1000, &algo);
@@ -195,8 +194,8 @@ int orion_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,
                              struct nand_device_s *device)
 {
        orion_nand_controller_t *hw;
-       u32 base;
-       u8 ale, cle;
+       uint32_t base;
+       uint8_t ale, cle;
 
        if (argc != 3) {
                LOG_ERROR("arguments must be: <target_number> <NAND_address>\n");
@@ -210,9 +209,9 @@ int orion_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,
        }
 
        device->controller_priv = hw;
-       hw->target = get_target_by_num(strtoul(args[1], NULL, 0));
+       hw->target = get_target(args[1]);
        if (!hw->target) {
-               LOG_ERROR("no target '%s' configured", args[1]);
+               LOG_ERROR("target '%s' not defined", args[1]);
                free(hw);
                return ERROR_NAND_DEVICE_INVALID;
        }