Skip to content

P
PPSi
Commit 2ffa3e76 authored by Omar Gabella's avatar Omar Gabella
Browse files
Options

Take into account the news build options on the Makefile

parent 863f8160
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 3 deletions
Makefile
View file @ 2ffa3e76
...@@ -78,8 +78,14 @@ ifneq ($(PROTO_EXT),) ...@@ -78,8 +78,14 @@ ifneq ($(PROTO_EXT),)
endif endif
include proto-standard/Makefile include proto-standard/Makefile
broadcast: CFLAGS += -DBROADCAST CFLAGS-$(CONFIG_MON_TO_DEBUG) += -DMON_TO_DEBUG
broadcast: all CFLAGS-$(CONFIG_PARENTWRMODEOFF) += -DPARENTWRMODEOFF
CFLAGS-$(CONFIG_TRACK_PHASE_NOT_FOUND) += -DTRACK_PHASE_NOT_FOUND
CFLAGS-$(CONFIG_BROADCAST) += -DBROADCAST
CFLAGS-$(CONFIG_WRPC_FAULTS) += -DCONFIG_WRPC_FAULTS
#broadcast: CFLAGS += -DBROADCAST
#broadcast: all
# ...and the TIME choice sets the default operations # ...and the TIME choice sets the default operations
CFLAGS += -DDEFAULT_TIME_OPS=$(TIME)_time_ops CFLAGS += -DDEFAULT_TIME_OPS=$(TIME)_time_ops
......
proto-ext-whiterabbit/wr-api.h
View file @ 2ffa3e76
...@@ -54,8 +54,10 @@ struct wr_dsport { ...@@ -54,8 +54,10 @@ struct wr_dsport {
Boolean doRestart; Boolean doRestart;
Boolean linkUP; Boolean linkUP;
#ifdef MON_TO_DEBUG
// TMP TEST // TMP TEST
UInteger32 counter_PP_TO_ANN_RECEIPT; UInteger32 counter_PP_TO_ANN_RECEIPT;
UInteger32 counter_before_timeout_check;
UInteger32 counter_slave_state; UInteger32 counter_slave_state;
UInteger32 counter_listening_state; UInteger32 counter_listening_state;
UInteger32 counter_wrlinkon_state; UInteger32 counter_wrlinkon_state;
...@@ -91,7 +93,7 @@ struct wr_dsport { ...@@ -91,7 +93,7 @@ struct wr_dsport {
UInteger32 ctr_servo_busy; UInteger32 ctr_servo_busy;
UInteger32 ctr_shw_pps_gen_busy; UInteger32 ctr_shw_pps_gen_busy;
UInteger32 ctr_spll_shifter_busy; UInteger32 ctr_spll_shifter_busy;
#ifdef MON_TO_DEBUG
UInteger16 mon_ext_specific; UInteger16 mon_ext_specific;
#endif #endif
}; };
......
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