Deleted Added
full compact
ata-all.h (56255) ata-all.h (56558)
1/*-
2 * Copyright (c) 1998,1999,2000 S�ren Schmidt
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 *
1/*-
2 * Copyright (c) 1998,1999,2000 S�ren Schmidt
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 *
28 * $FreeBSD: head/sys/dev/ata/ata-all.h 56255 2000-01-18 21:02:59Z sos $
28 * $FreeBSD: head/sys/dev/ata/ata-all.h 56558 2000-01-24 20:45:24Z sos $
29 */
30
31/* ATA register defines */
32#define ATA_DATA 0x00 /* data register */
33#define ATA_ERROR 0x01 /* (R) error register */
34#define ATA_E_NM 0x02 /* no media */
35#define ATA_E_ABORT 0x04 /* command aborted */
36#define ATA_E_MCR 0x08 /* media change request */

--- 134 unchanged lines hidden (view full) ---

171 int8_t vendorunique1;
172 int16_t usedmovsd; /* double word read/write? */
173
174 u_int8_t vendorcap; /* vendor capabilities */
175 u_int8_t dmaflag :1; /* DMA supported - always 1 */
176 u_int8_t lbaflag :1; /* LBA supported - always 1 */
177 u_int8_t iordydis :1; /* IORDY may be disabled */
178 u_int8_t iordyflag :1; /* IORDY supported */
29 */
30
31/* ATA register defines */
32#define ATA_DATA 0x00 /* data register */
33#define ATA_ERROR 0x01 /* (R) error register */
34#define ATA_E_NM 0x02 /* no media */
35#define ATA_E_ABORT 0x04 /* command aborted */
36#define ATA_E_MCR 0x08 /* media change request */

--- 134 unchanged lines hidden (view full) ---

171 int8_t vendorunique1;
172 int16_t usedmovsd; /* double word read/write? */
173
174 u_int8_t vendorcap; /* vendor capabilities */
175 u_int8_t dmaflag :1; /* DMA supported - always 1 */
176 u_int8_t lbaflag :1; /* LBA supported - always 1 */
177 u_int8_t iordydis :1; /* IORDY may be disabled */
178 u_int8_t iordyflag :1; /* IORDY supported */
179 u_int8_t :1;
179 u_int8_t softreset :1; /* needs softreset when busy */
180 u_int8_t stdby_ovlap :1; /* standby/overlap supported */
180 u_int8_t stdby_ovlap :1; /* standby/overlap supported */
181 u_int8_t :1;
181 u_int8_t queuing :1; /* supports queuing overlap */
182 u_int8_t idmaflag :1; /* interleaved DMA supported */
183 int16_t capvalidate; /* validation for above */
184
185 int8_t vendorunique3;
186 int8_t opiomode; /* PIO modes 0-2 */
187 int8_t vendorunique4;
188 int8_t odmamode; /* old DMA modes, not ATA-3 */
189

--- 89 unchanged lines hidden (view full) ---

279#define ATA_ATA_SLAVE 0x02
280#define ATA_ATAPI_MASTER 0x04
281#define ATA_ATAPI_SLAVE 0x08
282
283 u_int8_t status; /* last controller status */
284 u_int8_t error; /* last controller error */
285 int32_t active; /* active processing request */
286#define ATA_IDLE 0x0
182 u_int8_t idmaflag :1; /* interleaved DMA supported */
183 int16_t capvalidate; /* validation for above */
184
185 int8_t vendorunique3;
186 int8_t opiomode; /* PIO modes 0-2 */
187 int8_t vendorunique4;
188 int8_t odmamode; /* old DMA modes, not ATA-3 */
189

--- 89 unchanged lines hidden (view full) ---

279#define ATA_ATA_SLAVE 0x02
280#define ATA_ATAPI_MASTER 0x04
281#define ATA_ATAPI_SLAVE 0x08
282
283 u_int8_t status; /* last controller status */
284 u_int8_t error; /* last controller error */
285 int32_t active; /* active processing request */
286#define ATA_IDLE 0x0
287#define ATA_IMMEDIATE 0x0
288#define ATA_WAIT_INTR 0x1
289#define ATA_WAIT_READY 0x2
290#define ATA_ACTIVE_ATA 0x3
291#define ATA_ACTIVE_ATAPI 0x4
292#define ATA_REINITING 0x5
287#define ATA_IMMEDIATE 0x1
288#define ATA_WAIT_INTR 0x2
289#define ATA_WAIT_READY 0x3
290#define ATA_ACTIVE_ATA 0x4
291#define ATA_ACTIVE_ATAPI 0x5
292#define ATA_REINITING 0x6
293
294 TAILQ_HEAD(, ad_request) ata_queue; /* head of ATA queue */
295 TAILQ_HEAD(, atapi_request) atapi_queue; /* head of ATAPI queue */
296 void *running; /* currently running request */
297#if NAPM > 0
298 struct apmhook resume_hook; /* hook for apm */
299#endif
300

--- 15 unchanged lines hidden (view full) ---

316int32_t ata_dmastatus(struct ata_softc *);
317int32_t ata_dmadone(struct ata_softc *);
318int32_t ata_pmode(struct ata_params *);
319int32_t ata_wmode(struct ata_params *);
320int32_t ata_umode(struct ata_params *);
321int8_t *ata_mode2str(int32_t);
322int8_t ata_pio2mode(int32_t);
323int32_t ata_find_dev(device_t, int32_t);
293
294 TAILQ_HEAD(, ad_request) ata_queue; /* head of ATA queue */
295 TAILQ_HEAD(, atapi_request) atapi_queue; /* head of ATAPI queue */
296 void *running; /* currently running request */
297#if NAPM > 0
298 struct apmhook resume_hook; /* hook for apm */
299#endif
300

--- 15 unchanged lines hidden (view full) ---

316int32_t ata_dmastatus(struct ata_softc *);
317int32_t ata_dmadone(struct ata_softc *);
318int32_t ata_pmode(struct ata_params *);
319int32_t ata_wmode(struct ata_params *);
320int32_t ata_umode(struct ata_params *);
321int8_t *ata_mode2str(int32_t);
322int8_t ata_pio2mode(int32_t);
323int32_t ata_find_dev(device_t, int32_t);
324int32_t ata_printf(struct ata_softc *, int32_t, const char *, ...) __printflike(3, 4);