Import testing code and update makefiles

[~andy/csm213a-hw] / hw2 / timer_dma.c

diff --git a/hw2/timer_dma.c b/hw2/timer_dma.c
index 529fd7e2a59d2873563995cf5d5800f698df91ba..f80572e51fad8956f02879e5728f58d031bd7aab 100644 (file)
--- a/hw2/timer_dma.c
+++ b/hw2/timer_dma.c
@@ -158,13 +158,17 @@ void tdma_start(tdma_t *port)
        //sirq_printf("isfr3: %08x\r\n", PORTD->ISFR);\r
 }\r
 \r
-void tdma_stop(tdma_t *port)\r
+void tdma_stop(tdma_t *port, int wait)\r
 {\r
        if (!port)\r
                return;\r
 \r
        //sirq_printf("isfr0: %08x\r\n", PORTD->ISFR);\r
 \r
+       for (int i = 0; port->dma->dsr & DMA_DSR_BCR_BCR_MASK; i++)\r
+               if (i > wait)\r
+                       return;\r
+\r
        // Disable DMA Mux\r
        port->mux->cfg &= DMAMUX_CHCFG_ENBL_MASK;\r
 \r
@@ -211,7 +215,7 @@ uint64_t tdma_time(void)
                        | ((uint64_t)~tml) << 0;\r
 \r
        // Convert to nanoseconds\r
-       return clocks * 1000 / 24;\r
+       return clocks * 125 / 3;\r
 }\r
 \r
 void tdma_debug(tdma_t *port)\r