diff options
-rw-r--r-- | Documentation/DocBook/kernel-api.tmpl | 4 | ||||
-rw-r--r-- | include/asm-i386/mca_dma.h | 3 | ||||
-rw-r--r-- | kernel/dma.c | 10 |
3 files changed, 14 insertions, 3 deletions
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl index 6d4b1ef5b6f1..83b601b963c5 100644 --- a/Documentation/DocBook/kernel-api.tmpl +++ b/Documentation/DocBook/kernel-api.tmpl | |||
@@ -325,6 +325,10 @@ X!Ekernel/module.c | |||
325 | !Ekernel/irq/manage.c | 325 | !Ekernel/irq/manage.c |
326 | </sect1> | 326 | </sect1> |
327 | 327 | ||
328 | <sect1><title>DMA Channels</title> | ||
329 | !Ekernel/dma.c | ||
330 | </sect1> | ||
331 | |||
328 | <sect1><title>Resources Management</title> | 332 | <sect1><title>Resources Management</title> |
329 | !Ikernel/resource.c | 333 | !Ikernel/resource.c |
330 | </sect1> | 334 | </sect1> |
diff --git a/include/asm-i386/mca_dma.h b/include/asm-i386/mca_dma.h index 4b3b526c5a3f..fbb1f3b71279 100644 --- a/include/asm-i386/mca_dma.h +++ b/include/asm-i386/mca_dma.h | |||
@@ -181,7 +181,7 @@ static __inline__ void mca_set_dma_io(unsigned int dmanr, unsigned int io_addr) | |||
181 | * @mode: mode to set | 181 | * @mode: mode to set |
182 | * | 182 | * |
183 | * The DMA controller supports several modes. The mode values you can | 183 | * The DMA controller supports several modes. The mode values you can |
184 | * set are : | 184 | * set are- |
185 | * | 185 | * |
186 | * %MCA_DMA_MODE_READ when reading from the DMA device. | 186 | * %MCA_DMA_MODE_READ when reading from the DMA device. |
187 | * | 187 | * |
@@ -190,7 +190,6 @@ static __inline__ void mca_set_dma_io(unsigned int dmanr, unsigned int io_addr) | |||
190 | * %MCA_DMA_MODE_IO to do DMA to or from an I/O port. | 190 | * %MCA_DMA_MODE_IO to do DMA to or from an I/O port. |
191 | * | 191 | * |
192 | * %MCA_DMA_MODE_16 to do 16bit transfers. | 192 | * %MCA_DMA_MODE_16 to do 16bit transfers. |
193 | * | ||
194 | */ | 193 | */ |
195 | 194 | ||
196 | static __inline__ void mca_set_dma_mode(unsigned int dmanr, unsigned int mode) | 195 | static __inline__ void mca_set_dma_mode(unsigned int dmanr, unsigned int mode) |
diff --git a/kernel/dma.c b/kernel/dma.c index aef0a45b7893..2020644c938a 100644 --- a/kernel/dma.c +++ b/kernel/dma.c | |||
@@ -62,6 +62,11 @@ static struct dma_chan dma_chan_busy[MAX_DMA_CHANNELS] = { | |||
62 | }; | 62 | }; |
63 | 63 | ||
64 | 64 | ||
65 | /** | ||
66 | * request_dma - request and reserve a system DMA channel | ||
67 | * @dmanr: DMA channel number | ||
68 | * @device_id: reserving device ID string, used in /proc/dma | ||
69 | */ | ||
65 | int request_dma(unsigned int dmanr, const char * device_id) | 70 | int request_dma(unsigned int dmanr, const char * device_id) |
66 | { | 71 | { |
67 | if (dmanr >= MAX_DMA_CHANNELS) | 72 | if (dmanr >= MAX_DMA_CHANNELS) |
@@ -76,7 +81,10 @@ int request_dma(unsigned int dmanr, const char * device_id) | |||
76 | return 0; | 81 | return 0; |
77 | } /* request_dma */ | 82 | } /* request_dma */ |
78 | 83 | ||
79 | 84 | /** | |
85 | * free_dma - free a reserved system DMA channel | ||
86 | * @dmanr: DMA channel number | ||
87 | */ | ||
80 | void free_dma(unsigned int dmanr) | 88 | void free_dma(unsigned int dmanr) |
81 | { | 89 | { |
82 | if (dmanr >= MAX_DMA_CHANNELS) { | 90 | if (dmanr >= MAX_DMA_CHANNELS) { |