Deleted Added
full compact
entry.c (295790) entry.c (296135)
1/*
2 * Copyright (c) 2004-2005 HighPoint Technologies, Inc.
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) 2004-2005 HighPoint Technologies, Inc.
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/hptmv/entry.c 295790 2016-02-19 03:37:56Z jhibbits $");
28__FBSDID("$FreeBSD: head/sys/dev/hptmv/entry.c 296135 2016-02-27 03:34:01Z jhibbits $");
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/kernel.h>
33#include <sys/bus.h>
34#include <sys/malloc.h>
35#include <sys/resource.h>
36#include <sys/time.h>

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

1299 if (hptmv_allocate_edma_queues(pAdapter))
1300 {
1301 MV_ERROR("RR18xx: Failed to allocate memory for EDMA queues\n");
1302 return ENOMEM;
1303 }
1304
1305 /* also map EPROM address */
1306 rid = 0x10;
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/kernel.h>
33#include <sys/bus.h>
34#include <sys/malloc.h>
35#include <sys/resource.h>
36#include <sys/time.h>

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

1299 if (hptmv_allocate_edma_queues(pAdapter))
1300 {
1301 MV_ERROR("RR18xx: Failed to allocate memory for EDMA queues\n");
1302 return ENOMEM;
1303 }
1304
1305 /* also map EPROM address */
1306 rid = 0x10;
1307 if (!(pAdapter->mem_res = bus_alloc_resource(pAdapter->hpt_dev, SYS_RES_MEMORY, &rid,
1308 0, ~0, MV_SATA_PCI_BAR0_SPACE_SIZE+0x40000, RF_ACTIVE))
1307 if (!(pAdapter->mem_res = bus_alloc_resource_any(pAdapter->hpt_dev,
1308 SYS_RES_MEMORY, &rid, RF_ACTIVE))
1309 ||
1310 !(pMvSataAdapter->adapterIoBaseAddress = rman_get_virtual(pAdapter->mem_res)))
1311 {
1312 MV_ERROR("RR18xx: Failed to remap memory space\n");
1313 hptmv_free_edma_queues(pAdapter);
1314 return ENXIO;
1315 }
1316 else

--- 1676 unchanged lines hidden ---
1309 ||
1310 !(pMvSataAdapter->adapterIoBaseAddress = rman_get_virtual(pAdapter->mem_res)))
1311 {
1312 MV_ERROR("RR18xx: Failed to remap memory space\n");
1313 hptmv_free_edma_queues(pAdapter);
1314 return ENXIO;
1315 }
1316 else

--- 1676 unchanged lines hidden ---