@@ -3962,13 +3962,41 @@ struct nvme_phy_rx_eom_log {
39623962};
39633963
39643964/**
3965- * enum nvme_eom_optional_data - EOM Optional Data Present Fields
3965+ * enum nvme_eom_optional_data_present - EOM Optional Data Present Fields
3966+ * @NVME_EOM_ODP_PEFP_SHIFT: Shift amount to get the printable eye field present
3967+ * from the &struct nvme_phy_rx_eom_log.odp field.
3968+ * @NVME_EOM_ODP_EDFP_SHIFT: Shift amount to get the eye data field present
3969+ * from the &struct nvme_phy_rx_eom_log.odp field.
3970+ * @NVME_EOM_ODP_RSVD_SHIFT: Shift amount to get the reserved optional data present
3971+ * from the &struct nvme_phy_rx_eom_log.odp field.
3972+ * @NVME_EOM_ODP_PEFP_MASK: Mask to get the printable eye field present
3973+ * from the &struct nvme_phy_rx_eom_log.odp field.
3974+ * @NVME_EOM_ODP_EDFP_MASK: Mask to get the eye data field present
3975+ * from the &struct nvme_phy_rx_eom_log.odp field.
3976+ * @NVME_EOM_ODP_RSVD_MASK: Mask to get the reserved data present
3977+ * from the &struct nvme_phy_rx_eom_log.odp field.
3978+ */
3979+ enum nvme_eom_optional_data_present {
3980+ NVME_EOM_ODP_PEFP_SHIFT = 0 ,
3981+ NVME_EOM_ODP_EDFP_SHIFT = 1 ,
3982+ NVME_EOM_ODP_RSVD_SHIFT = 2 ,
3983+ NVME_EOM_ODP_PEFP_MASK = 0x1 ,
3984+ NVME_EOM_ODP_EDFP_MASK = 0x1 ,
3985+ NVME_EOM_ODP_RSVD_MASK = 0x3f ,
3986+ };
3987+
3988+ #define NVME_EOM_ODP_PEFP (odp ) NVME_GET(odp, EOM_ODP_PEFP)
3989+ #define NVME_EOM_ODP_EDFP (odp ) NVME_GET(odp, EOM_ODP_EDFP)
3990+ #define NVME_EOM_ODP_RSVD (odp ) NVME_GET(odp, EOM_ODP_RSVD)
3991+
3992+ /**
3993+ * enum nvme_eom_optional_data - EOM Optional Data Present Fields (Deprecated)
39663994 * @NVME_EOM_PRINTABLE_EYE_PRESENT: Printable Eye Present
39673995 * @NVME_EOM_EYE_DATA_PRESENT: Eye Data Present
39683996 */
39693997enum nvme_eom_optional_data {
3970- NVME_EOM_PRINTABLE_EYE_PRESENT = 0x1 << 0 ,
3971- NVME_EOM_EYE_DATA_PRESENT = 0x1 << 1 ,
3998+ NVME_EOM_PRINTABLE_EYE_PRESENT = NVME_EOM_ODP_PEFP_MASK << NVME_EOM_ODP_PEFP_SHIFT ,
3999+ NVME_EOM_EYE_DATA_PRESENT = NVME_EOM_ODP_EDFP_MASK << NVME_EOM_ODP_EDFP_SHIFT ,
39724000};
39734001
39744002/**
0 commit comments