From c4ce3806027d32e0108fc263af0f3b3e2d666342 Mon Sep 17 00:00:00 2001 From: patacongo Date: Mon, 4 Jul 2011 19:52:43 +0000 Subject: [PATCH] Add stm32/nsh2 config; Add option to use any TTY for NSH console git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3743 42af7a65-404d-4744-a932-0658087f49c3 --- arch/arm/src/stm32/stm32_lowputc.c | 2 +- arch/arm/src/stm32/stm32_serial.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/src/stm32/stm32_lowputc.c b/arch/arm/src/stm32/stm32_lowputc.c index 8166de513d..fe6f513867 100644 --- a/arch/arm/src/stm32/stm32_lowputc.c +++ b/arch/arm/src/stm32/stm32_lowputc.c @@ -291,7 +291,7 @@ void stm32_lowsetup(void) */ #ifdef CONFIG_STM32_USART2_REMAP - mapr |= ~AFIO_MAPR_USART2_REMAP; + mapr |= AFIO_MAPR_USART2_REMAP; #else mapr &= ~AFIO_MAPR_USART2_REMAP; #endif diff --git a/arch/arm/src/stm32/stm32_serial.c b/arch/arm/src/stm32/stm32_serial.c index 9e5de150a6..a529285f45 100644 --- a/arch/arm/src/stm32/stm32_serial.c +++ b/arch/arm/src/stm32/stm32_serial.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/arm/src/stm32/stm32_serial.c * - * Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2009-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -659,7 +659,7 @@ static int up_interrupt(int irq, void *context) /* Get the masked USART status and clear the pending interrupts. */ - priv->sr = up_serialin(priv, STM32_USART_SR_OFFSET); + priv->sr = up_serialin(priv, STM32_USART_SR_OFFSET); /* USART interrupts: *