From 266608c85aa055e8e4ca9dcdbaefec01b7c02591 Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Tue, 17 May 2016 01:39:34 +0000
Subject: [PATCH 01/28] Rename the legacy installer as such. If will be removed
 once the new installers are fully qualified on all platforms.

---
 Makefile                                        |  6 +++---
 builds/amd64/installer/legacy/builds/Makefile   |  3 +--
 builds/any/installer/legacy/APKG.yml            | 14 ++------------
 builds/any/installer/legacy/fit/builds/Makefile |  2 +-
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index 743df60f..96dab5a6 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ onl-amd64 onl-x86 x86 x86_64 amd64: packages_base_all
 	$(MAKE) -C packages/base/amd64/faultd
 	$(MAKE) -C builds/amd64/rootfs
 	$(MAKE) -C builds/amd64/swi
-	$(MAKE) -C builds/amd64/installer/legacy
+	$(MAKE) -C builds/amd64/installer
 
 onl-ppc ppc: packages_base_all
 	$(MAKE) -C packages/base/powerpc/kernels
@@ -34,7 +34,7 @@ onl-ppc ppc: packages_base_all
 	$(MAKE) -C packages/base/powerpc/fit
 	$(MAKE) -C builds/powerpc/rootfs
 	$(MAKE) -C builds/powerpc/swi
-	$(MAKE) -C builds/powerpc/installer/legacy
+	$(MAKE) -C builds/powerpc/installer
 
 
 ifdef ONL_DEBIAN_SUITE_jessie
@@ -51,7 +51,7 @@ onl-arm arm: arm_toolchain_check packages_base_all
 	$(MAKE) -C packages/base/armel/fit
 	$(MAKE) -C builds/armel/rootfs
 	$(MAKE) -C builds/armel/swi
-	$(MAKE) -C builds/armel/installer/legacy
+	$(MAKE) -C builds/armel/installer
 else
 
 onl-arm arm:
diff --git a/builds/amd64/installer/legacy/builds/Makefile b/builds/amd64/installer/legacy/builds/Makefile
index 158cbf6c..c32b3bce 100644
--- a/builds/amd64/installer/legacy/builds/Makefile
+++ b/builds/amd64/installer/legacy/builds/Makefile
@@ -14,7 +14,7 @@ MKSHAR_PERMS = autoperms.sh
 
 # Hardcoded to match ONL File naming conventions.
 include $(ONL)/make/version-onl.mk
-INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_INSTALLER
+INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_LEGACY_INSTALLER
 
 
 
@@ -41,4 +41,3 @@ shar installer: installer
 
 clean:
 	rm -f *.swi *.installer $(notdir $(KERNELS)) initrd-amd64
-
diff --git a/builds/any/installer/legacy/APKG.yml b/builds/any/installer/legacy/APKG.yml
index cad485cf..a53d0129 100644
--- a/builds/any/installer/legacy/APKG.yml
+++ b/builds/any/installer/legacy/APKG.yml
@@ -10,8 +10,8 @@ common:
   maintainer: support@bigswitch.com
 
 packages:
-  - name: onl-installer
-    summary: Open Network Linux $ARCH Installer
+  - name: onl-legacy-installer
+    summary: Open Network Linux $ARCH Legacy Installer
 
     files:
       builds/*INSTALLER        : $$PKG_INSTALL/
@@ -23,13 +23,3 @@ packages:
 release:
   - builds/*INSTALLER : $ARCH/
   - builds/*.md5sum   : $ARCH/
-
-
-
-
-
-
-
-
-
-
diff --git a/builds/any/installer/legacy/fit/builds/Makefile b/builds/any/installer/legacy/fit/builds/Makefile
index 38609d49..ce7e1c65 100644
--- a/builds/any/installer/legacy/fit/builds/Makefile
+++ b/builds/any/installer/legacy/fit/builds/Makefile
@@ -6,7 +6,7 @@ THISDIR := $(dir $(lastword $(MAKEFILE_LIST)))
 
 # Hardcoded to match ONL File naming conventions.
 include $(ONL)/make/version-onl.mk
-INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_INSTALLER
+INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_LEGACY_INSTALLER
 
 FIT_IMAGE_ALL := $(shell $(ONLPM) --find-file onl-loader-fit:$(ARCH) onl-loader-fit.itb)
 

From 837ad410219f89dcaf9824bd50ffbc5bcc451c57 Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Tue, 17 May 2016 18:30:17 +0000
Subject: [PATCH 02/28] Fix connection configuration.

---
 .../any/rootfs/jessie/common/overlay/etc/snmp/snmpd.conf  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/builds/any/rootfs/jessie/common/overlay/etc/snmp/snmpd.conf b/builds/any/rootfs/jessie/common/overlay/etc/snmp/snmpd.conf
index b885cb39..13eb88f7 100644
--- a/builds/any/rootfs/jessie/common/overlay/etc/snmp/snmpd.conf
+++ b/builds/any/rootfs/jessie/common/overlay/etc/snmp/snmpd.conf
@@ -12,7 +12,7 @@
 #
 
 #  Listen for connections from the local system only
-agentAddress  udp:127.0.0.1:161
+# agentAddress  udp:127.0.0.1:161
 #  Listen for connections on all interfaces (both IPv4 *and* IPv6)
 agentAddress udp:161,udp6:[::1]:161
 
@@ -48,9 +48,9 @@ view   systemonly  included   .1.3.6.1.4.1.42623
                                                  #  Full access from the local host
 rocommunity public  localhost
                                                  #  Default access to basic system info
-rocommunity public  default    -V systemonly
+ rocommunity public  default    -V systemonly
                                                  #  rocommunity6 is for IPv6
-rocommunity6 public  default   -V systemonly
+ rocommunity6 public  default   -V systemonly
 
                                                  #  Full access from an example network
                                                  #     Adjust this network address to match your local
@@ -139,7 +139,7 @@ load   12 10 5
 #  Event MIB - automatically generate alerts
 #
                                    # Remember to activate the 'createUser' lines above
-iquerySecName   internalUser
+iquerySecName   internalUser       
 rouser          internalUser
                                    # generate traps on UCD error conditions
 defaultMonitors          yes

From 8c8f7c35c1f718f2b5ac19eaafcc23e1cd670675 Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Tue, 17 May 2016 12:45:55 -0700
Subject: [PATCH 03/28] Latest

---
 packages/platforms-closed | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/platforms-closed b/packages/platforms-closed
index 3880b54f..1bea6253 160000
--- a/packages/platforms-closed
+++ b/packages/platforms-closed
@@ -1 +1 @@
-Subproject commit 3880b54fe9480edb6e8c2df7714d83e4e6aaf774
+Subproject commit 1bea6253f9814607df5c51a7cf5e1ee509331a37

From 80d06bec5a596ca335a72c29b8666511237d8490 Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Tue, 17 May 2016 12:46:18 -0700
Subject: [PATCH 04/28] Remove comments.

---
 .../all/vendor-config-onl/src/python/onl/install/BaseInstall.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/base/all/vendor-config-onl/src/python/onl/install/BaseInstall.py b/packages/base/all/vendor-config-onl/src/python/onl/install/BaseInstall.py
index 08e41e76..274268f9 100644
--- a/packages/base/all/vendor-config-onl/src/python/onl/install/BaseInstall.py
+++ b/packages/base/all/vendor-config-onl/src/python/onl/install/BaseInstall.py
@@ -358,7 +358,6 @@ class Base:
         return 0
 
 GRUB_TPL = """\
-#serial --port=0x3f8 --speed=115200 --word=8 --parity=no --stop=1
 serial %(serial)s
 terminal_input serial
 terminal_output serial
@@ -369,7 +368,6 @@ menuentry OpenNetworkLinux {
   echo 'Loading Open Network Linux ...'
   insmod gzio
   insmod part_msdos
-  #linux /kernel-3.9.6-x86-64-all nopat console=ttyS0,115200n8 onl_platform=x86-64-kvm-x86-64-r0
   linux /%(kernel)s %(args)s onl_platform=%(platform)s
   initrd /%(initrd)s
 }

From 911183ee7f125bba18d594d275b276fbc368bf99 Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Tue, 17 May 2016 12:46:58 -0700
Subject: [PATCH 05/28] Import from ONLP Repository.

---
 .../any/onlp/src/onlp/module/auto/onlp.yml    |    2 +
 .../src/onlp/module/inc/onlp/platformi/sysi.h |    5 +
 .../any/onlp/src/onlp/module/inc/onlp/sfp.h   |    2 +
 .../any/onlp/src/onlp/module/src/onlp_enums.c |    2 +
 .../any/onlp/src/onlp/module/src/onlp_main.c  |   36 +-
 .../onlp/src/onlp/module/src/onlp_module.c    |   24 +
 .../src/onlp/module/src/platform_manager.c    |    1 +
 .../onlp_platform_defaults/module/src/sysi.c  |    1 +
 .../onlp_platform_defaults.mk                 |   10 +-
 .../src/onlplib/module/inc/onlplib/thermal.h  |   36 +
 .../any/onlp/src/onlplib/module/src/thermal.c |   51 +
 packages/base/any/onlp/src/onlplib/onlplib.mk |   10 +-
 .../base/any/onlp/src/sff/module/auto/sff.yml |    5 +
 .../any/onlp/src/sff/module/inc/sff/8436.h    |   14 +
 .../any/onlp/src/sff/module/inc/sff/sff.h     |   91 +-
 .../onlp/src/sff/module/inc/sff/sff_config.h  |   10 +
 .../any/onlp/src/sff/module/inc/sff/sff_db.h  |   60 +
 .../base/any/onlp/src/sff/module/src/sff.c    |  450 ++---
 .../any/onlp/src/sff/module/src/sff_config.c  |    5 +
 .../base/any/onlp/src/sff/module/src/sff_db.c | 1468 +++++++++++++++++
 .../any/onlp/src/sff/module/src/sff_enums.c   |    2 +
 packages/base/any/onlp/src/sff/sff.mk         |   10 +-
 packages/base/any/onlp/src/sff/utest/main.c   | 1037 +-----------
 23 files changed, 2050 insertions(+), 1282 deletions(-)
 create mode 100644 packages/base/any/onlp/src/onlplib/module/inc/onlplib/thermal.h
 create mode 100644 packages/base/any/onlp/src/onlplib/module/src/thermal.c
 create mode 100644 packages/base/any/onlp/src/sff/module/inc/sff/sff_db.h
 create mode 100644 packages/base/any/onlp/src/sff/module/src/sff_db.c

diff --git a/packages/base/any/onlp/src/onlp/module/auto/onlp.yml b/packages/base/any/onlp/src/onlp/module/auto/onlp.yml
index 47adc6e6..972d47eb 100644
--- a/packages/base/any/onlp/src/onlp/module/auto/onlp.yml
+++ b/packages/base/any/onlp/src/onlp/module/auto/onlp.yml
@@ -111,6 +111,7 @@ sfp_control: &sfp_control
 - RX_LOS
 - TX_FAULT
 - TX_DISABLE
+- TX_DISABLE_CHANNEL
 - LP_MODE
 - POWER_OVERRIDE
 
@@ -253,6 +254,7 @@ definitions:
         - RX_LOS
         - TX_FAULT
         - TX_DISABLE
+        - TX_DISABLE_CHANNEL
         - LP_MODE
         - POWER_OVERRIDE
     onlp_sfp_control_flag:
diff --git a/packages/base/any/onlp/src/onlp/module/inc/onlp/platformi/sysi.h b/packages/base/any/onlp/src/onlp/module/inc/onlp/platformi/sysi.h
index d4bde216..bc05146a 100644
--- a/packages/base/any/onlp/src/onlp/module/inc/onlp/platformi/sysi.h
+++ b/packages/base/any/onlp/src/onlp/module/inc/onlp/platformi/sysi.h
@@ -130,6 +130,11 @@ int onlp_sysi_oids_get(onlp_oid_t* table, int max);
 int onlp_sysi_ioctl(int code, va_list vargs);
 
 
+/**
+ * @brief Platform management initialization.
+ */
+int onlp_sysi_platform_manage_init(void);
+
 /**
  * @brief Perform necessary platform fan management.
  * @note This function should automatically adjust the FAN speeds
diff --git a/packages/base/any/onlp/src/onlp/module/inc/onlp/sfp.h b/packages/base/any/onlp/src/onlp/module/inc/onlp/sfp.h
index 6208e3ee..173a38ae 100644
--- a/packages/base/any/onlp/src/onlp/module/inc/onlp/sfp.h
+++ b/packages/base/any/onlp/src/onlp/module/inc/onlp/sfp.h
@@ -39,6 +39,7 @@ typedef enum onlp_sfp_control_e {
     ONLP_SFP_CONTROL_RX_LOS,
     ONLP_SFP_CONTROL_TX_FAULT,
     ONLP_SFP_CONTROL_TX_DISABLE,
+    ONLP_SFP_CONTROL_TX_DISABLE_CHANNEL,
     ONLP_SFP_CONTROL_LP_MODE,
     ONLP_SFP_CONTROL_POWER_OVERRIDE,
     ONLP_SFP_CONTROL_LAST = ONLP_SFP_CONTROL_POWER_OVERRIDE,
@@ -238,6 +239,7 @@ int onlp_sfp_control_flags_get(int port, uint32_t* flags);
     "RX_LOS", \
     "TX_FAULT", \
     "TX_DISABLE", \
+    "TX_DISABLE_CHANNEL", \
     "LP_MODE", \
     "POWER_OVERRIDE", \
 }
diff --git a/packages/base/any/onlp/src/onlp/module/src/onlp_enums.c b/packages/base/any/onlp/src/onlp/module/src/onlp_enums.c
index 0c5a185f..f5c9a74d 100644
--- a/packages/base/any/onlp/src/onlp/module/src/onlp_enums.c
+++ b/packages/base/any/onlp/src/onlp/module/src/onlp_enums.c
@@ -728,6 +728,7 @@ aim_map_si_t onlp_sfp_control_map[] =
     { "RX_LOS", ONLP_SFP_CONTROL_RX_LOS },
     { "TX_FAULT", ONLP_SFP_CONTROL_TX_FAULT },
     { "TX_DISABLE", ONLP_SFP_CONTROL_TX_DISABLE },
+    { "TX_DISABLE_CHANNEL", ONLP_SFP_CONTROL_TX_DISABLE_CHANNEL },
     { "LP_MODE", ONLP_SFP_CONTROL_LP_MODE },
     { "POWER_OVERRIDE", ONLP_SFP_CONTROL_POWER_OVERRIDE },
     { NULL, 0 }
@@ -740,6 +741,7 @@ aim_map_si_t onlp_sfp_control_desc_map[] =
     { "None", ONLP_SFP_CONTROL_RX_LOS },
     { "None", ONLP_SFP_CONTROL_TX_FAULT },
     { "None", ONLP_SFP_CONTROL_TX_DISABLE },
+    { "None", ONLP_SFP_CONTROL_TX_DISABLE_CHANNEL },
     { "None", ONLP_SFP_CONTROL_LP_MODE },
     { "None", ONLP_SFP_CONTROL_POWER_OVERRIDE },
     { NULL, 0 }
diff --git a/packages/base/any/onlp/src/onlp/module/src/onlp_main.c b/packages/base/any/onlp/src/onlp/module/src/onlp_main.c
index f20b1f0b..5afbb143 100644
--- a/packages/base/any/onlp/src/onlp/module/src/onlp_main.c
+++ b/packages/base/any/onlp/src/onlp/module/src/onlp_main.c
@@ -28,6 +28,7 @@
 #include <onlp/sys.h>
 #include <onlp/sfp.h>
 #include <sff/sff.h>
+#include <sff/sff_db.h>
 #include <AIM/aim_log_handler.h>
 #include <syslog.h>
 
@@ -38,7 +39,7 @@ static void platform_manager_daemon__(const char* pidfile, char** argv);
  * This should be moved to common.
  */
 static void
-show_inventory__(aim_pvs_t* pvs)
+show_inventory__(aim_pvs_t* pvs, int database)
 {
     int port;
     onlp_sfp_bitmap_t bitmap;
@@ -50,8 +51,10 @@ show_inventory__(aim_pvs_t* pvs)
         aim_printf(pvs, "No SFPs on this platform.\n");
     }
     else {
+        if(!database) {
         aim_printf(pvs, "Port  Type            Media   Status  Len    Vendor            Model             S/N             \n");
         aim_printf(pvs, "----  --------------  ------  ------  -----  ----------------  ----------------  ----------------\n");
+        }
 
         AIM_BITMAP_ITER(&bitmap, port) {
             int rv;
@@ -60,7 +63,9 @@ show_inventory__(aim_pvs_t* pvs)
             rv = onlp_sfp_is_present(port);
 
             if(rv == 0) {
+                if(!database) {
                 aim_printf(pvs, "%4d  NONE\n", port);
+                }
                 continue;
             }
 
@@ -76,17 +81,21 @@ show_inventory__(aim_pvs_t* pvs)
                 continue;
             }
 
-            sff_info_t sff;
+            sff_eeprom_t sff;
             char status_str[32] = {0};
 
-            sff_info_init(&sff, data);
+            sff_eeprom_parse(&sff, data);
 
-            if(!sff.supported) {
+            if(!sff.identified) {
                 /* Present but unidentified. */
                 aim_printf(pvs, "%13d  UNK\n", port);
                 continue;
             }
 
+            if(database) {
+                sff_db_entry_struct(&sff, &aim_pvs_stdout);
+                continue;
+            }
 
             uint32_t status = 0;
             char* cp = status_str;
@@ -105,13 +114,13 @@ show_inventory__(aim_pvs_t* pvs)
             }
             aim_printf(pvs, "%4d  %-14s  %-6s  %-6.6s  %-5.5s  %-16.16s  %-16.16s  %16.16s\n",
                        port,
-                       sff.module_type_name,
-                       sff.media_type_name,
+                       sff.info.module_type_name,
+                       sff.info.media_type_name,
                        status_str,
-                       sff.length_desc,
-                       sff.vendor,
-                       sff.model,
-                       sff.serial);
+                       sff.info.length_desc,
+                       sff.info.vendor,
+                       sff.info.model,
+                       sff.info.serial);
         }
     }
 }
@@ -170,6 +179,7 @@ onlpdump_main(int argc, char* argv[])
     int S = 0;
     int l = 0;
     int M = 0;
+    int b = 0;
     char* pidfile = NULL;
     const char* O = NULL;
     const char* t = NULL;
@@ -182,7 +192,7 @@ onlpdump_main(int argc, char* argv[])
         return onlp_sys_debug(&aim_pvs_stdout, argc-2, argv+2);
     }
 
-    while( (c = getopt(argc, argv, "srehdojmyM:ipxlSt:O:")) != -1) {
+    while( (c = getopt(argc, argv, "srehdojmyM:ipxlSt:O:b")) != -1) {
         switch(c)
             {
             case 's': show=1; break;
@@ -201,6 +211,7 @@ onlpdump_main(int argc, char* argv[])
             case 'O': O = optarg; break;
             case 'S': S=1; break;
             case 'l': l=1; break;
+            case 'b': b=1; break;
             case 'y': show=1; showflags |= ONLP_OID_SHOW_F_YAML; break;
             default: help=1; rv = 1; break;
             }
@@ -223,6 +234,7 @@ onlpdump_main(int argc, char* argv[])
         printf("  -t   <file>  Decode TlvInfo data.\n");
         printf("  -O   <oid> Dump OID.\n");
         printf("  -S   Decode SFP Inventory\n");
+        printf("  -b   Decode SFP Inventory into SFF database entries.\n");
         printf("  -l   API Lock test.\n");
         return rv;
     }
@@ -262,7 +274,7 @@ onlpdump_main(int argc, char* argv[])
     }
 
     if(S) {
-        show_inventory__(&aim_pvs_stdout);
+        show_inventory__(&aim_pvs_stdout, b);
         return 0;
     }
 
diff --git a/packages/base/any/onlp/src/onlp/module/src/onlp_module.c b/packages/base/any/onlp/src/onlp/module/src/onlp_module.c
index 4d050bd2..541d3c6e 100644
--- a/packages/base/any/onlp/src/onlp/module/src/onlp_module.c
+++ b/packages/base/any/onlp/src/onlp/module/src/onlp_module.c
@@ -27,12 +27,36 @@
 
 #include "onlp_log.h"
 #include <onlplib/shlocks.h>
