Skip to content

Commit 1b0633a

Browse files
author
Scott Marks
committed
per issue #502 @wdoekes
1 parent 605da64 commit 1b0633a

File tree

2 files changed

+25
-19
lines changed

2 files changed

+25
-19
lines changed

Common/DtaOptions.inc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ BEGIN_OPTION_MAX(scan, 1)
1313
Scans the devices on the system
1414
identifying the TPers; output in compact JSON
1515
16+
SSCs supported by each device are indicated by
17+
1 Opal (ver. 1, "original")
18+
2 Opal ver. 2
19+
P Pyrite
20+
Q Pyrite ver. 2
21+
E Enterprise
1622
)-")
1723
END_OPTION
1824

linux/DtaLinux.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -105,24 +105,24 @@ std::vector<std::string> DtaLinux::generateDtaDriveDevRefs()
105105
const unsigned char device_part=s.st_rdev & 0x000F;
106106
typedef enum _rdev_type {
107107
/*
108-
sed -En 's/^[[:space:]]+([[:digit:]]+)[[:space:]]block[[:space:]]+SCSI disk devices[[:space:]]\(([[:digit:]]+)-([[:digit:]]+)\)/ SCSI_DRIVE_\2_\3 = \1/p' kernel.org/admin-guide/devices.txt
108+
sed -En 's/^[[:space:]]+([[:digit:]]+)[[:space:]]block[[:space:]]+SCSI disk devices[[:space:]]\(([[:digit:]]+)-([[:digit:]]+)\)/ SCSI_DRIVE_\2_\3 = \1,/p' kernel.org/admin-guide/devices.txt
109109
*/
110-
SCSI_DRIVE_0_15 = 8
111-
SCSI_DRIVE_16_31 = 65
112-
SCSI_DRIVE_32_47 = 66
113-
SCSI_DRIVE_48_63 = 67
114-
SCSI_DRIVE_64_79 = 68
115-
SCSI_DRIVE_80_95 = 69
116-
SCSI_DRIVE_96_111 = 70
117-
SCSI_DRIVE_112_127 = 71
118-
SCSI_DRIVE_128_143 = 128
119-
SCSI_DRIVE_144_159 = 129
120-
SCSI_DRIVE_160_175 = 130
121-
SCSI_DRIVE_176_191 = 131
122-
SCSI_DRIVE_192_207 = 132
123-
SCSI_DRIVE_208_223 = 133
124-
SCSI_DRIVE_224_239 = 134
125-
SCSI_DRIVE_240_255 = 135
110+
SCSI_DRIVE_0_15 = 8,
111+
SCSI_DRIVE_16_31 = 65,
112+
SCSI_DRIVE_32_47 = 66,
113+
SCSI_DRIVE_48_63 = 67,
114+
SCSI_DRIVE_64_79 = 68,
115+
SCSI_DRIVE_80_95 = 69,
116+
SCSI_DRIVE_96_111 = 70,
117+
SCSI_DRIVE_112_127 = 71,
118+
SCSI_DRIVE_128_143 = 128,
119+
SCSI_DRIVE_144_159 = 129,
120+
SCSI_DRIVE_160_175 = 130,
121+
SCSI_DRIVE_176_191 = 131,
122+
SCSI_DRIVE_192_207 = 132,
123+
SCSI_DRIVE_208_223 = 133,
124+
SCSI_DRIVE_224_239 = 134,
125+
SCSI_DRIVE_240_255 = 135,
126126

127127

128128

@@ -145,7 +145,7 @@ std::vector<std::string> DtaLinux::generateDtaDriveDevRefs()
145145
device_type==rdev_type::SCSI_DRIVE_64_79 ? " SCSI" :
146146
device_type==rdev_type::SCSI_DRIVE_80_95 ? " SCSI" :
147147
device_type==rdev_type::SCSI_DRIVE_96_111 ? " SCSI" :
148-
device_type==rdev_type::SCSI_DRIVE_112_12 ? " SCSI" :
148+
device_type==rdev_type::SCSI_DRIVE_112_127 ? " SCSI" :
149149
device_type==rdev_type::SCSI_DRIVE_128_143 ? " SCSI" :
150150
device_type==rdev_type::SCSI_DRIVE_144_159 ? " SCSI" :
151151
device_type==rdev_type::SCSI_DRIVE_160_175 ? " SCSI" :
@@ -168,7 +168,7 @@ std::vector<std::string> DtaLinux::generateDtaDriveDevRefs()
168168
device_type==rdev_type::SCSI_DRIVE_64_79 ||
169169
device_type==rdev_type::SCSI_DRIVE_80_95 ||
170170
device_type==rdev_type::SCSI_DRIVE_96_111 ||
171-
device_type==rdev_type::SCSI_DRIVE_112_12 ||
171+
device_type==rdev_type::SCSI_DRIVE_112_127 ||
172172
device_type==rdev_type::SCSI_DRIVE_128_143 ||
173173
device_type==rdev_type::SCSI_DRIVE_144_159 ||
174174
device_type==rdev_type::SCSI_DRIVE_160_175 ||

0 commit comments

Comments
 (0)