Merge from trunk

This commit is contained in:
David Gálvez
2014-07-10 11:09:09 +00:00
parent 98dacfbc69
commit 9a93782b77
54 changed files with 3647 additions and 1000 deletions

View File

@@ -52,17 +52,17 @@ struct dma_driver_interface
{
int32_t version;
int32_t magic;
int32_t (*dma_set_initiator)(int32_t initiator);
uint32_t (*dma_get_initiator)(int32_t requestor);
void (*dma_free_initiator)(int32_t requestor);
int32_t (*dma_set_channel)(int32_t requestor, void (*handler)(void));
int32_t (*dma_get_channel)(int32_t requestor);
void (*dma_free_channel)(int32_t requestor);
void (*dma_clear_channel)(int32_t channel);
int32_t (*MCD_startDma)(long channel,
int8_t *srcAddr, uint32_t srcIncr, int8_t *destAddr, uint32_t destIncr,
uint32_t dmaSize, uint32_t xferSize, uint32_t initiator, int32_t priority,
uint32_t flags, uint32_t funcDesc);
int (*dma_set_initiator)(int initiator);
uint32_t (*dma_get_initiator)(int requestor);
void (*dma_free_initiator)(int requestor);
int (*dma_set_channel)(int requestor, void (*handler)(void));
int (*dma_get_channel)(int requestor);
void (*dma_free_channel)(int requestor);
void (*dma_clear_channel)(int channel);
int (*MCD_startDma)(long channel,
int8_t *srcAddr, unsigned int srcIncr, int8_t *destAddr, unsigned int destIncr,
unsigned int dmaSize, unsigned int xferSize, unsigned int initiator, int priority,
unsigned int flags, unsigned int funcDesc);
int32_t (*MCD_dmaStatus)(int32_t channel);
int32_t (*MCD_XferProgrQuery)(int32_t channel, MCD_XferProg *progRep);
int32_t (*MCD_killDma)(int32_t channel);