diff options
| author | Alexander V. Chernikov <melifaro@FreeBSD.org> | 2015-05-16 13:11:35 +0000 |
|---|---|---|
| committer | Alexander V. Chernikov <melifaro@FreeBSD.org> | 2015-05-16 13:11:35 +0000 |
| commit | 5446b3f1d474f69fac7cb4069f88da7651174499 (patch) | |
| tree | 573fb3db94636125e1779dc384ff2a30c0b1854d /sys | |
| parent | 9896584a4bed558f90291eb70f76ee9c3b53c08e (diff) | |
| download | src-5446b3f1d474f69fac7cb4069f88da7651174499.tar.gz src-5446b3f1d474f69fac7cb4069f88da7651174499.zip | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/sff8436.h | 4 | ||||
| -rw-r--r-- | sys/net/sff8472.h | 20 |
2 files changed, 17 insertions, 7 deletions
diff --git a/sys/net/sff8436.h b/sys/net/sff8436.h index 7d705b8447a9..97abe104d076 100644 --- a/sys/net/sff8436.h +++ b/sys/net/sff8436.h @@ -202,7 +202,9 @@ enum { * optional features are implemented * (if any) in the transceiver * (see Table 42) */ - SFF_8436_CC_EXT = 222, /* Check code for the Extended ID + SFF_8636_BITRATE = 222, /* Nominal bit rate per channel, units + * of 250 Mbps */ + SFF_8436_CC_EXT = 223, /* Check code for the Extended ID * Fields (bytes 192-222 incl) */ SFF_8436_VENDOR_RSRVD_START = 224, SFF_8436_VENDOR_RSRVD_END = 255, diff --git a/sys/net/sff8472.h b/sys/net/sff8472.h index 08b37cabe3f2..fdeb2e9a0c2f 100644 --- a/sys/net/sff8472.h +++ b/sys/net/sff8472.h @@ -377,7 +377,7 @@ enum { /* * Table 3.2 Identifier values. - * Identifier constants has taken from SFF-8024 rev 2.2 table 4.1 + * Identifier constants has taken from SFF-8024 rev 2.9 table 4.1 * (as referenced by table 3.2 footer) * */ enum { @@ -400,28 +400,36 @@ enum { SFF_8024_ID_HD8X = 0x10, /* Shielded Mini Multilane HD 8X */ SFF_8024_ID_QSFP28 = 0x11, /* QSFP28 */ SFF_8024_ID_CXP2 = 0x12, /* CXP2 (aka CXP28) */ - SFF_8024_ID_LAST = SFF_8024_ID_CXP2 + SFF_8024_ID_CDFP = 0x13, /* CDFP (Style 1/Style 2) */ + SFF_8024_ID_SMM4 = 0x14, /* Shielded Mini Multilate HD 4X Fanout */ + SFF_8024_ID_SMM8 = 0x15, /* Shielded Mini Multilate HD 8X Fanout */ + SFF_8024_ID_CDFP3 = 0x16, /* CDFP (Style3) */ + SFF_8024_ID_LAST = SFF_8024_ID_CDFP3 }; static const char *sff_8024_id[SFF_8024_ID_LAST + 1] = {"Unknown", "GBIC", "SFF", - "SFP/SFP+", + "SFP/SFP+/SFP28", "XBI", "Xenpak", "XFP", "XFF", "XFP-E", - "XPAk", + "XPAK", "X2", - "DWDM-SFP", + "DWDM-SFP/SFP+", "QSFP", "QSFP+", "CXP", "HD4X", "HD8X", "QSFP28", - "CXP2"}; + "CXP2", + "CDFP", + "SMM4", + "SMM8", + "CDFP3"}; /* Keep compability with old definitions */ #define SFF_8472_ID_UNKNOWN SFF_8024_ID_UNKNOWN |