Deleted Added
sdiff udiff text old ( 170872 ) new ( 241591 )
full compact
aic_isa.c (170872) aic_isa.c (241591)
1/*-
2 * Copyright (c) 1999 Luoqi Chen.
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 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1999 Luoqi Chen.
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 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/dev/aic/aic_isa.c 170872 2007-06-17 05:55:54Z scottl $");
28__FBSDID("$FreeBSD: head/sys/dev/aic/aic_isa.c 241591 2012-10-15 16:09:59Z jhb $");
29
30#include <sys/param.h>
29
30#include <sys/param.h>
31#include <sys/callout.h>
31#include <sys/kernel.h>
32#include <sys/kernel.h>
33#include <sys/lock.h>
32#include <sys/module.h>
34#include <sys/module.h>
35#include <sys/mutex.h>
33#include <sys/bus.h>
34
35#include <machine/bus.h>
36#include <machine/resource.h>
37#include <sys/rman.h>
38
39#include <isa/isavar.h>
40#include <dev/aic/aic6360reg.h>

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

64};
65
66static int
67aic_isa_alloc_resources(device_t dev)
68{
69 struct aic_isa_softc *sc = device_get_softc(dev);
70 int rid;
71
36#include <sys/bus.h>
37
38#include <machine/bus.h>
39#include <machine/resource.h>
40#include <sys/rman.h>
41
42#include <isa/isavar.h>
43#include <dev/aic/aic6360reg.h>

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

67};
68
69static int
70aic_isa_alloc_resources(device_t dev)
71{
72 struct aic_isa_softc *sc = device_get_softc(dev);
73 int rid;
74
72 sc->sc_port = sc->sc_irq = sc->sc_drq = 0;
75 sc->sc_port = sc->sc_irq = sc->sc_drq = NULL;
73
74 rid = 0;
75 sc->sc_port = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
76 0ul, ~0ul, AIC_ISA_PORTSIZE, RF_ACTIVE);
77 if (!sc->sc_port) {
78 device_printf(dev, "I/O port allocation failed\n");
79 return (ENOMEM);
80 }

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

97 if (!sc->sc_drq) {
98 device_printf(dev, "DRQ allocation failed\n");
99 aic_isa_release_resources(dev);
100 return (ENOMEM);
101 }
102 }
103
104 sc->sc_aic.dev = dev;
76
77 rid = 0;
78 sc->sc_port = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
79 0ul, ~0ul, AIC_ISA_PORTSIZE, RF_ACTIVE);
80 if (!sc->sc_port) {
81 device_printf(dev, "I/O port allocation failed\n");
82 return (ENOMEM);
83 }

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

100 if (!sc->sc_drq) {
101 device_printf(dev, "DRQ allocation failed\n");
102 aic_isa_release_resources(dev);
103 return (ENOMEM);
104 }
105 }
106
107 sc->sc_aic.dev = dev;
105 sc->sc_aic.unit = device_get_unit(dev);
106 sc->sc_aic.tag = rman_get_bustag(sc->sc_port);
107 sc->sc_aic.bsh = rman_get_bushandle(sc->sc_port);
108 sc->sc_aic.res = sc->sc_port;
109 mtx_init(&sc->sc_aic.lock, "aic", NULL, MTX_DEF);
108 return (0);
109}
110
111static void
112aic_isa_release_resources(device_t dev)
113{
114 struct aic_isa_softc *sc = device_get_softc(dev);
115
116 if (sc->sc_port)
117 bus_release_resource(dev, SYS_RES_IOPORT, 0, sc->sc_port);
118 if (sc->sc_irq)
119 bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_irq);
120 if (sc->sc_drq)
121 bus_release_resource(dev, SYS_RES_DRQ, 0, sc->sc_drq);
110 return (0);
111}
112
113static void
114aic_isa_release_resources(device_t dev)
115{
116 struct aic_isa_softc *sc = device_get_softc(dev);
117
118 if (sc->sc_port)
119 bus_release_resource(dev, SYS_RES_IOPORT, 0, sc->sc_port);
120 if (sc->sc_irq)
121 bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_irq);
122 if (sc->sc_drq)
123 bus_release_resource(dev, SYS_RES_DRQ, 0, sc->sc_drq);
122 sc->sc_port = sc->sc_irq = sc->sc_drq = 0;
124 sc->sc_port = sc->sc_irq = sc->sc_drq = NULL;
125 mtx_destroy(&sc->sc_aic.lock);
123}
124
125static int
126aic_isa_probe(device_t dev)
127{
128 struct aic_isa_softc *sc = device_get_softc(dev);
129 struct aic_softc *aic = &sc->sc_aic;
130 int numports, i;

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

144 }
145
146 for (i = 0; i < numports; i++) {
147 if (bus_set_resource(dev, SYS_RES_IOPORT, 0, ports[i],
148 AIC_ISA_PORTSIZE))
149 continue;
150 if (aic_isa_alloc_resources(dev))
151 continue;
126}
127
128static int
129aic_isa_probe(device_t dev)
130{
131 struct aic_isa_softc *sc = device_get_softc(dev);
132 struct aic_softc *aic = &sc->sc_aic;
133 int numports, i;

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

147 }
148
149 for (i = 0; i < numports; i++) {
150 if (bus_set_resource(dev, SYS_RES_IOPORT, 0, ports[i],
151 AIC_ISA_PORTSIZE))
152 continue;
153 if (aic_isa_alloc_resources(dev))
154 continue;
152 if (!aic_probe(aic)) {
153 aic_isa_release_resources(dev);
155 if (aic_probe(aic) == 0)
154 break;
156 break;
155 }
156 aic_isa_release_resources(dev);
157 }
158
159 if (i == numports)
160 return (ENXIO);
161
162 porta = aic_inb(aic, PORTA);
157 aic_isa_release_resources(dev);
158 }
159
160 if (i == numports)
161 return (ENXIO);
162
163 porta = aic_inb(aic, PORTA);
164 aic_isa_release_resources(dev);
163 if (isa_get_irq(dev) == -1)
164 bus_set_resource(dev, SYS_RES_IRQ, 0, PORTA_IRQ(porta), 1);
165 if ((aic->flags & AIC_DMA_ENABLE) && isa_get_drq(dev) == -1)
166 bus_set_resource(dev, SYS_RES_DRQ, 0, PORTA_DRQ(porta), 1);
167 device_set_desc(dev, "Adaptec 6260/6360 SCSI controller");
168 return (0);
169}
170

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

183
184 error = aic_attach(aic);
185 if (error) {
186 device_printf(dev, "attach failed\n");
187 aic_isa_release_resources(dev);
188 return (error);
189 }
190
165 if (isa_get_irq(dev) == -1)
166 bus_set_resource(dev, SYS_RES_IRQ, 0, PORTA_IRQ(porta), 1);
167 if ((aic->flags & AIC_DMA_ENABLE) && isa_get_drq(dev) == -1)
168 bus_set_resource(dev, SYS_RES_DRQ, 0, PORTA_DRQ(porta), 1);
169 device_set_desc(dev, "Adaptec 6260/6360 SCSI controller");
170 return (0);
171}
172

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

185
186 error = aic_attach(aic);
187 if (error) {
188 device_printf(dev, "attach failed\n");
189 aic_isa_release_resources(dev);
190 return (error);
191 }
192
191 error = bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_CAM|INTR_ENTROPY,
192 NULL, aic_intr, aic, &sc->sc_ih);
193 error = bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_CAM | INTR_ENTROPY |
194 INTR_MPSAFE, NULL, aic_intr, aic, &sc->sc_ih);
193 if (error) {
194 device_printf(dev, "failed to register interrupt handler\n");
195 aic_isa_release_resources(dev);
196 return (error);
197 }
198 return (0);
199}
200

--- 39 unchanged lines hidden --- 		195 if (error) {
196 device_printf(dev, "failed to register interrupt handler\n");
197 aic_isa_release_resources(dev);
198 return (error);
199 }
200 return (0);
201}
202

--- 39 unchanged lines hidden ---