Skip to content

W
White Rabbit Switch - Software
Commit 8ffb1d48 authored by Jean-Claude BAU's avatar Jean-Claude BAU
Browse files
Options

kConfig(ARB clock), PPSI(BMCA, bug fixes), wr_mon (active_peer)...

parents ada1d2ad 3f1f872b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 148 additions and 151 deletions
Kconfig
View file @ 8ffb1d48
This diff is collapsed.
ppsi @ 04f722fe
Subproject commit 051a01c0ee9680540855f1b92e0e83709bd6dc5c
Subproject commit 04f722feec75f1e474f2d04b6df8ea5d67f77df8
userspace/rootfs_override/wr/bin/assembly_ppsi_conf.sh
View file @ 8ffb1d48
......@@ -358,8 +358,8 @@ function build_inst_ppsi_keys() {
}
globals_indexes='clock-class clock-accuracy clock-allan-variance domain-number priority1 priority2 time-source externalPortConfigurationEnabled slaveOnly ptpPpsThresholdMs ptpFallbackPpsGen gmDelayToGenPpsSec forcePpsGen'
globals_not_yet_supported='time-source'
globals_indexes='clock-class clock-accuracy clock-allan-variance time-source domain-number priority1 priority2 externalPortConfigurationEnabled slaveOnly ptpPpsThresholdMs ptpFallbackPpsGen gmDelayToGenPpsSec forcePpsGen'
globals_not_yet_supported='empty'
# PHYSICAL PORT PARAMETERS
declare -A port_dotc_ppsi_key_mapping='(\
......@@ -399,28 +399,23 @@ declare -A globals
[[ "$PRE_FILE" != "" ]] && [[ -f $PRE_FILE ]] && decode_pre_file "$PRE_FILE"
if [ "$CONFIG_TIME_GM" = "y" ]; then
globals[clock-class]=6
else
# Use default value of clock class if not overwritten or empty string
if [ -v CONFIG_PTP_OPT_OVERWRITE_CLOCK_CLASS ] && [ -n "$CONFIG_PTP_OPT_CLOCK_CLASS" ]; then
globals[clock-class]="$CONFIG_PTP_OPT_CLOCK_CLASS"
else
if [ "$CONFIG_TIME_FM" = "y" ]; then
globals[clock-class]=52
fi
if [ "$CONFIG_TIME_BC" = "y" ]; then
globals[clock-class]=248
fi
fi
if [ -n "$CONFIG_PTP_OPT_CLOCK_CLASS" ]; then
globals[clock-class]="$CONFIG_PTP_OPT_CLOCK_CLASS"
else # Use BC as default
globals[clock-class]="248"
fi
if [ -n "$CONFIG_PTP_OPT_CLOCK_ACCURACY" ]; then
globals[clock-accuracy]="$CONFIG_PTP_OPT_CLOCK_ACCURACY"
fi
if [ -n "$CONFIG_PTP_OPT_CLOCK_ALLAN_VARIANCE" ]; then
globals[clock-allan-variance]="$CONFIG_PTP_OPT_CLOCK_ALLAN_VARIANCE"
if [ -n "$CONFIG_PTP_OPT_OVERWRITE_ATTRIBUTES" ]; then
# Overwrite default PTP device attributes
if [ -n "$CONFIG_PTP_OPT_CLOCK_ACCURACY" ]; then
globals[clock-accuracy]="$CONFIG_PTP_OPT_CLOCK_ACCURACY"
fi
if [ -n "$CONFIG_PTP_OPT_CLOCK_ALLAN_VARIANCE" ]; then
globals[clock-allan-variance]="$CONFIG_PTP_OPT_CLOCK_ALLAN_VARIANCE"
fi
if [ -n "$CONFIG_PTP_OPT_TIME_SOURCE" ]; then
globals[time-source]="$CONFIG_PTP_OPT_TIME_SOURCE"
fi
fi
if [ -n "$CONFIG_PTP_OPT_DOMAIN_NUMBER" ]; then
......@@ -435,20 +430,6 @@ if [ -n "$CONFIG_PTP_OPT_PRIORITY2" ]; then
globals[priority2]="$CONFIG_PTP_OPT_PRIORITY2"
fi
if [ -v CONFIG_PTP_OPT_OVERWRITE_TIME_SOURCE ] && [ -n "$CONFIG_PTP_OPT_TIME_SOURCE" ]; then
globals[time-source]="$CONFIG_PTP_OPT_TIME_SOURCE"
else
if [ "$CONFIG_TIME_GM" = "y" ]; then
globals[time-source]=16 # ATOMIC_CLOCK
fi
if [ "$CONFIG_TIME_FM" = "y" ]; then
globals[time-source]=160 # INTERNAL_OSCILLATOR
fi
if [ "$CONFIG_TIME_BC" = "y" ]; then
globals[time-source]=160 # INTERNAL_OSCILLATOR
fi
fi
if [ -n "$CONFIG_PTP_OPT_EXT_PORT_CONFIG_ENABLED" ]; then
globals[externalPortConfigurationEnabled]="$CONFIG_PTP_OPT_EXT_PORT_CONFIG_ENABLED"
else
......
userspace/tools/wr_mon.c
View file @ 8ffb1d48
......@@ -735,7 +735,7 @@ void show_ports(int hal_alive, int ppsi_alive)
/* Note: we may have more pp instances per port */
/* if (state_up(port_state->state)) */ {
unsigned char *p = ppi->peer;
unsigned char *p = ppi->activePeer;
char * extension_state_name=EMPTY_EXTENSION_STATE_NAME;
term_cprintf(C_WHITE, "%02x:%02x"
......
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