| 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-12-danieller@nvidia.com>
Date: Sun, 26 Jan 2025 13:56:32 +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 11/14] sfpid: Add JSON output handling to --module-info in SFF8079 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>
---
sfpid.c | 360 ++++++++++++++++++++++++++++++++------------------------
1 file changed, 207 insertions(+), 153 deletions(-)
diff --git a/sfpid.c b/sfpid.c
index 3c126b4..f97e2b3 100644
--- a/sfpid.c
+++ b/sfpid.c
@@ -42,231 +42,258 @@ static void sff8079_show_connector(const __u8 *id)
static void sff8079_show_transceiver(const __u8 *id)
{
- static const char *pfx =
- "\tTransceiver type :";
+ static const char *pfx = "Transceiver type";
+ char value[140] = "";
- printf("\t%-41s : 0x%02x 0x%02x 0x%02x " \
- "0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n",
- "Transceiver codes",
- id[3], id[4], id[5], id[6],
- id[7], id[8], id[9], id[10], id[36]);
+ if (is_json_context()) {
+ open_json_array("transceiver_codes", "");
+ print_int(PRINT_JSON, NULL, "0x%02x", id[3]);
+ print_int(PRINT_JSON, NULL, "0x%02x", id[4]);
+ print_int(PRINT_JSON, NULL, "0x%02x", id[5]);
+ print_int(PRINT_JSON, NULL, "0x%02x", id[6]);
+ print_int(PRINT_JSON, NULL, "0x%02x", id[7]);
+ print_int(PRINT_JSON, NULL, "0x%02x", id[8]);
+ print_int(PRINT_JSON, NULL, "0x%02x", id[9]);
+ print_int(PRINT_JSON, NULL, "0x%02x", id[10]);
+ print_int(PRINT_JSON, NULL, "0x%02x", id[36]);
+ close_json_array("");
+ } else {
+ printf("\t%-41s : 0x%02x 0x%02x 0x%02x " \
+ "0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n",
+ "Transceiver codes", id[3], id[4], id[5], id[6],
+ id[7], id[8], id[9], id[10], id[36]);
+ }
/* 10G Ethernet Compliance Codes */
if (id[3] & (1 << 7))
- printf("%s 10G Ethernet: 10G Base-ER" \
- " [SFF-8472 rev10.4 onwards]\n", pfx);
+ sprintf(value, "%s",
+ "10G Ethernet: 10G Base-LRM [SFF-8472 rev10.4 onwards]");
if (id[3] & (1 << 6))
- printf("%s 10G Ethernet: 10G Base-LRM\n", pfx);
+ sprintf(value, "%s", "10G Ethernet: 10G Base-LRM");
if (id[3] & (1 << 5))
- printf("%s 10G Ethernet: 10G Base-LR\n", pfx);
+ sprintf(value, "%s", "10G Ethernet: 10G Base-LR");
if (id[3] & (1 << 4))
- printf("%s 10G Ethernet: 10G Base-SR\n", pfx);
+ sprintf(value, "%s", "10G Ethernet: 10G Base-SR");
/* Infiniband Compliance Codes */
if (id[3] & (1 << 3))
- printf("%s Infiniband: 1X SX\n", pfx);
+ sprintf(value, "%s", "Infiniband: 1X SX");
if (id[3] & (1 << 2))
- printf("%s Infiniband: 1X LX\n", pfx);
+ sprintf(value, "%s", "Infiniband: 1X LX");
if (id[3] & (1 << 1))
- printf("%s Infiniband: 1X Copper Active\n", pfx);
+ sprintf(value, "%s", "Infiniband: 1X Copper Active");
if (id[3] & (1 << 0))
- printf("%s Infiniband: 1X Copper Passive\n", pfx);
+ sprintf(value, "%s", "Infiniband: 1X Copper Passive");
/* ESCON Compliance Codes */
if (id[4] & (1 << 7))
- printf("%s ESCON: ESCON MMF, 1310nm LED\n", pfx);
+ sprintf(value, "%s", "ESCON: ESCON MMF, 1310nm LED");
if (id[4] & (1 << 6))
- printf("%s ESCON: ESCON SMF, 1310nm Laser\n", pfx);
+ sprintf(value, "%s", "ESCON: ESCON SMF, 1310nm Laser");
/* SONET Compliance Codes */
if (id[4] & (1 << 5))
- printf("%s SONET: OC-192, short reach\n", pfx);
+ sprintf(value, "%s", "SONET: OC-192, short reach");
if (id[4] & (1 << 4))
- printf("%s SONET: SONET reach specifier bit 1\n", pfx);
+ sprintf(value, "%s", "SONET: SONET reach specifier bit 1");
if (id[4] & (1 << 3))
- printf("%s SONET: SONET reach specifier bit 2\n", pfx);
+ sprintf(value, "%s", "SONET: SONET reach specifier bit 2");
if (id[4] & (1 << 2))
- printf("%s SONET: OC-48, long reach\n", pfx);
+ sprintf(value, "%s", "SONET: OC-48, long reach");
if (id[4] & (1 << 1))
- printf("%s SONET: OC-48, intermediate reach\n", pfx);
+ sprintf(value, "%s", "SONET: OC-48, intermediate reach");
if (id[4] & (1 << 0))
- printf("%s SONET: OC-48, short reach\n", pfx);
+ sprintf(value, "%s", "SONET: OC-48, short reach");
if (id[5] & (1 << 6))
- printf("%s SONET: OC-12, single mode, long reach\n", pfx);
+ sprintf(value, "%s", "SONET: OC-12, single mode, long reach");
if (id[5] & (1 << 5))
- printf("%s SONET: OC-12, single mode, inter. reach\n", pfx);
+ sprintf(value, "%s", "SONET: OC-12, single mode, inter. reach");
if (id[5] & (1 << 4))
- printf("%s SONET: OC-12, short reach\n", pfx);
+ sprintf(value, "%s", "SONET: OC-12, short reach");
if (id[5] & (1 << 2))
- printf("%s SONET: OC-3, single mode, long reach\n", pfx);
+ sprintf(value, "%s", "SONET: OC-3, single mode, long reach");
if (id[5] & (1 << 1))
- printf("%s SONET: OC-3, single mode, inter. reach\n", pfx);
+ sprintf(value, "%s", "SONET: OC-3, single mode, inter. reach");
if (id[5] & (1 << 0))
- printf("%s SONET: OC-3, short reach\n", pfx);
+ sprintf(value, "%s", "SONET: OC-3, short reach");
/* Ethernet Compliance Codes */
if (id[6] & (1 << 7))
- printf("%s Ethernet: BASE-PX\n", pfx);
+ sprintf(value, "%s", "Ethernet: BASE-PX");
if (id[6] & (1 << 6))
- printf("%s Ethernet: BASE-BX10\n", pfx);
+ sprintf(value, "%s", "Ethernet: BASE-BX10");
if (id[6] & (1 << 5))
- printf("%s Ethernet: 100BASE-FX\n", pfx);
+ sprintf(value, "%s", "Ethernet: 100BASE-FX");
if (id[6] & (1 << 4))
- printf("%s Ethernet: 100BASE-LX/LX10\n", pfx);
+ sprintf(value, "%s", "Ethernet: 100BASE-LX/LX10");
if (id[6] & (1 << 3))
- printf("%s Ethernet: 1000BASE-T\n", pfx);
+ sprintf(value, "%s", "Ethernet: 1000BASE-T");
if (id[6] & (1 << 2))
- printf("%s Ethernet: 1000BASE-CX\n", pfx);
+ sprintf(value, "%s", "Ethernet: 1000BASE-CX");
if (id[6] & (1 << 1))
- printf("%s Ethernet: 1000BASE-LX\n", pfx);
+ sprintf(value, "%s", "Ethernet: 1000BASE-LX");
if (id[6] & (1 << 0))
- printf("%s Ethernet: 1000BASE-SX\n", pfx);
+ sprintf(value, "%s", "Ethernet: 1000BASE-SX");
/* Fibre Channel link length */
if (id[7] & (1 << 7))
- printf("%s FC: very long distance (V)\n", pfx);
+ sprintf(value, "%s", "FC: very long distance (V)");
if (id[7] & (1 << 6))
- printf("%s FC: short distance (S)\n", pfx);
+ sprintf(value, "%s", "FC: short distance (S)");
if (id[7] & (1 << 5))
- printf("%s FC: intermediate distance (I)\n", pfx);
+ sprintf(value, "%s", "FC: intermediate distance (I)");
if (id[7] & (1 << 4))
- printf("%s FC: long distance (L)\n", pfx);
+ sprintf(value, "%s", "FC: long distance (L)");
if (id[7] & (1 << 3))
- printf("%s FC: medium distance (M)\n", pfx);
+ sprintf(value, "%s", "FC: medium distance (M)");
/* Fibre Channel transmitter technology */
if (id[7] & (1 << 2))
- printf("%s FC: Shortwave laser, linear Rx (SA)\n", pfx);
+ sprintf(value, "%s", "FC: Shortwave laser, linear Rx (SA)");
if (id[7] & (1 << 1))
- printf("%s FC: Longwave laser (LC)\n", pfx);
+ sprintf(value, "%s", "FC: Longwave laser (LC)");
if (id[7] & (1 << 0))
- printf("%s FC: Electrical inter-enclosure (EL)\n", pfx);
+ sprintf(value, "%s", "FC: Electrical inter-enclosure (EL)");
if (id[8] & (1 << 7))
- printf("%s FC: Electrical intra-enclosure (EL)\n", pfx);
+ sprintf(value, "%s", "FC: Electrical intra-enclosure (EL)");
if (id[8] & (1 << 6))
- printf("%s FC: Shortwave laser w/o OFC (SN)\n", pfx);
+ sprintf(value, "%s", "FC: Shortwave laser w/o OFC (SN)");
if (id[8] & (1 << 5))
- printf("%s FC: Shortwave laser with OFC (SL)\n", pfx);
+ sprintf(value, "%s", "FC: Shortwave laser with OFC (SL)");
if (id[8] & (1 << 4))
- printf("%s FC: Longwave laser (LL)\n", pfx);
+ sprintf(value, "%s", "FC: Longwave laser (LL)");
if (id[8] & (1 << 3))
- printf("%s Active Cable\n", pfx);
+ sprintf(value, "%s", "Active Cable");
if (id[8] & (1 << 2))
- printf("%s Passive Cable\n", pfx);
+ sprintf(value, "%s", "Passive Cable");
if (id[8] & (1 << 1))
- printf("%s FC: Copper FC-BaseT\n", pfx);
+ sprintf(value, "%s", "FC: Copper FC-BaseT");
/* Fibre Channel transmission media */
if (id[9] & (1 << 7))
- printf("%s FC: Twin Axial Pair (TW)\n", pfx);
+ sprintf(value, "%s", "FC: Twin Axial Pair (TW)");
if (id[9] & (1 << 6))
- printf("%s FC: Twisted Pair (TP)\n", pfx);
+ sprintf(value, "%s", "FC: Twisted Pair (TP)");
if (id[9] & (1 << 5))
- printf("%s FC: Miniature Coax (MI)\n", pfx);
+ sprintf(value, "%s", "FC: Miniature Coax (MI)");
if (id[9] & (1 << 4))
- printf("%s FC: Video Coax (TV)\n", pfx);
+ sprintf(value, "%s", "FC: Video Coax (TV)");
if (id[9] & (1 << 3))
- printf("%s FC: Multimode, 62.5um (M6)\n", pfx);
+ sprintf(value, "%s", "FC: Multimode, 62.5um (M6)");
if (id[9] & (1 << 2))
- printf("%s FC: Multimode, 50um (M5)\n", pfx);
+ sprintf(value, "%s", "FC: Multimode, 50um (M5)");
if (id[9] & (1 << 0))
- printf("%s FC: Single Mode (SM)\n", pfx);
+ sprintf(value, "%s", "FC: Single Mode (SM)");
/* Fibre Channel speed */
if (id[10] & (1 << 7))
- printf("%s FC: 1200 MBytes/sec\n", pfx);
+ sprintf(value, "%s", "FC: 1200 MBytes/sec");
if (id[10] & (1 << 6))
- printf("%s FC: 800 MBytes/sec\n", pfx);
+ sprintf(value, "%s", "FC: 800 MBytes/sec");
if (id[10] & (1 << 4))
- printf("%s FC: 400 MBytes/sec\n", pfx);
+ sprintf(value, "%s", "FC: 400 MBytes/sec");
if (id[10] & (1 << 2))
- printf("%s FC: 200 MBytes/sec\n", pfx);
+ sprintf(value, "%s", "FC: 200 MBytes/sec");
if (id[10] & (1 << 0))
- printf("%s FC: 100 MBytes/sec\n", pfx);
+ sprintf(value, "%s", "FC: 100 MBytes/sec");
/* Extended Specification Compliance Codes from SFF-8024 */
if (id[36] == 0x1)
- printf("%s Extended: 100G AOC or 25GAUI C2M AOC with worst BER of 5x10^(-5)\n", pfx);
+ sprintf(value, "%s",
+ "Extended: 100G AOC or 25GAUI C2M AOC with worst BER of 5x10^(-5)");
if (id[36] == 0x2)
- printf("%s Extended: 100G Base-SR4 or 25GBase-SR\n", pfx);
+ sprintf(value, "%s", "Extended: 100G Base-SR4 or 25GBase-SR");
if (id[36] == 0x3)
- printf("%s Extended: 100G Base-LR4 or 25GBase-LR\n", pfx);
+ sprintf(value, "%s", "Extended: 100G Base-LR4 or 25GBase-LR");
if (id[36] == 0x4)
- printf("%s Extended: 100G Base-ER4 or 25GBase-ER\n", pfx);
+ sprintf(value, "%s", "Extended: 100G Base-ER4 or 25GBase-ER");
if (id[36] == 0x8)
- printf("%s Extended: 100G ACC or 25GAUI C2M ACC with worst BER of 5x10^(-5)\n", pfx);
+ sprintf(value, "%s",
+ "Extended: 100G ACC or 25GAUI C2M ACC with worst BER of 5x10^(-5)");
if (id[36] == 0xb)
- printf("%s Extended: 100G Base-CR4 or 25G Base-CR CA-L\n", pfx);
+ sprintf(value, "%s",
+ "Extended: 100G Base-CR4 or 25G Base-CR CA-L");
if (id[36] == 0xc)
- printf("%s Extended: 25G Base-CR CA-S\n", pfx);
+ sprintf(value, "%s", "Extended: 25G Base-CR CA-S");
if (id[36] == 0xd)
- printf("%s Extended: 25G Base-CR CA-N\n", pfx);
+ sprintf(value, "%s", "Extended: 25G Base-CR CA-N");
if (id[36] == 0x16)
- printf("%s Extended: 10Gbase-T with SFI electrical interface\n", pfx);
+ sprintf(value, "%s",
+ "Extended: 10Gbase-T with SFI electrical interface");
if (id[36] == 0x18)
- printf("%s Extended: 100G AOC or 25GAUI C2M AOC with worst BER of 10^(-12)\n", pfx);
+ sprintf(value, "%s",
+ "Extended: 100G AOC or 25GAUI C2M AOC with worst BER of 10^(-12)");
if (id[36] == 0x19)
- printf("%s Extended: 100G ACC or 25GAUI C2M ACC with worst BER of 10^(-12)\n", pfx);
+ sprintf(value, "%s",
+ "Extended: 100G ACC or 25GAUI C2M ACC with worst BER of 10^(-12)");
if (id[36] == 0x1a)
- printf("%s Extended: 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",
+ "Extended: 100GE-DWDM2 (DWDM transceiver using 2 wavelengths on a 1550 nm DWDM grid with a reach up to 80 km)");
if (id[36] == 0x1b)
- printf("%s Extended: 100G 1550nm WDM (4 wavelengths)\n", pfx);
+ sprintf(value, "%s",
+ "Extended: 100G 1550nm WDM (4 wavelengths)");
if (id[36] == 0x1c)
- printf("%s Extended: 10Gbase-T Short Reach\n", pfx);
+ sprintf(value, "%s", "Extended: 10Gbase-T Short Reach");
if (id[36] == 0x1d)
- printf("%s Extended: 5GBASE-T\n", pfx);
+ sprintf(value, "%s", "Extended: 5GBASE-T");
if (id[36] == 0x1e)
- printf("%s Extended: 2.5GBASE-T\n", pfx);
+ sprintf(value, "%s", "Extended: 2.5GBASE-T");
if (id[36] == 0x1f)
- printf("%s Extended: 40G SWDM4\n", pfx);
+ sprintf(value, "%s", "Extended: 40G SWDM4");
if (id[36] == 0x20)
- printf("%s Extended: 100G SWDM4\n", pfx);
+ sprintf(value, "%s", "Extended: 100G SWDM4");
if (id[36] == 0x21)
- printf("%s Extended: 100G PAM4 BiDi\n", pfx);
+ sprintf(value, "%s", "Extended: 100G PAM4 BiDi");
if (id[36] == 0x22)
- printf("%s Extended: 4WDM-10 MSA (10km version of 100G CWDM4 with same RS(528,514) FEC in host system)\n",
- pfx);
+ sprintf(value, "%s",
+ "Extended: 4WDM-10 MSA (10km version of 100G CWDM4 with same RS(528,514) FEC in host system)");
if (id[36] == 0x23)
- printf("%s Extended: 4WDM-20 MSA (20km version of 100GBASE-LR4 with RS(528,514) FEC in host system)\n",
- pfx);
+ sprintf(value, "%s",
+ "Extended: 4WDM-20 MSA (20km version of 100GBASE-LR4 with RS(528,514) FEC in host system)");
if (id[36] == 0x24)
- printf("%s Extended: 4WDM-40 MSA (40km reach with APD receiver and RS(528,514) FEC in host system)\n",
- pfx);
+ sprintf(value, "%s",
+ "Extended: 4WDM-40 MSA (40km reach with APD receiver and RS(528,514) FEC in host system)");
if (id[36] == 0x25)
- printf("%s Extended: 100GBASE-DR (clause 140), CAUI-4 (no FEC)\n", pfx);
+ sprintf(value, "%s",
+ "Extended: 100GBASE-DR (clause 140), CAUI-4 (no FEC)");
if (id[36] == 0x26)
- printf("%s Extended: 100G-FR or 100GBASE-FR1 (clause 140), CAUI-4 (no FEC)\n", pfx);
+ sprintf(value, "%s",
+ "Extended: 100G-FR or 100GBASE-FR1 (clause 140), CAUI-4 (no FEC)");
if (id[36] == 0x27)
- printf("%s Extended: 100G-LR or 100GBASE-LR1 (clause 140), CAUI-4 (no FEC)\n", pfx);
+ sprintf(value, "%s",
+ "Extended: 100G-LR or 100GBASE-LR1 (clause 140), CAUI-4 (no FEC)");
if (id[36] == 0x30)
- printf("%s Extended: 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",
+ "Extended: Active Copper Cable with 50GAUI, 100GAUI-2 or 200GAUI-4 C2M. Providing a worst BER of 10-6 or below");
if (id[36] == 0x31)
- printf("%s Extended: 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",
+ "Extended: Active Optical Cable with 50GAUI, 100GAUI-2 or 200GAUI-4 C2M. Providing a worst BER of 10-6 or below");
if (id[36] == 0x32)
- printf("%s Extended: 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",
+ "Extended: 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");
if (id[36] == 0x33)
- printf("%s Extended: 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",
+ "Extended: 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");
if (id[36] == 0x40)
- printf("%s Extended: 50GBASE-CR, 100GBASE-CR2, or 200GBASE-CR4\n", pfx);
+ sprintf(value, "%s",
+ "Extended: 50GBASE-CR, 100GBASE-CR2, or 200GBASE-CR4");
if (id[36] == 0x41)
- printf("%s Extended: 50GBASE-SR, 100GBASE-SR2, or 200GBASE-SR4\n", pfx);
+ sprintf(value, "%s",
+ "Extended: 50GBASE-SR, 100GBASE-SR2, or 200GBASE-SR4");
if (id[36] == 0x42)
- printf("%s Extended: 50GBASE-FR or 200GBASE-DR4\n", pfx);
+ sprintf(value, "%s", "Extended: 50GBASE-FR or 200GBASE-DR4");
if (id[36] == 0x43)
- printf("%s Extended: 200GBASE-FR4\n", pfx);
+ sprintf(value, "%s", "Extended: 200GBASE-FR4");
if (id[36] == 0x44)
- printf("%s Extended: 200G 1550 nm PSM4\n", pfx);
+ sprintf(value, "%s", "Extended: 200G 1550 nm PSM4");
if (id[36] == 0x45)
- printf("%s Extended: 50GBASE-LR\n", pfx);
+ sprintf(value, "%s", "Extended: 50GBASE-LR");
if (id[36] == 0x46)
- printf("%s Extended: 200GBASE-LR4\n", pfx);
+ sprintf(value, "%s", "Extended: 200GBASE-LR4");
if (id[36] == 0x50)
- printf("%s Extended: 64GFC EA\n", pfx);
+ sprintf(value, "%s", "Extended: 64GFC EA");
if (id[36] == 0x51)
- printf("%s Extended: 64GFC SW\n", pfx);
+ sprintf(value, "%s", "Extended: 64GFC SW");
if (id[36] == 0x52)
- printf("%s Extended: 64GFC LW\n", pfx);
+ sprintf(value, "%s", "Extended: 64GFC LW");
if (id[36] == 0x53)
- printf("%s Extended: 128GFC EA\n", pfx);
+ sprintf(value, "%s", "Extended: 128GFC EA");
if (id[36] == 0x54)
- printf("%s Extended: 128GFC SW\n", pfx);
+ sprintf(value, "%s", "Extended: 128GFC SW");
if (id[36] == 0x55)
- printf("%s Extended: 128GFC LW\n", pfx);
+ sprintf(value, "%s", "Extended: 128GFC LW");
+
+ module_print_any_string(pfx, value);
}
static void sff8079_show_encoding(const __u8 *id)
@@ -276,100 +303,127 @@ static void sff8079_show_encoding(const __u8 *id)
static void sff8079_show_rate_identifier(const __u8 *id)
{
- printf("\t%-41s : 0x%02x", "Rate identifier", id[13]);
+ char description[SFF_MAX_DESC_LEN];
+
switch (id[13]) {
case 0x00:
- printf(" (unspecified)\n");
+ sprintf(description, "%s", "unspecified");
break;
case 0x01:
- printf(" (4/2/1G Rate_Select & AS0/AS1)\n");
+ sprintf(description, "%s", "4/2/1G Rate_Select & AS0/AS1");
break;
case 0x02:
- printf(" (8/4/2G Rx Rate_Select only)\n");
+ sprintf(description, "%s", "8/4/2G Rx Rate_Select only");
break;
case 0x03:
- printf(" (8/4/2G Independent Rx & Tx Rate_Select)\n");
+ sprintf(description, "%s",
+ "8/4/2G Independent Rx & Tx Rate_Select");
break;
case 0x04:
- printf(" (8/4/2G Tx Rate_Select only)\n");
+ sprintf(description, "%s", "8/4/2G Tx Rate_Select only");
break;
default:
- printf(" (reserved or unknown)\n");
+ sprintf(description, "%s", "reserved or unknown");
break;
}
+
+ sff_print_any_hex_field("Rate identifier", "rate_identifier", id[13],
+ description);
}
static void sff8079_show_wavelength_or_copper_compliance(const __u8 *id)
{
+ char description[SFF_MAX_DESC_LEN];
+
if (id[8] & (1 << 2)) {
- printf("\t%-41s : 0x%02x", "Passive Cu cmplnce.", id[60]);
switch (id[60]) {
case 0x00:
- printf(" (unspecified)");
+ strncpy(description, "unspecified",
+ SFF_MAX_DESC_LEN);
break;
case 0x01:
- printf(" (SFF-8431 appendix E)");
+ strncpy(description, "SFF-8431 appendix E",
+ SFF_MAX_DESC_LEN);
break;
default:
- printf(" (unknown)");
+ strncpy(description, "unknown", SFF_MAX_DESC_LEN);
break;
}
- printf(" [SFF-8472 rev10.4 only]\n");
+ strcat(description, " [SFF-8472 rev10.4 only]");
+ sff_print_any_hex_field("Passive Cu cmplnce.",
+ "passive_cu_cmplnce.",
+ id[60], description);
} else if (id[8] & (1 << 3)) {
printf("\t%-41s : 0x%02x", "Active Cu cmplnce.", id[60]);
switch (id[60]) {
case 0x00:
- printf(" (unspecified)");
+ strncpy(description, "unspecified",
+ SFF_MAX_DESC_LEN);
break;
case 0x01:
- printf(" (SFF-8431 appendix E)");
+ strncpy(description, "SFF-8431 appendix E",
+ SFF_MAX_DESC_LEN);
break;
case 0x04:
- printf(" (SFF-8431 limiting)");
+ strncpy(description, "SFF-8431 limiting",
+ SFF_MAX_DESC_LEN);
break;
default:
- printf(" (unknown)");
+ strncpy(description, "unknown", SFF_MAX_DESC_LEN);
break;
}
- printf(" [SFF-8472 rev10.4 only]\n");
+ strcat(description, " [SFF-8472 rev10.4 only]");
+ sff_print_any_hex_field("Active Cu cmplnce.",
+ "active_cu_cmplnce.",
+ id[60], description);
} else {
- printf("\t%-41s : %unm\n", "Laser wavelength",
- (id[60] << 8) | id[61]);
+ module_print_any_uint("Laser wavelength",
+ (id[60] << 8) | id[61], "nm");
}
}
static void sff8079_show_options(const __u8 *id)
{
- static const char *pfx =
- "\tOption :";
+ static const char *pfx = "Option";
+ char value[64] = "";
- printf("\t%-41s : 0x%02x 0x%02x\n", "Option values", id[64], id[65]);
+ if (is_json_context()) {
+ open_json_array("option_values", "");
+ print_int(PRINT_JSON, NULL, "0x%02x", id[64]);
+ print_int(PRINT_JSON, NULL, "0x%02x", id[65]);
+ close_json_array("");
+ } else {
+ printf("\t%-41s : 0x%02x 0x%02x\n", "Option values", id[64],
+ id[65]);
+ }
if (id[65] & (1 << 1))
- printf("%s RX_LOS implemented\n", pfx);
+ sprintf(value, "%s", "RX_LOS implemented");
if (id[65] & (1 << 2))
- printf("%s RX_LOS implemented, inverted\n", pfx);
+ sprintf(value, "%s", "RX_LOS implemented, inverted");
if (id[65] & (1 << 3))
- printf("%s TX_FAULT implemented\n", pfx);
+ sprintf(value, "%s", "TX_FAULT implemented");
if (id[65] & (1 << 4))
- printf("%s TX_DISABLE implemented\n", pfx);
+ sprintf(value, "%s", "TX_DISABLE implemented");
if (id[65] & (1 << 5))
- printf("%s RATE_SELECT implemented\n", pfx);
+ sprintf(value, "%s", "RATE_SELECT implemented");
if (id[65] & (1 << 6))
- printf("%s Tunable transmitter technology\n", pfx);
+ sprintf(value, "%s", "Tunable transmitter technology");
if (id[65] & (1 << 7))
- printf("%s Receiver decision threshold implemented\n", pfx);
+ sprintf(value, "%s", "Receiver decision threshold implemented");
if (id[64] & (1 << 0))
- printf("%s Linear receiver output implemented\n", pfx);
+ sprintf(value, "%s", "Linear receiver output implemented");
if (id[64] & (1 << 1))
- printf("%s Power level 2 requirement\n", pfx);
+ sprintf(value, "%s", "Power level 2 requirement");
if (id[64] & (1 << 2))
- printf("%s Cooled transceiver implemented\n", pfx);
+ sprintf(value, "%s", "Cooled transceiver implemented");
if (id[64] & (1 << 3))
- printf("%s Retimer or CDR implemented\n", pfx);
+ sprintf(value, "%s", "Retimer or CDR implemented");
if (id[64] & (1 << 4))
- printf("%s Paging implemented\n", pfx);
+ sprintf(value, "%s", "Paging implemented");
if (id[64] & (1 << 5))
- printf("%s Power level 3 requirement\n", pfx);
+ sprintf(value, "%s", "Power level 3 requirement");
+
+ module_print_any_string(pfx, value);
}
static void sff8079_show_all_common(const __u8 *id)
@@ -393,7 +447,7 @@ static void sff8079_show_all_common(const __u8 *id)
sff8079_show_connector(id);
sff8079_show_transceiver(id);
sff8079_show_encoding(id);
- printf("\t%-41s : %u%s\n", "BR, Nominal", br_nom, "MBd");
+ module_print_any_uint("BR Nominal", br_nom, "MBd");
sff8079_show_rate_identifier(id);
module_show_value_with_unit(id, 14,
"Length (SMF,km)", 1, "km");
@@ -409,8 +463,8 @@ static void sff8079_show_all_common(const __u8 *id)
module_show_ascii(id, 40, 55, "Vendor PN");
module_show_ascii(id, 56, 59, "Vendor rev");
sff8079_show_options(id);
- printf("\t%-41s : %u%s\n", "BR margin, max", br_max, "%");
- printf("\t%-41s : %u%s\n", "BR margin, min", br_min, "%");
+ module_print_any_uint("BR margin max", br_max, "%");
+ module_print_any_uint("BR margin min", br_min, "%");
module_show_ascii(id, 68, 83, "Vendor SN");
module_show_ascii(id, 84, 91, "Date code");
}
--
2.47.0
Powered by blists - more mailing lists