Switch from GPLv2 to GPLv2+

[fw/altos] / src / stm / ao_dma_stm.c

diff --git a/src/stm/ao_dma_stm.c b/src/stm/ao_dma_stm.c
index 8379a1a533ca0ec5e19321910b1a9975a952f744..6d77966076a88aefeac0f8a281fa81b5ebe0b662 100644 (file)
--- 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
@@ -64,7 +65,7 @@ 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]);
        ao_arch_critical(
@@ -105,13 +106,6 @@ ao_dma_done_transfer(uint8_t index)
                ao_mutex_put(&ao_dma_mutex[index]);
 }
 
-void
-ao_dma_abort(uint8_t index)
-{
-       stm_dma.channel[index].ccr &= ~(1 << STM_DMA_CCR_EN);
-       ao_wakeup(&ao_dma_done[index]);
-}
-
 void
 ao_dma_alloc(uint8_t index)
 {
@@ -120,6 +114,40 @@ ao_dma_alloc(uint8_t index)
        ao_dma_allocated[index] = 1;
 }
 
+#if DEBUG
+void
+ao_dma_dump_cmd(void)
+{
+       int i;
+
+       ao_arch_critical(
+               if (ao_dma_active++ == 0)
+                       stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_DMA1EN);
+               );
+       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);
+       ao_arch_critical(
+               if (--ao_dma_active == 0)
+                       stm_rcc.ahbenr &= ~(1 << STM_RCC_AHBENR_DMA1EN);
+               );
+}
+
+static const struct ao_cmds ao_dma_cmds[] = {
+       { ao_dma_dump_cmd,      "D\0Dump DMA status" },
+       { 0, NULL }
+};
+#endif
+
 void
 ao_dma_init(void)
 {
@@ -131,5 +159,7 @@ ao_dma_init(void)
                ao_dma_allocated[index] = 0;
                ao_dma_mutex[index] = 0;
        }
-       
+#if DEBUG
+       ao_cmd_register(&ao_dma_cmds[0]);
+#endif
 }