Commit fe3ed177 authored by Alessandro Rubini's avatar Alessandro Rubini Committed by Aurelio Colosimo

timer names: reduced in length

I removed the trailing "interval" in all of them but announce, that
has both receipt and interval. This shortens some almost-80-cols
lines.  I'm not sure it's the right thing to do, but timer names are
unreadable anyways.
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent f7a6b4e5
......@@ -35,11 +35,12 @@
#define PP_DEFAULT_MAX_FOREIGN_RECORDS 5
#define PP_DEFAULT_PARENTS_STATS 0
#define PP_TIMER_PDELAYREQ_INTERVAL 0
#define PP_TIMER_DELAYREQ_INTERVAL 1
#define PP_TIMER_SYNC_INTERVAL 2
#define PP_TIMER_ANNOUNCE_RECEIPT 3
#define PP_TIMER_ANNOUNCE_INTERVAL 4
/* We use an array of timers, with these indexes */
#define PP_TIMER_PDELAYREQ 0
#define PP_TIMER_DELAYREQ 1
#define PP_TIMER_SYNC 2
#define PP_TIMER_ANN_RECEIPT 3
#define PP_TIMER_ANN_INTERVAL 4
#define PP_TIMER_ARRAY_SIZE 5
#define PP_TWO_STEP_FLAG 2
......
......@@ -6,7 +6,7 @@
void st_com_execute_slave(struct pp_instance *ppi)
{
if (pp_timer_expired(ppi->timers[PP_TIMER_ANNOUNCE_RECEIPT])) {
if (pp_timer_expired(ppi->timers[PP_TIMER_ANN_RECEIPT])) {
/* FIXME diag
* DBGV("event ANNOUNCE_RECEIPT_TIMEOUT_EXPIRES\n");
*/
......@@ -23,14 +23,14 @@ void st_com_execute_slave(struct pp_instance *ppi)
}
if (ppi->rt_opts->e2e_mode) {
if (pp_timer_expired(ppi->timers[PP_TIMER_DELAYREQ_INTERVAL])) {
if (pp_timer_expired(ppi->timers[PP_TIMER_DELAYREQ])) {
/* FIXME diag
* DBGV("event DELAYREQ_INTERVAL_TIMEOUT_EXPIRES\n");
*/
/* TODO issueDelayReq(rtOpts,ptpClock); */
}
} else {
if (pp_timer_expired(ppi->timers[PP_TIMER_PDELAYREQ_INTERVAL]))
if (pp_timer_expired(ppi->timers[PP_TIMER_PDELAYREQ]))
{
/* FIXME diag
DBGV("event PDELAYREQ_INTERVAL_TIMEOUT_EXPIRES\n");
......@@ -47,7 +47,7 @@ void st_com_restart_annrec_timer(struct pp_instance *ppi)
* shift?*/
pp_timer_start((DSPOR(ppi)->announceReceiptTimeout) <<
DSPOR(ppi)->logAnnounceInterval,
ppi->timers[PP_TIMER_ANNOUNCE_RECEIPT]);
ppi->timers[PP_TIMER_ANN_RECEIPT]);
}
......
......@@ -33,7 +33,7 @@ int pp_listening(struct pp_instance *ppi, unsigned char *pkt, int plen)
state_updated:
/* Leaving this state */
if (ppi->next_state != ppi->state)
pp_timer_stop(ppi->timers[PP_TIMER_ANNOUNCE_RECEIPT]);
pp_timer_stop(ppi->timers[PP_TIMER_ANN_RECEIPT]);
ppi->next_delay = PP_DEFAULT_NEXT_DELAY_MS;
......
......@@ -16,26 +16,26 @@ int pp_master(struct pp_instance *ppi, unsigned char *pkt, int plen)
if (ppi->is_new_state) {
pp_timer_start(1 << DSPOR(ppi)->logSyncInterval,
ppi->timers[PP_TIMER_SYNC_INTERVAL]);
ppi->timers[PP_TIMER_SYNC]);
pp_timer_start(1 << DSPOR(ppi)->logAnnounceInterval,
ppi->timers[PP_TIMER_ANNOUNCE_INTERVAL]);
ppi->timers[PP_TIMER_ANN_INTERVAL]);
pp_timer_start(1 << DSPOR(ppi)->logMinPdelayReqInterval,
ppi->timers[PP_TIMER_PDELAYREQ_INTERVAL]);
ppi->timers[PP_TIMER_PDELAYREQ]);
}
if (st_com_check_record_update(ppi))
goto state_updated;
if (pp_timer_expired(ppi->timers[PP_TIMER_SYNC_INTERVAL])) {
if (pp_timer_expired(ppi->timers[PP_TIMER_SYNC])) {
/* FIXME diag
* DBGV("event SYNC_INTERVAL_TIMEOUT_EXPIRES\n");
*/
/* TODO issueSync(rtOpts, ptpClock); */
}
if (pp_timer_expired(ppi->timers[PP_TIMER_ANNOUNCE_INTERVAL])) {
if (pp_timer_expired(ppi->timers[PP_TIMER_ANN_INTERVAL])) {
/* FIXME diag
* DBGV("event ANNOUNCE_INTERVAL_TIMEOUT_EXPIRES\n");
*/
......@@ -43,8 +43,7 @@ int pp_master(struct pp_instance *ppi, unsigned char *pkt, int plen)
}
if (!ppi->rt_opts->e2e_mode) {
if (pp_timer_expired(ppi->timers[PP_TIMER_PDELAYREQ_INTERVAL]))
{
if (pp_timer_expired(ppi->timers[PP_TIMER_PDELAYREQ])) {
/* FIXME diag
* DBGV("event PDELAYREQ_INTERVAL_TIMEOUT_EXPIRES\n");
*/
......@@ -191,9 +190,9 @@ int pp_master(struct pp_instance *ppi, unsigned char *pkt, int plen)
state_updated:
/* Leaving this state */
if (ppi->next_state != ppi->state) {
pp_timer_stop(ppi->timers[PP_TIMER_SYNC_INTERVAL]);
pp_timer_stop(ppi->timers[PP_TIMER_ANNOUNCE_INTERVAL]);
pp_timer_stop(ppi->timers[PP_TIMER_PDELAYREQ_INTERVAL]);
pp_timer_stop(ppi->timers[PP_TIMER_SYNC]);
pp_timer_stop(ppi->timers[PP_TIMER_ANN_INTERVAL]);
pp_timer_stop(ppi->timers[PP_TIMER_PDELAYREQ]);
}
ppi->next_delay = PP_DEFAULT_NEXT_DELAY_MS;
......
......@@ -11,7 +11,7 @@ int pp_passive(struct pp_instance *ppi, unsigned char *pkt, int plen)
if (ppi->is_new_state) {
pp_timer_start(1 << DSPOR(ppi)->logMinPdelayReqInterval,
ppi->timers[PP_TIMER_PDELAYREQ_INTERVAL]);
ppi->timers[PP_TIMER_PDELAYREQ]);
st_com_restart_annrec_timer(ppi);
}
......@@ -44,8 +44,8 @@ int pp_passive(struct pp_instance *ppi, unsigned char *pkt, int plen)
state_updated:
/* Leaving this state */
if (ppi->next_state != ppi->state) {
pp_timer_stop(ppi->timers[PP_TIMER_ANNOUNCE_RECEIPT]);
pp_timer_stop(ppi->timers[PP_TIMER_PDELAYREQ_INTERVAL]);
pp_timer_stop(ppi->timers[PP_TIMER_ANN_RECEIPT]);
pp_timer_stop(ppi->timers[PP_TIMER_PDELAYREQ]);
}
ppi->next_delay = PP_DEFAULT_NEXT_DELAY_MS;
......
......@@ -31,10 +31,10 @@ int pp_slave(struct pp_instance *ppi, unsigned char *pkt, int plen)
if (ppi->rt_opts->e2e_mode)
pp_timer_start(1 << DSPOR(ppi)->logMinDelayReqInterval,
ppi->timers[PP_TIMER_DELAYREQ_INTERVAL]);
ppi->timers[PP_TIMER_DELAYREQ]);
else
pp_timer_start(1 << DSPOR(ppi)->logMinPdelayReqInterval,
ppi->timers[PP_TIMER_PDELAYREQ_INTERVAL]);
ppi->timers[PP_TIMER_PDELAYREQ]);
}
if (st_com_check_record_update(ppi))
......@@ -259,12 +259,12 @@ state_updated:
/* Leaving this state */
if (ppi->next_state != ppi->state) {
pp_timer_stop(ppi->timers[PP_TIMER_ANNOUNCE_RECEIPT]);
pp_timer_stop(ppi->timers[PP_TIMER_ANN_RECEIPT]);
if (ppi->rt_opts->e2e_mode)
pp_timer_stop(ppi->timers[PP_TIMER_DELAYREQ_INTERVAL]);
pp_timer_stop(ppi->timers[PP_TIMER_DELAYREQ]);
else
pp_timer_stop(ppi->timers[PP_TIMER_PDELAYREQ_INTERVAL]);
pp_timer_stop(ppi->timers[PP_TIMER_PDELAYREQ]);
pp_init_clock(ppi);
}
......
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