Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename _PRIVATE_BUS_DMAMEM_ALLOC_RANGE to _BUS_DMAMEM_ALLOC_RANGE for 

consistency with other macros defined in bus_private.h. Pointed out by
YAMAMOTO Takashi.
This commit is contained in:
bouyer 2005-08-22 11:09:39 +00:00
parent e6a6daf84f
commit f60ca60293
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/x86/include/bus_private.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: bus_private.h,v 1.2 2005/08/20 19:18:11 bouyer Exp $ */
/* $NetBSD: bus_private.h,v 1.3 2005/08/22 11:09:39 bouyer Exp $ */
/* NetBSD: bus.h,v 1.8 2005/03/09 19:04:46 matt Exp */
/*-
@ -98,7 +98,7 @@ void _bus_dmamem_unmap(bus_dma_tag_t tag, caddr_t kva, size_t size);
paddr_t _bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs,
int nsegs, off_t off, int prot, int flags);
#ifndef _PRIVATE_BUS_DMAMEM_ALLOC_RANGE
#ifndef _BUS_DMAMEM_ALLOC_RANGE
int _bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size,
bus_size_t alignment, bus_size_t boundary,
bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags,

12
sys/arch/x86/x86/bus_dma.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bus_dma.c,v 1.22 2005/08/20 19:18:11 bouyer Exp $ */
/* $NetBSD: bus_dma.c,v 1.23 2005/08/22 11:09:39 bouyer Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.22 2005/08/20 19:18:11 bouyer Exp $");
__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.23 2005/08/22 11:09:39 bouyer Exp $");
/*
* The following is included because _bus_dma_uiomove is derived from
@ -139,8 +139,8 @@ static int _bus_dmamap_load_buffer(bus_dma_tag_t t, bus_dmamap_t map,
static __inline int _bus_dmamap_load_busaddr(bus_dma_tag_t, bus_dmamap_t,
bus_addr_t, int);
#ifndef _PRIVATE_BUS_DMAMEM_ALLOC_RANGE
#define _PRIVATE_BUS_DMAMEM_ALLOC_RANGE _bus_dmamem_alloc_range
#ifndef _BUS_DMAMEM_ALLOC_RANGE
#define _BUS_DMAMEM_ALLOC_RANGE _bus_dmamem_alloc_range
/*
* Allocate physical memory from the given physical address range.
@ -200,7 +200,7 @@ _bus_dmamem_alloc_range(bus_dma_tag_t t, bus_size_t size, bus_size_t alignment,
return (0);
}
#endif /* _PRIVATE_BUS_DMAMEM_ALLOC_RANGE */
#endif /* _BUS_DMAMEM_ALLOC_RANGE */
/*
* Create a DMA map.
@ -860,7 +860,7 @@ _bus_dmamem_alloc(bus_dma_tag_t t, bus_size_t size, bus_size_t alignment,
else
high = trunc_page(_BUS_AVAIL_END);
return (_PRIVATE_BUS_DMAMEM_ALLOC_RANGE(t, size, alignment, boundary,
return (_BUS_DMAMEM_ALLOC_RANGE(t, size, alignment, boundary,
segs, nsegs, rsegs, flags, t->_bounce_alloc_lo, high));
}

4
sys/arch/xen/include/bus_private.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: bus_private.h,v 1.2 2005/08/20 19:30:37 bouyer Exp $ */
/* $NetBSD: bus_private.h,v 1.3 2005/08/22 11:09:39 bouyer Exp $ */
/*-
* Copyright (c)2005 YAMAMOTO Takashi,
@ -46,7 +46,7 @@ _bus_virt_to_bus(struct pmap *pm, vaddr_t va)
}
/* we need our own bus_dmamem_alloc_range */
#define _PRIVATE_BUS_DMAMEM_ALLOC_RANGE _xen_bus_dmamem_alloc_range
#define _BUS_DMAMEM_ALLOC_RANGE _xen_bus_dmamem_alloc_range
int _xen_bus_dmamem_alloc_range(bus_dma_tag_t, bus_size_t, bus_size_t,
bus_size_t, bus_dma_segment_t *, int, int *, int,
bus_addr_t, bus_addr_t);