svn commit: r235475 - projects/zfsd/head/sys/cam/scsi
Alexander Motin
mav at FreeBSD.org
Tue May 15 14:46:23 UTC 2012
Author: mav
Date: Tue May 15 14:46:22 2012
New Revision: 235475
URL: http://svn.freebsd.org/changeset/base/235475
Log:
Fix misreplacement: enclosure/seslosure.
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 13:23:44 2012 (r235474)
+++ projects/zfsd/head/sys/cam/scsi/scsi_ses.h Tue May 15 14:46:22 2012 (r235475)
@@ -622,46 +622,46 @@ struct ses_ctrl_enclosure {
};
enum ses_ctrl_enclosure_field_data {
- SES_CTRL_SESLOSURE_RQST_IDENT_BYTE = 0,
- SES_CTRL_SESLOSURE_RQST_IDENT_MASK = 0x80,
- SES_CTRL_SESLOSURE_RQST_IDENT_SHIFT = 7,
-
- SES_CTRL_SESLOSURE_POWER_CYCLE_RQST_BYTE = 1,
- SES_CTRL_SESLOSURE_POWER_CYCLE_RQST_MASK = 0xC0,
- SES_CTRL_SESLOSURE_POWER_CYCLE_RQST_SHIFT = 6,
- SES_CTRL_SESLOSURE_POWER_CYCLE_RQST_NONE = 0x0,
- SES_CTRL_SESLOSURE_POWER_CYCLE_RQST_AFTER_DELAY = 0x1,
- SES_CTRL_SESLOSURE_POWER_CYCLE_RQST_CANCEL = 0x2,
-
- SES_CTRL_SESLOSURE_POWER_CYCLE_DELAY_BYTE = 1,
- SES_CTRL_SESLOSURE_POWER_CYCLE_DELAY_MASK = 0x3F,
- SES_CTRL_SESLOSURE_POWER_CYCLE_DELAY_SHIFT = 0,
- SES_CTRL_SESLOSURE_POWER_CYCLE_DELAY_MAX = 60,/*minutes*/
-
- SES_CTRL_SESLOSURE_POWER_OFF_DURATION_BYTE = 2,
- SES_CTRL_SESLOSURE_POWER_OFF_DURATION_MASK = 0xFC,
- SES_CTRL_SESLOSURE_POWER_OFF_DURATION_SHIFT = 2,
- SES_CTRL_SESLOSURE_POWER_OFF_DURATION_MAX_AUTO = 60,
- SES_CTRL_SESLOSURE_POWER_OFF_DURATION_MANUAL = 63,
-
- SES_CTRL_SESLOSURE_RQST_FAIL_BYTE = 2,
- SES_CTRL_SESLOSURE_RQST_FAIL_MASK = 0x02,
- SES_CTRL_SESLOSURE_RQST_FAIL_SHIFT = 1,
-
- SES_CTRL_SESLOSURE_RQST_WARN_BYTE = 2,
- SES_CTRL_SESLOSURE_RQST_WARN_MASK = 0x01,
- SES_CTRL_SESLOSURE_RQST_WARN_SHIFT = 0
-};
-
-#define GEN_SES_CTRL_SESLOSURE_ACCESSORS(LCASE, UCASE) \
- GEN_ACCESSORS(ses_ctrl_enclosure, SES_CTRL_SESLOSURE, LCASE, UCASE)
-GEN_SES_CTRL_SESLOSURE_ACCESSORS(rqst_ident, RQST_IDENT)
-GEN_SES_CTRL_SESLOSURE_ACCESSORS(power_cycle_rqst, POWER_CYCLE_RQST)
-GEN_SES_CTRL_SESLOSURE_ACCESSORS(power_cycle_delay, POWER_CYCLE_DELAY)
-GEN_SES_CTRL_SESLOSURE_ACCESSORS(power_off_duration, POWER_OFF_DURATION)
-GEN_SES_CTRL_SESLOSURE_ACCESSORS(rqst_fail, RQST_FAIL)
-GEN_SES_CTRL_SESLOSURE_ACCESSORS(rqst_warn, RQST_WARN)
-#undef GEN_SES_CTRL_SESLOSURE_ACCESSORS
+ SES_CTRL_ENCLOSURE_RQST_IDENT_BYTE = 0,
+ SES_CTRL_ENCLOSURE_RQST_IDENT_MASK = 0x80,
+ SES_CTRL_ENCLOSURE_RQST_IDENT_SHIFT = 7,
+
+ SES_CTRL_ENCLOSURE_POWER_CYCLE_RQST_BYTE = 1,
+ SES_CTRL_ENCLOSURE_POWER_CYCLE_RQST_MASK = 0xC0,
+ SES_CTRL_ENCLOSURE_POWER_CYCLE_RQST_SHIFT = 6,
+ SES_CTRL_ENCLOSURE_POWER_CYCLE_RQST_NONE = 0x0,
+ SES_CTRL_ENCLOSURE_POWER_CYCLE_RQST_AFTER_DELAY = 0x1,
+ SES_CTRL_ENCLOSURE_POWER_CYCLE_RQST_CANCEL = 0x2,
+
+ SES_CTRL_ENCLOSURE_POWER_CYCLE_DELAY_BYTE = 1,
+ SES_CTRL_ENCLOSURE_POWER_CYCLE_DELAY_MASK = 0x3F,
+ SES_CTRL_ENCLOSURE_POWER_CYCLE_DELAY_SHIFT = 0,
+ SES_CTRL_ENCLOSURE_POWER_CYCLE_DELAY_MAX = 60,/*minutes*/
+
+ SES_CTRL_ENCLOSURE_POWER_OFF_DURATION_BYTE = 2,
+ SES_CTRL_ENCLOSURE_POWER_OFF_DURATION_MASK = 0xFC,
+ SES_CTRL_ENCLOSURE_POWER_OFF_DURATION_SHIFT = 2,
+ SES_CTRL_ENCLOSURE_POWER_OFF_DURATION_MAX_AUTO = 60,
+ SES_CTRL_ENCLOSURE_POWER_OFF_DURATION_MANUAL = 63,
+
+ SES_CTRL_ENCLOSURE_RQST_FAIL_BYTE = 2,
+ SES_CTRL_ENCLOSURE_RQST_FAIL_MASK = 0x02,
+ SES_CTRL_ENCLOSURE_RQST_FAIL_SHIFT = 1,
+
+ SES_CTRL_ENCLOSURE_RQST_WARN_BYTE = 2,
+ SES_CTRL_ENCLOSURE_RQST_WARN_MASK = 0x01,
+ SES_CTRL_ENCLOSURE_RQST_WARN_SHIFT = 0
+};
+
+#define GEN_SES_CTRL_ENCLOSURE_ACCESSORS(LCASE, UCASE) \
+ GEN_ACCESSORS(ses_ctrl_enclosure, SES_CTRL_ENCLOSURE, LCASE, UCASE)
+GEN_SES_CTRL_ENCLOSURE_ACCESSORS(rqst_ident, RQST_IDENT)
+GEN_SES_CTRL_ENCLOSURE_ACCESSORS(power_cycle_rqst, POWER_CYCLE_RQST)
+GEN_SES_CTRL_ENCLOSURE_ACCESSORS(power_cycle_delay, POWER_CYCLE_DELAY)
+GEN_SES_CTRL_ENCLOSURE_ACCESSORS(power_off_duration, POWER_OFF_DURATION)
+GEN_SES_CTRL_ENCLOSURE_ACCESSORS(rqst_fail, RQST_FAIL)
+GEN_SES_CTRL_ENCLOSURE_ACCESSORS(rqst_warn, RQST_WARN)
+#undef GEN_SES_CTRL_ENCLOSURE_ACCESSORS
/*------------------- SCSI Port/Transceiver Control Element ------------------*/
struct ses_ctrl_scsi_port_or_xcvr {
@@ -1011,13 +1011,13 @@ enum ses_status_dev_slot_field_data {
SES_STATUS_DEV_SLOT_DO_NOT_REMOVE_MASK = 0x40,
SES_STATUS_DEV_SLOT_DO_NOT_REMOVE_SHIFT = 6,
- SES_STATUS_DEV_SLOT_SESLOSURE_BYPED_A_BYTE = 0,
- SES_STATUS_DEV_SLOT_SESLOSURE_BYPED_A_MASK = 0x20,
- SES_STATUS_DEV_SLOT_SESLOSURE_BYPED_A_SHIFT = 5,
-
- SES_STATUS_DEV_SLOT_SESLOSURE_BYPED_B_BYTE = 0,
- SES_STATUS_DEV_SLOT_SESLOSURE_BYPED_B_MASK = 0x10,
- SES_STATUS_DEV_SLOT_SESLOSURE_BYPED_B_SHIFT = 4,
+ SES_STATUS_DEV_SLOT_ENCLOSURE_BYPED_A_BYTE = 0,
+ SES_STATUS_DEV_SLOT_ENCLOSURE_BYPED_A_MASK = 0x20,
+ SES_STATUS_DEV_SLOT_ENCLOSURE_BYPED_A_SHIFT = 5,
+
+ SES_STATUS_DEV_SLOT_ENCLOSURE_BYPED_B_BYTE = 0,
+ SES_STATUS_DEV_SLOT_ENCLOSURE_BYPED_B_MASK = 0x10,
+ SES_STATUS_DEV_SLOT_ENCLOSURE_BYPED_B_SHIFT = 4,
SES_STATUS_DEV_SLOT_INSERT_READY_BYTE = 0,
SES_STATUS_DEV_SLOT_INSERT_READY_MASK = 0x08,
@@ -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(seslosure_byped_a, SESLOSURE_BYPED_A)
-GEN_SES_STATUS_DEV_SLOT_ACCESSORS(seslosure_byped_b, SESLOSURE_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)
@@ -1667,55 +1667,55 @@ GEN_SES_STATUS_KEY_PAD_ENTRY_ACCESSORS(f
#undef GEN_SES_STATUS_KEY_PAD_ENTRY_ACCESSORS
/*------------------------- Enclosure Status Element -------------------------*/
-struct ses_status_seslosure {
+struct ses_status_enclosure {
struct ses_status_common common;
uint8_t bytes[3];
};
-enum ses_status_seslosure_field_data {
- SES_STATUS_SESLOSURE_IDENT_BYTE = 0,
- SES_STATUS_SESLOSURE_IDENT_MASK = 0x80,
- SES_STATUS_SESLOSURE_IDENT_SHIFT = 7,
+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_SESLOSURE_TIME_UNTIL_POWER_CYCLE_BYTE = 1,
- SES_STATUS_SESLOSURE_TIME_UNTIL_POWER_CYCLE_MASK = 0xFC,
- SES_STATUS_SESLOSURE_TIME_UNTIL_POWER_CYCLE_SHIFT = 2,
+ 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_SESLOSURE_FAIL_BYTE = 1,
- SES_STATUS_SESLOSURE_FAIL_MASK = 0x02,
- SES_STATUS_SESLOSURE_FAIL_SHIFT = 1,
+ SES_STATUS_enclosure_FAIL_BYTE = 1,
+ SES_STATUS_enclosure_FAIL_MASK = 0x02,
+ SES_STATUS_enclosure_FAIL_SHIFT = 1,
- SES_STATUS_SESLOSURE_WARN_BYTE = 1,
- SES_STATUS_SESLOSURE_WARN_MASK = 0x01,
- SES_STATUS_SESLOSURE_WARN_SHIFT = 0,
+ SES_STATUS_enclosure_WARN_BYTE = 1,
+ SES_STATUS_enclosure_WARN_MASK = 0x01,
+ SES_STATUS_enclosure_WARN_SHIFT = 0,
- SES_STATUS_SESLOSURE_REQUESTED_POWER_OFF_DURATION_BYTE = 2,
- SES_STATUS_SESLOSURE_REQUESTED_POWER_OFF_DURATION_MASK = 0xFC,
- SES_STATUS_SESLOSURE_REQUESTED_POWER_OFF_DURATION_SHIFT = 2,
- SES_STATUS_SESLOSURE_REQUESTED_POWER_OFF_DURATION_MAX_AUTO = 60,
- SES_STATUS_SESLOSURE_REQUESTED_POWER_OFF_DURATION_MANUAL = 63,
+ 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_SESLOSURE_REQUESTED_FAIL_BYTE = 2,
- SES_STATUS_SESLOSURE_REQUESTED_FAIL_MASK = 0x02,
- SES_STATUS_SESLOSURE_REQUESTED_FAIL_SHIFT = 1,
+ SES_STATUS_enclosure_REQUESTED_FAIL_BYTE = 2,
+ SES_STATUS_enclosure_REQUESTED_FAIL_MASK = 0x02,
+ SES_STATUS_enclosure_REQUESTED_FAIL_SHIFT = 1,
- SES_STATUS_SESLOSURE_REQUESTED_WARN_BYTE = 2,
- SES_STATUS_SESLOSURE_REQUESTED_WARN_MASK = 0x01,
- SES_STATUS_SESLOSURE_REQUESTED_WARN_SHIFT = 0
+ 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_SESLOSURE_ACCESSORS(LCASE, UCASE) \
- GEN_GETTER(ses_status_seslosure, SES_STATUS_SESLOSURE, LCASE, UCASE)
-GEN_SES_STATUS_SESLOSURE_ACCESSORS(ident, IDENT)
-GEN_SES_STATUS_SESLOSURE_ACCESSORS(time_until_power_cycle,
+#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_SESLOSURE_ACCESSORS(fail, FAIL)
-GEN_SES_STATUS_SESLOSURE_ACCESSORS(warn, WARN)
-GEN_SES_STATUS_SESLOSURE_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_SESLOSURE_ACCESSORS(requested_fail, REQUESTED_FAIL)
-GEN_SES_STATUS_SESLOSURE_ACCESSORS(requested_warn, REQUESTED_WARN)
-#undef GEN_SES_STATUS_SESLOSURE_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 {
@@ -1947,11 +1947,11 @@ GEN_SES_STATUS_INITIATOR_PORT_ACCESSORS(
GEN_SES_STATUS_INITIATOR_PORT_ACCESSORS(enabled, ENABLED)
#undef GEN_SES_STATUS_INITIATOR_PORT_ACCESSORS
-/*-------------------- Simple Subseslosure Status Element --------------------*/
+/*-------------------- Simple Subenclosure Status Element --------------------*/
struct ses_status_simple_subses {
struct ses_status_common common;
uint8_t bytes[2];
- uint8_t short_seslosure_status;
+ uint8_t short_enclosure_status;
};
enum ses_status_simple_subses_field_data {
@@ -2168,7 +2168,7 @@ struct ses_status_page_hdr {
/*
* For control pages, cstat[0] is the same for the
- * seslosure and is common across all device types.
+ * enclosure and is common across all device types.
*
* If SESCTL_CSEL is set, then PRDFAIL, DISABLE and RSTSWAP
* are checked, otherwise bits that are specific to the device
More information about the svn-src-projects
mailing list