| busdma_machdep-v4.c (132514) | busdma_machdep-v4.c (134934) |
|---|---|
| 1/* 2 * Copyright (c) 2004 Olivier Houchard 3 * Copyright (c) 2002 Peter Grehan 4 * Copyright (c) 1997, 1998 Justin T. Gibbs. 5 * All rights reserved. 6 * 7 * Redistribution and use in source and binary forms, with or without 8 * modification, are permitted provided that the following conditions --- 15 unchanged lines hidden (view full) --- 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 * From i386/busdma_machdep.c,v 1.26 2002/04/19 22:58:09 alfred 29 */ 30 31#include <sys/cdefs.h> | 1/* 2 * Copyright (c) 2004 Olivier Houchard 3 * Copyright (c) 2002 Peter Grehan 4 * Copyright (c) 1997, 1998 Justin T. Gibbs. 5 * All rights reserved. 6 * 7 * Redistribution and use in source and binary forms, with or without 8 * modification, are permitted provided that the following conditions --- 15 unchanged lines hidden (view full) --- 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 * From i386/busdma_machdep.c,v 1.26 2002/04/19 22:58:09 alfred 29 */ 30 31#include <sys/cdefs.h> |
| 32__FBSDID("$FreeBSD: head/sys/arm/arm/busdma_machdep.c 132514 2004-07-21 22:04:05Z cognet $"); | 32__FBSDID("$FreeBSD: head/sys/arm/arm/busdma_machdep.c 134934 2004-09-08 04:54:19Z scottl $"); |
| 33 34/* 35 * MacPPC bus dma support routines 36 */ 37 38#define _ARM32_BUS_DMA_PRIVATE 39#include <sys/param.h> 40#include <sys/systm.h> --- 161 unchanged lines hidden (view full) --- 202 } 203 204 /* 205 * Take into account any restrictions imposed by our parent tag 206 */ 207 if (parent != NULL) { 208 newtag->lowaddr = min(parent->lowaddr, newtag->lowaddr); 209 newtag->highaddr = max(parent->highaddr, newtag->highaddr); | 33 34/* 35 * MacPPC bus dma support routines 36 */ 37 38#define _ARM32_BUS_DMA_PRIVATE 39#include <sys/param.h> 40#include <sys/systm.h> --- 161 unchanged lines hidden (view full) --- 202 } 203 204 /* 205 * Take into account any restrictions imposed by our parent tag 206 */ 207 if (parent != NULL) { 208 newtag->lowaddr = min(parent->lowaddr, newtag->lowaddr); 209 newtag->highaddr = max(parent->highaddr, newtag->highaddr); |
| 210 211 /* 212 * XXX Not really correct??? Probably need to honor boundary 213 * all the way up the inheritence chain. 214 */ 215 newtag->boundary = max(parent->boundary, newtag->boundary); | 210 if (newtag->boundary == 0) 211 newtag->boundary = parent->boundary; 212 else if (parent->boundary != 0) 213 newtag->boundary = min(parent->boundary, 214 newtag->boundary); |
| 216 if (newtag->filter == NULL) { 217 /* 218 * Short circuit looking at our parent directly 219 * since we have encapsulated all of its information 220 */ 221 newtag->filter = parent->filter; 222 newtag->filterarg = parent->filterarg; 223 newtag->parent = parent->parent; --- 454 unchanged lines hidden --- | 215 if (newtag->filter == NULL) { 216 /* 217 * Short circuit looking at our parent directly 218 * since we have encapsulated all of its information 219 */ 220 newtag->filter = parent->filter; 221 newtag->filterarg = parent->filterarg; 222 newtag->parent = parent->parent; --- 454 unchanged lines hidden --- |