tests: dma: use generic callback arg for all dma_callbacks

Replace the first argument in dma_callback with generic 'void * arg'. Signed-off-by: Jun Li <jun.r.li@intel.com>
zephyrproject-rtos · Oct 16, 2018 · 2acbaf4 · 2acbaf4
1 parent 4982fa9
commit 2acbaf4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/tests/boards/altera_max10/msgdma/src/dma.c b/tests/boards/altera_max10/msgdma/src/dma.c
@@ -26,7 +26,7 @@ static char rx_data[DMA_BUFF_SIZE];
 static struct dma_config dma_cfg = {0};
 static struct dma_block_config dma_block_cfg = {0};
 
-static void dma_user_callback(struct device *dev, u32_t id, int error_code)
+static void dma_user_callback(void *arg, u32_t id, int error_code)
 {
 	if (error_code == 0) {
 		TC_PRINT("DMA completed successfully\n");

diff --git a/tests/boards/intel_s1000_crb/src/dma_test.c b/tests/boards/intel_s1000_crb/src/dma_test.c
@@ -67,7 +67,7 @@ static char rx_data2[RX_BUFF_SIZE] = { 0 };
 static char rx_data3[RX_BUFF_SIZE] = { 0 };
 static char rx_data4[RX_BUFF_SIZE] = { 0 };
 
-static void test_done(struct device *dev, u32_t id, int error_code)
+static void test_done(void *arg, u32_t id, int error_code)
 {
 	if (error_code == 0) {
 		printk("DMA transfer done\n");

diff --git a/tests/drivers/dma/chan_blen_transfer/src/test_dma.c b/tests/drivers/dma/chan_blen_transfer/src/test_dma.c
@@ -29,7 +29,7 @@
 static const char tx_data[] = "It is harder to be kind than to be wise";
 static char rx_data[RX_BUFF_SIZE] = { 0 };
 
-static void test_done(struct device *dev, u32_t id, int error_code)
+static void test_done(void *arg, u32_t id, int error_code)
 {
 	if (error_code == 0) {
 		TC_PRINT("DMA transfer done\n");

diff --git a/tests/drivers/dma/loop_transfer/src/dma.c b/tests/drivers/dma/loop_transfer/src/dma.c
@@ -50,8 +50,10 @@ static void test_error(void)
 	printk("DMA could not proceed, an error occurred\n");
 }
 
-static void dma_user_callback(struct device *dev, u32_t id, int error_code)
+static void dma_user_callback(void *arg, u32_t id, int error_code)
 {
+	struct device *dev = (struct device *)arg;
+
 	if (error_code == 0) {
 		test_transfer(dev, id);
 	} else {
@@ -79,6 +81,7 @@ void main(void)
 	dma_cfg.dest_data_size = 1;
 	dma_cfg.source_burst_length = 1;
 	dma_cfg.dest_burst_length = 1;
+	dma_cfg.callback_arg = dma;
 	dma_cfg.dma_callback = dma_user_callback;
 	dma_cfg.block_count = 1;
 	dma_cfg.head_block = &dma_block_cfg;