Commit 56eee90a authored by Jean-Claude BAU's avatar Jean-Claude BAU

Improve behavior when link up->down->up not detected.

- update PPSi submodule
- Adapt the display of wr_mon to PPSi changes
parent 4ca6e473
Subproject commit 043af2b4d68575034da03b302936cd5c459fb6b8 Subproject commit 420da467c4edbc76e830aca7a8b4b43be8e6ffdd
...@@ -229,6 +229,21 @@ static char *prot_detection_state_name[]={ ...@@ -229,6 +229,21 @@ static char *prot_detection_state_name[]={
/* prototypes */ /* prototypes */
int read_instances(void); int read_instances(void);
static inline int extensionStateColor( struct pp_instance *ppi) {
if ( ppi->protocol_extension==PPSI_EXT_NONE) {
return C_GREEN; /* No extension */
}
switch (ppi->extState) {
case PP_EXSTATE_ACTIVE :
return C_GREEN;
case PP_EXSTATE_PTP :
return C_WHITE;
case PP_EXSTATE_DISABLE :
default:
return C_RED;
}
}
char *getStateAsString(char *p[], int index) { char *getStateAsString(char *p[], int index) {
int i,len; int i,len;
char *errMsg="?????????????????????"; char *errMsg="?????????????????????";
...@@ -765,7 +780,7 @@ void show_ports(int hal_alive, int ppsi_alive) ...@@ -765,7 +780,7 @@ void show_ports(int hal_alive, int ppsi_alive)
} else { } else {
term_cprintf(C_WHITE, "?"); term_cprintf(C_WHITE, "?");
} }
color=ppi->protocol_extension!=PPSI_EXT_NONE && !ppi->ext_enabled ? C_RED : C_WHITE; color=extensionStateColor(ppi);
term_cprintf(color, "-%c",pe_info->short_ext_name); term_cprintf(color, "-%c",pe_info->short_ext_name);
nvlans = ppi->nvlans; nvlans = ppi->nvlans;
...@@ -812,15 +827,15 @@ void show_servo(struct inst_servo_t *servo, int alive) ...@@ -812,15 +827,15 @@ void show_servo(struct inst_servo_t *servo, int alive)
char buf[128]; char buf[128];
wrh_servo_t * l1e_servo; wrh_servo_t * l1e_servo;
int proto_extension=servo->ppi->ext_enabled ? servo->ppi->protocol_extension : PPSI_EXT_NONE; int proto_extension=servo->ppi->extState!=PP_EXSTATE_DISABLE ? servo->ppi->protocol_extension : PPSI_EXT_NONE;
struct proto_ext_info_t *pe_info= IS_PROTO_EXT_INFO_AVAILABLE(proto_extension) ? &proto_ext_info[proto_extension] : &proto_ext_info[0] ; struct proto_ext_info_t *pe_info= IS_PROTO_EXT_INFO_AVAILABLE(proto_extension) ? &proto_ext_info[proto_extension] : &proto_ext_info[0] ;
wr_servo= (servo->ppi->protocol_extension==PPSI_EXT_WR && servo->ppi->ext_enabled) ? wr_servo= (servo->ppi->protocol_extension==PPSI_EXT_WR && servo->ppi->extState==PP_EXSTATE_ACTIVE) ?
( wrh_servo_t* ) servo->servo_ext_snapshot : NULL; ( wrh_servo_t* ) servo->servo_ext_snapshot : NULL;
if ( wr_servo ) { if ( wr_servo ) {
wr_servo_ext= &((struct wr_data *)wr_servo)->servo_ext; wr_servo_ext= &((struct wr_data *)wr_servo)->servo_ext;
} }
l1e_servo= (servo->ppi->protocol_extension==PPSI_EXT_L1S && servo->ppi->ext_enabled) ? l1e_servo= (servo->ppi->protocol_extension==PPSI_EXT_L1S && servo->ppi->extState==PP_EXSTATE_ACTIVE) ?
( wrh_servo_t * ) servo->servo_ext_snapshot : NULL; ( wrh_servo_t * ) servo->servo_ext_snapshot : NULL;
if (mode == SHOW_GUI) { if (mode == SHOW_GUI) {
......
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