hla: Make consistent parameter naming61/1761/3
authorMathias K <kesmtp@freenet.de>
Thu, 24 Oct 2013 12:11:33 +0000 (24 14:11 +0200)
committerSpencer Oliver <spen@spen-soft.co.uk>
Thu, 7 Nov 2013 22:19:50 +0000 (7 22:19 +0000)
Rename fd to handle.

Change-Id: I98615aed1546976d00b0f20856d4e8e75f83c575
Signed-off-by: Mathias K <kesmtp@freenet.de>
Reviewed-on: http://openocd.zylin.com/1761
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
src/jtag/hla/hla_interface.c
src/jtag/hla/hla_interface.h
src/jtag/hla/hla_layout.c
src/jtag/hla/hla_layout.h
src/target/hla_target.c

index 9193133..81cac48 100644 (file)
@@ -72,7 +72,7 @@ int hl_interface_init_target(struct target *t)
         * can setup the private pointer in the tap structure
         * if the interface match the tap idcode
         */
-       res = hl_if.layout->api->idcode(hl_if.fd, &t->tap->idcode);
+       res = hl_if.layout->api->idcode(hl_if.handle, &t->tap->idcode);
 
        if (res != ERROR_OK)
                return res;
@@ -137,7 +137,7 @@ int hl_interface_init_reset(void)
         * we will attempt it again */
        if (hl_if.param.connect_under_reset) {
                jtag_add_reset(0, 1);
-               hl_if.layout->api->assert_srst(hl_if.fd, 0);
+               hl_if.layout->api->assert_srst(hl_if.handle, 0);
        } else {
                jtag_add_reset(0, 0);
        }
index fcf1d9e..13c169f 100644 (file)
@@ -58,7 +58,7 @@ struct hl_interface_s {
        /** */
        const struct hl_layout *layout;
        /** */
-       void *fd;
+       void *handle;
 };
 
 /** */
index 1d22fe1..0a20fbd 100644 (file)
@@ -41,9 +41,9 @@ static int hl_layout_open(struct hl_interface_s *adapter)
 
        LOG_DEBUG("hl_layout_open");
 
-       adapter->fd = NULL;
+       adapter->handle = NULL;
 
