added prescaler for 16 bit pwm in LPC1347 target
Fork of mbed-dev by
Diff: targets/hal/TARGET_Atmel/TARGET_SAM_CortexM0P/dma_api.c
- Revision:
- 64:41a834223ea3
- Parent:
- 15:a81a8d6c1dfe
--- a/targets/hal/TARGET_Atmel/TARGET_SAM_CortexM0P/dma_api.c Mon Feb 15 09:00:10 2016 +0000 +++ b/targets/hal/TARGET_Atmel/TARGET_SAM_CortexM0P/dma_api.c Mon Feb 15 10:00:10 2016 +0000 @@ -83,7 +83,7 @@ return; } - callback_func = dma_channels[channel_index].handler; + callback_func = (void(*)(void))(dma_channels[channel_index].handler); if (callback_func) { callback_func(); } @@ -268,7 +268,6 @@ */ bool dma_busy(int channelid) { - int res = 0; /* Sanity check arguments */ MBED_ASSERT(channelid < CONF_MAX_USED_CHANNEL_NUM); @@ -278,7 +277,8 @@ if (channel_index >= CONF_MAX_USED_CHANNEL_NUM) { /* This channel is not active! return zero for now */ - res = 0; + //res = 0; + return 0; } return dma_is_busy(&dma_channels[channel_index].resource); @@ -292,7 +292,6 @@ */ bool dma_is_transfer_complete(int channelid) { - int res = 0; /* Sanity check arguments */ MBED_ASSERT(channelid < CONF_MAX_USED_CHANNEL_NUM); @@ -302,7 +301,8 @@ if (channel_index >= CONF_MAX_USED_CHANNEL_NUM) { /* This channel is not active! return zero for now */ - res = 0; + // res = 0; + return 0; } return (STATUS_OK == dma_get_job_status(&dma_channels[channel_index].resource)); @@ -332,10 +332,10 @@ dma_channels[channel_index].handler = handler; if (event & DMA_TRANSFER_ERROR) { - dma_register_callback(&dma_channels[channel_index].resource, dma_handler, DMA_CALLBACK_TRANSFER_ERROR); + dma_register_callback(&dma_channels[channel_index].resource, (dma_callback_t)dma_handler, DMA_CALLBACK_TRANSFER_ERROR); } if (event & DMA_TRANSFER_COMPLETE) { - dma_register_callback(&dma_channels[channel_index].resource, dma_handler, DMA_CALLBACK_TRANSFER_DONE); + dma_register_callback(&dma_channels[channel_index].resource, (dma_callback_t)dma_handler, DMA_CALLBACK_TRANSFER_DONE); } /* Set interrupt vector if someone have removed it */