Deleted Added
full compact
mly.c (119285) mly.c (119690)
1/*-
2 * Copyright (c) 2000, 2001 Michael Smith
3 * Copyright (c) 2000 BSDi
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 *
1/*-
2 * Copyright (c) 2000, 2001 Michael Smith
3 * Copyright (c) 2000 BSDi
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 *
27 * $FreeBSD: head/sys/dev/mly/mly.c 119285 2003-08-22 06:42:59Z imp $
27 * $FreeBSD: head/sys/dev/mly/mly.c 119690 2003-09-02 17:30:40Z jhb $
28 */
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/malloc.h>
33#include <sys/kernel.h>
34#include <sys/bus.h>
35#include <sys/conf.h>

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

363 if ((command & PCIM_CMD_MEMEN) == 0) {
364 mly_printf(sc, "memory window not available\n");
365 goto fail;
366 }
367
368 /*
369 * Allocate the PCI register window.
370 */
28 */
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/malloc.h>
33#include <sys/kernel.h>
34#include <sys/bus.h>
35#include <sys/conf.h>

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

363 if ((command & PCIM_CMD_MEMEN) == 0) {
364 mly_printf(sc, "memory window not available\n");
365 goto fail;
366 }
367
368 /*
369 * Allocate the PCI register window.
370 */
371 sc->mly_regs_rid = PCIR_MAPS; /* first base address register */
371 sc->mly_regs_rid = PCIR_BAR(0); /* first base address register */
372 if ((sc->mly_regs_resource = bus_alloc_resource(sc->mly_dev, SYS_RES_MEMORY, &sc->mly_regs_rid,
373 0, ~0, 1, RF_ACTIVE)) == NULL) {
374 mly_printf(sc, "can't allocate register window\n");
375 goto fail;
376 }
377 sc->mly_btag = rman_get_bustag(sc->mly_regs_resource);
378 sc->mly_bhandle = rman_get_bushandle(sc->mly_regs_resource);
379

--- 2619 unchanged lines hidden ---
372 if ((sc->mly_regs_resource = bus_alloc_resource(sc->mly_dev, SYS_RES_MEMORY, &sc->mly_regs_rid,
373 0, ~0, 1, RF_ACTIVE)) == NULL) {
374 mly_printf(sc, "can't allocate register window\n");
375 goto fail;
376 }
377 sc->mly_btag = rman_get_bustag(sc->mly_regs_resource);
378 sc->mly_bhandle = rman_get_bushandle(sc->mly_regs_resource);
379

--- 2619 unchanged lines hidden ---