Skip to content

S
Software for White Rabbit PTP Core
Commit 7d3ac7a5 authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

shell/sfp: move matching of the sfp to dev/sfp.c 

Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent 469248b5
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 15 deletions
dev/sfp.c
View file @ 7d3ac7a5
...@@ -10,10 +10,13 @@ ...@@ -10,10 +10,13 @@
#include <stdio.h> #include <stdio.h>
#include <inttypes.h> #include <inttypes.h>
#include <string.h>
#include <errno.h>
#include "syscon.h" #include "syscon.h"
#include "i2c.h" #include "i2c.h"
#include "sfp.h" #include "sfp.h"
#include "storage.h"
/* Calibration data (from EEPROM if available) */ /* Calibration data (from EEPROM if available) */
int32_t sfp_alpha = 73622176; /* default values if could not read EEPROM */ int32_t sfp_alpha = 73622176; /* default values if could not read EEPROM */
...@@ -60,3 +63,27 @@ int sfp_read_part_id(char *part_id) ...@@ -60,3 +63,27 @@ int sfp_read_part_id(char *part_id)
return -1; return -1;
} }
int sfp_match(void)
{
struct s_sfpinfo sfp;
sfp_pn[0] = '\0';
if (!sfp_present()) {
return -ENODEV;
}
if (sfp_read_part_id(sfp_pn)) {
return -EIO;
}
strncpy(sfp.pn, sfp_pn, SFP_PN_LEN);
if (storage_match_sfp(&sfp) == 0) {
sfp_in_db = SFP_NOT_MATCHED;
return -ENXIO;
}
sfp_deltaTx = sfp.dTx;
sfp_deltaRx = sfp.dRx;
sfp_alpha = sfp.alpha;
sfp_in_db = SFP_MATCHED;
return 0;
}
include/sfp.h
View file @ 7d3ac7a5
...@@ -29,4 +29,7 @@ int sfp_present(void); ...@@ -29,4 +29,7 @@ int sfp_present(void);
/* Reads the part ID of the SFP from its configuration EEPROM */ /* Reads the part ID of the SFP from its configuration EEPROM */
int sfp_read_part_id(char *part_id); int sfp_read_part_id(char *part_id);
/* Match plugged SFP with a DB entry */
int sfp_match(void);
#endif #endif
shell/cmd_sfp.c
View file @ 7d3ac7a5
...@@ -34,8 +34,9 @@ ...@@ -34,8 +34,9 @@
static int cmd_sfp(const char *args[]) static int cmd_sfp(const char *args[])
{ {
int8_t sfpcount = 1, i, temp; int8_t sfpcount = 1, i, temp, ret;
struct s_sfpinfo sfp; struct s_sfpinfo sfp;
if (!args[0]) { if (!args[0]) {
pp_printf("Wrong parameter\n"); pp_printf("Wrong parameter\n");
return -EINVAL; return -EINVAL;
...@@ -87,32 +88,29 @@ static int cmd_sfp(const char *args[]) ...@@ -87,32 +88,29 @@ static int cmd_sfp(const char *args[])
} }
return 0; return 0;
} else if (!strcasecmp(args[0], "match")) { } else if (!strcasecmp(args[0], "match")) {
sfp_pn[0] = '\0'; ret = sfp_match();
if (!sfp_present()) { if (ret == -ENODEV) {
pp_printf("No SFP.\n"); pp_printf("No SFP.\n");
return -ENODEV; return ret;
} }
if (sfp_read_part_id(sfp_pn)) { if (ret == -EIO) {
pp_printf("SFP read error\n"); pp_printf("SFP read error\n");
return -EIO; return ret;
} }
/* SFP read correctly */
for (temp = 0; temp < SFP_PN_LEN; ++temp) for (temp = 0; temp < SFP_PN_LEN; ++temp)
pp_printf("%c", sfp_pn[temp]); pp_printf("%c", sfp_pn[temp]);
pp_printf("\n"); pp_printf("\n");
strncpy(sfp.pn, sfp_pn, SFP_PN_LEN); if (ret == -ENXIO) {
if (storage_match_sfp(&sfp) == 0) {
pp_printf("Could not match to DB\n"); pp_printf("Could not match to DB\n");
sfp_in_db = SFP_NOT_MATCHED; return ret;
return -ENXIO;
} }
/* match successful */
pp_printf("SFP matched, dTx=%d dRx=%d alpha=%d\n", pp_printf("SFP matched, dTx=%d dRx=%d alpha=%d\n",
sfp.dTx, sfp.dRx, sfp.alpha); sfp.dTx, sfp.dRx, sfp.alpha);
sfp_deltaTx = sfp.dTx; return ret;
sfp_deltaRx = sfp.dRx;
sfp_alpha = sfp.alpha;
sfp_in_db = SFP_MATCHED;
return 0;
} else if (args[1] && !strcasecmp(args[0], "ena")) { } else if (args[1] && !strcasecmp(args[0], "ena")) {
ep_sfp_enable(atoi(args[1])); ep_sfp_enable(atoi(args[1]));
return 0; return 0;
......
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