Deleted Added
full compact
ata-isa.c (103707) ata-isa.c (107562)
1/*-
2 * Copyright (c) 1998,1999,2000,2001,2002 S�ren Schmidt <sos@FreeBSD.org>
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,2001,2002 S�ren Schmidt <sos@FreeBSD.org>
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-isa.c 103707 2002-09-20 18:08:57Z phk $
28 * $FreeBSD: head/sys/dev/ata/ata-isa.c 107562 2002-12-03 20:20:44Z sos $
29 */
30
31#include "opt_ata.h"
32
33#include <sys/param.h>
34#include <sys/systm.h>
35#include <sys/kernel.h>
36#include <sys/module.h>

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

48 {0x0006d041, "Generic ESDI/IDE/ATA controller"}, /* PNP0600 */
49 {0x0106d041, "Plus Hardcard II"}, /* PNP0601 */
50 {0x0206d041, "Plus Hardcard IIXL/EZ"}, /* PNP0602 */
51 {0x0306d041, "Generic ATA"}, /* PNP0603 */
52 {0}
53};
54
55static int
29 */
30
31#include "opt_ata.h"
32
33#include <sys/param.h>
34#include <sys/systm.h>
35#include <sys/kernel.h>
36#include <sys/module.h>

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

48 {0x0006d041, "Generic ESDI/IDE/ATA controller"}, /* PNP0600 */
49 {0x0106d041, "Plus Hardcard II"}, /* PNP0601 */
50 {0x0206d041, "Plus Hardcard IIXL/EZ"}, /* PNP0602 */
51 {0x0306d041, "Generic ATA"}, /* PNP0603 */
52 {0}
53};
54
55static int
56ata_isa_intrnoop(struct ata_channel *ch)
57{
58 return 1;
59
60}
61static void
62ata_isa_lock(struct ata_channel *ch, int type)
63{
64}
65
66static int
56ata_isa_probe(device_t dev)
57{
58 struct ata_channel *ch = device_get_softc(dev);
59 struct resource *io;
60 u_long tmp;
61 int rid;
62
63 /* check isapnp ids */
64 if (ISA_PNP_PROBE(device_get_parent(dev), dev, ata_ids) == ENXIO)
65 return ENXIO;
66
67ata_isa_probe(device_t dev)
68{
69 struct ata_channel *ch = device_get_softc(dev);
70 struct resource *io;
71 u_long tmp;
72 int rid;
73
74 /* check isapnp ids */
75 if (ISA_PNP_PROBE(device_get_parent(dev), dev, ata_ids) == ENXIO)
76 return ENXIO;
77
67 /* allocate the io port range to get the start address */
78 /* allocate the io port range */
68 rid = ATA_IOADDR_RID;
69 io = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0,
70 ATA_IOSIZE, RF_ACTIVE);
71 if (!io)
72 return ENOMEM;
73
74 /* set the altport range */
75 if (bus_get_resource(dev, SYS_RES_IOPORT, ATA_ALTADDR_RID, &tmp, &tmp)) {
76 bus_set_resource(dev, SYS_RES_IOPORT, ATA_ALTADDR_RID,
77 rman_get_start(io) + ATA_ALTOFFSET, ATA_ALTIOSIZE);
78 }
79
80 bus_release_resource(dev, SYS_RES_IOPORT, rid, io);
81 ch->unit = 0;
82 ch->flags |= ATA_USE_16BIT;
79 rid = ATA_IOADDR_RID;
80 io = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0,
81 ATA_IOSIZE, RF_ACTIVE);
82 if (!io)
83 return ENOMEM;
84
85 /* set the altport range */
86 if (bus_get_resource(dev, SYS_RES_IOPORT, ATA_ALTADDR_RID, &tmp, &tmp)) {
87 bus_set_resource(dev, SYS_RES_IOPORT, ATA_ALTADDR_RID,
88 rman_get_start(io) + ATA_ALTOFFSET, ATA_ALTIOSIZE);
89 }
90
91 bus_release_resource(dev, SYS_RES_IOPORT, rid, io);
92 ch->unit = 0;
93 ch->flags |= ATA_USE_16BIT;
94 ch->intr_func = ata_isa_intrnoop;
95 ch->lock_func = ata_isa_lock;
83 return ata_probe(dev);
84}
85
86static device_method_t ata_isa_methods[] = {
87 /* device interface */
88 DEVMETHOD(device_probe, ata_isa_probe),
89 DEVMETHOD(device_attach, ata_attach),
90 DEVMETHOD(device_resume, ata_resume),

--- 61 unchanged lines hidden ---
96 return ata_probe(dev);
97}
98
99static device_method_t ata_isa_methods[] = {
100 /* device interface */
101 DEVMETHOD(device_probe, ata_isa_probe),
102 DEVMETHOD(device_attach, ata_attach),
103 DEVMETHOD(device_resume, ata_resume),

--- 61 unchanged lines hidden ---