Deleted Added
full compact
ata-all.h (57325) ata-all.h (57477)
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 57325 2000-02-18 20:57:33Z sos $
28 * $FreeBSD: head/sys/dev/ata/ata-all.h 57477 2000-02-25 09:48:23Z 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 */

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

255/* structure describing an ATA device */
256struct ata_softc {
257 struct device *dev; /* device handle */
258 int32_t unit; /* unit on this controller */
259 struct resource *r_io; /* io addr resource handle */
260 struct resource *r_altio; /* altio addr resource handle */
261 struct resource *r_bmio; /* bmio addr resource handle */
262 struct resource *r_irq; /* interrupt of this channel */
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 */

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

255/* structure describing an ATA device */
256struct ata_softc {
257 struct device *dev; /* device handle */
258 int32_t unit; /* unit on this controller */
259 struct resource *r_io; /* io addr resource handle */
260 struct resource *r_altio; /* altio addr resource handle */
261 struct resource *r_bmio; /* bmio addr resource handle */
262 struct resource *r_irq; /* interrupt of this channel */
263 void *ih; /* interrupt handle */
263 int32_t ioaddr; /* physical port addr */
264 int32_t altioaddr; /* physical alt port addr */
265 int32_t bmaddr; /* physical bus master port */
266 int32_t chiptype; /* pciid of controller chip */
267 struct ata_params *dev_param[2]; /* ptr to devices params */
268 void *dev_softc[2]; /* ptr to devices softc's */
269 struct ata_dmaentry *dmatab[2]; /* DMA transfer tables */
270 int32_t mode[2]; /* transfer mode for devices */

--- 63 unchanged lines hidden ---
264 int32_t ioaddr; /* physical port addr */
265 int32_t altioaddr; /* physical alt port addr */
266 int32_t bmaddr; /* physical bus master port */
267 int32_t chiptype; /* pciid of controller chip */
268 struct ata_params *dev_param[2]; /* ptr to devices params */
269 void *dev_softc[2]; /* ptr to devices softc's */
270 struct ata_dmaentry *dmatab[2]; /* DMA transfer tables */
271 int32_t mode[2]; /* transfer mode for devices */

--- 63 unchanged lines hidden ---