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

ESP32: Fix some compilation errors

Browse Source
This commit is contained in:
Gregory Nutt 2016-10-27 16:36:22 -06:00
parent c52ee46f5f
commit 6ed5d4b20c
7 changed files with 118 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
arch/xtensa/include/serial.h Normal file
View File

@ -0,0 +1,58 @@
/****************************************************************************
* arch/xtensa/include/serial.h
*
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 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.
*
****************************************************************************/
#ifndef __ARCH_XTENSA_INCLUDE_SERIAL_H
#define __ARCH_XTENSA_INCLUDE_SERIAL_H
/****************************************************************************
* Included Files
****************************************************************************/
#include <sys/types.h>
#include <nuttx/fs/ioctl.h>
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/****************************************************************************
* Public Functions
****************************************************************************/
#endif /* __ARCH_XTENSA_INCLUDE_SERIAL_H */

12
arch/xtensa/src/esp32/Kconfig
View File

@ -237,8 +237,8 @@ config ESP32_UART0_TXPIN
default 0
range 0 39
config ESP32_UART0_TXPIN
int "UART0 Tx Pin"
config ESP32_UART0_RXPIN
int "UART0 Rx Pin"
default 0
range 0 39
@ -263,8 +263,8 @@ config ESP32_UART1_TXPIN
default 0
range 0 39
config ESP32_UART1_TXPIN
int "UART1 Tx Pin"
config ESP32_UART1_RXPIN
int "UART1 Rx Pin"
default 0
range 0 39
@ -289,8 +289,8 @@ config ESP32_UART2_TXPIN
default 0
range 0 39
config ESP32_UART2_TXPIN
int "UART2 Tx Pin"
config ESP32_UART2_RXPIN
int "UART2 Rx Pin"
default 0
range 0 39

22
arch/xtensa/src/esp32/esp32_config.h
View File

@ -53,14 +53,14 @@
/* UARTs ********************************************************************/
/* Don't enable UARTs not supported by the chip. */
#if ESP32_NUART < 1
#if ESP32_NUARTS < 1
# undef CONFIG_ESP32_UART0
# undef CONFIG_ESP32_UART1
# undef CONFIG_ESP32_UART2
#elif ESP32_NUART < 2
#elif ESP32_NUARTS < 2
# undef CONFIG_ESP32_UART1
# undef CONFIG_ESP32_UART2
#elif ESP32_NUART < 3
#elif ESP32_NUARTS < 3
# undef CONFIG_ESP32_UART2
#endif
@ -127,20 +127,4 @@
# undef CONFIG_ESP32_SPI3
#endif
/****************************************************************************
* Public Types
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/****************************************************************************
* Inline Functions
****************************************************************************/
/****************************************************************************
* Public Functions
****************************************************************************/
#endif /* __ARCH_XTENSA_SRC_ESP32_ESP32_CONFIG_H */

2
arch/xtensa/src/esp32/esp32_gpio.c
View File

@ -214,7 +214,7 @@ int esp32_configgpio(int pin, gpio_pinattr_t attr)
func |= FUN_IE;
pinmode = (attr & PINMODE_MASK);
if (pinmode == INPUT | pinmode == OUTPUT)
if (pinmode == INPUT || pinmode == OUTPUT)
{
func |= (uint32_t)(2 << MCU_SEL_S);
}

73
arch/xtensa/src/esp32/esp32_serial.c
View File

