Deleted Added
full compact
busdma_machdep-v6.c (269209) busdma_machdep-v6.c (269210)
1/*-
2 * Copyright (c) 2012 Ian Lepore
3 * Copyright (c) 2010 Mark Tinguely
4 * Copyright (c) 2004 Olivier Houchard
5 * Copyright (c) 2002 Peter Grehan
6 * Copyright (c) 1997, 1998 Justin T. Gibbs.
7 * All rights reserved.
8 *

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

26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE.
29 *
30 * From i386/busdma_machdep.c 191438 2009-04-23 20:24:19Z jhb
31 */
32
33#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2012 Ian Lepore
3 * Copyright (c) 2010 Mark Tinguely
4 * Copyright (c) 2004 Olivier Houchard
5 * Copyright (c) 2002 Peter Grehan
6 * Copyright (c) 1997, 1998 Justin T. Gibbs.
7 * All rights reserved.
8 *

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

26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE.
29 *
30 * From i386/busdma_machdep.c 191438 2009-04-23 20:24:19Z jhb
31 */
32
33#include <sys/cdefs.h>
34__FBSDID("$FreeBSD: head/sys/arm/arm/busdma_machdep-v6.c 269209 2014-07-29 02:36:02Z ian $");
34__FBSDID("$FreeBSD: head/sys/arm/arm/busdma_machdep-v6.c 269210 2014-07-29 02:36:09Z ian $");
35
36#define _ARM32_BUS_DMA_PRIVATE
37#include <sys/param.h>
38#include <sys/kdb.h>
39#include <ddb/ddb.h>
40#include <ddb/db_output.h>
41#include <sys/systm.h>
42#include <sys/malloc.h>

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

441 newtag->segments = newtag->tagsegs;
442 else
443 newtag->segments = NULL;
444
445 /* Take into account any restrictions imposed by our parent tag */
446 if (parent != NULL) {
447 newtag->lowaddr = MIN(parent->lowaddr, newtag->lowaddr);
448 newtag->highaddr = MAX(parent->highaddr, newtag->highaddr);
35
36#define _ARM32_BUS_DMA_PRIVATE
37#include <sys/param.h>
38#include <sys/kdb.h>
39#include <ddb/ddb.h>
40#include <ddb/db_output.h>
41#include <sys/systm.h>
42#include <sys/malloc.h>

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

441 newtag->segments = newtag->tagsegs;
442 else
443 newtag->segments = NULL;
444
445 /* Take into account any restrictions imposed by our parent tag */
446 if (parent != NULL) {
447 newtag->lowaddr = MIN(parent->lowaddr, newtag->lowaddr);
448 newtag->highaddr = MAX(parent->highaddr, newtag->highaddr);
449 newtag->alignment = MAX(parent->alignment, newtag->alignment);
449 newtag->flags |= parent->flags & BUS_DMA_COULD_BOUNCE;
450 if (newtag->boundary == 0)
451 newtag->boundary = parent->boundary;
452 else if (parent->boundary != 0)
453 newtag->boundary = MIN(parent->boundary,
454 newtag->boundary);
455 if (newtag->filter == NULL) {
456 /*

--- 1151 unchanged lines hidden ---
450 newtag->flags |= parent->flags & BUS_DMA_COULD_BOUNCE;
451 if (newtag->boundary == 0)
452 newtag->boundary = parent->boundary;
453 else if (parent->boundary != 0)
454 newtag->boundary = MIN(parent->boundary,
455 newtag->boundary);
456 if (newtag->filter == NULL) {
457 /*

--- 1151 unchanged lines hidden ---