Deleted Added
full compact
ata-all.h (52067) ata-all.h (52918)
1/*-
2 * Copyright (c) 1998,1999 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 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 52067 1999-10-09 19:57:13Z sos $
28 * $FreeBSD: head/sys/dev/ata/ata-all.h 52918 1999-11-06 16:50:21Z 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_ABORT 0x04 /* command aborted */
35
36#define ATA_FEATURE 0x01 /* (W) feature register */

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

150#define ATA_ATAPI_SLAVE 0x08
151
152 u_int8_t status; /* last controller status */
153 u_int8_t error; /* last controller error */
154 int32_t active; /* active processing request */
155#define ATA_IDLE 0x0
156#define ATA_IMMEDIATE 0x0
157#define ATA_WAIT_INTR 0x1
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_ABORT 0x04 /* command aborted */
35
36#define ATA_FEATURE 0x01 /* (W) feature register */

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

150#define ATA_ATAPI_SLAVE 0x08
151
152 u_int8_t status; /* last controller status */
153 u_int8_t error; /* last controller error */
154 int32_t active; /* active processing request */
155#define ATA_IDLE 0x0
156#define ATA_IMMEDIATE 0x0
157#define ATA_WAIT_INTR 0x1
158#define ATA_IGNORE_INTR 0x2
158#define ATA_WAIT_READY 0x2
159#define ATA_ACTIVE_ATA 0x3
160#define ATA_ACTIVE_ATAPI 0x4
161#define ATA_REINITING 0x5
162
163 TAILQ_HEAD(, ad_request) ata_queue; /* head of ATA queue */
164 TAILQ_HEAD(, atapi_request) atapi_queue; /* head of ATAPI queue */
165 void *running; /* currently running request */
166#if NAPM > 0

--- 24 unchanged lines hidden ---
159#define ATA_ACTIVE_ATA 0x3
160#define ATA_ACTIVE_ATAPI 0x4
161#define ATA_REINITING 0x5
162
163 TAILQ_HEAD(, ad_request) ata_queue; /* head of ATA queue */
164 TAILQ_HEAD(, atapi_request) atapi_queue; /* head of ATAPI queue */
165 void *running; /* currently running request */
166#if NAPM > 0

--- 24 unchanged lines hidden ---