Skip to content

W
White Rabbit Switch - Software
Commit a88aa745 authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

userspace/ptpd_netif: move structures to headers 

Meanwhile, remove one of the typedefs and avoid "my_socket":
"wr_socket" is more correct.
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent d6c58056
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 30 deletions
userspace/libwr/Makefile
View file @ a88aa745
......@@ -20,6 +20,7 @@ OBJCOPY = $(CROSS_COMPILE)objcopy
OBJDUMP = $(CROSS_COMPILE)objdump
CFLAGS = -Wall -I. -O2 -DDEBUG -ggdb \
-DLIBWR_INTERNAL \
-I./include \
-I../include \
-I../mini-rpc \
......
userspace/libwr/include/libwr/ptpd_netif.h
View file @ a88aa745
......@@ -31,6 +31,27 @@ typedef struct {
uint16_t physical_port;
} wr_sockaddr_t;
#ifdef LIBWR_INTERNAL /* The following two used to be in ptpd_netif.c */
struct wr_tmo { /* timeout */
uint64_t start_tics;
uint64_t timeout;
};
struct wr_socket {
int fd;
wr_sockaddr_t bind_addr;
uint8_t local_mac[ETH_ALEN];
int if_index;
// parameters for linearization of RX timestamps
uint32_t clock_period;
uint32_t phase_transition;
uint32_t dmtd_phase;
int dmtd_phase_valid;
struct wr_tmo dmtd_update_tmo;
};
#endif
PACKED struct _wr_timestamp {
// Seconds
......
userspace/libwr/ptpd_netif.c
View file @ a88aa745
......@@ -45,25 +45,6 @@ PACKED struct etherpacket {
char data[ETHER_MTU];
};
typedef struct {
uint64_t start_tics;
uint64_t timeout;
} timeout_t;
struct my_socket {
int fd;
wr_sockaddr_t bind_addr;
uint8_t local_mac[ETH_ALEN];
int if_index;
// parameters for linearization of RX timestamps
uint32_t clock_period;
uint32_t phase_transition;
uint32_t dmtd_phase;
int dmtd_phase_valid;
timeout_t dmtd_update_tmo;
};
static uint64_t get_tics()
{
struct timezone tz = { 0, 0 };
......@@ -73,20 +54,20 @@ static uint64_t get_tics()
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(struct wr_tmo * tmo, uint32_t milliseconds)
{
tmo->start_tics = get_tics();
tmo->timeout = (uint64_t) milliseconds *1000ULL;
return 0;
}
static inline int tmo_restart(timeout_t * tmo)
static inline int tmo_restart(struct wr_tmo * tmo)
{
tmo->start_tics = get_tics();
return 0;
}
static inline int tmo_expired(timeout_t * tmo)
static inline int tmo_expired(struct wr_tmo * tmo)
{
return (get_tics() - tmo->start_tics > tmo->timeout);
}
......@@ -103,7 +84,7 @@ static inline int inside_range(int min, int max, int x)
/* For debugging/testing purposes */
int ptpd_netif_get_dmtd_phase(wr_socket_t * sock, int32_t * phase)
{
struct my_socket *s = (struct my_socket *)sock;
struct wr_socket *s = (struct wr_socket *)sock;
hexp_port_state_t pstate;
halexp_get_port_state(&pstate, s->bind_addr.if_name);
......@@ -115,7 +96,7 @@ int ptpd_netif_get_dmtd_phase(wr_socket_t * sock, int32_t * phase)
static void update_dmtd(wr_socket_t * sock)
{
struct my_socket *s = (struct my_socket *)sock;
struct wr_socket *s = (struct wr_socket *)sock;
hexp_port_state_t pstate;
if (tmo_expired(&s->dmtd_update_tmo)) {
......@@ -191,7 +172,7 @@ int ptpd_netif_init()
wr_socket_t *ptpd_netif_create_socket(int sock_type, int flags,
wr_sockaddr_t * bind_addr)
{
struct my_socket *s;
struct wr_socket *s;
struct sockaddr_ll sll;
struct ifreq f;
......@@ -269,7 +250,7 @@ wr_socket_t *ptpd_netif_create_socket(int sock_type, int flags,
return NULL;
}
s = calloc(sizeof(struct my_socket), 1);
s = calloc(sizeof(struct wr_socket), 1);
if (!s)
return NULL;
......@@ -299,7 +280,7 @@ wr_socket_t *ptpd_netif_create_socket(int sock_type, int flags,
int ptpd_netif_close_socket(wr_socket_t * sock)
{
struct my_socket *s = (struct my_socket *)sock;
struct wr_socket *s = (struct wr_socket *)sock;
if (!s)
return 0;
......@@ -316,7 +297,7 @@ int ptpd_netif_sendto(wr_socket_t * sock, wr_sockaddr_t * to, void *data,
size_t data_length, wr_timestamp_t * tx_ts)
{
struct etherpacket pkt;
struct my_socket *s = (struct my_socket *)sock;
struct wr_socket *s = (struct wr_socket *)sock;
struct sockaddr_ll sll;
int rval;
......@@ -370,7 +351,7 @@ static void poll_tx_timestamp(wr_socket_t * sock, wr_timestamp_t * tx_timestamp)
{
char data[16384];
struct my_socket *s = (struct my_socket *)sock;
struct wr_socket *s = (struct wr_socket *)sock;
struct msghdr msg;
struct iovec entry;
struct sockaddr_ll from_addr;
......@@ -432,7 +413,7 @@ static void poll_tx_timestamp(wr_socket_t * sock, wr_timestamp_t * tx_timestamp)
int ptpd_netif_recvfrom(wr_socket_t * sock, wr_sockaddr_t * from, void *data,
size_t data_length, wr_timestamp_t * rx_timestamp)
{
struct my_socket *s = (struct my_socket *)sock;
struct wr_socket *s = (struct wr_socket *)sock;
struct etherpacket pkt;
struct msghdr msg;
struct iovec entry;
......
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