-       res = adapter->layout->api->open(&adapter->param, &adapter->fd);
+       res = adapter->layout->api->open(&adapter->param, &adapter->handle);
 
        if (res != ERROR_OK) {
                LOG_DEBUG("failed");
index ccc3a00..9a991b6 100644 (file)
@@ -35,25 +35,25 @@ extern struct hl_layout_api_s icdi_usb_layout_api;
 /** */
 struct hl_layout_api_s {
        /** */
-       int (*open) (struct hl_interface_param_s *param, void **fd);
+       int (*open) (struct hl_interface_param_s *param, void **handle);
        /** */
-       int (*close) (void *fd);
+       int (*close) (void *handle);
        /** */
-       int (*reset) (void *fd);
+       int (*reset) (void *handle);
        /** */
-       int (*assert_srst) (void *fd, int srst);
+       int (*assert_srst) (void *handle, int srst);
        /** */
-       int (*run) (void *fd);
+       int (*run) (void *handle);
        /** */
-       int (*halt) (void *fd);
+       int (*halt) (void *handle);
        /** */
-       int (*step) (void *fd);
+       int (*step) (void *handle);
        /** */
-       int (*read_regs) (void *fd);
+       int (*read_regs) (void *handle);
        /** */
-       int (*read_reg) (void *fd, int num, uint32_t *val);
+       int (*read_reg) (void *handle, int num, uint32_t *val);
        /** */
-       int (*write_reg) (void *fd, int num, uint32_t val);
+       int (*write_reg) (void *handle, int num, uint32_t val);
        /** */
        int (*read_mem) (void *handle, uint32_t addr, uint32_t size,
                        uint32_t count, uint8_t *buffer);
@@ -74,7 +74,7 @@ struct hl_layout_api_s {
         */
        int (*idcode) (void *handle, uint32_t *idcode);
        /** */
-       enum target_state (*state) (void *fd);
+       enum target_state (*state) (void *handle);
 };
 
 /** */
index 9034094..efc0313 100644 (file)
@@ -66,7 +66,7 @@ static int adapter_load_core_reg_u32(struct target *target,
        switch (num) {
        case 0 ... 18:
                /* read a normal core register */
-               retval = adapter->layout->api->read_reg(adapter->fd, num, value);
+               retval = adapter->layout->api->read_reg(adapter->handle, num, value);
 
                if (retval != ERROR_OK) {
                        LOG_ERROR("JTAG failure %i", retval);
@@ -114,7 +114,7 @@ static int adapter_load_core_reg_u32(struct target *target,
                 * in one Debug Core register.  So say r0 and r2 docs;
                 * it was removed from r1 docs, but still works.
                 */
-               retval = adapter->layout->api->read_reg(adapter->fd, 20, value);
+               retval = adapter->layout->api->read_reg(adapter->handle, 20, value);
                if (retval != ERROR_OK)
                        return retval;
 
@@ -163,7 +163,7 @@ static int adapter_store_core_reg_u32(struct target *target,
         */
        switch (num) {
        case 0 ... 18:
-               retval = adapter->layout->api->write_reg(adapter->fd, num, value);
+               retval = adapter->layout->api->write_reg(adapter->handle, num, value);
 
                if (retval != ERROR_OK) {
                        struct reg *r;
@@ -214,7 +214,7 @@ static int adapter_store_core_reg_u32(struct target *target,
                 * it was removed from r1 docs, but still works.
                 */
 
-               adapter->layout->api->read_reg(adapter->fd, 20, &reg);
+               adapter->layout->api->read_reg(adapter->handle, 20, &reg);
 
                switch (num) {
                case ARMV7M_PRIMASK:
@@ -234,7 +234,7 @@ static int adapter_store_core_reg_u32(struct target *target,
                        break;
                }
 
-               adapter->layout->api->write_reg(adapter->fd, 20, reg);
+               adapter->layout->api->write_reg(adapter->handle, 20, reg);
 
                LOG_DEBUG("write special reg %i value 0x%" PRIx32 " ", (int)num, value);
                break;
@@ -259,7 +259,7 @@ static int adapter_examine_debug_reason(struct target *target)
 static int hl_dcc_read(struct hl_interface_s *hl_if, uint8_t *value, uint8_t *ctrl)
 {
        uint16_t dcrdr;
-       int retval = hl_if->layout->api->read_mem(hl_if->fd,
+       int retval = hl_if->layout->api->read_mem(hl_if->handle,
                        DCB_DCRDR, 1, sizeof(dcrdr), (uint8_t *)&dcrdr);
        if (retval == ERROR_OK) {
            *ctrl = (uint8_t)dcrdr;
@@ -272,7 +272,7 @@ static int hl_dcc_read(struct hl_interface_s *hl_if, uint8_t *value, uint8_t *ct
                         * to signify we have read data */
                        /* atomically clear just the byte containing the busy bit */
                        static const uint8_t zero;
-                       retval = hl_if->layout->api->write_mem(hl_if->fd, DCB_DCRDR, 1, 1, &zero);
+                       retval = hl_if->layout->api->write_mem(hl_if->handle, DCB_DCRDR, 1, 1, &zero);
                }
        }
        return retval;
@@ -412,7 +412,7 @@ static int adapter_debug_entry(struct target *target)
        adapter_load_context(target);
 
        /* make sure we clear the vector catch bit */
-       adapter->layout->api->write_debug_reg(adapter->fd, DCB_DEMCR, TRCENA);
+       adapter->layout->api->write_debug_reg(adapter->handle, DCB_DEMCR, TRCENA);
 
        r = arm->cpsr;
        xPSR = buf_get_u32(r->value, 0, 32);
@@ -456,7 +456,7 @@ static int adapter_poll(struct target *target)
        struct armv7m_common *armv7m = target_to_armv7m(target);
        enum target_state prev_target_state = target->state;
 
-       state = adapter->layout->api->state(adapter->fd);
+       state = adapter->layout->api->state(adapter->handle);
 
        if (state == TARGET_UNKNOWN) {
                LOG_ERROR("jtag status contains invalid mode value - communication failure");
@@ -505,22 +505,22 @@ static int adapter_assert_reset(struct target *target)
        if ((jtag_reset_config & RESET_HAS_SRST) &&
            (jtag_reset_config & RESET_SRST_NO_GATING)) {
                jtag_add_reset(0, 1);
-               res = adapter->layout->api->assert_srst(adapter->fd, 0);
+               res = adapter->layout->api->assert_srst(adapter->handle, 0);
                srst_asserted = true;
        }
 
-       adapter->layout->api->write_debug_reg(adapter->fd, DCB_DHCSR, DBGKEY|C_DEBUGEN);
+       adapter->layout->api->write_debug_reg(adapter->handle, DCB_DHCSR, DBGKEY|C_DEBUGEN);
 
        /* only set vector catch if halt is requested */
        if (target->reset_halt)
-               adapter->layout->api->write_debug_reg(adapter->fd, DCB_DEMCR, TRCENA|VC_CORERESET);
+               adapter->layout->api->write_debug_reg(adapter->handle, DCB_DEMCR, TRCENA|VC_CORERESET);
        else
-               adapter->layout->api->write_debug_reg(adapter->fd, DCB_DEMCR, TRCENA);
+               adapter->layout->api->write_debug_reg(adapter->handle, DCB_DEMCR, TRCENA);
 
        if (jtag_reset_config & RESET_HAS_SRST) {
                if (!srst_asserted) {
                        jtag_add_reset(0, 1);
-                       res = adapter->layout->api->assert_srst(adapter->fd, 0);
+                       res = adapter->layout->api->assert_srst(adapter->handle, 0);
                }
                if (res == ERROR_COMMAND_NOTFOUND)
                        LOG_ERROR("Hardware srst not supported, falling back to software reset");
@@ -532,10 +532,10 @@ static int adapter_assert_reset(struct target *target)
 
        if (use_srst_fallback) {
                /* stlink v1 api does not support hardware srst, so we use a software reset fallback */
-               adapter->layout->api->write_debug_reg(adapter->fd, NVIC_AIRCR, AIRCR_VECTKEY | AIRCR_SYSRESETREQ);
+               adapter->layout->api->write_debug_reg(adapter->handle, NVIC_AIRCR, AIRCR_VECTKEY | AIRCR_SYSRESETREQ);
        }
 
-       res = adapter->layout->api->reset(adapter->fd);
+       res = adapter->layout->api->reset(adapter->handle);
 
        if (res != ERROR_OK)
                return res;
@@ -562,7 +562,7 @@ static int adapter_deassert_reset(struct target *target)
        LOG_DEBUG("%s", __func__);
 
        if (jtag_reset_config & RESET_HAS_SRST)
-               adapter->layout->api->assert_srst(adapter->fd, 1);
+               adapter->layout->api->assert_srst(adapter->handle, 1);
 
        /* virtual deassert reset, we need it for the internal
         * jtag state machine
@@ -589,7 +589,7 @@ static int adapter_halt(struct target *target)
        if (target->state == TARGET_UNKNOWN)
                LOG_WARNING("target was in unknown state when halt was requested");
 
-       res = adapter->layout->api->halt(adapter->fd);
+       res = adapter->layout->api->halt(adapter->handle);
 
        if (res != ERROR_OK)
                return res;
@@ -663,7 +663,7 @@ static int adapter_resume(struct target *target, int current,
                                        breakpoint->unique_id);
                        cortex_m_unset_breakpoint(target, breakpoint);
 
-                       res = adapter->layout->api->step(adapter->fd);
+                       res = adapter->layout->api->step(adapter->handle);
 
                        if (res != ERROR_OK)
                                return res;
@@ -672,7 +672,7 @@ static int adapter_resume(struct target *target, int current,
                }
        }
 
-       res = adapter->layout->api->run(adapter->fd);
+       res = adapter->layout->api->run(adapter->handle);
 
        if (res != ERROR_OK)
                return res;
@@ -735,7 +735,7 @@ static int adapter_step(struct target *target, int current,
 
        target_call_event_callbacks(target, TARGET_EVENT_RESUMED);
 
-       res = adapter->layout->api->step(adapter->fd);
+       res = adapter->layout->api->step(adapter->handle);
 
        if (res != ERROR_OK)
                return res;
@@ -765,7 +765,7 @@ static int adapter_read_memory(struct target *target, uint32_t address,
 
        LOG_DEBUG("%s 0x%08" PRIx32 " %" PRIu32 " %" PRIu32, __func__, address, size, count);
 
-       return adapter->layout->api->read_mem(adapter->fd, address, size, count, buffer);
+       return adapter->layout->api->read_mem(adapter->handle, address, size, count, buffer);
 }
 
 static int adapter_write_memory(struct target *target, uint32_t address,
@@ -779,7 +779,7 @@ static int adapter_write_memory(struct target *target, uint32_t address,
 
        LOG_DEBUG("%s 0x%08" PRIx32 " %" PRIu32 " %" PRIu32, __func__, address, size, count);
 
-       return adapter->layout->api->write_mem(adapter->fd, address, size, count, buffer);
+       return adapter->layout->api->write_mem(adapter->handle, address, size, count, buffer);
 }
 
 static const struct command_registration adapter_command_handlers[] = {