mirrors
/
libserialport
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support timing helpers on Windows.

This commit is contained in:
Martin Ling 2020-01-03 23:50:31 +00:00
parent 08eb25f53a
commit 3317d678de
2 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libserialport_internal.h
View File

@ -40,6 +40,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h>
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#include <tchar.h> #include <tchar.h>

48
serialport.c
View File

@ -55,12 +55,14 @@ static enum sp_return get_config(struct sp_port *port, struct port_data *data,
static enum sp_return set_config(struct sp_port *port, struct port_data *data, static enum sp_return set_config(struct sp_port *port, struct port_data *data,
const struct sp_port_config *config); const struct sp_port_config *config);
#ifndef _WIN32
/* Timing abstraction */ /* Timing abstraction */
struct time { struct time {
#ifdef _WIN32
int64_t ticks;
#else
struct timeval tv; struct timeval tv;
#endif
}; };
struct timeout { struct timeout {
@ -72,7 +74,11 @@ struct timeout {
static void time_get(struct time *time) static void time_get(struct time *time)
{ {
#ifdef HAVE_CLOCK_GETTIME #ifdef _WIN32
LARGE_INTEGER count;
QueryPerformanceCounter(&count);
time->ticks = count.QuadPart;
#elif defined(HAVE_CLOCK_GETTIME)
struct timespec ts; struct timespec ts;
if (clock_gettime(CLOCK_MONOTONIC, &ts) == -1) if (clock_gettime(CLOCK_MONOTONIC, &ts) == -1)
clock_gettime(CLOCK_REALTIME, &ts); clock_gettime(CLOCK_REALTIME, &ts);
@ -92,35 +98,67 @@ static void time_get(struct time *time)
static void time_set_ms(struct time *time, unsigned int ms) static void time_set_ms(struct time *time, unsigned int ms)
{ {
#ifdef _WIN32
LARGE_INTEGER frequency;
QueryPerformanceFrequency(&frequency);
time->ticks = ms * (frequency.QuadPart / 1000);
#else
time->tv.tv_sec = ms / 1000; time->tv.tv_sec = ms / 1000;
time->tv.tv_usec = (ms % 1000) * 1000; time->tv.tv_usec = (ms % 1000) * 1000;
#endif
} }
static void time_add(const struct time *a, static void time_add(const struct time *a,
const struct time *b, struct time *result) const struct time *b, struct time *result)
{ {
#ifdef _WIN32
result->ticks = a->ticks + b->ticks;
#else
timeradd(&a->tv, &b->tv, &result->tv); timeradd(&a->tv, &b->tv, &result->tv);
#endif
} }
static void time_sub(const struct time *a, static void time_sub(const struct time *a,
const struct time *b, struct time *result) const struct time *b, struct time *result)
{ {
#ifdef _WIN32
result->ticks = a->ticks - b->ticks;
#else
timersub(&a->tv, &b->tv, &result->tv); timersub(&a->tv, &b->tv, &result->tv);
#endif
} }
static bool time_greater(const struct time *a, const struct time *b) static bool time_greater(const struct time *a, const struct time *b)
{ {
#ifdef _WIN32
return (a->ticks > b->ticks);
#else
return timercmp(&a->tv, &b->tv, >); return timercmp(&a->tv, &b->tv, >);
#endif
} }
static void time_as_timeval(const struct time *time, struct timeval *tv) static void time_as_timeval(const struct time *time, struct timeval *tv)
{ {
#ifdef _WIN32
LARGE_INTEGER frequency;
QueryPerformanceFrequency(&frequency);
tv->tv_sec = time->ticks / frequency.QuadPart;
tv->tv_usec = (time->ticks % frequency.QuadPart) /
(frequency.QuadPart / 1000000);
#else
*tv = time->tv; *tv = time->tv;
#endif
} }
static unsigned int time_as_ms(const struct time *time) static unsigned int time_as_ms(const struct time *time)
{ {
#ifdef _WIN32
LARGE_INTEGER frequency;
QueryPerformanceFrequency(&frequency);
return time->ticks / (frequency.QuadPart / 1000);
#else
return time->tv.tv_sec * 1000 + time->tv.tv_usec / 1000; return time->tv.tv_sec * 1000 + time->tv.tv_usec / 1000;
#endif
} }
static void timeout_start(struct timeout *timeout, unsigned int timeout_ms) static void timeout_start(struct timeout *timeout, unsigned int timeout_ms)
@ -158,6 +196,7 @@ static bool timeout_check(struct timeout *timeout)
return time_greater(&timeout->now, &timeout->end); return time_greater(&timeout->now, &timeout->end);
} }
#ifndef _WIN32
static struct timeval *timeout_timeval(struct timeout *timeout) static struct timeval *timeout_timeval(struct timeout *timeout)
{ {
if (timeout->ms == 0) if (timeout->ms == 0)
@ -167,6 +206,7 @@ static struct timeval *timeout_timeval(struct timeout *timeout)
return &timeout->delta_tv; return &timeout->delta_tv;
} }
#endif
static unsigned int timeout_remaining_ms(struct timeout *timeout) static unsigned int timeout_remaining_ms(struct timeout *timeout)
{ {
@ -178,8 +218,6 @@ static unsigned int timeout_remaining_ms(struct timeout *timeout)
return time_as_ms(&timeout->delta); return time_as_ms(&timeout->delta);
} }
#endif
SP_API enum sp_return sp_get_port_by_name(const char *portname, struct sp_port **port_ptr) SP_API enum sp_return sp_get_port_by_name(const char *portname, struct sp_port **port_ptr)
{ {
struct sp_port *port; struct sp_port *port;