4
0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-02-28 15:15:26 +08:00

Merge pull request #1301 from balanceTWK/master

[BSP] add other uart|添加其他串口
This commit is contained in:
Tanek 2018-03-19 19:35:07 +08:00 committed by GitHub
commit 1c318bafb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 2688 additions and 2692 deletions

View File

@ -7,7 +7,7 @@ cwd = os.path.join(str(Dir('#')), 'drivers')
# add the general drivers. # add the general drivers.
src = Split(""" src = Split("""
board.c board.c
usart.c drv_uart.c
hyper_flash_boot.c hyper_flash_boot.c
drv_sdram.c drv_sdram.c
""") """)

View File

@ -16,7 +16,7 @@
#include <rtthread.h> #include <rtthread.h>
#include "board.h" #include "board.h"
#include "usart.h" #include "drv_uart.h"
static struct rt_memheap system_heap; static struct rt_memheap system_heap;

View File

@ -1,5 +1,5 @@
/* /*
* File : usart.c * File : drv_uart.c
* This file is part of RT-Thread RTOS * This file is part of RT-Thread RTOS
* COPYRIGHT (C) 2006-2013, RT-Thread Development Team * COPYRIGHT (C) 2006-2013, RT-Thread Development Team
* *
@ -10,9 +10,10 @@
* Change Logs: * Change Logs:
* Date Author Notes * Date Author Notes
* 2017-10-10 Tanek the first version * 2017-10-10 Tanek the first version
* 2018-03-17 laiyiketang Add other uart.
*/ */
#include <rtthread.h> #include <rtthread.h>
#include "usart.h" #include "drv_uart.h"
#include "fsl_common.h" #include "fsl_common.h"
#include "fsl_lpuart.h" #include "fsl_lpuart.h"
@ -20,14 +21,21 @@
#ifdef RT_USING_SERIAL #ifdef RT_USING_SERIAL
#if !defined(RT_USING_UART0) && !defined(RT_USING_UART1) && \ /* GPIO外设时钟会在LPUART_Init中自动配置, 如果定义了以下宏则不会自动配置 */
!defined(RT_USING_UART2) && !defined(RT_USING_UART3) && \ #if defined(FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL) && FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL
!defined(RT_USING_UART4) && !defined(RT_USING_UART5) && \ #error "Please don't define 'FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL'!"
!defined(RT_USING_UART6) && !defined(RT_USING_UART7) #endif
#if !defined(RT_USING_UART1) && !defined(RT_USING_UART2) && \
!defined(RT_USING_UART3) && !defined(RT_USING_UART4) && \
!defined(RT_USING_UART5) && !defined(RT_USING_UART6) && \
!defined(RT_USING_UART7) && !defined(RT_USING_UART8)
#error "Please define at least one UARTx" #error "Please define at least one UARTx"
#endif #endif
#include <rtdevice.h> #include <rtdevice.h>
/* imxrt uart driver */ /* imxrt uart driver */
@ -55,7 +63,7 @@ void LPUART1_IRQHandler(void)
#if defined(RT_USING_UART2) #if defined(RT_USING_UART2)
struct rt_serial_device serial2; struct rt_serial_device serial2;
void USART2_IRQHandler(void) void LPUART2_IRQHandler(void)
{ {
uart_isr(&serial2); uart_isr(&serial2);
} }
@ -65,7 +73,7 @@ void USART2_IRQHandler(void)
#if defined(RT_USING_UART3) #if defined(RT_USING_UART3)
struct rt_serial_device serial3; struct rt_serial_device serial3;
void UART3_IRQHandler(void) void LPUART3_IRQHandler(void)
{ {
uart_isr(&serial3); uart_isr(&serial3);
} }
@ -75,7 +83,7 @@ void UART3_IRQHandler(void)
#if defined(RT_USING_UART4) #if defined(RT_USING_UART4)
struct rt_serial_device serial4; struct rt_serial_device serial4;
void UART4_IRQHandler(void) void LPUART4_IRQHandler(void)
{ {
uart_isr(&serial4); uart_isr(&serial4);
} }
@ -84,7 +92,7 @@ void UART4_IRQHandler(void)
#if defined(RT_USING_UART5) #if defined(RT_USING_UART5)
struct rt_serial_device serial5; struct rt_serial_device serial5;
void USART5_IRQHandler(void) void LPUART5_IRQHandler(void)
{ {
uart_isr(&serial5); uart_isr(&serial5);
} }
@ -94,7 +102,7 @@ void USART5_IRQHandler(void)
#if defined(RT_USING_UART6) #if defined(RT_USING_UART6)
struct rt_serial_device serial6; struct rt_serial_device serial6;
void UART6_IRQHandler(void) void LPUART6_IRQHandler(void)
{ {
uart_isr(&serial6); uart_isr(&serial6);
} }
@ -104,7 +112,7 @@ void UART6_IRQHandler(void)
#if defined(RT_USING_UART7) #if defined(RT_USING_UART7)
struct rt_serial_device serial7; struct rt_serial_device serial7;
void UART7_IRQHandler(void) void LPUART7_IRQHandler(void)
{ {
uart_isr(&serial7); uart_isr(&serial7);
} }
@ -114,7 +122,7 @@ void UART7_IRQHandler(void)
#if defined(RT_USING_UART8) #if defined(RT_USING_UART8)
struct rt_serial_device serial8; struct rt_serial_device serial8;
void UART8_IRQHandler(void) void LPUART8_IRQHandler(void)
{ {
uart_isr(&serial8); uart_isr(&serial8);
} }
@ -130,6 +138,62 @@ static const struct imxrt_uart uarts[] = {
"uart1", "uart1",
}, },
#endif #endif
#ifdef RT_USING_UART2
{
LPUART2,
LPUART2_IRQn,
&serial2,
"uart2",
},
#endif
#ifdef RT_USING_UART3
{
LPUART3,
LPUART3_IRQn,
&serial3,
"uart3",
},
#endif
#ifdef RT_USING_UART4
{
LPUART4,
LPUART4_IRQn,
&serial4,
"uart4",
},
#endif
#ifdef RT_USING_UART5
{
LPUART5,
LPUART5_IRQn,
&serial5,
"uart5",
},
#endif
#ifdef RT_USING_UART6
{
LPUART6,
LPUART6_IRQn,
&serial6,
"uart6",
},
#endif
#ifdef RT_USING_UART7
{
LPUART7,
LPUART7_IRQn,
&serial7,
"uart7",
},
#endif
#ifdef RT_USING_UART8
{
LPUART8,
LPUART8_IRQn,
&serial8,
"uart8",
},
#endif
}; };
@ -164,8 +228,9 @@ uint32_t BOARD_DebugConsoleSrcFreq(void)
*/ */
void imxrt_uart_gpio_init(struct imxrt_uart *uart) void imxrt_uart_gpio_init(struct imxrt_uart *uart)
{ {
if (uart->uart_base == LPUART1) if (uart->uart_base != RT_NULL)
{ {
#ifdef RT_USING_UART1
CLOCK_EnableClock(kCLOCK_Iomuxc); /* iomuxc clock (iomuxc_clk_enable): 0x03u */ CLOCK_EnableClock(kCLOCK_Iomuxc); /* iomuxc clock (iomuxc_clk_enable): 0x03u */
IOMUXC_SetPinMux( IOMUXC_SetPinMux(
@ -194,6 +259,128 @@ void imxrt_uart_gpio_init(struct imxrt_uart *uart)
Pull / Keep Select Field: Keeper Pull / Keep Select Field: Keeper
Pull Up / Down Config. Field: 100K Ohm Pull Down Pull Up / Down Config. Field: 100K Ohm Pull Down
Hyst. Enable Field: Hysteresis Disabled */ Hyst. Enable Field: Hysteresis Disabled */
#endif
#ifdef RT_USING_UART2
CLOCK_EnableClock(kCLOCK_Iomuxc);
IOMUXC_SetPinMux(
IOMUXC_GPIO_AD_B1_02_LPUART2_TX,
0U);
IOMUXC_SetPinMux(
IOMUXC_GPIO_AD_B1_03_LPUART2_RX,
0U);
IOMUXC_SetPinConfig(
IOMUXC_GPIO_AD_B1_02_LPUART2_TX,
0x10B0u);
IOMUXC_SetPinConfig(
IOMUXC_GPIO_AD_B1_03_LPUART2_RX,
0x10B0u);
#endif
#ifdef RT_USING_UART3
CLOCK_EnableClock(kCLOCK_Iomuxc);
IOMUXC_SetPinMux(
IOMUXC_GPIO_AD_B1_06_LPUART3_TX,
0U);
IOMUXC_SetPinMux(
IOMUXC_GPIO_AD_B1_07_LPUART3_RX,
0U);
IOMUXC_SetPinConfig(
IOMUXC_GPIO_AD_B1_06_LPUART3_TX,
0x10B0u);
IOMUXC_SetPinConfig(
IOMUXC_GPIO_AD_B1_07_LPUART3_RX,
0x10B0u);
#endif
#ifdef RT_USING_UART4
CLOCK_EnableClock(kCLOCK_Iomuxc);
IOMUXC_SetPinMux(
IOMUXC_GPIO_B1_00_LPUART4_TX,
0U);
IOMUXC_SetPinMux(
IOMUXC_GPIO_B1_01_LPUART4_RX,
0U);
IOMUXC_SetPinConfig(
IOMUXC_GPIO_B1_00_LPUART4_TX,
0x10B0u);
IOMUXC_SetPinConfig(
IOMUXC_GPIO_B1_01_LPUART4_RX,
0x10B0u);
#endif
#ifdef RT_USING_UART5
CLOCK_EnableClock(kCLOCK_Iomuxc);
IOMUXC_SetPinMux(
IOMUXC_GPIO_B1_12_LPUART5_TX,
0U);
IOMUXC_SetPinMux(
IOMUXC_GPIO_B1_13_LPUART5_RX,
0U);
IOMUXC_SetPinConfig(
IOMUXC_GPIO_B1_12_LPUART5_TX,
0x10B0u);
IOMUXC_SetPinConfig(
IOMUXC_GPIO_B1_13_LPUART5_RX,
0x10B0u);
#endif
#ifdef RT_USING_UART6
CLOCK_EnableClock(kCLOCK_Iomuxc);
IOMUXC_SetPinMux(
IOMUXC_GPIO_AD_B0_02_LPUART6_TX,
0U);
IOMUXC_SetPinMux(
IOMUXC_GPIO_AD_B0_03_LPUART6_RX,
0U);
IOMUXC_SetPinConfig(
IOMUXC_GPIO_AD_B0_02_LPUART6_TX,
0x10B0u);
IOMUXC_SetPinConfig(
IOMUXC_GPIO_AD_B0_03_LPUART6_RX,
0x10B0u);
#endif
#ifdef RT_USING_UART7
CLOCK_EnableClock(kCLOCK_Iomuxc);
IOMUXC_SetPinMux(
IOMUXC_GPIO_EMC_31_LPUART7_TX,
0U);
IOMUXC_SetPinMux(
IOMUXC_GPIO_EMC_32_LPUART7_RX,
0U);
IOMUXC_SetPinConfig(
IOMUXC_GPIO_EMC_31_LPUART7_TX,
0x10B0u);
IOMUXC_SetPinConfig(
IOMUXC_GPIO_EMC_32_LPUART7_RX,
0x10B0u);
#endif
#ifdef RT_USING_UART8
CLOCK_EnableClock(kCLOCK_Iomuxc);
IOMUXC_SetPinMux(
IOMUXC_GPIO_AD_B1_10_LPUART8_TX,
0U);
IOMUXC_SetPinMux(
IOMUXC_GPIO_AD_B1_11_LPUART8_RX,
0U);
IOMUXC_SetPinConfig(
IOMUXC_GPIO_AD_B1_10_LPUART8_TX,
0x10B0u);
IOMUXC_SetPinConfig(
IOMUXC_GPIO_AD_B1_11_LPUART8_RX,
0x10B0u);
#endif
} }
else else
{ {
@ -363,7 +550,6 @@ int imxrt_hw_usart_init(void)
{ {
struct serial_configure config = RT_SERIAL_CONFIG_DEFAULT; struct serial_configure config = RT_SERIAL_CONFIG_DEFAULT;
int i; int i;
for (i = 0; i < sizeof(uarts) / sizeof(uarts[0]); i++) for (i = 0; i < sizeof(uarts) / sizeof(uarts[0]); i++)
{ {
uarts[i].serial->ops = &imxrt_uart_ops; uarts[i].serial->ops = &imxrt_uart_ops;

View File

@ -1,5 +1,5 @@
/* /*
* File : usart.h * File : drv_uart.h
* This file is part of RT-Thread RTOS * This file is part of RT-Thread RTOS
* COPYRIGHT (C) 2009, RT-Thread Development Team * COPYRIGHT (C) 2009, RT-Thread Development Team
* *
@ -12,8 +12,8 @@
* 2017-10-10 Tanek the first version * 2017-10-10 Tanek the first version
*/ */
#ifndef __USART_H__ #ifndef __DRV_USART_H__
#define __USART_H__ #define __DRV_USART_H__
#include <rthw.h> #include <rthw.h>
#include <rtthread.h> #include <rtthread.h>

File diff suppressed because it is too large Load Diff

View File

@ -73,7 +73,7 @@
<LExpSel>0</LExpSel> <LExpSel>0</LExpSel>
</OPTXL> </OPTXL>
<OPTFL> <OPTFL>
<tvExp>1</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>1</IsCurrentTarget> <IsCurrentTarget>1</IsCurrentTarget>
</OPTFL> </OPTFL>
@ -101,7 +101,9 @@
<sRunDeb>0</sRunDeb> <sRunDeb>0</sRunDeb>
<sLrtime>0</sLrtime> <sLrtime>0</sLrtime>
<bEvRecOn>1</bEvRecOn> <bEvRecOn>1</bEvRecOn>
<nTsel>2</nTsel> <bSchkAxf>0</bSchkAxf>
<bTchkAxf>0</bTchkAxf>
<nTsel>3</nTsel>
<sDll></sDll> <sDll></sDll>
<sDllPa></sDllPa> <sDllPa></sDllPa>
<sDlgDll></sDlgDll> <sDlgDll></sDlgDll>
@ -164,11 +166,16 @@
<LintExecutable></LintExecutable> <LintExecutable></LintExecutable>
<LintConfigFile></LintConfigFile> <LintConfigFile></LintConfigFile>
<bLintAuto>0</bLintAuto> <bLintAuto>0</bLintAuto>
<Lin2Executable></Lin2Executable>
<Lin2ConfigFile></Lin2ConfigFile>
<bLin2Auto>0</bLin2Auto>
<bAutoGenD>0</bAutoGenD> <bAutoGenD>0</bAutoGenD>
<bAuto2GenD>0</bAuto2GenD> <LntExFlags>0</LntExFlags>
<pMisraName></pMisraName>
<pszMrule></pszMrule>
<pSingCmds></pSingCmds>
<pMultCmds></pMultCmds>
<pMisraNamep></pMisraNamep>
<pszMrulep></pszMrulep>
<pSingCmdsp></pSingCmdsp>
<pMultCmdsp></pMultCmdsp>
</TargetOption> </TargetOption>
</Target> </Target>

View File

@ -8,11 +8,13 @@
<ToolsetNumber>0x4</ToolsetNumber> <ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName> <ToolsetName>ARM-ADS</ToolsetName>
<pCCUsed>5060528::V5.06 update 5 (build 528)::ARMCC</pCCUsed> <pCCUsed>5060528::V5.06 update 5 (build 528)::ARMCC</pCCUsed>
<uAC6>0</uAC6>
<TargetOption> <TargetOption>
<TargetCommonOption> <TargetCommonOption>
<Device>MIMXRT1052:M7</Device> <Device>MIMXRT1052:M7</Device>
<Vendor>NXP</Vendor> <Vendor>NXP</Vendor>
<PackID>NXP.iMXRT_DFP.1.0.1</PackID> <PackID>NXP.iMXRT_DFP.1.0.2</PackID>
<PackURL>http://mcuxpresso.nxp.com/cmsis_pack/repo/</PackURL>
<Cpu>IRAM(0x20000000,0x00060000) IRAM2(0x00000000,0x00020000) CPUTYPE("Cortex-M7") FPU3(SFPU) CLOCK(12000000) ELITTLE</Cpu> <Cpu>IRAM(0x20000000,0x00060000) IRAM2(0x00000000,0x00020000) CPUTYPE("Cortex-M7") FPU3(SFPU) CLOCK(12000000) ELITTLE</Cpu>
<FlashUtilSpec /> <FlashUtilSpec />
<StartupFile /> <StartupFile />
@ -414,9 +416,9 @@
</Files> </Files>
<Files> <Files>
<File> <File>
<FileName>usart.c</FileName> <FileName>drv_uart.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>drivers\usart.c</FilePath> <FilePath>drivers\drv_uart.c</FilePath>
</File> </File>
</Files> </Files>
<Files> <Files>