Deleted Added
full compact
busdma_bounce.c (254025) busdma_bounce.c (257228)
1/*-
2 * Copyright (c) 1997, 1998 Justin T. Gibbs.
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) 1997, 1998 Justin T. Gibbs.
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/x86/x86/busdma_machdep.c 254025 2013-08-07 06:21:20Z jeff $");
28__FBSDID("$FreeBSD: head/sys/x86/x86/busdma_machdep.c 257228 2013-10-27 21:39:16Z kib $");
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/malloc.h>
33#include <sys/bus.h>
34#include <sys/interrupt.h>
35#include <sys/kernel.h>
36#include <sys/ktr.h>

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

844 }
845
846 /*
847 * Did we fit?
848 */
849 return (buflen != 0 ? EFBIG : 0); /* XXX better return value here? */
850}
851
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/malloc.h>
33#include <sys/bus.h>
34#include <sys/interrupt.h>
35#include <sys/kernel.h>
36#include <sys/ktr.h>

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

844 }
845
846 /*
847 * Did we fit?
848 */
849 return (buflen != 0 ? EFBIG : 0); /* XXX better return value here? */
850}
851
852int
853_bus_dmamap_load_ma(bus_dma_tag_t dmat, bus_dmamap_t map,
854 struct vm_page **ma, bus_size_t tlen, int ma_offs, int flags,
855 bus_dma_segment_t *segs, int *segp)
856{
857
858 return (bus_dmamap_load_ma_triv(dmat, map, ma, tlen, ma_offs, flags,
859 segs, segp));
860}
861
852void
853__bus_dmamap_waitok(bus_dma_tag_t dmat, bus_dmamap_t map,
854 struct memdesc *mem, bus_dmamap_callback_t *callback,
855 void *callback_arg)
856{
857 if (map != NULL) {
858 map->mem = *mem;
859 map->dmat = dmat;

--- 335 unchanged lines hidden ---
862void
863__bus_dmamap_waitok(bus_dma_tag_t dmat, bus_dmamap_t map,
864 struct memdesc *mem, bus_dmamap_callback_t *callback,
865 void *callback_arg)
866{
867 if (map != NULL) {
868 map->mem = *mem;
869 map->dmat = dmat;

--- 335 unchanged lines hidden ---