Skip to content

P
PPSi
Commit f7a6b4e5 authored by Alessandro Rubini's avatar Alessandro Rubini Committed by Aurelio Colosimo
Browse files
Options

general: ppi must be first argument 

the "ppi" object instance should consistently be the first argument of
functions that receive it. Besides being more consistent, it's smaller
and faster too (on processors with more than 4 registers, I mean).
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 55129ce9
Hide whitespace changes
Inline Side-by-side
Showing with 116 additions and 109 deletions
fsm.c
View file @ f7a6b4e5
......@@ -19,7 +19,7 @@ int pp_state_machine(struct pp_instance *ppi, uint8_t *packet, int plen)
int state, err;
if (packet)
msg_unpack_header(packet, ppi);
msg_unpack_header(ppi, packet);
state = ppi->state;
......
include/pptp/pptp.h
View file @ f7a6b4e5
......@@ -192,44 +192,48 @@ extern int pp_timer_expired(struct pp_timer *tm); /* returns 1 when expired */
/* Servo */
extern void pp_init_clock(struct pp_instance *ppi);
extern void pp_update_offset(TimeInternal *send_time, TimeInternal *recv_time,
TimeInternal *correctionField, struct pp_instance *ppi);
extern void pp_update_offset(struct pp_instance *ppi,
TimeInternal *send_time,
TimeInternal *recv_time,
TimeInternal *correctionField);
/* FIXME: offset_from_master_filter: put it in ppi */
extern void pp_update_clock(struct pp_instance *ppi);
/* bmc.c */
extern void m1(struct pp_instance *ppi);
extern void s1(MsgHeader *header, MsgAnnounce *ann, struct pp_instance *ppi);
extern UInteger8 bmc(struct pp_frgn_master *frgn_master,
struct pp_runtime_opts *rt_opts, struct pp_instance *ppi);
extern void s1(struct pp_instance *ppi, MsgHeader *header, MsgAnnounce *ann);
extern UInteger8 bmc(struct pp_instance *ppi,
struct pp_frgn_master *frgn_master,
struct pp_runtime_opts *rt_opts);
/* msg.c */
extern void msg_pack_header(void *buf, struct pp_instance *ppi);
extern void msg_unpack_header(void *buf, struct pp_instance *ppi);
extern void msg_pack_header(struct pp_instance *ppi, void *buf);
extern void msg_unpack_header(struct pp_instance *ppi, void *buf);
void *msg_copy_header(MsgHeader *dest, MsgHeader *src);
extern void msg_pack_sync(void *buf, Timestamp *orig_tstamp,
struct pp_instance *ppi);
extern void msg_pack_sync(struct pp_instance *ppi, void *buf,
Timestamp *orig_tstamp);
extern void msg_unpack_sync(void *buf, MsgSync *sync);
extern void msg_pack_announce(void *buf, struct pp_instance *ppi);
extern void msg_pack_announce(struct pp_instance *ppi, void *buf);
extern void msg_unpack_announce(void *buf, MsgAnnounce *ann);
extern void msg_pack_follow_up(void *buf, Timestamp *prec_orig_tstamp,
struct pp_instance *ppi);
extern void msg_pack_follow_up(struct pp_instance *ppi, void *buf,
Timestamp *prec_orig_tstamp);
extern void msg_unpack_follow_up(void *buf, MsgFollowUp *flwup);
extern void msg_pack_pdelay_req(void *buf, Timestamp *orig_tstamp,
struct pp_instance *ppi);
extern void msg_pack_pdelay_req(struct pp_instance *ppi, void *buf,
Timestamp *orig_tstamp);
extern void msg_unpack_pdelay_req(void *buf, MsgPDelayReq *pdelay_req);
extern void msg_pack_delay_req(void *buf, Timestamp *orig_tstamp,
struct pp_instance *ppi);
extern void msg_pack_delay_req(struct pp_instance *ppi, void *buf,
Timestamp *orig_tstamp);
extern void msg_unpack_delay_req(void *buf, MsgDelayReq *delay_req);
extern void msg_pack_delay_resp(void *buf, MsgHeader *hdr,
Timestamp *rcv_tstamp, struct pp_instance *ppi);
extern void msg_pack_delay_resp(struct pp_instance *ppi, void *buf,
MsgHeader *hdr, Timestamp *rcv_tstamp);
extern void msg_unpack_delay_resp(void *buf, MsgDelayResp *resp);
extern void msg_pack_pdelay_resp(void *buf, MsgHeader *hdr,
Timestamp *req_rec_tstamp, struct pp_instance *ppi);
extern void msg_pack_pdelay_resp(struct pp_instance *ppi, void *buf,
MsgHeader *hdr, Timestamp *req_rec_tstamp);
extern void msg_unpack_pdelay_resp(void *buf, MsgPDelayResp *presp);
extern void msg_pack_pdelay_resp_followup(void *buf, MsgHeader *hdr,
Timestamp *resp_orig_tstamp, struct pp_instance *ppi);
extern void msg_pack_pdelay_resp_followup(struct pp_instance *ppi, void *buf,
MsgHeader *hdr,
Timestamp *resp_orig_tstamp);
extern void msg_unpack_pdelay_resp_followup(void *buf,
MsgPDelayRespFollowUp *presp_follow);
......
proto-standard/bmc.c
View file @ f7a6b4e5
......@@ -37,7 +37,7 @@ void m1(struct pp_instance *ppi)
/* Local clock is synchronized to Ebest Table 16 (9.3.5) of the spec. */
void s1(MsgHeader *hdr, MsgAnnounce *ann, struct pp_instance *ppi)
void s1(struct pp_instance *ppi, MsgHeader *hdr, MsgAnnounce *ann)
{
/* Current DS */
DSCUR(ppi)->stepsRemoved = ann->stepsRemoved + 1;
......@@ -78,7 +78,7 @@ void s1(MsgHeader *hdr, MsgAnnounce *ann, struct pp_instance *ppi)
/* Copy local data set into header and ann message. 9.3.4 table 12. */
void copy_d0(MsgHeader *hdr, MsgAnnounce *ann, struct pp_instance *ppi)
void copy_d0( struct pp_instance *ppi, MsgHeader *hdr, MsgAnnounce *ann)
{
ann->grandmasterPriority1 = DSDEF(ppi)->priority1;
pp_memcpy(ann->grandmasterIdentity, DSDEF(ppi)->clockIdentity,
......@@ -100,9 +100,9 @@ void copy_d0(MsgHeader *hdr, MsgAnnounce *ann, struct pp_instance *ppi)
* Data set comparison bewteen two foreign masters (9.3.4 fig 27)
* return similar to memcmp()
*/
Integer8 bmc_dataset_cmp(MsgHeader *hdr_a, MsgAnnounce *ann_a,
MsgHeader *hdr_b, MsgAnnounce *ann_b,
struct pp_instance *ppi)
Integer8 bmc_dataset_cmp(struct pp_instance *ppi,
MsgHeader *hdr_a, MsgAnnounce *ann_a,
MsgHeader *hdr_b, MsgAnnounce *ann_b)
{
/* FIXME DBGV("Data set comparison \n"); */
short comp = 0;
......@@ -232,25 +232,27 @@ Integer8 bmc_dataset_cmp(MsgHeader *hdr_a, MsgAnnounce *ann_a,
}
/* State decision algorithm 9.3.3 Fig 26 */
UInteger8 bmc_state_decision(MsgHeader *hdr, MsgAnnounce *ann,
struct pp_runtime_opts *rt_opts, struct pp_instance *ppi)
UInteger8 bmc_state_decision( struct pp_instance *ppi,
MsgHeader *hdr, MsgAnnounce *ann,
struct pp_runtime_opts *rt_opts)
{
int cmpres;
if (rt_opts->slave_only) {
s1(hdr, ann, ppi);
s1(ppi, hdr, ann);
return PPS_SLAVE;
}
if ((!ppi->number_foreign_records) && (ppi->state == PPS_LISTENING))
return PPS_LISTENING;
copy_d0(&ppi->msg_tmp_header, &ppi->msg_tmp.announce, ppi);
copy_d0(ppi, &ppi->msg_tmp_header, &ppi->msg_tmp.announce);
cmpres = bmc_dataset_cmp(&ppi->msg_tmp_header,
cmpres = bmc_dataset_cmp(ppi,
&ppi->msg_tmp_header,
&ppi->msg_tmp.announce,
hdr, ann, ppi);
hdr, ann);
if (DSDEF(ppi)->clockQuality.clockClass < 128) {
......@@ -258,7 +260,7 @@ UInteger8 bmc_state_decision(MsgHeader *hdr, MsgAnnounce *ann,
m1(ppi);
return PPS_MASTER;
} else if (cmpres > 0) {
s1(hdr, ann, ppi);
s1(ppi, hdr, ann);
return PPS_PASSIVE;
} else {
/* FIXME DBG("Error in bmcDataSetComparison..\n"); */
......@@ -270,7 +272,7 @@ UInteger8 bmc_state_decision(MsgHeader *hdr, MsgAnnounce *ann,
m1(ppi);
return PPS_MASTER;
} else if (cmpres > 0) {
s1(hdr, ann, ppi);
s1(ppi, hdr, ann);
return PPS_SLAVE;
} else {
/* FIXME DBG("Error in bmcDataSetComparison..\n"); */
......@@ -285,8 +287,8 @@ UInteger8 bmc_state_decision(MsgHeader *hdr, MsgAnnounce *ann,
UInteger8 bmc(struct pp_frgn_master *frgn_master,
struct pp_runtime_opts *rt_opts, struct pp_instance *ppi)
UInteger8 bmc(struct pp_instance *ppi, struct pp_frgn_master *frgn_master,
struct pp_runtime_opts *rt_opts)
{
Integer16 i, best;
......@@ -297,17 +299,17 @@ UInteger8 bmc(struct pp_frgn_master *frgn_master,
}
for (i = 1, best = 0; i < ppi->number_foreign_records; i++)
if ((bmc_dataset_cmp(&frgn_master[i].hdr,
if (bmc_dataset_cmp(ppi,
&frgn_master[i].hdr,
&frgn_master[i].ann,
&frgn_master[best].hdr,
&frgn_master[best].ann,
ppi)) < 0)
&frgn_master[best].ann) < 0)
best = i;
/* FIXME DBGV("Best record : %d \n",best); */
ppi->foreign_record_best = best;
return bmc_state_decision(&frgn_master[best].hdr,
return bmc_state_decision(ppi, &frgn_master[best].hdr,
&frgn_master[best].ann,
rt_opts, ppi);
rt_opts);
}
proto-standard/common-fun.c
View file @ f7a6b4e5
......@@ -56,8 +56,7 @@ int st_com_check_record_update(struct pp_instance *ppi)
if (ppi->record_update) {
/* FIXME diag DBGV("event STATE_DECISION_EVENT\n"); */
ppi->record_update = FALSE;
ppi->next_state = bmc(ppi->frgn_master,
ppi->rt_opts, ppi);
ppi->next_state = bmc(ppi, ppi->frgn_master, ppi->rt_opts);
if (ppi->next_state != ppi->state)
return 1;
......@@ -65,7 +64,7 @@ int st_com_check_record_update(struct pp_instance *ppi)
return 0;
}
void st_com_add_foreign(unsigned char *buf, struct pp_instance *ppi)
void st_com_add_foreign(struct pp_instance *ppi, unsigned char *buf)
{
int i, j;
int found = 0;
......@@ -130,8 +129,8 @@ void st_com_add_foreign(unsigned char *buf, struct pp_instance *ppi)
}
int st_com_slave_handle_announce(unsigned char *buf, int len,
struct pp_instance *ppi)
int st_com_slave_handle_announce(struct pp_instance *ppi, unsigned char *buf,
int len)
{
MsgHeader *hdr = &ppi->msg_tmp_header;
......@@ -149,10 +148,10 @@ int st_com_slave_handle_announce(unsigned char *buf, int len,
if (!ppi->is_from_cur_par) {
msg_unpack_announce(buf, &ppi->msg_tmp.announce);
s1(hdr, &ppi->msg_tmp.announce, ppi);
s1(ppi, hdr, &ppi->msg_tmp.announce);
} else {
/* st_com_add_foreign takes care of announce unpacking */
st_com_add_foreign(buf, ppi);
st_com_add_foreign(ppi, buf);
}
/*Reset Timer handling Announce receipt timeout*/
......@@ -161,8 +160,8 @@ int st_com_slave_handle_announce(unsigned char *buf, int len,
return 0;
}
int st_com_slave_handle_sync(unsigned char *buf, int len, TimeInternal *time,
struct pp_instance *ppi)
int st_com_slave_handle_sync(struct pp_instance *ppi, unsigned char *buf,
int len, TimeInternal *time)
{
TimeInternal origin_tstamp;
TimeInternal correction_field;
......@@ -208,17 +207,17 @@ int st_com_slave_handle_sync(unsigned char *buf, int len, TimeInternal *time,
ppi->waiting_for_follow = FALSE;
to_TimeInternal(&origin_tstamp,
&ppi->msg_tmp.sync.originTimestamp);
pp_update_offset(&origin_tstamp,
pp_update_offset(ppi, &origin_tstamp,
&ppi->sync_receive_time,
&correction_field, ppi);
&correction_field);
pp_update_clock(ppi);
}
}
return 0;
}
int st_com_slave_handle_followup(unsigned char *buf, int len,
struct pp_instance *ppi)
int st_com_slave_handle_followup(struct pp_instance *ppi, unsigned char *buf,
int len)
{
TimeInternal precise_orig_timestamp;
TimeInternal correction_field;
......@@ -262,17 +261,17 @@ int st_com_slave_handle_followup(unsigned char *buf, int len,
add_TimeInternal(&correction_field, &correction_field,
&ppi->last_sync_corr_field);
pp_update_offset(&precise_orig_timestamp,
pp_update_offset(ppi, &precise_orig_timestamp,
&ppi->sync_receive_time,
&correction_field, ppi);
&correction_field);
pp_update_clock(ppi);
return 0;
}
int st_com_handle_pdelay_req(unsigned char *buf, int len,
TimeInternal *time, struct pp_instance *ppi)
int st_com_handle_pdelay_req(struct pp_instance *ppi, unsigned char *buf,
int len, TimeInternal *time)
{
MsgHeader *hdr = &ppi->msg_tmp_header;
......@@ -304,8 +303,8 @@ int st_com_handle_pdelay_req(unsigned char *buf, int len,
return 0;
}
int st_com_master_handle_announce(unsigned char *buf, int len,
struct pp_instance *ppi)
int st_com_master_handle_announce(struct pp_instance *ppi, unsigned char *buf,
int len)
{
if (len < PP_ANNOUNCE_LENGTH)
return -1;
......@@ -321,15 +320,15 @@ int st_com_master_handle_announce(unsigned char *buf, int len,
* DBGV("Announce message from another foreign master");
*/
st_com_add_foreign(buf, ppi);
st_com_add_foreign(ppi, buf);
ppi->record_update = TRUE;
return 0;
}
int st_com_master_handle_sync(unsigned char *buf, int len, TimeInternal *time,
struct pp_instance *ppi)
int st_com_master_handle_sync(struct pp_instance *ppi, unsigned char *buf,
int len, TimeInternal *time)
{
if (len < PP_SYNC_LENGTH)
return -1;
......
proto-standard/common-fun.h
View file @ f7a6b4e5
......@@ -17,20 +17,20 @@ void st_com_add_foreign(unsigned char *buf, MsgHeader *header,
struct pp_instance *ppi);
*/
int st_com_slave_handle_announce(unsigned char *buf, int len,
struct pp_instance *ppi);
int st_com_slave_handle_announce(struct pp_instance *ppi, unsigned char *buf,
int len);
int st_com_master_handle_announce(unsigned char *buf, int len,
struct pp_instance *ppi);
int st_com_master_handle_announce(struct pp_instance *ppi, unsigned char *buf,
int len);
int st_com_slave_handle_sync(unsigned char *buf, int len, TimeInternal *time,
struct pp_instance *ppi);
int st_com_slave_handle_sync(struct pp_instance *ppi, unsigned char *buf,
int len, TimeInternal *time);
int st_com_master_handle_sync(unsigned char *buf, int len, TimeInternal *time,
struct pp_instance *ppi);
int st_com_master_handle_sync(struct pp_instance *ppi, unsigned char *buf,
int len, TimeInternal *time);
int st_com_slave_handle_followup(unsigned char *buf, int len,
struct pp_instance *ppi);
int st_com_slave_handle_followup(struct pp_instance *ppi, unsigned char *buf,
int len);
int st_com_handle_pdelay_req(unsigned char *buf, int len, TimeInternal *time,
struct pp_instance *ppi);
int st_com_handle_pdelay_req(struct pp_instance *ppi, unsigned char *buf,
int len, TimeInternal *time);
proto-standard/msg.c
View file @ f7a6b4e5
......@@ -5,7 +5,7 @@
#include <pptp/pptp.h>
/* Unpack header from in buffer to msg_tmp_header field */
void msg_unpack_header(void *buf, struct pp_instance *ppi)
void msg_unpack_header(struct pp_instance *ppi, void *buf)
{
MsgHeader *hdr = &ppi->msg_tmp_header;
......@@ -57,7 +57,7 @@ void msg_unpack_header(void *buf, struct pp_instance *ppi)
}
/* Pack header message into out buffer of ppi */
void msg_pack_header(void *buf, struct pp_instance *ppi)
void msg_pack_header(struct pp_instance *ppi, void *buf)
{
Nibble transport = 0x80;
......@@ -85,7 +85,7 @@ void *msg_copy_header(MsgHeader *dest, MsgHeader *src)
/* Pack Sync message into out buffer of ppi */
void msg_pack_sync(void *buf, Timestamp *orig_tstamp, struct pp_instance *ppi)
void msg_pack_sync(struct pp_instance *ppi, void *buf, Timestamp *orig_tstamp)
{
/* changes in header */
*(char *)(buf + 0) = *(char *)(buf + 0) & 0xF0;
......@@ -125,7 +125,7 @@ void msg_unpack_sync(void *buf, MsgSync *sync)
}
/* Pack Announce message into out buffer of ppi */
void msg_pack_announce(void *buf, struct pp_instance *ppi)
void msg_pack_announce(struct pp_instance *ppi, void *buf)
{
/* changes in header */
*(char *)(buf + 0) = *(char *)(buf + 0) & 0xF0;
......@@ -185,8 +185,8 @@ void msg_unpack_announce(void *buf, MsgAnnounce *ann)
/* Pack Follow Up message into out buffer of ppi*/
void msg_pack_follow_up(void *buf, Timestamp *prec_orig_tstamp,
struct pp_instance *ppi)
void msg_pack_follow_up(struct pp_instance *ppi, void *buf,
Timestamp *prec_orig_tstamp)
{
/* changes in header */
*(char *)(buf + 0) = *(char *)(buf + 0) & 0xF0;
......@@ -230,8 +230,8 @@ void msg_unpack_follow_up(void *buf, MsgFollowUp *flwup)
}
/* pack PdelayReq message into out buffer of ppi */
void msg_pack_pdelay_req(void *buf, Timestamp *orig_tstamp,
struct pp_instance *ppi)
void msg_pack_pdelay_req(struct pp_instance *ppi, void *buf,
Timestamp *orig_tstamp)
{
/* changes in header */
*(char *)(buf + 0) = *(char *)(buf + 0) & 0xF0;
......@@ -261,8 +261,8 @@ void msg_pack_pdelay_req(void *buf, Timestamp *orig_tstamp,
/*pack DelayReq message into out buffer of ppi*/
void msg_pack_delay_req(void *buf, Timestamp *orig_tstamp,
struct pp_instance *ppi)
void msg_pack_delay_req(struct pp_instance *ppi, void *buf,
Timestamp *orig_tstamp)
{
/* changes in header */
*(char *)(buf + 0) = *(char *)(buf + 0) & 0xF0;
......@@ -288,8 +288,8 @@ void msg_pack_delay_req(void *buf, Timestamp *orig_tstamp,
/*pack delayResp message into OUT buffer of ppi*/
void msg_pack_delay_resp(void *buf, MsgHeader *hdr, Timestamp *rcv_tstamp,
struct pp_instance *ppi)
void msg_pack_delay_resp(struct pp_instance *ppi, void *buf,
MsgHeader *hdr, Timestamp *rcv_tstamp)
{
/* changes in header */
*(char *)(buf + 0) = *(char *)(buf + 0) & 0xF0;
......@@ -328,8 +328,8 @@ void msg_pack_delay_resp(void *buf, MsgHeader *hdr, Timestamp *rcv_tstamp,
/* Pack PdelayResp message into out buffer of ppi */
void msg_pack_pdelay_resp(void *buf, MsgHeader *hdr,
Timestamp *req_rec_tstamp, struct pp_instance *ppi)
void msg_pack_pdelay_resp(struct pp_instance *ppi, void *buf, MsgHeader *hdr,
Timestamp *req_rec_tstamp)
{
/* changes in header */
*(char *)(buf + 0) = *(char *)(buf + 0) & 0xF0;
......@@ -436,8 +436,9 @@ void msg_unpack_pdelay_resp(void *buf, MsgPDelayResp *presp)
}
/* Pack PdelayRespFollowUp message into out buffer of ppi */
void msg_pack_pdelay_resp_followup(void *buf, MsgHeader *hdr,
Timestamp *resp_orig_tstamp, struct pp_instance *ppi)
void msg_pack_pdelay_resp_followup(struct pp_instance *ppi, void *buf,
MsgHeader *hdr,
Timestamp *resp_orig_tstamp)
{
/* changes in header */
*(char *)(buf + 0) = *(char *)(buf + 0) & 0xF0;
......
proto-standard/servo.c
View file @ f7a6b4e5
......@@ -10,8 +10,9 @@ void pp_init_clock(struct pp_instance *ppi)
/* TODO */
}
void pp_update_offset(TimeInternal *send_time, TimeInternal *recv_time,
TimeInternal *correctionField, struct pp_instance *ppi)
void pp_update_offset(struct pp_instance *ppi, TimeInternal *send_time,
TimeInternal *recv_time,
TimeInternal *correctionField)
/* FIXME: offset_from_master_filter: put it in ppi */
{
/* TODO */
......
proto-standard/state-initializing.c
View file @ f7a6b4e5
......@@ -54,7 +54,7 @@ int pp_initializing(struct pp_instance *ppi, unsigned char *pkt, int plen)
m1(ppi);
msg_pack_header(ppi->buf_out, ppi);
msg_pack_header(ppi, ppi->buf_out);
ppi->next_state = PPS_LISTENING;
ppi->next_delay = PP_DEFAULT_NEXT_DELAY_MS;
......
proto-standard/state-listening.c
View file @ f7a6b4e5
......@@ -17,7 +17,7 @@ int pp_listening(struct pp_instance *ppi, unsigned char *pkt, int plen)
switch (ppi->msg_tmp_header.messageType) {
case PPM_ANNOUNCE:
e = st_com_master_handle_announce(pkt, plen, ppi);
e = st_com_master_handle_announce(ppi, pkt, plen);
break;
default:
......
proto-standard/state-master.c
View file @ f7a6b4e5
......@@ -55,11 +55,11 @@ int pp_master(struct pp_instance *ppi, unsigned char *pkt, int plen)
switch (ppi->msg_tmp_header.messageType) {
case PPM_ANNOUNCE:
e = st_com_master_handle_announce(pkt, plen, ppi);
e = st_com_master_handle_announce(ppi, pkt, plen);
break;
case PPM_SYNC:
e = st_com_master_handle_sync(pkt, plen, &time, ppi);
e = st_com_master_handle_sync(ppi, pkt, plen, &time);
break;
case PPM_DELAY_REQ:
......@@ -69,7 +69,7 @@ int pp_master(struct pp_instance *ppi, unsigned char *pkt, int plen)
break;
case PPM_PDELAY_REQ:
e = st_com_handle_pdelay_req(pkt, plen, &time, ppi);
e = st_com_handle_pdelay_req(ppi, pkt, plen, &time);
break;
case PPM_PDELAY_RESP:
......
proto-standard/state-passive.c
View file @ f7a6b4e5
......@@ -22,11 +22,11 @@ int pp_passive(struct pp_instance *ppi, unsigned char *pkt, int plen)
switch (ppi->msg_tmp_header.messageType) {
case PPM_ANNOUNCE:
e = st_com_master_handle_announce(pkt, plen, ppi);
e = st_com_master_handle_announce(ppi, pkt, plen);
break;
case PPM_PDELAY_REQ:
e = st_com_handle_pdelay_req(pkt, plen, &time, ppi);
e = st_com_handle_pdelay_req(ppi, pkt, plen, &time);
break;
default:
......
proto-standard/state-slave.c
View file @ f7a6b4e5
......@@ -43,15 +43,15 @@ int pp_slave(struct pp_instance *ppi, unsigned char *pkt, int plen)
switch (ppi->msg_tmp_header.messageType) {
case PPM_ANNOUNCE:
e = st_com_slave_handle_announce(pkt, plen, ppi);
e = st_com_slave_handle_announce(ppi, pkt, plen);
break;
case PPM_SYNC:
e = st_com_slave_handle_sync(pkt, plen, &time, ppi);
e = st_com_slave_handle_sync(ppi, pkt, plen, &time);
break;
case PPM_FOLLOW_UP:
e = st_com_slave_handle_followup(pkt, plen, ppi);
e = st_com_slave_handle_followup(ppi, pkt, plen);
break;
case PPM_DELAY_REQ:
......@@ -124,7 +124,7 @@ int pp_slave(struct pp_instance *ppi, unsigned char *pkt, int plen)
break;
case PPM_PDELAY_REQ:
e = st_com_handle_pdelay_req(pkt, plen, &time, ppi);
e = st_com_handle_pdelay_req(ppi, pkt, plen, &time);
break;
case PPM_PDELAY_RESP:
......
proto-standard/state-uncalibrated.c
View file @ f7a6b4e5
......@@ -12,15 +12,15 @@ int pp_uncalibrated(struct pp_instance *ppi, unsigned char *pkt, int plen)
switch (ppi->msg_tmp_header.messageType) {
case PPM_ANNOUNCE:
e = st_com_slave_handle_announce(pkt, plen, ppi);
e = st_com_slave_handle_announce(ppi, pkt, plen);
break;
case PPM_SYNC:
e = st_com_slave_handle_sync(pkt, plen, &time, ppi);
e = st_com_slave_handle_sync(ppi, pkt, plen, &time);
break;
case PPM_FOLLOW_UP:
e = st_com_slave_handle_followup(pkt, plen, ppi);
e = st_com_slave_handle_followup(ppi, pkt, plen);
break;
default:
......
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