diff options
Diffstat (limited to 'include/sound/memalloc.h')
| -rw-r--r-- | include/sound/memalloc.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/sound/memalloc.h b/include/sound/memalloc.h index 7ccce94a5255..c42506212649 100644 --- a/include/sound/memalloc.h +++ b/include/sound/memalloc.h | |||
| @@ -47,7 +47,11 @@ struct snd_dma_device { | |||
| 47 | #define SNDRV_DMA_TYPE_UNKNOWN 0 /* not defined */ | 47 | #define SNDRV_DMA_TYPE_UNKNOWN 0 /* not defined */ |
| 48 | #define SNDRV_DMA_TYPE_CONTINUOUS 1 /* continuous no-DMA memory */ | 48 | #define SNDRV_DMA_TYPE_CONTINUOUS 1 /* continuous no-DMA memory */ |
| 49 | #define SNDRV_DMA_TYPE_DEV 2 /* generic device continuous */ | 49 | #define SNDRV_DMA_TYPE_DEV 2 /* generic device continuous */ |
| 50 | #ifdef CONFIG_SND_DMA_SGBUF | ||
| 50 | #define SNDRV_DMA_TYPE_DEV_SG 3 /* generic device SG-buffer */ | 51 | #define SNDRV_DMA_TYPE_DEV_SG 3 /* generic device SG-buffer */ |
| 52 | #else | ||
| 53 | #define SNDRV_DMA_TYPE_DEV_SG SNDRV_DMA_TYPE_DEV /* no SG-buf support */ | ||
| 54 | #endif | ||
| 51 | 55 | ||
| 52 | /* | 56 | /* |
| 53 | * info for buffer allocation | 57 | * info for buffer allocation |
| @@ -60,6 +64,7 @@ struct snd_dma_buffer { | |||
| 60 | void *private_data; /* private for allocator; don't touch */ | 64 | void *private_data; /* private for allocator; don't touch */ |
| 61 | }; | 65 | }; |
| 62 | 66 | ||
| 67 | #ifdef CONFIG_SND_DMA_SGBUF | ||
| 63 | /* | 68 | /* |
| 64 | * Scatter-Gather generic device pages | 69 | * Scatter-Gather generic device pages |
| 65 | */ | 70 | */ |
| @@ -107,6 +112,7 @@ static inline void *snd_sgbuf_get_ptr(struct snd_sg_buf *sgbuf, size_t offset) | |||
| 107 | { | 112 | { |
| 108 | return sgbuf->table[offset >> PAGE_SHIFT].buf + offset % PAGE_SIZE; | 113 | return sgbuf->table[offset >> PAGE_SHIFT].buf + offset % PAGE_SIZE; |
| 109 | } | 114 | } |
| 115 | #endif /* CONFIG_SND_DMA_SGBUF */ | ||
| 110 | 116 | ||
| 111 | /* allocate/release a buffer */ | 117 | /* allocate/release a buffer */ |
| 112 | int snd_dma_alloc_pages(int type, struct device *dev, size_t size, | 118 | int snd_dma_alloc_pages(int type, struct device *dev, size_t size, |
