diff options
| author | mav <mav@FreeBSD.org> | 2010-02-26 10:42:46 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2010-02-26 10:42:46 +0000 |
| commit | 859e0a0f68c4a4fd1d24467e14d8ea59f0ad0ef0 (patch) | |
| tree | ce951ff38be2e19cedd5dea0116b0d18f48dab87 | |
| parent | 119ce28bd70b8e87d0d2fddfc12c08cc6133a206 (diff) | |
| download | FreeBSD-src-859e0a0f68c4a4fd1d24467e14d8ea59f0ad0ef0.zip FreeBSD-src-859e0a0f68c4a4fd1d24467e14d8ea59f0ad0ef0.tar.gz | |
Make PUIS detection more strict. Previous implementation caused false
positives on VMWare's virtual CD-ROMs.
| -rw-r--r-- | sys/cam/ata/ata_xpt.c | 9 | ||||
| -rw-r--r-- | sys/sys/ata.h | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sys/cam/ata/ata_xpt.c b/sys/cam/ata/ata_xpt.c index 0c2bf32..d5e0b32 100644 --- a/sys/cam/ata/ata_xpt.c +++ b/sys/cam/ata/ata_xpt.c @@ -788,11 +788,10 @@ noerror: ata_btrim(ident_buf->serial, sizeof(ident_buf->serial)); ata_bpack(ident_buf->serial, ident_buf->serial, sizeof(ident_buf->serial)); /* Device may need spin-up before IDENTIFY become valid. */ - if ((ident_buf->config & ATA_RESP_INCOMPLETE) || - ((ident_buf->support.command2 & ATA_SUPPORT_STANDBY) && - (ident_buf->enabled.command2 & ATA_SUPPORT_STANDBY) && - (ident_buf->support.command2 & ATA_SUPPORT_SPINUP) && - softc->spinup == 0)) { + if ((ident_buf->specconf == 0x37c8 || + ident_buf->specconf == 0x738c) && + ((ident_buf->config & ATA_RESP_INCOMPLETE) || + softc->spinup == 0)) { PROBE_SET_ACTION(softc, PROBE_SPINUP); xpt_release_ccb(done_ccb); xpt_schedule(periph, priority); diff --git a/sys/sys/ata.h b/sys/sys/ata.h index e8a04db..cacb1ea0 100644 --- a/sys/sys/ata.h +++ b/sys/sys/ata.h @@ -51,7 +51,7 @@ struct ata_params { #define ATA_RESP_INCOMPLETE 0x0004 /*001*/ u_int16_t cylinders; /* # of cylinders */ - u_int16_t reserved2; +/*002*/ u_int16_t specconf; /* specific configuration */ /*003*/ u_int16_t heads; /* # heads */ u_int16_t obsolete4; u_int16_t obsolete5; |
