Skip to content

P
PPSi
Commit 5a77159d authored by Omar Gabella's avatar Omar Gabella
Browse files
Options

issue fixed

parent 78fffc7a
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 4 deletions
arch-wrpc/wrc_ptp_ppsi.c
View file @ 5a77159d
......@@ -34,10 +34,9 @@ static struct wr_operations wrpc_wr_operations = {
.locking_disable = wrpc_spll_locking_disable,
.enable_ptracker = wrpc_spll_enable_ptracker,
#if defined(BROADCAST_BASE) && defined(BC_EXTRA_MON)
.adjust_in_progress = wrpc_adjust_in_progress_bc,
#else
.adjust_in_progress = wrpc_adjust_in_progress,
.adjust_in_progress_bc = wrpc_adjust_in_progress_bc,
#endif // BROADCAST_BASE && BC_EXTRA_MON
.adjust_in_progress = wrpc_adjust_in_progress,
.adjust_counters = wrpc_adjust_counters,
.adjust_phase = wrpc_adjust_phase,
......
arch-wrpc/wrpc-spll.c
View file @ 5a77159d
......@@ -77,7 +77,7 @@ int wrpc_adjust_in_progress(void)
int wrpc_adjust_in_progress_bc(struct pp_instance *ppi)
{
#if defined(BROADCAST_BASE) && defined(BC_EXTRA_MON)
/* ONLY FOR TESTS */
/* ONLY FOR TESTS */
if (shw_pps_gen_busy())
WR_DSPOR(ppi)->ctr_pps_gen_busy++;
else if (spll_shifter_busy(0))
......
proto-ext-whiterabbit/wr-api.h
View file @ 5a77159d
......@@ -176,6 +176,9 @@ struct wr_operations {
int (*enable_ptracker)(struct pp_instance *ppi);
int (*adjust_in_progress)(void);
#if defined(BROADCAST_BASE) && defined(BC_EXTRA_MON)
int (*adjust_in_progress_bc)(struct pp_instance *ppi);
#endif // BROADCAST_BASE && BC_EXTRA_MON
int (*adjust_counters)(int64_t adjust_sec, int32_t adjust_nsec);
int (*adjust_phase)(int32_t phase_ps);
......
proto-ext-whiterabbit/wr-servo.c
View file @ 5a77159d
......@@ -587,7 +587,11 @@ int wr_servo_update(struct pp_instance *ppi)
}
/* After each action on the hardware, we must verify if it is over. */
#if defined(BROADCAST_BASE) && defined(BC_EXTRA_MON)
if (!wrp->ops->adjust_in_progress_bc(ppi)) {
#else
if (!wrp->ops->adjust_in_progress()) {
#endif // BROADCAST_BASE && BC_EXTRA_MON
s->flags &= ~WR_FLAG_WAIT_HW;
} else {
pp_diag(ppi, servo, 1, "servo:busy\n");
......
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