Add last pieces of ses crud to enable blink functionality.

This file is still a work in progress.

1 files changed, 75 insertions, 35 deletions

diff --git a/sys/scsi/scsi_ses.h b/sys/scsi/scsi_ses.h
index 70923f7124f..82d595af9c4 100644
--- a/sys/scsi/scsi_ses.h
+++ b/sys/scsi/scsi_ses.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsi_ses.h,v 1.2 2005/04/09 15:24:16 marco Exp $ */
+/* $OpenBSD: scsi_ses.h,v 1.3 2005/04/12 20:44:18 marco Exp $ */
 /*
  * Copyright (c) 2005 Marco Peereboom
  * All rights reserved.
@@ -34,6 +34,7 @@
 struct ses_config_page {
 	/* diagnostic page header */
 	u_int8_t page_code;
+#define SES_CFG_DIAG_PAGE (0x01)
 	u_int8_t nr_sub_enc;
 	u_int8_t length[2]; /* n - 3 */
 	u_int8_t gencode[4];
@@ -56,35 +57,65 @@ struct ses_config_page {
 
 struct ses_type_desc_hdr {
 	u_int8_t elem_type;
+#define STDH_UNSPECIFIED	(0x00)
+#define STDH_DEVICE		(0x01)
+#define STDH_POWER_SUPPLY	(0x02)
+#define STDH_COOLING		(0x03)
+#define STDH_TEMP_SENSOR	(0x04)
+#define STDH_DOOR_LOCK		(0x05)
+#define STDH_AUDIBLE_ALARM	(0x06)
+#define STDH_ENC_SRVC_CTRL	(0x07)
+#define STDH_SCC_CTRL		(0x08)
+#define STDH_NONVOL_CACHE	(0x09)
+#define STDH_INV_OPER_REASON	(0x0a)
+#define STDH_UNINT_POWER_SUPP	(0x0b)
+#define STDH_DISPLAY		(0x0c)
+#define STDH_KEY_PAD		(0x0d)
+#define STDH_ENCLOSURE		(0x0e)
+#define STDH_SCSI_PORT_TRANS	(0x0f)
+#define STDH_LANGUAGE		(0x10)
+#define STDH_COMM_PORT		(0x11)
+#define STDH_VOLTAGE_SENSOR	(0x12)
+#define STDH_CURRENT_SENSOR	(0x13)
+#define STDH_SCSI_TARGET_PORT	(0x14)
+#define STDH_SCSI_INIT_PORT	(0x15)
+#define STDH_SIMP_SUBENC	(0x16)
+#define STDH_ARRAY_DEVICE	(0x17)
 	u_int8_t nr_elem;
 	u_int8_t sub_enc_id;
 	u_int8_t type_desc_len;
 };
 
-/* control structures, control structs are uses when SENDING */
+/* control structures, control structs are used when SENDING */
 struct ses_dev_elmt_ctrl_diag {
 	u_int8_t common_ctrl;
+#define SDECD_RST_SWAP	(0x10)
+#define SDECD_DISABLE	(0x20)
+#define SDECD_PRDFAIL	(0x40)
+#define SDECD_SELECT	(0x80)
+
 	u_int8_t reserved;
 	u_int8_t byte3;
-#define SDECD_RQST_IDENT	0x02
-#define SDECD_RQST_REMOVE	0x04
-#define SDECD_RQST_INSERT	0x08
-#define SDECD_DONT_REMOVE	0x40
-#define SDECD_ACTIVE		0x80
+#define SDECD_RQST_IDENT	(0x02)
+#define SDECD_RQST_REMOVE	(0x04)
+#define SDECD_RQST_INSERT	(0x08)
+#define SDECD_DONT_REMOVE	(0x40)
+#define SDECD_ACTIVE		(0x80)
 	u_int8_t byte4;
-#define SDECD_ENABLE_BYP_B	0x04
-#define SDECD_ENABLE_BYP_A	0x08
-#define SDECD_DEVICE_OFF	0x10
-#define SDECD_RQST_FAULT	0x20
+#define SDECD_ENABLE_BYP_B	(0x04)
+#define SDECD_ENABLE_BYP_A	(0x08)
+#define SDECD_DEVICE_OFF	(0x10)
+#define SDECD_RQST_FAULT	(0x20)
 };
 
 struct ses_enc_ctrl_diag_page {
 	u_int8_t page_code;
+#define SES_CTRL_DIAG_PAGE (0x02)
 	u_int8_t byte2;
-#define SECDP_UNREC	0x01
-#define SECDP_CRIT	0x02
-#define SECDP_NONCRIT	0x04
-#define SECDP_INFO	0x08
+#define SECDP_UNREC	(0x01)
+#define SECDP_CRIT	(0x02)
+#define SECDP_NONCRIT	(0x04)
+#define SECDP_INFO	(0x08)
 	u_int8_t length[2];
 	u_int8_t gencode[4];
 	u_int8_t overallctrl[4];
@@ -93,36 +124,45 @@ struct ses_enc_ctrl_diag_page {
 };
 
 /* status structures, status structs are uses when RECEIVING */
+/* device type, disk really */
 struct ses_dev_elmt_status_diag {
 	u_int8_t common_status;
+#define SDESD_UNSUPPORTED	(0x00)
+#define SDESD_OK		(0x01)
+#define SDESD_CRITICAL		(0x02)
+#define SDESD_NONCRITICAL	(0x03)
+#define SDESD_UNRECOVERABLE	(0x04)
+#define SDESD_NOT_INSTALLED	(0x05)
+#define SDESD_UNKNOWN		(0x06)
+#define SDESD_NOT_AVAILABLE	(0x07)
 	u_int8_t slot_addr;
 	u_int8_t byte3;
-#define SDESD_REPORT		0x01
-#define SDESD_IDENT		0x02
-#define SDESD_RMV		0x04
-#define SDESD_RDY_INSRT		0x08
-#define SDESD_ENC_BYP_B		0x10
-#define SDESD_ENC_BYP_A		0x20
-#define SDESD_DONT_REMV		0x40
-#define SDESD_CLNT_BYP_A	0x80
+#define SDESD_REPORT		(0x01)
+#define SDESD_IDENT		(0x02)
+#define SDESD_RMV		(0x04)
+#define SDESD_RDY_INSRT		(0x08)
+#define SDESD_ENC_BYP_B		(0x10)
+#define SDESD_ENC_BYP_A		(0x20)
+#define SDESD_DONT_REMV		(0x40)
+#define SDESD_CLNT_BYP_A	(0x80)
 	u_int8_t byte4;
-#define SDESD_DEV_BYP_B		0x01
-#define SDESD_DEV_BYP_A		0x02
-#define SDESD_BYP_B		0x04
-#define SDESD_BYP_A		0x08
-#define SDESD_DEV_OFF		0x10
-#define SDESD_FLT_RQSTD		0x20
-#define SDESD_FLT_SENSED	0x40
-#define SDESD_CLNT_BYP_B	0x80
+#define SDESD_DEV_BYP_B		(0x01)
+#define SDESD_DEV_BYP_A		(0x02)
+#define SDESD_BYP_B		(0x04)
+#define SDESD_BYP_A		(0x08)
+#define SDESD_DEV_OFF		(0x10)
+#define SDESD_FLT_RQSTD		(0x20)
+#define SDESD_FLT_SENSED	(0x40)
+#define SDESD_CLNT_BYP_B	(0x80)
 };
 
 struct ses_enc_stat_diag_page {
 	u_int8_t page_code;
 	u_int8_t byte2;
-#define SESDP_UNREC	0x01
-#define SESDP_CRIT	0x02
-#define SESDP_NONCRIT	0x04
-#define SESDP_INFO	0x08
+#define SESDP_UNREC	(0x01)
+#define SESDP_CRIT	(0x02)
+#define SESDP_NONCRIT	(0x04)
+#define SESDP_INFO	(0x08)
 	u_int8_t length[2];
 	u_int8_t gencode[4];
 	u_int8_t overallstat[4];