+#include <onlp/oids.h>
+
+static int
+onlp_aim_ts__onlp_oid(aim_datatype_context_t* dtc, aim_va_list_t* vargs,
+                      const char** rv)
+{
+    onlp_oid_t oid = va_arg(vargs->val, onlp_oid_t);
+    int id = ONLP_OID_ID_GET(oid);
+
+    switch(ONLP_OID_TYPE_GET(oid))
+        {
+#define ONLP_OID_TYPE_ENTRY(_name, _value) \
+            case ONLP_OID_TYPE_##_name:    \
+                *rv = aim_fstrdup("%s:%d", #_name, id); \
+                break;
+#include <onlp/onlp.x>
+        }
+
+    return AIM_DATATYPE_OK;
+}
 
 static int
 datatypes_init__(void)
 {
 #define ONLP_ENUMERATION_ENTRY(_enum_name, _desc)     AIM_DATATYPE_MAP_REGISTER(_enum_name, _enum_name##_map, _desc,                               AIM_LOG_INTERNAL);
 #include <onlp/onlp.x>
+    aim_datatype_register(0, "onlp_oid",
+                          "ONLP OID",
+                          NULL,
+                          onlp_aim_ts__onlp_oid, NULL);
 
 
     /*
diff --git a/packages/base/any/onlp/src/onlp/module/src/platform_manager.c b/packages/base/any/onlp/src/onlp/module/src/platform_manager.c
index dfcba142..75054d6f 100644
--- a/packages/base/any/onlp/src/onlp/module/src/platform_manager.c
+++ b/packages/base/any/onlp/src/onlp/module/src/platform_manager.c
@@ -134,6 +134,7 @@ onlp_sys_platform_manage_init(void)
         int i;
         uint64_t now = os_time_monotonic();
 
+        onlp_sysi_platform_manage_init();
         control__.tw = timer_wheel_create(4, 512, now);
 
         for(i = 0; i < AIM_ARRAYSIZE(management_entries); i++) {
diff --git a/packages/base/any/onlp/src/onlp_platform_defaults/module/src/sysi.c b/packages/base/any/onlp/src/onlp_platform_defaults/module/src/sysi.c
index 76b66ab7..c5146f21 100644
--- a/packages/base/any/onlp/src/onlp_platform_defaults/module/src/sysi.c
+++ b/packages/base/any/onlp/src/onlp_platform_defaults/module/src/sysi.c
@@ -65,6 +65,7 @@ __ONLP_DEFAULTI_IMPLEMENTATION(onlp_sysi_oids_get(onlp_oid_t* table, int max));
 __ONLP_DEFAULTI_IMPLEMENTATION(onlp_sysi_platform_info_get(onlp_platform_info_t* pi));
 __ONLP_DEFAULTI_VIMPLEMENTATION(onlp_sysi_platform_info_free(onlp_platform_info_t* pi));
 __ONLP_DEFAULTI_IMPLEMENTATION(onlp_sysi_ioctl(int id, va_list vargs));
+__ONLP_DEFAULTI_IMPLEMENTATION(onlp_sysi_platform_manage_init(void));
 __ONLP_DEFAULTI_IMPLEMENTATION(onlp_sysi_platform_manage_fans(void));
 __ONLP_DEFAULTI_IMPLEMENTATION(onlp_sysi_platform_manage_leds(void));
 
diff --git a/packages/base/any/onlp/src/onlp_platform_defaults/onlp_platform_defaults.mk b/packages/base/any/onlp/src/onlp_platform_defaults/onlp_platform_defaults.mk
index 301c4fe0..fa66350e 100644
--- a/packages/base/any/onlp/src/onlp_platform_defaults/onlp_platform_defaults.mk
+++ b/packages/base/any/onlp/src/onlp_platform_defaults/onlp_platform_defaults.mk
@@ -3,12 +3,12 @@
 #
 # Inclusive Makefile for the onlp_platform_defaults module.
 #
-# Autogenerated 2016-03-23 18:28:25.688419
+# Autogenerated 2016-05-17 17:43:05.660985
 #
 ###############################################################################
 onlp_platform_defaults_BASEDIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
-include $(onlp_platform_defaults_BASEDIR)/module/make.mk
-include $(onlp_platform_defaults_BASEDIR)/module/auto/make.mk
-include $(onlp_platform_defaults_BASEDIR)/module/src/make.mk
-include $(onlp_platform_defaults_BASEDIR)/utest/_make.mk
+include $(onlp_platform_defaults_BASEDIR)module/make.mk
+include $(onlp_platform_defaults_BASEDIR)module/auto/make.mk
+include $(onlp_platform_defaults_BASEDIR)module/src/make.mk
+include $(onlp_platform_defaults_BASEDIR)utest/_make.mk
 
diff --git a/packages/base/any/onlp/src/onlplib/module/inc/onlplib/thermal.h b/packages/base/any/onlp/src/onlplib/module/inc/onlplib/thermal.h
new file mode 100644
index 00000000..025e90a4
--- /dev/null
+++ b/packages/base/any/onlp/src/onlplib/module/inc/onlplib/thermal.h
@@ -0,0 +1,36 @@
+/**************************************************************
+ * <bsn.cl fy=2014 v=onl>
+ *
+ *        Copyright 2014, 2015 Big Switch Networks, Inc.
+ *
+ * Licensed under the Eclipse Public License, Version 1.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ *        http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ *
+ * </bsn.cl>
+ **************************************************************
+ *
+ * Common thermal support routines.
+ *
+ ************************************************************/
+#ifndef __ONLPLIB_THERMAL_H__
+#define __ONLPLIB_THERMAL_H__
+#include <onlplib/onlplib_config.h>
+#include <onlp/thermal.h>
+/**
+ * @brief Read the mcelsius value from the given file.
+ * @param fname Filename
+ * @param info Thermal info structure.
+ */
+int onlplib_thermal_read_file(const char* fname, onlp_thermal_info_t* info);
+
+#endif /* __ONLPLIB_THERMAL_H__ */
diff --git a/packages/base/any/onlp/src/onlplib/module/src/thermal.c b/packages/base/any/onlp/src/onlplib/module/src/thermal.c
new file mode 100644
index 00000000..32d1c931
--- /dev/null
+++ b/packages/base/any/onlp/src/onlplib/module/src/thermal.c
@@ -0,0 +1,51 @@
+/**************************************************************
+ * <bsn.cl fy=2014 v=onl>
+ *
+ *        Copyright 2014, 2015 Big Switch Networks, Inc.
+ *
+ * Licensed under the Eclipse Public License, Version 1.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ *        http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ *
+ * </bsn.cl>
+ **************************************************************
+ *
+ * Common thermal support routines.
+ *
+ ************************************************************/
+#include <onlplib/thermal.h>
+#include <onlplib/file.h>
+#include <onlp/thermal.h>
+
+int
+onlplib_thermal_read_file(const char* fname, onlp_thermal_info_t* info)
+{
+    int ret;
+    int rv = onlp_file_read_int(&info->mcelsius, fname);
+
+    if(rv == ONLP_STATUS_E_MISSING) {
+        /* Absent */
+        info->status = 0;
+        ret = 0;
+    }
+    else if(rv >= 0) {
+        /* Present */
+        info->status |= 1;
+        ret = 0;
+    }
+    else {
+        /** Other error. */
+        ret = ONLP_STATUS_E_INTERNAL;
+    }
+    return ret;
+}
+
diff --git a/packages/base/any/onlp/src/onlplib/onlplib.mk b/packages/base/any/onlp/src/onlplib/onlplib.mk
index 889b3b94..c33c4de3 100644
--- a/packages/base/any/onlp/src/onlplib/onlplib.mk
+++ b/packages/base/any/onlp/src/onlplib/onlplib.mk
@@ -3,12 +3,12 @@
 #
 # Inclusive Makefile for the onlplib module.
 #
-# Autogenerated 2016-03-23 18:28:25.806397
+# Autogenerated 2016-05-17 17:43:05.779760
 #
 ###############################################################################
 onlplib_BASEDIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
-include $(onlplib_BASEDIR)/module/make.mk
-include $(onlplib_BASEDIR)/module/auto/make.mk
-include $(onlplib_BASEDIR)/module/src/make.mk
-include $(onlplib_BASEDIR)/utest/_make.mk
+include $(onlplib_BASEDIR)module/make.mk
+include $(onlplib_BASEDIR)module/auto/make.mk
+include $(onlplib_BASEDIR)module/src/make.mk
+include $(onlplib_BASEDIR)utest/_make.mk
 
diff --git a/packages/base/any/onlp/src/sff/module/auto/sff.yml b/packages/base/any/onlp/src/sff/module/auto/sff.yml
index dd31d020..3ccd142c 100644
--- a/packages/base/any/onlp/src/sff/module/auto/sff.yml
+++ b/packages/base/any/onlp/src/sff/module/auto/sff.yml
@@ -32,6 +32,9 @@ cdefs: &cdefs
 - SFF_CONFIG_INCLUDE_EXT_CC_CHECK:
     doc: "Include extended checksum verification."
     default: 0
+- SFF_CONFIG_INCLUDE_DATABASE:
+    doc: "Include eeprom database."
+    default: 1
 
 sff_media_types: &sff_media_types
 - COPPER:
@@ -56,6 +59,8 @@ sff_module_types: &sff_module_types
     desc: "40GBASE-SR4"
 - 40G_BASE_LR4:
     desc: "40GBASE-LR4"
+- 40G_BASE_LM4:
+    desc: "40GBASE-LM4"
 - 40G_BASE_ACTIVE:
     desc: "40GBASE-ACTIVE"
 - 40G_BASE_CR:
diff --git a/packages/base/any/onlp/src/sff/module/inc/sff/8436.h b/packages/base/any/onlp/src/sff/module/inc/sff/8436.h
index 3bedc8f8..d2c0e35f 100644
--- a/packages/base/any/onlp/src/sff/module/inc/sff/8436.h
+++ b/packages/base/any/onlp/src/sff/module/inc/sff/8436.h
@@ -224,6 +224,8 @@
 #define SFF8436_DOM_GET_RXPWR_TYPE(idprom)               \
         (idprom[220] & SFF8436_RX_PWR_TYPE_MASK)
 
+/* SFF8436 registers */
+#define SFF8436_CONTROL_TX_DISABLE       86
 /* alternate ways to identify pre-standard 40G cables */
 static inline int
 _sff8436_qsfp_40g_pre(const uint8_t* idprom)
@@ -255,6 +257,18 @@ _sff8436_qsfp_40g_pre(const uint8_t* idprom)
 
     return 0;
 }
+static inline int
+_sff8436_qsfp_40g_lm4(const uint8_t* idprom)
+{
+    if(!SFF8436_MODULE_QSFP_PLUS_V2(idprom)) {
+        return 0;
+    }
+    /* Restrict to Finisar FTL4C3QE1C at this point. */
+    if(strncmp("FTL4C3QE1C      ", (char*)idprom+168, 16)) {
+        return 0;
+    }
+    return SFF8436_MEDIA_NONE(idprom);
+}
 
 static inline int
 _sff8436_bitrate(const uint8_t *idprom)
diff --git a/packages/base/any/onlp/src/sff/module/inc/sff/sff.h b/packages/base/any/onlp/src/sff/module/inc/sff/sff.h
index cd110cdb..20e3b3f4 100644
--- a/packages/base/any/onlp/src/sff/module/inc/sff/sff.h
+++ b/packages/base/any/onlp/src/sff/module/inc/sff/sff.h
@@ -1,21 +1,21 @@
 /************************************************************
  * <bsn.cl fy=2014 v=onl>
- * 
- *        Copyright 2014, 2015 Big Switch Networks, Inc.       
- * 
+ *
+ *        Copyright 2014, 2015 Big Switch Networks, Inc.
+ *
  * Licensed under the Eclipse Public License, Version 1.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  *        http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
  * either express or implied. See the License for the specific
  * language governing permissions and limitations under the
  * License.
- * 
+ *
  * </bsn.cl>
  ************************************************************
  *
@@ -103,6 +103,7 @@ typedef enum sff_module_type_e {
     SFF_MODULE_TYPE_40G_BASE_CR4,
     SFF_MODULE_TYPE_40G_BASE_SR4,
     SFF_MODULE_TYPE_40G_BASE_LR4,
+    SFF_MODULE_TYPE_40G_BASE_LM4,
     SFF_MODULE_TYPE_40G_BASE_ACTIVE,
     SFF_MODULE_TYPE_40G_BASE_CR,
     SFF_MODULE_TYPE_40G_BASE_SR2,
@@ -137,6 +138,7 @@ typedef enum sff_module_type_e {
     "40G_BASE_CR4", \
     "40G_BASE_SR4", \
     "40G_BASE_LR4", \
+    "40G_BASE_LM4", \
     "40G_BASE_ACTIVE", \
     "40G_BASE_CR", \
     "40G_BASE_SR2", \
@@ -228,7 +230,7 @@ sff_module_type_t sff_module_type_get(const uint8_t* idprom);
  * @brief Determine the SFF Media type (from the idprom data)./
  * @param idprom The SFF idprom.
  */
-sff_media_type_t sff_media_type_get(const uint8_t* idprom);
+sff_media_type_t sff_media_type_get(sff_module_type_t mt);
 
 
 /**
@@ -238,45 +240,35 @@ sff_media_type_t sff_media_type_get(const uint8_t* idprom);
  * @returns 0 on successful parse.
  * @returns < 0 on error.
  */
-int sff_module_caps_get(const uint8_t* idprom, uint32_t* caps);
+int sff_module_caps_get(sff_module_type_t mt, uint32_t* caps);
 
 
-/**
- * Display a summary of the given SFF module.
- * @param idprom The idprom data
- * @param pvs The output pvs.
- */
-
-void sff_module_show(const uint8_t* idprom, aim_pvs_t* pvs);
-
-
-
-/**
- * SFF Module Information Structure
- */
 typedef struct sff_info_s {
-    /** Raw eeprom data */
-    uint8_t eeprom[256];
 
     /** Vendor Name */
     char vendor[17];
+
     /** Model Number */
     char model[17];
+
     /** Serial Number */
     char serial[17];
 
     /** SFP Type */
     sff_sfp_type_t sfp_type;
+
     /** SFP Type Name */
     const char* sfp_type_name;
 
     /** Module Type */
     sff_module_type_t module_type;
+
     /** Module Type Name */
     const char* module_type_name;
 
     /** Media Type */
     sff_media_type_t media_type;
+
     /** Media Type Name */
     const char* media_type_name;
 
@@ -286,15 +278,26 @@ typedef struct sff_info_s {
     /** Cable length, if available */
     int length;
     char length_desc[16];
+} sff_info_t;
 
-    /** computed checksums for idprom contents */
+/**
+ * SFF Module Information Structure
+ */
+typedef struct sff_eeprom_s {
+    /** Raw eeprom data */
+    uint8_t eeprom[256];
+
+    /** computed checksums for eeprom contents */
     uint8_t cc_base;
     uint8_t cc_ext;
 
-    /** whether this SFP is supported */
-    int supported;
+    /** Whether this EEPROM was successfully parsed and identified. */
+    int identified;
 
-} sff_info_t;
+    /** Parsed SFF Information */
+    sff_info_t info;
+
+} sff_eeprom_t;
 
 
 /**
@@ -305,14 +308,28 @@ typedef struct sff_info_s {
  * @note if eeprom is NULL it is assumed the rv->eeprom buffer
  * has already been initialized.
  */
-int sff_info_init(sff_info_t* rv, uint8_t* eeprom);
+int sff_eeprom_parse(sff_eeprom_t* rv, uint8_t* eeprom);
 
 /**
  * @brief Initialize an SFF module information structure from a file.
  * @param rv [out] Receives thh data.
  * @param fname The filename.
  */
-int sff_info_init_file(sff_info_t* rv, const char* fname);
+int sff_eeprom_parse_file(sff_eeprom_t* rv, const char* fname);
+
+/**
+ * @brief Clear an sff_eeprom_t structure.
+ * @param eeprom The eeprom structure.
+ */
+void sff_eeprom_invalidate(sff_eeprom_t *info);
+
+/**
+ * @brief Determine if this is a valid SFP
+ *     (whether or not we can parse it)
+ * @param info The info structure.
+ * @param verbose Whether to report errors on invalid contents.
+ */
+int sff_eeprom_validate(sff_eeprom_t *info, int verbose);
 
 /**
  * @brief Show an sff info structure.
@@ -322,18 +339,12 @@ int sff_info_init_file(sff_info_t* rv, const char* fname);
 void sff_info_show(sff_info_t* info, aim_pvs_t* pvs);
 
 /**
- * @brief Invalidate an idprom data structure,
- *     such that any resulting sff_info_init will fail.
- * @param eeprom  The idprom buffer (256 bytes).
+ * @brief Populate an SFF info structure from a module type.
  */
-void sff_info_invalidate(sff_info_t *info);
+int sff_info_from_module_type(sff_info_t* info,
+                               sff_sfp_type_t st,
+                               sff_module_type_t mt);
+
 
-/**
- * @brief Determine if this is a valid SFP
- *     (whether or not we can parse it)
- * @param info The info structure.
- * @param verbose Whether to report errors on invalid contents.
- */
-int sff_info_valid(sff_info_t *info, int verbose);
 
 #endif /* __SFF_SFF_H__ */
diff --git a/packages/base/any/onlp/src/sff/module/inc/sff/sff_config.h b/packages/base/any/onlp/src/sff/module/inc/sff/sff_config.h
index 966d24c4..c3e5d6de 100644
--- a/packages/base/any/onlp/src/sff/module/inc/sff/sff_config.h
+++ b/packages/base/any/onlp/src/sff/module/inc/sff/sff_config.h
@@ -109,6 +109,16 @@
 #define SFF_CONFIG_INCLUDE_EXT_CC_CHECK 0
 #endif
 
+/**
+ * SFF_CONFIG_INCLUDE_DATABASE
+ *
+ * Include eeprom database. */
+
+
+#ifndef SFF_CONFIG_INCLUDE_DATABASE
+#define SFF_CONFIG_INCLUDE_DATABASE 1
+#endif
+
 
 
 /**
diff --git a/packages/base/any/onlp/src/sff/module/inc/sff/sff_db.h b/packages/base/any/onlp/src/sff/module/inc/sff/sff_db.h
new file mode 100644
index 00000000..2242cd57
--- /dev/null
+++ b/packages/base/any/onlp/src/sff/module/inc/sff/sff_db.h
@@ -0,0 +1,60 @@
+/************************************************************
+ * <bsn.cl fy=2014 v=onl>
+ *
+ *        Copyright 2014, 2015 Big Switch Networks, Inc.
+ *
+ * Licensed under the Eclipse Public License, Version 1.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ *        http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ *
+ * </bsn.cl>
+ ************************************************************
+ *
+ *
+ *
+ ***********************************************************/
+#ifndef __SFF_DB_H__
+#define __SFF_DB_H__
+
+#include <sff/sff_config.h>
+#include <sff/sff.h>
+#include <AIM/aim_pvs.h>
+
+typedef struct {
+    sff_eeprom_t se;
+} sff_db_entry_t;
+
+/**
+ * @brief Get the database entry table.
+ * @param entries Receives the table pointer.
+ * @param count Receives the size of the table.
+ */
+int sff_db_get(sff_db_entry_t** entries, int* count);
+
+/**
+ * @brief Return any entry with the given module type.
+ * @param se Receives the information struct.
+ * @param type The type to retreive.
+ */
+int sff_db_get_type(sff_eeprom_t* se, sff_module_type_t type);
+
+
+/**
+ * @brief Output the given SFF information to a database entry.
+ * @param info The source information.
+ * @param pvs The output pvs.;
+ * @note This is used mainly for generating new entries for the SFF db from a running system.
+ */
+int sff_db_entry_struct(sff_eeprom_t* se, aim_pvs_t* pvs);
+
+#endif /* __SFF_DB_H__ */
+
diff --git a/packages/base/any/onlp/src/sff/module/src/sff.c b/packages/base/any/onlp/src/sff/module/src/sff.c
index 20650c0e..74cad3e5 100644
--- a/packages/base/any/onlp/src/sff/module/src/sff.c
+++ b/packages/base/any/onlp/src/sff/module/src/sff.c
@@ -1,21 +1,21 @@
 /************************************************************
  * <bsn.cl fy=2014 v=onl>
- * 
- *        Copyright 2014, 2015 Big Switch Networks, Inc.       
- * 
+ *
+ *        Copyright 2014, 2015 Big Switch Networks, Inc.
+ *
  * Licensed under the Eclipse Public License, Version 1.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  *        http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
  * either express or implied. See the License for the specific
  * language governing permissions and limitations under the
  * License.
- * 
+ *
  * </bsn.cl>
  ************************************************************
  *
@@ -30,16 +30,16 @@
 #include <ctype.h>
 
 sff_sfp_type_t
-sff_sfp_type_get(const uint8_t* idprom)
+sff_sfp_type_get(const uint8_t* eeprom)
 {
-    if(idprom) {
-        if(SFF8472_MODULE_SFP(idprom)) {
+    if(eeprom) {
+        if(SFF8472_MODULE_SFP(eeprom)) {
             return SFF_SFP_TYPE_SFP;
         }
-        if(SFF8436_MODULE_QSFP_PLUS_V2(idprom)) {
+        if(SFF8436_MODULE_QSFP_PLUS_V2(eeprom)) {
             return SFF_SFP_TYPE_QSFP_PLUS;
         }
-        if(SFF8636_MODULE_QSFP28(idprom)) {
+        if(SFF8636_MODULE_QSFP28(eeprom)) {
             return SFF_SFP_TYPE_QSFP28;
         }
     }
@@ -47,92 +47,97 @@ sff_sfp_type_get(const uint8_t* idprom)
 }
 
 sff_module_type_t
-sff_module_type_get(const uint8_t* idprom)
+sff_module_type_get(const uint8_t* eeprom)
 {
-    if (SFF8636_MODULE_QSFP28(idprom)
-        && SFF8636_MEDIA_EXTENDED(idprom)
-        && SFF8636_MEDIA_100GE_AOC(idprom))
+    if (SFF8636_MODULE_QSFP28(eeprom)
+        && SFF8636_MEDIA_EXTENDED(eeprom)
+        && SFF8636_MEDIA_100GE_AOC(eeprom))
         return SFF_MODULE_TYPE_100G_AOC;
 
-    if (SFF8636_MODULE_QSFP28(idprom)
-        && SFF8636_MEDIA_EXTENDED(idprom)
-        && SFF8636_MEDIA_100GE_SR4(idprom))
+    if (SFF8636_MODULE_QSFP28(eeprom)
+        && SFF8636_MEDIA_EXTENDED(eeprom)
+        && SFF8636_MEDIA_100GE_SR4(eeprom))
         return SFF_MODULE_TYPE_100G_BASE_SR4;
 
-    if (SFF8636_MODULE_QSFP28(idprom)
-        && SFF8636_MEDIA_EXTENDED(idprom)
-        && SFF8636_MEDIA_100GE_LR4(idprom))
+    if (SFF8636_MODULE_QSFP28(eeprom)
+        && SFF8636_MEDIA_EXTENDED(eeprom)
+        && SFF8636_MEDIA_100GE_LR4(eeprom))
         return SFF_MODULE_TYPE_100G_BASE_LR4;
 
-    if (SFF8636_MODULE_QSFP28(idprom)
-        && SFF8636_MEDIA_EXTENDED(idprom)
-        && SFF8636_MEDIA_100GE_CR4(idprom))
+    if (SFF8636_MODULE_QSFP28(eeprom)
+        && SFF8636_MEDIA_EXTENDED(eeprom)
+        && SFF8636_MEDIA_100GE_CR4(eeprom))
         return SFF_MODULE_TYPE_100G_BASE_CR4;
 
-    if (SFF8636_MODULE_QSFP28(idprom)
-        && SFF8636_MEDIA_EXTENDED(idprom)
-        && SFF8636_MEDIA_100GE_CWDM4(idprom))
+    if (SFF8636_MODULE_QSFP28(eeprom)
+        && SFF8636_MEDIA_EXTENDED(eeprom)
+        && SFF8636_MEDIA_100GE_CWDM4(eeprom))
         return SFF_MODULE_TYPE_100G_CWDM4;
- 
-    if (SFF8436_MODULE_QSFP_PLUS_V2(idprom)
-        && SFF8436_MEDIA_40GE_CR4(idprom))
+
+    if (SFF8436_MODULE_QSFP_PLUS_V2(eeprom)
+        && SFF8436_MEDIA_40GE_CR4(eeprom))
         return SFF_MODULE_TYPE_40G_BASE_CR4;
 
-    if (SFF8436_MODULE_QSFP_PLUS_V2(idprom)
-        && SFF8436_MEDIA_40GE_SR4(idprom))
+    if (SFF8436_MODULE_QSFP_PLUS_V2(eeprom)
+        && SFF8436_MEDIA_40GE_SR4(eeprom))
         return SFF_MODULE_TYPE_40G_BASE_SR4;
 
-    if (SFF8436_MODULE_QSFP_PLUS_V2(idprom)
-        && _sff8436_qsfp_40g_sr4_aoc_pre(idprom))
+    if (SFF8436_MODULE_QSFP_PLUS_V2(eeprom)
+        && _sff8436_qsfp_40g_sr4_aoc_pre(eeprom))
         return SFF_MODULE_TYPE_40G_BASE_SR4;
 
-    if (SFF8436_MODULE_QSFP_PLUS_V2(idprom)
-        && SFF8436_MEDIA_40GE_LR4(idprom))
+    if (SFF8436_MODULE_QSFP_PLUS_V2(eeprom)
+        && SFF8436_MEDIA_40GE_LR4(eeprom))
         return SFF_MODULE_TYPE_40G_BASE_LR4;
 
-    if (SFF8436_MODULE_QSFP_PLUS_V2(idprom)
-        && SFF8436_MEDIA_40GE_ACTIVE(idprom))
+    if (SFF8436_MODULE_QSFP_PLUS_V2(eeprom)
+        && SFF8436_MEDIA_40GE_ACTIVE(eeprom))
         return SFF_MODULE_TYPE_40G_BASE_ACTIVE;
 
-    if (SFF8436_MODULE_QSFP_PLUS_V2(idprom)
-        && _sff8436_qsfp_40g_aoc_breakout(idprom))
+    if (SFF8436_MODULE_QSFP_PLUS_V2(eeprom)
+        && _sff8436_qsfp_40g_aoc_breakout(eeprom))
         return SFF_MODULE_TYPE_40G_BASE_SR4;
 
-    if (SFF8436_MODULE_QSFP_PLUS_V2(idprom)
-        && SFF8436_MEDIA_40GE_CR(idprom))
+    if (SFF8436_MODULE_QSFP_PLUS_V2(eeprom)
+        && SFF8436_MEDIA_40GE_CR(eeprom))
         return SFF_MODULE_TYPE_40G_BASE_CR;
 
     /* pre-standard finisar optics */
-    if (SFF8436_MODULE_QSFP_PLUS_V2(idprom)
-        && _sff8436_qsfp_40g_pre(idprom)
-        && (SFF8436_TECH_FC_FIBER_LONG(idprom)
-            || SFF8436_MEDIA_FC_FIBER_SM(idprom)))
+    if (SFF8436_MODULE_QSFP_PLUS_V2(eeprom)
+        && _sff8436_qsfp_40g_pre(eeprom)
+        && (SFF8436_TECH_FC_FIBER_LONG(eeprom)
+            || SFF8436_MEDIA_FC_FIBER_SM(eeprom)))
         return SFF_MODULE_TYPE_40G_BASE_LR4;
 
-    if (SFF8436_MODULE_QSFP_PLUS_V2(idprom)
-        && _sff8436_qsfp_40g_pre(idprom)
-        && (SFF8436_TECH_FC_FIBER_SHORT(idprom)
-            || SFF8436_MEDIA_FC_FIBER_MM(idprom)))
+    if (SFF8436_MODULE_QSFP_PLUS_V2(eeprom)
+        && _sff8436_qsfp_40g_pre(eeprom)
+        && (SFF8436_TECH_FC_FIBER_SHORT(eeprom)
+            || SFF8436_MEDIA_FC_FIBER_MM(eeprom)))
         return SFF_MODULE_TYPE_40G_BASE_SR4;
 
     /* pre-standard QSFP-BiDi optics */
-    if (SFF8436_MODULE_QSFP_PLUS_V2(idprom)
-        && _sff8436_qsfp_40g_sr2_bidi_pre(idprom))
+    if (SFF8436_MODULE_QSFP_PLUS_V2(eeprom)
+        && _sff8436_qsfp_40g_sr2_bidi_pre(eeprom))
         return SFF_MODULE_TYPE_40G_BASE_SR2;
 
-    if (SFF8472_MODULE_SFP(idprom)
-        && SFF8472_MEDIA_XGE_SR(idprom)
-        && !_sff8472_media_gbe_sx_fc_hack(idprom))
+    if (SFF8436_MODULE_QSFP_PLUS_V2(eeprom)
+        && _sff8436_qsfp_40g_lm4(eeprom)) {
+        return SFF_MODULE_TYPE_40G_BASE_LM4;
+    }
+
+    if (SFF8472_MODULE_SFP(eeprom)
+        && SFF8472_MEDIA_XGE_SR(eeprom)
+        && !_sff8472_media_gbe_sx_fc_hack(eeprom))
         return SFF_MODULE_TYPE_10G_BASE_SR;
 
-    if (SFF8472_MODULE_SFP(idprom)
-        && SFF8472_MEDIA_XGE_LR(idprom)
-        && !_sff8472_media_gbe_lx_fc_hack(idprom))
+    if (SFF8472_MODULE_SFP(eeprom)
+        && SFF8472_MEDIA_XGE_LR(eeprom)
+        && !_sff8472_media_gbe_lx_fc_hack(eeprom))
         return SFF_MODULE_TYPE_10G_BASE_LR;
 
-    if (SFF8472_MODULE_SFP(idprom)
-        && SFF8472_MEDIA_XGE_LRM(idprom)
-        && !_sff8472_media_gbe_lx_fc_hack(idprom))
+    if (SFF8472_MODULE_SFP(eeprom)
+        && SFF8472_MEDIA_XGE_LRM(eeprom)
+        && !_sff8472_media_gbe_lx_fc_hack(eeprom))
         return SFF_MODULE_TYPE_10G_BASE_LRM;
 
     /*
@@ -141,71 +146,69 @@ sff_module_type_get(const uint8_t* idprom)
      * See also _sff8472_media_cr_passive, which encodes some
      * additional workarounds for these cables.
      */
-    if (SFF8472_MODULE_SFP(idprom)
-        && SFF8472_MEDIA_XGE_ER(idprom)
-        && !_sff8472_inf_1x_cu_active(idprom)
-        && !_sff8472_inf_1x_cu_passive(idprom))
+    if (SFF8472_MODULE_SFP(eeprom)
+        && SFF8472_MEDIA_XGE_ER(eeprom)
+        && !_sff8472_inf_1x_cu_active(eeprom)
+        && !_sff8472_inf_1x_cu_passive(eeprom))
         return SFF_MODULE_TYPE_10G_BASE_ER;
 
     /* XXX roth - not sure on this one */
-    if (SFF8472_MODULE_SFP(idprom)
-        && _sff8472_media_cr_passive(idprom))
+    if (SFF8472_MODULE_SFP(eeprom)
+        && _sff8472_media_cr_passive(eeprom))
         return SFF_MODULE_TYPE_10G_BASE_CR;
 
-    if (SFF8472_MODULE_SFP(idprom)
-        && _sff8472_media_cr_active(idprom)) {
-        if (_sff8472_sfp_10g_aoc(idprom))
+    if (SFF8472_MODULE_SFP(eeprom)
+        && _sff8472_media_cr_active(eeprom)) {
+        if (_sff8472_sfp_10g_aoc(eeprom))
             return SFF_MODULE_TYPE_10G_BASE_SR;
         else
             return SFF_MODULE_TYPE_10G_BASE_CR;
     }
 
-    if (SFF8472_MODULE_SFP(idprom)
-        && SFF8472_MEDIA_GBE_SX(idprom))
+    if (SFF8472_MODULE_SFP(eeprom)
+        && SFF8472_MEDIA_GBE_SX(eeprom))
         return SFF_MODULE_TYPE_1G_BASE_SX;
 
-    if (SFF8472_MODULE_SFP(idprom)
-        && SFF8472_MEDIA_GBE_LX(idprom))
+    if (SFF8472_MODULE_SFP(eeprom)
+        && SFF8472_MEDIA_GBE_LX(eeprom))
         return SFF_MODULE_TYPE_1G_BASE_LX;
 
-    if (SFF8472_MODULE_SFP(idprom)
-        && SFF8472_MEDIA_GBE_CX(idprom))
+    if (SFF8472_MODULE_SFP(eeprom)
+        && SFF8472_MEDIA_GBE_CX(eeprom))
         return SFF_MODULE_TYPE_1G_BASE_CX;
 
-    if (SFF8472_MODULE_SFP(idprom)
-        && SFF8472_MEDIA_GBE_T(idprom))
+    if (SFF8472_MODULE_SFP(eeprom)
+        && SFF8472_MEDIA_GBE_T(eeprom))
         return SFF_MODULE_TYPE_1G_BASE_T;
 
-    if (SFF8472_MODULE_SFP(idprom)
-        && SFF8472_MEDIA_GBE_LX(idprom))
+    if (SFF8472_MODULE_SFP(eeprom)
+        && SFF8472_MEDIA_GBE_LX(eeprom))
         return SFF_MODULE_TYPE_1G_BASE_LX;
 
-    if (SFF8472_MODULE_SFP(idprom)
-        && SFF8472_MEDIA_CBE_LX(idprom))
+    if (SFF8472_MODULE_SFP(eeprom)
+        && SFF8472_MEDIA_CBE_LX(eeprom))
         return SFF_MODULE_TYPE_100_BASE_LX;
 
-    if (SFF8472_MODULE_SFP(idprom)
-        && SFF8472_MEDIA_CBE_FX(idprom))
+    if (SFF8472_MODULE_SFP(eeprom)
+        && SFF8472_MEDIA_CBE_FX(eeprom))
         return SFF_MODULE_TYPE_100_BASE_FX;
 
     /* non-standard (e.g. Finisar) ZR media */
-    if (SFF8472_MODULE_SFP(idprom)
-        && _sff8472_media_zr(idprom))
+    if (SFF8472_MODULE_SFP(eeprom)
+        && _sff8472_media_zr(eeprom))
         return SFF_MODULE_TYPE_10G_BASE_ZR;
 
     /* non-standard (e.g. Finisar) SRL media */
-    if (SFF8472_MODULE_SFP(idprom)
-        && _sff8472_media_srlite(idprom))
+    if (SFF8472_MODULE_SFP(eeprom)
+        && _sff8472_media_srlite(eeprom))
         return SFF_MODULE_TYPE_10G_BASE_SRL;
 
     return SFF_MODULE_TYPE_INVALID;
 }
 
 sff_media_type_t
-sff_media_type_get(const uint8_t* idprom)
+sff_media_type_get(sff_module_type_t mt)
 {
-    sff_module_type_t mt = sff_module_type_get(idprom);
-
     switch(mt)
         {
         case SFF_MODULE_TYPE_100G_BASE_CR4:
@@ -222,6 +225,7 @@ sff_media_type_get(const uint8_t* idprom)
         case SFF_MODULE_TYPE_100G_CWDM4:
         case SFF_MODULE_TYPE_40G_BASE_SR4:
         case SFF_MODULE_TYPE_40G_BASE_LR4:
+        case SFF_MODULE_TYPE_40G_BASE_LM4:
         case SFF_MODULE_TYPE_40G_BASE_ACTIVE:
         case SFF_MODULE_TYPE_40G_BASE_SR2:
         case SFF_MODULE_TYPE_10G_BASE_SR:
@@ -247,14 +251,11 @@ sff_media_type_get(const uint8_t* idprom)
 }
 
 int
-sff_module_caps_get(const uint8_t* idprom, uint32_t *caps)
+sff_module_caps_get(sff_module_type_t mt, uint32_t *caps)
 {
-    if (idprom == NULL)
-        return -1;
     if (caps == NULL)
         return -1;
 
-    sff_module_type_t mt = sff_module_type_get(idprom);
     *caps = 0;
 
     switch(mt)
@@ -270,6 +271,7 @@ sff_module_caps_get(const uint8_t* idprom, uint32_t *caps)
         case SFF_MODULE_TYPE_40G_BASE_CR4:
         case SFF_MODULE_TYPE_40G_BASE_SR4:
         case SFF_MODULE_TYPE_40G_BASE_LR4:
+        case SFF_MODULE_TYPE_40G_BASE_LM4:
         case SFF_MODULE_TYPE_40G_BASE_ACTIVE:
         case SFF_MODULE_TYPE_40G_BASE_CR:
         case SFF_MODULE_TYPE_40G_BASE_SR2:
@@ -305,24 +307,6 @@ sff_module_caps_get(const uint8_t* idprom, uint32_t *caps)
         }
 }
 
-void
-sff_module_show(const uint8_t* idprom, aim_pvs_t* pvs)
-{
-
-    if (SFF8436_MODULE_QSFP_PLUS_V2(idprom) ||
-        SFF8636_MODULE_QSFP28(idprom)) {
-        aim_printf(pvs,
-                   "%-12.12s  %-16.16s  %-16.16s  %-16.16s\n",
-                   sff_module_type_desc(sff_module_type_get(idprom)),
-                   idprom+148, idprom+168, idprom+196);
-    } else {
-        aim_printf(pvs,
-                   "%-12.12s  %-16.16s  %-16.16s  %-16.16s\n",
-                   sff_module_type_desc(sff_module_type_get(idprom)),
-                   idprom+20, idprom+40, idprom+68);
-    }
-}
-
 static void
 make_printable__(char* string)
 {
@@ -342,154 +326,176 @@ make_printable__(char* string)
  * @note if eeprom is NULL it is assumed the rv->eeprom buffer
  * has already been initialized.
  */
+
 int
-sff_info_init(sff_info_t* rv, uint8_t* eeprom)
+sff_eeprom_parse(sff_eeprom_t* se, uint8_t* eeprom)
 {
-    if(rv == NULL) {
+    if(se == NULL) {
         return -1;
     }
-    rv->supported = 0;
+    se->identified = 0;
 
     if(eeprom) {
-        SFF_MEMCPY(rv->eeprom, eeprom, 256);
+        SFF_MEMCPY(se->eeprom, eeprom, 256);
     }
 
-    if (SFF8472_MODULE_SFP(rv->eeprom)) {
+    if (SFF8472_MODULE_SFP(se->eeprom)) {
         /* See SFF-8472 pp22, pp28 */
         int i;
-        for (i = 0, rv->cc_base = 0; i < 63; ++i)
-            rv->cc_base = (rv->cc_base + rv->eeprom[i]) & 0xFF;
-        for (i = 64, rv->cc_ext = 0; i < 95; ++i)
-            rv->cc_ext = (rv->cc_ext + rv->eeprom[i]) & 0xFF;
-    } else if (SFF8436_MODULE_QSFP_PLUS_V2(rv->eeprom) ||
-               SFF8636_MODULE_QSFP28(rv->eeprom)) {
+        for (i = 0, se->cc_base = 0; i < 63; ++i)
+            se->cc_base = (se->cc_base + se->eeprom[i]) & 0xFF;
+        for (i = 64, se->cc_ext = 0; i < 95; ++i)
+            se->cc_ext = (se->cc_ext + se->eeprom[i]) & 0xFF;
+    } else if (SFF8436_MODULE_QSFP_PLUS_V2(se->eeprom) ||
+               SFF8636_MODULE_QSFP28(se->eeprom)) {
         /* See SFF-8436 pp72, pp73 */
         int i;
-        for (i = 128, rv->cc_base = 0; i < 191; ++i)
-            rv->cc_base = (rv->cc_base + rv->eeprom[i]) & 0xFF;
-        for (i = 192, rv->cc_ext = 0; i < 223; ++i)
-            rv->cc_ext = (rv->cc_ext + rv->eeprom[i]) & 0xFF;
+        for (i = 128, se->cc_base = 0; i < 191; ++i)
+            se->cc_base = (se->cc_base + se->eeprom[i]) & 0xFF;
+        for (i = 192, se->cc_ext = 0; i < 223; ++i)
+            se->cc_ext = (se->cc_ext + se->eeprom[i]) & 0xFF;
     }
 
-    if (!sff_info_valid(rv, 1)) return -1;
-
-    rv->sfp_type = sff_sfp_type_get(rv->eeprom);
-    if(rv->sfp_type == SFF_SFP_TYPE_INVALID) {
-        AIM_LOG_ERROR("sff_info_init() failed: invalid sfp type");
+    if (!sff_eeprom_validate(se, 1)) {
         return -1;
     }
-    rv->sfp_type_name = sff_sfp_type_desc(rv->sfp_type);
+
+    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;
+    }
+    se->info.sfp_type_name = sff_sfp_type_desc(se->info.sfp_type);
 
     const uint8_t *vendor, *model, *serial;
 
-    switch(rv->sfp_type)
+    switch(se->info.sfp_type)
         {
         case SFF_SFP_TYPE_QSFP_PLUS:
         case SFF_SFP_TYPE_QSFP28:
-            vendor=rv->eeprom+148;
-            model=rv->eeprom+168;
-            serial=rv->eeprom+196;
+            vendor=se->eeprom+148;
+            model=se->eeprom+168;
+            serial=se->eeprom+196;
             break;
 
         case SFF_SFP_TYPE_SFP:
         default:
-            vendor=rv->eeprom+20;
-            model=rv->eeprom+40;
-            serial=rv->eeprom+68;
+            vendor=se->eeprom+20;
+            model=se->eeprom+40;
+            serial=se->eeprom+68;
             break;
         }
 
     /* handle NULL fields, they should actually be space-padded */
     const char *empty = "                ";
     if (*vendor) {
-        aim_strlcpy(rv->vendor, (char*)vendor, sizeof(rv->vendor));
-        make_printable__(rv->vendor);
+        aim_strlcpy(se->info.vendor, (char*)vendor, sizeof(se->info.vendor));
+        make_printable__(se->info.vendor);
     }
     else {
-        aim_strlcpy(rv->vendor, empty, 17);
+        aim_strlcpy(se->info.vendor, empty, 17);
     }
     if (*model) {
-        aim_strlcpy(rv->model, (char*)model, sizeof(rv->model));
-        make_printable__(rv->model);
+        aim_strlcpy(se->info.model, (char*)model, sizeof(se->info.model));
+        make_printable__(se->info.model);
     }
     else {
-        aim_strlcpy(rv->model, empty, 17);
+        aim_strlcpy(se->info.model, empty, 17);
     }
     if (*serial) {
-        aim_strlcpy(rv->serial, (char*)serial, sizeof(rv->serial));
-        make_printable__(rv->serial);
+        aim_strlcpy(se->info.serial, (char*)serial, sizeof(se->info.serial));
+        make_printable__(se->info.serial);
     }
     else {
-        aim_strlcpy(rv->serial, empty, 17);
+        aim_strlcpy(se->info.serial, empty, 17);
     }
 
-    rv->module_type = sff_module_type_get(rv->eeprom);
-    if(rv->module_type == SFF_MODULE_TYPE_INVALID) {
+    se->info.module_type = sff_module_type_get(se->eeprom);
+    if(se->info.module_type == SFF_MODULE_TYPE_INVALID) {
         AIM_LOG_ERROR("sff_info_init() failed: invalid module type");
         return -1;
     }
-    rv->module_type_name = sff_module_type_desc(rv->module_type);
 
-    rv->media_type = sff_media_type_get(rv->eeprom);
-    rv->media_type_name = sff_media_type_desc(rv->media_type);
-
-    if (sff_module_caps_get(rv->eeprom, &rv->caps) < 0) {
-        AIM_LOG_ERROR("sff_info_init() failed: invalid module caps");
+    if(sff_info_from_module_type(&se->info, se->info.sfp_type,
+                                 se->info.module_type) < 0) {
         return -1;
     }
 
     int aoc_length;
-    switch (rv->media_type) {
-    case SFF_MEDIA_TYPE_COPPER:
-        switch (rv->sfp_type) {
-        case SFF_SFP_TYPE_QSFP_PLUS:
-        case SFF_SFP_TYPE_QSFP28:
-            rv->length = rv->eeprom[146];
+    switch (se->info.media_type)
+        {
+        case SFF_MEDIA_TYPE_COPPER:
+            switch (se->info.sfp_type)
+                {
+                case SFF_SFP_TYPE_QSFP_PLUS:
+                case SFF_SFP_TYPE_QSFP28:
+                    se->info.length = se->eeprom[146];
+                    break;
+                case SFF_SFP_TYPE_SFP:
+                    se->info.length = se->eeprom[18];
+                    break;
+                default:
+                    se->info.length = -1;
+                    break;
+                }
             break;
-        case SFF_SFP_TYPE_SFP:
-            rv->length = rv->eeprom[18];
-            break;
-        default:
-            rv->length = -1;
-            break;
-        }
-        break;
-    case SFF_MEDIA_TYPE_FIBER:
-        switch (rv->sfp_type) {
-        case SFF_SFP_TYPE_QSFP28:
-            aoc_length = _sff8636_qsfp28_100g_aoc_length(rv->eeprom);
-            rv->length = aoc_length;
-            break;
-        case SFF_SFP_TYPE_QSFP_PLUS:
-        case SFF_SFP_TYPE_SFP:
-            aoc_length = _sff8436_qsfp_40g_aoc_length(rv->eeprom);
-            if (aoc_length < 0)
-                aoc_length = _sff8472_sfp_10g_aoc_length(rv->eeprom);
-            if (aoc_length > 0)
-                rv->length = aoc_length;
-            else
-                rv->length = -1;
-            break;
-        default:
-            rv->length = -1;
-            break;
-        }
-        break;
-    default:
-        rv->length = -1;
-    }
 
-    if(rv->length == -1) {
-        rv->length_desc[0] = 0;
+        case SFF_MEDIA_TYPE_FIBER:
+            switch (se->info.sfp_type)
+                {
+                case SFF_SFP_TYPE_QSFP28:
+                    aoc_length = _sff8636_qsfp28_100g_aoc_length(se->eeprom);
+                    se->info.length = aoc_length;
+                    break;
+                case SFF_SFP_TYPE_QSFP_PLUS:
+                case SFF_SFP_TYPE_SFP:
+                    aoc_length = _sff8436_qsfp_40g_aoc_length(se->eeprom);
+                    if (aoc_length < 0)
+                        aoc_length = _sff8472_sfp_10g_aoc_length(se->eeprom);
+                    if (aoc_length > 0)
+                        se->info.length = aoc_length;
+                    else
+                        se->info.length = -1;
+                    break;
+                default:
+                    se->info.length = -1;
+                    break;
+                }
+            break;
+        default:
+            se->info.length = -1;
+        }
+
+    if(se->info.length == -1) {
+        se->info.length_desc[0] = 0;
     }
     else {
-        SFF_SNPRINTF(rv->length_desc, sizeof(rv->length_desc), "%dm", rv->length);
+        SFF_SNPRINTF(se->info.length_desc, sizeof(se->info.length_desc), "%dm", se->info.length);
     }
-    rv->supported = 1;
+    se->identified = 1;
 
     return 0;
 }
 
+int
+sff_info_from_module_type(sff_info_t* info, sff_sfp_type_t st, sff_module_type_t mt)
+{
+    info->sfp_type = st;
+    info->sfp_type_name = sff_sfp_type_desc(st);
+
+    info->module_type = mt;
+    info->module_type_name = sff_module_type_desc(mt);
+
+    info->media_type = sff_media_type_get(mt);
+    info->media_type_name = sff_media_type_desc(info->media_type);
+
+    if (sff_module_caps_get(info->module_type, &info->caps) < 0) {
+        AIM_LOG_ERROR("sff_info_init() failed: invalid module caps");
+        return -1;
+    }
+    return 0;
+}
+
 void
 sff_info_show(sff_info_t* info, aim_pvs_t* pvs)
 {
@@ -499,20 +505,20 @@ sff_info_show(sff_info_t* info, aim_pvs_t* pvs)
 }
 
 int
-sff_info_init_file(sff_info_t* info, const char* fname)
+sff_eeprom_parse_file(sff_eeprom_t* se, const char* fname)
 {
     int rv;
     FILE* fp;
 
-    SFF_MEMSET(info, 0, sizeof(*info));
+    SFF_MEMSET(se, 0, sizeof(*se));
 
     if( (fp = fopen(fname, "r")) == NULL) {
         AIM_LOG_ERROR("Failed to open eeprom file %s: %{errno}");
         return -1;
     }
 
-    if( (rv = fread(info->eeprom, 1, 256, fp)) > 0) {
-        if( (rv=sff_info_init(info, NULL)) < 0) {
+    if( (rv = fread(se->eeprom, 1, 256, fp)) > 0) {
+        if( (rv=sff_eeprom_parse(se, NULL)) < 0) {
             AIM_LOG_ERROR("sff_init() failed on data from file %s: %d\n", fname, rv);
             rv = -1;
         }
@@ -526,53 +532,53 @@ sff_info_init_file(sff_info_t* info, const char* fname)
 }
 
 void
-sff_info_invalidate(sff_info_t *info)
+sff_eeprom_invalidate(sff_eeprom_t *se)
 {
-    memset(info->eeprom, 0xFF, 256);
-    info->cc_base = 0xFF;
-    info->cc_ext = 0xFF;
-    info->supported = 0;
+    memset(se->eeprom, 0xFF, 256);
+    se->cc_base = 0xFF;
+    se->cc_ext = 0xFF;
+    se->identified = 0;
 }
 
 int
-sff_info_valid(sff_info_t *info, int verbose)
+sff_eeprom_validate(sff_eeprom_t *se, int verbose)
 {
-    if (SFF8436_MODULE_QSFP_PLUS_V2(info->eeprom) ||
-        SFF8636_MODULE_QSFP28(info->eeprom)) {
+    if (SFF8436_MODULE_QSFP_PLUS_V2(se->eeprom) ||
+        SFF8636_MODULE_QSFP28(se->eeprom)) {
 
-        if (info->cc_base != info->eeprom[191]) {
+        if (se->cc_base != se->eeprom[191]) {
             if (verbose) {
-                AIM_LOG_ERROR("sff_info_valid() failed: invalid base QSFP checksum (0x%x should be 0x%x)",
-                              info->eeprom[191], info->cc_base);
+                AIM_LOG_ERROR("sff_eeprom_validate() failed: invalid base QSFP checksum (0x%x should be 0x%x)",
+                              se->eeprom[191], se->cc_base);
             }
             return 0;
         }
 
 #if SFF_CONFIG_INCLUDE_EXT_CC_CHECK == 1
-        if (info->cc_ext != info->eeprom[223]) {
+        if (se->cc_ext != se->eeprom[223]) {
             if (verbose) {
                 AIM_LOG_ERROR("sff_info_valid() failed: invalid extended QSFP checksum (0x%x should be 0x%x)",
-                              info->eeprom[223], info->cc_ext);
+                              se->eeprom[223], se->cc_ext);
             }
             return 0;
         }
 #endif
 
-    } else if (SFF8472_MODULE_SFP(info->eeprom)) {
+    } else if (SFF8472_MODULE_SFP(se->eeprom)) {
 
-        if (info->cc_base != info->eeprom[63]) {
+        if (se->cc_base != se->eeprom[63]) {
             if (verbose) {
                 AIM_LOG_ERROR("sff_info_valid() failed: invalid base SFP checksum (0x%x should be 0x%x)",
-                              info->eeprom[63], info->cc_base);
+                              se->eeprom[63], se->cc_base);
             }
             return 0;
         }
 
 #if SFF_CONFIG_INCLUDE_EXT_CC_CHECK == 1
-        if (info->cc_ext != info->eeprom[95]) {
+        if (se->cc_ext != se->eeprom[95]) {
             if (verbose) {
                 AIM_LOG_ERROR("sff_info_valid() failed: invalid extended SFP checksum (0x%x should be 0x%x)",
-                              info->eeprom[95], info->cc_ext);
+                              se->eeprom[95], se->cc_ext);
             }
             return 0;
         }
diff --git a/packages/base/any/onlp/src/sff/module/src/sff_config.c b/packages/base/any/onlp/src/sff/module/src/sff_config.c
index 1e448f3b..400b7a72 100644
--- a/packages/base/any/onlp/src/sff/module/src/sff_config.c
+++ b/packages/base/any/onlp/src/sff/module/src/sff_config.c
@@ -54,6 +54,11 @@ sff_config_settings_t sff_config_settings[] =
     { __sff_config_STRINGIFY_NAME(SFF_CONFIG_INCLUDE_EXT_CC_CHECK), __sff_config_STRINGIFY_VALUE(SFF_CONFIG_INCLUDE_EXT_CC_CHECK) },
 #else
 { SFF_CONFIG_INCLUDE_EXT_CC_CHECK(__sff_config_STRINGIFY_NAME), "__undefined__" },
+#endif
+#ifdef SFF_CONFIG_INCLUDE_DATABASE
+    { __sff_config_STRINGIFY_NAME(SFF_CONFIG_INCLUDE_DATABASE), __sff_config_STRINGIFY_VALUE(SFF_CONFIG_INCLUDE_DATABASE) },
+#else
+{ SFF_CONFIG_INCLUDE_DATABASE(__sff_config_STRINGIFY_NAME), "__undefined__" },
 #endif
     { NULL, NULL }
 };
diff --git a/packages/base/any/onlp/src/sff/module/src/sff_db.c b/packages/base/any/onlp/src/sff/module/src/sff_db.c
new file mode 100644
index 00000000..c6c0ae1e
--- /dev/null
+++ b/packages/base/any/onlp/src/sff/module/src/sff_db.c
@@ -0,0 +1,1468 @@
+/**************************************************************************//**
+ *
+ *
+ *
+ *****************************************************************************/
+#include <sff/sff_db.h>
+
+#define SFF_1G_BASE_SX_PROPERTIES                                       \
+    SFF_SFP_TYPE_SFP, "SFP", SFF_MODULE_TYPE_1G_BASE_SX, "1GBASE-SX", SFF_MEDIA_TYPE_FIBER, "Fiber", SFF_MODULE_CAPS_F_1G
+
+
+#define SFF_1G_BASE_LX_PROPERTIES                                       \
+    SFF_SFP_TYPE_SFP, "SFP", SFF_MODULE_TYPE_1G_BASE_LX, "1GBASE-LR", SFF_MEDIA_TYPE_FIBER, "Fiber", SFF_MODULE_CAPS_F_1G
+
+
+#define SFF_10G_BASE_CR_PROPERTIES                                      \
+    SFF_SFP_TYPE_SFP, "SFP", SFF_MODULE_TYPE_10G_BASE_CR, "10GBASE-CR", SFF_MEDIA_TYPE_COPPER, "Copper", SFF_MODULE_CAPS_F_10G
+
+
+#define SFF_10G_BASE_ZR_PROPERTIES                                      \
+    SFF_SFP_TYPE_SFP, "SFP", SFF_MODULE_TYPE_10G_BASE_ZR, "10GBASE-ZR", SFF_MEDIA_TYPE_FIBER, "Fiber", SFF_MODULE_CAPS_F_10G
+
+
+#define SFF_10G_BASE_SR_PROPERTIES                                      \
+    SFF_SFP_TYPE_SFP, "SFP", SFF_MODULE_TYPE_10G_BASE_SR, "10GBASE-SR", SFF_MEDIA_TYPE_FIBER, "Fiber",SFF_MODULE_CAPS_F_10G
+
+
+#define SFF_10G_BASE_SRL_PROPERTIES                                     \
+    SFF_SFP_TYPE_SFP, "SFP", SFF_MODULE_TYPE_10G_BASE_SRL, "1GBASE-SRL", SFF_MEDIA_TYPE_FIBER, "Fiber", SFF_MODULE_CAPS_F_10G
+
+
+#define SFF_40G_BASE_SR4_PROPERTIES                                     \
+    SFF_SFP_TYPE_QSFP_PLUS, "QSFP+", SFF_MODULE_TYPE_40G_BASE_SR4, "40GBASE-SR4", SFF_MEDIA_TYPE_FIBER, "Fiber", SFF_MODULE_CAPS_F_40G
+
+#define SFF_40G_BASE_LR4_PROPERTIES                                     \
+    SFF_SFP_TYPE_QSFP_PLUS, "QSFP+", SFF_MODULE_TYPE_40G_BASE_LR4, "40GBASE-LR4", SFF_MEDIA_TYPE_FIBER, "Fiber", SFF_MODULE_CAPS_F_40G
+
+#define SFF_40G_BASE_LM4_PROPERTIES                                     \
+    SFF_SFP_TYPE_QSFP_PLUS, "QSFP+", SFF_MODULE_TYPE_40G_BASE_LM4, "40GBASE-LM4", SFF_MEDIA_TYPE_FIBER, "Fiber", SFF_MODULE_CAPS_F_40G
+
+
+#define SFF_40G_BASE_CR4_PROPERTIES                                     \
+    SFF_SFP_TYPE_QSFP_PLUS, "QSFP+", SFF_MODULE_TYPE_40G_BASE_CR4, "40GBASE-CR4", SFF_MEDIA_TYPE_COPPER, "Copper", SFF_MODULE_CAPS_F_40G
+
+
+#define SFF_40G_BASE_SR2_PROPERTIES                                     \
+    SFF_SFP_TYPE_QSFP_PLUS, "QSFP+", SFF_MODULE_TYPE_40G_BASE_SR2, "40GBASE-SR2", SFF_MEDIA_TYPE_FIBER, "Fiber", SFF_MODULE_CAPS_F_40G
+
+#define SFF_100G_AOC_PROPERTIES                                         \
+    SFF_SFP_TYPE_QSFP28, "QSFP28", SFF_MODULE_TYPE_100G_AOC, "100G-AOC", SFF_MEDIA_TYPE_FIBER, "Fiber", SFF_MODULE_CAPS_F_100G
+
+#define SFF_100G_BASE_LR4_PROPERTIES                                    \
+    SFF_SFP_TYPE_QSFP28, "QSFP28", SFF_MODULE_TYPE_100G_BASE_LR4, "100GBASE-LR4", SFF_MEDIA_TYPE_FIBER, "Fiber", SFF_MODULE_CAPS_F_100G
+
+#define SFF_100G_BASE_SR4_PROPERTIES                                    \
+    SFF_SFP_TYPE_QSFP28, "QSFP28", SFF_MODULE_TYPE_100G_BASE_SR4, "100GBASE-SR4", SFF_MEDIA_TYPE_FIBER, "Fiber", SFF_MODULE_CAPS_F_100G
+
+#define SFF_100G_BASE_CR4_PROPERTIES                                    \
+    SFF_SFP_TYPE_QSFP28, "QSFP28", SFF_MODULE_TYPE_100G_BASE_CR4, "100GBASE-CR4", SFF_MEDIA_TYPE_COPPER, "Copper", SFF_MODULE_CAPS_F_100G
+
+#define SFF_100G_CWDM4_PROPERTIES                                       \
+    SFF_SFP_TYPE_QSFP28, "QSFP28", SFF_MODULE_TYPE_100G_CWDM4, "100G-CWDM4", SFF_MEDIA_TYPE_FIBER, "Fiber", SFF_MODULE_CAPS_F_100G
+
+static sff_db_entry_t sff_database__[] =
+    {
+
+#if SFF_CONFIG_INCLUDE_DATABASE == 1
+        {
+            {
+                .eeprom = {
+                    0x03, 0x04, 0x07, 0x00, 0x00, 0x00, 0x01, 0x20, 0x40, 0x0c, 0x05, 0x01, 0x15, 0x00, 0x00, 0x00,
+                    0x1e, 0x0f, 0x00, 0x00, 0x46, 0x49, 0x4e, 0x49, 0x53, 0x41, 0x52, 0x20, 0x43, 0x4f, 0x52, 0x50,
+                    0x2e, 0x20, 0x20, 0x20, 0x00, 0x00, 0x90, 0x65, 0x46, 0x54, 0x52, 0x4a, 0x38, 0x35, 0x31, 0x39,
+                    0x50, 0x31, 0x42, 0x4e, 0x4c, 0x20, 0x20, 0x20, 0x41, 0x20, 0x20, 0x20, 0x03, 0x52, 0x00, 0x66,
+                    0x00, 0x12, 0x00, 0x00, 0x50, 0x38, 0x4a, 0x32, 0x5a, 0x4e, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x30, 0x35, 0x31, 0x30, 0x33, 0x31, 0x20, 0x20, 0x58, 0x90, 0x01, 0x74,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                },
+                .info = {
+                    "FINISAR CORP.   ",
+                    "FTRJ8519P1BNL   ",
+                    "P8J2ZNC         ",
+                    SFF_1G_BASE_SX_PROPERTIES,
+                    -1,
+                }
+            },
+        },
+
+        {
+            {
+                .eeprom = {
+                    0x03, 0x04, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x67, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x01, 0x00, 0x41, 0x6d, 0x70, 0x68, 0x65, 0x6e, 0x6f, 0x6c, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x00, 0x41, 0x50, 0x48, 0x35, 0x37, 0x31, 0x35, 0x34, 0x30, 0x30, 0x30,
+                    0x37, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4b, 0x20, 0x20, 0x20, 0x01, 0x00, 0x00, 0xfa,
+                    0x00, 0x00, 0x00, 0x00, 0x41, 0x50, 0x46, 0x31, 0x30, 0x30, 0x38, 0x30, 0x30, 0x37, 0x30, 0x31,
+                    0x34, 0x37, 0x20, 0x20, 0x31, 0x30, 0x30, 0x33, 0x30, 0x32, 0x20, 0x20, 0x00, 0x00, 0x00, 0xa9,
+                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                },
+                .info = {
+                    "Amphenol        ",
+                    "571540007       ",
+                    "APF10080070147  ",
+                    SFF_10G_BASE_CR_PROPERTIES,
+                    0x1
+                },
+            },
+        },
+
+        {
+            {
+                .eeprom = {
+                    0x03, 0x04, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x67, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x01, 0x00, 0x43, 0x49, 0x53, 0x43, 0x4f, 0x2d, 0x4d, 0x4f, 0x4c, 0x45, 0x58, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x09, 0x3a, 0x37, 0x34, 0x37, 0x35, 0x32, 0x2d, 0x39, 0x35,
+                    0x31, 0x39, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x30, 0x38, 0x20, 0x20, 0x01, 0x00, 0x00, 0x11,
+                    0x00, 0x00, 0x00, 0x00, 0x4d, 0x4f, 0x43, 0x31, 0x35, 0x34, 0x37, 0x30, 0x30, 0x30, 0x48, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x31, 0x31, 0x31, 0x31, 0x32, 0x31, 0x20, 0x20, 0x00, 0x00, 0x00, 0x8f,
+                    0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x69, 0xf9, 0x8e, 0x5a,
+                    0x43, 0x4f, 0x50, 0x51, 0x41, 0x41, 0x34, 0x4a, 0x41, 0x42, 0x33, 0x37, 0x2d, 0x30, 0x39, 0x36,
+                    0x30, 0x2d, 0x30, 0x33, 0x56, 0x30, 0x33, 0x20, 0x01, 0x00, 0x46, 0x00, 0x00, 0x00, 0x00, 0xcc,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x53, 0x46, 0x50, 0x2d, 0x48, 0x31, 0x30, 0x47, 0x42, 0x2d, 0x43, 0x55, 0x31, 0x4d, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x30, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb3,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+                .info = {
+                    "CISCO-MOLEX     ",
+                    "74752-9519      ",
+                    "MOC1547000H     ",
+                    SFF_10G_BASE_CR_PROPERTIES,
+                    0x1,
+                },
+            },
+        },
+
+        {
+            {
+                .eeprom = {
+                    0x03, 0x04, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x67, 0x00, 0x00, 0x00,
+                    0x00, 0x01, 0x00, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x43, 0x39, 0x39, 0x39, 0x39, 0x2d, 0x31, 0x4d,
+                    0x2d, 0x50, 0x2d, 0x4c, 0x43, 0x20, 0x20, 0x20, 0x41, 0x20, 0x20, 0x20, 0x01, 0x00, 0x00, 0xa1,
+                    0x00, 0x00, 0x00, 0x00, 0x31, 0x33, 0x30, 0x35, 0x33, 0x30, 0x30, 0x30, 0x34, 0x31, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x31, 0x33, 0x30, 0x34, 0x31, 0x33, 0x20, 0x20, 0x00, 0x00, 0x00, 0x1d,
+                    0x00, 0x00, 0x11, 0xb6, 0x7f, 0x7f, 0x08, 0x96, 0xee, 0x8e, 0x60, 0x37, 0xb4, 0xc8, 0x8b, 0x88,
+                    0x66, 0x9c, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa3, 0xdd, 0x56, 0xe8,
+                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                },
+                .info = {
+                    "                ",
+                    "C9999-1M-P-LC   ",
+                    "1305300041      ",
+                    SFF_10G_BASE_CR_PROPERTIES,
+                    0x0,
+                }
+            },
+        },
+
+        {
+            {
+                .eeprom = {
+                    0x03, 0x04, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x67, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x03, 0x00, 0x43, 0x49, 0x53, 0x43, 0x4f, 0x2d, 0x4d, 0x4f, 0x4c, 0x45, 0x58, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x09, 0x3a, 0x37, 0x34, 0x37, 0x35, 0x32, 0x2d, 0x39, 0x35,
+                    0x32, 0x30, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x30, 0x38, 0x20, 0x20, 0x01, 0x00, 0x00, 0x0b,
+                    0x00, 0x00, 0x00, 0x00, 0x4d, 0x4f, 0x43, 0x31, 0x36, 0x30, 0x33, 0x30, 0x42, 0x48, 0x34, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x31, 0x32, 0x30, 0x31, 0x31, 0x39, 0x20, 0x20, 0x00, 0x00, 0x00, 0xa5,
+                    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0x04, 0x3b, 0x5b,
+                    0x43, 0x4f, 0x50, 0x51, 0x41, 0x41, 0x36, 0x4a, 0x41, 0x42, 0x33, 0x37, 0x2d, 0x30, 0x39, 0x36,
+                    0x31, 0x2d, 0x30, 0x33, 0x56, 0x30, 0x33, 0x20, 0x01, 0x00, 0x46, 0x00, 0x00, 0x00, 0x00, 0xcf,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x53, 0x46, 0x50, 0x2d, 0x48, 0x31, 0x30, 0x47, 0x42, 0x2d, 0x43, 0x55, 0x33, 0x4d, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x30, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb5,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+                .info = {
+                    "CISCO-MOLEX     ",
+                "74752-9520      ",
+                "MOC16030BH4     ",
+                SFF_10G_BASE_CR_PROPERTIES,
+                0x3
+                },
+            },
+        },
+
+        {
+            {
+                .eeprom = {
+                    0x00, 0x80, 0xfb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
+                    0x01, 0x0d, 0x33, 0x0c, 0xcb, 0x0c, 0xcb, 0x0d, 0x33, 0x1b, 0xd5, 0x1b, 0x54, 0x18, 0xcd, 0x1c,
+                    0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x01, 0x00, 0x03, 0x67, 0x00, 0x00, 0x00, 0x0a, 0x03, 0x00, 0x00, 0x4f, 0x45, 0x4d, 0x20, 0x20,
+                    0x0d, 0x00, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x67, 0x00, 0x00, 0x00,
+                    0x0a, 0x03, 0x00, 0x00, 0x4f, 0x45, 0x4d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x07, 0x00, 0x1e, 0x00, 0x51, 0x53, 0x46, 0x50, 0x2d, 0x34, 0x30, 0x47,
+                    0x2d, 0x53, 0x52, 0x34, 0x20, 0x20, 0x20, 0x20, 0x31, 0x41, 0x42, 0x68, 0x07, 0xd0, 0x46, 0x0c,
+                    0x00, 0x00, 0x00, 0xde, 0x41, 0x43, 0x52, 0x34, 0x30, 0x47, 0x30, 0x30, 0x34, 0x31, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x31, 0x32, 0x30, 0x38, 0x32, 0x37, 0x31, 0x39, 0x08, 0x00, 0x00, 0x8a,
+                    0x00, 0x00, 0x11, 0x9d, 0xf1, 0x68, 0x34, 0xac, 0xb2, 0x3d, 0xc6, 0x19, 0x53, 0x0b, 0xbf, 0xf0,
+                    0x2e, 0xe1, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf7, 0xfe, 0x58, 0x27,
+                },
+                .info = {
+                    "OEM             ",
+                "QSFP-40G-SR4    ",
+                "ACR40G0041      ",
+                SFF_40G_BASE_SR4_PROPERTIES,
+                -1,
+                },
+            },
+        },
+
+        {
+            {
+                .eeprom = {
+                    0x0d, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x0d, 0x00, 0x23, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x67, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x03, 0xa0, 0x41, 0x6d, 0x70, 0x68, 0x65, 0x6e, 0x6f, 0x6c, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x00, 0x78, 0xa7, 0x14, 0x36, 0x30, 0x33, 0x30, 0x32, 0x30, 0x30, 0x30,
+                    0x33, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x42, 0x20, 0x07, 0x0b, 0x00, 0x00, 0x46, 0x01,
+                    0x00, 0x00, 0x00, 0x00, 0x41, 0x50, 0x46, 0x31, 0x33, 0x30, 0x32, 0x30, 0x30, 0x33, 0x35, 0x41,
+                    0x52, 0x56, 0x20, 0x20, 0x31, 0x33, 0x30, 0x31, 0x31, 0x35, 0x20, 0x20, 0x00, 0x00, 0x00, 0xf9,
+                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                },
+                .info = {
+                    "Amphenol        ",
+                "603020003       ",
+                "APF13020035ARV  ",
+                SFF_40G_BASE_CR4_PROPERTIES,
+                0x3
+                },
+            },
+        },
+
+        {
+            {
+                .eeprom = {
+                    0x03, 0x04, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x67, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x01, 0x00, 0x46, 0x69, 0x62, 0x65, 0x72, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x40, 0x20, 0x31, 0x30, 0x47, 0x53, 0x46, 0x50, 0x2d, 0x50,
+                    0x43, 0x2d, 0x33, 0x30, 0x2d, 0x31, 0x20, 0x20, 0x41, 0x30, 0x20, 0x20, 0x00, 0x00, 0x00, 0xd9,
+                    0x00, 0x00, 0x00, 0x00, 0x46, 0x53, 0x34, 0x30, 0x32, 0x31, 0x32, 0x44, 0x30, 0x31, 0x37, 0x36,
+                    0x20, 0x20, 0x20, 0x20, 0x31, 0x34, 0x30, 0x32, 0x31, 0x33, 0x20, 0x20, 0x00, 0x00, 0x00, 0x8f,
+                    0x00, 0x00, 0x11, 0x4b, 0xd4, 0xe4, 0xc5, 0x99, 0xd1, 0xfb, 0xdb, 0x5e, 0xa2, 0xc4, 0x62, 0x0c,
+                    0xf2, 0x5b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x26, 0x26, 0xfa, 0x99,
+                    0x43, 0x4f, 0x50, 0x51, 0x41, 0x41, 0x34, 0x4a, 0x41, 0x41, 0x33, 0x37, 0x2d, 0x30, 0x39, 0x36,
+                    0x30, 0x2d, 0x30, 0x32, 0x56, 0x30, 0x32, 0x20, 0x01, 0x00, 0x46, 0x00, 0x00, 0x00, 0x00, 0xc9,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x53, 0x46, 0x50, 0x2d, 0x48, 0x31, 0x30, 0x47, 0x42, 0x2d, 0x43, 0x55, 0x31, 0x4d, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x30, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb3,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+                                .info = {
+"FiberStore      ",
+                "10GSFP-PC-30-1  ",
+                "FS40212D0176    ",
+                SFF_10G_BASE_CR_PROPERTIES,
+                0x1,
+                },
+            },
+        },
+
+        {
+            {
+                .eeprom = {
+                    0x03, 0x04, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x01, 0x00, 0x06, 0x67, 0x00, 0x50, 0xff,
+                    0x00, 0x00, 0x00, 0x00, 0x46, 0x49, 0x4e, 0x49, 0x53, 0x41, 0x52, 0x20, 0x43, 0x4f, 0x52, 0x50,
+                    0x2e, 0x20, 0x20, 0x20, 0x00, 0x00, 0x90, 0x65, 0x46, 0x54, 0x4c, 0x58, 0x31, 0x38, 0x37, 0x31,
+                    0x4d, 0x33, 0x42, 0x43, 0x4c, 0x20, 0x20, 0x20, 0x41, 0x20, 0x20, 0x20, 0x06, 0x0e, 0x00, 0x33,
+                    0x06, 0x1a, 0x00, 0x00, 0x55, 0x50, 0x47, 0x30, 0x31, 0x57, 0x4a, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x31, 0x33, 0x30, 0x34, 0x32, 0x39, 0x20, 0x20, 0x68, 0xf0, 0x05, 0xfe,
+                    0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+                .info = {
+                "FINISAR CORP.   ",
+                "FTLX1871M3BCL   ",
+                "UPG01WJ         ",
+                SFF_10G_BASE_ZR_PROPERTIES,
+                -1,
+                },
+            },
+        },
+
+        {
+            {
+                .eeprom = {
+                    0x03, 0x04, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x67, 0x00, 0x00, 0x00,
+                    0x03, 0x01, 0x00, 0x0a, 0x46, 0x49, 0x4e, 0x49, 0x53, 0x41, 0x52, 0x20, 0x43, 0x4f, 0x52, 0x50,
+                    0x2e, 0x20, 0x20, 0x20, 0x00, 0x00, 0x90, 0x65, 0x46, 0x54, 0x4c, 0x58, 0x38, 0x35, 0x37, 0x30,
+                    0x44, 0x33, 0x42, 0x43, 0x4c, 0x20, 0x20, 0x20, 0x41, 0x20, 0x20, 0x20, 0x03, 0x52, 0x00, 0x1c,
+                    0x00, 0x1a, 0x00, 0x00, 0x50, 0x50, 0x34, 0x34, 0x51, 0x56, 0x31, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x31, 0x33, 0x30, 0x32, 0x31, 0x37, 0x20, 0x20, 0x68, 0xf0, 0x03, 0xe3,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+                .info = {
+                "FINISAR CORP.   ",
+                "FTLX8570D3BCL   ",
+                "PP44QV1         ",
+                SFF_10G_BASE_SRL_PROPERTIES,
+                -1,
+                },
+            },
+        },
+
+        {
+            {
+                .eeprom = {
+                    0x03, 0x04, 0x07, 0x00, 0x00, 0x00, 0x02, 0x12, 0x10, 0x01, 0x05, 0x01, 0x15, 0x00, 0x0a, 0x64,
+                    0x00, 0x00, 0x00, 0x00, 0x46, 0x49, 0x4e, 0x49, 0x53, 0x41, 0x52, 0x20, 0x43, 0x4f, 0x52, 0x50,
+                    0x2e, 0x20, 0x20, 0x20, 0x00, 0x00, 0x90, 0x65, 0x46, 0x54, 0x52, 0x4a, 0x31, 0x33, 0x31, 0x39,
+                    0x50, 0x31, 0x42, 0x54, 0x4c, 0x2d, 0x4d, 0x44, 0x41, 0x20, 0x20, 0x20, 0x05, 0x1e, 0x00, 0x88,
+                    0x00, 0x1a, 0x00, 0x00, 0x50, 0x44, 0x42, 0x31, 0x56, 0x51, 0x55, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x30, 0x38, 0x30, 0x33, 0x31, 0x37, 0x20, 0x20, 0x68, 0xb0, 0x01, 0xc9,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                },
+                .info = {
+"FINISAR CORP.   ",
+                "FTRJ1319P1BTL-MD",
+                "PDB1VQU         ",
+                SFF_1G_BASE_LX_PROPERTIES,
+                -1,
+                },
+            },
+        },
+
+        {
+            {
+                .eeprom = {
+                    0x03, 0x04, 0x21, 0x81, 0x00, 0x00, 0x04, 0x41, 0x04, 0x80, 0xd5, 0x00, 0x67, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x01, 0x00, 0x54, 0x79, 0x63, 0x6f, 0x20, 0x45, 0x6c, 0x65, 0x63, 0x74, 0x72, 0x6f,
+                    0x6e, 0x69, 0x63, 0x73, 0x00, 0x00, 0x40, 0x20, 0x32, 0x31, 0x30, 0x30, 0x38, 0x37, 0x30, 0x2d,
+                    0x31, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x41, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x8a,
+                    0x00, 0x00, 0x00, 0x00, 0x30, 0x39, 0x33, 0x35, 0x45, 0x30, 0x34, 0x38, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x31, 0x30, 0x30, 0x35, 0x30, 0x39, 0x30, 0x30, 0x00, 0x00, 0x00, 0x41,
+                    0x37, 0x34, 0x30, 0x2d, 0x30, 0x33, 0x30, 0x30, 0x37, 0x36, 0x20, 0x52, 0x45, 0x56, 0x20, 0x30,
+                    0x31, 0x20, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                },
+                .info = {
+                "Tyco Electronics",
+                "2100870-1       ",
+                "0935E048        ",
+                SFF_10G_BASE_CR_PROPERTIES,
+                1,
+                },
+            },
+        },
+
+        {
+            {
+                .eeprom = {
+                    /*   0 */ 0x0d, 0x00, 0x02, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /*  16 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /*  32 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /*  48 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /*  64 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /*  80 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /*  96 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 112 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 128 */ 0x0d, 0xdc, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xce, 0x00, 0x00, 0x32,
+                    /* 144 */ 0x00, 0x00, 0x00, 0x00, 0x43, 0x49, 0x53, 0x43, 0x4f, 0x2d, 0x41, 0x56, 0x41, 0x47, 0x4f, 0x20,
+                    /* 160 */ 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x17, 0x6a, 0x41, 0x46, 0x42, 0x52, 0x2d, 0x37, 0x39, 0x45,
+                    /* 176 */ 0x42, 0x50, 0x5a, 0x2d, 0x43, 0x53, 0x31, 0x20, 0x30, 0x31, 0x42, 0x68, 0x07, 0xd0, 0x46, 0x47,
+                    /* 192 */ 0x00, 0x00, 0x0f, 0xde, 0x41, 0x56, 0x4d, 0x31, 0x38, 0x30, 0x39, 0x53, 0x30, 0x54, 0x47, 0x20,
+                    /* 208 */ 0x20, 0x20, 0x20, 0x20, 0x31, 0x34, 0x30, 0x32, 0x32, 0x35, 0x20, 0x20, 0x08, 0x00, 0xf5, 0xcc,
+                    /* 224 */ 0xf5, 0x00, 0x06, 0xd2, 0x04, 0x9c, 0x47, 0x09, 0xc5, 0xaf, 0xcf, 0xb7, 0x65, 0xd9, 0x72, 0x03,
+                    /* 240 */ 0xea, 0x59, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x45, 0xbd, 0x94,
+                },
+                                .info = {
+"CISCO-AVAGO     ",
+                "AFBR-79EBPZ-CS1 ",
+                "AVM1809S0TG     ",
+                SFF_40G_BASE_SR2_PROPERTIES,
+                -1,
+                },
+            },
+        },
+        /* Cisco/Finisar 40G QSFP (QuadWire? AOC? Pigtail?) */
+        {
+            {
+                .eeprom = {
+                    /* 0x0000 */ 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x0010 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0xde, 0x00, 0x00, 0x7f, 0x4d, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x0020 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x0030 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x0040 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x0050 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x0060 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x0070 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
+                    /* 0x0080 */ 0x0d, 0x10, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x67, 0x00, 0x00, 0x32,
+                    /* 0x0090 */ 0x1e, 0x00, 0x0a, 0x00, 0x43, 0x49, 0x53, 0x43, 0x4f, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    /* 0x00a0 */ 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x90, 0x65, 0x46, 0x43, 0x42, 0x4e, 0x34, 0x31, 0x30, 0x51,
+                    /* 0x00b0 */ 0x45, 0x32, 0x43, 0x31, 0x30, 0x2d, 0x43, 0x31, 0x41, 0x20, 0x42, 0x68, 0x07, 0xd0, 0x46, 0xaf,
+                    /* 0x00c0 */ 0x00, 0x01, 0x04, 0xd8, 0x46, 0x49, 0x53, 0x31, 0x37, 0x33, 0x31, 0x30, 0x30, 0x35, 0x33, 0x2d,
+                    /* 0x00d0 */ 0x41, 0x20, 0x20, 0x20, 0x31, 0x33, 0x30, 0x37, 0x33, 0x31, 0x20, 0x20, 0x0a, 0x00, 0xf6, 0x90,
+                    /* 0x00e0 */ 0x00, 0x00, 0x02, 0x43, 0x59, 0xd3, 0x68, 0x03, 0x46, 0x83, 0x87, 0x75, 0x1f, 0xee, 0x94, 0x62,
+                    /* 0x00f0 */ 0xb8, 0x98, 0xf5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x5e, 0x75, 0x43,
+                },
+                .info = {
+                "CISCO           ",
+                "FCBN410QE2C10-C1",
+                "FIS17310053-A   ",
+                SFF_40G_BASE_SR4_PROPERTIES,
+                -1,
+                },
+            },
+        },
+        /*
+         * Dell/Amphenol 3M copper
+         * Identifies as intra-enclosure and inter-enclosure
+         */
+        {
+            {
+                .eeprom = {
+                    /* 0000 */ 0x03, 0x04, 0x21, 0x01, 0x00, 0x00, 0x00, 0x41, 0x84, 0x80, 0x55, 0x00, 0x67, 0x00, 0x00, 0x00,
+                    /* 0010 */ 0x00, 0x00, 0x03, 0x00, 0x41, 0x6d, 0x70, 0x68, 0x65, 0x6e, 0x6f, 0x6c, 0x20, 0x20, 0x20, 0x20,
+                    /* 0020 */ 0x20, 0x20, 0x20, 0x20, 0x00, 0x78, 0xa7, 0x14, 0x36, 0x31, 0x36, 0x37, 0x34, 0x30, 0x30, 0x30,
+                    /* 0030 */ 0x33, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x43, 0x20, 0x20, 0x20, 0x01, 0x00, 0x00, 0xe3,
+                    /* 0040 */ 0x00, 0x00, 0x00, 0x00, 0x43, 0x4e, 0x30, 0x35, 0x33, 0x48, 0x56, 0x4e, 0x34, 0x34, 0x4c, 0x38,
+                    /* 0050 */ 0x37, 0x59, 0x59, 0x20, 0x31, 0x34, 0x30, 0x34, 0x32, 0x33, 0x20, 0x20, 0x00, 0x00, 0x00, 0x78,
+                    /* 0060 */ 0x0f, 0x10, 0x00, 0xa3, 0x71, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    /* 0070 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    /* 0080 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    /* 0090 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    /* 00a0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    /* 00b0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    /* 00c0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    /* 00d0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    /* 00e0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    /* 00f0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                },
+                .info = {
+                "Amphenol        ",
+                "616740003       ",
+                "CN053HVN44L87YY ",
+                SFF_10G_BASE_CR_PROPERTIES,
+                3,
+                },
+            },
+        },
+        /*
+         * Dell/Amphenol 3M copper
+         * Identifies as intra-enclosure and inter-enclosure
+         */
+        {
+            {
+                .eeprom = {
+                    /* 0x0000 */ 0x03, 0x04, 0x21, 0x02, 0x00, 0x00, 0x04, 0x41, 0x84, 0x80, 0xd5, 0x00, 0x67, 0x00, 0x00, 0x00,
+                    /* 0x0010 */ 0x00, 0x00, 0x03, 0x00, 0x33, 0x4d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    /* 0x0020 */ 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x31, 0x34, 0x31, 0x30, 0x2d, 0x50, 0x31, 0x37,
+                    /* 0x0030 */ 0x2d, 0x30, 0x30, 0x2d, 0x33, 0x2e, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x1c,
+                    /* 0x0040 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x0050 */ 0x00, 0x00, 0x00, 0x00, 0x31, 0x32, 0x30, 0x32, 0x32, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28,
+                    /* 0x0060 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x0070 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x0080 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x0090 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x00a0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x00b0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x00c0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x00d0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x00e0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x00f0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+                .info = {
+                "3M              ",
+                "1410-P17-00-3.00",
+                /* XXX roth -- NULL serial number ??!??111! */
+                "                ",
+                SFF_10G_BASE_CR_PROPERTIES,
+                3,
+                },
+            },
+        },
+        {
+            {
+                .eeprom = {
+                    0x0d, 0x03, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,
+                    0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x14, 0x21, 0x00, 0x00, 0x83, 0x2c, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x0a, 0x12, 0x48, 0x12, 0x48, 0x12, 0x48, 0x12, 0x48,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x00,
+                    0x0c, 0x04, 0x00, 0x00, 0x00, 0x40, 0x40, 0x06, 0x00, 0x05,
+                    0x64, 0x00, 0x00, 0x32, 0x1e, 0x00, 0x00, 0x00, 0x45, 0x64,
+                    0x67, 0x65, 0x2d, 0x63, 0x6f, 0x72, 0x45, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x04, 0x70, 0x72, 0xcf, 0x4d, 0x30,
+                    0x4f, 0x45, 0x43, 0x36, 0x34, 0x30, 0x31, 0x54, 0x30, 0x30,
+                    0x5a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x42, 0x68, 0x07, 0xd0,
+                    0x46, 0xb0, 0x00, 0x00, 0x00, 0x12, 0x31, 0x45, 0x37, 0x51,
+                    0x54, 0x30, 0x30, 0x30, 0x33, 0x30, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x31, 0x34, 0x30, 0x37, 0x32, 0x38, 0x20, 0x20,
+                    0x08, 0x00, 0x00, 0x95, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+                .info = {
+                "Edge-corE       ",
+                "M0OEC6401T00Z   ",
+                "1E7QT00030      ",
+                SFF_40G_BASE_SR4_PROPERTIES,
+                -1,
+                },
+            }
+        },
+        {
+            {
+                .eeprom = {
+                    0x0d, 0x03, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,
+                    0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x0e, 0x30, 0x00, 0x00, 0x82, 0xa2, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x12, 0x48, 0x12, 0x48, 0x12, 0x48, 0x12, 0x48,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x00,
+                    0x0c, 0x04, 0x00, 0x00, 0x00, 0x40, 0x40, 0x06, 0x00, 0x05,
+                    0x64, 0x00, 0x00, 0x32, 0x1e, 0x00, 0x00, 0x00, 0x45, 0x64,
+                    0x67, 0x65, 0x2d, 0x63, 0x6f, 0x72, 0x45, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x04, 0x70, 0x72, 0xcf, 0x4d, 0x30,
+                    0x4f, 0x45, 0x43, 0x36, 0x34, 0x30, 0x31, 0x54, 0x30, 0x30,
+                    0x5a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x42, 0x68, 0x07, 0xd0,
+                    0x46, 0xb0, 0x00, 0x00, 0x00, 0x12, 0x31, 0x45, 0x37, 0x51,
+                    0x54, 0x30, 0x30, 0x30, 0x32, 0x38, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x31, 0x34, 0x30, 0x37, 0x32, 0x38, 0x20, 0x20,
+                    0x08, 0x00, 0x00, 0x9c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                },
+                .info = {
+                "Edge-corE       ",
+                "M0OEC6401T00Z   ",
+                "1E7QT00028      ",
+                SFF_40G_BASE_SR4_PROPERTIES,
+                -1,
+                },
+            }
+        },
+        {
+            {
+                .eeprom = {
+                    0x0d, 0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x17, 0x9f, 0x00, 0x00, 0x80, 0x29, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x44, 0xd5, 0x44, 0x3a, 0x48, 0xb1,
+                    0x4d, 0x30, 0x12, 0x48, 0x12, 0x48, 0x12, 0x48, 0x12, 0x48,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x8c,
+                    0x23, 0x04, 0x00, 0x00, 0x01, 0x40, 0x40, 0x02, 0x00, 0x05,
+                    0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x46, 0x4f,
+                    0x52, 0x4d, 0x45, 0x52, 0x49, 0x43, 0x41, 0x4f, 0x45, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x04, 0x00, 0x00, 0x00, 0x54, 0x51,
+                    0x53, 0x2d, 0x51, 0x31, 0x4c, 0x48, 0x38, 0x2d, 0x58, 0x43,
+                    0x41, 0x31, 0x30, 0x20, 0x00, 0x00, 0x42, 0x68, 0x07, 0xd0,
+                    0x46, 0x4a, 0x00, 0x00, 0x05, 0x31, 0x39, 0x31, 0x33, 0x33,
+                    0x32, 0x4c, 0x30, 0x30, 0x30, 0x31, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x31, 0x33, 0x30, 0x38, 0x30, 0x36, 0x20, 0x20,
+                    0x08, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xef,
+                    0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xf7, 0xf7, 0xf7,
+                    0xf7, 0xf7, 0xf7, 0xf7, 0xfe, 0xfe,
+                },
+                .info = {
+                "FORMERICAOE     ",
+                "TQS-Q1LH8-XCA10 ",
+                "91332L0001      ",
+                SFF_40G_BASE_SR4_PROPERTIES,
+                10,
+                },
+            },
+        },
+
+        {
+            {
+                .eeprom = {
+                    /* 0x0000 */ 0x03, 0x04, 0x21, 0x00, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x06, 0x67, 0x00, 0x00, 0x00,
+                    /*
+                     *                       ^^^^ copper pigtail
+                     *
+                     *                             ^^^^ no 10G or IB codes
+                     *
+                     *                                   ^^^^  ^^^^ no SONET (fiber)
+                     *
+                     *  identifies as 1000BASE-CX                    ^^^^
+                     *
+                     *  no FC length code                                  ^^^^
+                     *
+                     *  identifies as SFP+ passive                               ^^^^
+                     *
+                     *  no FC media, copper or otherwise                               ^^^^
+                     *
+                     *  no FC speed                                                          ^^^^
+                     *
+                     *  nominal bitrate 0x67 --> 10.3GB                                            ^^^^
+                     */
+                    /* 0x0010 */ 0x00, 0x00, 0x03, 0x00, 0x49, 0x42, 0x4d, 0x2d, 0x41, 0x6d, 0x70, 0x68, 0x65, 0x6e, 0x6f, 0x6c,
+                    /*
+                     *                       ^^^^  copper cable length (3m)
+                     */
+                    /* 0x0020 */ 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x17, 0xef, 0x39, 0x30, 0x59, 0x39, 0x34, 0x32, 0x38, 0x2d,
+                    /* 0x0030 */ 0x4e, 0x32, 0x38, 0x35, 0x30, 0x30, 0x41, 0x20, 0x46, 0x20, 0x20, 0x20, 0x01, 0x00, 0x00, 0x7a,
+                    /* 0x0040 */ 0x00, 0x00, 0x00, 0x00, 0x59, 0x33, 0x35, 0x30, 0x56, 0x54, 0x32, 0x42, 0x52, 0x31, 0x46, 0x47,
+                    /* 0x0050 */ 0x20, 0x20, 0x20, 0x20, 0x31, 0x32, 0x31, 0x31, 0x32, 0x37, 0x20, 0x20, 0x00, 0x00, 0x00, 0x0d,
+                    /* 0x0060 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    /* 0x0070 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    /* 0x0080 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    /* 0x0090 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    /* 0x00a0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    /* 0x00b0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    /* 0x00c0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    /* 0x00d0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    /* 0x00e0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    /* 0x00f0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                },
+                .info = {
+"IBM-Amphenol    ",
+                "90Y9428-N28500A ",
+                "Y350VT2BR1FG    ",
+                SFF_10G_BASE_CR_PROPERTIES,
+                3,
+                },
+            },
+        },
+        {
+            /* Verify string normalization for unprintable characters in the vendor, model, or serial number fields. */
+            {
+                {
+                    /* 0x0000 */ 0x03, 0x04, 0x21, 0x00, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x06, 0x67, 0x00, 0x00, 0x00,
+                    /* 0x0010 */ 0x00, 0x00, 0x03, 0x00, 0x49, 0x42, 0x4d, 0x2d, 0x41, 0x6d, 0x70, 0x68, 0x65, 0x6e, 0x6f, 0x6c,
+                    /* 0x0020 */ 0xF0, 0xF0, 0xF0, 0xF0, 0x00, 0x00, 0x17, 0xef, 0x39, 0x30, 0x59, 0x39, 0x34, 0x32, 0x38, 0xFd,
+                    /* 0x0030 */ 0x4e, 0x32, 0x38, 0x35, 0x30, 0x30, 0x41, 0x20, 0x46, 0x20, 0x20, 0x20, 0x01, 0x00, 0x00, 0x8a,
+                    /* 0x0040 */ 0x00, 0x00, 0x00, 0x00, 0x59, 0x33, 0xF5, 0xF0, 0x56, 0x54, 0x32, 0x42, 0x52, 0x31, 0x46, 0x47,
+                    /* 0x0050 */ 0x20, 0x20, 0x20, 0x20, 0x31, 0x32, 0x31, 0x31, 0x32, 0x37, 0x20, 0x20, 0x00, 0x00, 0x00, 0x8d,
+                    /* 0x0060 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    /* 0x0070 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    /* 0x0080 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    /* 0x0090 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    /* 0x00a0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    /* 0x00b0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    /* 0x00c0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    /* 0x00d0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    /* 0x00e0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    /* 0x00f0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                },
+                .info = {
+                "IBM-Amphenol????",
+                "90Y9428?N28500A ",
+                "Y3??VT2BR1FG    ",
+                SFF_10G_BASE_CR_PROPERTIES,
+                3,
+                },
+            },
+        },
+        {
+            /*
+             * Finisar 40G AOC breakout cable
+             */
+            {
+                {
+                    /* 0x0000 */ 0x0d, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x0010 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x9f, 0x00, 0x00, 0x80, 0xc2, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x0020 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x0030 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x0040 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x0050 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x0060 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x0070 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
+
+                    /* 0x0080 */ 0x0d, 0x10, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x67, 0x00, 0x00, 0x00,
+                    /*
+                     *           ^^^^ QSFP+
+                     *
+                     *                       ^^^^ no separable connector (active?)
+                     *
+                     *                             ^^^^^ no media compliance (*NOT* 40G active)
+                     *
+                     *                                   ^^^^ no SONET compliance
+                     *
+                     *                                         ^^^^ no SAS compliance
+                     *
+                     *                                               ^^^^ no GbE compliance
+                     *
+                     *                                                     ^^^^  ^^^^ no FC compliance
+                     *
+                     *                                                                 ^^^^ no FC media
+                     *
+                     *                                                                       ^^^^ no FC speed
+                     *
+                     *                                                                             ^^^^ 64b66b
+                     *
+                     *                                                                                   ^^^^ nominal BR >= 10G
+                     *                                                                           no SM or OM3 length ^^^^  ^^^^
+                     */
+                    /* 0x0090 */ 0x00, 0x00, 0x03, 0x00, 0x46, 0x49, 0x4e, 0x49, 0x53, 0x41, 0x52, 0x20, 0x43, 0x4f, 0x52, 0x50,
+                    /*
+                     *           ^^^^  ^^^^ no OM1 or OM2 length
+                     *
+                     *                       ^^^^ 3M cable (copper or active)
+                     */
+                    /* 0x00a0 */ 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x90, 0x65, 0x46, 0x43, 0x42, 0x4e, 0x35, 0x31, 0x30, 0x51,
+                    /* 0x00b0 */ 0x45, 0x32, 0x43, 0x30, 0x33, 0x20, 0x20, 0x20, 0x41, 0x20, 0x42, 0x68, 0x07, 0xd0, 0x46, 0x29,
+                    /*
+                     *                                                                       ^^^^  ^^^^ 850nm
+                     */
+                    /* 0x00c0 */ 0x00, 0x01, 0x04, 0xd8, 0x44, 0x53, 0x4b, 0x30, 0x34, 0x56, 0x52, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    /* 0x00d0 */ 0x20, 0x20, 0x20, 0x20, 0x31, 0x34, 0x31, 0x31, 0x30, 0x34, 0x20, 0x20, 0x08, 0x00, 0xf6, 0x54,
+                    /* 0x00e0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x00f0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+                .info = {
+                "FINISAR CORP    ",
+                "FCBN510QE2C03   ",
+                "DSK04VR         ",
+                SFF_40G_BASE_SR4_PROPERTIES,
+                3,
+                },
+            },
+        },
+        {
+            /*
+             * Finisar 40G AOC breakout cable, 10G end
+             */
+            {
+                {
+                    /* 0x0000 */ 0x03, 0x04, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x06, 0x67, 0x00, 0x00, 0x00,
+                    /*
+                     *           ^^^^ SFP+
+                     *
+                     *                       ^^^^ copper pigtail (ugh)
+                     *
+                     *                             ^^^^ no 10G or IF compliance
+                     *
+                     *                                   ^^^^ no SONET compliance
+                     *
+                     *                                         ^^^^ no OC length spec
+                     *
+                     *                                               ^^^^ no ethernet compliance
+                     *
+                     *                                                     ^^^^ no FC length or tech
+                     *
+                     *                                                           ^^^^ active cable, no FC tech
+                     *
+                     *                                                                 ^^^^ no FC media
+                     *
+                     *                                                                       ^^^^ no FC speed
+                     *
+                     *                                                                             ^^^^ 64/66 encoding
+                     *
+                     *                                                                 nominal BR >= 10G ^^^^
+                     *
+                     *                                                                                 no SM length  ^^^^  ^^^^
+                     */
+                    /* 0x0010 */ 0x00, 0x00, 0x01, 0x00, 0x46, 0x49, 0x4e, 0x49, 0x53, 0x41, 0x52, 0x20, 0x43, 0x4f, 0x52, 0x50,
+                    /*
+                     *           ^^^^  ^^^^ no MM length
+                     *
+                     *                       ^^^^ active/copper length 1m
+                     *
+                     *                             ^^^^ no OM3 length
+                     *
+                     */
+                    /* 0x0020 */ 0x2e, 0x20, 0x20, 0x20, 0x00, 0x00, 0x90, 0x65, 0x46, 0x43, 0x42, 0x4e, 0x35, 0x31, 0x30, 0x51,
+                    /* 0x0030 */ 0x45, 0x32, 0x43, 0x30, 0x31, 0x20, 0x20, 0x20, 0x41, 0x20, 0x20, 0x20, 0x0c, 0x00, 0x00, 0xa9,
+                    /*
+                     *                                                 compliant with FC or SFF limiting ^^^^  ^^^^
+                     */
+                    /* 0x0040 */ 0x00, 0x12, 0x00, 0x00, 0x44, 0x53, 0x4a, 0x30, 0x35, 0x39, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    /* 0x0050 */ 0x20, 0x20, 0x20, 0x20, 0x31, 0x34, 0x31, 0x30, 0x33, 0x30, 0x20, 0x20, 0x00, 0x00, 0x05, 0x72,
+                    /* 0x0060 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x0070 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x0080 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x0090 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x00a0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x00b0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x00c0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x00d0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x00e0 */ 0x00, 0x7f, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    /* 0x00f0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00,
+                },
+                .info = {
+                "FINISAR CORP.   ",
+                "FCBN510QE2C01   ",
+                "DSJ059S         ",
+                SFF_10G_BASE_SR_PROPERTIES,
+                1,
+                },
+            },
+        },
+
+
+        {
+            {
+                .eeprom = {
+                    0x0d, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x0d, 0x00, 0x23, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x01, 0xa0, 0x33, 0x4d, 0x20, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x6e, 0x79, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x07, 0x08, 0x00, 0x21, 0x39, 0x51, 0x41, 0x30, 0x2d, 0x31, 0x31, 0x31,
+                    0x2d, 0x31, 0x32, 0x2d, 0x31, 0x2e, 0x30, 0x30, 0x30, 0x31, 0x03, 0x05, 0x06, 0x0c, 0x00, 0x56,
+                    0x00, 0x00, 0x00, 0x00, 0x56, 0x31, 0x30, 0x45, 0x42, 0x30, 0x38, 0x35, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x31, 0x35, 0x31, 0x31, 0x31, 0x30, 0x20, 0x20, 0x00, 0x00, 0x00, 0x44,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+                .info = {
+                "3M Company      ",
+                "9QA0-111-12-1.00",
+                "V10EB085        ",
+                SFF_40G_BASE_CR4_PROPERTIES,
+                1,
+                },
+            },
+        },
+        {
+            {
+                .eeprom = {
+                    0x11, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1d, 0x4f, 0x00, 0x00, 0x7f, 0x3d, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x1b, 0x19, 0x1c, 0x87, 0x1a, 0x7c, 0x1b, 0xdd, 0x0e, 0xed, 0x0e, 0xd1, 0x0e, 0xcc,
+                    0x0f, 0xe8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x11, 0xcc, 0x23, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xff, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x03, 0x00, 0x46, 0x49, 0x4e, 0x49, 0x53, 0x41, 0x52, 0x20, 0x43, 0x4f, 0x52, 0x50,
+                    0x20, 0x20, 0x20, 0x20, 0x1f, 0x00, 0x90, 0x65, 0x46, 0x43, 0x42, 0x4e, 0x34, 0x32, 0x35, 0x51,
+                    0x42, 0x31, 0x43, 0x30, 0x33, 0x20, 0x20, 0x20, 0x41, 0x31, 0x00, 0x00, 0x00, 0x00, 0x46, 0xb1,
+                    0x01, 0x07, 0xff, 0xde, 0x44, 0x55, 0x48, 0x30, 0x30, 0x32, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x31, 0x35, 0x31, 0x30, 0x32, 0x31, 0x20, 0x20, 0x08, 0x00, 0x67, 0x94,
+                    0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+                .info = {
+                "FINISAR CORP    ",
+                "FCBN425QB1C03   ",
+                "DUH002C         ",
+                SFF_100G_AOC_PROPERTIES,
+                3,
+                },
+            },
+        },
+        {
+            {
+                .eeprom = {
+                    0x0d, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x4f, 0x00, 0x00, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x07, 0xd7, 0x06, 0x55, 0x06, 0x41, 0x07, 0xab, 0x4b, 0x1d, 0x45, 0x55, 0x48, 0x45,
+                    0x44, 0x4a, 0x1f, 0x02, 0x2f, 0x75, 0x32, 0x82, 0x37, 0x4e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
+                    0x0d, 0xc0, 0x07, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x67, 0x00, 0x0a, 0x00,
+                    0x00, 0x00, 0x00, 0x40, 0x46, 0x49, 0x4e, 0x49, 0x53, 0x41, 0x52, 0x20, 0x43, 0x4f, 0x52, 0x50,
+                    0x2e, 0x20, 0x20, 0x20, 0x00, 0x00, 0x90, 0x65, 0x46, 0x54, 0x4c, 0x34, 0x43, 0x31, 0x51, 0x45,
+                    0x31, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x41, 0x31, 0x65, 0xa4, 0x05, 0x14, 0x46, 0xa1,
+                    0x00, 0x01, 0x0c, 0xd8, 0x55, 0x51, 0x4b, 0x30, 0x4e, 0x4c, 0x31, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x31, 0x33, 0x31, 0x31, 0x32, 0x30, 0x20, 0x20, 0x08, 0x00, 0x00, 0x61,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+                .info = {
+                "FINISAR CORP.   ",
+                "FTL4C1QE1C      ",
+                "UQK0NL1         ",
+                SFF_40G_BASE_LR4_PROPERTIES,
+                -1,
+                },
+            },
+        },
+        {
+            {
+                .eeprom = {
+                    0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xd3, 0x00, 0x00, 0x80, 0x56, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x03, 0x23, 0x03, 0xbc, 0x03, 0x20, 0x06, 0x49, 0x4d, 0x76, 0x4f, 0x6a, 0x54, 0x33,
+                    0x44, 0xc5, 0x3c, 0xd8, 0x38, 0xc4, 0x3b, 0xe6, 0x36, 0x89, 0x80, 0x51, 0x81, 0x48, 0x7e, 0xe2,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x0d, 0xc0, 0x07, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x67, 0x00, 0x0a, 0x00,
+                    0x00, 0x00, 0x00, 0x40, 0x4a, 0x44, 0x53, 0x55, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x01, 0x9c, 0x4a, 0x51, 0x50, 0x2d, 0x30, 0x34, 0x4c, 0x57,
+                    0x42, 0x41, 0x32, 0x20, 0x20, 0x20, 0x20, 0x20, 0x30, 0x31, 0x66, 0x6c, 0x05, 0x14, 0x46, 0xe5,
+                    0x00, 0x00, 0x0c, 0x98, 0x46, 0x45, 0x33, 0x34, 0x31, 0x30, 0x38, 0x38, 0x43, 0x30, 0x32, 0x34,
+                    0x20, 0x20, 0x20, 0x20, 0x31, 0x34, 0x30, 0x38, 0x32, 0x32, 0x20, 0x20, 0x08, 0x00, 0x00, 0x39,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+                .info = {
+                "JDSU            ",
+                "JQP-04LWBA2     ",
+                "FE341088C024    ",
+                SFF_40G_BASE_LR4_PROPERTIES,
+                -1,
+                },
+            },
+        },
+        {
+            {
+                .eeprom = {
+                    0x0d, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x0d, 0x00, 0x23, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x01, 0xa0, 0x33, 0x4d, 0x20, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x6e, 0x79, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x07, 0x08, 0x00, 0x21, 0x39, 0x51, 0x41, 0x30, 0x2d, 0x31, 0x31, 0x31,
+                    0x2d, 0x31, 0x32, 0x2d, 0x31, 0x2e, 0x30, 0x30, 0x30, 0x31, 0x03, 0x05, 0x06, 0x0c, 0x00, 0x56,
+                    0x00, 0x00, 0x00, 0x00, 0x56, 0x31, 0x30, 0x42, 0x39, 0x32, 0x30, 0x32, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x31, 0x32, 0x30, 0x39, 0x31, 0x37, 0x20, 0x20, 0x00, 0x00, 0x00, 0x3a,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+                .info = {
+                "3M Company      ",
+                "9QA0-111-12-1.00",
+                "V10B9202        ",
+                SFF_40G_BASE_CR4_PROPERTIES,
+                1,
+                },
+            },
+        },
+        {
+            {
+                .eeprom = {
+                    0x11, 0x07, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0xa4, 0x00, 0x00, 0x81, 0x43, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x18, 0x96, 0x1d, 0xe5, 0x28, 0xfc, 0x1e, 0x76, 0x30, 0x05, 0x2e, 0x97, 0x30, 0xaf,
+                    0x41, 0x07, 0x1f, 0x47, 0x1f, 0x70, 0x20, 0x0c, 0x1d, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x11, 0xcc, 0x07, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0x02, 0x02, 0x00,
+                    0x00, 0x00, 0x00, 0x60, 0x4c, 0x55, 0x4d, 0x45, 0x4e, 0x54, 0x55, 0x4d, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x01, 0x9c, 0x4c, 0x51, 0x32, 0x31, 0x30, 0x43, 0x52, 0x2d,
+                    0x43, 0x41, 0x41, 0x31, 0x20, 0x20, 0x20, 0x20, 0x30, 0x31, 0x66, 0x6c, 0x05, 0x14, 0x00, 0x96,
+                    0x06, 0x0f, 0xff, 0xfa, 0x46, 0x46, 0x34, 0x32, 0x35, 0x30, 0x35, 0x30, 0x30, 0x30, 0x31, 0x39,
+                    0x2d, 0x51, 0x20, 0x20, 0x31, 0x35, 0x31, 0x32, 0x30, 0x32, 0x20, 0x20, 0x0c, 0x18, 0x67, 0x48,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+                .info = {
+                "LUMENTUM        ",
+                "LQ210CR-CAA1    ",
+                "FF4250500019-Q  ",
+                SFF_100G_CWDM4_PROPERTIES,
+                -1,
+                },
+            },
+        },
+        {
+            {
+                .eeprom = {
+                    0x0d, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x0d, 0x00, 0x23, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x01, 0xa0, 0x33, 0x4d, 0x20, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x6e, 0x79, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x07, 0x08, 0x00, 0x21, 0x39, 0x51, 0x41, 0x30, 0x2d, 0x31, 0x31, 0x31,
+                    0x2d, 0x31, 0x32, 0x2d, 0x31, 0x2e, 0x30, 0x30, 0x30, 0x31, 0x03, 0x05, 0x06, 0x0c, 0x00, 0x56,
+                    0x00, 0x00, 0x00, 0x00, 0x56, 0x31, 0x30, 0x45, 0x42, 0x30, 0x34, 0x39, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x31, 0x35, 0x31, 0x31, 0x31, 0x30, 0x20, 0x20, 0x00, 0x00, 0x00, 0x44,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+                .info = {
+                "3M Company      ",
+                "9QA0-111-12-1.00",
+                "V10EB049        ",
+                SFF_40G_BASE_CR4_PROPERTIES,
+                1,
+                },
+            },
+        },
+        {
+            {
+                .eeprom = {
+                    0x11, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x17, 0x00, 0x00, 0x7f, 0x46, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x1e, 0xa9, 0x1c, 0x81, 0x1c, 0x4a, 0x1d, 0xf0, 0x0f, 0xfb, 0x0f, 0x8e, 0x0f, 0x90,
+                    0x0f, 0xe2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x08, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x11, 0xcc, 0x23, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xff, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x0a, 0x00, 0x46, 0x49, 0x4e, 0x49, 0x53, 0x41, 0x52, 0x20, 0x43, 0x4f, 0x52, 0x50,
+                    0x20, 0x20, 0x20, 0x20, 0x1f, 0x00, 0x90, 0x65, 0x46, 0x43, 0x42, 0x4e, 0x34, 0x32, 0x35, 0x51,
+                    0x42, 0x31, 0x43, 0x31, 0x30, 0x20, 0x20, 0x20, 0x41, 0x31, 0x00, 0x00, 0x00, 0x00, 0x46, 0xb6,
+                    0x01, 0x07, 0xff, 0xde, 0x44, 0x55, 0x48, 0x30, 0x30, 0x37, 0x34, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x31, 0x35, 0x31, 0x30, 0x32, 0x34, 0x20, 0x20, 0x08, 0x00, 0x67, 0x8d,
+                    0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+                .info = {
+                "FINISAR CORP    ",
+                "FCBN425QB1C10   ",
+                "DUH0074         ",
+                SFF_100G_AOC_PROPERTIES,
+                10,
+                },
+            },
+        },
+        {
+            {
+                .eeprom = {
+                    0x0d, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x0d, 0x00, 0x23, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x01, 0xa0, 0x33, 0x4d, 0x20, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x6e, 0x79, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x07, 0x08, 0x00, 0x21, 0x39, 0x51, 0x41, 0x30, 0x2d, 0x31, 0x31, 0x31,
+                    0x2d, 0x31, 0x32, 0x2d, 0x31, 0x2e, 0x30, 0x30, 0x30, 0x31, 0x03, 0x05, 0x06, 0x0c, 0x00, 0x56,
+                    0x00, 0x00, 0x00, 0x00, 0x56, 0x31, 0x30, 0x45, 0x42, 0x30, 0x34, 0x36, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x31, 0x35, 0x31, 0x31, 0x31, 0x30, 0x20, 0x20, 0x00, 0x00, 0x00, 0x41,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+                .info = {
+                "3M Company      ",
+                "9QA0-111-12-1.00",
+                "V10EB046        ",
+                SFF_40G_BASE_CR4_PROPERTIES,
+                1,
+                },
+            },
+        },
+        {
+            {
+                .eeprom = {
+                    0x11, 0x07, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x2d, 0x00, 0x00, 0x7f, 0x58, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x12, 0xf8, 0x12, 0x17, 0x17, 0x09, 0x0f, 0x2e, 0x8c, 0x56, 0x79, 0x8a, 0x7e, 0x21,
+                    0x84, 0xb5, 0x1f, 0x8d, 0x21, 0x25, 0x20, 0xa1, 0x23, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,
+                    0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+                    0x11, 0xcd, 0x07, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0x00, 0x02, 0x00,
+                    0x00, 0x00, 0x00, 0x64, 0x44, 0x45, 0x4c, 0x4c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x1f, 0x22, 0x33, 0x4d, 0x46, 0x58, 0x47, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x41, 0x30, 0x66, 0x58, 0x01, 0x90, 0x46, 0x7a,
+                    0x03, 0x0f, 0xff, 0xda, 0x43, 0x4e, 0x30, 0x33, 0x4d, 0x46, 0x58, 0x47, 0x35, 0x36, 0x49, 0x30,
+                    0x30, 0x30, 0x31, 0x20, 0x31, 0x35, 0x30, 0x36, 0x31, 0x38, 0x20, 0x20, 0x0c, 0x10, 0x67, 0x9e,
+                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                    0xdf, 0x10, 0x01, 0x21, 0x41, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                },
+                .info = {
+                "DELL            ",
+                "3MFXG           ",
+                "CN03MFXG56I0001 ",
+                SFF_100G_BASE_LR4_PROPERTIES,
+                -1,
+                },
+            },
+        },
+        {
+            {
+                .eeprom = {
+                    0x0d, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x0d, 0x00, 0x23, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x01, 0xa0, 0x33, 0x4d, 0x20, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x6e, 0x79, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x07, 0x08, 0x00, 0x21, 0x39, 0x51, 0x41, 0x30, 0x2d, 0x31, 0x31, 0x31,
+                    0x2d, 0x31, 0x32, 0x2d, 0x31, 0x2e, 0x30, 0x30, 0x30, 0x31, 0x03, 0x05, 0x06, 0x0c, 0x00, 0x56,
+                    0x00, 0x00, 0x00, 0x00, 0x56, 0x31, 0x30, 0x45, 0x42, 0x30, 0x30, 0x31, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x31, 0x35, 0x31, 0x31, 0x31, 0x30, 0x20, 0x20, 0x00, 0x00, 0x00, 0x38,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+                .info = {
+                "3M Company      ",
+                "9QA0-111-12-1.00",
+                "V10EB001        ",
+                SFF_40G_BASE_CR4_PROPERTIES,
+                1,
+                },
+            },
+        },
+        {
+            {
+                .eeprom = {
+                    0x0d, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x0d, 0x00, 0x23, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x01, 0xa0, 0x33, 0x4d, 0x20, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x6e, 0x79, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x07, 0x08, 0x00, 0x21, 0x39, 0x51, 0x41, 0x30, 0x2d, 0x31, 0x31, 0x31,
+                    0x2d, 0x31, 0x32, 0x2d, 0x31, 0x2e, 0x30, 0x30, 0x30, 0x31, 0x03, 0x05, 0x06, 0x0c, 0x00, 0x56,
+                    0x00, 0x00, 0x00, 0x00, 0x56, 0x31, 0x30, 0x42, 0x39, 0x37, 0x36, 0x35, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x31, 0x32, 0x30, 0x39, 0x31, 0x37, 0x20, 0x20, 0x00, 0x00, 0x00, 0x48,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+                .info = {
+                "3M Company      ",
+                "9QA0-111-12-1.00",
+                "V10B9765        ",
+                SFF_40G_BASE_CR4_PROPERTIES,
+                1,
+                },
+            },
+        },
+        {
+            {
+                .eeprom = {
+                    0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x89, 0x00, 0x00, 0x80, 0xfc, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x2c, 0x7a, 0x2c, 0x51, 0x23, 0x1a, 0x25, 0x43, 0x0d, 0xb3, 0x0d, 0x77, 0x0d, 0xc7,
+                    0x0d, 0x7f, 0x1a, 0xed, 0x1b, 0x3e, 0x1c, 0xa4, 0x1c, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x0d, 0x00, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x67, 0x00, 0x00, 0x32,
+                    0x00, 0x00, 0x00, 0x00, 0x41, 0x56, 0x41, 0x47, 0x4f, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x17, 0x6a, 0x41, 0x46, 0x42, 0x52, 0x2d, 0x37, 0x39, 0x45,
+                    0x51, 0x44, 0x5a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x30, 0x31, 0x42, 0x68, 0x07, 0xd0, 0x46, 0xbe,
+                    0x00, 0x00, 0x0f, 0xde, 0x51, 0x44, 0x34, 0x39, 0x30, 0x37, 0x32, 0x38, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x31, 0x33, 0x31, 0x32, 0x30, 0x35, 0x20, 0x20, 0x08, 0x00, 0x00, 0x34,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+                .info = {
+                "AVAGO           ",
+                "AFBR-79EQDZ     ",
+                "QD490728        ",
+                SFF_40G_BASE_SR4_PROPERTIES,
+                -1,
+                },
+            },
+        },
+        {
+            {
+                .eeprom = {
+                    0x11, 0x07, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,
+                    0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x08, 0x00,
+                    0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x11, 0x00, 0x23, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xff, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x03, 0xa0, 0x41, 0x6d, 0x70, 0x68, 0x65, 0x6e, 0x6f, 0x6c, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x1f, 0x78, 0xa7, 0x14, 0x4e, 0x44, 0x41, 0x41, 0x46, 0x46, 0x2d, 0x43,
+                    0x31, 0x30, 0x33, 0x20, 0x20, 0x20, 0x20, 0x20, 0x41, 0x20, 0x07, 0x0b, 0x0d, 0x13, 0x55, 0x15,
+                    0x0b, 0x00, 0x00, 0x00, 0x41, 0x50, 0x46, 0x31, 0x35, 0x35, 0x30, 0x31, 0x30, 0x33, 0x34, 0x37,
+                    0x35, 0x46, 0x20, 0x20, 0x31, 0x35, 0x31, 0x32, 0x30, 0x38, 0x20, 0x20, 0x00, 0x00, 0x67, 0x3f,
+                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
+                    0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                },
+                .info = {
+                "Amphenol        ",
+                "NDAAFF-C103     ",
+                "APF1550103475F  ",
+                SFF_100G_BASE_CR4_PROPERTIES,
+                3,
+                },
+            },
+        },
+        {
+            {
+                .eeprom = {
+                    0x11, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1a, 0x68, 0x00, 0x00, 0x7f, 0x42, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x34, 0x0f, 0x1c, 0xf3, 0x34, 0x57, 0x33, 0xcf, 0x0d, 0xd3, 0x0d, 0xf9, 0x0e, 0x03,
+                    0x0d, 0xdf, 0x26, 0xe6, 0x2d, 0xd3, 0x2d, 0xd8, 0x30, 0xd4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x11, 0xcc, 0x0c, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0x00, 0x00, 0x23,
+                    0x00, 0x00, 0x32, 0x00, 0x46, 0x49, 0x4e, 0x49, 0x53, 0x41, 0x52, 0x20, 0x43, 0x4f, 0x52, 0x50,
+                    0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x90, 0x65, 0x46, 0x54, 0x4c, 0x43, 0x39, 0x35, 0x35, 0x31,
+                    0x52, 0x45, 0x50, 0x4d, 0x20, 0x20, 0x20, 0x20, 0x41, 0x30, 0x42, 0x68, 0x07, 0xd0, 0x00, 0x3c,
+                    0x02, 0x07, 0xff, 0xde, 0x58, 0x55, 0x39, 0x30, 0x54, 0x52, 0x50, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x31, 0x35, 0x31, 0x30, 0x30, 0x36, 0x20, 0x20, 0x0c, 0x10, 0x67, 0x02,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+                .info = {
+                "FINISAR CORP    ",
+                "FTLC9551REPM    ",
+                "XU90TRP         ",
+                SFF_100G_BASE_SR4_PROPERTIES,
+                -1,
+                },
+            },
+        },
+        {
+            {
+                .eeprom = {
+                    0x11, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x66, 0x00, 0x00, 0x7f, 0x45, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x21, 0x1b, 0x1f, 0x2d, 0x1f, 0xe5, 0x1f, 0xdb, 0x0f, 0x25, 0x0f, 0x19, 0x0f, 0x09,
+                    0x0e, 0xfa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x08, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x11, 0xcc, 0x23, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xff, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x05, 0x00, 0x46, 0x49, 0x4e, 0x49, 0x53, 0x41, 0x52, 0x20, 0x43, 0x4f, 0x52, 0x50,
+                    0x20, 0x20, 0x20, 0x20, 0x1f, 0x00, 0x90, 0x65, 0x46, 0x43, 0x42, 0x4e, 0x34, 0x32, 0x35, 0x51,
+                    0x42, 0x31, 0x43, 0x30, 0x35, 0x20, 0x20, 0x20, 0x41, 0x31, 0x00, 0x00, 0x00, 0x00, 0x46, 0xb5,
+                    0x01, 0x07, 0xff, 0xde, 0x44, 0x55, 0x38, 0x30, 0x30, 0x33, 0x45, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x31, 0x35, 0x30, 0x38, 0x32, 0x31, 0x20, 0x20, 0x08, 0x00, 0x67, 0x8e,
+                    0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+                .info = {
+                "FINISAR CORP    ",
+                "FCBN425QB1C05   ",
+                "DU8003E         ",
+                SFF_100G_AOC_PROPERTIES,
+                5,
+                },
+            },
+        },
+        {
+            {
+                .eeprom = {
+                    0x03, 0x04, 0x07, 0x10, 0x00, 0x00, 0x00, 0x20, 0x40, 0x0c, 0x80, 0x06, 0x67, 0x00, 0x00, 0x00,
+                    0x08, 0x03, 0x00, 0x1e, 0x4a, 0x44, 0x53, 0x55, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x01, 0x9c, 0x50, 0x4c, 0x52, 0x58, 0x50, 0x4c, 0x53, 0x43,
+                    0x53, 0x34, 0x33, 0x32, 0x32, 0x4e, 0x20, 0x20, 0x32, 0x20, 0x20, 0x20, 0x03, 0x52, 0x00, 0xfe,
+                    0x00, 0x1a, 0x00, 0x00, 0x43, 0x42, 0x34, 0x35, 0x55, 0x46, 0x30, 0x30, 0x31, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x31, 0x31, 0x31, 0x30, 0x33, 0x31, 0x20, 0x20, 0x68, 0xf0, 0x03, 0xd6,
+                    0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+                .info = {
+                "JDSU            ",
+                "PLRXPLSCS4322N  ",
+                "CB45UF001       ",
+                SFF_10G_BASE_SR_PROPERTIES,
+                -1,
+                },
+            },
+        },
+        {
+            {
+                .eeprom = {
+                    0x03, 0x04, 0x07, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x67, 0x00, 0x00, 0x00,
+                    0x08, 0x03, 0x00, 0x1e, 0x46, 0x49, 0x4e, 0x49, 0x53, 0x41, 0x52, 0x20, 0x43, 0x4f, 0x52, 0x50,
+                    0x2e, 0x20, 0x20, 0x20, 0x00, 0x00, 0x90, 0x65, 0x46, 0x54, 0x4c, 0x58, 0x38, 0x35, 0x37, 0x31,
+                    0x44, 0x33, 0x42, 0x43, 0x4c, 0x20, 0x20, 0x20, 0x41, 0x20, 0x20, 0x20, 0x03, 0x52, 0x00, 0x48,
+                    0x00, 0x1a, 0x00, 0x00, 0x4d, 0x54, 0x38, 0x31, 0x54, 0x45, 0x58, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x31, 0x35, 0x30, 0x33, 0x30, 0x34, 0x20, 0x20, 0x68, 0xf0, 0x03, 0xfd,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+                .info = {
+                "FINISAR CORP.   ",
+                "FTLX8571D3BCL   ",
+                "MT81TEX         ",
+                SFF_10G_BASE_SR_PROPERTIES,
+                -1,
+                },
+            },
+        },
+        {
+            {
+                .eeprom = {
+                    0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1d, 0x78, 0x00, 0x00, 0x7f, 0x19, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x89, 0x0d, 0x70, 0xb6, 0x51, 0x1b, 0x7e, 0x8a, 0x51, 0x40, 0x44, 0x62, 0x4f, 0x4f,
+                    0x4a, 0xe3, 0x46, 0x41, 0x45, 0xc9, 0x49, 0x6e, 0x49, 0xab, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
+                    0x0d, 0xc0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x67, 0x00, 0x01, 0x46,
+                    0x00, 0x00, 0x00, 0x40, 0x46, 0x49, 0x4e, 0x49, 0x53, 0x41, 0x52, 0x20, 0x43, 0x4f, 0x52, 0x50,
+                    0x2e, 0x20, 0x20, 0x20, 0x00, 0x00, 0x90, 0x65, 0x46, 0x54, 0x4c, 0x34, 0x43, 0x33, 0x51, 0x45,
+                    0x31, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x41, 0x31, 0x65, 0xa4, 0x05, 0x14, 0x46, 0xde,
+                    0x00, 0x01, 0x0c, 0xd8, 0x55, 0x54, 0x4e, 0x30, 0x51, 0x38, 0x34, 0x20, 0x20, 0x20, 0x20, 0x20,
+                    0x20, 0x20, 0x20, 0x20, 0x31, 0x36, 0x30, 0x33, 0x31, 0x30, 0x20, 0x20, 0x08, 0x00, 0x00, 0x5c,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                },
+                .info = {
+                    "FINISAR CORP.   ",
+                    "FTL4C3QE1C      ",
+                    "UTN0Q84         ",
+                    SFF_40G_BASE_LM4_PROPERTIES,
+                    -1,
+                },
+            },
+        },
+
+#endif /** SFF_CONFIG_INCLUDE_DATABASE */
+    };
+
+int
+sff_db_get(sff_db_entry_t** entries, int* count)
+{
+    *entries = sff_database__;
+    *count = AIM_ARRAYSIZE(sff_database__);
+    return *count;
+}
+
+int
+sff_db_get_type(sff_eeprom_t* se, sff_module_type_t type)
+{
+    int i;
+    sff_db_entry_t* entry;
+    for(i = 0; i < AIM_ARRAYSIZE(sff_database__); i++) {
+        entry = sff_database__ + i;
+        if(se->info.module_type == type) {
+            memcpy(se, &entry->se, sizeof(*se));
+            return 1;
+        }
+    }
+    return 0;
+}
+
+int
+sff_db_entry_struct(sff_eeprom_t* se, aim_pvs_t* pvs)
+{
+    int i, j;
+    aim_printf(pvs, "    {\n");
+    aim_printf(pvs, "        {\n");
+    aim_printf(pvs, "            .eeprom = {\n");
+    for(i = 0; i < 16; i++) {
+        aim_printf(pvs, "                ");
+        for(j = 0; j < 16; j++) {
+            aim_printf(pvs, "0x%.2x, ", se->eeprom[i*16+j]);
+        }
+        aim_printf(pvs, "\n");
+    }
+    aim_printf(pvs, "            },\n");
+    aim_printf(pvs, "            .info = {\n");
+    aim_printf(pvs, "                \"%s\",\n", se->info.vendor);
+    aim_printf(pvs, "                \"%s\",\n", se->info.model);
+    aim_printf(pvs, "                \"%s\",\n", se->info.serial);
+    aim_printf(pvs, "                SFF_%s_PROPERTIES,\n",
+               sff_module_type_name(se->info.module_type));
+    aim_printf(pvs, "                %d,\n", se->info.length);
+    aim_printf(pvs, "            },\n");
+    aim_printf(pvs, "        },\n");
+    aim_printf(pvs, "    },\n");
+    return 0;}
diff --git a/packages/base/any/onlp/src/sff/module/src/sff_enums.c b/packages/base/any/onlp/src/sff/module/src/sff_enums.c
index d3a4ed30..d748d162 100644
--- a/packages/base/any/onlp/src/sff/module/src/sff_enums.c
+++ b/packages/base/any/onlp/src/sff/module/src/sff_enums.c
@@ -137,6 +137,7 @@ aim_map_si_t sff_module_type_map[] =
     { "40G_BASE_CR4", SFF_MODULE_TYPE_40G_BASE_CR4 },
     { "40G_BASE_SR4", SFF_MODULE_TYPE_40G_BASE_SR4 },
     { "40G_BASE_LR4", SFF_MODULE_TYPE_40G_BASE_LR4 },
+    { "40G_BASE_LM4", SFF_MODULE_TYPE_40G_BASE_LM4 },
     { "40G_BASE_ACTIVE", SFF_MODULE_TYPE_40G_BASE_ACTIVE },
     { "40G_BASE_CR", SFF_MODULE_TYPE_40G_BASE_CR },
     { "40G_BASE_SR2", SFF_MODULE_TYPE_40G_BASE_SR2 },
@@ -168,6 +169,7 @@ aim_map_si_t sff_module_type_desc_map[] =
     { "40GBASE-CR4", SFF_MODULE_TYPE_40G_BASE_CR4 },
     { "40GBASE-SR4", SFF_MODULE_TYPE_40G_BASE_SR4 },
     { "40GBASE-LR4", SFF_MODULE_TYPE_40G_BASE_LR4 },
+    { "40GBASE-LM4", SFF_MODULE_TYPE_40G_BASE_LM4 },
     { "40GBASE-ACTIVE", SFF_MODULE_TYPE_40G_BASE_ACTIVE },
     { "40GBASE-CR", SFF_MODULE_TYPE_40G_BASE_CR },
     { "40GBASE-SR2", SFF_MODULE_TYPE_40G_BASE_SR2 },
diff --git a/packages/base/any/onlp/src/sff/sff.mk b/packages/base/any/onlp/src/sff/sff.mk
index 9770d2c8..cfe22be5 100644
--- a/packages/base/any/onlp/src/sff/sff.mk
+++ b/packages/base/any/onlp/src/sff/sff.mk
@@ -3,12 +3,12 @@
 #
 # Inclusive Makefile for the sff module.
 #
-# Autogenerated 2016-03-23 18:28:25.869697
+# Autogenerated 2016-05-17 17:43:05.843123
 #
 ###############################################################################
 sff_BASEDIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
-include $(sff_BASEDIR)/module/make.mk
-include $(sff_BASEDIR)/module/auto/make.mk
-include $(sff_BASEDIR)/module/src/make.mk
-include $(sff_BASEDIR)/utest/_make.mk
+include $(sff_BASEDIR)module/make.mk
+include $(sff_BASEDIR)module/auto/make.mk
+include $(sff_BASEDIR)module/src/make.mk
+include $(sff_BASEDIR)utest/_make.mk
 
diff --git a/packages/base/any/onlp/src/sff/utest/main.c b/packages/base/any/onlp/src/sff/utest/main.c
index 8152fa9b..acf6593d 100644
--- a/packages/base/any/onlp/src/sff/utest/main.c
+++ b/packages/base/any/onlp/src/sff/utest/main.c
@@ -10,1044 +10,95 @@
 #include <string.h>
 #include <AIM/aim.h>
 #include <sff/sff.h>
-
-typedef struct {
-    sff_info_t info;
-} eeprom_verify_t;
-
-
-static eeprom_verify_t data[] =
-    {
-        {
-            {
-                {
-                    0x03, 0x04, 0x07, 0x00, 0x00, 0x00, 0x01, 0x20, 0x40, 0x0c, 0x05, 0x01, 0x15, 0x00, 0x00, 0x00,
-                    0x1e, 0x0f, 0x00, 0x00, 0x46, 0x49, 0x4e, 0x49, 0x53, 0x41, 0x52, 0x20, 0x43, 0x4f, 0x52, 0x50,
-                    0x2e, 0x20, 0x20, 0x20, 0x00, 0x00, 0x90, 0x65, 0x46, 0x54, 0x52, 0x4a, 0x38, 0x35, 0x31, 0x39,
-                    0x50, 0x31, 0x42, 0x4e, 0x4c, 0x20, 0x20, 0x20, 0x41, 0x20, 0x20, 0x20, 0x03, 0x52, 0x00, 0x66,
-                    0x00, 0x12, 0x00, 0x00, 0x50, 0x38, 0x4a, 0x32, 0x5a, 0x4e, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20,
-                    0x20, 0x20, 0x20, 0x20, 0x30, 0x35, 0x31, 0x30, 0x33, 0x31, 0x20, 0x20, 0x58, 0x90, 0x01, 0x74,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                },
-                "FINISAR CORP.   ",
-                "FTRJ8519P1BNL   ",
-                "P8J2ZNC         ",
-                SFF_SFP_TYPE_SFP,
-                "SFP",
-                SFF_MODULE_TYPE_1G_BASE_SX,
-                "1GBASE-SX",
-                SFF_MEDIA_TYPE_FIBER,
-                "Fiber",
-                SFF_MODULE_CAPS_F_1G,
-                -1,
-            },
-        },
-        /* Amphenol 10GBASE-CR */
-        {
-            /* sff info */
-            {
-                /* eeprom */
-                {
-                    0x03, 0x04, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x67, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x01, 0x00, 0x41, 0x6d, 0x70, 0x68, 0x65, 0x6e, 0x6f, 0x6c, 0x20, 0x20, 0x20, 0x20,
-                    0x20, 0x20, 0x20, 0x20, 0x00, 0x41, 0x50, 0x48, 0x35, 0x37, 0x31, 0x35, 0x34, 0x30, 0x30, 0x30,
-                    0x37, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4b, 0x20, 0x20, 0x20, 0x01, 0x00, 0x00, 0xfa,
-                    0x00, 0x00, 0x00, 0x00, 0x41, 0x50, 0x46, 0x31, 0x30, 0x30, 0x38, 0x30, 0x30, 0x37, 0x30, 0x31,
-                    0x34, 0x37, 0x20, 0x20, 0x31, 0x30, 0x30, 0x33, 0x30, 0x32, 0x20, 0x20, 0x00, 0x00, 0x00, 0xa9,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                },
-
-                "Amphenol        ",
-                "571540007       ",
-                "APF10080070147  ",
-
-                /* sfp_type */
-                SFF_SFP_TYPE_SFP,
-                "SFP",
-
-                /* module_type */
-                SFF_MODULE_TYPE_10G_BASE_CR,
-                "10GBASE-CR",
-
-                /* media_type */
-                SFF_MEDIA_TYPE_COPPER,
-                "Copper",
-
-                /* caps */
-                SFF_MODULE_CAPS_F_10G,
-
-                /* Length */
-                0x1
-            },
-        },
-        /* CISCO-MOLEX */
-        {
-            /* sff_info */
-            {
-                /* eeprom */
-                {
-                    0x03, 0x04, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x67, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x01, 0x00, 0x43, 0x49, 0x53, 0x43, 0x4f, 0x2d, 0x4d, 0x4f, 0x4c, 0x45, 0x58, 0x20,
-                    0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x09, 0x3a, 0x37, 0x34, 0x37, 0x35, 0x32, 0x2d, 0x39, 0x35,
-                    0x31, 0x39, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x30, 0x38, 0x20, 0x20, 0x01, 0x00, 0x00, 0x11,
-                    0x00, 0x00, 0x00, 0x00, 0x4d, 0x4f, 0x43, 0x31, 0x35, 0x34, 0x37, 0x30, 0x30, 0x30, 0x48, 0x20,
-                    0x20, 0x20, 0x20, 0x20, 0x31, 0x31, 0x31, 0x31, 0x32, 0x31, 0x20, 0x20, 0x00, 0x00, 0x00, 0x8f,
-                    0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x69, 0xf9, 0x8e, 0x5a,
-                    0x43, 0x4f, 0x50, 0x51, 0x41, 0x41, 0x34, 0x4a, 0x41, 0x42, 0x33, 0x37, 0x2d, 0x30, 0x39, 0x36,
-                    0x30, 0x2d, 0x30, 0x33, 0x56, 0x30, 0x33, 0x20, 0x01, 0x00, 0x46, 0x00, 0x00, 0x00, 0x00, 0xcc,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x53, 0x46, 0x50, 0x2d, 0x48, 0x31, 0x30, 0x47, 0x42, 0x2d, 0x43, 0x55, 0x31, 0x4d, 0x20, 0x20,
-                    0x20, 0x20, 0x20, 0x20, 0x30, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb3,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                },
-                "CISCO-MOLEX     ",
-                "74752-9519      ",
-                "MOC1547000H     ",
-
-                /* sfp_type */
-                SFF_SFP_TYPE_SFP,
-                "SFP",
-                SFF_MODULE_TYPE_10G_BASE_CR,
-                "10GBASE-CR",
-
-                SFF_MEDIA_TYPE_COPPER,
-                "Copper",
-                SFF_MODULE_CAPS_F_10G,
-                0x1,
-            },
-        },
-        /* Unknown */
-        {
-            /* sff_info */
-            {
-                /* eeprom */
-                {
-                    0x03, 0x04, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x67, 0x00, 0x00, 0x00,
-                    0x00, 0x01, 0x00, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-                    0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x43, 0x39, 0x39, 0x39, 0x39, 0x2d, 0x31, 0x4d,
-                    0x2d, 0x50, 0x2d, 0x4c, 0x43, 0x20, 0x20, 0x20, 0x41, 0x20, 0x20, 0x20, 0x01, 0x00, 0x00, 0xa1,
-                    0x00, 0x00, 0x00, 0x00, 0x31, 0x33, 0x30, 0x35, 0x33, 0x30, 0x30, 0x30, 0x34, 0x31, 0x20, 0x20,
-                    0x20, 0x20, 0x20, 0x20, 0x31, 0x33, 0x30, 0x34, 0x31, 0x33, 0x20, 0x20, 0x00, 0x00, 0x00, 0x1d,
-                    0x00, 0x00, 0x11, 0xb6, 0x7f, 0x7f, 0x08, 0x96, 0xee, 0x8e, 0x60, 0x37, 0xb4, 0xc8, 0x8b, 0x88,
-                    0x66, 0x9c, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa3, 0xdd, 0x56, 0xe8,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                },
-                "                ",
-                "C9999-1M-P-LC   ",
-                "1305300041      ",
-                SFF_SFP_TYPE_SFP,
-                "SFP",
-                SFF_MODULE_TYPE_10G_BASE_CR,
-                "10GBASE-CR",
-                SFF_MEDIA_TYPE_COPPER,
-                "Copper",
-                SFF_MODULE_CAPS_F_10G,
-                0x0,
-            },
-        },
-        /* CISCO-MOLEX */
-        {
-            {
-                {
-                    0x03, 0x04, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x67, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x03, 0x00, 0x43, 0x49, 0x53, 0x43, 0x4f, 0x2d, 0x4d, 0x4f, 0x4c, 0x45, 0x58, 0x20,
-                    0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x09, 0x3a, 0x37, 0x34, 0x37, 0x35, 0x32, 0x2d, 0x39, 0x35,
-                    0x32, 0x30, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x30, 0x38, 0x20, 0x20, 0x01, 0x00, 0x00, 0x0b,
-                    0x00, 0x00, 0x00, 0x00, 0x4d, 0x4f, 0x43, 0x31, 0x36, 0x30, 0x33, 0x30, 0x42, 0x48, 0x34, 0x20,
-                    0x20, 0x20, 0x20, 0x20, 0x31, 0x32, 0x30, 0x31, 0x31, 0x39, 0x20, 0x20, 0x00, 0x00, 0x00, 0xa5,
-                    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0x04, 0x3b, 0x5b,
-                    0x43, 0x4f, 0x50, 0x51, 0x41, 0x41, 0x36, 0x4a, 0x41, 0x42, 0x33, 0x37, 0x2d, 0x30, 0x39, 0x36,
-                    0x31, 0x2d, 0x30, 0x33, 0x56, 0x30, 0x33, 0x20, 0x01, 0x00, 0x46, 0x00, 0x00, 0x00, 0x00, 0xcf,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x53, 0x46, 0x50, 0x2d, 0x48, 0x31, 0x30, 0x47, 0x42, 0x2d, 0x43, 0x55, 0x33, 0x4d, 0x20, 0x20,
-                    0x20, 0x20, 0x20, 0x20, 0x30, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb5,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                },
-                "CISCO-MOLEX     ",
-                "74752-9520      ",
-                "MOC16030BH4     ",
-                SFF_SFP_TYPE_SFP,
-                "SFP",
-                SFF_MODULE_TYPE_10G_BASE_CR,
-                "10GBASE-CR",
-                SFF_MEDIA_TYPE_COPPER,
-                "Copper",
-                SFF_MODULE_CAPS_F_10G,
-                0x3
-            },
-        },
-        /* OEM */
-        {
-            {
-                {
-                    0x00, 0x80, 0xfb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-                    0x01, 0x0d, 0x33, 0x0c, 0xcb, 0x0c, 0xcb, 0x0d, 0x33, 0x1b, 0xd5, 0x1b, 0x54, 0x18, 0xcd, 0x1c,
-                    0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x01, 0x00, 0x03, 0x67, 0x00, 0x00, 0x00, 0x0a, 0x03, 0x00, 0x00, 0x4f, 0x45, 0x4d, 0x20, 0x20,
-                    0x0d, 0x00, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x67, 0x00, 0x00, 0x00,
-                    0x0a, 0x03, 0x00, 0x00, 0x4f, 0x45, 0x4d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-                    0x20, 0x20, 0x20, 0x20, 0x07, 0x00, 0x1e, 0x00, 0x51, 0x53, 0x46, 0x50, 0x2d, 0x34, 0x30, 0x47,
-                    0x2d, 0x53, 0x52, 0x34, 0x20, 0x20, 0x20, 0x20, 0x31, 0x41, 0x42, 0x68, 0x07, 0xd0, 0x46, 0x0c,
-                    0x00, 0x00, 0x00, 0xde, 0x41, 0x43, 0x52, 0x34, 0x30, 0x47, 0x30, 0x30, 0x34, 0x31, 0x20, 0x20,
-                    0x20, 0x20, 0x20, 0x20, 0x31, 0x32, 0x30, 0x38, 0x32, 0x37, 0x31, 0x39, 0x08, 0x00, 0x00, 0x8a,
-                    0x00, 0x00, 0x11, 0x9d, 0xf1, 0x68, 0x34, 0xac, 0xb2, 0x3d, 0xc6, 0x19, 0x53, 0x0b, 0xbf, 0xf0,
-                    0x2e, 0xe1, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf7, 0xfe, 0x58, 0x27,
-                },
-                "OEM             ",
-                "QSFP-40G-SR4    ",
-                "ACR40G0041      ",
-                SFF_SFP_TYPE_QSFP_PLUS,
-                "QSFP+",
-                SFF_MODULE_TYPE_40G_BASE_SR4,
-                "40GBASE-SR4",
-                SFF_MEDIA_TYPE_FIBER,
-                "Fiber",
-                SFF_MODULE_CAPS_F_40G,
-                -1,
-            },
-        },
-        {
-            {
-                {
-                    0x0d, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x0d, 0x00, 0x23, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x67, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x03, 0xa0, 0x41, 0x6d, 0x70, 0x68, 0x65, 0x6e, 0x6f, 0x6c, 0x20, 0x20, 0x20, 0x20,
-                    0x20, 0x20, 0x20, 0x20, 0x00, 0x78, 0xa7, 0x14, 0x36, 0x30, 0x33, 0x30, 0x32, 0x30, 0x30, 0x30,
-                    0x33, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x42, 0x20, 0x07, 0x0b, 0x00, 0x00, 0x46, 0x01,
-                    0x00, 0x00, 0x00, 0x00, 0x41, 0x50, 0x46, 0x31, 0x33, 0x30, 0x32, 0x30, 0x30, 0x33, 0x35, 0x41,
-                    0x52, 0x56, 0x20, 0x20, 0x31, 0x33, 0x30, 0x31, 0x31, 0x35, 0x20, 0x20, 0x00, 0x00, 0x00, 0xf9,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                },
-                "Amphenol        ",
-                "603020003       ",
-                "APF13020035ARV  ",
-                SFF_SFP_TYPE_QSFP_PLUS,
-                "QSFP+",
-                SFF_MODULE_TYPE_40G_BASE_CR4,
-                "40GBASE-CR4",
-                SFF_MEDIA_TYPE_COPPER,
-                "Copper",
-                SFF_MODULE_CAPS_F_40G,
-                0x3
-            },
-        },
-        /* Fiberstore */
-        {
-            {
-                {
-                    0x03, 0x04, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x67, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x01, 0x00, 0x46, 0x69, 0x62, 0x65, 0x72, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x20, 0x20,
-                    0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x40, 0x20, 0x31, 0x30, 0x47, 0x53, 0x46, 0x50, 0x2d, 0x50,
-                    0x43, 0x2d, 0x33, 0x30, 0x2d, 0x31, 0x20, 0x20, 0x41, 0x30, 0x20, 0x20, 0x00, 0x00, 0x00, 0xd9,
-                    0x00, 0x00, 0x00, 0x00, 0x46, 0x53, 0x34, 0x30, 0x32, 0x31, 0x32, 0x44, 0x30, 0x31, 0x37, 0x36,
-                    0x20, 0x20, 0x20, 0x20, 0x31, 0x34, 0x30, 0x32, 0x31, 0x33, 0x20, 0x20, 0x00, 0x00, 0x00, 0x8f,
-                    0x00, 0x00, 0x11, 0x4b, 0xd4, 0xe4, 0xc5, 0x99, 0xd1, 0xfb, 0xdb, 0x5e, 0xa2, 0xc4, 0x62, 0x0c,
-                    0xf2, 0x5b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x26, 0x26, 0xfa, 0x99,
-                    0x43, 0x4f, 0x50, 0x51, 0x41, 0x41, 0x34, 0x4a, 0x41, 0x41, 0x33, 0x37, 0x2d, 0x30, 0x39, 0x36,
-                    0x30, 0x2d, 0x30, 0x32, 0x56, 0x30, 0x32, 0x20, 0x01, 0x00, 0x46, 0x00, 0x00, 0x00, 0x00, 0xc9,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x53, 0x46, 0x50, 0x2d, 0x48, 0x31, 0x30, 0x47, 0x42, 0x2d, 0x43, 0x55, 0x31, 0x4d, 0x20, 0x20,
-                    0x20, 0x20, 0x20, 0x20, 0x30, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb3,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                },
-                "FiberStore      ",
-                "10GSFP-PC-30-1  ",
-                "FS40212D0176    ",
-                SFF_SFP_TYPE_SFP,
-                "SFP",
-                SFF_MODULE_TYPE_10G_BASE_CR,
-                "10GBASE-CR",
-                SFF_MEDIA_TYPE_COPPER,
-                "Copper",
-                SFF_MODULE_CAPS_F_10G,
-                0x1,
-            },
-        },
-        /*
-         * Finisar FTLX1871M3BCL, see PAN-1005
-         * http://www.finisar.com/products/optical-modules/sfp-plus/FTLX1871M3BCL
-         * http://www.quagwire.com/ftlx1871m3bcl/
-         * XXX roth -- from my reading, this is a 10GBASE-ZR module
-         */
-        {
-            {
-                {
-                    0x03, 0x04, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x01, 0x00, 0x06, 0x67, 0x00, 0x50, 0xff,
-                    0x00, 0x00, 0x00, 0x00, 0x46, 0x49, 0x4e, 0x49, 0x53, 0x41, 0x52, 0x20, 0x43, 0x4f, 0x52, 0x50,
-                    0x2e, 0x20, 0x20, 0x20, 0x00, 0x00, 0x90, 0x65, 0x46, 0x54, 0x4c, 0x58, 0x31, 0x38, 0x37, 0x31,
-                    0x4d, 0x33, 0x42, 0x43, 0x4c, 0x20, 0x20, 0x20, 0x41, 0x20, 0x20, 0x20, 0x06, 0x0e, 0x00, 0x33,
-                    0x06, 0x1a, 0x00, 0x00, 0x55, 0x50, 0x47, 0x30, 0x31, 0x57, 0x4a, 0x20, 0x20, 0x20, 0x20, 0x20,
-                    0x20, 0x20, 0x20, 0x20, 0x31, 0x33, 0x30, 0x34, 0x32, 0x39, 0x20, 0x20, 0x68, 0xf0, 0x05, 0xfe,
-                    0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-                    0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                },
-                "FINISAR CORP.   ",
-                "FTLX1871M3BCL   ",
-                "UPG01WJ         ",
-                SFF_SFP_TYPE_SFP,
-                "SFP",
-                SFF_MODULE_TYPE_10G_BASE_ZR,
-                "1GBASE-ZR",
-                SFF_MEDIA_TYPE_FIBER,
-                "Fiber",
-                SFF_MODULE_CAPS_F_10G,
-                -1,
-            },
-        },
-        /*
-         * Finisar FTLX8570D3BCL, see PAN-1006
-         * http://www.finisar.com/products/optical-modules/sfp-plus/FTLX1671D3BCL
-         * http://www.quagwire.com/ftlx8570d3bcl/
-         * XXX roth -- from my reading, this is a 10GBASE-SR-lite
-         */
-        {
-            {
-                {
-                    0x03, 0x04, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x67, 0x00, 0x00, 0x00,
-                    0x03, 0x01, 0x00, 0x0a, 0x46, 0x49, 0x4e, 0x49, 0x53, 0x41, 0x52, 0x20, 0x43, 0x4f, 0x52, 0x50,
-                    0x2e, 0x20, 0x20, 0x20, 0x00, 0x00, 0x90, 0x65, 0x46, 0x54, 0x4c, 0x58, 0x38, 0x35, 0x37, 0x30,
-                    0x44, 0x33, 0x42, 0x43, 0x4c, 0x20, 0x20, 0x20, 0x41, 0x20, 0x20, 0x20, 0x03, 0x52, 0x00, 0x1c,
-                    0x00, 0x1a, 0x00, 0x00, 0x50, 0x50, 0x34, 0x34, 0x51, 0x56, 0x31, 0x20, 0x20, 0x20, 0x20, 0x20,
-                    0x20, 0x20, 0x20, 0x20, 0x31, 0x33, 0x30, 0x32, 0x31, 0x37, 0x20, 0x20, 0x68, 0xf0, 0x03, 0xe3,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                },
-                "FINISAR CORP.   ",
-                "FTLX8570D3BCL   ",
-                "PP44QV1         ",
-                SFF_SFP_TYPE_SFP,
-                "SFP",
-                SFF_MODULE_TYPE_10G_BASE_SRL,
-                "1GBASE-SRL",
-                SFF_MEDIA_TYPE_FIBER,
-                "Fiber",
-                SFF_MODULE_CAPS_F_10G,
-                -1,
-            },
-        },
-        /*
-         * Finisar FTRJ1319P1BTL-MD, see PAN-1011
-         * http://www.technodirect.com/finisarsfp2125gb1310nm10kmlongwavetransceiverftrj1319p1btl-md.aspx
-         * XXX roth -- from my reading, this is a 1GBASE-LX optic
-         * (10km) but it supports 2G FC.
-         */
-        {
-            {
-                {
-                    0x03, 0x04, 0x07, 0x00, 0x00, 0x00, 0x02, 0x12, 0x10, 0x01, 0x05, 0x01, 0x15, 0x00, 0x0a, 0x64,
-                    0x00, 0x00, 0x00, 0x00, 0x46, 0x49, 0x4e, 0x49, 0x53, 0x41, 0x52, 0x20, 0x43, 0x4f, 0x52, 0x50,
-                    0x2e, 0x20, 0x20, 0x20, 0x00, 0x00, 0x90, 0x65, 0x46, 0x54, 0x52, 0x4a, 0x31, 0x33, 0x31, 0x39,
-                    0x50, 0x31, 0x42, 0x54, 0x4c, 0x2d, 0x4d, 0x44, 0x41, 0x20, 0x20, 0x20, 0x05, 0x1e, 0x00, 0x88,
-                    0x00, 0x1a, 0x00, 0x00, 0x50, 0x44, 0x42, 0x31, 0x56, 0x51, 0x55, 0x20, 0x20, 0x20, 0x20, 0x20,
-                    0x20, 0x20, 0x20, 0x20, 0x30, 0x38, 0x30, 0x33, 0x31, 0x37, 0x20, 0x20, 0x68, 0xb0, 0x01, 0xc9,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                },
-                "FINISAR CORP.   ",
-                "FTRJ1319P1BTL-MD",
-                "PDB1VQU         ",
-                SFF_SFP_TYPE_SFP,
-                "SFP",
-                SFF_MODULE_TYPE_1G_BASE_LX,
-                "1GBASE-LR",
-                SFF_MEDIA_TYPE_FIBER,
-                "Fiber",
-                SFF_MODULE_CAPS_F_1G,
-                -1,
-            },
-        },
-        /*
-         * Juniper/Tyco 10G CR, see PAN-934
-         *
-         */
-        {
-            {
-                {
-                    0x03, 0x04, 0x21, 0x81, 0x00, 0x00, 0x04, 0x41, 0x04, 0x80, 0xd5, 0x00, 0x67, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x01, 0x00, 0x54, 0x79, 0x63, 0x6f, 0x20, 0x45, 0x6c, 0x65, 0x63, 0x74, 0x72, 0x6f,
-                    0x6e, 0x69, 0x63, 0x73, 0x00, 0x00, 0x40, 0x20, 0x32, 0x31, 0x30, 0x30, 0x38, 0x37, 0x30, 0x2d,
-                    0x31, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x41, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x8a,
-                    0x00, 0x00, 0x00, 0x00, 0x30, 0x39, 0x33, 0x35, 0x45, 0x30, 0x34, 0x38, 0x20, 0x20, 0x20, 0x20,
-                    0x20, 0x20, 0x20, 0x20, 0x31, 0x30, 0x30, 0x35, 0x30, 0x39, 0x30, 0x30, 0x00, 0x00, 0x00, 0x41,
-                    0x37, 0x34, 0x30, 0x2d, 0x30, 0x33, 0x30, 0x30, 0x37, 0x36, 0x20, 0x52, 0x45, 0x56, 0x20, 0x30,
-                    0x31, 0x20, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                },
-                "Tyco Electronics",
-                "2100870-1       ",
-                "0935E048        ",
-                SFF_SFP_TYPE_SFP,
-                "SFP",
-                SFF_MODULE_TYPE_10G_BASE_CR,
-                "10GBASE-CR",
-                SFF_MEDIA_TYPE_COPPER,
-                "Copper",
-                SFF_MODULE_CAPS_F_10G,
-                1,
-            },
-        },
-        /*
-         * QSFP+ 40G-bidi
-         */
-        {
-            {
-                {
-                    /*   0 */ 0x0d, 0x00, 0x02, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /*  16 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /*  32 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /*  48 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /*  64 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /*  80 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /*  96 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 112 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 128 */ 0x0d, 0xdc, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xce, 0x00, 0x00, 0x32,
-                    /* 144 */ 0x00, 0x00, 0x00, 0x00, 0x43, 0x49, 0x53, 0x43, 0x4f, 0x2d, 0x41, 0x56, 0x41, 0x47, 0x4f, 0x20,
-                    /* 160 */ 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x17, 0x6a, 0x41, 0x46, 0x42, 0x52, 0x2d, 0x37, 0x39, 0x45,
-                    /* 176 */ 0x42, 0x50, 0x5a, 0x2d, 0x43, 0x53, 0x31, 0x20, 0x30, 0x31, 0x42, 0x68, 0x07, 0xd0, 0x46, 0x47,
-                    /* 192 */ 0x00, 0x00, 0x0f, 0xde, 0x41, 0x56, 0x4d, 0x31, 0x38, 0x30, 0x39, 0x53, 0x30, 0x54, 0x47, 0x20,
-                    /* 208 */ 0x20, 0x20, 0x20, 0x20, 0x31, 0x34, 0x30, 0x32, 0x32, 0x35, 0x20, 0x20, 0x08, 0x00, 0xf5, 0xcc,
-                    /* 224 */ 0xf5, 0x00, 0x06, 0xd2, 0x04, 0x9c, 0x47, 0x09, 0xc5, 0xaf, 0xcf, 0xb7, 0x65, 0xd9, 0x72, 0x03,
-                    /* 240 */ 0xea, 0x59, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x45, 0xbd, 0x94,
-                },
-                "CISCO-AVAGO     ",
-                "AFBR-79EBPZ-CS1 ",
-                "AVM1809S0TG     ",
-                SFF_SFP_TYPE_QSFP_PLUS,
-                "QSFP+",
-                SFF_MODULE_TYPE_40G_BASE_SR2,
-                "40GBASE-SR2",
-                SFF_MEDIA_TYPE_FIBER,
-                "Fiber",
-                SFF_MODULE_CAPS_F_40G,
-                -1,
-            },
-        },
-        /* Cisco/Finisar 40G QSFP (QuadWire? AOC? Pigtail?) */
-        {
-            {
-                {
-                    /* 0x0000 */ 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x0010 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0xde, 0x00, 0x00, 0x7f, 0x4d, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x0020 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x0030 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x0040 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x0050 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x0060 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x0070 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
-                    /* 0x0080 */ 0x0d, 0x10, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x67, 0x00, 0x00, 0x32,
-                    /* 0x0090 */ 0x1e, 0x00, 0x0a, 0x00, 0x43, 0x49, 0x53, 0x43, 0x4f, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-                    /* 0x00a0 */ 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x90, 0x65, 0x46, 0x43, 0x42, 0x4e, 0x34, 0x31, 0x30, 0x51,
-                    /* 0x00b0 */ 0x45, 0x32, 0x43, 0x31, 0x30, 0x2d, 0x43, 0x31, 0x41, 0x20, 0x42, 0x68, 0x07, 0xd0, 0x46, 0xaf,
-                    /* 0x00c0 */ 0x00, 0x01, 0x04, 0xd8, 0x46, 0x49, 0x53, 0x31, 0x37, 0x33, 0x31, 0x30, 0x30, 0x35, 0x33, 0x2d,
-                    /* 0x00d0 */ 0x41, 0x20, 0x20, 0x20, 0x31, 0x33, 0x30, 0x37, 0x33, 0x31, 0x20, 0x20, 0x0a, 0x00, 0xf6, 0x90,
-                    /* 0x00e0 */ 0x00, 0x00, 0x02, 0x43, 0x59, 0xd3, 0x68, 0x03, 0x46, 0x83, 0x87, 0x75, 0x1f, 0xee, 0x94, 0x62,
-                    /* 0x00f0 */ 0xb8, 0x98, 0xf5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x5e, 0x75, 0x43,
-                },
-                "CISCO           ",
-                "FCBN410QE2C10-C1",
-                "FIS17310053-A   ",
-                SFF_SFP_TYPE_QSFP_PLUS,
-                "QSFP+",
-                /* XXX roth -- FIXME */
-                SFF_MODULE_TYPE_40G_BASE_SR4,
-                "40GBASE-SR4",
-                SFF_MEDIA_TYPE_FIBER,
-                "Fiber",
-                SFF_MODULE_CAPS_F_40G,
-                -1,
-            },
-        },
-        /*
-         * Dell/Amphenol 3M copper
-         * Identifies as intra-enclosure and inter-enclosure
-         */
-        {
-            {
-                {
-                    /* 0000 */ 0x03, 0x04, 0x21, 0x01, 0x00, 0x00, 0x00, 0x41, 0x84, 0x80, 0x55, 0x00, 0x67, 0x00, 0x00, 0x00,
-                    /* 0010 */ 0x00, 0x00, 0x03, 0x00, 0x41, 0x6d, 0x70, 0x68, 0x65, 0x6e, 0x6f, 0x6c, 0x20, 0x20, 0x20, 0x20,
-                    /* 0020 */ 0x20, 0x20, 0x20, 0x20, 0x00, 0x78, 0xa7, 0x14, 0x36, 0x31, 0x36, 0x37, 0x34, 0x30, 0x30, 0x30,
-                    /* 0030 */ 0x33, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x43, 0x20, 0x20, 0x20, 0x01, 0x00, 0x00, 0xe3,
-                    /* 0040 */ 0x00, 0x00, 0x00, 0x00, 0x43, 0x4e, 0x30, 0x35, 0x33, 0x48, 0x56, 0x4e, 0x34, 0x34, 0x4c, 0x38,
-                    /* 0050 */ 0x37, 0x59, 0x59, 0x20, 0x31, 0x34, 0x30, 0x34, 0x32, 0x33, 0x20, 0x20, 0x00, 0x00, 0x00, 0x78,
-                    /* 0060 */ 0x0f, 0x10, 0x00, 0xa3, 0x71, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    /* 0070 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    /* 0080 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    /* 0090 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    /* 00a0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    /* 00b0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    /* 00c0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    /* 00d0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    /* 00e0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    /* 00f0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                },
-                "Amphenol        ",
-                "616740003       ",
-                "CN053HVN44L87YY ",
-                SFF_SFP_TYPE_SFP,
-                "SFP",
-                SFF_MODULE_TYPE_10G_BASE_CR,
-                "10GBASE-CR",
-                SFF_MEDIA_TYPE_COPPER,
-                "Copper",
-                SFF_MODULE_CAPS_F_10G,
-                3,
-            },
-        },
-        /*
-         * Dell/Amphenol 3M copper
-         * Identifies as intra-enclosure and inter-enclosure
-         */
-        {
-            {
-                {
-                    /* 0x0000 */ 0x03, 0x04, 0x21, 0x02, 0x00, 0x00, 0x04, 0x41, 0x84, 0x80, 0xd5, 0x00, 0x67, 0x00, 0x00, 0x00,
-                    /* 0x0010 */ 0x00, 0x00, 0x03, 0x00, 0x33, 0x4d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-                    /* 0x0020 */ 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x31, 0x34, 0x31, 0x30, 0x2d, 0x50, 0x31, 0x37,
-                    /* 0x0030 */ 0x2d, 0x30, 0x30, 0x2d, 0x33, 0x2e, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x1c,
-                    /* 0x0040 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x0050 */ 0x00, 0x00, 0x00, 0x00, 0x31, 0x32, 0x30, 0x32, 0x32, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28,
-                    /* 0x0060 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x0070 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x0080 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x0090 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x00a0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x00b0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x00c0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x00d0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x00e0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x00f0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                },
-                "3M              ",
-                "1410-P17-00-3.00",
-                /* XXX roth -- NULL serial number ??!??111! */
-                "                ",
-                SFF_SFP_TYPE_SFP,
-                "SFP",
-                SFF_MODULE_TYPE_10G_BASE_CR,
-                "10GBASE-CR",
-                SFF_MEDIA_TYPE_COPPER,
-                "Copper",
-                SFF_MODULE_CAPS_F_10G,
-                3,
-            },
-        },
-        {
-            {
-                {
-                    0x0d, 0x03, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,
-                    0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x14, 0x21, 0x00, 0x00, 0x83, 0x2c, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x0a, 0x12, 0x48, 0x12, 0x48, 0x12, 0x48, 0x12, 0x48,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x00,
-                    0x0c, 0x04, 0x00, 0x00, 0x00, 0x40, 0x40, 0x06, 0x00, 0x05,
-                    0x64, 0x00, 0x00, 0x32, 0x1e, 0x00, 0x00, 0x00, 0x45, 0x64,
-                    0x67, 0x65, 0x2d, 0x63, 0x6f, 0x72, 0x45, 0x20, 0x20, 0x20,
-                    0x20, 0x20, 0x20, 0x20, 0x04, 0x70, 0x72, 0xcf, 0x4d, 0x30,
-                    0x4f, 0x45, 0x43, 0x36, 0x34, 0x30, 0x31, 0x54, 0x30, 0x30,
-                    0x5a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x42, 0x68, 0x07, 0xd0,
-                    0x46, 0xb0, 0x00, 0x00, 0x00, 0x12, 0x31, 0x45, 0x37, 0x51,
-                    0x54, 0x30, 0x30, 0x30, 0x33, 0x30, 0x20, 0x20, 0x20, 0x20,
-                    0x20, 0x20, 0x31, 0x34, 0x30, 0x37, 0x32, 0x38, 0x20, 0x20,
-                    0x08, 0x00, 0x00, 0x95, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                },
-                "Edge-corE       ",
-                "M0OEC6401T00Z   ",
-                "1E7QT00030      ",
-                SFF_SFP_TYPE_QSFP_PLUS,
-                "QSFP+",
-                SFF_MODULE_TYPE_40G_BASE_SR4,
-                "40GBASE_SR4",
-                SFF_MEDIA_TYPE_FIBER,
-                "Fiber",
-                SFF_MODULE_CAPS_F_40G,
-                -1,
-            }
-        },
-        {
-            {
-                {
-                    0x0d, 0x03, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,
-                    0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x0e, 0x30, 0x00, 0x00, 0x82, 0xa2, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x12, 0x48, 0x12, 0x48, 0x12, 0x48, 0x12, 0x48,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x00,
-                    0x0c, 0x04, 0x00, 0x00, 0x00, 0x40, 0x40, 0x06, 0x00, 0x05,
-                    0x64, 0x00, 0x00, 0x32, 0x1e, 0x00, 0x00, 0x00, 0x45, 0x64,
-                    0x67, 0x65, 0x2d, 0x63, 0x6f, 0x72, 0x45, 0x20, 0x20, 0x20,
-                    0x20, 0x20, 0x20, 0x20, 0x04, 0x70, 0x72, 0xcf, 0x4d, 0x30,
-                    0x4f, 0x45, 0x43, 0x36, 0x34, 0x30, 0x31, 0x54, 0x30, 0x30,
-                    0x5a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x42, 0x68, 0x07, 0xd0,
-                    0x46, 0xb0, 0x00, 0x00, 0x00, 0x12, 0x31, 0x45, 0x37, 0x51,
-                    0x54, 0x30, 0x30, 0x30, 0x32, 0x38, 0x20, 0x20, 0x20, 0x20,
-                    0x20, 0x20, 0x31, 0x34, 0x30, 0x37, 0x32, 0x38, 0x20, 0x20,
-                    0x08, 0x00, 0x00, 0x9c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                },
-                "Edge-corE       ",
-                "M0OEC6401T00Z   ",
-                "1E7QT00028      ",
-                SFF_SFP_TYPE_QSFP_PLUS,
-                "QSFP+",
-                SFF_MODULE_TYPE_40G_BASE_SR4,
-                "40GBASE_SR4",
-                SFF_MEDIA_TYPE_FIBER,
-                "Fiber",
-                SFF_MODULE_CAPS_F_40G,
-                -1,
-            }
-        },
-        {
-            {
-                {
-                    0x0d, 0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x17, 0x9f, 0x00, 0x00, 0x80, 0x29, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x44, 0xd5, 0x44, 0x3a, 0x48, 0xb1,
-                    0x4d, 0x30, 0x12, 0x48, 0x12, 0x48, 0x12, 0x48, 0x12, 0x48,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x8c,
-                    0x23, 0x04, 0x00, 0x00, 0x01, 0x40, 0x40, 0x02, 0x00, 0x05,
-                    0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x46, 0x4f,
-                    0x52, 0x4d, 0x45, 0x52, 0x49, 0x43, 0x41, 0x4f, 0x45, 0x20,
-                    0x20, 0x20, 0x20, 0x20, 0x04, 0x00, 0x00, 0x00, 0x54, 0x51,
-                    0x53, 0x2d, 0x51, 0x31, 0x4c, 0x48, 0x38, 0x2d, 0x58, 0x43,
-                    0x41, 0x31, 0x30, 0x20, 0x00, 0x00, 0x42, 0x68, 0x07, 0xd0,
-                    0x46, 0x4a, 0x00, 0x00, 0x05, 0x31, 0x39, 0x31, 0x33, 0x33,
-                    0x32, 0x4c, 0x30, 0x30, 0x30, 0x31, 0x20, 0x20, 0x20, 0x20,
-                    0x20, 0x20, 0x31, 0x33, 0x30, 0x38, 0x30, 0x36, 0x20, 0x20,
-                    0x08, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xef,
-                    0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xf7, 0xf7, 0xf7,
-                    0xf7, 0xf7, 0xf7, 0xf7, 0xfe, 0xfe,
-                },
-                "FORMERICAOE     ",
-                "TQS-Q1LH8-XCA10 ",
-                "91332L0001      ",
-                SFF_SFP_TYPE_QSFP_PLUS,
-                "QSFP+",
-                SFF_MODULE_TYPE_40G_BASE_SR4,
-                "40GBASE_SR4",
-                SFF_MEDIA_TYPE_FIBER,
-                "Fiber",
-                SFF_MODULE_CAPS_F_40G,
-                10,
-            },
-        },
-        {
-            /*
-             * PAN-1233 -- 10G IBM-Amphenol cable
-             */
-            {
-                {
-                    /* 0x0000 */ 0x03, 0x04, 0x21, 0x00, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x06, 0x67, 0x00, 0x00, 0x00,
-                    /*
-                     *                       ^^^^ copper pigtail
-                     *
-                     *                             ^^^^ no 10G or IB codes
-                     *
-                     *                                   ^^^^  ^^^^ no SONET (fiber)
-                     *
-                     *  identifies as 1000BASE-CX                    ^^^^
-                     *
-                     *  no FC length code                                  ^^^^
-                     *
-                     *  identifies as SFP+ passive                               ^^^^
-                     *
-                     *  no FC media, copper or otherwise                               ^^^^
-                     *
-                     *  no FC speed                                                          ^^^^
-                     *
-                     *  nominal bitrate 0x67 --> 10.3GB                                            ^^^^
-                     */
-                    /* 0x0010 */ 0x00, 0x00, 0x03, 0x00, 0x49, 0x42, 0x4d, 0x2d, 0x41, 0x6d, 0x70, 0x68, 0x65, 0x6e, 0x6f, 0x6c,
-                    /*
-                     *                       ^^^^  copper cable length (3m)
-                     */
-                    /* 0x0020 */ 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x17, 0xef, 0x39, 0x30, 0x59, 0x39, 0x34, 0x32, 0x38, 0x2d,
-                    /* 0x0030 */ 0x4e, 0x32, 0x38, 0x35, 0x30, 0x30, 0x41, 0x20, 0x46, 0x20, 0x20, 0x20, 0x01, 0x00, 0x00, 0x7a,
-                    /* 0x0040 */ 0x00, 0x00, 0x00, 0x00, 0x59, 0x33, 0x35, 0x30, 0x56, 0x54, 0x32, 0x42, 0x52, 0x31, 0x46, 0x47,
-                    /* 0x0050 */ 0x20, 0x20, 0x20, 0x20, 0x31, 0x32, 0x31, 0x31, 0x32, 0x37, 0x20, 0x20, 0x00, 0x00, 0x00, 0x0d,
-                    /* 0x0060 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    /* 0x0070 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    /* 0x0080 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    /* 0x0090 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    /* 0x00a0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    /* 0x00b0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    /* 0x00c0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    /* 0x00d0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    /* 0x00e0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    /* 0x00f0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                },
-                "IBM-Amphenol    ",
-                "90Y9428-N28500A ",
-                "Y350VT2BR1FG    ",
-                SFF_SFP_TYPE_SFP,
-                "SFP",
-                SFF_MODULE_TYPE_10G_BASE_CR,
-                "10GBASE-CR",
-                SFF_MEDIA_TYPE_COPPER,
-                "Copper",
-                SFF_MODULE_CAPS_F_10G,
-                3,
-            },
-        },
-        {
-            /* Verify string normalization for unprintable characters in the vendor, model, or serial number fields. */
-            {
-                {
-                    /* 0x0000 */ 0x03, 0x04, 0x21, 0x00, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x06, 0x67, 0x00, 0x00, 0x00,
-                    /* 0x0010 */ 0x00, 0x00, 0x03, 0x00, 0x49, 0x42, 0x4d, 0x2d, 0x41, 0x6d, 0x70, 0x68, 0x65, 0x6e, 0x6f, 0x6c,
-                    /* 0x0020 */ 0xF0, 0xF0, 0xF0, 0xF0, 0x00, 0x00, 0x17, 0xef, 0x39, 0x30, 0x59, 0x39, 0x34, 0x32, 0x38, 0xFd,
-                    /* 0x0030 */ 0x4e, 0x32, 0x38, 0x35, 0x30, 0x30, 0x41, 0x20, 0x46, 0x20, 0x20, 0x20, 0x01, 0x00, 0x00, 0x8a,
-                    /* 0x0040 */ 0x00, 0x00, 0x00, 0x00, 0x59, 0x33, 0xF5, 0xF0, 0x56, 0x54, 0x32, 0x42, 0x52, 0x31, 0x46, 0x47,
-                    /* 0x0050 */ 0x20, 0x20, 0x20, 0x20, 0x31, 0x32, 0x31, 0x31, 0x32, 0x37, 0x20, 0x20, 0x00, 0x00, 0x00, 0x8d,
-                    /* 0x0060 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    /* 0x0070 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    /* 0x0080 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    /* 0x0090 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    /* 0x00a0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    /* 0x00b0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    /* 0x00c0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    /* 0x00d0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    /* 0x00e0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                    /* 0x00f0 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                },
-                "IBM-Amphenol????",
-                "90Y9428?N28500A ",
-                "Y3??VT2BR1FG    ",
-                SFF_SFP_TYPE_SFP,
-                "SFP",
-                SFF_MODULE_TYPE_10G_BASE_CR,
-                "10GBASE-CR",
-                SFF_MEDIA_TYPE_COPPER,
-                "Copper",
-                SFF_MODULE_CAPS_F_10G,
-                3,
-            },
-        },
-        {
-            /*
-             * Finisar 40G AOC breakout cable
-             */
-            {
-                {
-                    /* 0x0000 */ 0x0d, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x0010 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x9f, 0x00, 0x00, 0x80, 0xc2, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x0020 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x0030 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x0040 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x0050 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x0060 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x0070 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
-
-                    /* 0x0080 */ 0x0d, 0x10, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x67, 0x00, 0x00, 0x00,
-                    /*
-                     *           ^^^^ QSFP+
-                     *
-                     *                       ^^^^ no separable connector (active?)
-                     *
-                     *                             ^^^^^ no media compliance (*NOT* 40G active)
-                     *
-                     *                                   ^^^^ no SONET compliance
-                     *
-                     *                                         ^^^^ no SAS compliance
-                     *
-                     *                                               ^^^^ no GbE compliance
-                     *
-                     *                                                     ^^^^  ^^^^ no FC compliance
-                     *
-                     *                                                                 ^^^^ no FC media
-                     *
-                     *                                                                       ^^^^ no FC speed
-                     *
-                     *                                                                             ^^^^ 64b66b
-                     *
-                     *                                                                                   ^^^^ nominal BR >= 10G
-                     *                                                                           no SM or OM3 length ^^^^  ^^^^
-                     */
-                    /* 0x0090 */ 0x00, 0x00, 0x03, 0x00, 0x46, 0x49, 0x4e, 0x49, 0x53, 0x41, 0x52, 0x20, 0x43, 0x4f, 0x52, 0x50,
-                    /*
-                     *           ^^^^  ^^^^ no OM1 or OM2 length
-                     *
-                     *                       ^^^^ 3M cable (copper or active)
-                     */
-                    /* 0x00a0 */ 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x90, 0x65, 0x46, 0x43, 0x42, 0x4e, 0x35, 0x31, 0x30, 0x51,
-                    /* 0x00b0 */ 0x45, 0x32, 0x43, 0x30, 0x33, 0x20, 0x20, 0x20, 0x41, 0x20, 0x42, 0x68, 0x07, 0xd0, 0x46, 0x29,
-                    /*
-                     *                                                                       ^^^^  ^^^^ 850nm
-                     */
-                    /* 0x00c0 */ 0x00, 0x01, 0x04, 0xd8, 0x44, 0x53, 0x4b, 0x30, 0x34, 0x56, 0x52, 0x20, 0x20, 0x20, 0x20, 0x20,
-                    /* 0x00d0 */ 0x20, 0x20, 0x20, 0x20, 0x31, 0x34, 0x31, 0x31, 0x30, 0x34, 0x20, 0x20, 0x08, 0x00, 0xf6, 0x54,
-                    /* 0x00e0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x00f0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                },
-                "FINISAR CORP    ",
-                "FCBN510QE2C03   ",
-                "DSK04VR         ",
-                SFF_SFP_TYPE_QSFP_PLUS,
-                "QSFP+",
-                SFF_MODULE_TYPE_40G_BASE_SR4,
-                "40GBASE-SR4",
-                SFF_MEDIA_TYPE_FIBER,
-                "Fiber",
-                SFF_MODULE_CAPS_F_40G,
-                3,
-            },
-        },
-        {
-            /*
-             * Finisar 40G AOC breakout cable, 10G end
-             */
-            {
-                {
-                    /* 0x0000 */ 0x03, 0x04, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x06, 0x67, 0x00, 0x00, 0x00,
-                    /*
-                     *           ^^^^ SFP+
-                     *
-                     *                       ^^^^ copper pigtail (ugh)
-                     *
-                     *                             ^^^^ no 10G or IF compliance
-                     *
-                     *                                   ^^^^ no SONET compliance
-                     *
-                     *                                         ^^^^ no OC length spec
-                     *
-                     *                                               ^^^^ no ethernet compliance
-                     *
-                     *                                                     ^^^^ no FC length or tech
-                     *
-                     *                                                           ^^^^ active cable, no FC tech
-                     *
-                     *                                                                 ^^^^ no FC media
-                     *
-                     *                                                                       ^^^^ no FC speed
-                     *
-                     *                                                                             ^^^^ 64/66 encoding
-                     *
-                     *                                                                 nominal BR >= 10G ^^^^
-                     *
-                     *                                                                                 no SM length  ^^^^  ^^^^
-                     */
-                    /* 0x0010 */ 0x00, 0x00, 0x01, 0x00, 0x46, 0x49, 0x4e, 0x49, 0x53, 0x41, 0x52, 0x20, 0x43, 0x4f, 0x52, 0x50,
-                    /*
-                     *           ^^^^  ^^^^ no MM length
-                     *
-                     *                       ^^^^ active/copper length 1m
-                     *
-                     *                             ^^^^ no OM3 length
-                     *
-                     */
-                    /* 0x0020 */ 0x2e, 0x20, 0x20, 0x20, 0x00, 0x00, 0x90, 0x65, 0x46, 0x43, 0x42, 0x4e, 0x35, 0x31, 0x30, 0x51,
-                    /* 0x0030 */ 0x45, 0x32, 0x43, 0x30, 0x31, 0x20, 0x20, 0x20, 0x41, 0x20, 0x20, 0x20, 0x0c, 0x00, 0x00, 0xa9,
-                    /*
-                     *                                                 compliant with FC or SFF limiting ^^^^  ^^^^
-                     */
-                    /* 0x0040 */ 0x00, 0x12, 0x00, 0x00, 0x44, 0x53, 0x4a, 0x30, 0x35, 0x39, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20,
-                    /* 0x0050 */ 0x20, 0x20, 0x20, 0x20, 0x31, 0x34, 0x31, 0x30, 0x33, 0x30, 0x20, 0x20, 0x00, 0x00, 0x05, 0x72,
-                    /* 0x0060 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x0070 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x0080 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x0090 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x00a0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x00b0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x00c0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x00d0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x00e0 */ 0x00, 0x7f, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    /* 0x00f0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00,
-                },
-                "FINISAR CORP.   ",
-                "FCBN510QE2C01   ",
-                "DSJ059S         ",
-                SFF_SFP_TYPE_SFP,
-                "SFP",
-                SFF_MODULE_TYPE_10G_BASE_SR,
-                "10GBASE-SR",
-                SFF_MEDIA_TYPE_FIBER,
-                "Fiber",
-                SFF_MODULE_CAPS_F_10G,
-                1,
-            },
-        },
-    };
-
+#include <sff/sff_db.h>
 
 int
 aim_main(int argc, char* argv[])
 {
     int i;
 
-    int first = 0;
-    int last = AIM_ARRAYSIZE(data)-1;
-    if(argv[1]) {
-        first = last = atoi(argv[1]);
-    }
+    sff_db_entry_t* entries;
+    sff_db_entry_t* p;
+    int count;
 
-    for(i = first; i <= last; i++) {
+    sff_db_get(&entries, &count);
+
+    for(i = 0, p=entries; i < count; i++, p++) {
         int rv;
-        sff_info_t info;
-        eeprom_verify_t* p = data+i;
+        sff_eeprom_t se;
 
         aim_printf(&aim_pvs_stdout, "Verifying entry %d: %s:%s:%s...\n",
                    i,
-                   p->info.vendor,
-                   p->info.model,
-                   p->info.serial);
+                   p->se.info.vendor,
+                   p->se.info.model,
+                   p->se.info.serial);
 
 
-        if( (rv=sff_info_init(&info, p->info.eeprom)) < 0) {
-            AIM_DIE("index=%d sff_info_init=%d\n", i, rv);
+        if( (rv=sff_eeprom_parse(&se, p->se.eeprom)) < 0) {
+            AIM_DIE("index=%d sff_eeprom_parse=%d\n", i, rv);
         }
-        if (!info.supported) {
-            AIM_DIE("index=%d supported=0\n", i);
+        if (!se.identified) {
+            AIM_DIE("index=%d identified=0\n", i);
         }
-
-        if(strcmp(info.vendor, p->info.vendor)) {
+        if(strcmp(se.info.vendor, p->se.info.vendor)) {
             AIM_DIE("index=%d vendor expected '%s' got '%s'",
-                    i, p->info.vendor, info.vendor);
+                    i, p->se.info.vendor, se.info.vendor);
         }
-        if(strcmp(info.model, p->info.model)) {
+        if(strcmp(se.info.model, p->se.info.model)) {
             AIM_DIE("index=%d model expected '%s' got '%s'",
-                    i, p->info.model, info.model);
+                    i, p->se.info.model, se.info.model);
         }
-        if(strcmp(info.serial, p->info.serial)) {
+        if(strcmp(se.info.serial, p->se.info.serial)) {
             AIM_DIE("index=%d serial expected '%s' got '%s'",
-                    i, p->info.serial, info.serial);
+                    i, p->se.info.serial, se.info.serial);
         }
-        if(info.sfp_type != p->info.sfp_type) {
+        if(se.info.sfp_type != p->se.info.sfp_type) {
             AIM_DIE("index=%d sfp_type expected '%{sff_sfp_type}' got '%{sff_sfp_type}'",
-                    i, p->info.sfp_type, info.sfp_type);
+                    i, p->se.info.sfp_type, se.info.sfp_type);
         }
-        if(strcmp(info.sfp_type_name, p->info.sfp_type_name)) {
+        if(strcmp(se.info.sfp_type_name, p->se.info.sfp_type_name)) {
             AIM_DIE("index=%d type_name expected '%s' got '%s'",
-                    i, p->info.sfp_type, info.sfp_type);
+                    i, p->se.info.sfp_type, se.info.sfp_type);
         }
-        if(info.module_type != p->info.module_type) {
+        if(se.info.module_type != p->se.info.module_type) {
             AIM_DIE("index=%d module_type expected '%{sff_module_type}' got '%{sff_module_type}'",
-                    i, p->info.module_type, info.module_type);
+                    i, p->se.info.module_type, se.info.module_type);
         }
-        if(info.media_type != p->info.media_type) {
+        if(se.info.media_type != p->se.info.media_type) {
             AIM_DIE("index=%d media_type expected '%{sff_media_type}' got '%{sff_media_type}'\n",
-                    i, p->info.media_type, info.media_type);
+                    i, p->se.info.media_type, se.info.media_type);
         }
-        if(strcmp(info.media_type_name, p->info.media_type_name)) {
+        if(strcmp(se.info.media_type_name, p->se.info.media_type_name)) {
             AIM_DIE("index=%d media_type_name expected '%s' got '%s'",
-                    i, p->info.media_type_name, info.media_type_name);
+                    i, p->se.info.media_type_name, se.info.media_type_name);
         }
-
-        if (info.caps != p->info.caps) {
+        if (se.info.caps != p->se.info.caps) {
             AIM_DIE("index=%d caps expected '%{sff_module_caps}' got '%{sff_module_caps}'",
-                    i, p->info.caps, info.caps);
+                    i, p->se.info.caps, se.info.caps);
         }
 
-        if(info.length != p->info.length) {
+        if(se.info.length != p->se.info.length) {
             AIM_DIE("index=%d length expected %d got %d",
-                    i, p->info.length, info.length);
+                    i, p->se.info.length, se.info.length);
         }
-
-        if(info.length == -1 && info.length_desc[0]) {
+        if(se.info.length == -1 && se.info.length_desc[0]) {
             AIM_DIE("index=%d length_desc expected '%s' got '%s'",
-                    i, '\0', info.length_desc);
+                    i, '\0', se.info.length_desc);
         }
-        else if(info.length != -1) {
+        else if(se.info.length != -1) {
             char tmp[32];
-            snprintf(tmp, sizeof(tmp), "%dm", info.length);
-            if(strcmp(tmp, info.length_desc)) {
+            snprintf(tmp, sizeof(tmp), "%dm", se.info.length);
+            if(strcmp(tmp, se.info.length_desc)) {
                 AIM_DIE("index=%d length_desc expected '%s' got '%s'",
-                        i, tmp, info.length_desc);
+                        i, tmp, se.info.length_desc);
             }
         }
 
         aim_printf(&aim_pvs_stdout, "Verifying entry %d: %s:%s:%s...PASSED\n",
                    i,
-                   p->info.vendor,
-                   p->info.model,
-                   p->info.serial);
+                   p->se.info.vendor,
+                   p->se.info.model,
+                   p->se.info.serial);
 
     }
     return 0;

From 0477d8d90dfc7464d47c0125aafdccafd160444a Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Tue, 17 May 2016 12:47:28 -0700
Subject: [PATCH 06/28] Init at INFO.

---
 tools/onlpm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/onlpm.py b/tools/onlpm.py
index a3ff9a0c..d45b2e29 100755
--- a/tools/onlpm.py
+++ b/tools/onlpm.py
@@ -24,7 +24,7 @@ import lsb_release
 
 g_dist_codename = lsb_release.get_distro_information().get('CODENAME')
 
-logger = onlu.init_logging('onlpm')
+logger = onlu.init_logging('onlpm', logging.INFO)
 
 class OnlPackageError(Exception):
     """General Package Error Exception

From bef2556d611143399b29bf2ee1537a50cbbd09db Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Wed, 18 May 2016 18:08:53 +0000
Subject: [PATCH 07/28] Use ONLPM_OPTION_REPO as the base local repository.

---
 builds/any/rootfs/jessie/standard/standard.yml | 4 ++--
 builds/any/rootfs/wheezy/standard/standard.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/builds/any/rootfs/jessie/standard/standard.yml b/builds/any/rootfs/jessie/standard/standard.yml
index 4586c93f..7266fa7d 100644
--- a/builds/any/rootfs/jessie/standard/standard.yml
+++ b/builds/any/rootfs/jessie/standard/standard.yml
@@ -43,11 +43,11 @@ Multistrap:
     omitdebsrc: true
 
   Local-All:
-    source: ${ONL}/REPO/${ONL_DEBIAN_SUITE}/packages/binary-all
+    source: ${ONLPM_OPTION_REPO}/${ONL_DEBIAN_SUITE}/packages/binary-all
     omitdebsrc: true
 
   Local-Arch:
-    source: ${ONL}/REPO/${ONL_DEBIAN_SUITE}/packages/binary-${ARCH}
+    source: ${ONLPM_OPTION_REPO}/${ONL_DEBIAN_SUITE}/packages/binary-${ARCH}
     omitdebsrc: true
 
 Configure:
diff --git a/builds/any/rootfs/wheezy/standard/standard.yml b/builds/any/rootfs/wheezy/standard/standard.yml
index 2ec2902d..f7f04c32 100644
--- a/builds/any/rootfs/wheezy/standard/standard.yml
+++ b/builds/any/rootfs/wheezy/standard/standard.yml
@@ -43,11 +43,11 @@ Multistrap:
     omitdebsrc: true
 
   Local-All:
-    source: ${ONL}/REPO/${ONL_DEBIAN_SUITE}/packages/binary-all
+    source: ${ONLPM_OPTION_REPO}/${ONL_DEBIAN_SUITE}/packages/binary-all
     omitdebsrc: true
 
   Local-Arch:
-    source: ${ONL}/REPO/${ONL_DEBIAN_SUITE}/packages/binary-${ARCH}
+    source: ${ONLPM_OPTION_REPO}/${ONL_DEBIAN_SUITE}/packages/binary-${ARCH}
     omitdebsrc: true
 
 Configure:

From 929234b9ed2fd6601872e755d37b52b93593aa5a Mon Sep 17 00:00:00 2001
From: Charlie Lewis <charliel@lab41.org>
Date: Wed, 18 May 2016 15:40:43 -0700
Subject: [PATCH 08/28] small typo

---
 docs/GettingStartedWedge.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/GettingStartedWedge.md b/docs/GettingStartedWedge.md
index fb479df2..42fe39c9 100644
--- a/docs/GettingStartedWedge.md
+++ b/docs/GettingStartedWedge.md
@@ -66,7 +66,7 @@ ONL Manual Install
 
 4) Wait for the install to finish and the system to reboot
 
-5) One the onl login prompt appears login with the username root and the
+5) Once the onl login prompt appears login with the username root and the
 password "onl"
 
 6) Configure the ma1 interface either via dhcp (dhclient ma1) or manually

From ea375379db3dfcd27844df3103f73109e04153ab Mon Sep 17 00:00:00 2001
From: "Carl D. Roth" <carl.roth@bigswitch.com>
Date: Wed, 18 May 2016 18:47:58 -0700
Subject: [PATCH 09/28] Deprecate initnetdev

- moved to onl-vendor-config-onl
- onl-loader-initscripts is now deprecated
---
 builds/any/rootfs/jessie/common/common-packages.yml   |  1 -
 builds/any/rootfs/wheezy/common/common-packages.yml   |  1 -
 packages/base/all/initrds/loader-initrd-files/PKG.yml | 11 -----------
 3 files changed, 13 deletions(-)

diff --git a/builds/any/rootfs/jessie/common/common-packages.yml b/builds/any/rootfs/jessie/common/common-packages.yml
index ef765ea3..d41477b4 100644
--- a/builds/any/rootfs/jessie/common/common-packages.yml
+++ b/builds/any/rootfs/jessie/common/common-packages.yml
@@ -66,7 +66,6 @@
 - realpath
 - iptables
 - onl-faultd
-- onl-loader-initscripts
 - onlp-snmpd
 - oom-shim
 - python-parted
diff --git a/builds/any/rootfs/wheezy/common/common-packages.yml b/builds/any/rootfs/wheezy/common/common-packages.yml
index 40a6bf5d..eb365075 100644
--- a/builds/any/rootfs/wheezy/common/common-packages.yml
+++ b/builds/any/rootfs/wheezy/common/common-packages.yml
@@ -65,7 +65,6 @@
 - realpath
 - iptables
 - onl-faultd
-- onl-loader-initscripts
 - onlp-snmpd
 - oom-shim
 - python-parted
diff --git a/packages/base/all/initrds/loader-initrd-files/PKG.yml b/packages/base/all/initrds/loader-initrd-files/PKG.yml
index 3ae21ef7..9b8e7022 100644
--- a/packages/base/all/initrds/loader-initrd-files/PKG.yml
+++ b/packages/base/all/initrds/loader-initrd-files/PKG.yml
@@ -22,15 +22,4 @@ packages:
     changelog:  Change changes changes.,
 
 
-  - name: onl-loader-initscripts
-    version: 1.0.0
-    summary: Open Network Linux System Loader Common Initscripts
-
-    files:
-      src/bin/initnetdev : /sbin/
-
-    changelog:  Change changes changes.,
-
-
-
 

From 3f5e708161d8cfa23928ef029b29c7899f560396 Mon Sep 17 00:00:00 2001
From: "Carl D. Roth" <carl.roth@bigswitch.com>
Date: Wed, 18 May 2016 18:49:34 -0700
Subject: [PATCH 10/28] Spray and pray! Everything is eth0, right?

- stub out syspath entries for network devices
- assume that each platform boots with eth0
---
 .../r0/src/lib/powerpc-accton-as4600-54t-r0.yml        | 10 +++++-----
 .../r0/src/lib/powerpc-accton-as5610-52x-r0.yml        | 10 +++++-----
 .../r0/src/lib/powerpc-accton-as5710-54x-r0.yml        | 10 +++++-----
 .../r0b/src/lib/powerpc-accton-as5710-54x-r0b.yml      | 10 +++++-----
 .../r0/src/lib/powerpc-accton-as6700-32x-r0.yml        | 10 +++++-----
 .../r1/src/lib/powerpc-accton-as6700-32x-r1.yml        | 10 +++++-----
 .../r0/src/lib/x86-64-accton-as5512-54x-r0.yml         | 10 +++++-----
 .../r0/src/lib/x86-64-accton-as5712-54x-r0.yml         | 10 +++++-----
 .../r0/src/lib/x86-64-accton-as5812-54t-r0.yml         | 10 +++++-----
 .../r0/src/lib/x86-64-accton-as5812-54x-r0.yml         | 10 +++++-----
 .../r0/src/lib/x86-64-accton-as6712-32x-r0.yml         | 10 +++++-----
 .../r0/src/lib/x86-64-accton-as6812-32x-r0.yml         | 10 +++++-----
 .../r0/src/lib/x86-64-accton-as7512-32x-r0.yml         | 10 +++++-----
 .../r0/src/lib/x86-64-accton-as7712-32x-r0.yml         | 10 +++++-----
 .../r0/src/lib/x86-64-accton-wedge-16x-r0.yml          | 10 +++++-----
 .../r0/src/lib/x86-64-cel-redstone-xp-r0.yml           | 10 +++++-----
 .../r0/src/lib/x86-64-kvm-x86-64-r0.yml                | 10 +++++-----
 .../r0/src/lib/powerpc-quanta-lb9-r0.yml               | 10 +++++-----
 .../r0/src/lib/powerpc-quanta-ly2-r0.yml               | 10 +++++-----
 .../r0/src/lib/x86-64-quanta-ly6-rangeley-r0.yml       | 10 +++++-----
 .../r0/src/lib/x86-64-quanta-ly8-rangeley-r0.yml       | 10 +++++-----
 21 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/packages/platforms/accton/powerpc/powerpc-accton-as4600-54t/platform-config/r0/src/lib/powerpc-accton-as4600-54t-r0.yml b/packages/platforms/accton/powerpc/powerpc-accton-as4600-54t/platform-config/r0/src/lib/powerpc-accton-as4600-54t-r0.yml
index 1e8f0c60..eb3bdf19 100644
--- a/packages/platforms/accton/powerpc/powerpc-accton-as4600-54t/platform-config/r0/src/lib/powerpc-accton-as4600-54t-r0.yml
+++ b/packages/platforms/accton/powerpc/powerpc-accton-as4600-54t/platform-config/r0/src/lib/powerpc-accton-as4600-54t-r0.yml
@@ -39,8 +39,8 @@ powerpc-accton-as4600-54t-r0:
       =: 100%
       format: ext4
 
-  network:
-    interfaces:
-      ma1:
-        name: ~
-        syspath: soc.0/ff725000.ethernet
+  ##network:
+  ##  interfaces:
+  ##    ma1:
+  ##      name: ~
+  ##      syspath: soc.0/ff725000.ethernet
diff --git a/packages/platforms/accton/powerpc/powerpc-accton-as5610-52x/platform-config/r0/src/lib/powerpc-accton-as5610-52x-r0.yml b/packages/platforms/accton/powerpc/powerpc-accton-as5610-52x/platform-config/r0/src/lib/powerpc-accton-as5610-52x-r0.yml
index d81acd37..ca4037b2 100644
--- a/packages/platforms/accton/powerpc/powerpc-accton-as5610-52x/platform-config/r0/src/lib/powerpc-accton-as5610-52x-r0.yml
+++ b/packages/platforms/accton/powerpc/powerpc-accton-as5610-52x/platform-config/r0/src/lib/powerpc-accton-as5610-52x-r0.yml
@@ -40,8 +40,8 @@ powerpc-accton-as5610-52x-r0:
       =: 100%
       format: ext4
 
-  network:
-    interfaces:
-      ma1:
-        name: ~
-        syspath: soc.0/ff724000.ethernet
+  ##network:
+  ##  interfaces:
+  ##    ma1:
+  ##      name: ~
+  ##      syspath: soc.0/ff724000.ethernet
diff --git a/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0/src/lib/powerpc-accton-as5710-54x-r0.yml b/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0/src/lib/powerpc-accton-as5710-54x-r0.yml
index 3f610df6..f30782be 100644
--- a/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0/src/lib/powerpc-accton-as5710-54x-r0.yml
+++ b/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0/src/lib/powerpc-accton-as5710-54x-r0.yml
@@ -40,8 +40,8 @@ powerpc-accton-as5710-54x-r0:
       =: 100%
       format: ext4
 
-  network:
-    interfaces:
-      ma1:
-        name: ~
-        syspath: fsl,dpaa.16/ethernet.17
+  ##network:
+  ##  interfaces:
+  ##    ma1:
+  ##      name: ~
+  ##      syspath: fsl,dpaa.16/ethernet.17
diff --git a/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0b/src/lib/powerpc-accton-as5710-54x-r0b.yml b/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0b/src/lib/powerpc-accton-as5710-54x-r0b.yml
index ca2a066c..f940bd38 100644
--- a/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0b/src/lib/powerpc-accton-as5710-54x-r0b.yml
+++ b/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/platform-config/r0b/src/lib/powerpc-accton-as5710-54x-r0b.yml
@@ -25,8 +25,8 @@ powerpc-accton-as5710-54x-r0b:
     device: /dev/sda
     nos_bootcmds: *usb_bootcmds
 
-  network:
-    interfaces:
-      ma1:
-        name: ~
-        syspath: fsl,dpaa.16/ethernet.17
+  ##network:
+  ##  interfaces:
+  ##    ma1:
+  ##      name: ~
+  ##      syspath: fsl,dpaa.16/ethernet.17
diff --git a/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r0/src/lib/powerpc-accton-as6700-32x-r0.yml b/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r0/src/lib/powerpc-accton-as6700-32x-r0.yml
index 570843ec..b7ee33b1 100644
--- a/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r0/src/lib/powerpc-accton-as6700-32x-r0.yml
+++ b/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r0/src/lib/powerpc-accton-as6700-32x-r0.yml
@@ -40,8 +40,8 @@ powerpc-accton-as6700-32x-r0:
       =: 100%
       format: ext4
 
-  network:
-    interfaces:
-      ma1:
-        name: ~
-        syspath: fsl,dpaa.16/ethernet.18
+  ##network:
+  ##  interfaces:
+  ##    ma1:
+  ##      name: ~
+  ##      syspath: fsl,dpaa.16/ethernet.18
diff --git a/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r1/src/lib/powerpc-accton-as6700-32x-r1.yml b/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r1/src/lib/powerpc-accton-as6700-32x-r1.yml
index f6d5c232..249fa0f5 100644
--- a/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r1/src/lib/powerpc-accton-as6700-32x-r1.yml
+++ b/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/platform-config/r1/src/lib/powerpc-accton-as6700-32x-r1.yml
@@ -40,8 +40,8 @@ powerpc-accton-as6700-32x-r1:
       =: 100%
       format: ext4
 
-  network:
-    interfaces:
-      ma1:
-        name: ~
-        syspath: fsl,dpaa.16/ethernet.18
+  ##network:
+  ##  interfaces:
+  ##    ma1:
+  ##      name: ~
+  ##      syspath: fsl,dpaa.16/ethernet.18
diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5512-54x/platform-config/r0/src/lib/x86-64-accton-as5512-54x-r0.yml b/packages/platforms/accton/x86-64/x86-64-accton-as5512-54x/platform-config/r0/src/lib/x86-64-accton-as5512-54x-r0.yml
index 0cdb6fca..2c31c65a 100644
--- a/packages/platforms/accton/x86-64/x86-64-accton-as5512-54x/platform-config/r0/src/lib/x86-64-accton-as5512-54x-r0.yml
+++ b/packages/platforms/accton/x86-64/x86-64-accton-as5512-54x/platform-config/r0/src/lib/x86-64-accton-as5512-54x-r0.yml
@@ -24,8 +24,8 @@ x86-64-accton-as5512-54x-r0:
       nopat
       console=ttyS1,115200n8
 
-  network
-    interfaces:
-      ma1:
-        name: ~
-        syspath: pci0000:00/0000:00:14.0
+  ##network
+  ##  interfaces:
+  ##    ma1:
+  ##      name: ~
+  ##      syspath: pci0000:00/0000:00:14.0
diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5712-54x/platform-config/r0/src/lib/x86-64-accton-as5712-54x-r0.yml b/packages/platforms/accton/x86-64/x86-64-accton-as5712-54x/platform-config/r0/src/lib/x86-64-accton-as5712-54x-r0.yml
index 29ce9bef..fa4eea34 100644
--- a/packages/platforms/accton/x86-64/x86-64-accton-as5712-54x/platform-config/r0/src/lib/x86-64-accton-as5712-54x-r0.yml
+++ b/packages/platforms/accton/x86-64/x86-64-accton-as5712-54x/platform-config/r0/src/lib/x86-64-accton-as5712-54x-r0.yml
@@ -24,8 +24,8 @@ x86-64-accton-as5712-54x-r0:
       nopat
       console=ttyS1,115200n8
 
-  network
-    interfaces:
-      ma1:
-        name: ~
-        syspath: pci0000:00/0000:00:14.0
+  ##network
+  ##  interfaces:
+  ##    ma1:
+  ##      name: ~
+  ##      syspath: pci0000:00/0000:00:14.0
diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5812-54t/platform-config/r0/src/lib/x86-64-accton-as5812-54t-r0.yml b/packages/platforms/accton/x86-64/x86-64-accton-as5812-54t/platform-config/r0/src/lib/x86-64-accton-as5812-54t-r0.yml
index 4bfc8909..a88f81cf 100644
--- a/packages/platforms/accton/x86-64/x86-64-accton-as5812-54t/platform-config/r0/src/lib/x86-64-accton-as5812-54t-r0.yml
+++ b/packages/platforms/accton/x86-64/x86-64-accton-as5812-54t/platform-config/r0/src/lib/x86-64-accton-as5812-54t-r0.yml
@@ -24,8 +24,8 @@ x86-64-accton-as5812-54t-r0:
       nopat
       console=ttyS1,115200n8
 
-  network
-    interfaces:
-      ma1:
-        name: ~
-        syspath: pci0000:00/0000:00:14.0
+  ##network
+  ##  interfaces:
+  ##    ma1:
+  ##      name: ~
+  ##      syspath: pci0000:00/0000:00:14.0
diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5812-54x/platform-config/r0/src/lib/x86-64-accton-as5812-54x-r0.yml b/packages/platforms/accton/x86-64/x86-64-accton-as5812-54x/platform-config/r0/src/lib/x86-64-accton-as5812-54x-r0.yml
index 7e4f4230..95817d8a 100644
--- a/packages/platforms/accton/x86-64/x86-64-accton-as5812-54x/platform-config/r0/src/lib/x86-64-accton-as5812-54x-r0.yml
+++ b/packages/platforms/accton/x86-64/x86-64-accton-as5812-54x/platform-config/r0/src/lib/x86-64-accton-as5812-54x-r0.yml
@@ -24,8 +24,8 @@ x86-64-accton-as5812-54x-r0:
       nopat
       console=ttyS1,115200n8
 
-  network
-    interfaces:
-      ma1:
-        name: ~
-        syspath: pci0000:00/0000:00:14.0
+  ##network
+  ##  interfaces:
+  ##    ma1:
+  ##      name: ~
+  ##      syspath: pci0000:00/0000:00:14.0
diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as6712-32x/platform-config/r0/src/lib/x86-64-accton-as6712-32x-r0.yml b/packages/platforms/accton/x86-64/x86-64-accton-as6712-32x/platform-config/r0/src/lib/x86-64-accton-as6712-32x-r0.yml
index 7d358255..b3310b8d 100644
--- a/packages/platforms/accton/x86-64/x86-64-accton-as6712-32x/platform-config/r0/src/lib/x86-64-accton-as6712-32x-r0.yml
+++ b/packages/platforms/accton/x86-64/x86-64-accton-as6712-32x/platform-config/r0/src/lib/x86-64-accton-as6712-32x-r0.yml
@@ -24,8 +24,8 @@ x86-64-accton-as6712-32x-r0:
       nopat
       console=ttyS1,115200n8
 
-  network
-    interfaces:
-      ma1:
-        name: ~
-        syspath: pci0000:00/0000:00:14.0
+  ##network
+  ##  interfaces:
+  ##    ma1:
+  ##      name: ~
+  ##      syspath: pci0000:00/0000:00:14.0
diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as6812-32x/platform-config/r0/src/lib/x86-64-accton-as6812-32x-r0.yml b/packages/platforms/accton/x86-64/x86-64-accton-as6812-32x/platform-config/r0/src/lib/x86-64-accton-as6812-32x-r0.yml
index 3eccc8bf..a7b75803 100644
--- a/packages/platforms/accton/x86-64/x86-64-accton-as6812-32x/platform-config/r0/src/lib/x86-64-accton-as6812-32x-r0.yml
+++ b/packages/platforms/accton/x86-64/x86-64-accton-as6812-32x/platform-config/r0/src/lib/x86-64-accton-as6812-32x-r0.yml
@@ -24,8 +24,8 @@ x86-64-accton-as6812-32x-r0:
       nopat
       console=ttyS1,115200n8
 
-  network
-    interfaces:
-      ma1:
-        name: ~
-        syspath: pci0000:00/0000:00:14.0
+  ##network
+  ##  interfaces:
+  ##    ma1:
+  ##      name: ~
+  ##      syspath: pci0000:00/0000:00:14.0
diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as7512-32x/platform-config/r0/src/lib/x86-64-accton-as7512-32x-r0.yml b/packages/platforms/accton/x86-64/x86-64-accton-as7512-32x/platform-config/r0/src/lib/x86-64-accton-as7512-32x-r0.yml
index 319e4db2..4f4c51ce 100644
--- a/packages/platforms/accton/x86-64/x86-64-accton-as7512-32x/platform-config/r0/src/lib/x86-64-accton-as7512-32x-r0.yml
+++ b/packages/platforms/accton/x86-64/x86-64-accton-as7512-32x/platform-config/r0/src/lib/x86-64-accton-as7512-32x-r0.yml
@@ -24,8 +24,8 @@ x86-64-accton-as5712-32x-r0:
       nopat
       console=ttyS1,115200n8
 
-  network
-    interfaces:
-      ma1:
-        name: ~
-        syspath: pci0000:00/0000:00:14.0
+  ##network
+  ##  interfaces:
+  ##    ma1:
+  ##      name: ~
+  ##      syspath: pci0000:00/0000:00:14.0
diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as7712-32x/platform-config/r0/src/lib/x86-64-accton-as7712-32x-r0.yml b/packages/platforms/accton/x86-64/x86-64-accton-as7712-32x/platform-config/r0/src/lib/x86-64-accton-as7712-32x-r0.yml
index 83e1d05d..1220adf4 100644
--- a/packages/platforms/accton/x86-64/x86-64-accton-as7712-32x/platform-config/r0/src/lib/x86-64-accton-as7712-32x-r0.yml
+++ b/packages/platforms/accton/x86-64/x86-64-accton-as7712-32x/platform-config/r0/src/lib/x86-64-accton-as7712-32x-r0.yml
@@ -24,8 +24,8 @@ x86-64-accton-as7712-32x-r0:
       nopat
       console=ttyS1,115200n8
 
-  network
-    interfaces:
-      ma1:
-        name: ~
-        syspath: pci0000:00/0000:00:14.0
+  ##network
+  ##  interfaces:
+  ##    ma1:
+  ##      name: ~
+  ##      syspath: pci0000:00/0000:00:14.0
diff --git a/packages/platforms/accton/x86-64/x86-64-accton-wedge-16x/platform-config/r0/src/lib/x86-64-accton-wedge-16x-r0.yml b/packages/platforms/accton/x86-64/x86-64-accton-wedge-16x/platform-config/r0/src/lib/x86-64-accton-wedge-16x-r0.yml
index dc009fbb..1c42ce71 100644
--- a/packages/platforms/accton/x86-64/x86-64-accton-wedge-16x/platform-config/r0/src/lib/x86-64-accton-wedge-16x-r0.yml
+++ b/packages/platforms/accton/x86-64/x86-64-accton-wedge-16x/platform-config/r0/src/lib/x86-64-accton-wedge-16x-r0.yml
@@ -27,8 +27,8 @@ x86-64-accton-wedge-16x-r0:
       rd_NO_LUKS
       intel_iommu=off
 
-  network
-    interfaces:
-      ma1:
-        name: ~
-        syspath: pci0000:00/0000:00:14.0
+  ##network
+  ##  interfaces:
+  ##    ma1:
+  ##      name: ~
+  ##      syspath: pci0000:00/0000:00:14.0
diff --git a/packages/platforms/celestica/x86-64/x86-64-cel-redstone-xp/platform-config/r0/src/lib/x86-64-cel-redstone-xp-r0.yml b/packages/platforms/celestica/x86-64/x86-64-cel-redstone-xp/platform-config/r0/src/lib/x86-64-cel-redstone-xp-r0.yml
index b3efd7ec..76c1455d 100644
--- a/packages/platforms/celestica/x86-64/x86-64-cel-redstone-xp/platform-config/r0/src/lib/x86-64-cel-redstone-xp-r0.yml
+++ b/packages/platforms/celestica/x86-64/x86-64-cel-redstone-xp/platform-config/r0/src/lib/x86-64-cel-redstone-xp-r0.yml
@@ -24,8 +24,8 @@ x86-64-cel-redstone-xp-r0:
       nopat
       console=ttyS0,115200n8
 
-  network:
-    interfaces:
-      ma1:
-        name: ~
-        syspath: pci0000:00/0000:00:14.0
+  ##network:
+  ##  interfaces:
+  ##    ma1:
+  ##      name: ~
+  ##      syspath: pci0000:00/0000:00:14.0
diff --git a/packages/platforms/kvm/x86-64/x86-64-kvm-x86-64/platform-config/r0/src/lib/x86-64-kvm-x86-64-r0.yml b/packages/platforms/kvm/x86-64/x86-64-kvm-x86-64/platform-config/r0/src/lib/x86-64-kvm-x86-64-r0.yml
index 9f7a641c..e20a30ab 100644
--- a/packages/platforms/kvm/x86-64/x86-64-kvm-x86-64/platform-config/r0/src/lib/x86-64-kvm-x86-64-r0.yml
+++ b/packages/platforms/kvm/x86-64/x86-64-kvm-x86-64/platform-config/r0/src/lib/x86-64-kvm-x86-64-r0.yml
@@ -24,8 +24,8 @@ x86-64-kvm-x86-64-r0:
       nopat
       console=ttyS0,115200n8
     
-  network
-    interfaces:
-      ma1:
-        name: ~
-        syspath: pci0000:00/0000:00:03.0
+  ##network
+  ##  interfaces:
+  ##    ma1:
+  ##      name: ~
+  ##      syspath: pci0000:00/0000:00:03.0
diff --git a/packages/platforms/quanta/powerpc/powerpc-quanta-lb9/platform-config/r0/src/lib/powerpc-quanta-lb9-r0.yml b/packages/platforms/quanta/powerpc/powerpc-quanta-lb9/platform-config/r0/src/lib/powerpc-quanta-lb9-r0.yml
index 170b83a9..5e6528cd 100644
--- a/packages/platforms/quanta/powerpc/powerpc-quanta-lb9/platform-config/r0/src/lib/powerpc-quanta-lb9-r0.yml
+++ b/packages/platforms/quanta/powerpc/powerpc-quanta-lb9/platform-config/r0/src/lib/powerpc-quanta-lb9-r0.yml
@@ -26,8 +26,8 @@ powerpc-quanta-lb9-r0:
       env_size: 0x00002000
       sector_size: 0x00020000
 
-  network:
-    interfaces:
-      ma1:
-        name: ~
-        syspath: e0000000.soc8541/e0024000.ethernet
+  ##network:
+  ##  interfaces:
+  ##    ma1:
+  ##      name: ~
+  ##      syspath: e0000000.soc8541/e0024000.ethernet
diff --git a/packages/platforms/quanta/powerpc/powerpc-quanta-ly2/platform-config/r0/src/lib/powerpc-quanta-ly2-r0.yml b/packages/platforms/quanta/powerpc/powerpc-quanta-ly2/platform-config/r0/src/lib/powerpc-quanta-ly2-r0.yml
index 29626424..47231061 100644
--- a/packages/platforms/quanta/powerpc/powerpc-quanta-ly2/platform-config/r0/src/lib/powerpc-quanta-ly2-r0.yml
+++ b/packages/platforms/quanta/powerpc/powerpc-quanta-ly2/platform-config/r0/src/lib/powerpc-quanta-ly2-r0.yml
@@ -26,8 +26,8 @@ powerpc-quanta-ly2-r0:
       env_size: 0x00002000
       sector_size: 0x00020000
 
-  network
-    interfaces:
-      ma1:
-        name: ~
-        syspath: soc.0/ffe24000.ethernet
+  ##network
+  ##  interfaces:
+  ##    ma1:
+  ##      name: ~
+  ##      syspath: soc.0/ffe24000.ethernet
diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/x86-64-quanta-ly6-rangeley-r0.yml b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/x86-64-quanta-ly6-rangeley-r0.yml
index ecd6b139..0d6cc8f9 100644
--- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/x86-64-quanta-ly6-rangeley-r0.yml
+++ b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/lib/x86-64-quanta-ly6-rangeley-r0.yml
@@ -23,8 +23,8 @@ x86-64-quanta-ly6-rangeley-r0:
     args: >-
       console=ttyS1,115200n8
 
-  network:
-    interfaces:
-      ma1:
-        name: ~
-        syspath: pci0000:00/0000:00:14.0
+  ##network:
+  ##  interfaces:
+  ##    ma1:
+  ##      name: ~
+  ##      syspath: pci0000:00/0000:00:14.0
diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/platform-config/r0/src/lib/x86-64-quanta-ly8-rangeley-r0.yml b/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/platform-config/r0/src/lib/x86-64-quanta-ly8-rangeley-r0.yml
index 24bd1298..d6d78f2a 100644
--- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/platform-config/r0/src/lib/x86-64-quanta-ly8-rangeley-r0.yml
+++ b/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/platform-config/r0/src/lib/x86-64-quanta-ly8-rangeley-r0.yml
@@ -23,8 +23,8 @@ x86-64-quanta-ly8-rangeley-r0:
     args: >-
       console=ttyS1,115200n8
 
-  network:
-    interfaces:
-      ma1:
-        name: ~
-        syspath: pci0000:00/0000:00:14.0
+  ##network:
+  ##  interfaces:
+  ##    ma1:
+  ##      name: ~
+  ##      syspath: pci0000:00/0000:00:14.0

From 8d27402a3dd1ad46f5c9d51d7007d8057fea6459 Mon Sep 17 00:00:00 2001
From: "Carl D. Roth" <carl.roth@bigswitch.com>
Date: Thu, 19 May 2016 11:30:20 -0700
Subject: [PATCH 11/28] loader init files depend on onl-vendor-config-onl

---
 packages/base/all/initrds/loader-initrd-files/PKG.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/base/all/initrds/loader-initrd-files/PKG.yml b/packages/base/all/initrds/loader-initrd-files/PKG.yml
index 9b8e7022..79489347 100644
--- a/packages/base/all/initrds/loader-initrd-files/PKG.yml
+++ b/packages/base/all/initrds/loader-initrd-files/PKG.yml
@@ -6,6 +6,7 @@ common:
 
 packages:
   - name: onl-loader-initrd-files
+    depends: [ onl-vendor-config-onl ]
     version: 1.0.0
     summary: Open Network Linux System Loader Source Files
 

From 1cd5a85fd9a155f292980f334c4a8edb917652e5 Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Fri, 20 May 2016 00:02:59 +0000
Subject: [PATCH 12/28] Add YAML output files.

---
 tools/make-versions.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/make-versions.py b/tools/make-versions.py
index a5c0ae17..2813c44e 100755
--- a/tools/make-versions.py
+++ b/tools/make-versions.py
@@ -56,6 +56,12 @@ class OnlVersionsGenerator(object):
             with open(fname, "w") as f:
                 json.dump(data, f, indent=2)
 
+        # YAML
+        fname = os.path.join(self.ops.output_dir, basename + '.yml')
+        if not os.path.exists(fname) or self.ops.force:
+            with open(fname, "w") as f:
+                yaml.dump(data, f, default_flow_style=False)
+
         # mk
         fname = os.path.join(self.ops.output_dir, basename + '.mk')
         if not os.path.exists(fname) or self.ops.force:

From 4158ab47c8a1fc2216e1c15d3cdbb2ff05fce9c1 Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Fri, 20 May 2016 00:03:32 +0000
Subject: [PATCH 13/28] - Move version files to versions directory. - Remove
 ENV_JSON option in favor of explicit includes in necessary packages files.

---
 setup.env | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/setup.env b/setup.env
index ed0ae4a9..5c05029b 100755
--- a/setup.env
+++ b/setup.env
@@ -23,10 +23,7 @@ export PATH="$ONL/tools/scripts:$ONL/tools:$PATH"
 export ONL_MAKE_PARALLEL=-j16
 
 # Version files
-$ONL/tools/make-versions.py --import-file=$ONL/tools/onlvi --class-name=OnlVersionImplementation --output-dir $ONL/make
-
-# Make version values available in the package environment
-export ONLPM_OPTION_INCLUDE_ENV_JSON="$ONL/make/version-onl.json"
+$ONL/tools/make-versions.py --import-file=$ONL/tools/onlvi --class-name=OnlVersionImplementation --output-dir $ONL/make/versions
 
 #
 # buildroot download mirror. We suggest you setup a local repository containing these contents for faster local builds.
@@ -41,6 +38,6 @@ $ONL/tools/submodules.py $ONL sm/bigcode
 export ONL_DEBIAN_SUITE=$(lsb_release -c -s)
 
 # Enable local post-merge githook
-if [ ! -f $ONL/.git/hooks/post-merge ]; then
+if [ ! -f $ONL/.git/hooks/post-merge ] && [ -d $ONL/.git ]; then
     cp $ONL/tools/scripts/post-merge.hook $ONL/.git/hooks/post-merge
 fi

From 647e9d3bef44c51a49f95606bd9592a555f78041 Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Fri, 20 May 2016 00:07:26 +0000
Subject: [PATCH 14/28] Mount ONL-BOOT read-write by default.

---
 packages/base/all/initrds/loader-initrd-files/src/etc/mtab.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/base/all/initrds/loader-initrd-files/src/etc/mtab.yml b/packages/base/all/initrds/loader-initrd-files/src/etc/mtab.yml
index 00f64685..8026f979 100644
--- a/packages/base/all/initrds/loader-initrd-files/src/etc/mtab.yml
+++ b/packages/base/all/initrds/loader-initrd-files/src/etc/mtab.yml
@@ -14,6 +14,6 @@ mounts:
     fsck: true
 
   ONL-BOOT:
-    mount: r
+    mount: w
     dir: /mnt/onl/boot
     fsck: false

From 95997e7983decebf25ac4eae45dd406ef2eb583b Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Fri, 20 May 2016 00:08:16 +0000
Subject: [PATCH 15/28] Use the system boot-config from
 /mnt/onl/boot/boot-config if present. If not, use system default
 /etc/onl/boot-config-default if present.

---
 .../base/all/initrds/loader-initrd-files/src/bin/sysinit  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/base/all/initrds/loader-initrd-files/src/bin/sysinit b/packages/base/all/initrds/loader-initrd-files/src/bin/sysinit
index 07b1f2e3..5a42b204 100755
--- a/packages/base/all/initrds/loader-initrd-files/src/bin/sysinit
+++ b/packages/base/all/initrds/loader-initrd-files/src/bin/sysinit
@@ -76,7 +76,13 @@ if [ ! -f /etc/onl/abort ]; then
         cat /etc/issue
     fi
 
-    [ ! -f /mnt/onl/boot/boot-config ] || cat /mnt/onl/boot/boot-config >>/etc/onl/boot-config
+    if [ -f /mnt/onl/boot/boot-config ]; then
+        # Use local boot-config.
+        cp /mnt/onl/boot/boot-config /etc/onl/boot-config
+    elif [ -f /etc/onl/boot-config-default ]; then
+        # Use default boot-config.
+        cp /etc/onl/boot-config-default /etc/onl/boot-config
+    fi
 
     #
     # Initialize the /mnt/flash/boot area.

From dd4ebb7904cba5feae11c4531bc13bbcbba5e9b0 Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Fri, 20 May 2016 00:09:24 +0000
Subject: [PATCH 16/28] Support possible dynamic generation of the boot-config
 if not present.

---
 packages/base/all/initrds/loader-initrd-files/src/bin/banner | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/base/all/initrds/loader-initrd-files/src/bin/banner b/packages/base/all/initrds/loader-initrd-files/src/bin/banner
index bcd344c0..546872ed 100755
--- a/packages/base/all/initrds/loader-initrd-files/src/bin/banner
+++ b/packages/base/all/initrds/loader-initrd-files/src/bin/banner
@@ -23,11 +23,10 @@ field "$ONL_PLATFORM"             "      Platform: $ONL_PLATFORM"
 field "MA1_ADDR"                  "           ma1: $MA1_ADDR"
 echo "*"
 echo "************************************************************"
-if [ -f /etc/onl/boot-config ]; then
+if [ -s /etc/onl/boot-config ]; then
     msg_info "boot-config"
     cat /etc/onl/boot-config
 else
-
     if [ -f /bin/boot-config.py ]; then
         if /bin/boot-config.py configure; then
             echo "The system will now reboot to apply your configuration."
@@ -36,7 +35,7 @@ else
 	    echo "The boot-config script failed." >> /etc/onl/abort
 	fi
     else
-        msg_info "No boot-config"
+        echo "No boot-config." >> /etc/onl/abort
     fi
 fi
 

From 70327a396e39324bb73402d7d5103272736b9ae3 Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Fri, 20 May 2016 00:10:26 +0000
Subject: [PATCH 17/28] Generate the version files if necessary. This is to
 support inclusion in a superproject which does not use the local setup.env.

---
 make/config.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/make/config.mk b/make/config.mk
index 215be80c..cd957fba 100644
--- a/make/config.mk
+++ b/make/config.mk
@@ -29,6 +29,10 @@ export BUILD_DIR_BASE=BUILD/$(ONL_DEBIAN_SUITE)
 # Generate manifest if necessary
 export MODULEMANIFEST := $(shell $(BUILDER)/tools/mmg.py --dirs $(ONL) $(ONLPM_OPTION_PACKAGEDIRS) --out $(ONL)/make/module-manifest.mk --only-if-missing make)
 
+# Generate versions if necessary.
+$(shell $(ONL)/tools/make-versions.py --import-file=$(ONL)/tools/onlvi --class-name=OnlVersionImplementation --output-dir $(ONL)/make/versions)
+
+
 #
 # Default make options.
 #

From f7e3d54e721d9296bc65fa44bb380b8f25f5abb2 Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Fri, 20 May 2016 00:11:43 +0000
Subject: [PATCH 18/28] Removed.

---
 make/Makefile | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 make/Makefile

diff --git a/make/Makefile b/make/Makefile
deleted file mode 100644
index d7a2afeb..00000000
--- a/make/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-############################################################
-#
-# Convenience makefile for generating
-# the local version variables.
-#
-versions.env:
-	$(ONL_V_at) $(MAKE) -f versions.mk ONL_VERSION_ENV_FILE=versions.env
-

From dd93bf58bdf9a30227209bfedbff660bb6f94e7f Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Fri, 20 May 2016 00:12:18 +0000
Subject: [PATCH 19/28] Version ignore.

---
 make/.gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/.gitignore b/make/.gitignore
index d6850c00..4bf19b41 100644
--- a/make/.gitignore
+++ b/make/.gitignore
@@ -1,3 +1,3 @@
-version-onl.*
+versions/
 module-manifest.mk
 

From 9057eb80e25c5b6cf8a2c4479c65f084101e3cb8 Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Fri, 20 May 2016 01:25:36 +0000
Subject: [PATCH 20/28] Version files moved.

---
 builds/amd64/installer/legacy/builds/Makefile         | 4 ++--
 builds/any/installer/grub/builds/Makefile             | 4 ++--
 builds/any/installer/legacy/fit/builds/Makefile       | 4 ++--
 builds/any/installer/uboot/builds/Makefile            | 4 ++--
 builds/any/rootfs/jessie/standard/standard.yml        | 2 +-
 builds/any/rootfs/wheezy/standard/standard.yml        | 2 +-
 packages/base/all/initrds/loader-initrd-files/PKG.yml | 8 ++++----
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/builds/amd64/installer/legacy/builds/Makefile b/builds/amd64/installer/legacy/builds/Makefile
index c32b3bce..e5c06989 100644
--- a/builds/amd64/installer/legacy/builds/Makefile
+++ b/builds/amd64/installer/legacy/builds/Makefile
@@ -13,7 +13,7 @@ MKSHAR_PERMS = autoperms.sh
 
 
 # Hardcoded to match ONL File naming conventions.
-include $(ONL)/make/version-onl.mk
+include $(ONL)/make/versions/version-onl.mk
 INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_LEGACY_INSTALLER
 
 
@@ -28,7 +28,7 @@ __installer:
 	mv ./usr/share/onl/packages/amd64/onl-swi/*.swi .
 	rm -rf ./usr
 	$(ONL_V_at)cp /dev/null $(MKSHAR_PERMS)
-	$(ONL_V_at) cp $(ONL)/make/version-onl.sh .
+	$(ONL_V_at) cp $(ONL)/make/versions/version-onl.sh .
 	$(ONL_V_at)echo "#!/bin/sh" >> $(MKSHAR_PERMS)
 	$(ONL_V_at)echo "set -e" >> $(MKSHAR_PERMS)
 	$(ONL_V_at)echo "set -x" >> $(MKSHAR_PERMS)
diff --git a/builds/any/installer/grub/builds/Makefile b/builds/any/installer/grub/builds/Makefile
index 99be574f..2d1e55a6 100644
--- a/builds/any/installer/grub/builds/Makefile
+++ b/builds/any/installer/grub/builds/Makefile
@@ -10,7 +10,7 @@ MKSHAR_OPTS = --lazy --unzip-pad --fixup-perms autoperms.sh
 MKSHAR_PERMS = autoperms.sh
 
 # Hardcoded to match ONL File naming conventions.
-include $(ONL)/make/version-onl.mk
+include $(ONL)/make/versions/version-onl.mk
 INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_INSTALLER
 
 ifeq ($(ARCH), amd64)
@@ -36,7 +36,7 @@ __installer: __installer_platform_files __installer_swi_files
 	>> installer.sh
 	$(ONL_V_at)echo "PAYLOAD_FOLLOWS" >> installer.sh
 	$(ONL_V_at)cp /dev/null $(MKSHAR_PERMS)
-	$(ONL_V_at)cp $(ONL)/make/version-onl.sh .
+	$(ONL_V_at)cp $(ONL)/make/versions/version-onl.sh .
 	$(ONL_V_at)echo "#!/bin/sh" >> $(MKSHAR_PERMS)
 	$(ONL_V_at)echo "set -e" >> $(MKSHAR_PERMS)
 	$(ONL_V_at)echo "set -x" >> $(MKSHAR_PERMS)
diff --git a/builds/any/installer/legacy/fit/builds/Makefile b/builds/any/installer/legacy/fit/builds/Makefile
index ce7e1c65..7052ebab 100644
--- a/builds/any/installer/legacy/fit/builds/Makefile
+++ b/builds/any/installer/legacy/fit/builds/Makefile
@@ -5,7 +5,7 @@ endif
 THISDIR := $(dir $(lastword $(MAKEFILE_LIST)))
 
 # Hardcoded to match ONL File naming conventions.
-include $(ONL)/make/version-onl.mk
+include $(ONL)/make/versions/version-onl.mk
 INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_LEGACY_INSTALLER
 
 FIT_IMAGE_ALL := $(shell $(ONLPM) --find-file onl-loader-fit:$(ARCH) onl-loader-fit.itb)
@@ -28,7 +28,7 @@ ifndef NO_SWI
 endif
 	rm -rf ./usr
 	$(ONL_V_at)cp /dev/null $(MKSHAR_PERMS)
-	$(ONL_V_at) cp $(ONL)/make/version-onl.sh .
+	$(ONL_V_at) cp $(ONL)/make/versions/version-onl.sh .
 	$(ONL_V_at)echo "#!/bin/sh" >> $(MKSHAR_PERMS)
 	$(ONL_V_at)echo "set -e" >> $(MKSHAR_PERMS)
 	$(ONL_V_at)echo "set -x" >> $(MKSHAR_PERMS)
diff --git a/builds/any/installer/uboot/builds/Makefile b/builds/any/installer/uboot/builds/Makefile
index ea5ad357..eae9c217 100644
--- a/builds/any/installer/uboot/builds/Makefile
+++ b/builds/any/installer/uboot/builds/Makefile
@@ -14,7 +14,7 @@ PYFIT = $(VONLDIR)/src/bin/pyfit
 PYFIT_ENVIRONMENT = PYTHONPATH=$(VONLDIR)/src/python
 
 # Hardcoded to match ONL File naming conventions.
-include $(ONL)/make/version-onl.mk
+include $(ONL)/make/versions/version-onl.mk
 INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_INSTALLER
 
 # default fit image can be used as the canonical location for the initrd
@@ -25,7 +25,7 @@ INITRD_BOUNDS := $(shell $(PYFIT_ENVIRONMENT) $(PYFIT) -v offset $(FIT_IMAGE_ALL
 __installer: installer.sh __installer_fit_files __installer_platform_files __installer_swi_files
 	$(ONL_V_at)rm -rf *INSTALLER* *.md5sum
 	$(ONL_V_at)cp /dev/null $(MKSHAR_PERMS)
-	$(ONL_V_at)cp $(ONL)/make/version-onl.sh .
+	$(ONL_V_at)cp $(ONL)/make/versions/version-onl.sh .
 	$(ONL_V_at)echo "#!/bin/sh" >> $(MKSHAR_PERMS)
 	$(ONL_V_at)echo "set -e" >> $(MKSHAR_PERMS)
 	$(ONL_V_at)echo "set -x" >> $(MKSHAR_PERMS)
diff --git a/builds/any/rootfs/jessie/standard/standard.yml b/builds/any/rootfs/jessie/standard/standard.yml
index 7266fa7d..c3b22d8e 100644
--- a/builds/any/rootfs/jessie/standard/standard.yml
+++ b/builds/any/rootfs/jessie/standard/standard.yml
@@ -89,5 +89,5 @@ Configure:
       password: onl
 
   manifest:
-    version: $ONL/make/version-onl.json
+    version: $ONL/make/versions/version-onl.json
     platforms: $PLATFORM_LIST
diff --git a/builds/any/rootfs/wheezy/standard/standard.yml b/builds/any/rootfs/wheezy/standard/standard.yml
index f7f04c32..1ba7a3d4 100644
--- a/builds/any/rootfs/wheezy/standard/standard.yml
+++ b/builds/any/rootfs/wheezy/standard/standard.yml
@@ -91,5 +91,5 @@ Configure:
       password: onl
 
   manifest:
-    version: $ONL/make/version-onl.json
+    version: $ONL/make/versions/version-onl.json
     platforms: $PLATFORM_LIST
diff --git a/packages/base/all/initrds/loader-initrd-files/PKG.yml b/packages/base/all/initrds/loader-initrd-files/PKG.yml
index 3ae21ef7..09237084 100644
--- a/packages/base/all/initrds/loader-initrd-files/PKG.yml
+++ b/packages/base/all/initrds/loader-initrd-files/PKG.yml
@@ -15,10 +15,10 @@ packages:
       - src/lib : /lib
       - src/bootmodes : /bootmodes
       - src/python: /usr/lib/python2.7/site-packages
-      - $ONL/make/version-onl.sh :   /etc/onl/loader/versions.sh
-      - $ONL/make/version-onl.json : /etc/onl/loader/versions.json
-      - $ONL/make/version-onl.mk :   /etc/onl/loader/versions.mk
-      
+      - $ONL/make/versions/version-onl.sh :   /etc/onl/loader/versions.sh
+      - $ONL/make/versions/version-onl.json : /etc/onl/loader/versions.json
+      - $ONL/make/versions/version-onl.mk :   /etc/onl/loader/versions.mk
+
     changelog:  Change changes changes.,
 
 

From 4bfad168fbb0cf9f665b51726448b9688a9e339f Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Fri, 20 May 2016 01:25:48 +0000
Subject: [PATCH 21/28] Include the version files contents as PKG variables.

---
 builds/any/installer/APKG.yml        | 2 ++
 builds/any/installer/legacy/APKG.yml | 2 ++
 builds/any/rootfs/APKG.yml           | 3 +++
 builds/any/swi/APKG.yml              | 2 ++
 4 files changed, 9 insertions(+)

diff --git a/builds/any/installer/APKG.yml b/builds/any/installer/APKG.yml
index 62ad5191..4c96a4f9 100644
--- a/builds/any/installer/APKG.yml
+++ b/builds/any/installer/APKG.yml
@@ -1,3 +1,5 @@
+variables:
+  !include $ONL/make/versions/version-onl.yml
 
 prerequisites:
   broken: true
diff --git a/builds/any/installer/legacy/APKG.yml b/builds/any/installer/legacy/APKG.yml
index a53d0129..26106bd6 100644
--- a/builds/any/installer/legacy/APKG.yml
+++ b/builds/any/installer/legacy/APKG.yml
@@ -1,3 +1,5 @@
+variables:
+  !include $ONL/make/versions/version-onl.yml
 
 prerequisites:
   broken: true
diff --git a/builds/any/rootfs/APKG.yml b/builds/any/rootfs/APKG.yml
index 114d10c2..7a716da9 100644
--- a/builds/any/rootfs/APKG.yml
+++ b/builds/any/rootfs/APKG.yml
@@ -1,3 +1,6 @@
+variables:
+  !include $ONL/make/versions/version-onl.yml
+
 prerequisites:
   broken: true
 
diff --git a/builds/any/swi/APKG.yml b/builds/any/swi/APKG.yml
index c7ca8ea1..8d87930b 100644
--- a/builds/any/swi/APKG.yml
+++ b/builds/any/swi/APKG.yml
@@ -1,3 +1,5 @@
+variables:
+  !include $ONL/make/versions/version-onl.yml
 
 prerequisites:
   broken: true

From e9facee6c481d83aa72b54f0b62e698234c54ff3 Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Fri, 20 May 2016 14:28:35 +0000
Subject: [PATCH 22/28] Add new LED mode AUTO_BLINKING.

---
 packages/base/any/onlp/src/onlp/module/auto/onlp.yml    | 2 ++
 packages/base/any/onlp/src/onlp/module/inc/onlp/led.h   | 2 ++
 packages/base/any/onlp/src/onlp/module/src/onlp_enums.c | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/packages/base/any/onlp/src/onlp/module/auto/onlp.yml b/packages/base/any/onlp/src/onlp/module/auto/onlp.yml
index 972d47eb..9d4255f1 100644
--- a/packages/base/any/onlp/src/onlp/module/auto/onlp.yml
+++ b/packages/base/any/onlp/src/onlp/module/auto/onlp.yml
@@ -179,6 +179,7 @@ led_caps: &led_caps
 - PURPLE            : (1 << 20)
 - PURPLE_BLINKING   : (1 << 21)
 - AUTO              : (1 << 22)
+- AUTO_BLINKING     : (1 << 23)
 
 # LED status
 led_status: &led_status
@@ -205,6 +206,7 @@ led_mode: &led_mode
 - 'PURPLE' : 20
 - 'PURPLE_BLINKING' : 21
 - 'AUTO' : 22
+- 'AUTO_BLINKING' : 23
 
 # PSU Status
 psu_status: &psu_status
diff --git a/packages/base/any/onlp/src/onlp/module/inc/onlp/led.h b/packages/base/any/onlp/src/onlp/module/inc/onlp/led.h
index 2909b9df..1c99843e 100644
--- a/packages/base/any/onlp/src/onlp/module/inc/onlp/led.h
+++ b/packages/base/any/onlp/src/onlp/module/inc/onlp/led.h
@@ -46,6 +46,7 @@ typedef enum onlp_led_caps_e {
     ONLP_LED_CAPS_PURPLE = (1 << 20),
     ONLP_LED_CAPS_PURPLE_BLINKING = (1 << 21),
     ONLP_LED_CAPS_AUTO = (1 << 22),
+    ONLP_LED_CAPS_AUTO_BLINKING = (1 << 23),
 } onlp_led_caps_t;
 
 /** onlp_led_mode */
@@ -66,6 +67,7 @@ typedef enum onlp_led_mode_e {
     ONLP_LED_MODE_PURPLE = 20,
     ONLP_LED_MODE_PURPLE_BLINKING = 21,
     ONLP_LED_MODE_AUTO = 22,
+    ONLP_LED_MODE_AUTO_BLINKING = 23,
 } onlp_led_mode_t;
 
 /** onlp_led_status */
diff --git a/packages/base/any/onlp/src/onlp/module/src/onlp_enums.c b/packages/base/any/onlp/src/onlp/module/src/onlp_enums.c
index f5c9a74d..78a169ae 100644
--- a/packages/base/any/onlp/src/onlp/module/src/onlp_enums.c
+++ b/packages/base/any/onlp/src/onlp/module/src/onlp_enums.c
@@ -296,6 +296,7 @@ aim_map_si_t onlp_led_caps_map[] =
     { "PURPLE", ONLP_LED_CAPS_PURPLE },
     { "PURPLE_BLINKING", ONLP_LED_CAPS_PURPLE_BLINKING },
     { "AUTO", ONLP_LED_CAPS_AUTO },
+    { "AUTO_BLINKING", ONLP_LED_CAPS_AUTO_BLINKING },
     { NULL, 0 }
 };
 
@@ -316,6 +317,7 @@ aim_map_si_t onlp_led_caps_desc_map[] =
     { "None", ONLP_LED_CAPS_PURPLE },
     { "None", ONLP_LED_CAPS_PURPLE_BLINKING },
     { "None", ONLP_LED_CAPS_AUTO },
+    { "None", ONLP_LED_CAPS_AUTO_BLINKING },
     { NULL, 0 }
 };
 
@@ -383,6 +385,7 @@ aim_map_si_t onlp_led_mode_map[] =
     { "PURPLE", ONLP_LED_MODE_PURPLE },
     { "PURPLE_BLINKING", ONLP_LED_MODE_PURPLE_BLINKING },
     { "AUTO", ONLP_LED_MODE_AUTO },
+    { "AUTO_BLINKING", ONLP_LED_MODE_AUTO_BLINKING },
     { NULL, 0 }
 };
 
@@ -404,6 +407,7 @@ aim_map_si_t onlp_led_mode_desc_map[] =
     { "None", ONLP_LED_MODE_PURPLE },
     { "None", ONLP_LED_MODE_PURPLE_BLINKING },
     { "None", ONLP_LED_MODE_AUTO },
+    { "None", ONLP_LED_MODE_AUTO_BLINKING },
     { NULL, 0 }
 };
 

From 89a4fe3f2446b54d1ca1beb2426b199978f422b4 Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Fri, 20 May 2016 14:29:41 +0000
Subject: [PATCH 23/28] Version files have moved.

---
 packages/base/any/initrds/loader/builds/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/base/any/initrds/loader/builds/Makefile b/packages/base/any/initrds/loader/builds/Makefile
index b117a086..a60ba9f9 100644
--- a/packages/base/any/initrds/loader/builds/Makefile
+++ b/packages/base/any/initrds/loader/builds/Makefile
@@ -27,7 +27,7 @@ $(TARGET):
 	$(ONLPM) --sudo $(foreach p,$(PLATFORM_PACKAGES),--extract-dir $(p) $(ROOT))
 	$(MAKE) __vendor_config_data
 	$(ONLPM) --sudo --force --extract-dir onl-vendor-config-onl:all $(ROOT)
-	$(ONL)/tools/sjson.py --kj version $(ONL)/make/version-onl.json --kl platforms $(PLATFORMS) --kv arch $(ARCH) --out manifest.json
+	$(ONL)/tools/sjson.py --kj version $(ONL)/make/versions/version-onl.json --kl platforms $(PLATFORMS) --kv arch $(ARCH) --out manifest.json
 	sudo mkdir -p $(ROOT)/etc/onl/loader && sudo cp manifest.json $(ROOT)/etc/onl/loader
 	sudo $(ONL)/tools/makedevs -d $(ROOT)/etc/rootperms $(abspath $(ROOT))
 	sudo $(ONL)/tools/cpiomod.py --cpio onl-buildroot-initrd-$(ARCH).cpio.gz --add-directory $(ROOT) --out $@

From 3174eb6db1c80bf8eeb6af4f855c29c58a4f5ddf Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Fri, 20 May 2016 14:53:45 +0000
Subject: [PATCH 24/28] Make the RELEASE directory customizable.

---
 tools/onlpm.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/onlpm.py b/tools/onlpm.py
index d45b2e29..11b93099 100755
--- a/tools/onlpm.py
+++ b/tools/onlpm.py
@@ -548,8 +548,9 @@ class OnlPackageGroup(object):
                                                       dict(),
                                                       OnlPackageError)
             for f in release_list:
-                # Todo -- customize
-                dst = os.path.join(os.getenv('ONL'), 'RELEASE', g_dist_codename, f[1])
+                release_dir = os.environ.get('ONLPM_OPTION_RELEASE_DIR',
+                                             os.path.join(os.environ.get('ONL', 'RELEASE')))
+                dst = os.path.join(release_dir, g_dist_codename, f[1])
                 if not os.path.exists(dst):
                     os.makedirs(dst)
                 logger.info("Releasing %s -> %s" % (os.path.basename(f[0]), dst))

From 6eab05f1de36e2de5bf3154ca53ebf0a67053a15 Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Fri, 20 May 2016 16:49:30 +0000
Subject: [PATCH 25/28] initdev -> initmounts

---
 packages/base/all/boot.d/src/50.initdev    | 19 -------------------
 packages/base/all/boot.d/src/50.initmounts |  6 ++++++
 2 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 100755 packages/base/all/boot.d/src/50.initdev
 create mode 100755 packages/base/all/boot.d/src/50.initmounts

diff --git a/packages/base/all/boot.d/src/50.initdev b/packages/base/all/boot.d/src/50.initdev
deleted file mode 100755
index 9fbc1152..00000000
--- a/packages/base/all/boot.d/src/50.initdev
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-. /lib/lsb/init-functions
-
-log_action_begin_msg "Setting up block and net devices"
-
-ln -snf /proc/mounts /etc/mtab
-
-( cd /sys/class/block; for d in *; do /sbin/initblockdev $d add; done )
-if [ -d /sys/class/ubi ]; then
-    ( cd /sys/class/ubi; for d in *; do /sbin/initblockdev $d add; done )
-fi
-( cd /sys/class/net; for d in *; do /sbin/initnetdev $d add; done )
-
-log_action_end_msg 0
-
-log_action_begin_msg "Mounting filesystems"
-initmounts -q
-log_action_end_msg 0
diff --git a/packages/base/all/boot.d/src/50.initmounts b/packages/base/all/boot.d/src/50.initmounts
new file mode 100755
index 00000000..8aa7ca5b
--- /dev/null
+++ b/packages/base/all/boot.d/src/50.initmounts
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+. /lib/lsb/init-functions
+log_action_begin_msg "Mounting filesystems..."
+initmounts -q
+log_action_end_msg 0

From 3727a226e7a8dc7a6117f76bffe30861a870148a Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Fri, 20 May 2016 16:52:24 +0000
Subject: [PATCH 26/28] Latest

---
 packages/platforms-closed | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/platforms-closed b/packages/platforms-closed
index 1bea6253..5628d2f2 160000
--- a/packages/platforms-closed
+++ b/packages/platforms-closed
@@ -1 +1 @@
-Subproject commit 1bea6253f9814607df5c51a7cf5e1ee509331a37
+Subproject commit 5628d2f2e43a78b9faa33428575e8e322899d3c7

From 58ec3fadbf821190a0e6aaea9aa32e8b358d10fa Mon Sep 17 00:00:00 2001
From: Steven Noble <snoble@sonn.com>
Date: Mon, 23 May 2016 12:05:40 -0700
Subject: [PATCH 27/28] updated install.sh to reference new location of version
 files (#84)

---
 tools/autobuild/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/autobuild/install.sh b/tools/autobuild/install.sh
index e04b0289..dddc2bfa 100755
--- a/tools/autobuild/install.sh
+++ b/tools/autobuild/install.sh
@@ -68,7 +68,7 @@ if [ -z "$REMOTE_PASS" ]; then
 fi
 
 
-. $ONL/make/version-onl.sh
+. $ONL/make/versions/version-onl.sh
 REMOTE_DIR="$REMOTE_BASE_DIR/$BUILD_BRANCH/$FNAME_BUILD_ID"
 
 workdir=$(mktemp -d -t update-XXXXXX)

From 5141acb92e8de65417c931466bbc0ae6da785cdd Mon Sep 17 00:00:00 2001
From: Steven Noble <snoble@sonn.com>
Date: Mon, 23 May 2016 14:13:34 -0700
Subject: [PATCH 28/28] add default RELEASE directory to setup.env (#85)

---
 setup.env | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setup.env b/setup.env
index 5c05029b..56d0ad37 100755
--- a/setup.env
+++ b/setup.env
@@ -15,6 +15,9 @@ export ONLPM_OPTION_PACKAGEDIRS="$ONL/packages:$ONL/builds"
 # The ONL repo dir is here:
 export ONLPM_OPTION_REPO="$ONL/REPO"
 
+# The default RELEASE dir is here:
+export ONLPM_OPTION_RELEASE_DIR="$ONL/RELEASE"
+
 # The ONL build tools should be included in the local path:
 export PATH="$ONL/tools/scripts:$ONL/tools:$PATH"