upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-11 01:30:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

cam: remove redundant scsi_vpd_block_characteristics definition

Browse source 
There were two definitions for the SCSI VPD Block Device Characteristics (page
0xb1): struct scsi_vpd_block_characteristics and struct
scsi_vpd_block_device_characteristics. The latter is more complete and more
widely used. Convert uses of the former to the latter by tweaking the da driver
and removing sturct scsi_vpd_block_characteristics.

(cherry picked from commit b3fce46a3e)
This commit is contained in:
Warner Losh 2021-03-02 18:31:43 -07:00
parent feef1047d6
commit fbc8ddde4c
2 changed files with 3 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
sys/cam/scsi/scsi_all.h
View file

@ -2820,30 +2820,6 @@ struct scsi_vpd_sfs
uint8_t codes[];
};
/*
* Block Device Characteristics VPD Page based on
* T10/1799-D Revision 31
*/
struct scsi_vpd_block_characteristics
{
u_int8_t device;
u_int8_t page_code;
#define SVPD_BDC 0xB1
u_int8_t page_length[2];
u_int8_t medium_rotation_rate[2];
#define SVPD_BDC_RATE_NOT_REPORTED 0x00
#define SVPD_BDC_RATE_NON_ROTATING 0x01
u_int8_t reserved1;
u_int8_t nominal_form_factor;
#define SVPD_BDC_FORM_NOT_REPORTED 0x00
#define SVPD_BDC_FORM_5_25INCH 0x01
#define SVPD_BDC_FORM_3_5INCH 0x02
#define SVPD_BDC_FORM_2_5INCH 0x03
#define SVPD_BDC_FORM_1_5INCH 0x04
#define SVPD_BDC_FORM_LESSTHAN_1_5INCH 0x05
u_int8_t reserved2[56];
};
/*
* Block Device Characteristics VPD Page
*/

7
sys/cam/scsi/scsi_da.c
View file

@ -3649,14 +3649,14 @@ out:
}
case DA_STATE_PROBE_BDC:
{
struct scsi_vpd_block_characteristics *bdc;
struct scsi_vpd_block_device_characteristics *bdc;
if (!scsi_vpd_supported_page(periph, SVPD_BDC)) {
softc->state = DA_STATE_PROBE_ATA;
goto skipstate;
}
bdc = (struct scsi_vpd_block_characteristics *)
bdc = (struct scsi_vpd_block_device_characteristics *)
malloc(sizeof(*bdc), M_SCSIDA, M_NOWAIT|M_ZERO);
if (bdc == NULL) {
@ -5207,8 +5207,7 @@ dadone_probebdc(struct cam_periph *periph, union ccb *done_ccb)
medium_rotation_rate)) {
softc->disk->d_rotation_rate =
scsi_2btoul(bdc->medium_rotation_rate);
if (softc->disk->d_rotation_rate ==
SVPD_BDC_RATE_NON_ROTATING) {
if (softc->disk->d_rotation_rate == SVPD_NON_ROTATING) {
cam_iosched_set_sort_queue(
softc->cam_iosched, 0);
softc->flags &= ~DA_FLAG_ROTATING;