openocd-commit Mailing List for OpenOCD - Open On-Chip Debugger (Page 78)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  94dfa68647062ce71322f293a468bf5cdccf82be (commit)
      from  17789d3762aff931bc4bffd2c129100d952ccc84 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 94dfa68647062ce71322f293a468bf5cdccf82be
Author: Antonio Borneo <bor...@gm...>
Date:   Wed Mar 18 22:35:26 2020 +0100

    stlink: reduce use of hla specific enum hl_transports
    
    In the driver's code it's widely used the enum hl_transports for
    any check concerning the current transport, even for the non-hla
    transport dapdirect.
    The driver already provides a stlink specific enum stlink_mode
    that can be used in place of the hla one.
    
    Replace the hla enum with the stlink one allover the code.
    Introduce a hla specific wrapper stlink_usb_hl_open() to cope with
    the only API that requires the hla specific enum.
    
    The overall behaviour is not changed, with exception for a debug
    message in stlink_usb_open() than now prints the numeric value of
    stlink enum in place of the numeric value of the corresponding hla
    one.
    
    This change prepares the road for moving SWIM transport out of hla
    by removing any reference to the macro HL_TRANSPORT_SWIM from the
    stlink driver.
    
    Change-Id: Ieeea34f312245a94bfc1333087afdb8eb9f77139
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/5526
    Tested-by: jenkins

diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c
index 03d3da7bb..aef02c563 100644
--- a/src/jtag/drivers/stlink_usb.c
+++ b/src/jtag/drivers/stlink_usb.c
@@ -95,6 +95,15 @@ enum stlink_jtag_api_version {
 	STLINK_JTAG_API_V3,
 };
 
