sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix typo in STM32 header files

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4915 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-07-06 22:21:58 +00:00
parent af8400bba9
commit 383bc9c24c
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm/src/lpc43xx/lpc43_serial.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* arch/arm/src/lpc43xx/lpc43_serial.c * arch/arm/src/lpc43xx/lpc43_serial.c
* *
* Copyright (C) 2010-2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -60,8 +60,7 @@
#include "os_internal.h" #include "os_internal.h"
#include "up_internal.h" #include "up_internal.h"
#include "lpc43_internal.h" #include "lpc43_config.h"
#include "lpc43_uart.h"
#include "lpc43_serial.h" #include "lpc43_serial.h"
/**************************************************************************** /****************************************************************************
@ -161,7 +160,7 @@ static struct up_dev_s g_uart0priv =
{ {
.uartbase = LPC43_USART0_BASE, .uartbase = LPC43_USART0_BASE,
.baud = CONFIG_USART0_BAUD, .baud = CONFIG_USART0_BAUD,
.irq = LPC43_IRQ_USART0, .irq = LPC43M4_IRQ_USART0,
.parity = CONFIG_USART0_PARITY, .parity = CONFIG_USART0_PARITY,
.bits = CONFIG_USART0_BITS, .bits = CONFIG_USART0_BITS,
.stopbits2 = CONFIG_USART0_2STOP, .stopbits2 = CONFIG_USART0_2STOP,
@ -191,7 +190,7 @@ static struct up_dev_s g_uart1priv =
{ {
.uartbase = LPC43_UART1_BASE, .uartbase = LPC43_UART1_BASE,
.baud = CONFIG_UART1_BAUD, .baud = CONFIG_UART1_BAUD,
.irq = LPC43_IRQ_UART1, .irq = LPC43M4_IRQ_UART1,
.parity = CONFIG_UART1_PARITY, .parity = CONFIG_UART1_PARITY,
.bits = CONFIG_UART1_BITS, .bits = CONFIG_UART1_BITS,
.stopbits2 = CONFIG_UART1_2STOP, .stopbits2 = CONFIG_UART1_2STOP,
@ -221,7 +220,7 @@ static struct up_dev_s g_uart2priv =
{ {
.uartbase = LPC43_USART2_BASE, .uartbase = LPC43_USART2_BASE,
.baud = CONFIG_USART2_BAUD, .baud = CONFIG_USART2_BAUD,
.irq = LPC43_IRQ_USART2, .irq = LPC43M4_IRQ_USART2,
.parity = CONFIG_USART2_PARITY, .parity = CONFIG_USART2_PARITY,
.bits = CONFIG_USART2_BITS, .bits = CONFIG_USART2_BITS,
.stopbits2 = CONFIG_USART2_2STOP, .stopbits2 = CONFIG_USART2_2STOP,
@ -251,7 +250,7 @@ static struct up_dev_s g_uart3priv =
{ {
.uartbase = LPC43_USART3_BASE, .uartbase = LPC43_USART3_BASE,
.baud = CONFIG_USART3_BAUD, .baud = CONFIG_USART3_BAUD,
.irq = LPC43_IRQ_USART3, .irq = LPC43M4_IRQ_USART3,
.parity = CONFIG_USART3_PARITY, .parity = CONFIG_USART3_PARITY,
.bits = CONFIG_USART3_BITS, .bits = CONFIG_USART3_BITS,
.stopbits2 = CONFIG_USART3_2STOP, .stopbits2 = CONFIG_USART3_2STOP,

2
arch/arm/src/lpc43xx/lpc43_serial.h
View File

@ -41,6 +41,8 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include "chip.h"
#include "chip/lpc43_uart.h"
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions

2
arch/arm/src/stm32/chip/stm32f103vc_pinmap.h
View File

@ -357,7 +357,7 @@
#endif #endif
#endif #endif
#define GPIO_USART1_CTS (GPIO_INPUT|GPIO_CNF_INFLOAT|GPIO_MODE_INPU|GPIO_PORTA|GPIO_PIN11) #define GPIO_USART1_CTS (GPIO_INPUT|GPIO_CNF_INFLOAT|GPIO_MODE_INPUT|GPIO_PORTA|GPIO_PIN11)
#define GPIO_USART1_RTS (GPIO_ALT|GPIO_CNF_AFPP|GPIO_MODE_50MHz|GPIO_PORTA|GPIO_PIN12) #define GPIO_USART1_RTS (GPIO_ALT|GPIO_CNF_AFPP|GPIO_MODE_50MHz|GPIO_PORTA|GPIO_PIN12)
#define GPIO_USART1_CK (GPIO_ALT|GPIO_CNF_AFPP|GPIO_MODE_50MHz|GPIO_PORTA|GPIO_PIN8) #define GPIO_USART1_CK (GPIO_ALT|GPIO_CNF_AFPP|GPIO_MODE_50MHz|GPIO_PORTA|GPIO_PIN8)
#if defined(CONFIG_STM32_USART1_REMAP) #if defined(CONFIG_STM32_USART1_REMAP)

2
arch/arm/src/stm32/chip/stm32f107vc_pinmap.h
View File

@ -350,7 +350,7 @@
#endif #endif
#endif #endif
#define GPIO_USART1_CTS (GPIO_INPUT|GPIO_CNF_INFLOAT|GPIO_MODE_INPU|GPIO_PORTA|GPIO_PIN11) #define GPIO_USART1_CTS (GPIO_INPUT|GPIO_CNF_INFLOAT|GPIO_MODE_INPUT|GPIO_PORTA|GPIO_PIN11)
#define GPIO_USART1_RTS (GPIO_ALT|GPIO_CNF_AFPP|GPIO_MODE_50MHz|GPIO_PORTA|GPIO_PIN12) #define GPIO_USART1_RTS (GPIO_ALT|GPIO_CNF_AFPP|GPIO_MODE_50MHz|GPIO_PORTA|GPIO_PIN12)
#define GPIO_USART1_CK (GPIO_ALT|GPIO_CNF_AFPP|GPIO_MODE_50MHz|GPIO_PORTA|GPIO_PIN8) #define GPIO_USART1_CK (GPIO_ALT|GPIO_CNF_AFPP|GPIO_MODE_50MHz|GPIO_PORTA|GPIO_PIN8)
#if defined(CONFIG_STM32_USART1_REMAP) #if defined(CONFIG_STM32_USART1_REMAP)