d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix arm wrt to busdma...

Browse Source 
also wrap the two macros that have bare if's w/ do {} while(0) so that
my epe driver doesn't get a warning about braces around confused else...
This commit is contained in:
jmg 2005-03-15 14:57:30 +00:00
parent 5c298acd0a
commit c3d17f2e03
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arm/arm/busdma_machdep.c
View File

@ -709,7 +709,7 @@ bus_dmamap_load_uio(bus_dma_tag_t dmat, bus_dmamap_t map, struct uio *uio,
* Release the mapping held by map.
*/
void
bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map)
_bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map)
{
map->flags &= ~DMAMAP_TYPE_MASK;
return;
@ -735,7 +735,7 @@ bus_dmamap_sync_buf(void *buf, int len, bus_dmasync_op_t op)
}
void
bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op)
_bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op)
{
struct mbuf *m;
struct uio *uio;

17
sys/sys/bus_dma.h
View File

@ -277,17 +277,22 @@ int bus_dmamap_load_uio(bus_dma_tag_t dmat, bus_dmamap_t map,
* Perform a synchronization operation on the given map.
*/
void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_dmasync_op_t);
#define bus_dmamap_sync(dmat, dmamap, op) \
if ((dmamap) != NULL) \
_bus_dmamap_sync(dmat, dmamap, op)
#define bus_dmamap_sync(dmat, dmamap, op) \
do { \
if ((dmamap) != NULL) \
_bus_dmamap_sync(dmat, dmamap, op); \
} while (0)
/*
* Release the mapping held by map.
*/
void _bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map);
#define bus_dmamap_unload(dmat, dmamap) \
if ((dmamap) != NULL) \
_bus_dmamap_unload(dmat, dmamap)
#define bus_dmamap_unload(dmat, dmamap) \
do { \
if ((dmamap) != NULL) \
_bus_dmamap_unload(dmat, dmamap); \
} while (0)
#endif /* __sparc64__ */
#endif /* _BUS_DMA_H_ */