From 4aa7ba827bc7a5bf7bdb8d48dcfb844422c6ed50 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Thu, 3 Dec 2020 06:09:41 -0800 Subject: [PATCH] imxrt:imxrt_lowputc Fixed parity settings. imxrt UART must be placed in 9 bit mode (M=1) with when 8 bit data with parity is required. If left in 8 bit mode (M=0) with parity then D7 of the TX/RX register becomes parity bit. Hence what is called 9-bit or 8-bit Mode Select is a misnomer. 8 bit mode when parity is enabled is realy 7 bit with parity. --- arch/arm/src/imxrt/imxrt_lowputc.c | 56 ++++++++++++------------------ 1 file changed, 22 insertions(+), 34 deletions(-) diff --git a/arch/arm/src/imxrt/imxrt_lowputc.c b/arch/arm/src/imxrt/imxrt_lowputc.c index ee826b8ab96..682d1fec91e 100644 --- a/arch/arm/src/imxrt/imxrt_lowputc.c +++ b/arch/arm/src/imxrt/imxrt_lowputc.c @@ -1,35 +1,20 @@ /**************************************************************************** * arch/arm/src/imxrt/imxrt_lowputc.c * - * Copyright (C) 2018, 2019 Gregory Nutt. All rights reserved. - * Author: Ivan Ucherdzhiev + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * http://www.apache.org/licenses/LICENSE-2.0 * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. * ****************************************************************************/ @@ -544,14 +529,14 @@ int imxrt_lpuart_configure(uint32_t base, regval |= LPUART_CTRL_PE | LPUART_CTRL_PT_EVEN; } - if (config->bits == 8) - { - regval &= ~LPUART_CTRL_M; - } - else if (config->bits == 9) + if (config->bits == 9 || (config->bits == 8 && config->parity != 0)) { regval |= LPUART_CTRL_M; } + else if ((config->bits == 8)) + { + regval &= ~LPUART_CTRL_M; + } else { /* Here should be added support of other bit modes. */ @@ -590,13 +575,16 @@ void imxrt_lowputc(int ch) { } - /* If the character to output is a newline, then pre-pend a carriage return */ + /* If the character to output is a newline, then pre-pend a carriage + * return + */ if (ch == '\n') { /* Send the carriage return by writing it into the UART_TXD register. */ - putreg32((uint32_t)'\r', IMXRT_CONSOLE_BASE + IMXRT_LPUART_DATA_OFFSET); + putreg32((uint32_t)'\r', IMXRT_CONSOLE_BASE + + IMXRT_LPUART_DATA_OFFSET); /* Wait for the transmit register to be emptied. When the TXFE bit is * non-zero, the TX Buffer FIFO is empty.