Skip to content

P
PPSi
Commit ee45a0a6 authored by Aurelio Colosimo's avatar Aurelio Colosimo
Browse files
Options

portState field correctly handled in DSPort Dataset

parent c6de634d
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 2 deletions
proto-ext-whiterabbit/state-disabled.c
View file @ ee45a0a6
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
int pp_disabled(struct pp_instance *ppi, unsigned char *pkt, int plen) int pp_disabled(struct pp_instance *ppi, unsigned char *pkt, int plen)
{ {
/* nothing to do */ /* nothing to do */
DSPOR(ppi)->portState = PPS_DISABLED;
ppi->next_delay = PP_DEFAULT_NEXT_DELAY_MS; ppi->next_delay = PP_DEFAULT_NEXT_DELAY_MS;
return 0; return 0;
} }
proto-ext-whiterabbit/state-faulty.c
View file @ ee45a0a6
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
int pp_faulty(struct pp_instance *ppi, unsigned char *pkt, int plen) int pp_faulty(struct pp_instance *ppi, unsigned char *pkt, int plen)
{ {
DSPOR(ppi)->portState = PPS_FAULTY;
pp_printf("event FAULT_CLEARED\n"); pp_printf("event FAULT_CLEARED\n");
ppi->next_state = PPS_INITIALIZING; ppi->next_state = PPS_INITIALIZING;
ppi->next_delay = PP_DEFAULT_NEXT_DELAY_MS * 4; ppi->next_delay = PP_DEFAULT_NEXT_DELAY_MS * 4;
......
proto-ext-whiterabbit/state-initializing.c
View file @ ee45a0a6
...@@ -23,6 +23,7 @@ int pp_initializing(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -23,6 +23,7 @@ int pp_initializing(struct pp_instance *ppi, unsigned char *pkt, int plen)
if (pp_net_init(ppi) < 0) if (pp_net_init(ppi) < 0)
goto failure; goto failure;
pp_did_init = 1; pp_did_init = 1;
DSPOR(ppi)->portState = PPS_INITIALIZING;
/* Initialize default data set */ /* Initialize default data set */
DSDEF(ppi)->twoStepFlag = PP_TWO_STEP_FLAG; DSDEF(ppi)->twoStepFlag = PP_TWO_STEP_FLAG;
......
proto-ext-whiterabbit/state-listening.c
View file @ ee45a0a6
...@@ -11,8 +11,10 @@ int pp_listening(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -11,8 +11,10 @@ int pp_listening(struct pp_instance *ppi, unsigned char *pkt, int plen)
{ {
int e = 0; /* error var, to check errors in msg handling */ int e = 0; /* error var, to check errors in msg handling */
if (ppi->is_new_state) if (ppi->is_new_state) {
DSPOR(ppi)->portState = PPS_LISTENING;
st_com_restart_annrec_timer(ppi); st_com_restart_annrec_timer(ppi);
}
if (st_com_check_record_update(ppi)) if (st_com_check_record_update(ppi))
goto state_updated; goto state_updated;
......
proto-ext-whiterabbit/state-master.c
View file @ ee45a0a6
...@@ -21,6 +21,7 @@ int pp_master(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -21,6 +21,7 @@ int pp_master(struct pp_instance *ppi, unsigned char *pkt, int plen)
time = &ppi->last_rcv_time; time = &ppi->last_rcv_time;
if (ppi->is_new_state) { if (ppi->is_new_state) {
DSPOR(ppi)->portState = PPS_MASTER;
pp_timer_start(1 << DSPOR(ppi)->logSyncInterval, pp_timer_start(1 << DSPOR(ppi)->logSyncInterval,
ppi->timers[PP_TIMER_SYNC]); ppi->timers[PP_TIMER_SYNC]);
......
proto-ext-whiterabbit/state-passive.c
View file @ ee45a0a6
...@@ -11,6 +11,7 @@ int pp_passive(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -11,6 +11,7 @@ int pp_passive(struct pp_instance *ppi, unsigned char *pkt, int plen)
int e = 0; /* error var, to check errors in msg handling */ int e = 0; /* error var, to check errors in msg handling */
if (ppi->is_new_state) { if (ppi->is_new_state) {
DSPOR(ppi)->portState = PPS_PASSIVE;
pp_timer_start(1 << DSPOR(ppi)->logMinPdelayReqInterval, pp_timer_start(1 << DSPOR(ppi)->logMinPdelayReqInterval,
ppi->timers[PP_TIMER_PDELAYREQ]); ppi->timers[PP_TIMER_PDELAYREQ]);
......
proto-ext-whiterabbit/state-pre-master.c
View file @ ee45a0a6
...@@ -11,5 +11,6 @@ int pp_pre_master(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -11,5 +11,6 @@ int pp_pre_master(struct pp_instance *ppi, unsigned char *pkt, int plen)
* No need of PRE_MASTER state because of only ordinary clock * No need of PRE_MASTER state because of only ordinary clock
* implementation. * implementation.
*/ */
DSPOR(ppi)->portState = PPS_PRE_MASTER;
return 0; return 0;
} }
proto-ext-whiterabbit/state-slave.c
View file @ ee45a0a6
...@@ -19,6 +19,7 @@ int pp_slave(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -19,6 +19,7 @@ int pp_slave(struct pp_instance *ppi, unsigned char *pkt, int plen)
time = &ppi->last_rcv_time; time = &ppi->last_rcv_time;
if (ppi->is_new_state) { if (ppi->is_new_state) {
DSPOR(ppi)->portState = PPS_SLAVE;
pp_init_clock(ppi); pp_init_clock(ppi);
ppi->waiting_for_follow = FALSE; ppi->waiting_for_follow = FALSE;
......
proto-standard/state-disabled.c
View file @ ee45a0a6
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
int pp_disabled(struct pp_instance *ppi, unsigned char *pkt, int plen) int pp_disabled(struct pp_instance *ppi, unsigned char *pkt, int plen)
{ {
/* nothing to do */ /* nothing to do */
DSPOR(ppi)->portState = PPS_DISABLED;
ppi->next_delay = PP_DEFAULT_NEXT_DELAY_MS; ppi->next_delay = PP_DEFAULT_NEXT_DELAY_MS;
return 0; return 0;
} }
proto-standard/state-faulty.c
View file @ ee45a0a6
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
int pp_faulty(struct pp_instance *ppi, unsigned char *pkt, int plen) int pp_faulty(struct pp_instance *ppi, unsigned char *pkt, int plen)
{ {
DSPOR(ppi)->portState = PPS_FAULTY;
pp_printf("event FAULT_CLEARED\n"); pp_printf("event FAULT_CLEARED\n");
ppi->next_state = PPS_INITIALIZING; ppi->next_state = PPS_INITIALIZING;
ppi->next_delay = PP_DEFAULT_NEXT_DELAY_MS * 4; ppi->next_delay = PP_DEFAULT_NEXT_DELAY_MS * 4;
......
proto-standard/state-initializing.c
View file @ ee45a0a6
...@@ -22,6 +22,7 @@ int pp_initializing(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -22,6 +22,7 @@ int pp_initializing(struct pp_instance *ppi, unsigned char *pkt, int plen)
if (pp_net_init(ppi) < 0) if (pp_net_init(ppi) < 0)
goto failure; goto failure;
pp_did_init = 1; pp_did_init = 1;
DSPOR(ppi)->portState = PPS_INITIALIZING;
/* Initialize default data set */ /* Initialize default data set */
DSDEF(ppi)->twoStepFlag = PP_TWO_STEP_FLAG; DSDEF(ppi)->twoStepFlag = PP_TWO_STEP_FLAG;
......
proto-standard/state-listening.c
View file @ ee45a0a6
...@@ -11,8 +11,10 @@ int pp_listening(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -11,8 +11,10 @@ int pp_listening(struct pp_instance *ppi, unsigned char *pkt, int plen)
{ {
int e = 0; /* error var, to check errors in msg handling */ int e = 0; /* error var, to check errors in msg handling */
if (ppi->is_new_state) if (ppi->is_new_state) {
DSPOR(ppi)->portState = PPS_LISTENING;
st_com_restart_annrec_timer(ppi); st_com_restart_annrec_timer(ppi);
}
if (st_com_check_record_update(ppi)) if (st_com_check_record_update(ppi))
goto state_updated; goto state_updated;
......
proto-standard/state-master.c
View file @ ee45a0a6
...@@ -21,6 +21,7 @@ int pp_master(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -21,6 +21,7 @@ int pp_master(struct pp_instance *ppi, unsigned char *pkt, int plen)
time = &ppi->last_rcv_time; time = &ppi->last_rcv_time;
if (ppi->is_new_state) { if (ppi->is_new_state) {
DSPOR(ppi)->portState = PPS_MASTER;
pp_timer_start(1 << DSPOR(ppi)->logSyncInterval, pp_timer_start(1 << DSPOR(ppi)->logSyncInterval,
ppi->timers[PP_TIMER_SYNC]); ppi->timers[PP_TIMER_SYNC]);
......
proto-standard/state-passive.c
View file @ ee45a0a6
...@@ -11,6 +11,7 @@ int pp_passive(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -11,6 +11,7 @@ int pp_passive(struct pp_instance *ppi, unsigned char *pkt, int plen)
int e = 0; /* error var, to check errors in msg handling */ int e = 0; /* error var, to check errors in msg handling */
if (ppi->is_new_state) { if (ppi->is_new_state) {
DSPOR(ppi)->portState = PPS_PASSIVE;
pp_timer_start(1 << DSPOR(ppi)->logMinPdelayReqInterval, pp_timer_start(1 << DSPOR(ppi)->logMinPdelayReqInterval,
ppi->timers[PP_TIMER_PDELAYREQ]); ppi->timers[PP_TIMER_PDELAYREQ]);
......
proto-standard/state-pre-master.c
View file @ ee45a0a6
...@@ -11,5 +11,6 @@ int pp_pre_master(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -11,5 +11,6 @@ int pp_pre_master(struct pp_instance *ppi, unsigned char *pkt, int plen)
* No need of PRE_MASTER state because of only ordinary clock * No need of PRE_MASTER state because of only ordinary clock
* implementation. * implementation.
*/ */
DSPOR(ppi)->portState = PPS_PRE_MASTER;
return 0; return 0;
} }
proto-standard/state-slave.c
View file @ ee45a0a6
...@@ -19,6 +19,7 @@ int pp_slave(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -19,6 +19,7 @@ int pp_slave(struct pp_instance *ppi, unsigned char *pkt, int plen)
time = &ppi->last_rcv_time; time = &ppi->last_rcv_time;
if (ppi->is_new_state) { if (ppi->is_new_state) {
DSPOR(ppi)->portState = PPS_SLAVE;
pp_init_clock(ppi); pp_init_clock(ppi);
ppi->waiting_for_follow = FALSE; ppi->waiting_for_follow = FALSE;
......
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