From f818faec589a980d30964f5d16eceb620ed11b50 Mon Sep 17 00:00:00 2001 From: supperthomas <78900636@qq.com> Date: Fri, 12 Feb 2021 00:28:44 +0800 Subject: [PATCH] fix the code sytle --- bsp/maxim/MAX32660_EVSYS/README.md | 24 ++++++++++---------- bsp/maxim/MAX32660_EVSYS/board/board.h | 10 +++++++++ bsp/maxim/libraries/HAL_Drivers/drv_uart.c | 26 +++++++++++----------- 3 files changed, 35 insertions(+), 25 deletions(-) diff --git a/bsp/maxim/MAX32660_EVSYS/README.md b/bsp/maxim/MAX32660_EVSYS/README.md index af74e31c3c..7123c5d400 100644 --- a/bsp/maxim/MAX32660_EVSYS/README.md +++ b/bsp/maxim/MAX32660_EVSYS/README.md @@ -12,7 +12,7 @@ 开发板datasheet: [MAX32660-EVSYS.pdf)](https://datasheets.maximintegrated.com/en/ds/MAX32660-EVSYS.pdf) -支持IDE: keil, [eclipse](https://www.maximintegrated.com/en/design/software-description.html/swpart=SFW0001500A) +支持IDE: [keil pack](http://www.mxim.net/microcontroller/pack/Maxim.MAX32660.1.2.0.pack), [eclipse](https://www.maximintegrated.com/en/design/software-description.html/swpart=SFW0001500A) 本文主要内容如下: @@ -70,17 +70,17 @@ MAX32660-EVSYS开发板常用 **板载资源** 如下: 本 BSP 目前对外设的支持情况如下: -| **片上外设** | **支持情况** | **备注** | -| :----------- | :----------: | :----------: | -| GPIO | | | -| UART | 支持 | UART0, UART1 | -| PWM | | | -| SPI | | | -| RTC | | | -| I2S | | | -| I2C | | | -| TIMER | | | -| Watchdog | | | +| **片上外设** | **支持情况** | **备注** | +| :----------- | :----------: | :-------------------: | +| GPIO | | | +| UART | 支持 | UART0, UART1(console) | +| PWM | | | +| SPI | | | +| RTC | | | +| I2S | | | +| I2C | | | +| TIMER | | | +| Watchdog | | | diff --git a/bsp/maxim/MAX32660_EVSYS/board/board.h b/bsp/maxim/MAX32660_EVSYS/board/board.h index 42324905c7..155749b002 100644 --- a/bsp/maxim/MAX32660_EVSYS/board/board.h +++ b/bsp/maxim/MAX32660_EVSYS/board/board.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2006-2020, RT-Thread Development Team + * + * SPDX-License-Identifier: Apache-2.0 + * + * Change Logs: + * Date Author Notes + * 2021-02-11 supperthomas first version + * + */ #ifndef _BOARD_H_ #define _BOARD_H_ diff --git a/bsp/maxim/libraries/HAL_Drivers/drv_uart.c b/bsp/maxim/libraries/HAL_Drivers/drv_uart.c index 382806cc45..7e53800a33 100644 --- a/bsp/maxim/libraries/HAL_Drivers/drv_uart.c +++ b/bsp/maxim/libraries/HAL_Drivers/drv_uart.c @@ -15,19 +15,22 @@ #include "rtdevice.h" #ifdef RT_USING_SERIAL +//#define DRV_DEBUG +//#define LOG_TAG "drv.usart" +//#include + #define UART0_CONFIG \ { \ .name = "uart0", \ - .Instance = MXC_UART_GET_UART(0), \ - .irq_type = MXC_UART_GET_IRQ(0), \ + .Instance = MXC_UART_GET_UART(0), \ + .irq_type = MXC_UART_GET_IRQ(0), \ } - #define UART1_CONFIG \ { \ .name = "uart1", \ - .Instance = MXC_UART_GET_UART(1), \ - .irq_type = MXC_UART_GET_IRQ(1), \ + .Instance = MXC_UART_GET_UART(1), \ + .irq_type = MXC_UART_GET_IRQ(1), \ } struct mcu_uart_config @@ -49,10 +52,6 @@ struct mcu_uart -//#define DRV_DEBUG -//#define LOG_TAG "drv.usart" -//#include - #if !defined(BSP_USING_UART0) && !defined(BSP_USING_UART1) #error "Please define at least one BSP_USING_UARTx" @@ -92,7 +91,7 @@ void UART1_IRQHandler(void) uint32_t intst = 0; intst = MXC_UART1->int_fl; MXC_UART1->int_fl = intst; - + rt_interrupt_leave(); } #endif @@ -138,9 +137,10 @@ static rt_err_t mcu_configure(struct rt_serial_device *serial, struct serial_con mcu_cfg.pol = UART_FLOW_POL_EN; error = UART_Init(uart->handle, &mcu_cfg, &sys_uart_cfg); - if (error != E_NO_ERROR) { + if (error != E_NO_ERROR) + { rt_kprintf("Error initializing UART %d\n", error); - while(1) {} + while (1) {} } return RT_EOK; } @@ -171,7 +171,7 @@ static rt_err_t mcu_control(struct rt_serial_device *serial, int cmd, void *arg) uart->handle->ctrl |= 0x05 << MXC_F_UART_CTRL_RX_TO_POS; uart->handle->int_en |= MXC_F_UART_INT_EN_RX_FIFO_THRESH | \ MXC_F_UART_INT_EN_RX_TIMEOUT; - + uart->handle->int_en |= MXC_F_UART_INT_EN_RX_FRAME_ERROR | \ MXC_F_UART_INT_EN_RX_PARITY_ERROR | \ MXC_F_UART_INT_EN_RX_OVERRUN ;