28c28
< * $FreeBSD: head/sys/dev/ata/ata-all.h 84419 2001-10-03 11:36:25Z sos $
---
> * $FreeBSD: head/sys/dev/ata/ata-all.h 84584 2001-10-06 11:07:04Z sos $
65a66,69
> #define ATA_C_READ48 0x24 /* read command */
> #define ATA_C_READ_DMA48 0x25 /* read w/DMA command */
> #define ATA_C_READ_DMA_QUEUED48 0x26 /* read w/DMA QUEUED command */
> #define ATA_C_READ_MUL48 0x29 /* read multi command */
66a71,74
> #define ATA_C_WRITE48 0x34 /* write command */
> #define ATA_C_WRITE_DMA48 0x35 /* write w/DMA command */
> #define ATA_C_WRITE_DMA_QUEUED48 0x36 /* write w/DMA QUEUED command */
> #define ATA_C_WRITE_MUL48 0x39 /* write multi command */
78a87
> #define ATA_C_FLUSHCACHE48 0xea /* flush cache to disk */
133,134c142,143
< #define ATA_BMCMD_START_STOP 0x01
< #define ATA_BMCMD_WRITE_READ 0x08
---
> #define ATA_BMCMD_START_STOP 0x01
> #define ATA_BMCMD_WRITE_READ 0x08
139,145c148,154
< #define ATA_BMSTAT_ACTIVE 0x01
< #define ATA_BMSTAT_ERROR 0x02
< #define ATA_BMSTAT_INTERRUPT 0x04
< #define ATA_BMSTAT_MASK 0x07
< #define ATA_BMSTAT_DMA_MASTER 0x20
< #define ATA_BMSTAT_DMA_SLAVE 0x40
< #define ATA_BMSTAT_DMA_SIMPLEX 0x80
---
> #define ATA_BMSTAT_ACTIVE 0x01
> #define ATA_BMSTAT_ERROR 0x02
> #define ATA_BMSTAT_INTERRUPT 0x04
> #define ATA_BMSTAT_MASK 0x07
> #define ATA_BMSTAT_DMA_MASTER 0x20
> #define ATA_BMSTAT_DMA_SLAVE 0x40
> #define ATA_BMSTAT_DMA_SIMPLEX 0x80
148d156
<
153,154c161,162
< u_int32_t base;
< u_int32_t count;
---
> u_int32_t base;
> u_int32_t count;
174,178c182,186
< #define ATA_DMA_ACTIVE 0x01
< #define ATA_ATAPI_DMA_RO 0x02
< #define ATA_USE_16BIT 0x04
< #define ATA_NO_SLAVE 0x08
< #define ATA_QUEUED 0x10
---
> #define ATA_NO_SLAVE 0x01
> #define ATA_USE_16BIT 0x02
> #define ATA_ATAPI_DMA_RO 0x04
> #define ATA_QUEUED 0x08
> #define ATA_DMA_ACTIVE 0x10
193,196c201,206
< #define ATA_ACTIVE 0x0008
< #define ATA_ACTIVE_ATA 0x0010
< #define ATA_ACTIVE_ATAPI 0x0020
< #define ATA_CONTROL 0x0040
---
> #define ATA_WAIT_MASK 0x0007
> #define ATA_USE_CHS 0x0008
> #define ATA_ACTIVE 0x0010
> #define ATA_ACTIVE_ATA 0x0020
> #define ATA_ACTIVE_ATAPI 0x0040
> #define ATA_CONTROL 0x0080
216c226
< int ata_command(struct ata_softc *, int, u_int8_t, u_int16_t, u_int8_t, u_int8_t, u_int8_t, u_int8_t, int);
---
> int ata_command(struct ata_softc *, int, u_int8_t, u_int64_t, u_int16_t, u_int8_t, int);
224d233
< int ata_pio2mode(int);