X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fstm%2Fao_serial_stm.c;h=ce33f97e97416eaaf2a9eddfb54ba9f19943cb9e;hp=ead2570f4d983eee2e24c0bf1c0988c81e30bd38;hb=6fa1ec0dbf2a4eda8d061c67b3779b83b88f29f0;hpb=8ba5344514f8ed51f6fd69ca09f6c7035c4fd0da diff --git a/src/stm/ao_serial_stm.c b/src/stm/ao_serial_stm.c index ead2570f..ce33f97e 100644 --- a/src/stm/ao_serial_stm.c +++ b/src/stm/ao_serial_stm.c @@ -17,9 +17,6 @@ #include -__xdata struct ao_fifo ao_usart1_rx_fifo; -__xdata struct ao_fifo ao_usart1_tx_fifo; - void ao_debug_out(char c) { @@ -29,153 +26,128 @@ ao_debug_out(char c) stm_usart1.dr = c; } -void -outbyte(char c) -{ - putchar(c); -} - -static __xdata uint8_t ao_serial_tx1_started; - static void -ao_serial_tx1_start(void) +_ao_usart_tx_start(struct ao_stm_usart *usart) { - if (!ao_fifo_empty(ao_usart1_tx_fifo) && - !ao_serial_tx1_started) + if (!ao_fifo_empty(usart->tx_fifo) && !usart->tx_started) { - ao_serial_tx1_started = 1; - ao_fifo_remove(ao_usart1_tx_fifo, stm_usart1.dr); + usart->tx_started = 1; + ao_fifo_remove(usart->tx_fifo, usart->reg->dr); } } -void stm_usart1_isr(void) +static void +ao_usart_isr(struct ao_stm_usart *usart, int stdin) { uint32_t sr; - cli(); - sr = stm_usart1.sr; - stm_usart1.sr = 0; - sei(); + + sr = usart->reg->sr; + usart->reg->sr = 0; + if (sr & (1 << STM_USART_SR_RXNE)) { - if (!ao_fifo_full(ao_usart1_rx_fifo)) - ao_fifo_insert(ao_usart1_rx_fifo, stm_usart1.dr); - ao_wakeup(&ao_usart1_rx_fifo); -#if USE_SERIAL_STDIN - ao_wakeup(&ao_stdin_ready); -#endif + char c = usart->reg->dr; + if (!ao_fifo_full(usart->rx_fifo)) + ao_fifo_insert(usart->rx_fifo, c); + ao_wakeup(&usart->rx_fifo); + if (stdin) + ao_wakeup(&ao_stdin_ready); } - if (sr & (1 << STM_USART_SR_TXE)) { - ao_serial_tx1_started = 0; - ao_serial_tx1_start(); - ao_wakeup(&ao_usart1_tx_fifo); + if (sr & (1 << STM_USART_SR_TC)) { + usart->tx_started = 0; + _ao_usart_tx_start(usart); + ao_wakeup(&usart->tx_fifo); } } char -ao_serial_getchar(void) __critical -{ - char c; - cli(); - while (ao_fifo_empty(ao_usart1_rx_fifo)) - ao_sleep(&ao_usart1_rx_fifo); - ao_fifo_remove(ao_usart1_rx_fifo, c); - sei(); +ao_usart_getchar(struct ao_stm_usart *usart) +{ + char c; + ao_arch_block_interrupts(); + while (ao_fifo_empty(usart->rx_fifo)) + ao_sleep(&usart->rx_fifo); + ao_fifo_remove(usart->rx_fifo, c); + ao_arch_release_interrupts(); return c; } -#if USE_SERIAL_STDIN -char -ao_serial_pollchar(void) __critical +int +ao_usart_pollchar(struct ao_stm_usart *usart) { - char c; - cli(); - if (ao_fifo_empty(ao_usart1_rx_fifo)) { - sei(); - return AO_READ_AGAIN; + int c; + + ao_arch_block_interrupts(); + if (ao_fifo_empty(usart->rx_fifo)) + c = AO_READ_AGAIN; + else { + uint8_t u; + ao_fifo_remove(usart->rx_fifo,u); + c = u; } - ao_fifo_remove(ao_usart1_rx_fifo,c); - sei(); + ao_arch_release_interrupts(); return c; } -#endif void -ao_serial_putchar(char c) __critical +ao_usart_putchar(struct ao_stm_usart *usart, char c) { - cli(); - while (ao_fifo_full(ao_usart1_tx_fifo)) - ao_sleep(&ao_usart1_tx_fifo); - ao_fifo_insert(ao_usart1_tx_fifo, c); - ao_serial_tx1_start(); - sei(); + ao_arch_block_interrupts(); + while (ao_fifo_full(usart->tx_fifo)) + ao_sleep(&usart->tx_fifo); + ao_fifo_insert(usart->tx_fifo, c); + _ao_usart_tx_start(usart); + ao_arch_release_interrupts(); } void -ao_serial_drain(void) __critical +ao_usart_drain(struct ao_stm_usart *usart) { - cli(); - while (!ao_fifo_empty(ao_usart1_tx_fifo)) - ao_sleep(&ao_usart1_tx_fifo); - sei(); -} - -int _write(int file, char *ptr, int len) -{ - int l = len; - while (l--) - ao_debug_out(*ptr++); - return len; + ao_arch_block_interrupts(); + while (!ao_fifo_empty(usart->tx_fifo)) + ao_sleep(&usart->tx_fifo); + ao_arch_release_interrupts(); } static const struct { uint32_t brr; -} ao_serial_speeds[] = { +} ao_usart_speeds[] = { [AO_SERIAL_SPEED_4800] = { - STM_APB1 / 4800 + AO_PCLK1 / 4800 }, [AO_SERIAL_SPEED_9600] = { - STM_APB1 / 9600 + AO_PCLK1 / 9600 }, [AO_SERIAL_SPEED_19200] = { - STM_APB1 / 19200 + AO_PCLK1 / 19200 }, [AO_SERIAL_SPEED_57600] = { - STM_APB1 / 57600 + AO_PCLK1 / 57600 + }, + [AO_SERIAL_SPEED_115200] = { + AO_PCLK1 / 115200 }, }; void -ao_serial_set_speed(uint8_t speed) +ao_usart_set_speed(struct ao_stm_usart *usart, uint8_t speed) { -#if 0 - ao_serial_drain(); -#endif - if (speed > AO_SERIAL_SPEED_57600) + if (speed > AO_SERIAL_SPEED_115200) return; - stm_usart1.brr = ao_serial_speeds[speed].brr; + usart->reg->brr = ao_usart_speeds[speed].brr; } void -ao_serial_init(void) +ao_usart_init(struct ao_stm_usart *usart) { - 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) | + usart->reg->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) | - (1 << STM_USART_CR1_TXEIE) | - (0 << STM_USART_CR1_TCIE) | + (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) | @@ -183,7 +155,7 @@ ao_serial_init(void) (0 << STM_USART_CR1_RWU) | (0 << STM_USART_CR1_SBK)); - stm_usart1.cr2 = ((0 << STM_USART_CR2_LINEN) | + usart->reg->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) | @@ -193,7 +165,7 @@ ao_serial_init(void) (0 << STM_USART_CR2_LBDL) | (0 << STM_USART_CR2_ADD)); - stm_usart1.cr3 = ((0 << STM_USART_CR3_ONEBITE) | + usart->reg->cr3 = ((0 << STM_USART_CR3_ONEBITE) | (0 << STM_USART_CR3_CTSIE) | (0 << STM_USART_CR3_CTSE) | (0 << STM_USART_CR3_RTSE) | @@ -207,17 +179,222 @@ ao_serial_init(void) (0 << STM_USART_CR3_EIE)); /* Pick a 9600 baud rate */ - ao_serial_set_speed(AO_SERIAL_SPEED_9600); + ao_usart_set_speed(usart, AO_SERIAL_SPEED_9600); +} - printf ("serial initialized\n"); -#if 0 -#if USE_SERIAL_STDIN - ao_add_stdio(ao_serial_pollchar, - ao_serial_putchar, - NULL); +#if HAS_SERIAL_1 + +struct ao_stm_usart ao_stm_usart1; + +void stm_usart1_isr(void) { ao_usart_isr(&ao_stm_usart1, USE_SERIAL_1_STDIN); } + +char +ao_serial1_getchar(void) +{ + return ao_usart_getchar(&ao_stm_usart1); +} + +void +ao_serial1_putchar(char c) +{ + ao_usart_putchar(&ao_stm_usart1, c); +} + +int +ao_serial1_pollchar(void) +{ + return ao_usart_pollchar(&ao_stm_usart1); +} + +void +ao_serial1_set_speed(uint8_t speed) +{ + ao_usart_set_speed(&ao_stm_usart1, speed); +} +#endif /* HAS_SERIAL_1 */ + +#if HAS_SERIAL_2 + +struct ao_stm_usart ao_stm_usart2; + +void stm_usart2_isr(void) { ao_usart_isr(&ao_stm_usart2, USE_SERIAL_2_STDIN); } + +char +ao_serial2_getchar(void) +{ + return ao_usart_getchar(&ao_stm_usart2); +} + +void +ao_serial2_putchar(char c) +{ + ao_usart_putchar(&ao_stm_usart2, c); +} + +int +ao_serial2_pollchar(void) +{ + return ao_usart_pollchar(&ao_stm_usart2); +} + +void +ao_serial2_set_speed(uint8_t speed) +{ + ao_usart_set_speed(&ao_stm_usart2, speed); +} +#endif /* HAS_SERIAL_2 */ + +#if HAS_SERIAL_3 + +struct ao_stm_usart ao_stm_usart3; + +void stm_usart3_isr(void) { ao_usart_isr(&ao_stm_usart3, USE_SERIAL_2_STDIN); } + +char +ao_serial3_getchar(void) +{ + return ao_usart_getchar(&ao_stm_usart3); +} + +void +ao_serial3_putchar(char c) +{ + ao_usart_putchar(&ao_stm_usart3, c); +} + +int +ao_serial3_pollchar(void) +{ + return ao_usart_pollchar(&ao_stm_usart3); +} + +void +ao_serial3_set_speed(uint8_t speed) +{ + ao_usart_set_speed(&ao_stm_usart3, speed); +} +#endif /* HAS_SERIAL_3 */ + +void +ao_serial_init(void) +{ +#if HAS_SERIAL_1 + /* + * TX RX + * PA9 PA10 + * PB6 PB7 * + */ + +#if SERIAL_1_PA9_PA10 + stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIOAEN); + + stm_afr_set(&stm_gpioa, 9, STM_AFR_AF7); + stm_afr_set(&stm_gpioa, 10, STM_AFR_AF7); +#else +#if SERIAL_1_PB6_PB7 + stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIOBEN); + + stm_afr_set(&stm_gpiob, 6, STM_AFR_AF7); + stm_afr_set(&stm_gpiob, 7, STM_AFR_AF7); +#else +#error "No SERIAL_1 port configuration specified" #endif #endif + /* Enable USART */ + stm_rcc.apb2enr |= (1 << STM_RCC_APB2ENR_USART1EN); + + ao_stm_usart1.reg = &stm_usart1; + ao_usart_init(&ao_stm_usart1); stm_nvic_set_enable(STM_ISR_USART1_POS); stm_nvic_set_priority(STM_ISR_USART1_POS, 4); +#if USE_SERIAL_1_STDIN + ao_add_stdio(ao_serial1_pollchar, + ao_serial1_putchar, + NULL); +#endif +#endif + +#if HAS_SERIAL_2 + /* + * TX RX + * PA2 PA3 + * PD5 PD6 + */ + +#if SERIAL_2_PA2_PA3 + stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIOAEN); + + stm_afr_set(&stm_gpioa, 2, STM_AFR_AF7); + stm_afr_set(&stm_gpioa, 3, STM_AFR_AF7); +#else +#if SERIAL_2_PD5_PD6 + stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIODEN); + + stm_afr_set(&stm_gpiod, 5, STM_AFR_AF7); + stm_afr_set(&stm_gpiod, 6, STM_AFR_AF7); +#else +#error "No SERIAL_2 port configuration specified" +#endif +#endif + /* Enable USART */ + stm_rcc.apb1enr |= (1 << STM_RCC_APB1ENR_USART2EN); + + ao_stm_usart2.reg = &stm_usart2; + ao_usart_init(&ao_stm_usart2); + + stm_nvic_set_enable(STM_ISR_USART2_POS); + stm_nvic_set_priority(STM_ISR_USART2_POS, 4); +#if USE_SERIAL_2_STDIN + ao_add_stdio(ao_serial2_pollchar, + ao_serial2_putchar, + NULL); +#endif +#endif + +#if HAS_SERIAL_3 + /* + * TX RX + * PB10 PB11 + * PC10 PC11 + * PD8 PD9 + */ +#if SERIAL_3_PB10_PB11 + stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIOBEN); + + stm_afr_set(&stm_gpiob, 10, STM_AFR_AF7); + stm_afr_set(&stm_gpiob, 11, STM_AFR_AF7); +#else +#if SERIAL_3_PC10_PC11 + stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIOCEN); + + stm_afr_set(&stm_gpioc, 10, STM_AFR_AF7); + stm_afr_set(&stm_gpioc, 11, STM_AFR_AF7); +#else +#if SERIAL_3_PD8_PD9 + stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIODEN); + + stm_afr_set(&stm_gpiod, 8, STM_AFR_AF7); + stm_afr_set(&stm_gpiod, 9, STM_AFR_AF7); +#else +#error "No SERIAL_3 port configuration specified" +#endif +#endif +#endif + /* Enable USART */ + stm_rcc.apb1enr |= (1 << STM_RCC_APB1ENR_USART3EN); + + ao_stm_usart3.reg = &stm_usart3; + ao_usart_init(&ao_stm_usart3); + + stm_nvic_set_enable(STM_ISR_USART3_POS); + stm_nvic_set_priority(STM_ISR_USART3_POS, 4); +#if USE_SERIAL_3_STDIN + ao_add_stdio(ao_serial3_pollchar, + ao_serial3_putchar, + NULL); +#endif +#endif } + +