X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fstm%2Fao_dma_stm.c;h=d3162d5ba85c163261e4e3bc815cf4f02398c496;hp=21390748b86dae82eddaec7e2662be60e38aa6a2;hb=HEAD;hpb=059f09dbca4703c25b42389b54c6510331c39485

diff --git a/src/stm/ao_dma_stm.c b/src/stm/ao_dma_stm.c
index 21390748..d3162d5b 100644
--- a/src/stm/ao_dma_stm.c
+++ b/src/stm/ao_dma_stm.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,7 +21,7 @@
 #define NUM_DMA	7
 
 struct ao_dma_config {
-	void		(*isr)(void);
+	void		(*isr)(int index);
 };
 
 uint8_t ao_dma_done[NUM_DMA];
@@ -28,7 +29,6 @@ uint8_t ao_dma_done[NUM_DMA];
 static struct ao_dma_config ao_dma_config[NUM_DMA];
 static uint8_t ao_dma_allocated[NUM_DMA];
 static uint8_t ao_dma_mutex[NUM_DMA];
-static uint8_t ao_dma_active;
 
 static void
 ao_dma_isr(uint8_t index) {
@@ -39,7 +39,7 @@ ao_dma_isr(uint8_t index) {
 	/* Ack them */
 	stm_dma.ifcr = isr;
 	if (ao_dma_config[index].isr)
-		(*ao_dma_config[index].isr)();
+		(*ao_dma_config[index].isr)(index);
 	else {
 		ao_dma_done[index] = 1;
 		ao_wakeup(&ao_dma_done[index]);
@@ -48,12 +48,24 @@ ao_dma_isr(uint8_t index) {
 
 void stm_dma1_channel1_isr(void) { ao_dma_isr(STM_DMA_INDEX(1)); }
 void stm_dma1_channel2_isr(void) { ao_dma_isr(STM_DMA_INDEX(2)); }
+#ifdef STM_DMA1_3_STOLEN
+#define LEAVE_DMA_ON
+#else
 void stm_dma1_channel3_isr(void) { ao_dma_isr(STM_DMA_INDEX(3)); }
+#endif
 void stm_dma1_channel4_isr(void) { ao_dma_isr(STM_DMA_INDEX(4)); }
+#ifdef STM_DMA1_5_STOLEN
+#define LEAVE_DMA_ON
+#else
 void stm_dma1_channel5_isr(void) { ao_dma_isr(STM_DMA_INDEX(5)); }
+#endif
 void stm_dma1_channel6_isr(void) { ao_dma_isr(STM_DMA_INDEX(6)); }
 void stm_dma1_channel7_isr(void) { ao_dma_isr(STM_DMA_INDEX(7)); }
 
+#ifndef LEAVE_DMA_ON
+static uint8_t ao_dma_active;
+#endif
+
 void
 ao_dma_set_transfer(uint8_t 		index,
 		    volatile void	*peripheral,
@@ -64,13 +76,15 @@ ao_dma_set_transfer(uint8_t 		index,
 	if (ao_dma_allocated[index]) {
 		if (ao_dma_mutex[index])
 			ao_panic(AO_PANIC_DMA);
-		ao_dma_mutex[index] = 1;
+		ao_dma_mutex[index] = 0xff;
 	} else
 		ao_mutex_get(&ao_dma_mutex[index]);
+#ifndef LEAVE_DMA_ON
 	ao_arch_critical(
 		if (ao_dma_active++ == 0)
 			stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_DMA1EN);
 		);
+#endif
 	stm_dma.channel[index].ccr = ccr | (1 << STM_DMA_CCR_TCIE);
 	stm_dma.channel[index].cndtr = count;
 	stm_dma.channel[index].cpar = peripheral;
@@ -79,7 +93,7 @@ ao_dma_set_transfer(uint8_t 		index,
 }
 
 void
-ao_dma_set_isr(uint8_t index, void (*isr)(void))
+ao_dma_set_isr(uint8_t index, void (*isr)(int))
 {
 	ao_dma_config[index].isr = isr;
 }
@@ -88,29 +102,25 @@ void
 ao_dma_start(uint8_t index)
 {
 	ao_dma_done[index] = 0;
-	stm_dma.channel[index].ccr |= (1 << STM_DMA_CCR_EN);
+	stm_dma.channel[index].ccr |= (1UL << STM_DMA_CCR_EN);
 }
 
 void
 ao_dma_done_transfer(uint8_t index)
 {
-	stm_dma.channel[index].ccr &= ~(1 << STM_DMA_CCR_EN);
+	stm_dma.channel[index].ccr &= ~(1UL << STM_DMA_CCR_EN);
+#ifndef LEAVE_DMA_ON
 	ao_arch_critical(
 		if (--ao_dma_active == 0)
-			stm_rcc.ahbenr &= ~(1 << STM_RCC_AHBENR_DMA1EN);
+			stm_rcc.ahbenr &= ~(1UL << STM_RCC_AHBENR_DMA1EN);
 		);
+#endif
 	if (ao_dma_allocated[index])
 		ao_dma_mutex[index] = 0;
 	else
 		ao_mutex_put(&ao_dma_mutex[index]);
 }
 
-void
-ao_dma_abort(uint8_t index)
-{
-	stm_dma.channel[index].ccr &= ~(1 << STM_DMA_CCR_EN);
-}
-
 void
 ao_dma_alloc(uint8_t index)
 {
@@ -119,16 +129,74 @@ ao_dma_alloc(uint8_t index)
 	ao_dma_allocated[index] = 1;
 }
 
+#if DEBUG
+void
+ao_dma_dump_cmd(void)
+{
+	int i;
+
+#ifndef LEAVE_DMA_ON
+	ao_arch_critical(
+		if (ao_dma_active++ == 0)
+			stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_DMA1EN);
+		);
+#endif
+	printf ("isr %08x ifcr%08x\n", stm_dma.isr, stm_dma.ifcr);
+	for (i = 0; i < NUM_DMA; i++)
+		printf("%d: done %d allocated %d mutex %2d ccr %04x cndtr %04x cpar %08x cmar %08x isr %08x\n",
+		       i,
+		       ao_dma_done[i],
+		       ao_dma_allocated[i],
+		       ao_dma_mutex[i],
+		       stm_dma.channel[i].ccr,
+		       stm_dma.channel[i].cndtr,
+		       stm_dma.channel[i].cpar,
+		       stm_dma.channel[i].cmar,
+		       ao_dma_config[i].isr);
+#ifndef LEAVE_DMA_ON
+	ao_arch_critical(
+		if (--ao_dma_active == 0)
+			stm_rcc.ahbenr &= ~(1 << STM_RCC_AHBENR_DMA1EN);
+		);
+#endif
+}
+
+static const struct ao_cmds ao_dma_cmds[] = {
+	{ ao_dma_dump_cmd, 	"D\0Dump DMA status" },
+	{ 0, NULL }
+};
+#endif
+
 void
 ao_dma_init(void)
 {
 	int	index;
 
+#ifdef LEAVE_DMA_ON
+	stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_DMA1EN);
+#endif
 	for (index = 0; index < STM_NUM_DMA; index++) {
+#if STM_DMA1_5_STOLEN
+		if (index == STM_DMA_INDEX(5)) {
+			ao_dma_allocated[index] = 1;
+			ao_dma_mutex[index] = 0xff;
+			continue;
+		}
+#endif
+#if STM_DMA1_3_STOLEN
+		if (index == STM_DMA_INDEX(3)) {
+			ao_dma_allocated[index] = 1;
+			ao_dma_mutex[index] = 0xff;
+			continue;
+		}
+#endif
 		stm_nvic_set_enable(STM_ISR_DMA1_CHANNEL1_POS + index);
-		stm_nvic_set_priority(STM_ISR_DMA1_CHANNEL1_POS + index, 4);
+		stm_nvic_set_priority(STM_ISR_DMA1_CHANNEL1_POS + index,
+				      AO_STM_NVIC_MED_PRIORITY);
 		ao_dma_allocated[index] = 0;
 		ao_dma_mutex[index] = 0;
 	}
-	
+#if DEBUG
+	ao_cmd_register(&ao_dma_cmds[0]);
+#endif
 }