[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openocd-development
Subject:    [OpenOCD-devel] [PATCH]: bc28d42 stlink: remove only instance of useconds_t
From:       gerrit () openocd ! org (gerrit)
Date:       2020-03-26 14:36:18
Message-ID: 20200326143618.CF3E94A1EEC () mail ! openocd ! org
[Download RAW message or body]

This is an automated email from Gerrit.

Antonio Borneo (borneo.antonio@gmail.com) just uploaded a new patch set to Gerrit, \
which you can find at http://openocd.zylin.com/5544

-- gerrit

commit bc28d4255b56154162a50149626857052e9306d1
Author: Antonio Borneo <borneo.antonio@gmail.com>
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 <borneo.antonio@gmail.com>

diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c
index b45e4a4..94c80f7 100644
--- a/src/jtag/drivers/stlink_usb.c
+++ b/src/jtag/drivers/stlink_usb.c
@@ -835,7 +835,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;

-- 


_______________________________________________
OpenOCD-devel mailing list
OpenOCD-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openocd-devel


[prev in list] [next in list] [prev in thread] [next in thread]