Update spll_init() calls to accomodate API changes

b15bdf98 · Tomasz Wlostowski · Grzegorz Daniluk · ff12ee24 · b15bdf98 · b15bdf98
Commit b15bdf98 authored Mar 19, 2020 by Tomasz Wlostowski Committed by Grzegorz Daniluk Apr 24, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 4 deletions

rxts_calibrator.c dev/rxts_calibrator.c +1 -1

spll.c host/spll.c +1 -1

rt_ipc.c ipc/rt_ipc.c +10 -1

wrc_main.c wrc_main.c +1 -1

No files found.
--- a/dev/rxts_calibrator.c
+++ b/dev/rxts_calibrator.c
@@ -201,7 +201,7 @@ int measure_t24p(uint32_t *value)
 	while (!ep_link_up(NULL))
 		timer_delay_ms(100);

-	spll_init(SPLL_MODE_SLAVE, 0, 1);
+	spll_init(SPLL_MODE_SLAVE, 0, SPLL_FLAG_USE_LJD);
 	pp_printf("Locking PLL...\n");
 	while (!spll_check_lock(0))
 		timer_delay_ms(100);

--- a/host/spll.c
+++ b/host/spll.c
@@ -3,7 +3,7 @@
 void spll_very_init(void)
 {}

-void spll_init(int mode, int ref_channel, int align_pps)
+void spll_init(int mode, int ref_channel, int flags)
 {}

 void spll_enable_ptracker(int ref_channel, int enable)

--- a/ipc/rt_ipc.c
+++ b/ipc/rt_ipc.c
@@ -21,6 +21,8 @@

 static struct rts_pll_state pstate;

+extern int scb_ljd_present;
+
 static void clear_state(void)
 {
 	int i;
@@ -71,7 +73,14 @@ int rts_set_mode(int mode)
 		{
 			pp_printf("RT: Setting mode to %s.\n", options[i].desc);
 			if(options[i].do_init)
-				spll_init(options[i].mode_spll, 0, 1);
+			{
+				uint32_t flags = SPLL_FLAG_ALIGN_PPS;
+
+				if( scb_ljd_present )
+					flags |= SPLL_FLAG_USE_LJD;
+
+				spll_init(options[i].mode_spll, 0, flags);
+			}
 			else
 				spll_init(SPLL_MODE_DISABLED, 0, 0);
 		}

--- a/wrc_main.c
+++ b/wrc_main.c
@@ -133,7 +133,7 @@ static int wrc_check_link(void)
 		wrc_ptp_stop();
 		rv = 1;
 		/* special case */
-		spll_init(SPLL_MODE_FREE_RUNNING_MASTER, 0, 1);
+		spll_init(SPLL_MODE_FREE_RUNNING_MASTER, 0, SPLL_FLAG_ALIGN_PPS);
 		shw_pps_gen_enable_output(0);

 	} else