| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20250126115635.801935-10-danieller@nvidia.com>
Date: Sun, 26 Jan 2025 13:56:30 +0200
From: Danielle Ratson <danieller@...dia.com>
To: <netdev@...r.kernel.org>
CC: <mkubecek@...e.cz>, <matt@...verse.com.au>, <daniel.zahka@...il.com>,
<amcohen@...dia.com>, <nbu-mlxsw@...hange.nvidia.com>, Danielle Ratson
<danieller@...dia.com>
Subject: [PATCH ethtool-next 09/14] qsfp: Add JSON output handling to --module-info in SFF8636 modules
Add JSON output handling for 'ethtool -m' / --module-info, following the
guideline below:
1. Fields with description, will have a separate description field.
2. Fields with units, will have a separate unit field.
3. ASCII fields will be presented as strings.
4. On/Off is rendered as true/false.
5. Yes/no is rendered as true/false.
6. Per-channel fields will be presented as array, when each element
represents a channel.
7. Fields that hold version, will be split to major and minor sub fields.
Signed-off-by: Danielle Ratson <danieller@...dia.com>
---
cmis.h | 3 +
qsfp.c | 538 +++++++++++++++++++++++++++++++++++----------------------
2 files changed, 337 insertions(+), 204 deletions(-)
diff --git a/cmis.h b/cmis.h
index 007632a..d2b3d24 100644
--- a/cmis.h
+++ b/cmis.h
@@ -199,6 +199,9 @@
#define CMIS_RX_PWR_HWARN_OFFSET 0xC4
#define CMIS_RX_PWR_LWARN_OFFSET 0xC6
+#define YESNO(x) (((x) != 0) ? "Yes" : "No")
+#define ONOFF(x) (((x) != 0) ? "On" : "Off")
+
void cmis_show_all_ioctl(const __u8 *id);
int cmis_show_all_nl(struct cmd_context *ctx);
diff --git a/qsfp.c b/qsfp.c
index 13d8fb7..d835067 100644
--- a/qsfp.c
+++ b/qsfp.c
@@ -82,64 +82,92 @@ static void sff8636_show_identifier(const struct sff8636_memory_map *map)
static void sff8636_show_ext_identifier(const struct sff8636_memory_map *map)
{
- printf("\t%-41s : 0x%02x\n", "Extended identifier",
- map->page_00h[SFF8636_EXT_ID_OFFSET]);
-
static const char *pfx =
"\tExtended identifier description :";
+ char description[64];
+
+ if (is_json_context()) {
+ open_json_object("extended_identifier");
+ print_int(PRINT_JSON, "value", "0x%02x",
+ map->page_00h[SFF8636_EXT_ID_OFFSET]);
+ } else {
+ printf("\t%-41s : 0x%02x\n", "Extended identifier",
+ map->page_00h[SFF8636_EXT_ID_OFFSET]);
+ }
switch (map->page_00h[SFF8636_EXT_ID_OFFSET] &
SFF8636_EXT_ID_PWR_CLASS_MASK) {
case SFF8636_EXT_ID_PWR_CLASS_1:
- printf("%s 1.5W max. Power consumption\n", pfx);
+ strncpy(description, "1.5W max. Power consumption", 64);
break;
case SFF8636_EXT_ID_PWR_CLASS_2:
- printf("%s 2.0W max. Power consumption\n", pfx);
+ strncpy(description, "1.5W max. Power consumption", 64);
break;
case SFF8636_EXT_ID_PWR_CLASS_3:
- printf("%s 2.5W max. Power consumption\n", pfx);
+ strncpy(description, "2.5W max. Power consumption", 64);
break;
case SFF8636_EXT_ID_PWR_CLASS_4:
- printf("%s 3.5W max. Power consumption\n", pfx);
+ strncpy(description, "3.5W max. Power consumption", 64);
break;
}
+ if (is_json_context())
+ print_string(PRINT_JSON, "description", "%s", description);
+ else
+ printf("%s %s\n", pfx, description);
+
if (map->page_00h[SFF8636_EXT_ID_OFFSET] & SFF8636_EXT_ID_CDR_TX_MASK)
- printf("%s CDR present in TX,", pfx);
+ strncpy(description, "CDR present in TX,", 64);
else
- printf("%s No CDR in TX,", pfx);
+ strncpy(description, "No CDR in TX,", 64);
if (map->page_00h[SFF8636_EXT_ID_OFFSET] & SFF8636_EXT_ID_CDR_RX_MASK)
- printf(" CDR present in RX\n");
+ strcat(description, " CDR present in RX");
+ else
+ strcat(description, " No CDR in RX");
+
+ if (is_json_context())
+ print_string(PRINT_JSON, "description", "%s", description);
else
- printf(" No CDR in RX\n");
+ printf("%s %s\n", pfx, description);
switch (map->page_00h[SFF8636_EXT_ID_OFFSET] &
SFF8636_EXT_ID_EPWR_CLASS_MASK) {
case SFF8636_EXT_ID_PWR_CLASS_LEGACY:
- printf("%s", pfx);
+ strncpy(description, "", 64);
break;
case SFF8636_EXT_ID_PWR_CLASS_5:
- printf("%s 4.0W max. Power consumption,", pfx);
+ strncpy(description, "4.0W max. Power consumption,", 64);
break;
case SFF8636_EXT_ID_PWR_CLASS_6:
- printf("%s 4.5W max. Power consumption, ", pfx);
+ strncpy(description, "4.5W max. Power consumption,", 64);
break;
case SFF8636_EXT_ID_PWR_CLASS_7:
- printf("%s 5.0W max. Power consumption, ", pfx);
+ strncpy(description, "5.0W max. Power consumption,", 64);
break;
}
+
if (map->lower_memory[SFF8636_PWR_MODE_OFFSET] &
SFF8636_HIGH_PWR_ENABLE)
- printf(" High Power Class (> 3.5 W) enabled\n");
+ strcat(description, " High Power Class (> 3.5 W) enabled");
else
- printf(" High Power Class (> 3.5 W) not enabled\n");
- printf("\t%-41s : ", "Power set");
- printf("%s\n", ONOFF(map->lower_memory[SFF8636_PWR_MODE_OFFSET] &
- SFF8636_LOW_PWR_SET));
- printf("\t%-41s : ", "Power override");
- printf("%s\n", ONOFF(map->lower_memory[SFF8636_PWR_MODE_OFFSET] &
- SFF8636_PWR_OVERRIDE));
+ strcat(description,
+ " High Power Class (> 3.5 W) not enabled");
+
+ if (is_json_context())
+ print_string(PRINT_JSON, "description", "%s", description);
+ else
+ printf("%s %s\n", pfx, description);
+
+ close_json_object();
+
+ bool value = map->lower_memory[SFF8636_PWR_MODE_OFFSET] &
+ SFF8636_LOW_PWR_SET;
+ module_print_any_bool("Power set", "power_set", value, ONOFF(value));
+ value = map->lower_memory[SFF8636_PWR_MODE_OFFSET] &
+ SFF8636_PWR_OVERRIDE;
+ module_print_any_bool("Power override", "power_override", value,
+ ONOFF(value));
}
static void sff8636_show_connector(const struct sff8636_memory_map *map)
@@ -149,232 +177,262 @@ static void sff8636_show_connector(const struct sff8636_memory_map *map)
static void sff8636_show_transceiver(const struct sff8636_memory_map *map)
{
- static const char *pfx =
- "\tTransceiver type :";
-
- printf("\t%-41s : 0x%02x 0x%02x 0x%02x " \
- "0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n",
- "Transceiver codes",
- map->page_00h[SFF8636_ETHERNET_COMP_OFFSET],
- map->page_00h[SFF8636_SONET_COMP_OFFSET],
- map->page_00h[SFF8636_SAS_COMP_OFFSET],
- map->page_00h[SFF8636_GIGE_COMP_OFFSET],
- map->page_00h[SFF8636_FC_LEN_OFFSET],
- map->page_00h[SFF8636_FC_TECH_OFFSET],
- map->page_00h[SFF8636_FC_TRANS_MEDIA_OFFSET],
- map->page_00h[SFF8636_FC_SPEED_OFFSET]);
+ static const char *pfx = "Transceiver type";
+ char value[140] = "";
+
+ if (is_json_context()) {
+ open_json_array("transceiver_codes", "");
+ print_int(PRINT_JSON, NULL, "0x%02x",
+ map->page_00h[SFF8636_ETHERNET_COMP_OFFSET]);
+ print_int(PRINT_JSON, NULL, "0x%02x",
+ map->page_00h[SFF8636_SONET_COMP_OFFSET]);
+ print_int(PRINT_JSON, NULL, "0x%02x",
+ map->page_00h[SFF8636_SAS_COMP_OFFSET]);
+ print_int(PRINT_JSON, NULL, "0x%02x",
+ map->page_00h[SFF8636_GIGE_COMP_OFFSET]);
+ print_int(PRINT_JSON, NULL, "0x%02x",
+ map->page_00h[SFF8636_FC_LEN_OFFSET]);
+ print_int(PRINT_JSON, NULL, "0x%02x",
+ map->page_00h[SFF8636_FC_TECH_OFFSET]);
+ print_int(PRINT_JSON, NULL, "0x%02x",
+ map->page_00h[SFF8636_FC_TRANS_MEDIA_OFFSET]);
+ print_int(PRINT_JSON, NULL, "0x%02x",
+ map->page_00h[SFF8636_FC_SPEED_OFFSET]);
+ close_json_array("");
+ } else {
+ printf("\t%-41s : 0x%02x 0x%02x 0x%02x " \
+ "0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n",
+ "Transceiver codes",
+ map->page_00h[SFF8636_ETHERNET_COMP_OFFSET],
+ map->page_00h[SFF8636_SONET_COMP_OFFSET],
+ map->page_00h[SFF8636_SAS_COMP_OFFSET],
+ map->page_00h[SFF8636_GIGE_COMP_OFFSET],
+ map->page_00h[SFF8636_FC_LEN_OFFSET],
+ map->page_00h[SFF8636_FC_TECH_OFFSET],
+ map->page_00h[SFF8636_FC_TRANS_MEDIA_OFFSET],
+ map->page_00h[SFF8636_FC_SPEED_OFFSET]);
+ }
/* 10G/40G Ethernet Compliance Codes */
if (map->page_00h[SFF8636_ETHERNET_COMP_OFFSET] &
SFF8636_ETHERNET_10G_LRM)
- printf("%s 10G Ethernet: 10G Base-LRM\n", pfx);
+ sprintf(value, "%s", "10G Ethernet: 10G Base-LRM");
if (map->page_00h[SFF8636_ETHERNET_COMP_OFFSET] &
SFF8636_ETHERNET_10G_LR)
- printf("%s 10G Ethernet: 10G Base-LR\n", pfx);
+ sprintf(value, "%s", "10G Ethernet: 10G Base-LR");
if (map->page_00h[SFF8636_ETHERNET_COMP_OFFSET] &
SFF8636_ETHERNET_10G_SR)
- printf("%s 10G Ethernet: 10G Base-SR\n", pfx);
+ sprintf(value, "%s", "10G Ethernet: 10G Base-SR");
if (map->page_00h[SFF8636_ETHERNET_COMP_OFFSET] &
SFF8636_ETHERNET_40G_CR4)
- printf("%s 40G Ethernet: 40G Base-CR4\n", pfx);
+ sprintf(value, "%s", "40G Ethernet: 40G Base-CR4");
if (map->page_00h[SFF8636_ETHERNET_COMP_OFFSET] &
SFF8636_ETHERNET_40G_SR4)
- printf("%s 40G Ethernet: 40G Base-SR4\n", pfx);
+ sprintf(value, "%s", "40G Ethernet: 40G Base-SR4");
if (map->page_00h[SFF8636_ETHERNET_COMP_OFFSET] &
SFF8636_ETHERNET_40G_LR4)
- printf("%s 40G Ethernet: 40G Base-LR4\n", pfx);
+ sprintf(value, "%s", "40G Ethernet: 40G Base-LR4");
if (map->page_00h[SFF8636_ETHERNET_COMP_OFFSET] &
SFF8636_ETHERNET_40G_ACTIVE)
- printf("%s 40G Ethernet: 40G Active Cable (XLPPI)\n", pfx);
+ sprintf(value, "%s", "40G Ethernet: 40G Active Cable (XLPPI)");
/* Extended Specification Compliance Codes from SFF-8024 */
if (map->page_00h[SFF8636_ETHERNET_COMP_OFFSET] &
SFF8636_ETHERNET_RSRVD) {
switch (map->page_00h[SFF8636_OPTION_1_OFFSET]) {
case SFF8636_ETHERNET_UNSPECIFIED:
- printf("%s (reserved or unknown)\n", pfx);
+ sprintf(value, "%s", "(reserved or unknown)");
break;
case SFF8636_ETHERNET_100G_AOC:
- printf("%s 100G Ethernet: 100G AOC or 25GAUI C2M AOC with worst BER of 5x10^(-5)\n",
- pfx);
+ sprintf(value, "%s",
+ "100G Ethernet: 100G AOC or 25GAUI C2M AOC with worst BER of 5x10^(-5)");
break;
case SFF8636_ETHERNET_100G_SR4:
- printf("%s 100G Ethernet: 100G Base-SR4 or 25GBase-SR\n",
- pfx);
+ sprintf(value, "%s",
+ "100G Ethernet: 100G Base-SR4 or 25GBase-SR");
break;
case SFF8636_ETHERNET_100G_LR4:
- printf("%s 100G Ethernet: 100G Base-LR4\n", pfx);
+ sprintf(value, "%s", "100G Ethernet: 100G Base-LR4");
break;
case SFF8636_ETHERNET_100G_ER4:
- printf("%s 100G Ethernet: 100G Base-ER4\n", pfx);
+ sprintf(value, "%s", "100G Ethernet: 100G Base-ER4");
break;
case SFF8636_ETHERNET_100G_SR10:
- printf("%s 100G Ethernet: 100G Base-SR10\n", pfx);
+ sprintf(value, "%s", "100G Ethernet: 100G Base-SR10");
break;
case SFF8636_ETHERNET_100G_CWDM4_FEC:
- printf("%s 100G Ethernet: 100G CWDM4 MSA with FEC\n", pfx);
+ sprintf(value, "%s",
+ "100G Ethernet: 100G CWDM4 MSA with FEC");
break;
case SFF8636_ETHERNET_100G_PSM4:
- printf("%s 100G Ethernet: 100G PSM4 Parallel SMF\n", pfx);
+ sprintf(value, "%s",
+ "100G Ethernet: 100G PSM4 Parallel SMF");
break;
case SFF8636_ETHERNET_100G_ACC:
- printf("%s 100G Ethernet: 100G ACC or 25GAUI C2M ACC with worst BER of 5x10^(-5)\n",
- pfx);
+ sprintf(value, "%s",
+ "100G Ethernet: 100G ACC or 25GAUI C2M ACC with worst BER of 5x10^(-5)");
break;
case SFF8636_ETHERNET_100G_CWDM4_NO_FEC:
- printf("%s 100G Ethernet: 100G CWDM4 MSA without FEC\n", pfx);
+ sprintf(value, "%s",
+ "100G Ethernet: 100G CWDM4 MSA without FEC");
break;
case SFF8636_ETHERNET_100G_RSVD1:
- printf("%s (reserved or unknown)\n", pfx);
+ sprintf(value, "%s", "(reserved or unknown)");
break;
case SFF8636_ETHERNET_100G_CR4:
- printf("%s 100G Ethernet: 100G Base-CR4 or 25G Base-CR CA-L\n",
- pfx);
+ sprintf(value, "%s",
+ "100G Ethernet: 100G Base-CR4 or 25G Base-CR CA-L");
break;
case SFF8636_ETHERNET_25G_CR_CA_S:
- printf("%s 25G Ethernet: 25G Base-CR CA-S\n", pfx);
+ sprintf(value, "%s", "25G Ethernet: 25G Base-CR CA-S");
break;
case SFF8636_ETHERNET_25G_CR_CA_N:
- printf("%s 25G Ethernet: 25G Base-CR CA-N\n", pfx);
+ sprintf(value, "%s", "25G Ethernet: 25G Base-CR CA-N");
break;
case SFF8636_ETHERNET_40G_ER4:
- printf("%s 40G Ethernet: 40G Base-ER4\n", pfx);
+ sprintf(value, "%s", "40G Ethernet: 40G Base-ER4");
break;
case SFF8636_ETHERNET_4X10_SR:
- printf("%s 4x10G Ethernet: 10G Base-SR\n", pfx);
+ sprintf(value, "%s", "4x10G Ethernet: 10G Base-SR");
break;
case SFF8636_ETHERNET_40G_PSM4:
- printf("%s 40G Ethernet: 40G PSM4 Parallel SMF\n", pfx);
+ sprintf(value, "%s",
+ "40G Ethernet: 40G PSM4 Parallel SMF");
break;
case SFF8636_ETHERNET_G959_P1I1_2D1:
- printf("%s Ethernet: G959.1 profile P1I1-2D1 (10709 MBd, 2km, 1310nm SM)\n",
- pfx);
+ sprintf(value, "%s",
+ "Ethernet: G959.1 profile P1I1-2D1 (10709 MBd, 2km, 1310nm SM)");
break;
case SFF8636_ETHERNET_G959_P1S1_2D2:
- printf("%s Ethernet: G959.1 profile P1S1-2D2 (10709 MBd, 40km, 1550nm SM)\n",
- pfx);
+ sprintf(value, "%s",
+ "Ethernet: G959.1 profile P1S1-2D2 (10709 MBd, 40km, 1550nm SM)");
break;
case SFF8636_ETHERNET_G959_P1L1_2D2:
- printf("%s Ethernet: G959.1 profile P1L1-2D2 (10709 MBd, 80km, 1550nm SM)\n",
- pfx);
+ sprintf(value, "%s",
+ "Ethernet: G959.1 profile P1L1-2D2 (10709 MBd, 80km, 1550nm SM)");
break;
case SFF8636_ETHERNET_10GT_SFI:
- printf("%s 10G Ethernet: 10G Base-T with SFI electrical interface\n",
- pfx);
+ sprintf(value, "%s",
+ "10G Ethernet: 10G Base-T with SFI electrical interface");
break;
case SFF8636_ETHERNET_100G_CLR4:
- printf("%s 100G Ethernet: 100G CLR4\n", pfx);
+ sprintf(value, "%s", "100G Ethernet: 100G CLR4");
break;
case SFF8636_ETHERNET_100G_AOC2:
- printf("%s 100G Ethernet: 100G AOC or 25GAUI C2M AOC with worst BER of 10^(-12)\n",
- pfx);
+ sprintf(value, "%s",
+ "100G Ethernet: 100G AOC or 25GAUI C2M AOC with worst BER of 10^(-12)");
break;
case SFF8636_ETHERNET_100G_ACC2:
- printf("%s 100G Ethernet: 100G ACC or 25GAUI C2M ACC with worst BER of 10^(-12)\n",
- pfx);
+ sprintf(value, "%s",
+ "100G Ethernet: 100G ACC or 25GAUI C2M ACC with worst BER of 10^(-12)");
break;
case SFF8636_ETHERNET_100GE_DWDM2:
- printf("%s 100GE-DWDM2 (DWDM transceiver using 2 wavelengths on a 1550 nm DWDM grid with a reach up to 80 km)\n",
- pfx);
+ sprintf(value, "%s",
+ "100GE-DWDM2 (DWDM transceiver using 2 wavelengths on a 1550 nm DWDM grid with a reach up to 80 km)");
break;
case SFF8636_ETHERNET_100G_1550NM_WDM:
- printf("%s 100G 1550nm WDM (4 wavelengths)\n", pfx);
+ sprintf(value, "%s", "100G 1550nm WDM (4 wavelengths)");
break;
case SFF8636_ETHERNET_10G_BASET_SR:
- printf("%s 10GBASE-T Short Reach (30 meters)\n", pfx);
+ sprintf(value, "%s",
+ "10GBASE-T Short Reach (30 meters)");
break;
case SFF8636_ETHERNET_5G_BASET:
- printf("%s 5GBASE-T\n", pfx);
+ sprintf(value, "%s", "5GBASE-T");
break;
case SFF8636_ETHERNET_2HALFG_BASET:
- printf("%s 2.5GBASE-T\n", pfx);
+ sprintf(value, "%s", "2.5GBASE-T");
break;
case SFF8636_ETHERNET_40G_SWDM4:
- printf("%s 40G SWDM4\n", pfx);
+ sprintf(value, "%s", "40G SWDM4");
break;
case SFF8636_ETHERNET_100G_SWDM4:
- printf("%s 100G SWDM4\n", pfx);
+ sprintf(value, "%s", "100G SWDM4");
break;
case SFF8636_ETHERNET_100G_PAM4_BIDI:
- printf("%s 100G PAM4 BiDi\n", pfx);
+ sprintf(value, "%s", "100G PAM4 BiDi");
break;
case SFF8636_ETHERNET_4WDM10_MSA:
- printf("%s 4WDM-10 MSA (10km version of 100G CWDM4 with same RS(528,514) FEC in host system)\n",
- pfx);
+ sprintf(value, "%s",
+ "4WDM-10 MSA (10km version of 100G CWDM4 with same RS(528,514) FEC in host system)");
break;
case SFF8636_ETHERNET_4WDM20_MSA:
- printf("%s 4WDM-20 MSA (20km version of 100GBASE-LR4 with RS(528,514) FEC in host system)\n",
- pfx);
+ sprintf(value, "%s", "4WDM-20 MSA (20km version of 100GBASE-LR4 with RS(528,514) FEC in host system)");
break;
case SFF8636_ETHERNET_4WDM40_MSA:
- printf("%s 4WDM-40 MSA (40km reach with APD receiver and RS(528,514) FEC in host system)\n",
- pfx);
+ sprintf(value, "%s",
+ "4WDM-40 MSA (40km reach with APD receiver and RS(528,514) FEC in host system)");
break;
case SFF8636_ETHERNET_100G_DR:
- printf("%s 100GBASE-DR (clause 140), CAUI-4 (no FEC)\n", pfx);
+ sprintf(value, "%s",
+ "100GBASE-DR (clause 140), CAUI-4 (no FEC)");
break;
case SFF8636_ETHERNET_100G_FR_NOFEC:
- printf("%s 100G-FR or 100GBASE-FR1 (clause 140), CAUI-4 (no FEC)\n", pfx);
+ sprintf(value, "%s",
+ "100G-FR or 100GBASE-FR1 (clause 140), CAUI-4 (no FEC)");
break;
case SFF8636_ETHERNET_100G_LR_NOFEC:
- printf("%s 100G-LR or 100GBASE-LR1 (clause 140), CAUI-4 (no FEC)\n", pfx);
+ sprintf(value, "%s",
+ "100G-LR or 100GBASE-LR1 (clause 140), CAUI-4 (no FEC)");
break;
case SFF8636_ETHERNET_200G_ACC1:
- printf("%s Active Copper Cable with 50GAUI, 100GAUI-2 or 200GAUI-4 C2M. Providing a worst BER of 10-6 or below\n",
- pfx);
+ sprintf(value, "%s",
+ "Active Copper Cable with 50GAUI, 100GAUI-2 or 200GAUI-4 C2M. Providing a worst BER of 10-6 or below");
break;
case SFF8636_ETHERNET_200G_AOC1:
- printf("%s Active Optical Cable with 50GAUI, 100GAUI-2 or 200GAUI-4 C2M. Providing a worst BER of 10-6 or below\n",
- pfx);
+ sprintf(value, "%s",
+ "Active Optical Cable with 50GAUI, 100GAUI-2 or 200GAUI-4 C2M. Providing a worst BER of 10-6 or below");
break;
case SFF8636_ETHERNET_200G_ACC2:
- printf("%s Active Copper Cable with 50GAUI, 100GAUI-2 or 200GAUI-4 C2M. Providing a worst BER of 2.6x10-4 for ACC, 10-5 for AUI, or below\n",
- pfx);
+ sprintf(value, "%s",
+ "Active Copper Cable with 50GAUI, 100GAUI-2 or 200GAUI-4 C2M. Providing a worst BER of 2.6x10-4 for ACC, 10-5 for AUI, or below");
break;
case SFF8636_ETHERNET_200G_A0C2:
- printf("%s Active Optical Cable with 50GAUI, 100GAUI-2 or 200GAUI-4 C2M. Providing a worst BER of 2.6x10-4 for ACC, 10-5 for AUI, or below\n",
- pfx);
+ sprintf(value, "%s",
+ "Active Optical Cable with 50GAUI, 100GAUI-2 or 200GAUI-4 C2M. Providing a worst BER of 2.6x10-4 for ACC, 10-5 for AUI, or below");
break;
case SFF8636_ETHERNET_200G_CR4:
- printf("%s 50GBASE-CR, 100GBASE-CR2, or 200GBASE-CR4\n", pfx);
+ sprintf(value, "%s",
+ "50GBASE-CR, 100GBASE-CR2, or 200GBASE-CR4");
break;
case SFF8636_ETHERNET_200G_SR4:
- printf("%s 50GBASE-SR, 100GBASE-SR2, or 200GBASE-SR4\n", pfx);
+ sprintf(value, "%s",
+ "50GBASE-SR, 100GBASE-SR2, or 200GBASE-SR4");
break;
case SFF8636_ETHERNET_200G_DR4:
- printf("%s 50GBASE-FR or 200GBASE-DR4\n", pfx);
+ sprintf(value, "%s", "50GBASE-FR or 200GBASE-DR4");
break;
case SFF8636_ETHERNET_200G_FR4:
- printf("%s 200GBASE-FR4\n", pfx);
+ sprintf(value, "%s", "200GBASE-FR4");
break;
case SFF8636_ETHERNET_200G_PSM4:
- printf("%s 200G 1550 nm PSM4\n", pfx);
+ sprintf(value, "%s", "200G 1550 nm PSM4");
break;
case SFF8636_ETHERNET_50G_LR:
- printf("%s 50GBASE-LR\n", pfx);
+ sprintf(value, "%s", "50GBASE-LR");
break;
case SFF8636_ETHERNET_200G_LR4:
- printf("%s 200GBASE-LR4\n", pfx);
+ sprintf(value, "%s", "200GBASE-LR4");
break;
case SFF8636_ETHERNET_64G_EA:
- printf("%s 64GFC EA\n", pfx);
+ sprintf(value, "%s", "64GFC EA");
break;
case SFF8636_ETHERNET_64G_SW:
- printf("%s 64GFC SW\n", pfx);
+ sprintf(value, "%s", "64GFC SW");
break;
case SFF8636_ETHERNET_64G_LW:
- printf("%s 64GFC LW\n", pfx);
+ sprintf(value, "%s", "64GFC LW");
break;
case SFF8636_ETHERNET_128FC_EA:
- printf("%s 128GFC EA\n", pfx);
+ sprintf(value, "%s", "128GFC EA");
break;
case SFF8636_ETHERNET_128FC_SW:
- printf("%s 128GFC SW\n", pfx);
+ sprintf(value, "%s", "128GFC SW");
break;
case SFF8636_ETHERNET_128FC_LW:
- printf("%s 128GFC LW\n", pfx);
+ sprintf(value, "%s", "128GFC LW");
break;
default:
- printf("%s (reserved or unknown)\n", pfx);
+ sprintf(value, "%s", "(reserved or unknown)");
break;
}
}
@@ -382,96 +440,98 @@ static void sff8636_show_transceiver(const struct sff8636_memory_map *map)
/* SONET Compliance Codes */
if (map->page_00h[SFF8636_SONET_COMP_OFFSET] &
(SFF8636_SONET_40G_OTN))
- printf("%s 40G OTN (OTU3B/OTU3C)\n", pfx);
+ sprintf(value, "%s", "40G OTN (OTU3B/OTU3C)");
if (map->page_00h[SFF8636_SONET_COMP_OFFSET] & (SFF8636_SONET_OC48_LR))
- printf("%s SONET: OC-48, long reach\n", pfx);
+ sprintf(value, "%s", "SONET: OC-48, long reach");
if (map->page_00h[SFF8636_SONET_COMP_OFFSET] & (SFF8636_SONET_OC48_IR))
- printf("%s SONET: OC-48, intermediate reach\n", pfx);
+ sprintf(value, "%s", "SONET: OC-48, intermediate reach");
if (map->page_00h[SFF8636_SONET_COMP_OFFSET] & (SFF8636_SONET_OC48_SR))
- printf("%s SONET: OC-48, short reach\n", pfx);
+ sprintf(value, "%s", "SONET: OC-48, short reach");
/* SAS/SATA Compliance Codes */
if (map->page_00h[SFF8636_SAS_COMP_OFFSET] & (SFF8636_SAS_6G))
- printf("%s SAS 6.0G\n", pfx);
+ sprintf(value, "%s", "SAS 6.0G");
if (map->page_00h[SFF8636_SAS_COMP_OFFSET] & (SFF8636_SAS_3G))
- printf("%s SAS 3.0G\n", pfx);
+ sprintf(value, "%s", "SAS 3.0G");
/* Ethernet Compliance Codes */
if (map->page_00h[SFF8636_GIGE_COMP_OFFSET] & SFF8636_GIGE_1000_BASE_T)
- printf("%s Ethernet: 1000BASE-T\n", pfx);
+ sprintf(value, "%s", "Ethernet: 1000BASE-T");
if (map->page_00h[SFF8636_GIGE_COMP_OFFSET] & SFF8636_GIGE_1000_BASE_CX)
- printf("%s Ethernet: 1000BASE-CX\n", pfx);
+ sprintf(value, "%s", "Ethernet: 1000BASE-CX");
if (map->page_00h[SFF8636_GIGE_COMP_OFFSET] & SFF8636_GIGE_1000_BASE_LX)
- printf("%s Ethernet: 1000BASE-LX\n", pfx);
+ sprintf(value, "%s", "Ethernet: 1000BASE-LX");
if (map->page_00h[SFF8636_GIGE_COMP_OFFSET] & SFF8636_GIGE_1000_BASE_SX)
- printf("%s Ethernet: 1000BASE-SX\n", pfx);
+ sprintf(value, "%s", "Ethernet: 1000BASE-SX");
/* Fibre Channel link length */
if (map->page_00h[SFF8636_FC_LEN_OFFSET] & SFF8636_FC_LEN_VERY_LONG)
- printf("%s FC: very long distance (V)\n", pfx);
+ sprintf(value, "%s", "FC: very long distance (V)");
if (map->page_00h[SFF8636_FC_LEN_OFFSET] & SFF8636_FC_LEN_SHORT)
- printf("%s FC: short distance (S)\n", pfx);
+ sprintf(value, "%s", "FC: short distance (S)");
if (map->page_00h[SFF8636_FC_LEN_OFFSET] & SFF8636_FC_LEN_INT)
- printf("%s FC: intermediate distance (I)\n", pfx);
+ sprintf(value, "%s", "FC: intermediate distance (I)");
if (map->page_00h[SFF8636_FC_LEN_OFFSET] & SFF8636_FC_LEN_LONG)
- printf("%s FC: long distance (L)\n", pfx);
+ sprintf(value, "%s", "FC: long distance (L)");
if (map->page_00h[SFF8636_FC_LEN_OFFSET] & SFF8636_FC_LEN_MED)
- printf("%s FC: medium distance (M)\n", pfx);
+ sprintf(value, "%s", "FC: medium distance (M)");
/* Fibre Channel transmitter technology */
if (map->page_00h[SFF8636_FC_LEN_OFFSET] & SFF8636_FC_TECH_LONG_LC)
- printf("%s FC: Longwave laser (LC)\n", pfx);
+ sprintf(value, "%s", "FC: Longwave laser (LC)");
if (map->page_00h[SFF8636_FC_LEN_OFFSET] & SFF8636_FC_TECH_ELEC_INTER)
- printf("%s FC: Electrical inter-enclosure (EL)\n", pfx);
+ sprintf(value, "%s", "FC: Electrical inter-enclosure (EL)");
if (map->page_00h[SFF8636_FC_TECH_OFFSET] & SFF8636_FC_TECH_ELEC_INTRA)
- printf("%s FC: Electrical intra-enclosure (EL)\n", pfx);
+ sprintf(value, "%s", "FC: Electrical intra-enclosure (EL)");
if (map->page_00h[SFF8636_FC_TECH_OFFSET] &
SFF8636_FC_TECH_SHORT_WO_OFC)
- printf("%s FC: Shortwave laser w/o OFC (SN)\n", pfx);
+ sprintf(value, "%s", "FC: Shortwave laser w/o OFC (SN)");
if (map->page_00h[SFF8636_FC_TECH_OFFSET] & SFF8636_FC_TECH_SHORT_W_OFC)
- printf("%s FC: Shortwave laser with OFC (SL)\n", pfx);
+ sprintf(value, "%s", "FC: Shortwave laser with OFC (SL)");
if (map->page_00h[SFF8636_FC_TECH_OFFSET] & SFF8636_FC_TECH_LONG_LL)
- printf("%s FC: Longwave laser (LL)\n", pfx);
+ sprintf(value, "%s", "FC: Longwave laser (LL)");
/* Fibre Channel transmission media */
if (map->page_00h[SFF8636_FC_TRANS_MEDIA_OFFSET] &
SFF8636_FC_TRANS_MEDIA_TW)
- printf("%s FC: Twin Axial Pair (TW)\n", pfx);
+ sprintf(value, "%s", "FC: Twin Axial Pair (TW)");
if (map->page_00h[SFF8636_FC_TRANS_MEDIA_OFFSET] &
SFF8636_FC_TRANS_MEDIA_TP)
- printf("%s FC: Twisted Pair (TP)\n", pfx);
+ sprintf(value, "%s", "FC: Twisted Pair (TP)");
if (map->page_00h[SFF8636_FC_TRANS_MEDIA_OFFSET] &
SFF8636_FC_TRANS_MEDIA_MI)
- printf("%s FC: Miniature Coax (MI)\n", pfx);
+ sprintf(value, "%s", "FC: Miniature Coax (MI)");
if (map->page_00h[SFF8636_FC_TRANS_MEDIA_OFFSET] &
SFF8636_FC_TRANS_MEDIA_TV)
- printf("%s FC: Video Coax (TV)\n", pfx);
+ sprintf(value, "%s", "FC: Video Coax (TV)");
if (map->page_00h[SFF8636_FC_TRANS_MEDIA_OFFSET] &
SFF8636_FC_TRANS_MEDIA_M6)
- printf("%s FC: Multimode, 62.5m (M6)\n", pfx);
+ sprintf(value, "%s", "FC: Multimode, 62.5m (M6)");
if (map->page_00h[SFF8636_FC_TRANS_MEDIA_OFFSET] &
SFF8636_FC_TRANS_MEDIA_M5)
- printf("%s FC: Multimode, 50m (M5)\n", pfx);
+ sprintf(value, "%s", "FC: Multimode, 50m (M5)");
if (map->page_00h[SFF8636_FC_TRANS_MEDIA_OFFSET] &
SFF8636_FC_TRANS_MEDIA_OM3)
- printf("%s FC: Multimode, 50um (OM3)\n", pfx);
+ sprintf(value, "%s", "FC: Multimode, 50um (OM3)");
if (map->page_00h[SFF8636_FC_TRANS_MEDIA_OFFSET] &
SFF8636_FC_TRANS_MEDIA_SM)
- printf("%s FC: Single Mode (SM)\n", pfx);
+ sprintf(value, "%s", "FC: Single Mode (SM)");
/* Fibre Channel speed */
if (map->page_00h[SFF8636_FC_SPEED_OFFSET] & SFF8636_FC_SPEED_1200_MBPS)
- printf("%s FC: 1200 MBytes/sec\n", pfx);
+ sprintf(value, "%s", "FC: 1200 MBytes/sec");
if (map->page_00h[SFF8636_FC_SPEED_OFFSET] & SFF8636_FC_SPEED_800_MBPS)
- printf("%s FC: 800 MBytes/sec\n", pfx);
+ sprintf(value, "%s", "FC: 800 MBytes/sec");
if (map->page_00h[SFF8636_FC_SPEED_OFFSET] & SFF8636_FC_SPEED_1600_MBPS)
- printf("%s FC: 1600 MBytes/sec\n", pfx);
+ sprintf(value, "%s", "FC: 1600 MBytes/sec");
if (map->page_00h[SFF8636_FC_SPEED_OFFSET] & SFF8636_FC_SPEED_400_MBPS)
- printf("%s FC: 400 MBytes/sec\n", pfx);
+ sprintf(value, "%s", "FC: 400 MBytes/sec");
if (map->page_00h[SFF8636_FC_SPEED_OFFSET] & SFF8636_FC_SPEED_200_MBPS)
- printf("%s FC: 200 MBytes/sec\n", pfx);
+ sprintf(value, "%s", "FC: 200 MBytes/sec");
if (map->page_00h[SFF8636_FC_SPEED_OFFSET] & SFF8636_FC_SPEED_100_MBPS)
- printf("%s FC: 100 MBytes/sec\n", pfx);
+ sprintf(value, "%s", "FC: 100 MBytes/sec");
+
+ module_print_any_string(pfx, value);
}
static void sff8636_show_encoding(const struct sff8636_memory_map *map)
@@ -483,8 +543,10 @@ static void sff8636_show_encoding(const struct sff8636_memory_map *map)
static void sff8636_show_rate_identifier(const struct sff8636_memory_map *map)
{
/* TODO: Need to fix rate select logic */
- printf("\t%-41s : 0x%02x\n", "Rate identifier",
- map->page_00h[SFF8636_EXT_RS_OFFSET]);
+ sff_print_any_hex_field("Rate identifier", "rate_identifier",
+ map->page_00h[SFF8636_EXT_RS_OFFSET], NULL);
+
+
}
static void
@@ -496,58 +558,65 @@ sff8636_show_wavelength_or_copper_compliance(const struct sff8636_memory_map *ma
module_show_mit_compliance(value);
if (value >= SFF8636_TRANS_COPPER_PAS_UNEQUAL) {
- printf("\t%-41s : %udb\n", "Attenuation at 2.5GHz",
- map->page_00h[SFF8636_WAVELEN_HIGH_BYTE_OFFSET]);
- printf("\t%-41s : %udb\n", "Attenuation at 5.0GHz",
- map->page_00h[SFF8636_WAVELEN_LOW_BYTE_OFFSET]);
- printf("\t%-41s : %udb\n", "Attenuation at 7.0GHz",
- map->page_00h[SFF8636_WAVE_TOL_HIGH_BYTE_OFFSET]);
- printf("\t%-41s : %udb\n", "Attenuation at 12.9GHz",
- map->page_00h[SFF8636_WAVE_TOL_LOW_BYTE_OFFSET]);
+ module_print_any_uint("Attenuation at 2.5GHz",
+ map->page_00h[SFF8636_WAVELEN_HIGH_BYTE_OFFSET],
+ "db");
+ module_print_any_uint("Attenuation at 5.0GHz",
+ map->page_00h[SFF8636_WAVELEN_LOW_BYTE_OFFSET],
+ "db");
+ module_print_any_uint("Attenuation at 7.0GHz",
+ map->page_00h[SFF8636_WAVELEN_HIGH_BYTE_OFFSET],
+ "db");
+ module_print_any_uint("Attenuation at 12.9GHz",
+ map->page_00h[SFF8636_WAVELEN_LOW_BYTE_OFFSET],
+ "db");
} else {
- printf("\t%-41s : %.3lfnm\n", "Laser wavelength",
- (((map->page_00h[SFF8636_WAVELEN_HIGH_BYTE_OFFSET] << 8) |
- map->page_00h[SFF8636_WAVELEN_LOW_BYTE_OFFSET]) * 0.05));
- printf("\t%-41s : %.3lfnm\n", "Laser wavelength tolerance",
- (((map->page_00h[SFF8636_WAVE_TOL_HIGH_BYTE_OFFSET] << 8) |
- map->page_00h[SFF8636_WAVE_TOL_LOW_BYTE_OFFSET]) * 0.005));
+ module_print_any_float("Laser wavelength",
+ (((map->page_00h[SFF8636_WAVELEN_HIGH_BYTE_OFFSET] << 8) |
+ map->page_00h[SFF8636_WAVELEN_LOW_BYTE_OFFSET]) * 0.05),
+ "nm");
+ module_print_any_float("Laser wavelength tolerance",
+ (((map->page_00h[SFF8636_WAVE_TOL_HIGH_BYTE_OFFSET] << 8) |
+ map->page_00h[SFF8636_WAVE_TOL_LOW_BYTE_OFFSET]) * 0.05),
+ "nm");
}
}
static void sff8636_show_revision_compliance(const __u8 *id, int rev_offset)
{
- static const char *pfx =
- "\tRevision Compliance :";
+ const char *pfx = "Revision Compliance";
+ char value[64] = "";
switch (id[rev_offset]) {
case SFF8636_REV_UNSPECIFIED:
- printf("%s Revision not specified\n", pfx);
+ sprintf(value, "%s", "Revision not specified");
break;
case SFF8636_REV_8436_48:
- printf("%s SFF-8436 Rev 4.8 or earlier\n", pfx);
+ sprintf(value, "%s", "SFF-8436 Rev 4.8 or earlier");
break;
case SFF8636_REV_8436_8636:
- printf("%s SFF-8436 Rev 4.8 or earlier\n", pfx);
+ sprintf(value, "%s", "SFF-8436 Rev 4.8 or earlier");
break;
case SFF8636_REV_8636_13:
- printf("%s SFF-8636 Rev 1.3 or earlier\n", pfx);
+ sprintf(value, "%s", "SFF-8636 Rev 1.3 or earlier");
break;
case SFF8636_REV_8636_14:
- printf("%s SFF-8636 Rev 1.4\n", pfx);
+ sprintf(value, "%s", "SFF-8636 Rev 1.4");
break;
case SFF8636_REV_8636_15:
- printf("%s SFF-8636 Rev 1.5\n", pfx);
+ sprintf(value, "%s", "SFF-8636 Rev 1.5");
break;
case SFF8636_REV_8636_20:
- printf("%s SFF-8636 Rev 2.0\n", pfx);
+ sprintf(value, "%s", "SFF-8636 Rev 2.0");
break;
case SFF8636_REV_8636_27:
- printf("%s SFF-8636 Rev 2.5/2.6/2.7\n", pfx);
+ sprintf(value, "%s", "SFF-8636 Rev 2.5/2.6/2.7");
break;
default:
- printf("%s Unallocated\n", pfx);
+ sprintf(value, "%s", "Unallocated");
break;
}
+ module_print_any_string(pfx, value);
}
/*
@@ -654,11 +723,21 @@ static void sff8636_show_dom_chan_lvl_tx_bias(const struct sff_diags *sd)
char power_string[MAX_DESC_SIZE];
int i;
+ open_json_array("laser_tx_bias_current", "");
for (i = 0; i < SFF8636_MAX_CHANNEL_NUM; i++) {
- snprintf(power_string, MAX_DESC_SIZE, "%s (Channel %d)",
- "Laser tx bias current", i+1);
- PRINT_BIAS(power_string, sd->scd[i].bias_cur);
+ if (is_json_context()) {
+ print_float(PRINT_JSON, NULL, "%.3f",
+ (double)sd->scd[i].bias_cur / 500.);
+ } else {
+ snprintf(power_string, MAX_DESC_SIZE, "%s (Channel %d)",
+ "Laser tx bias current", i+1);
+ PRINT_BIAS(power_string, sd->scd[i].bias_cur);
+ }
}
+ close_json_array("");
+
+ if (is_json_context())
+ module_print_any_units("laser_tx_bias_current", "mA");
}
static void sff8636_show_dom_chan_lvl_tx_power(const struct sff_diags *sd)
@@ -666,11 +745,21 @@ static void sff8636_show_dom_chan_lvl_tx_power(const struct sff_diags *sd)
char power_string[MAX_DESC_SIZE];
int i;
+ open_json_array("transmit_avg_optical_power", "");
for (i = 0; i < SFF8636_MAX_CHANNEL_NUM; i++) {
- snprintf(power_string, MAX_DESC_SIZE, "%s (Channel %d)",
- "Transmit avg optical power", i+1);
- PRINT_xX_PWR(power_string, sd->scd[i].tx_power);
+ if (is_json_context()) {
+ print_float(PRINT_JSON, NULL, "%.4f",
+ (double)sd->scd[i].tx_power / 10000.);
+ } else {
+ snprintf(power_string, MAX_DESC_SIZE, "%s (Channel %d)",
+ "Transmit avg optical power", i+1);
+ PRINT_xX_PWR(power_string, sd->scd[i].tx_power);
+ }
}
+ close_json_array("");
+
+ if (is_json_context())
+ module_print_any_units("transmit_avg_optical_power", "mW");
}
static void sff8636_show_dom_chan_lvl_rx_power(const struct sff_diags *sd)
@@ -684,11 +773,25 @@ static void sff8636_show_dom_chan_lvl_rx_power(const struct sff_diags *sd)
else
rx_power_string = "Rcvr signal avg optical power";
+ char rx_power_json_str[strlen(rx_power_string)];
+
+ convert_json_field_name(rx_power_string, rx_power_json_str);
+
+ open_json_array(rx_power_json_str, "");
for (i = 0; i < SFF8636_MAX_CHANNEL_NUM; i++) {
- snprintf(power_string, MAX_DESC_SIZE, "%s (Channel %d)",
- rx_power_string, i+1);
- PRINT_xX_PWR(power_string, sd->scd[i].rx_power);
+ if (is_json_context()) {
+ print_float(PRINT_JSON, NULL, "%.4f",
+ (double)sd->scd[i].rx_power / 10000.);
+ } else {
+ snprintf(power_string, MAX_DESC_SIZE, "%s (Channel %d)",
+ rx_power_string, i+1);
+ PRINT_xX_PWR(power_string, sd->scd[i].rx_power);
+ }
}
+ close_json_array("");
+
+ if (is_json_context())
+ module_print_any_units(rx_power_json_str, "mW");
}
static void
@@ -698,38 +801,61 @@ sff8636_show_dom_chan_lvl_flags(const struct sff8636_memory_map *map)
int i;
for (i = 0; module_aw_chan_flags[i].fmt_str; ++i) {
+ char json_str[80] = {};
+ char str[80] = {};
int j = 1;
if (module_aw_chan_flags[i].type != MODULE_TYPE_SFF8636)
continue;
+ convert_json_field_name(module_aw_chan_flags[i].fmt_str,
+ json_str);
+
+ open_json_array(json_str, "");
do {
value = map->lower_memory[module_aw_chan_flags[i].offset] &
module_aw_chan_flags[i].adver_value;
- printf("\t%-41s (Chan %d) : %s\n",
- module_aw_chan_flags[i].fmt_str, j,
- ONOFF(value));
+ if (is_json_context()) {
+ print_bool(PRINT_JSON, NULL, NULL, value);
+ } else {
+ snprintf(str, 80, "%s (Chan %d)",
+ module_aw_chan_flags[i].fmt_str, j);
+ printf("\t%-41s : %s\n", str, ONOFF(value));
+ }
j++;
i++;
- }
- while (module_aw_chan_flags[i].fmt_str &&
- strcmp(module_aw_chan_flags[i].fmt_str,
- module_aw_chan_flags[i-1].fmt_str) == 0);
+ } while (module_aw_chan_flags[i].fmt_str &&
+ strcmp(module_aw_chan_flags[i].fmt_str,
+ module_aw_chan_flags[i-1].fmt_str) == 0);
i--;
+ close_json_array("");
}
}
static void
sff8636_show_dom_mod_lvl_flags(const struct sff8636_memory_map *map)
{
+ bool value;
int i;
for (i = 0; module_aw_mod_flags[i].str; ++i) {
- if (module_aw_mod_flags[i].type == MODULE_TYPE_SFF8636)
+ char str[80] = {};
+
+ if (module_aw_mod_flags[i].type != MODULE_TYPE_SFF8636)
+ continue;
+
+ value = map->lower_memory[module_aw_mod_flags[i].offset] &
+ module_aw_mod_flags[i].value;
+
+ if (is_json_context()) {
+ print_bool(PRINT_JSON, module_aw_mod_flags[i].str,
+ NULL, value);
+ } else {
+ snprintf(str, 80, "%s (Chan %d)",
+ module_aw_mod_flags[i].str, i+1);
printf("\t%-41s : %s\n",
- module_aw_mod_flags[i].str,
- ONOFF(map->lower_memory[module_aw_mod_flags[i].offset]
- & module_aw_mod_flags[i].value));
+ module_aw_mod_flags[i].str, ONOFF(value));
+ }
}
}
@@ -765,8 +891,9 @@ static void sff8636_show_dom(const struct sff8636_memory_map *map)
(sd.sfp_temp[MCURR] == (__s16)0xFFFF))
return;
- printf("\t%-41s : %s\n", "Alarm/warning flags implemented",
- (sd.supports_alarms ? "Yes" : "No"));
+ module_print_any_bool("Alarm/warning flags implemented",
+ "alarm/warning_flags_implemented",
+ sd.supports_alarms, YESNO(sd.supports_alarms));
sff8636_show_dom_chan_lvl_tx_bias(&sd);
sff8636_show_dom_chan_lvl_tx_power(&sd);
@@ -776,7 +903,10 @@ static void sff8636_show_dom(const struct sff8636_memory_map *map)
sff8636_show_dom_chan_lvl_flags(map);
sff8636_show_dom_mod_lvl_flags(map);
- sff_show_thresholds(sd);
+ if (is_json_context())
+ sff_show_thresholds_json(sd);
+ else
+ sff_show_thresholds(sd);
}
}
@@ -817,7 +947,7 @@ static void sff8636_show_page_zero(const struct sff8636_memory_map *map)
sff8636_show_transceiver(map);
sff8636_show_encoding(map);
module_show_value_with_unit(map->page_00h, SFF8636_BR_NOMINAL_OFFSET,
- "BR, Nominal", 100, "Mbps");
+ "BR Nominal", 100, "Mbps");
sff8636_show_rate_identifier(map);
module_show_value_with_unit(map->page_00h, SFF8636_SM_LEN_OFFSET,
"Length (SMF,km)", 1, "km");
--
2.47.0
Powered by blists - more mailing lists