altos/stm: remove ao_dma_abort

[fw/altos] / src / stm / ao_arch_funcs.h

diff --git a/src/stm/ao_arch_funcs.h b/src/stm/ao_arch_funcs.h
index f1d17ed152a5a8e0aea983e3446dcc1018634b72..25b435879b3fbab71e5625b3a2ddebaaf2586fca 100644 (file)
--- a/src/stm/ao_arch_funcs.h
+++ b/src/stm/ao_arch_funcs.h
@@ -249,9 +249,6 @@ ao_dma_start(uint8_t index);
 void
 ao_dma_done_transfer(uint8_t index);
 
-void
-ao_dma_abort(uint8_t index);
-
 void
 ao_dma_alloc(uint8_t index);
 
@@ -278,12 +275,35 @@ ao_i2c_recv(void *block, uint16_t len, uint8_t i2c_index, uint8_t stop);
 void
 ao_i2c_init(void);
 
+#if USE_SERIAL_1_SW_FLOW || USE_SERIAL_2_SW_FLOW || USE_SERIAL_3_SW_FLOW
+#define HAS_SERIAL_SW_FLOW 1
+#else
+#define HAS_SERIAL_SW_FLOW 0
+#endif
+
+#if USE_SERIAL_1_FLOW && !USE_SERIAL_1_SW_FLOW || USE_SERIAL_2_FLOW && !USE_SERIAL_2_SW_FLOW || USE_SERIAL_3_FLOW && !USE_SERIAL_3_SW_FLOW
+#define HAS_SERIAL_HW_FLOW 1
+#else
+#define HAS_SERIAL_HW_FLOW 0
+#endif
+
 /* ao_serial_stm.c */
 struct ao_stm_usart {
        struct ao_fifo          rx_fifo;
        struct ao_fifo          tx_fifo;
        struct stm_usart        *reg;
-       uint8_t                 tx_started;
+       uint8_t                 tx_running;
+       uint8_t                 draining;
+#if HAS_SERIAL_SW_FLOW
+       /* RTS - 0 if we have FIFO space, 1 if not
+        * CTS - 0 if we can send, 0 if not
+        */
+       struct stm_gpio         *gpio_rts;
+       struct stm_gpio         *gpio_cts;
+       uint8_t                 pin_rts;
+       uint8_t                 pin_cts;
+       uint8_t                 rts;
+#endif
 };
 
 #if HAS_SERIAL_1
@@ -320,6 +340,14 @@ ao_arch_memory_barrier() {
        asm volatile("" ::: "memory");
 }
 
+static inline void
+ao_arch_irq_check(void) {
+       uint32_t        primask;
+       asm("mrs %0,primask" : "=&r" (primask));
+       if ((primask & 1) == 0)
+               ao_panic(AO_PANIC_IRQ);
+}
+
 #if HAS_TASK
 static inline void
 ao_arch_init_stack(struct ao_task *task, void *start)
@@ -368,13 +396,6 @@ static inline void ao_arch_save_stack(void) {
 
 static inline void ao_arch_restore_stack(void) {
        uint32_t        sp;
-       uint32_t        control;
-
-       asm("mrs %0,control" : "=&r" (control));
-       control |= (1 << 1);
-       asm("msr control,%0" : : "r" (control));
-       asm("isb");
-
        sp = (uint32_t) ao_cur_task->sp;
 
        /* Switch stacks */
@@ -431,14 +452,7 @@ static inline void ao_arch_start_scheduler(void) {
 }
 #endif
 
-static inline void ao_arch_isr_stack(void) {
-       uint32_t        control;
-
-       asm("mrs %0,control" : "=&r" (control));
-       control &= ~(1 << 1);
-       asm("msr control,%0" : : "r" (control));
-       asm("isb");
-}
+#define ao_arch_isr_stack()
 
 #endif