MFC r311636: Make 'camcontrol modepage' support subpages.

1 files changed, 118 insertions, 42 deletions

diff --git a/share/misc/scsi_modes b/share/misc/scsi_modes
index ec791c7..4a5939c 100644
--- a/share/misc/scsi_modes
+++ b/share/misc/scsi_modes
@@ -49,7 +49,11 @@
 
 # ALL DEVICE TYPES
 
-0x0a "Control Mode Page" {
+0x0a,0x03 "Command Duration Limit A";
+
+0x0a,0x04 "Command Duration Limit B";
+
+0x0a "Control" {
 	{TST} t3
 	{TMF_ONLY} t1
 	{DPICZ} t1
@@ -78,7 +82,18 @@
 	{Extended Self-Test Completion Time} i2
 }
 
-0x02 "Disconnect-Reconnect Page" {
+0x0a,0x01 "Control Extension" {
+	{Reserved} *t4
+	{DLC} t1
+	{TCMOS} t1
+	{SCSIP} t1
+	{IALUAE} t1
+	{Reserved} *t4
+	{Initial Command Priority} t4
+	{Maximum Sense Data Length} i1
+}
+
+0x02 "Disconnect-Reconnect" {
 	{Buffer Full Ratio} i1
 	{Buffer Empty Ratio} i1
 	{Bus Inactivity Limit} i2
@@ -92,26 +107,11 @@
 	{Reserved} *i1
 }
 
-0x15 "Extended Page";
+0x15 "Extended";
 
-0x16 "Extended Device-Type Specific Page";
+0x16 "Extended Device-Type Specific";
 
-0x1c "Informational Exceptions Control Page" {
-	{PERF} t1
-	{Reserved} *t1
-	{EBF} t1
-	{EWasc} t1
-	{DExcpt} t1
-	{TEST} t1
-	{EBACKERR} t1
-	{LogErr} t1
-	{Reserved} *t4
-	{MRIE} t4
-	{Interval Timer} i4
-	{Report Count} i4
-}
-
-0x09 "Peripheral Device Page" {
+0x09 "Peripheral Device" {
 	{Interface Identifier} i2
 	{Reserved} *i1
 	{Reserved} *i1
@@ -119,21 +119,69 @@
 	{Reserved} *i1
 }
 
-0x1a "Power Condition Page" {
-	{Reserved} *i1
+0x1a "Power Condition" {
+	{PM_BG_PRECEDENCE} t1
+	{Reserved} *t6
+	{STANDBY_Y} t1
+	{Reserved} *t4
+	{IDLE_C} t1
+	{IDLE_B} t1
+	{IDLE_A} t1
+	{STANDBY_Z} t1
+	{IDLE_A Condition Timer} i4
+	{STANDBY_Z Condition Timer} i4
+	{IDLE_B Condition Timer} i4
+	{IDLE_C Condition Timer} i4
+	{STANDBY_Y Condition Timer} i4
+	{Reserved} *i4
+	{Reserved} *i4
+	{Reserved} *i4
+	{Reserved} *i3
+	{CCF Idle} t2
+	{CCF Standby} t2
+	{CCF Stopped} t2
+	{Reserved} *t2
+}
+
+0x1a,0x01 "Power Consumption" {
+	{Reserved} *i2
 	{Reserved} *t6
-	{Idle} t1
-	{Standby} t1
-	{Idle Condition Timer} i4
-	{Standby Condition Timer} i4
+	{Active Level} t2
+	{Power Consumption Identifier} i1
+	{Reserved} *i4
+	{Reserved} *i4
 }
 
-0x18 "Protocol-Specific LUN Page";
+0x18 "Protocol-Specific Logical Unit";
 
-0x19 "Protocol-Specific Port Page";
+0x19 "Protocol-Specific Port";
 
 # DIRECT ACCESS DEVICES
-0x08 "Caching Page" {
+
+0x0a,0x02 "Application Tag";
+
+0x1a,0xf1 "ATA Power Condition";
+
+0x1c,0x01 "Background Control" {
+	{Reserved} *t5
+	{S_L_FULL} *t1
+	{LOWIR} *t1
+	{EN_BMS} *t1
+	{Reserved} *t7
+	{EN_PS} *t1
+	{Background Medium Scan Interval Time} i2
+	{Background Pre-Scan Time Limit} i2
+	{Minimum Idle Time Before Background Scan} i2
+	{Maximum Time To Suspend Background Scan} i2
+	{Reserved} *i2
+}
+
+0x0a,0x06 "Background Operation Control" {
+	{BO_MODE} t2
+	{Reserved} *t6
+}
+
+0x08 "Caching" {
 	{IC} t1
 	{ABPF} t1
 	{CAP} t1
@@ -159,7 +207,7 @@
 	{Reserved} *t4
 }
 
-0x05 "Flexible Disk Page" {
+0x05 "Flexible Disk" {
 	{Transfer rate} i2
 	{Number of heads} i1
 	{Sectors per track} i1
@@ -190,7 +238,7 @@
 	{Reserved} *i1
 }
 
-0x03 "Format Device Page" {
+0x03 "Format Device" {
 	{Tracks per Zone} i2
 	{Alternate Sectors per Zone} i2
 	{Alternate Tracks per Zone} i2
@@ -207,7 +255,34 @@
 	{Reserved} *t4
 }
 
-0x0b "Medium Types Supported Page" {
+0x0a,0x05 "I/O Advice Hints Grouping";
+
+0x1c "Informational Exceptions Control" {
+	{PERF} t1
+	{Reserved} *t1
+	{EBF} t1
+	{EWasc} t1
+	{DExcpt} t1
+	{TEST} t1
+	{EBACKERR} t1
+	{LogErr} t1
+	{Reserved} *t4
+	{MRIE} t4
+	{Interval Timer} i4
+	{Report Count} i4
+}
+
+0x1c,0x02 "Logical Block Provisioning" {
+	{Reserved} *t7
+	{SITUA} t1
+	{Reserved} *i1
+	{Reserved} *i1
+	{Reserved} *i1
+	{Reserved} *i4
+	{Reserved} *i4
+}
+
+0x0b "Medium Types Supported" {
 	{Reserved} *i1
 	{Reserved} *i1
 	{Medium type one supported} i1
@@ -216,10 +291,11 @@
 	{Medium type four supported} i1
 }
 
-# Notch page (0x0c)
-0x0c "Notch and Partition Page";
+0x0c "Notch and Partition";
+
+0x0a,0xf1 "PATA Control";
 
-0x01 "Read-Write Error Recovery Page" {
+0x01 "Read-Write Error Recovery" {
 	{AWRE (Auto Write Reallocation Enbld)} t1
 	{ARRE (Auto Read Reallocation Enbld)} t1
 	{TB (Transfer Block)} t1
@@ -240,7 +316,7 @@
 	{Recovery Time Limit} i2
 }
 
-0x04 "Rigid Disk Drive Geometry Page" {
+0x04 "Rigid Disk Drive Geometry" {
 	{Number of Cylinders} i3
 	{Number of Heads} i1
 	{Starting Cylinder-Write Precompensation} i3
@@ -256,7 +332,7 @@
 	{Reserved} *i1
 }
 
-0x07 "Verify Error Recovery Page" {
+0x07 "Verify Error Recovery" {
 	{Reserved} *t4
 	{EER} t1
 	{PER} t1
@@ -272,7 +348,7 @@
 	{Verify Recovery Time Limit} i2
 }
 
-0x0E "CD-ROM Audio Control Parameters Page" {
+0x0E "CD-ROM Audio Control Parameters" {
 	{Reserved} *t5
 	{Immed} t1
 	{SOTC} t1
@@ -297,7 +373,7 @@
 }
 
 # SEQUENTIAL ACCESS DEVICES
-0x10 "Device Configuration Page" {
+0x10 "Device Configuration" {
 	{Reserved} *t1
 	{Change Active Partition} t1
 	{Change Active Format} t1
@@ -326,7 +402,7 @@
 	{SCSI-3 Permanent Write Protect} t1
 }
 
-0x0f "Data Compression Page" {
+0x0f "Data Compression" {
 	{Data Compression Enabled} t1
 	{Date Compression Capable} t1
 	{Reserved} *t6
@@ -339,7 +415,7 @@
 }
 
 # Removable devices
-0x1b "Removable Block Access Capacities Page" {
+0x1b "Removable Block Access Capacities" {
 	{System Floppy Type Device} t1
 	{Supports Reporting Format Progress} t1
 	{Reserved} *t6
@@ -351,7 +427,7 @@
 }
 
 # CD-ROM (and CD-R[W]) devices
-0x2a "CD capabilities and mechanical status page" {
+0x2a "CD capabilities and mechanical status" {
 	{Reserved} *t4
 	{Method 2} t1
 	{CD-RW Read} t1