Skip to content

S
Software for White Rabbit PTP Core
Commit ed59a870 authored by Adam Wujek's avatar Adam Wujek 💬 Committed by Alessandro Rubini
Browse files
Options

main: trigger PTP start/stop from wrpc, remove old/wrong prototype 

Trigger start/stop of PTP from wrc_check_link job instead of PTP's job.
This picks ppsi's new master that matches the change.

We need to remove prototype for an unused function, now that the one
in ppsi changed arguments and we'd otherwise get

  error: conflicting types for 'wr_servo_reset'
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
Signed-off-by: 's avatarAlessandro Rubini <a.rubini@gsi.de>
parent a6a7a489
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
include/wrc.h
View file @ ed59a870
......@@ -53,9 +53,6 @@ void shell_init(void);
/* This is in the library, somewhere */
extern int abs(int val);
/* The following from ptp-noposix */
extern void wr_servo_reset(void);
/* refresh period for _gui_ and _stat_ commands */
extern int wrc_ui_refperiod;
......
ppsi @ c93d7100
Subproject commit 5c5c8039bf416ccd8aae42be232ee09e3167d2ba
Subproject commit c93d7100eb7a87d41c0422dd1e033196231e3ce7
wrc_main.c
View file @ ed59a870
......@@ -121,12 +121,14 @@ static int wrc_check_link(void)
if (!prev_state && state) {
wrc_verbose("Link up.\n");
gpio_out(GPIO_LED_LINK, 1);
wrc_ptp_start();
link_status = LINK_WENT_UP;
rv = 1;
} else if (prev_state && !state) {
wrc_verbose("Link down.\n");
gpio_out(GPIO_LED_LINK, 0);
link_status = LINK_WENT_DOWN;
wrc_ptp_stop();
rv = 1;
/* special case */
spll_init(SPLL_MODE_FREE_RUNNING_MASTER, 0, 1);
......
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