Skip to content

P
PPSi
Commit b65420ce authored by Jean-Claude BAU's avatar Jean-Claude BAU
Browse files
Options

Change timeout_t structure name to _timeout_t 

The timeout_t structure is already defined in libwr (wrs arch) and has
different fields. Renaming this local structure avoid compilation
conflicts.
parent b2db858f
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
time-wrs/wrs-socket.c
View file @ b65420ce
...@@ -52,7 +52,7 @@ typedef struct ...@@ -52,7 +52,7 @@ typedef struct
{ {
uint64_t start_tics; uint64_t start_tics;
uint64_t timeout; uint64_t timeout;
} timeout_t ; } _timeout_t ;
struct wrs_socket { struct wrs_socket {
/* parameters for linearization of RX timestamps */ /* parameters for linearization of RX timestamps */
...@@ -60,7 +60,7 @@ struct wrs_socket { ...@@ -60,7 +60,7 @@ struct wrs_socket {
uint32_t phase_transition; uint32_t phase_transition;
uint32_t dmtd_phase; uint32_t dmtd_phase;
int dmtd_phase_valid; int dmtd_phase_valid;
timeout_t dmtd_update_tmo; _timeout_t dmtd_update_tmo;
}; };
static uint64_t get_tics(void) static uint64_t get_tics(void)
...@@ -72,20 +72,20 @@ static uint64_t get_tics(void) ...@@ -72,20 +72,20 @@ static uint64_t get_tics(void)
return (uint64_t) tv.tv_sec * 1000000ULL + (uint64_t) tv.tv_usec; return (uint64_t) tv.tv_sec * 1000000ULL + (uint64_t) tv.tv_usec;
} }
static inline int tmo_init(timeout_t *tmo, uint32_t milliseconds) static inline int tmo_init(_timeout_t *tmo, uint32_t milliseconds)
{ {
tmo->start_tics = get_tics(); tmo->start_tics = get_tics();
tmo->timeout = (uint64_t) milliseconds * 1000ULL; tmo->timeout = (uint64_t) milliseconds * 1000ULL;
return 0; return 0;
} }
static inline int tmo_restart(timeout_t *tmo) static inline int tmo_restart(_timeout_t *tmo)
{ {
tmo->start_tics = get_tics(); tmo->start_tics = get_tics();
return 0; return 0;
} }
static inline int tmo_expired(timeout_t *tmo) static inline int tmo_expired(_timeout_t *tmo)
{ {
return (get_tics() - tmo->start_tics > tmo->timeout); return (get_tics() - tmo->start_tics > tmo->timeout);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment