28c28
< * $FreeBSD: head/sys/dev/ata/ata-all.h 50842 1999-09-03 10:57:17Z phk $
---
> * $FreeBSD: head/sys/dev/ata/ata-all.h 51520 1999-09-21 19:50:40Z sos $
33c33
< #define ATA_ERROR 0x01 /* (R) error register */
---
> #define ATA_ERROR 0x01 /* (R) error register */
45,47c45,47
< #define ATA_SECTOR 0x03 /* sector # */
< #define ATA_CYL_LSB 0x04 /* cylinder# LSB */
< #define ATA_CYL_MSB 0x05 /* cylinder# MSB */
---
> #define ATA_SECTOR 0x03 /* sector # */
> #define ATA_CYL_LSB 0x04 /* cylinder# LSB */
> #define ATA_CYL_MSB 0x05 /* cylinder# MSB */
53,54c53
< #define ATA_C_ATA_IDENTIFY 0xec /* get ATA params */
< #define ATA_C_ATAPI_IDENTIFY 0xa1 /* get ATAPI params*/
---
> #define ATA_C_ATAPI_RESET 0x08 /* reset ATAPI device */
56a56,57
> #define ATA_C_PACKET_CMD 0xa0 /* packet command */
> #define ATA_C_ATAPI_IDENTIFY 0xa1 /* get ATAPI params*/
62c63
< #define ATA_C_PACKET_CMD 0xa0 /* packet command */
---
> #define ATA_C_ATA_IDENTIFY 0xec /* get ATA params */
79c80
< #define ATA_A_IDS 0x02 /* disable interrupts */
---
> #define ATA_A_IDS 0x02 /* disable interrupts */
81c82
< #define ATA_A_4BIT 0x08 /* 4 head bits */
---
> #define ATA_A_4BIT 0x08 /* 4 head bits */
84,86c85,87
< #define ATA_MASTER 0x00
< #define ATA_SLAVE 0x10
< #define ATA_IOSIZE 0x08
---
> #define ATA_MASTER 0x00
> #define ATA_SLAVE 0x10
> #define ATA_IOSIZE 0x08
100d100
< #define ATA_BMSTAT_MASK 0x07
103a104
> #define ATA_BMSTAT_MASK 0x07
109,111d109
< #define ATA_WDMA2 0x22
< #define ATA_UDMA2 0x42
<
114,115c112,113
< u_int32_t base;
< u_int32_t count;
---
> u_int32_t base;
> u_int32_t count;
117a116,120
> /* ATA device DMA access modes */
> #define ATA_WDMA2 0x22
> #define ATA_UDMA2 0x42
> #define ATA_UDMA4 0x44
>
125a129
> void *dev_softc[2]; /* ptr to devices softc's */
126a131,136
> int32_t mode[2]; /* transfer mode for devices */
> #define ATA_MODE_PIO 0x00
> #define ATA_MODE_DMA 0x01
> #define ATA_MODE_UDMA33 0x02
> #define ATA_MODE_UDMA66 0x04
>
127a138,139
> #define ATA_ATAPI_DMA_RO 0x01
>
130,132c142,144
< #define ATA_ATA_SLAVE 0x02
< #define ATA_ATAPI_MASTER 0x04
< #define ATA_ATAPI_SLAVE 0x08
---
> #define ATA_ATA_SLAVE 0x02
> #define ATA_ATAPI_MASTER 0x04
> #define ATA_ATAPI_SLAVE 0x08
144,145c156,162
< TAILQ_HEAD(, ad_request) ata_queue; /* head of ATA queue */
< TAILQ_HEAD(, atapi_request) atapi_queue; /* head of ATAPI queue */
---
> TAILQ_HEAD(, ad_request) ata_queue; /* head of ATA queue */
> TAILQ_HEAD(, atapi_request) atapi_queue; /* head of ATAPI queue */
> void *running; /* currently running request */
> #if NAPM > 0
> struct apmhook resume_hook; /* hook for apm */
> #endif
>
153a171,172
> void ata_reset(struct ata_softc *, int32_t *);
> int32_t ata_reinit(struct ata_softc *);
160a180
> int8_t *ata_mode2str(int32_t);
164,167d183
<
< void ad_transfer(struct ad_request *);
< int32_t ad_interrupt(struct ad_request *);
<