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

b1c90ee8 · Tomasz Wlostowski · e0720653 · 256f803b · b1c90ee8
Commit b1c90ee8 authored Jul 25, 2012 by Tomasz Wlostowski
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

freestanding-wrapper.c libposix/freestanding-wrapper.c +7 -5

No files found.
--- a/libposix/freestanding-wrapper.c
+++ b/libposix/freestanding-wrapper.c
@@ -10,6 +10,7 @@
 #include "ptpd_netif.h"
 #include "../PTPWRd/ptpd.h"
 #include "../PTPWRd/datatypes.h"
+#include "wrc_ptp.h"

 int usleep(useconds_t useconds)
 {
@@ -86,11 +87,12 @@ extern int32_t sfp_alpha;
 int halexp_get_port_state(hexp_port_state_t *state, const char *port_name)
 {
  state->valid         = 1;
-#ifdef WRPC_MASTER
-  state->mode          = HEXP_PORT_MODE_WR_MASTER;
-#else
-  state->mode          = HEXP_PORT_MODE_WR_SLAVE;
-#endif
+
+  if(wrc_ptp_get_mode()==WRC_MODE_SLAVE)
+    state->mode = HEXP_PORT_MODE_WR_SLAVE;
+  else
+    state->mode = HEXP_PORT_MODE_WR_MASTER;  
+
  ep_get_deltas( &state->delta_tx, &state->delta_rx);
  read_phase_val(state);
  state->up            = ep_link_up(NULL);