Skip to content

S
Software for White Rabbit PTP Core
Commit b07602de authored by Aurelio Colosimo's avatar Aurelio Colosimo Committed by Alessandro Rubini
Browse files
Options

ppsi: fix master/slave selection to be selected by wrpc-sw 

ppsi module now correctly handles mode shell command
Signed-off-by: Aurelio Colosimo's avatarAurelio Colosimo <aurelio@aureliocolosimo.it>
parent b069c347
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 9 deletions
ppsi @ 90411237
Subproject commit 22c7e74fbd627dfc1a8eb3bcc3954a5abd3c20fd Subproject commit 904112373dde5a6537b9d2039d8da3f0515a0f1f
wrc_ptp_ppsi.c
View file @ b07602de
...@@ -60,11 +60,6 @@ int wrc_ptp_init() ...@@ -60,11 +60,6 @@ int wrc_ptp_init()
ppi->frgn_master = &frgn_master; ppi->frgn_master = &frgn_master;
ppi->arch_data = NULL; ppi->arch_data = NULL;
#ifdef PPSI_SLAVE
/* FIXME slave_only */
OPTS(ppi)->slave_only = 1;
#endif
return 0; return 0;
} }
...@@ -84,7 +79,8 @@ int wrc_ptp_set_mode(int mode) ...@@ -84,7 +79,8 @@ int wrc_ptp_set_mode(int mode)
case WRC_MODE_GM: case WRC_MODE_GM:
/* FIXME multiport rtOpts.primarySource = TRUE; */ /* FIXME multiport rtOpts.primarySource = TRUE; */
DSPOR(ppi)->wrConfig = WR_M_ONLY; DSPOR(ppi)->wrConfig = WR_M_ONLY;
/* FIXME multiport? rtOpts.masterOnly = TRUE; */ OPTS(ppi)->master_only = TRUE;
OPTS(ppi)->slave_only = FALSE;
spll_init(SPLL_MODE_GRAND_MASTER, 0, 1); spll_init(SPLL_MODE_GRAND_MASTER, 0, 1);
lock_timeout = LOCK_TIMEOUT_GM; lock_timeout = LOCK_TIMEOUT_GM;
break; break;
...@@ -92,7 +88,8 @@ int wrc_ptp_set_mode(int mode) ...@@ -92,7 +88,8 @@ int wrc_ptp_set_mode(int mode)
case WRC_MODE_MASTER: case WRC_MODE_MASTER:
/* FIXME multiport rtOpts.primarySource = FALSE; */ /* FIXME multiport rtOpts.primarySource = FALSE; */
DSPOR(ppi)->wrConfig = WR_M_ONLY; DSPOR(ppi)->wrConfig = WR_M_ONLY;
/* FIXME multiport? rtOpts.masterOnly = TRUE; */ OPTS(ppi)->master_only = TRUE;
OPTS(ppi)->slave_only = FALSE;
spll_init(SPLL_MODE_FREE_RUNNING_MASTER, 0, 1); spll_init(SPLL_MODE_FREE_RUNNING_MASTER, 0, 1);
lock_timeout = LOCK_TIMEOUT_FM; lock_timeout = LOCK_TIMEOUT_FM;
break; break;
...@@ -100,7 +97,8 @@ int wrc_ptp_set_mode(int mode) ...@@ -100,7 +97,8 @@ int wrc_ptp_set_mode(int mode)
case WRC_MODE_SLAVE: case WRC_MODE_SLAVE:
/* FIXME multiport rtOpts.primarySource = FALSE; */ /* FIXME multiport rtOpts.primarySource = FALSE; */
DSPOR(ppi)->wrConfig = WR_S_ONLY; DSPOR(ppi)->wrConfig = WR_S_ONLY;
/* FIXME multiport? rtOpts.masterOnly = FALSE; */ OPTS(ppi)->master_only = FALSE;
OPTS(ppi)->slave_only = TRUE;
spll_init(SPLL_MODE_SLAVE, 0, 1); spll_init(SPLL_MODE_SLAVE, 0, 1);
break; break;
} }
......
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