+enum stlink_mode {
+	STLINK_MODE_UNKNOWN = 0,
+	STLINK_MODE_DFU,
+	STLINK_MODE_MASS,
+	STLINK_MODE_DEBUG_JTAG,
+	STLINK_MODE_DEBUG_SWD,
+	STLINK_MODE_DEBUG_SWIM
+};
+
 /** */
 struct stlink_usb_version {
 	/** */
@@ -132,7 +141,7 @@ struct stlink_usb_handle_s {
 	/** */
 	uint32_t max_mem_packet;
 	/** */
-	enum hl_transports transport;
+	enum stlink_mode st_mode;
 	/** */
 	struct stlink_usb_version version;
 	/** */
@@ -292,16 +301,6 @@ struct stlink_usb_handle_s {
 
 #define STLINK_V3_MAX_FREQ_NB               10
 
-/** */
-enum stlink_mode {
-	STLINK_MODE_UNKNOWN = 0,
-	STLINK_MODE_DFU,
-	STLINK_MODE_MASS,
-	STLINK_MODE_DEBUG_JTAG,
-	STLINK_MODE_DEBUG_SWD,
-	STLINK_MODE_DEBUG_SWIM
-};
-
 #define REQUEST_SENSE        0x03
 #define REQUEST_SENSE_LENGTH 18
 
@@ -710,7 +709,7 @@ static int stlink_usb_error_check(void *handle)
 
 	assert(handle != NULL);
 
-	if (h->transport == HL_TRANSPORT_SWIM) {
+	if (h->st_mode == STLINK_MODE_DEBUG_SWIM) {
 		switch (h->databuf[0]) {
 			case STLINK_SWIM_ERR_OK:
 				return ERROR_OK;
@@ -819,13 +818,13 @@ static int stlink_cmd_allow_retry(void *handle, const uint8_t *buf, int size)
 	struct stlink_usb_handle_s *h = handle;
 
 	while (1) {
-		if ((h->transport != HL_TRANSPORT_SWIM) || !retries) {
+		if ((h->st_mode != STLINK_MODE_DEBUG_SWIM) || !retries) {
 			res = stlink_usb_xfer_noerrcheck(handle, buf, size);
 			if (res != ERROR_OK)
 				return res;
 		}
 
-		if (h->transport == HL_TRANSPORT_SWIM) {
+		if (h->st_mode == STLINK_MODE_DEBUG_SWIM) {
 			res = stlink_swim_status(handle);
 			if (res != ERROR_OK)
 				return res;
@@ -1368,7 +1367,7 @@ static int stlink_usb_init_mode(void *handle, bool connect_under_reset, int init
 	LOG_DEBUG("MODE: 0x%02X", mode);
 
 	/* set selected mode */
-	emode = stlink_get_mode(h->transport);
+	emode = h->st_mode;
 
 	if (emode == STLINK_MODE_UNKNOWN) {
 		LOG_ERROR("selected mode (transport) not supported");
@@ -1376,12 +1375,12 @@ static int stlink_usb_init_mode(void *handle, bool connect_under_reset, int init
 	}
 
 	/* set the speed before entering the mode, as the chip discovery phase should be done at this speed too */
-	if (h->transport == HL_TRANSPORT_JTAG) {
+	if (emode == STLINK_MODE_DEBUG_JTAG) {
 		if (h->version.flags & STLINK_F_HAS_JTAG_SET_FREQ) {
 			stlink_dump_speed_map(stlink_khz_to_speed_map_jtag, ARRAY_SIZE(stlink_khz_to_speed_map_jtag));
 			stlink_speed(h, initial_interface_speed, false);
 		}
-	} else if (h->transport == HL_TRANSPORT_SWD) {
+	} else if (emode == STLINK_MODE_DEBUG_SWD) {
 		if (h->version.flags & STLINK_F_HAS_SWD_SET_FREQ) {
 			stlink_dump_speed_map(stlink_khz_to_speed_map_swd, ARRAY_SIZE(stlink_khz_to_speed_map_swd));
 			stlink_speed(h, initial_interface_speed, false);
@@ -1391,7 +1390,7 @@ static int stlink_usb_init_mode(void *handle, bool connect_under_reset, int init
 	if (h->version.jtag_api == STLINK_JTAG_API_V3) {
 		struct speed_map map[STLINK_V3_MAX_FREQ_NB];
 
-		stlink_get_com_freq(h, (h->transport == HL_TRANSPORT_JTAG), map);
+		stlink_get_com_freq(h, (emode == STLINK_MODE_DEBUG_JTAG), map);
 		stlink_dump_speed_map(map, ARRAY_SIZE(map));
 		stlink_speed(h, initial_interface_speed, false);
 	}
@@ -1632,7 +1631,7 @@ static int stlink_usb_idcode(void *handle, uint32_t *idcode)
 	assert(handle != NULL);
 
 	/* there is no swim read core id cmd */
-	if (h->transport == HL_TRANSPORT_SWIM) {
+	if (h->st_mode == STLINK_MODE_DEBUG_SWIM) {
 		*idcode = 0;
 		return ERROR_OK;
 	}
@@ -1763,8 +1762,8 @@ static enum target_state stlink_usb_state(void *handle)
 
 	assert(handle != NULL);
 
-	if (h->transport == HL_TRANSPORT_SWIM) {
-		res = stlink_usb_mode_enter(handle, stlink_get_mode(h->transport));
+	if (h->st_mode == STLINK_MODE_DEBUG_SWIM) {
+		res = stlink_usb_mode_enter(handle, h->st_mode);
 		if (res != ERROR_OK)
 			return TARGET_UNKNOWN;
 
@@ -1777,8 +1776,7 @@ static enum target_state stlink_usb_state(void *handle)
 
 	if (h->reconnect_pending) {
 		LOG_INFO("Previous state query failed, trying to reconnect");
-		res = stlink_usb_mode_enter(handle, stlink_get_mode(h->transport));
-
+		res = stlink_usb_mode_enter(handle, h->st_mode);
 		if (res != ERROR_OK)
 			return TARGET_UNKNOWN;
 
@@ -1818,7 +1816,7 @@ static int stlink_usb_assert_srst(void *handle, int srst)
 
 	assert(handle != NULL);
 
-	if (h->transport == HL_TRANSPORT_SWIM)
+	if (h->st_mode == STLINK_MODE_DEBUG_SWIM)
 		return stlink_swim_assert_reset(handle, srst);
 
 	if (h->version.stlink == 1)
@@ -1895,7 +1893,7 @@ static int stlink_usb_reset(void *handle)
 
 	assert(handle != NULL);
 
-	if (h->transport == HL_TRANSPORT_SWIM)
+	if (h->st_mode == STLINK_MODE_DEBUG_SWIM)
 		return stlink_swim_generate_rst(handle);
 
 	stlink_usb_init_buffer(handle, h->rx_ep, 2);
@@ -2325,7 +2323,7 @@ static int stlink_usb_read_mem(void *handle, uint32_t addr, uint32_t size,
 		if (count < bytes_remaining)
 			bytes_remaining = count;
 
-		if (h->transport == HL_TRANSPORT_SWIM) {
+		if (h->st_mode == STLINK_MODE_DEBUG_SWIM) {
 			retval = stlink_swim_readbytes(handle, addr, bytes_remaining, buffer);
 			if (retval != ERROR_OK)
 				return retval;
@@ -2410,7 +2408,7 @@ static int stlink_usb_write_mem(void *handle, uint32_t addr, uint32_t size,
 		if (count < bytes_remaining)
 			bytes_remaining = count;
 
-		if (h->transport == HL_TRANSPORT_SWIM) {
+		if (h->st_mode == STLINK_MODE_DEBUG_SWIM) {
 			retval = stlink_swim_writebytes(handle, addr, bytes_remaining, buffer);
 			if (retval != ERROR_OK)
 				return retval;
@@ -2674,16 +2672,16 @@ static int stlink_speed(void *handle, int khz, bool query)
 	if (!handle)
 		return khz;
 
-	switch (h->transport) {
-	case HL_TRANSPORT_SWIM:
+	switch (h->st_mode) {
+	case STLINK_MODE_DEBUG_SWIM:
 		return stlink_speed_swim(handle, khz, query);
-	case HL_TRANSPORT_SWD:
+	case STLINK_MODE_DEBUG_SWD:
 		if (h->version.jtag_api == STLINK_JTAG_API_V3)
 			return stlink_speed_v3(handle, false, khz, query);
 		else
 			return stlink_speed_swd(handle, khz, query);
 		break;
-	case HL_TRANSPORT_JTAG:
+	case STLINK_MODE_DEBUG_JTAG:
 		if (h->version.jtag_api == STLINK_JTAG_API_V3)
 			return stlink_speed_v3(handle, true, khz, query);
 		else
@@ -2824,7 +2822,7 @@ char *stlink_usb_get_alternate_serial(libusb_device_handle *device,
 }
 
 /** */
-static int stlink_usb_open(struct hl_interface_param_s *param, void **fd)
+static int stlink_usb_open(struct hl_interface_param_s *param, enum stlink_mode mode, void **fd)
 {
 	int err, retry_count = 1;
 	struct stlink_usb_handle_s *h;
@@ -2838,11 +2836,11 @@ static int stlink_usb_open(struct hl_interface_param_s *param, void **fd)
 		return ERROR_FAIL;
 	}
 
-	h->transport = param->transport;
+	h->st_mode = mode;
 
 	for (unsigned i = 0; param->vid[i]; i++) {
 		LOG_DEBUG("transport: %d vid: 0x%04x pid: 0x%04x serial: %s",
-			  param->transport, param->vid[i], param->pid[i],
+			  h->st_mode, param->vid[i], param->pid[i],
 			  param->serial ? param->serial : "");
 	}
 
@@ -2942,16 +2940,16 @@ static int stlink_usb_open(struct hl_interface_param_s *param, void **fd)
 	/* check if mode is supported */
 	err = ERROR_OK;
 
-	switch (h->transport) {
-		case HL_TRANSPORT_SWD:
+	switch (h->st_mode) {
+		case STLINK_MODE_DEBUG_SWD:
 			if (h->version.jtag_api == STLINK_JTAG_API_V1)
 				err = ERROR_FAIL;
 			/* fall-through */
-		case HL_TRANSPORT_JTAG:
+		case STLINK_MODE_DEBUG_JTAG:
 			if (h->version.jtag == 0)
 				err = ERROR_FAIL;
 			break;
-		case HL_TRANSPORT_SWIM:
+		case STLINK_MODE_DEBUG_SWIM:
 			if (h->version.swim == 0)
 				err = ERROR_FAIL;
 			break;
@@ -2973,7 +2971,7 @@ static int stlink_usb_open(struct hl_interface_param_s *param, void **fd)
 		goto error_open;
 	}
 
-	if (h->transport == HL_TRANSPORT_SWIM) {
+	if (h->st_mode == STLINK_MODE_DEBUG_SWIM) {
 		err = stlink_swim_enter(h);
 		if (err != ERROR_OK) {
 			LOG_ERROR("stlink_swim_enter_failed (unable to connect to the target)");
@@ -3011,6 +3009,11 @@ error_open:
 	return ERROR_FAIL;
 }
 
+static int stlink_usb_hl_open(struct hl_interface_param_s *param, void **fd)
+{
+	return stlink_usb_open(param, stlink_get_mode(param->transport), fd);
+}
+
 int stlink_config_trace(void *handle, bool enabled,
 		enum tpiu_pin_protocol pin_protocol, uint32_t port_size,
 		unsigned int *trace_freq, unsigned int traceclkin_freq,
@@ -3144,7 +3147,7 @@ static int stlink_write_dap_register(void *handle, unsigned short dap_port,
 /** */
 struct hl_layout_api_s stlink_usb_layout_api = {
 	/** */
-	.open = stlink_usb_open,
+	.open = stlink_usb_hl_open,
 	/** */
 	.close = stlink_usb_close,
 	/** */
@@ -3259,7 +3262,6 @@ static int stlink_dap_closeall_ap(void)
 static int stlink_dap_reinit_interface(void)
 {
 	int retval;
-	enum stlink_mode mode;
 
 	/*
 	 * On JTAG only, it should be enough to call stlink_usb_reset(). But on
@@ -3269,13 +3271,12 @@ static int stlink_dap_reinit_interface(void)
 	 * select the mode again.
 	 */
 
-	mode = stlink_get_mode(stlink_dap_param.transport);
 	if (!stlink_dap_handle->reconnect_pending) {
 		stlink_dap_handle->reconnect_pending = true;
-		stlink_usb_mode_leave(stlink_dap_handle, mode);
+		stlink_usb_mode_leave(stlink_dap_handle, stlink_dap_handle->st_mode);
 	}
 
-	retval = stlink_usb_mode_enter(stlink_dap_handle, mode);
+	retval = stlink_usb_mode_enter(stlink_dap_handle, stlink_dap_handle->st_mode);
 	if (retval != ERROR_OK)
 		return retval;
 
@@ -3322,7 +3323,7 @@ static int stlink_dap_op_connect(struct adiv5_dap *dap)
 	retval = stlink_usb_idcode(stlink_dap_handle, &idcode);
 	if (retval == ERROR_OK)
 		LOG_INFO("%s %#8.8" PRIx32,
-			(stlink_dap_handle->transport == HL_TRANSPORT_JTAG) ? "JTAG IDCODE" : "SWD DPIDR",
+			(stlink_dap_handle->st_mode == STLINK_MODE_DEBUG_JTAG) ? "JTAG IDCODE" : "SWD DPIDR",
 			idcode);
 	else
 		dap->do_reconnect = true;
@@ -3371,7 +3372,7 @@ static int stlink_dap_op_queue_dp_read(struct adiv5_dap *dap, unsigned reg,
 
 	data = data ? : &dummy;
 	if (stlink_dap_handle->version.flags & STLINK_F_QUIRK_JTAG_DP_READ
-		&& stlink_dap_handle->transport == HL_TRANSPORT_JTAG) {
+		&& stlink_dap_handle->st_mode == STLINK_MODE_DEBUG_JTAG) {
 		/* Quirk required in JTAG. Read RDBUFF to get the data */
 		retval = stlink_read_dap_register(stlink_dap_handle,
 					STLINK_DEBUG_PORT_ACCESS, reg, &dummy);
@@ -3507,7 +3508,7 @@ static int stlink_dap_op_run(struct adiv5_dap *dap)
 	}
 
 	if (ctrlstat & SSTICKYERR) {
-		if (stlink_dap_param.transport == HL_TRANSPORT_JTAG)
+		if (stlink_dap_handle->st_mode == STLINK_MODE_DEBUG_JTAG)
 			retval = stlink_dap_op_queue_dp_write(dap, DP_CTRL_STAT,
 					ctrlstat & (dap->dp_ctrl_stat | SSTICKYERR));
 		else
@@ -3635,6 +3636,7 @@ static const struct command_registration stlink_dap_command_handlers[] = {
 static int stlink_dap_init(void)
 {
 	enum reset_types jtag_reset_config = jtag_get_reset_config();
+	enum stlink_mode mode;
 	int retval;
 
 	LOG_DEBUG("stlink_dap_init()");
@@ -3647,15 +3649,15 @@ static int stlink_dap_init(void)
 	}
 
 	if (transport_is_dapdirect_swd())
-		stlink_dap_param.transport = HL_TRANSPORT_SWD;
+		mode = STLINK_MODE_DEBUG_SWD;
 	else if (transport_is_dapdirect_jtag())
-		stlink_dap_param.transport = HL_TRANSPORT_JTAG;
+		mode = STLINK_MODE_DEBUG_JTAG;
 	else {
 		LOG_ERROR("Unsupported transport");
 		return ERROR_FAIL;
 	}
 
-	retval = stlink_usb_open(&stlink_dap_param, (void **)&stlink_dap_handle);
+	retval = stlink_usb_open(&stlink_dap_param, mode, (void **)&stlink_dap_handle);
 	if (retval != ERROR_OK)
 		return retval;
 

-----------------------------------------------------------------------

Summary of changes:
 src/jtag/drivers/stlink_usb.c | 102 +++++++++++++++++++++---------------------
 1 file changed, 52 insertions(+), 50 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository




2008	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (75)
2009	Jan (70)	Feb (20)	Mar (52)	Apr (149)	May (387)	Jun (466)	Jul (133)	Aug (87)	Sep (122)	Oct (140)	Nov (185)	Dec (105)
2010	Jan (85)	Feb (45)	Mar (75)	Apr (17)	May (41)	Jun (52)	Jul (33)	Aug (29)	Sep (36)	Oct (15)	Nov (26)	Dec (34)
2011	Jan (26)	Feb (25)	Mar (26)	Apr (29)	May (20)	Jun (27)	Jul (15)	Aug (32)	Sep (13)	Oct (64)	Nov (60)	Dec (10)
2012	Jan (64)	Feb (63)	Mar (39)	Apr (43)	May (54)	Jun (11)	Jul (30)	Aug (45)	Sep (11)	Oct (70)	Nov (24)	Dec (23)
2013	Jan (17)	Feb (8)	Mar (35)	Apr (40)	May (20)	Jun (24)	Jul (36)	Aug (25)	Sep (42)	Oct (40)	Nov (9)	Dec (21)
2014	Jan (29)	Feb (24)	Mar (60)	Apr (22)	May (22)	Jun (46)	Jul (11)	Aug (23)	Sep (26)	Oct (10)	Nov (14)	Dec (2)
2015	Jan (28)	Feb (47)	Mar (33)	Apr (58)	May (5)	Jun (1)	Jul	Aug (8)	Sep (12)	Oct (25)	Nov (58)	Dec (21)
2016	Jan (12)	Feb (40)	Mar (2)	Apr (1)	May (67)	Jun (2)	Jul (5)	Aug (36)	Sep	Oct (24)	Nov (17)	Dec (50)
2017	Jan (14)	Feb (16)	Mar (2)	Apr (35)	May (14)	Jun (16)	Jul (3)	Aug (3)	Sep	Oct (19)	Nov	Dec (16)
2018	Jan (55)	Feb (11)	Mar (34)	Apr (14)	May (4)	Jun (20)	Jul (39)	Aug (16)	Sep (17)	Oct (16)	Nov (20)	Dec (30)
2019	Jan (29)	Feb (24)	Mar (37)	Apr (26)	May (19)	Jun (21)	Jul (2)	Aug (3)	Sep (9)	Oct (12)	Nov (12)	Dec (12)
2020	Jan (47)	Feb (36)	Mar (54)	Apr (44)	May (37)	Jun (19)	Jul (32)	Aug (13)	Sep (16)	Oct (24)	Nov (32)	Dec (11)
2021	Jan (14)	Feb (5)	Mar (40)	Apr (32)	May (42)	Jun (31)	Jul (29)	Aug (47)	Sep (38)	Oct (17)	Nov (74)	Dec (33)
2022	Jan (11)	Feb (15)	Mar (40)	Apr (21)	May (39)	Jun (44)	Jul (19)	Aug (46)	Sep (79)	Oct (35)	Nov (21)	Dec (15)
2023	Jan (56)	Feb (13)	Mar (43)	Apr (28)	May (60)	Jun (15)	Jul (29)	Aug (28)	Sep (32)	Oct (21)	Nov (42)	Dec (39)
2024	Jan (35)	Feb (17)	Mar (28)	Apr (7)	May (14)	Jun (35)	Jul (30)	Aug (35)	Sep (30)	Oct (28)	Nov (38)	Dec (18)
2025	Jan (21)	Feb (28)	Mar (36)	Apr (35)	May (34)	Jun (58)	Jul (9)	Aug (37)	Sep	Oct	Nov	Dec

openocd-commit Mailing List for OpenOCD - Open On-Chip Debugger (Page 78)

The Open On-Chip Debugger

openocd-commit — OpenOCD commit maling list - read only