Skip to content

best effort parsing of the contents of eeprom#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vjanandr wants to merge 1 commit into
base:master
Choose a base branch
from
Open

best effort parsing of the contents of eeprom #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions modules/sff/module/src/sff.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -486,6 +486,7 @@ make_printable__(char* string, int size)
static int
sff_eeprom_parse_standard__(sff_eeprom_t* se, uint8_t* eeprom)
{
int rc = 0;
if(se == NULL) {
return -1;
}
Expand DownExpand Up@@ -518,13 +519,14 @@ sff_eeprom_parse_standard__(sff_eeprom_t* se, uint8_t* eeprom)
}

if (!sff_eeprom_validate(se, 1)) {
return -1;
AIM_LOG_ERROR("sff_eeprom_parse(): eeprom validate failed");
rc |= -1;
}

se->info.sfp_type = sff_sfp_type_get(se->eeprom);
if(se->info.sfp_type == SFF_SFP_TYPE_INVALID) {
AIM_LOG_ERROR("sff_eeprom_parse() failed: invalid sfp type");
return -1;
rc |= -1;
}
se->info.sfp_type_name = sff_sfp_type_desc(se->info.sfp_type);

Expand DownExpand Up@@ -579,11 +581,13 @@ sff_eeprom_parse_standard__(sff_eeprom_t* se, uint8_t* eeprom)

se->info.module_type = sff_module_type_get(se->eeprom);
if(se->info.module_type == SFF_MODULE_TYPE_INVALID) {
return -1;
AIM_LOG_ERROR("sff_eeprom_parse(): module type invalid");
rc |= -1;
}

if(sff_info_init(&se->info, se->info.module_type, NULL, NULL, NULL, 0) < 0) {
return -1;
AIM_LOG_ERROR("sff_eeprom_parse(): sff info init failed");
rc |= -1;
}

int aoc_length;
Expand DownExpand Up@@ -642,9 +646,11 @@ sff_eeprom_parse_standard__(sff_eeprom_t* se, uint8_t* eeprom)
else {
SFF_SNPRINTF(se->info.length_desc, sizeof(se->info.length_desc), "%dm", se->info.length);
}
se->identified = 1;

return 0;
if (rc == 0) {
AIM_LOG_INFO("sff_eeprom_parse(): parse success");
se->identified = 1;
}
return rc;
}

int
Expand Down