RPCS3/libusb
1
0
Fork 0
mirror of https://github.com/RPCS3/libusb.git synced 2024-11-23 18:19:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace obsolete usleep with nanosleep

Browse Source 
This fixes compiling libusb with uclibc.

Closes #141, #165

Signed-off-by: Stefan Tauner <stefan.tauner@gmx.at>
This commit is contained in:
Stefan Tauner 2016-01-19 00:02:16 +01:00 committed by Nathan Hjelm
parent fb2b6b2a92
commit 1fd08a1513
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/xusb.c
View File

@ -29,8 +29,8 @@
#if defined(_WIN32)
#define msleep(msecs) Sleep(msecs)
#else
#include <unistd.h>
#define msleep(msecs) usleep(1000*msecs)
#include <time.h>
#define msleep(msecs) nanosleep(&(struct timespec){delay / 1000, (delay * 1000000) % 1000000000UL}, NULL);
#endif
#if defined(_MSC_VER)

3
libusb/hotplug.c
View File

@ -94,6 +94,7 @@
\code
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include <libusb.h>
static int count = 0;
@ -142,7 +143,7 @@ int main (void) {
while (count < 2) {
libusb_handle_events_completed(NULL, NULL);
usleep(10000);
nanosleep(&(struct timespec){0, 10000000UL}, NULL);
}
libusb_hotplug_deregister_callback(NULL, callback_handle);

3
libusb/os/darwin_usb.c
View File

@ -19,6 +19,7 @@
*/
#include "config.h"
#include <time.h>
#include <ctype.h>
#include <errno.h>
#include <pthread.h>
@ -764,7 +765,7 @@ static int darwin_cache_device_descriptor (struct libusb_context *ctx, struct da
if (kIOReturnSuccess != ret) {
usbi_dbg("kernel responded with code: 0x%08x. sleeping for %d ms before trying again", ret, delay/1000);
/* sleep for a little while before trying again */
usleep (delay);
nanosleep(&(struct timespec){delay / 1000000, (delay * 1000) % 1000000000UL}, NULL);
}
} while (kIOReturnSuccess != ret && retries--);

4
libusb/os/linux_usbfs.c
View File

@ -36,7 +36,7 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/utsname.h>
#include <unistd.h>
#include <time.h>
#include "libusbi.h"
#include "linux_usbfs.h"
@ -202,7 +202,7 @@ static int _get_usbfs_fd(struct libusb_device *dev, mode_t mode, int silent)
usbi_err(ctx, "File doesn't exist, wait %d ms and try again", delay/1000);
/* Wait 10ms for USB device path creation.*/
usleep(delay);
nanosleep(&(struct timespec){delay / 1000000, (delay * 1000) % 1000000000UL}, NULL);
fd = open(path, mode);
if (fd != -1)

2
libusb/version_nano.h
View File

@ -1 +1 @@
#define LIBUSB_NANO 11089
#define LIBUSB_NANO 11092