Skip to content

P
PPSi
Commit b95f0df8 authored by Maciej Lipinski's avatar Maciej Lipinski Committed by Adam Wujek
Browse files
Options

[calibrate msg] changed order of fields (calRetry and CalSendPatter) to follow WR Spec

parent 5f68aa48
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 4 deletions
proto-ext-whiterabbit/wr-msg.c
View file @ b95f0df8
......@@ -154,10 +154,10 @@ int msg_pack_wrsig(struct pp_instance *ppi, Enumeration16 wr_msg_id)
case CALIBRATE:
if (WR_DSPOR(ppi)->calibrated) {
put_be16(buf+56,
(WR_DSPOR(ppi)->calRetry << 8 | 0x0000));
(WR_DSPOR(ppi)->calRetry | 0x0000));
} else {
put_be16(buf+56,
(WR_DSPOR(ppi)->calRetry << 8 | 0x0001));
(WR_DSPOR(ppi)->calRetry | 0x0100));
}
put_be32(buf+58, WR_DSPOR(ppi)->calPeriod);
len = 14;
......@@ -245,10 +245,15 @@ void msg_unpack_wrsig(struct pp_instance *ppi, void *buf,
switch (wr_msg_id) {
case CALIBRATE:
WR_DSPOR(ppi)->otherNodeCalSendPattern =
0x00FF & get_be16(buf+56);
WR_DSPOR(ppi)->otherNodeCalRetry =
0x00FF & (get_be16(buf+56) >> 8);
WR_DSPOR(ppi)->otherNodeCalRetry =
0x00FF & get_be16(buf+56);
WR_DSPOR(ppi)->otherNodeCalPeriod = get_be32(buf+58);
pp_diag(ppi, frames, 1, "otherNodeCalPeriod "
"from frame = 0x%x | stored = 0x%x \n", get_be32(buf+58),
WR_DSPOR(ppi)->otherNodeCalPeriod);
break;
case CALIBRATED:
......
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