@ -52,7 +52,7 @@
# include <termios.h>
#endif
#include <nuttx/cpuint.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
#include <nuttx/serial/serial.h>
@ -64,7 +64,9 @@
#include "chip/esp32_iomux.h"
#include "chip/esp32_gpio_sigmap.h"
#include "chip/esp32_uart.h"
#include "rom/esp32_gpio.h"
#include "esp32_config.h"
#include "esp32_gpio.h"
#include "esp32_cpuint.h"
/****************************************************************************
@ -100,6 +102,7 @@
# elif defined(CONFIG_ESP32_UART2)
# define TTYS0_DEV g_uart2port /* UART2 is ttyS0 */
# define UART2_ASSIGNED 1
# endif
#endif
/* Pick ttys1. This could be any of UART0-2 excluding the console
@ -163,9 +166,9 @@ struct esp32_config_s
struct esp32_dev_s
{
const struct esp32_config_s *config /* Constant configuration */
const struct esp32_config_s *config; /* Constant configuration */
uint32_t baud; /* Configured baud */
uint32_t sr; /* Saved status bits */
uint32_t status; /* Saved status bits */
uint8_t cpuint; /* CPU interrupt assigned to this UART */
uint8_t parity; /* 0=none, 1=odd, 2=even */
uint8_t bits; /* Number of bits (5-9) */
@ -194,7 +197,7 @@ static int esp32_uart1_interrupt(int cpuint, void *context);
static int esp32_uart2_interrupt(int cpuint, void *context);
#endif
static int esp32_ioctl(struct file *filep, int cmd, unsigned long arg);
static int esp32_receive(struct uart_dev_s *dev, uint32_t *status);
static int esp32_receive(struct uart_dev_s *dev, unsigned int *status);
static void esp32_rxint(struct uart_dev_s *dev, bool enable);
static bool esp32_rxavailable(struct uart_dev_s *dev);
static void esp32_send(struct uart_dev_s *dev, int ch);
@ -243,7 +246,7 @@ static char g_uart2txbuffer[CONFIG_UART2_TXBUFSIZE];
/* This describes the state of the UART0 port. */
#ifdef CONFIG_ESP32_UART0
static struct const esp32_config_s g_uart0config =
static const struct esp32_config_s g_uart0config =
{
.uartbase = DR_REG_UART_BASE,
.handler = esp32_uart0_interrupt,
@ -263,7 +266,7 @@ static struct const esp32_config_s g_uart0config =
static struct esp32_dev_s g_uart0priv =
{
.config = &g_uart0config;
.config = &g_uart0config,
.baud = CONFIG_UART0_BAUD,
.parity = CONFIG_UART0_PARITY,
.bits = CONFIG_UART0_BITS,
@ -290,7 +293,7 @@ static uart_dev_t g_uart0port =
/* This describes the state of the UART1 port. */
#ifdef CONFIG_ESP32_UART1
static struct const esp32_config_s g_uart1config =
static const struct esp32_config_s g_uart1config =
{
.uartbase = DR_REG_UART1_BASE,
.handler = esp32_uart1_interrupt,
@ -310,7 +313,7 @@ static struct const esp32_config_s g_uart1config =
static struct esp32_dev_s g_uart1priv =
{
.config = &g_uart1config;
.config = &g_uart1config,
.baud = CONFIG_UART1_BAUD,
.parity = CONFIG_UART1_PARITY,
.bits = CONFIG_UART1_BITS,
@ -337,7 +340,7 @@ static uart_dev_t g_uart1port =
/* This describes the state of the UART2 port. */
#ifdef CONFIG_ESP32_UART2
static struct const esp32_config_s g_uart2config =
static const struct esp32_config_s g_uart2config =
{
.uartbase = DR_REG_UART2_BASE,
.handler = esp32_uart2_interrupt,
@ -357,7 +360,7 @@ static struct const esp32_config_s g_uart2config =
static struct esp32_dev_s g_uart2priv =
{
.config = &g_uart2config;
.config = &g_uart2config,
.baud = CONFIG_UART2_BAUD,
.parity = CONFIG_UART2_PARITY,
.bits = CONFIG_UART2_BITS,
@ -591,17 +594,17 @@ static void esp32_shutdown(struct uart_dev_s *dev)
/* Revert pins to inputs and detach UART signals */
esp32_configgpio(priv->config->txpin, INPUT);
gpio_matrix_out(MATRIX_DETACH_OUT_SIG, priv->txsig, true, false);
gpio_matrix_out(MATRIX_DETACH_OUT_SIG, priv->config->txsig, true, false);
esp32_configgpio(priv->config->rxpin, INPUT);
gpio_matrix_in(MATRIX_DETACH_IN_LOW_PIN, priv->rxsig, false);
gpio_matrix_in(MATRIX_DETACH_IN_LOW_PIN, priv->config->rxsig, false);
#if defined(CONFIG_SERIAL_IFLOWCONTROL) || defined(CONFIG_SERIAL_OFLOWCONTROL)
esp32_configgpio(priv->config->rtspin, INPUT);
gpio_matrix_out(MATRIX_DETACH_OUT_SIG, priv->rtssig, true, false);
gpio_matrix_out(MATRIX_DETACH_OUT_SIG, priv->config->rtssig, true, false);
esp32_configgpio(priv->config->ctspin, INPUT);
gpio_matrix_in(MATRIX_DETACH_IN_LOW_PIN, priv->ctssig, false);
gpio_matrix_in(MATRIX_DETACH_IN_LOW_PIN, priv->config->ctssig, false);
#endif
/* Unconfigure and disable the UART */
@ -652,7 +655,7 @@ static int esp32_attach(struct uart_dev_s *dev)
/* Attach the GPIO peripheral to the allocated CPU interrupt */
up_disable_irq(g_gpio_cpuint);
up_disable_irq(priv->cpuint);
esp32_attach_peripheral(cpu, priv->config->periph, priv->cpuint);
/* Attach and enable the IRQ */
@ -683,6 +686,7 @@ static int esp32_attach(struct uart_dev_s *dev)
static void esp32_detach(struct uart_dev_s *dev)
{
struct esp32_dev_s *priv = (struct esp32_dev_s *)dev->priv;
int cpu;
/* Disable and detach the CPU interrupt */
@ -691,6 +695,12 @@ static void esp32_detach(struct uart_dev_s *dev)
/* Disassociate the peripheral interrupt from the CPU interrupt */
#ifdef CONFIG_SMP
cpu = up_cpu_index();
#else
cpu = 0;
#endif
esp32_detach_peripheral(cpu, priv->config->periph);
/* And release the CPU interrupt */
@ -714,6 +724,7 @@ static int esp32_interrupt(struct uart_dev_s *dev)
{
struct esp32_dev_s *priv;
uint32_t regval;
uint32_t status;
int passes;
bool handled;
@ -727,7 +738,9 @@ static int esp32_interrupt(struct uart_dev_s *dev)
handled = true;
for (passes = 0; passes < 256 && handled; passes++)
{
handled = false;
handled = false;
priv->status = esp32_serialin(priv, UART_INT_RAW_OFFSET);
status = esp32_serialin(priv, UART_STATUS_OFFSET);
/* Clear pending interrupts */
@ -736,7 +749,7 @@ static int esp32_interrupt(struct uart_dev_s *dev)
UART_TXFIFO_EMPTY_INT_CLR_S);
esp32_serialout(priv, UART_INT_CLR_OFFSET, regval);
if ((esp32_serialin(priv, UART_STATUS_OFFSET) & UART_RXFIFO_CNT_M) > 0)
if ((status & UART_RXFIFO_CNT_M) > 0)
{
/* Received data in the RXFIFO ... process incoming bytes */
@ -744,7 +757,7 @@ static int esp32_interrupt(struct uart_dev_s *dev)
handled = true;
}
if ((esp32_serialin(priv, UART_STATUS_OFFSET) & UART_TXFIFO_CNT_M) < 0x7f)
if ((status & UART_TXFIFO_CNT_M) < 0x7f)
{
/* The TXFIFO is not full ... process outgoing bytes */
@ -994,18 +1007,18 @@ static int esp32_ioctl(struct file *filep, int cmd, unsigned long arg)
*
****************************************************************************/
static int esp32_receive(struct uart_dev_s *dev, uint32_t *status)
static int esp32_receive(struct uart_dev_s *dev, unsigned int *status)
{
struct esp32_dev_s *priv = (struct esp32_dev_s *)dev->priv;
/* Return the error information in the saved status */
*status = priv->sr;
priv->sr = 0;
*status = (unsigned int)priv->status;
priv->status = 0;
/* Then return the actual received byte */
return (int)(esp32_serialin(priv, ESP32_UART_RHR_OFFSET) & 0xff);
return (int)(esp32_serialin(priv, UART_FIFO_OFFSET) & UART_RXFIFO_RD_BYTE_M);
}
/****************************************************************************
@ -1019,6 +1032,7 @@ static int esp32_receive(struct uart_dev_s *dev, uint32_t *status)
static void esp32_rxint(struct uart_dev_s *dev, bool enable)
{
struct esp32_dev_s *priv = (struct esp32_dev_s *)dev->priv;
int regval;
if (enable)
{
@ -1027,12 +1041,19 @@ static void esp32_rxint(struct uart_dev_s *dev, bool enable)
*/
#ifndef CONFIG_SUPPRESS_SERIAL_INTS
esp32_serialout(priv, ESP32_UART_IER_OFFSET, UART_INT_RXRDY);
regval = esp32_serialin(priv, UART_INT_ENA_OFFSET);
regval |= (UART_RXFIFO_FULL_INT_CLR_S | UART_FRM_ERR_INT_CLR_S |
UART_RXFIFO_TOUT_INT_CLR_S);
esp32_serialout(priv, UART_INT_ENA_OFFSET, regval);
#endif
}
else
{
esp32_serialout(priv, ESP32_UART_IDR_OFFSET, UART_INT_RXRDY);
/* Disable the RX interrupts */
esp32_serialout(priv, UART_INT_CLR_OFFSET,
(UART_RXFIFO_FULL_INT_CLR_S | UART_FRM_ERR_INT_CLR_S |
UART_RXFIFO_TOUT_INT_CLR_S));
}
}
@ -1091,7 +1112,7 @@ static void esp32_txint(struct uart_dev_s *dev, bool enable)
#ifndef CONFIG_SUPPRESS_SERIAL_INTS
regval = esp32_serialin(priv, UART_INT_ENA_OFFSET);
regval |= (UART_TX_DONE_INT_S | UART_TXFIFO_EMPTY_INT_RAW);
regval |= (UART_TX_DONE_INT_ENA_S | UART_TXFIFO_EMPTY_INT_ENA_S);
esp32_serialout(priv, UART_INT_ENA_OFFSET, regval);
/* Fake a TX interrupt here by just calling uart_xmitchars() with
@ -1191,7 +1212,7 @@ void up_earlyserialinit(void)
*
****************************************************************************/
void up_serialinit(void)
void xtensa_serial_initialize(void)
{
/* Register the console */

2
arch/xtensa/src/esp32/rom/esp32_gpio.h
View File

@ -36,7 +36,7 @@
#include <stdint.h>
#include <stdbool.h>
#include "chip/gpio_reg.h"
#include "chip/esp32_gpio.h"
/****************************************************************************
* Pre-processor Definitions

3
configs/esp32-core/nsh/defconfig
View File

@ -89,6 +89,7 @@ CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0
CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=0
# CONFIG_ESP32_GPIO_IRQ is not set
CONFIG_ESP32_UART0_TXPIN=0
CONFIG_ESP32_UART0_RXPIN=0
#
# ESP32 Peripheral Selection
@ -594,10 +595,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
CONFIG_EXAMPLES_NSH=y
CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
# CONFIG_EXAMPLES_NULL is not set
# CONFIG_EXAMPLES_NX is not set
# CONFIG_EXAMPLES_NXFFS is not set
# CONFIG_EXAMPLES_NXHELLO is not set
# CONFIG_EXAMPLES_NXIMAGE is not set
# CONFIG_EXAMPLES_NX is not set
# CONFIG_EXAMPLES_NXLINES is not set
# CONFIG_EXAMPLES_NXTERM is not set
# CONFIG_EXAMPLES_NXTEXT is not set