git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-arm
/
arch-imx
/
imx-dma.h
diff --git
a/include/asm-arm/arch-imx/imx-dma.h
b/include/asm-arm/arch-imx/imx-dma.h
index
f2063c1
..
5b1066d
100644
(file)
--- a/
include/asm-arm/arch-imx/imx-dma.h
+++ b/
include/asm-arm/arch-imx/imx-dma.h
@@
-45,8
+45,8
@@
struct imx_dma_channel {
const char *name;
struct imx_dma_channel {
const char *name;
- void (*irq_handler) (int, void *
, struct pt_regs *
);
- void (*err_handler) (int, void *,
struct pt_regs *
);
+ void (*irq_handler) (int, void *);
+ void (*err_handler) (int, void *,
int errcode
);
void *data;
dmamode_t dma_mode;
struct scatterlist *sg;
void *data;
dmamode_t dma_mode;
struct scatterlist *sg;
@@
-58,6
+58,10
@@
struct imx_dma_channel {
extern struct imx_dma_channel imx_dma_channels[IMX_DMA_CHANNELS];
extern struct imx_dma_channel imx_dma_channels[IMX_DMA_CHANNELS];
+#define IMX_DMA_ERR_BURST 1
+#define IMX_DMA_ERR_REQUEST 2
+#define IMX_DMA_ERR_TRANSFER 4
+#define IMX_DMA_ERR_BUFFER 8
/* The type to distinguish channel numbers parameter from ordinal int type */
typedef int imx_dmach_t;
/* The type to distinguish channel numbers parameter from ordinal int type */
typedef int imx_dmach_t;
@@
-73,8
+77,8
@@
imx_dma_setup_sg(imx_dmach_t dma_ch,
int
imx_dma_setup_handlers(imx_dmach_t dma_ch,
int
imx_dma_setup_handlers(imx_dmach_t dma_ch,
- void (*irq_handler) (int, void *
, struct pt_regs *
),
- void (*err_handler) (int, void *,
struct pt_regs *
), void *data);
+ void (*irq_handler) (int, void *),
+ void (*err_handler) (int, void *,
int
), void *data);
void imx_dma_enable(imx_dmach_t dma_ch);
void imx_dma_enable(imx_dmach_t dma_ch);