X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstm-demo%2Fao_demo.c;h=63647aac912238d461bccea33e7e33f647df082d;hb=9b9357f48597a034211affb3f18fc6089816456d;hp=54f7c8f2efb72f46dd5cb93a9bbc1327c791c7a8;hpb=9b12bc445fe482306e4587ad60c6d2daf65a60f3;p=fw%2Faltos

diff --git a/src/stm-demo/ao_demo.c b/src/stm-demo/ao_demo.c
index 54f7c8f2..63647aac 100644
--- a/src/stm-demo/ao_demo.c
+++ b/src/stm-demo/ao_demo.c
@@ -51,13 +51,15 @@ void _exit () { }
 void _read () { }
 void _fstat() { }
 
+#define AO_DMA_TEST_INDEX	STM_DMA_INDEX(4)
+
 static void
 ao_dma_test(void) {
 	static char	src[20] = "hello, world";
 	static char	dst[20];
 	
 	dst[0] = '\0';
-	ao_dma_set_transfer(STM_DMA_INDEX(1), dst, src, 13,
+	ao_dma_set_transfer(AO_DMA_TEST_INDEX, dst, src, 13,
 			    (1 << STM_DMA_CCR_MEM2MEM) |
 			    (STM_DMA_CCR_PL_LOW << STM_DMA_CCR_PL) |
 			    (STM_DMA_CCR_MSIZE_8 << STM_DMA_CCR_MSIZE) |
@@ -66,11 +68,12 @@ ao_dma_test(void) {
 			    (1 << STM_DMA_CCR_PINC) |
 			    (0 << STM_DMA_CCR_CIRC) |
 			    (STM_DMA_CCR_DIR_MEM_TO_PER << STM_DMA_CCR_DIR));
-	ao_dma_start(STM_DMA_INDEX(1));
-	cli();
-	while (!ao_dma_done[STM_DMA_INDEX(1)])
-		ao_sleep(&ao_dma_done[STM_DMA_INDEX(1)]);
-	sei();
+	ao_dma_start(AO_DMA_TEST_INDEX);
+	ao_arch_critical(
+		while (!ao_dma_done[AO_DMA_TEST_INDEX])
+			ao_sleep(&ao_dma_done[AO_DMA_TEST_INDEX]);
+		);
+	ao_dma_done_transfer(AO_DMA_TEST_INDEX);
 	printf ("copied %s\n", dst);
 }
 
@@ -82,7 +85,7 @@ ao_spi_write(void) {
 	for (i = 0; i < 10; i++) {
 		ao_spi_get(0);
 		stm_gpio_set(&stm_gpioc, 12, 0);
-		ao_spi_send(data, 1, 0);
+		ao_spi_send(data, 4, 0);
 		stm_gpio_set(&stm_gpioc, 12, 1);
 		ao_spi_put(0);
 		printf(".");
@@ -100,10 +103,10 @@ ao_spi_read(void) {
 		ao_spi_get(0);
 		stm_gpio_set(&stm_gpioc, 12, 0);
 		ao_spi_recv(data, 4, 0);
-		printf(".");
-		flush();
 		stm_gpio_set(&stm_gpioc, 12, 1);
 		ao_spi_put(0);
+		printf(".");
+		flush();
 		ao_delay(100);
 	}
 }
@@ -128,13 +131,12 @@ main(void)
 //	ao_lcd_font_init();
 	ao_spi_init();
 
+	ao_timer_set_adc_interval(100);
+
+	ao_adc_init();
+
 	ao_cmd_register(&ao_demo_cmds[0]);
 	
-	stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIOCEN);
-	stm_gpio_set(&stm_gpioc, 12, 1);
-	stm_moder_set(&stm_gpioc, 12, STM_MODER_OUTPUT);
-	stm_otyper_set(&stm_gpioc, 12, STM_OTYPER_PUSH_PULL);
-
 	ao_start_scheduler();
 	return 0;
 }