Commit b1c90ee8 authored by Tomasz Wlostowski's avatar Tomasz Wlostowski

Merge branch 'master' of ohwr.org:white-rabbit/ppsi/ptp-noposix

parents e0720653 256f803b
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "ptpd_netif.h" #include "ptpd_netif.h"
#include "../PTPWRd/ptpd.h" #include "../PTPWRd/ptpd.h"
#include "../PTPWRd/datatypes.h" #include "../PTPWRd/datatypes.h"
#include "wrc_ptp.h"
int usleep(useconds_t useconds) int usleep(useconds_t useconds)
{ {
...@@ -86,11 +87,12 @@ extern int32_t sfp_alpha; ...@@ -86,11 +87,12 @@ extern int32_t sfp_alpha;
int halexp_get_port_state(hexp_port_state_t *state, const char *port_name) int halexp_get_port_state(hexp_port_state_t *state, const char *port_name)
{ {
state->valid = 1; state->valid = 1;
#ifdef WRPC_MASTER
state->mode = HEXP_PORT_MODE_WR_MASTER; if(wrc_ptp_get_mode()==WRC_MODE_SLAVE)
#else state->mode = HEXP_PORT_MODE_WR_SLAVE;
state->mode = HEXP_PORT_MODE_WR_SLAVE; else
#endif state->mode = HEXP_PORT_MODE_WR_MASTER;
ep_get_deltas( &state->delta_tx, &state->delta_rx); ep_get_deltas( &state->delta_tx, &state->delta_rx);
read_phase_val(state); read_phase_val(state);
state->up = ep_link_up(NULL); state->up = ep_link_up(NULL);
......
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