diff options
| author | Martyn Welch | 2010-02-18 16:12:58 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-03-04 01:43:00 +0100 |
| commit | 4f723df45d3952c485ee0125fb6797ad615901c3 (patch) | |
| tree | 3db9d8a00c01c0ffa4d3d66630abf4e72e4771ed /drivers/staging/vme/vme.h | |
| parent | Staging: vme: Renaming following split of GE Fanuc joint venture (diff) | |
| download | kernel-qcow2-linux-4f723df45d3952c485ee0125fb6797ad615901c3.tar.gz kernel-qcow2-linux-4f723df45d3952c485ee0125fb6797ad615901c3.tar.xz kernel-qcow2-linux-4f723df45d3952c485ee0125fb6797ad615901c3.zip | |
Staging: vme: Attribute Testing For Dma Request
Check the directions in which the DMA controller is expected to operate
before giving control of a resource.
Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vme/vme.h')
| -rw-r--r-- | drivers/staging/vme/vme.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/staging/vme/vme.h b/drivers/staging/vme/vme.h index 5a4d163fae10..48768ca97e16 100644 --- a/drivers/staging/vme/vme.h +++ b/drivers/staging/vme/vme.h @@ -68,6 +68,14 @@ typedef u32 vme_pattern_t; #define VME_DMA_PATTERN_WORD (1<<1) #define VME_DMA_PATTERN_INCREMENT (1<<2) +typedef u32 vme_dma_route_t; +#define VME_DMA_VME_TO_MEM (1<<0) +#define VME_DMA_MEM_TO_VME (1<<1) +#define VME_DMA_VME_TO_VME (1<<2) +#define VME_DMA_MEM_TO_MEM (1<<3) +#define VME_DMA_PATTERN_TO_VME (1<<4) +#define VME_DMA_PATTERN_TO_MEM (1<<5) + struct vme_dma_attr { vme_dma_t type; void *private; @@ -124,7 +132,7 @@ unsigned int vme_master_rmw(struct vme_resource *, unsigned int, unsigned int, unsigned int, loff_t); void vme_master_free(struct vme_resource *); -struct vme_resource *vme_dma_request(struct device *); +struct vme_resource *vme_dma_request(struct device *, vme_dma_route_t); struct vme_dma_list *vme_new_dma_list(struct vme_resource *); struct vme_dma_attr *vme_dma_pattern_attribute(u32, vme_pattern_t); struct vme_dma_attr *vme_dma_pci_attribute(dma_addr_t); |