shell: store sfp product number in sfp_pn for cmd_sfp

--Don't use "static char pn" top store sfp's pn. --Print error when unable to read SFP Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

shell: store sfp product number in sfp_pn for cmd_sfp
--Don't use "static char pn" top store sfp's pn. --Print error when unable to read SFP Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
e8c95666 · Adam Wujek · f9e8b825 · e8c95666 · e8c95666 · e8c95666
Commit e8c95666 authored Apr 22, 2016 by Adam Wujek 💬
Hide whitespace changes
Inline Side-by-side

Showing with 22 additions and 12 deletions

sfp.c dev/sfp.c +2 -0

sfp.h include/sfp.h +2 -0

cmd_sfp.c shell/cmd_sfp.c +18 -12

No files found.
--- a/dev/sfp.c
+++ b/dev/sfp.c
@@ -21,6 +21,8 @@ int32_t sfp_deltaTx = 0;
 int32_t sfp_deltaRx = 0;
 int32_t sfp_in_db = 0;

+char sfp_pn[SFP_PN_LEN];
+
 int sfp_present(void)
 {
 	return !gpio_in(GPIO_SFP_DET);

--- a/include/sfp.h
+++ b/include/sfp.h
@@ -13,6 +13,8 @@
 #define SFP_NOT_MATCHED 1
 #define SFP_MATCHED 2

+extern char sfp_pn[SFP_PN_LEN];
+
 extern int32_t sfp_in_db;
 extern int32_t sfp_alpha;
 extern int32_t sfp_deltaTx;

--- a/shell/cmd_sfp.c
+++ b/shell/cmd_sfp.c
@@ -36,15 +36,21 @@ static int cmd_sfp(const char *args[])
 {
 	int8_t sfpcount = 1, i, temp;
 	struct s_sfpinfo sfp;
-	static char pn[SFP_PN_LEN + 1] = "\0";

 	if (args[0] && !strcasecmp(args[0], "detect")) {
-		if (!sfp_present())
+		/* clear sfp_pn */
+		sfp_pn[0] = '\0';
+		if (!sfp_present()) {
 			pp_printf("No SFP.\n");
-		else
-			sfp_read_part_id(pn);
-		pn[16] = 0;
-		pp_printf("%s\n", pn);
+			return -1;
+		}
+		if (sfp_read_part_id(sfp_pn)) {
+			pp_printf("SFP read error\n");
+			return -1;
+		}
+		for (temp = 0; temp < SFP_PN_LEN; ++temp)
+				pp_printf("%c", sfp.pn[temp]);
+		pp_printf("\n");
 		return 0;
 	}
 //  else if (!strcasecmp(args[0], "i2cscan"))
@@ -57,13 +63,13 @@ static int cmd_sfp(const char *args[])
 		    EE_RET_I2CERR)
 			pp_printf("Could not erase DB\n");
 	} else if (args[4] && !strcasecmp(args[0], "add")) {
-		if (strlen(args[1]) > 16)
-			temp = 16;
+		if (strlen(args[1]) > SFP_PN_LEN)
+			temp = SFP_PN_LEN;
 		else
 			temp = strlen(args[1]);
 		for (i = 0; i < temp; ++i)
 			sfp.pn[i] = args[1][i];
-		while (i < 16)
+		while (i < SFP_PN_LEN)
 			sfp.pn[i++] = ' ';	//padding
 		sfp.dTx = atoi(args[2]);
 		sfp.dRx = atoi(args[3]);
@@ -89,17 +95,17 @@ static int cmd_sfp(const char *args[])
 				}
 			}
 			pp_printf("%d: PN:", i + 1);
-			for (temp = 0; temp < 16; ++temp)
+			for (temp = 0; temp < SFP_PN_LEN; ++temp)
 				pp_printf("%c", sfp.pn[temp]);
 			pp_printf(" dTx: %d, dRx: %d, alpha: %d\n", sfp.dTx,
 				sfp.dRx, sfp.alpha);
 		}
 	} else if (args[0] && !strcasecmp(args[0], "match")) {
-		if (pn[0] == '\0') {
+		if (sfp_pn[0] == '\0') {
 			pp_printf("Run sfp detect first\n");
 			return 0;
 		}
-		strncpy(sfp.pn, pn, SFP_PN_LEN);
+		strncpy(sfp.pn, sfp_pn, SFP_PN_LEN);
 		if (storage_match_sfp(&sfp) > 0) {
 			pp_printf("SFP matched, dTx=%d, dRx=%d, alpha=%d\n",
 				sfp.dTx, sfp.dRx, sfp.alpha);