X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fstm%2Fao_serial_stm.c;h=38f16e5eb96d8042d17dc02b8e475fdbf4cd67e3;hp=dc446120e965272761970f3e0cabfd67075821cf;hb=ab6ea9043b592c25948a70b6204d613756a9a250;hpb=9279fd42793123784ce83ca151df6f4630487722

diff --git a/src/stm/ao_serial_stm.c b/src/stm/ao_serial_stm.c
index dc446120..38f16e5e 100644
--- a/src/stm/ao_serial_stm.c
+++ b/src/stm/ao_serial_stm.c
@@ -25,11 +25,16 @@ ao_debug_out(char c)
 {
 	if (c == '\n')
 		ao_debug_out('\r');
-	while (!(STM_USART1->usart_sr & (1 << STM_USART_SR_TXE)));
-	STM_USART1->usart_dr = c;
+	while (!(stm_usart1.sr & (1 << STM_USART_SR_TXE)));
+	stm_usart1.dr = c;
+}
+
+void
+outbyte(char c)
+{
+	putchar(c);
 }
 
-#if 0
 static __xdata uint8_t ao_serial_tx1_started;
 
 static void
@@ -39,21 +44,27 @@ ao_serial_tx1_start(void)
 	    !ao_serial_tx1_started)
 	{
 		ao_serial_tx1_started = 1;
-		ao_fifo_remove(ao_usart1_tx_fifo, STM_USART1->usart_dr);
+		ao_fifo_remove(ao_usart1_tx_fifo, stm_usart1.dr);
 	}
 }
 
