diff options
| author | Alexander Motin <mav@FreeBSD.org> | 2010-03-01 19:36:19 +0000 |
|---|---|---|
| committer | Alexander Motin <mav@FreeBSD.org> | 2010-03-01 19:36:19 +0000 |
| commit | aeb7e9f945740c55f0ec2d690bbf556584577681 (patch) | |
| tree | a083222e1786fe2a72aa904019cc59b2fbc3cb27 /sys | |
| parent | df7d3f0a1f3aa49307520ae5233da67b123307a0 (diff) | |
Notes
Diffstat (limited to 'sys')
| -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 0c2bf32f8a0e..d5e0b32a49b1 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 e8a04dbbbfd5..cacb1ea02777 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; |