dump-info: update to current ppsi fields

Signed-off-by: Alessandro Rubini <rubini@gnudd.com> Conflicts: dump-info.c

dump-info: update to current ppsi fields
Signed-off-by: Alessandro Rubini <rubini@gnudd.com> Conflicts: dump-info.c
6525e9d1 · Alessandro Rubini · Grzegorz Daniluk · bcb30277 · 6525e9d1
Commit 6525e9d1 authored Oct 28, 2016 by Alessandro Rubini Committed by Grzegorz Daniluk Feb 16, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 3 deletions

dump-info.c dump-info.c +14 -3

No files found.
--- a/dump-info.c
+++ b/dump-info.c
@@ -92,12 +92,14 @@ struct dump_info  dump_info[] = {
 	DUMP_FIELD(TimeInternal, t2),
 	DUMP_FIELD(TimeInternal, t3),
 	DUMP_FIELD(TimeInternal, t4),
-	DUMP_FIELD(Integer32, delta_ms_prev),
+	DUMP_FIELD(TimeInternal, t5),
+	DUMP_FIELD(TimeInternal, t6),
+	DUMP_FIELD(Integer64, delta_ms_prev),
 	DUMP_FIELD(int, missed_iters),
 	DUMP_FIELD(TimeInternal, mu),		/* half of the RTT */
 	DUMP_FIELD(Integer64, picos_mu),
 	DUMP_FIELD(Integer32, cur_setpoint),
-	DUMP_FIELD(Integer32, delta_ms),
+	DUMP_FIELD(Integer64, delta_ms),
 	DUMP_FIELD(UInteger32, update_count),
 	DUMP_FIELD(int, tracking_enabled),
 	DUMP_FIELD_SIZE(char, servo_state_name, 32),
@@ -106,6 +108,7 @@ struct dump_info  dump_info[] = {
 	DUMP_FIELD(UInteger32, n_err_state),
 	DUMP_FIELD(UInteger32, n_err_offset),
 	DUMP_FIELD(UInteger32, n_err_delta_rtt),
+	DUMP_FIELD(TimeInternal, update_time),

 #undef DUMP_STRUCT
 #define DUMP_STRUCT struct pp_instance
@@ -115,12 +118,14 @@ struct dump_info  dump_info[] = {
 	DUMP_FIELD(int, next_state),
 	DUMP_FIELD(int, next_delay),
 	DUMP_FIELD(int, is_new_state),
+	DUMP_FIELD(pointer, current_state_item),
 	DUMP_FIELD(pointer, arch_data),
 	DUMP_FIELD(pointer, ext_data),
 	DUMP_FIELD(unsigned_long, d_flags),
 	DUMP_FIELD(unsigned_char, flags),
 	DUMP_FIELD(int, role),
 	DUMP_FIELD(int, proto),
+	DUMP_FIELD(int, mech),
 	DUMP_FIELD(pointer, glbs),
 	DUMP_FIELD(pointer, n_ops),
 	DUMP_FIELD(pointer, t_ops),
@@ -143,7 +148,8 @@ struct dump_info  dump_info[] = {
 	DUMP_FIELD_SIZE(bina, ch[1].addr, 6),
 	DUMP_FIELD(int, ch[1].pkt_present),

-	DUMP_FIELD(ip_address, mcast_addr),
+	DUMP_FIELD(ip_address, mcast_addr[0]),
+	DUMP_FIELD(ip_address, mcast_addr[1]),
 	DUMP_FIELD(int, tx_offset),
 	DUMP_FIELD(int, rx_offset),
 	DUMP_FIELD_SIZE(bina, peer, 6),
@@ -153,6 +159,10 @@ struct dump_info  dump_info[] = {
 	DUMP_FIELD(TimeInternal, t2),
 	DUMP_FIELD(TimeInternal, t3),
 	DUMP_FIELD(TimeInternal, t4),
+	DUMP_FIELD(TimeInternal, t5),
+	DUMP_FIELD(TimeInternal, t6),
+	DUMP_FIELD(Integer32, t4_cf),
+	DUMP_FIELD(Integer32, t6_cf),
 	DUMP_FIELD(TimeInternal, cField),
 	DUMP_FIELD(TimeInternal, last_rcv_time),
 	DUMP_FIELD(TimeInternal, last_snt_time),
@@ -176,6 +186,7 @@ struct dump_info  dump_info[] = {
 	DUMP_FIELD_SIZE(char, cfg.iface_name, 16),
 	DUMP_FIELD(int, cfg.ext),
 	DUMP_FIELD(int, cfg.ext),
+	DUMP_FIELD(int, cfg.mech),

 	DUMP_FIELD(unsigned_long, ptp_tx_count),
 	DUMP_FIELD(unsigned_long, ptp_rx_count),