Date: Tue, 15 May 2012 15:00:26 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r235476 - projects/zfsd/head/sys/cam/scsi Message-ID: <201205151500.q4FF0Ql2092678@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Tue May 15 15:00:26 2012 New Revision: 235476 URL: http://svn.freebsd.org/changeset/base/235476 Log: mmm, fix for a fix. :( Modified: projects/zfsd/head/sys/cam/scsi/scsi_ses.h Modified: projects/zfsd/head/sys/cam/scsi/scsi_ses.h ============================================================================== --- projects/zfsd/head/sys/cam/scsi/scsi_ses.h Tue May 15 14:46:22 2012 (r235475) +++ projects/zfsd/head/sys/cam/scsi/scsi_ses.h Tue May 15 15:00:26 2012 (r235476) @@ -1072,8 +1072,8 @@ enum ses_status_dev_slot_field_data { GEN_SES_STATUS_DEV_SLOT_ACCESSORS(app_client_byped_a, APP_CLIENT_BYPED_A) GEN_SES_STATUS_DEV_SLOT_ACCESSORS(do_not_remove, DO_NOT_REMOVE) -GEN_SES_STATUS_DEV_SLOT_ACCESSORS(enclosure_byped_a, enclosure_BYPED_A) -GEN_SES_STATUS_DEV_SLOT_ACCESSORS(enclosure_byped_b, enclosure_BYPED_B) +GEN_SES_STATUS_DEV_SLOT_ACCESSORS(enclosure_byped_a, ENCLOSURE_BYPED_A) +GEN_SES_STATUS_DEV_SLOT_ACCESSORS(enclosure_byped_b, ENCLOSURE_BYPED_B) GEN_SES_STATUS_DEV_SLOT_ACCESSORS(insert_ready, INSERT_READY) GEN_SES_STATUS_DEV_SLOT_ACCESSORS(remove, REMOVE) GEN_SES_STATUS_DEV_SLOT_ACCESSORS(ident, IDENT) @@ -1673,49 +1673,49 @@ struct ses_status_enclosure { }; enum ses_status_enclosure_field_data { - SES_STATUS_enclosure_IDENT_BYTE = 0, - SES_STATUS_enclosure_IDENT_MASK = 0x80, - SES_STATUS_enclosure_IDENT_SHIFT = 7, - - SES_STATUS_enclosure_TIME_UNTIL_POWER_CYCLE_BYTE = 1, - SES_STATUS_enclosure_TIME_UNTIL_POWER_CYCLE_MASK = 0xFC, - SES_STATUS_enclosure_TIME_UNTIL_POWER_CYCLE_SHIFT = 2, - - SES_STATUS_enclosure_FAIL_BYTE = 1, - SES_STATUS_enclosure_FAIL_MASK = 0x02, - SES_STATUS_enclosure_FAIL_SHIFT = 1, - - SES_STATUS_enclosure_WARN_BYTE = 1, - SES_STATUS_enclosure_WARN_MASK = 0x01, - SES_STATUS_enclosure_WARN_SHIFT = 0, - - SES_STATUS_enclosure_REQUESTED_POWER_OFF_DURATION_BYTE = 2, - SES_STATUS_enclosure_REQUESTED_POWER_OFF_DURATION_MASK = 0xFC, - SES_STATUS_enclosure_REQUESTED_POWER_OFF_DURATION_SHIFT = 2, - SES_STATUS_enclosure_REQUESTED_POWER_OFF_DURATION_MAX_AUTO = 60, - SES_STATUS_enclosure_REQUESTED_POWER_OFF_DURATION_MANUAL = 63, - - SES_STATUS_enclosure_REQUESTED_FAIL_BYTE = 2, - SES_STATUS_enclosure_REQUESTED_FAIL_MASK = 0x02, - SES_STATUS_enclosure_REQUESTED_FAIL_SHIFT = 1, - - SES_STATUS_enclosure_REQUESTED_WARN_BYTE = 2, - SES_STATUS_enclosure_REQUESTED_WARN_MASK = 0x01, - SES_STATUS_enclosure_REQUESTED_WARN_SHIFT = 0 -}; - -#define GEN_SES_STATUS_enclosure_ACCESSORS(LCASE, UCASE) \ - GEN_GETTER(ses_status_enclosure, SES_STATUS_enclosure, LCASE, UCASE) -GEN_SES_STATUS_enclosure_ACCESSORS(ident, IDENT) -GEN_SES_STATUS_enclosure_ACCESSORS(time_until_power_cycle, + SES_STATUS_ENCLOSURE_IDENT_BYTE = 0, + SES_STATUS_ENCLOSURE_IDENT_MASK = 0x80, + SES_STATUS_ENCLOSURE_IDENT_SHIFT = 7, + + SES_STATUS_ENCLOSURE_TIME_UNTIL_POWER_CYCLE_BYTE = 1, + SES_STATUS_ENCLOSURE_TIME_UNTIL_POWER_CYCLE_MASK = 0xFC, + SES_STATUS_ENCLOSURE_TIME_UNTIL_POWER_CYCLE_SHIFT = 2, + + SES_STATUS_ENCLOSURE_FAIL_BYTE = 1, + SES_STATUS_ENCLOSURE_FAIL_MASK = 0x02, + SES_STATUS_ENCLOSURE_FAIL_SHIFT = 1, + + SES_STATUS_ENCLOSURE_WARN_BYTE = 1, + SES_STATUS_ENCLOSURE_WARN_MASK = 0x01, + SES_STATUS_ENCLOSURE_WARN_SHIFT = 0, + + SES_STATUS_ENCLOSURE_REQUESTED_POWER_OFF_DURATION_BYTE = 2, + SES_STATUS_ENCLOSURE_REQUESTED_POWER_OFF_DURATION_MASK = 0xFC, + SES_STATUS_ENCLOSURE_REQUESTED_POWER_OFF_DURATION_SHIFT = 2, + SES_STATUS_ENCLOSURE_REQUESTED_POWER_OFF_DURATION_MAX_AUTO = 60, + SES_STATUS_ENCLOSURE_REQUESTED_POWER_OFF_DURATION_MANUAL = 63, + + SES_STATUS_ENCLOSURE_REQUESTED_FAIL_BYTE = 2, + SES_STATUS_ENCLOSURE_REQUESTED_FAIL_MASK = 0x02, + SES_STATUS_ENCLOSURE_REQUESTED_FAIL_SHIFT = 1, + + SES_STATUS_ENCLOSURE_REQUESTED_WARN_BYTE = 2, + SES_STATUS_ENCLOSURE_REQUESTED_WARN_MASK = 0x01, + SES_STATUS_ENCLOSURE_REQUESTED_WARN_SHIFT = 0 +}; + +#define GEN_SES_STATUS_ENCLOSURE_ACCESSORS(LCASE, UCASE) \ + GEN_GETTER(ses_status_enclosure, SES_STATUS_ENCLOSURE, LCASE, UCASE) +GEN_SES_STATUS_ENCLOSURE_ACCESSORS(ident, IDENT) +GEN_SES_STATUS_ENCLOSURE_ACCESSORS(time_until_power_cycle, TIME_UNTIL_POWER_CYCLE) -GEN_SES_STATUS_enclosure_ACCESSORS(fail, FAIL) -GEN_SES_STATUS_enclosure_ACCESSORS(warn, WARN) -GEN_SES_STATUS_enclosure_ACCESSORS(requested_power_off_duration, +GEN_SES_STATUS_ENCLOSURE_ACCESSORS(fail, FAIL) +GEN_SES_STATUS_ENCLOSURE_ACCESSORS(warn, WARN) +GEN_SES_STATUS_ENCLOSURE_ACCESSORS(requested_power_off_duration, REQUESTED_POWER_OFF_DURATION) -GEN_SES_STATUS_enclosure_ACCESSORS(requested_fail, REQUESTED_FAIL) -GEN_SES_STATUS_enclosure_ACCESSORS(requested_warn, REQUESTED_WARN) -#undef GEN_SES_STATUS_enclosure_ACCESSORS +GEN_SES_STATUS_ENCLOSURE_ACCESSORS(requested_fail, REQUESTED_FAIL) +GEN_SES_STATUS_ENCLOSURE_ACCESSORS(requested_warn, REQUESTED_WARN) +#undef GEN_SES_STATUS_ENCLOSURE_ACCESSORS /*------------------- SCSI Port/Transceiver Status Element -------------------*/ struct ses_status_scsi_port_or_xcvr {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205151500.q4FF0Ql2092678>