Deleted Added
full compact
siis.c (208410) siis.c (208414)
1/*-
2 * Copyright (c) 2009 Alexander Motin <mav@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 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2009 Alexander Motin <mav@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 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/dev/siis/siis.c 208410 2010-05-22 07:32:47Z mav $");
28__FBSDID("$FreeBSD: head/sys/dev/siis/siis.c 208414 2010-05-22 08:30:47Z mav $");
29
30#include <sys/param.h>
31#include <sys/module.h>
32#include <sys/systm.h>
33#include <sys/kernel.h>
34#include <sys/ata.h>
35#include <sys/bus.h>
36#include <sys/endian.h>

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

147 return (ENXIO);
148 ctlr->gctl = ATA_INL(ctlr->r_gmem, SIIS_GCTL);
149 /* Channels memory */
150 ctlr->r_rid = PCIR_BAR(2);
151 if (!(ctlr->r_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
152 &ctlr->r_rid, RF_ACTIVE)))
153 return (ENXIO);
154 /* Setup our own memory management for channels. */
29
30#include <sys/param.h>
31#include <sys/module.h>
32#include <sys/systm.h>
33#include <sys/kernel.h>
34#include <sys/ata.h>
35#include <sys/bus.h>
36#include <sys/endian.h>

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

147 return (ENXIO);
148 ctlr->gctl = ATA_INL(ctlr->r_gmem, SIIS_GCTL);
149 /* Channels memory */
150 ctlr->r_rid = PCIR_BAR(2);
151 if (!(ctlr->r_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
152 &ctlr->r_rid, RF_ACTIVE)))
153 return (ENXIO);
154 /* Setup our own memory management for channels. */
155 ctlr->sc_iomem.rm_start = rman_get_start(ctlr->r_mem);
156 ctlr->sc_iomem.rm_end = rman_get_end(ctlr->r_mem);
155 ctlr->sc_iomem.rm_type = RMAN_ARRAY;
156 ctlr->sc_iomem.rm_descr = "I/O memory addresses";
157 if ((error = rman_init(&ctlr->sc_iomem)) != 0) {
158 bus_release_resource(dev, SYS_RES_MEMORY, ctlr->r_rid, ctlr->r_mem);
159 bus_release_resource(dev, SYS_RES_MEMORY, ctlr->r_grid, ctlr->r_gmem);
160 return (error);
161 }
162 if ((error = rman_manage_region(&ctlr->sc_iomem,

--- 1688 unchanged lines hidden ---
157 ctlr->sc_iomem.rm_type = RMAN_ARRAY;
158 ctlr->sc_iomem.rm_descr = "I/O memory addresses";
159 if ((error = rman_init(&ctlr->sc_iomem)) != 0) {
160 bus_release_resource(dev, SYS_RES_MEMORY, ctlr->r_rid, ctlr->r_mem);
161 bus_release_resource(dev, SYS_RES_MEMORY, ctlr->r_grid, ctlr->r_gmem);
162 return (error);
163 }
164 if ((error = rman_manage_region(&ctlr->sc_iomem,

--- 1688 unchanged lines hidden ---