diff options
| author | mav <mav@FreeBSD.org> | 2009-02-28 22:07:15 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2009-02-28 22:07:15 +0000 |
| commit | 55cab290fcfb54ff2225bc84652ff631feca520a (patch) | |
| tree | ec95ab40b5ed482c5e53ec83ecf3ff4a51f7e75c /sys/dev/ata/ata-all.h | |
| parent | 4eafa084fe4aba2a485ea0c0d8e047b253977e9d (diff) | |
| download | FreeBSD-src-55cab290fcfb54ff2225bc84652ff631feca520a.zip FreeBSD-src-55cab290fcfb54ff2225bc84652ff631feca520a.tar.gz | |
Revert my ata_identify()/ata_reinit() related changes: r189166, r189091
and partially r188903. Revert breaks new drives detection on reinit to the
state as it was before me, but fixes series of new bugs reported by some
people.
Unconditional queueing of ata_completed() calls can lead to deadlock if
due to timeout ata_reinit() was called at the same thread by previous
ata_completed(). Calling of ata_identify() on ata_reinit() in current
implementation opens numerous races and deadlocks.
Problems I was touching here are still exist and should be addresed, but
probably in different way.
Diffstat (limited to 'sys/dev/ata/ata-all.h')
| -rw-r--r-- | sys/dev/ata/ata-all.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sys/dev/ata/ata-all.h b/sys/dev/ata/ata-all.h index 8c7f0d1..a721d80 100644 --- a/sys/dev/ata/ata-all.h +++ b/sys/dev/ata/ata-all.h @@ -367,6 +367,7 @@ struct ata_request { #define ATA_R_AT_HEAD 0x00000200 #define ATA_R_REQUEUE 0x00000400 #define ATA_R_THREAD 0x00000800 +#define ATA_R_DIRECT 0x00001000 #define ATA_R_DEBUG 0x10000000 #define ATA_R_DANGER1 0x20000000 @@ -410,10 +411,6 @@ struct ata_device { #define ATA_MASTER 0x00 #define ATA_SLAVE 0x01 #define ATA_PM 0x0f - int type; /* device type */ -#define ATA_T_ATA 0x00 -#define ATA_T_ATAPI 0x01 -#define ATA_T_ATAPI_CAM 0x02 struct ata_params param; /* ata param structure */ int mode; /* current transfermode */ @@ -426,8 +423,6 @@ struct ata_device { #define ATA_D_MEDIA_CHANGED 0x0002 #define ATA_D_ENC_PRESENT 0x0004 #define ATA_D_48BIT_ACTIVE 0x0008 -#define ATA_D_PROBED 0x0010 -#define ATA_D_VALID 0x0020 }; /* structure for holding DMA Physical Region Descriptors (PRD) entries */ @@ -565,8 +560,6 @@ void ata_interrupt(void *data); int ata_device_ioctl(device_t dev, u_long cmd, caddr_t data); int ata_getparam(struct ata_device *atadev, int init); int ata_identify(device_t dev); -device_t ata_add_child(device_t, int, int); -int ata_delete_child(device_t , device_t); void ata_default_registers(device_t dev); void ata_modify_if_48bit(struct ata_request *request); void ata_udelay(int interval); |
