[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.10.0-1171-gcbbc56f7f

[OpenOCD-Gerrit <ope...@us...>]

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  cbbc56f7f7bef9e0e1cb8711576449c62fe31654 (commit)
      from  02903916dd004f03290bdf766e02ce73151f7d71 (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 cbbc56f7f7bef9e0e1cb8711576449c62fe31654
Author: Antonio Borneo <bor...@gm...>
Date:   Thu Mar 26 15:16:52 2020 +0100

    stlink: remove only instance of useconds_t
    
    The usleep() function, and its associated useconds_t type
    specifier, has been obsoleted by POSIX.1-2008.
    
    OpenOCD has 28 call to usleep(), that should be migrated to the
    replacement nanosleep(), but due to the different prototype
            int nanosleep(const struct timespec *req, struct timespec *rem);
    this can take some effort.
    
    The type useconds_t is used in only one case, where it's used both
    as parameter of usleep() and as value passed to LOG_DEBUG(). Due
    to different implementation of useconds_t, there are cases that
    trigger a compile warning in LOG_DEBUG() when useconds_t is more
    than 32 bit.
    E.g. with unistd.h in MinGW 4.x, useconds_t is defined as unsigned
    long, thus being 32 or 64 bits depending on the target.
    
    Replace the only instance of useconds_t.
    
    Change-Id: I21724f8b06780abdb003a57222ff1d6840ff5419
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/5544
    Tested-by: jenkins
    Reviewed-by: Ake Rehnman <ake...@gm...>

diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c
index 3f9ce37a9..f4992daa6 100644
--- a/src/jtag/drivers/stlink_usb.c
+++ b/src/jtag/drivers/stlink_usb.c
@@ -834,7 +834,7 @@ static int stlink_cmd_allow_retry(void *handle, const uint8_t *buf, int size)
 
 		res = stlink_usb_error_check(handle);
 		if (res == ERROR_WAIT && retries < MAX_WAIT_RETRIES) {
-			useconds_t delay_us = (1<<retries++) * 1000;
+			unsigned int delay_us = (1<<retries++) * 1000;
 			LOG_DEBUG("stlink_cmd_allow_retry ERROR_WAIT, retry %d, delaying %u microseconds", retries, delay_us);
 			usleep(delay_us);
 			continue;

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

Summary of changes:
 src/jtag/drivers/stlink_usb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository