| mrml_bridge.c (294994) | mrml_bridge.c (295832) |
|---|---|
| 1/* 2 * Copyright (C) 2016 Cavium Inc. 3 * All rights reserved. 4 * 5 * Developed by Semihalf. 6 * 7 * Redistribution and use in source and binary forms, with or without 8 * modification, are permitted provided that the following conditions --- 14 unchanged lines hidden (view full) --- 23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 26 * SUCH DAMAGE. 27 */ 28#include "opt_platform.h" 29 30#include <sys/cdefs.h> | 1/* 2 * Copyright (C) 2016 Cavium Inc. 3 * All rights reserved. 4 * 5 * Developed by Semihalf. 6 * 7 * Redistribution and use in source and binary forms, with or without 8 * modification, are permitted provided that the following conditions --- 14 unchanged lines hidden (view full) --- 23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 26 * SUCH DAMAGE. 27 */ 28#include "opt_platform.h" 29 30#include <sys/cdefs.h> |
| 31__FBSDID("$FreeBSD: head/sys/dev/vnic/mrml_bridge.c 294994 2016-01-28 15:44:14Z zbb $"); | 31__FBSDID("$FreeBSD: head/sys/dev/vnic/mrml_bridge.c 295832 2016-02-20 01:32:58Z jhibbits $"); |
| 32 33#include <sys/param.h> 34#include <sys/systm.h> 35#include <sys/bus.h> 36#include <sys/kernel.h> 37#include <sys/module.h> 38#include <sys/resource.h> 39#include <sys/rman.h> --- 94 unchanged lines hidden (view full) --- 134mrmlb_ofw_bus_alloc_res(device_t bus, device_t child, int type, int *rid, 135 rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) 136{ 137 struct simplebus_softc *sc; 138 struct mrmlb_ofw_devinfo *di; 139 struct resource_list_entry *rle; 140 int i; 141 | 32 33#include <sys/param.h> 34#include <sys/systm.h> 35#include <sys/bus.h> 36#include <sys/kernel.h> 37#include <sys/module.h> 38#include <sys/resource.h> 39#include <sys/rman.h> --- 94 unchanged lines hidden (view full) --- 134mrmlb_ofw_bus_alloc_res(device_t bus, device_t child, int type, int *rid, 135 rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) 136{ 137 struct simplebus_softc *sc; 138 struct mrmlb_ofw_devinfo *di; 139 struct resource_list_entry *rle; 140 int i; 141 |
| 142 if ((start == 0UL) && (end == ~0UL)) { | 142 if (RMAN_IS_DEFAULT_RANGE(start, end)) { |
| 143 if ((di = device_get_ivars(child)) == NULL) 144 return (NULL); 145 if (type == SYS_RES_IOPORT) 146 type = SYS_RES_MEMORY; 147 148 /* Find defaults for this rid */ 149 rle = resource_list_find(&di->di_rl, type, *rid); 150 if (rle == NULL) --- 130 unchanged lines hidden --- | 143 if ((di = device_get_ivars(child)) == NULL) 144 return (NULL); 145 if (type == SYS_RES_IOPORT) 146 type = SYS_RES_MEMORY; 147 148 /* Find defaults for this rid */ 149 rle = resource_list_find(&di->di_rl, type, *rid); 150 if (rle == NULL) --- 130 unchanged lines hidden --- |