| busdma_machdep-v6.c (246859) | busdma_machdep-v6.c (246881) |
|---|---|
| 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 246859 2013-02-15 23:41:47Z ian $"); | 34__FBSDID("$FreeBSD: head/sys/arm/arm/busdma_machdep-v6.c 246881 2013-02-16 20:43:16Z 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> --- 808 unchanged lines hidden (view full) --- 851 852 if (dmat->ranges) { 853 struct arm32_dma_range *dr; 854 855 dr = _bus_dma_inrange(dmat->ranges, dmat->_nranges, 856 curaddr); 857 if (dr == NULL) { 858 _bus_dmamap_unload(dmat, map); | 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> --- 808 unchanged lines hidden (view full) --- 851 852 if (dmat->ranges) { 853 struct arm32_dma_range *dr; 854 855 dr = _bus_dma_inrange(dmat->ranges, dmat->_nranges, 856 curaddr); 857 if (dr == NULL) { 858 _bus_dmamap_unload(dmat, map); |
| 859 return (EINVAL); | 859 return (0); |
| 860 } 861 /* 862 * In a valid DMA range. Translate the physical 863 * memory address to an address in the DMA window. 864 */ 865 curaddr = (curaddr - dr->dr_sysbase) + dr->dr_busbase; 866 } 867 --- 747 unchanged lines hidden --- | 860 } 861 /* 862 * In a valid DMA range. Translate the physical 863 * memory address to an address in the DMA window. 864 */ 865 curaddr = (curaddr - dr->dr_sysbase) + dr->dr_busbase; 866 } 867 --- 747 unchanged lines hidden --- |