Skip to content

P
PPSi
Commit e0e64285 authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

bugfix: wr: a function was renamed 

We don't have st_com_restart_annrec_timer any more, but
I forgot to remove its prototype from the headers. This lead
to a link failure in wrpc-sw with the ppsi submodule.

But introduced in 415e530e, 96 commits ago.
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 3e2ad33b
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
proto-ext-whiterabbit/hooks.c
View file @ e0e64285
...@@ -111,7 +111,7 @@ static int wr_execute_slave(struct pp_instance *ppi) ...@@ -111,7 +111,7 @@ static int wr_execute_slave(struct pp_instance *ppi)
return 0; return 0;
ppi->next_state = PPS_INITIALIZING; ppi->next_state = PPS_INITIALIZING;
st_com_restart_annrec_timer(ppi); pp_timeout_restart_annrec(ppi);
WR_DSPOR(ppi)->doRestart = FALSE; WR_DSPOR(ppi)->doRestart = FALSE;
return 1; /* the caller returns too */ return 1; /* the caller returns too */
} }
......
proto-ext-whiterabbit/state-wr-present.c
View file @ e0e64285
...@@ -18,7 +18,7 @@ int wr_present(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -18,7 +18,7 @@ int wr_present(struct pp_instance *ppi, unsigned char *pkt, int plen)
WR_DSPOR(ppi)->wrMode = WR_SLAVE; WR_DSPOR(ppi)->wrMode = WR_SLAVE;
pp_timeout_set(ppi, PP_TO_EXT_0, pp_timeout_set(ppi, PP_TO_EXT_0,
WR_WRS_PRESENT_TIMEOUT_MS); WR_WRS_PRESENT_TIMEOUT_MS);
st_com_restart_annrec_timer(ppi); pp_timeout_restart_annrec(ppi);
e = msg_issue_wrsig(ppi, SLAVE_PRESENT); e = msg_issue_wrsig(ppi, SLAVE_PRESENT);
} }
......
proto-standard/common-fun.h
View file @ e0e64285
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
/* returns -1 in case of error, see below */ /* returns -1 in case of error, see below */
int st_com_execute_slave(struct pp_instance *ppi); int st_com_execute_slave(struct pp_instance *ppi);
void st_com_restart_annrec_timer(struct pp_instance *ppi);
/* Each of the following "handle" functions" return 0 in case of correct /* Each of the following "handle" functions" return 0 in case of correct
* message, -1 in case the message contained in buf is not proper (e.g. size * message, -1 in case the message contained in buf is not proper (e.g. size
* is not the expected one * is not the expected one
......
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