-void usart1_isr(void)
+void stm_usart1_isr(void)
 {
-	if (STM_USART1->usart_sr & (1 << STM_USART_SR_RXNE)) {
+	uint32_t	sr;
+
+	sr = stm_usart1.sr;
+	stm_usart1.sr = 0;
+
+	if (sr & (1 << STM_USART_SR_RXNE)) {
+		char c = stm_usart1.dr;
 		if (!ao_fifo_full(ao_usart1_rx_fifo))
-			ao_fifo_insert(ao_usart1_rx_fifo, STM_USART1->usart_dr);
+			ao_fifo_insert(ao_usart1_rx_fifo, c);
 		ao_wakeup(&ao_usart1_rx_fifo);
 #if USE_SERIAL_STDIN
 		ao_wakeup(&ao_stdin_ready);
 #endif
 	}
-	if (STM_USART1->usart_sr & (1 << STM_USART_SR_TXE)) {
+	if (sr & (1 << STM_USART_SR_TC)) {
 		ao_serial_tx1_started = 0;
 		ao_serial_tx1_start();
 		ao_wakeup(&ao_usart1_tx_fifo);
@@ -108,8 +119,6 @@ ao_serial_drain(void) __critical
 	sei();
 }
 
-#endif
-
 int _write(int file, char *ptr, int len)
 {
 	int l = len;
@@ -118,22 +127,20 @@ int _write(int file, char *ptr, int len)
 	return len;
 }
 
-#define F_CPU	24000000
-
 static const struct {
-	uint32_t usart_brr;
+	uint32_t brr;
 } ao_serial_speeds[] = {
 	[AO_SERIAL_SPEED_4800] = {
-		(F_CPU * 16) / (16 * 4800) 
+		STM_APB1 / 4800
 	},
 	[AO_SERIAL_SPEED_9600] = {
-		(F_CPU * 16) / (16 * 9600) 
+		STM_APB1 / 9600
 	},
 	[AO_SERIAL_SPEED_19200] = {
-		(F_CPU * 16) / (16 * 19200) 
+		STM_APB1 / 19200
 	},
 	[AO_SERIAL_SPEED_57600] = {
-		(F_CPU * 16) / (16 * 57600) 
+		STM_APB1 / 57600
 	},
 };
 
@@ -145,40 +152,71 @@ ao_serial_set_speed(uint8_t speed)
 #endif
 	if (speed > AO_SERIAL_SPEED_57600)
 		return;
-	STM_USART1->usart_brr = ao_serial_speeds[speed].usart_brr;
+	stm_usart1.brr = ao_serial_speeds[speed].brr;
 }
 
 void
 ao_serial_init(void)
 {
-	STM_USART1->usart_cr1 = ((0 << STM_USART_CR1_OVER8) |
-			     (1 << STM_USART_CR1_UE) |
-			     (0 << STM_USART_CR1_M) |
-			     (0 << STM_USART_CR1_WAKE) |
-			     (0 << STM_USART_CR1_PCE) |
-			     (0 << STM_USART_CR1_PS) |
-			     (0 << STM_USART_CR1_PEIE) |
-			     (0 << STM_USART_CR1_TXEIE) |	/* XXX enable */
-			     (0 << STM_USART_CR1_TCIE) |
-			     (0 << STM_USART_CR1_RXNEIE) |		/* XXX enable */
-			     (0 << STM_USART_CR1_IDLEIE) |
-			     (1 << STM_USART_CR1_TE) |
-			     (1 << STM_USART_CR1_RE) |
-			     (0 << STM_USART_CR1_RWU) |
-			     (0 << STM_USART_CR1_SBK));
-
-	STM_USART1->usart_cr2 = 0;
-	STM_USART1->usart_cr3 = 0;
+	stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIOAEN);
+
+	stm_moder_set(&stm_gpioa, 9, STM_MODER_ALTERNATE);
+	stm_moder_set(&stm_gpioa, 10, STM_MODER_ALTERNATE);
+	stm_afr_set(&stm_gpioa, 9, STM_AFR_AF7);
+	stm_afr_set(&stm_gpioa, 10, STM_AFR_AF7);
+	
+	/* Enable USART1 */
+	stm_rcc.apb2enr |= (1 << STM_RCC_APB2ENR_USART1EN);
+
+	stm_usart1.cr1 = ((0 << STM_USART_CR1_OVER8) |
+			  (1 << STM_USART_CR1_UE) |
+			  (0 << STM_USART_CR1_M) |
+			  (0 << STM_USART_CR1_WAKE) |
+			  (0 << STM_USART_CR1_PCE) |
+			  (0 << STM_USART_CR1_PS) |
+			  (0 << STM_USART_CR1_PEIE) |
+			  (0 << STM_USART_CR1_TXEIE) |
+			  (1 << STM_USART_CR1_TCIE) |
+			  (1 << STM_USART_CR1_RXNEIE) |
+			  (0 << STM_USART_CR1_IDLEIE) |
+			  (1 << STM_USART_CR1_TE) |
+			  (1 << STM_USART_CR1_RE) |
+			  (0 << STM_USART_CR1_RWU) |
+			  (0 << STM_USART_CR1_SBK));
+
+	stm_usart1.cr2 = ((0 << STM_USART_CR2_LINEN) |
+			  (STM_USART_CR2_STOP_1 << STM_USART_CR2_STOP) |
+			  (0 << STM_USART_CR2_CLKEN) |
+			  (0 << STM_USART_CR2_CPOL) |
+			  (0 << STM_USART_CR2_CPHA) |
+			  (0 << STM_USART_CR2_LBCL) |
+			  (0 << STM_USART_CR2_LBDIE) |
+			  (0 << STM_USART_CR2_LBDL) |
+			  (0 << STM_USART_CR2_ADD));
+
+	stm_usart1.cr3 = ((0 << STM_USART_CR3_ONEBITE) |
+			  (0 << STM_USART_CR3_CTSIE) |
+			  (0 << STM_USART_CR3_CTSE) |
+			  (0 << STM_USART_CR3_RTSE) |
+			  (0 << STM_USART_CR3_DMAT) |
+			  (0 << STM_USART_CR3_DMAR) |
+			  (0 << STM_USART_CR3_SCEN) |
+			  (0 << STM_USART_CR3_NACK) |
+			  (0 << STM_USART_CR3_HDSEL) |
+			  (0 << STM_USART_CR3_IRLP) |
+			  (0 << STM_USART_CR3_IREN) |
+			  (0 << STM_USART_CR3_EIE));
 
 	/* Pick a 9600 baud rate */
 	ao_serial_set_speed(AO_SERIAL_SPEED_9600);
 
 	printf ("serial initialized\n");
-#if 0
 #if USE_SERIAL_STDIN
 	ao_add_stdio(ao_serial_pollchar,
 		     ao_serial_putchar,
 		     NULL);
 #endif
-#endif
+
+	stm_nvic_set_enable(STM_ISR_USART1_POS);
+	stm_nvic_set_priority(STM_ISR_USART1_POS, 4);
 }