Merged in alinjerpelea/nuttx (pull request #971)

codestyle fixes

* misoc: codestyle fixes

     After the board restructuration is time for codestyle cleanup

    Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>

* or1k: codestyle fixes

     After the board restructuration is time for codestyle cleanup

    Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>

* renesas: codestyle fixes

     After the board restructuration is time for codestyle cleanup

    Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>

* risc-v: codestyle fixes

     After the board restructuration is time for codestyle cleanup

    Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>

* sim: codestyle fixes

     After the board restructuration is time for codestyle cleanup

    Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>

* x86: codestyle fixes

     After the board restructuration is time for codestyle cleanup

    Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>

* xtensa: codestyle fixes

     After the board restructuration is time for codestyle cleanup

    Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>

* z16: codestyle fixes

     After the board restructuration is time for codestyle cleanup

    Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>

* z80: codestyle fixes

     After the board restructuration is time for codestyle cleanup

    Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>

Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
Alin Jerpelea 2019-08-09 13:22:39 +00:00 committed by Gregory Nutt
parent c300f27130
commit a06033df64
135 changed files with 620 additions and 555 deletions

View File

@ -60,11 +60,11 @@ Buildroot Toolchain
CONFIG_LM3S_TOOLCHAIN_BUILDROOT=y CONFIG_LM3S_TOOLCHAIN_BUILDROOT=y
boards/misoc/include/generated boards/misoc/lm32/misoc/include/generated
=============================== ===============================
In order to build this configuration, you must provide the In order to build this configuration, you must provide the
boards/misoc/include/generated directory. It contains the generated boards/misoc/lm32/misoc/include/generated directory. It contains the generated
Misoc files and may be a symbolic link. The base configurtion will NOT Misoc files and may be a symbolic link. The base configurtion will NOT
build without this directory! build without this directory!
@ -72,7 +72,7 @@ boards/misoc/include/generated
If you want to do a test build without generating the architecture, then If you want to do a test build without generating the architecture, then
you can simply link this sample directory like: you can simply link this sample directory like:
$ ln -s boards/misoc/include/generated-sample boards/misoc/include/generated $ ln -s boards/misoc/lm32/misoc/include/generated-sample boards/misoc/lm32/misoc/include/generated
That should permit a test build. That should permit a test build.

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/misoc/misoc/include/board.h * boards/misoc/m32/misoc/include/board.h
* *
* Copyright (C) 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -48,6 +48,7 @@
****************************************************************************/ ****************************************************************************/
/* Clocking *****************************************************************/ /* Clocking *****************************************************************/
/* Assume default CLKDIV8 fuse setting is overridden to CLKDIV1 */ /* Assume default CLKDIV8 fuse setting is overridden to CLKDIV1 */
#define BOARD_XTAL_FREQ 14745600 /* 14.7456MHz crystal */ #define BOARD_XTAL_FREQ 14745600 /* 14.7456MHz crystal */
@ -55,6 +56,7 @@
#define BOARD_TOSCK_CLOCK 32768 /* TOSC = 32.768KHz */ #define BOARD_TOSCK_CLOCK 32768 /* TOSC = 32.768KHz */
/* LED definitions **********************************************************/ /* LED definitions **********************************************************/
/* The Amber Web Server has a reset switch and four LEDs. The LEDs indicate /* The Amber Web Server has a reset switch and four LEDs. The LEDs indicate
* the status of power, programming state, Ethernet link status and reset * the status of power, programming state, Ethernet link status and reset
* status (Active). None are available for software use. * status (Active). None are available for software use.

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/misoc/misoc/hello/script/ld.script * boards/misoc/m32/misoc/hello/script/ld.script
* *
* Copyright (C) 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/misoc/misoc/scripts/ld.script * boards/misoc/m32/misoc/scripts/ld.script
* *
* Copyright (C) 2019 Gregory Nutt. All rights reserved. * Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/misoc/src/Makefile # boards/misoc/lm32/misoc/src/Makefile
# #
# Copyright (C) 2016 Gregory Nutt. All rights reserved. # Copyright (C) 2016 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/misoc/misoc/src/lm32_boot.c * boards/misoc/m32/misoc/src/lm32_boot.c
* *
* Copyright (C) 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -32,11 +32,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -44,24 +44,25 @@
#include <arch/board/board.h> #include <arch/board/board.h>
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: lm32_board_initialize * Name: lm32_board_initialize
* *
* Description: * Description:
* All LM32 architectures must provide the following entry point. This entry * All LM32 architectures must provide the following entry point. This entry
* point is called early in the initialization -- after all memory has been * point is called early in the initialization -- after all memory has been
* configured and mapped but before any devices have been initialized. * configured and mapped but before any devices have been initialized.
* *
************************************************************************************/ ****************************************************************************/
void lm32_board_initialize(void) void lm32_board_initialize(void)
{ {
/* Configure SSP chip selects if 1) at least one SSP is enabled, and 2) the weak /* Configure SSP chip selects if 1) at least one SSP is enabled, and 2)
* function atmega_spidev_initialize() has been brought into the link. * the weak function atmega_spidev_initialize() has been brought into
* the link.
*/ */
/* Configure on-board LEDs if LED support has been selected. */ /* Configure on-board LEDs if LED support has been selected. */

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/misoc/misoc/src/misoc.h * boards/misoc/m32/misoc/src/misoc.h
* *
* Copyright (C) 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -34,8 +34,8 @@
* *
****************************************************************************/ ****************************************************************************/
#ifndef __BOARDS_MISOC_MISOC_SRC_MISOC_H #ifndef __BOARDS_MISOC_LM32_MISOC_SRC_MISOC_H
#define __BOARDS_MISOC_MISOC_SRC_MISOC_H #define __BOARDS_MISOC_LM32_MISOC_SRC_MISOC_H
/**************************************************************************** /****************************************************************************
* Included Files * Included Files
@ -69,25 +69,25 @@ extern "C"
#define EXTERN extern #define EXTERN extern
#endif #endif
/************************************************************************************ /****************************************************************************
* Name: lm32_spidev_initialize * Name: lm32_spidev_initialize
* *
* Description: * Description:
* Called to configure SPI chip select GPIO pins for the Amber Web Server. * Called to configure SPI chip select GPIO pins for the Amber Web Server.
* *
************************************************************************************/ ****************************************************************************/
#if defined(CONFIG_AVR_SPI1) || defined(CONFIG_AVR_SPI2) #if defined(CONFIG_AVR_SPI1) || defined(CONFIG_AVR_SPI2)
void weak_function lm32_spidev_initialize(void); void weak_function lm32_spidev_initialize(void);
#endif #endif
/************************************************************************************ /****************************************************************************
* Name: lm32_led_initialize * Name: lm32_led_initialize
* *
* Description: * Description:
* Configure on-board LEDs if LED support has been selected. * Configure on-board LEDs if LED support has been selected.
* *
************************************************************************************/ ****************************************************************************/
#ifdef CONFIG_ARCH_LEDS #ifdef CONFIG_ARCH_LEDS
void lm32_led_initialize(void); void lm32_led_initialize(void);
@ -99,4 +99,4 @@ void lm32_led_initialize(void);
#endif #endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __BOARDS_MISOC_MISOC_SRC_MISOC_H */ #endif /* __BOARDS_MISOC_LM32_MISOC_SRC_MISOC_H */

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/or1k/or1k/include/board.h * boards/or1k/mor1kx/or1k/include/board.h
* *
* Copyright (C) 2018 Gregory Nutt. All rights reserved. * Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
* *
****************************************************************************/ ****************************************************************************/
#ifndef __BOARDS_OR1K_OR1K_INCLUDE_BOARD_H #ifndef __BOARDS_OR1K_MOR1KX_OR1K_INCLUDE_BOARD_H
#define __BOARDS_OR1K_OR1K_INCLUDE_BOARD_H #define __BOARDS_OR1K_MOR1KX_OR1K_INCLUDE_BOARD_H
/**************************************************************************** /****************************************************************************
* Included Files * Included Files
@ -57,4 +57,4 @@
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
#endif /* __BOARDS_OR1K_OR1K_INCLUDE_BOARD_H */ #endif /* __BOARDS_OR1K_MOR1KX_OR1K_INCLUDE_BOARD_H */

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/or1k/scripts/Make.defs # boards/or1k/mor1kx/or1k/scripts/Make.defs
# #
# Copyright (C) 2018 Gregory Nutt. All rights reserved. # Copyright (C) 2018 Gregory Nutt. All rights reserved.
# Author: Matt Thompson <matt@extent3d.com> # Author: Matt Thompson <matt@extent3d.com>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/or1k/or1k/scripts/ram.ld * boards/or1k/mor1kx/or1k/scripts/ram.ld
* *
* Copyright (C) 2018 Gregory Nutt. All rights reserved. * Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/or1k/src/Makefile # boards/or1k/mor1kx/or1k/src/Makefile
# #
# Copyright (C) 2018 Gregory Nutt. All rights reserved. # Copyright (C) 2018 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/or1k/or1k/src/or1k.h * boards/or1k/mor1kx/or1k/src/or1k.h
* *
* Copyright (C) 2018 Gregory Nutt. All rights reserved. * Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -31,14 +31,14 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
#ifndef __BOARDS_OR1K_OR1K_SRC_OR1K_H #ifndef __BOARDS_OR1K_MOR1KX_OR1K_SRC_OR1K_H
#define __BOARDS_OR1K_OR1K_SRC_OR1K_H #define __BOARDS_OR1K_MOR1KX_OR1K_SRC_OR1K_H
/************************************************************************************ /****************************************************************************
* Public Function Prototypes * Public Function Prototypes
************************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: or1k_bringup * Name: or1k_bringup
@ -56,4 +56,4 @@
int or1k_bringup(void); int or1k_bringup(void);
#endif /* __BOARDS_OR1K_OR1K_SRC_OR1K_H */ #endif /* __BOARDS_OR1K_MOR1KX_OR1K_SRC_OR1K_H */

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* config/or1kf4discovery/src/or1k_appinit.c * boards/or1k/mor1kx/or1k/src/or1k_appinit.c
* *
* Copyright (C) 2018 Gregory Nutt. All rights reserved. * Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/or1k/or1k/src/or1k_autoled.c * boards/or1k/mor1kx/or1k/src/or1k_autoled.c
* *
* Copyright (C) 2018 Gregory Nutt. All rights reserved. * Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/or1k/or1k/src/or1k_boot.c * boards/or1k/mor1kx/or1k/src/or1k_boot.c
* *
* Copyright (C) 2018 Extent3D. All rights reserved. * Copyright (C) 2018 Extent3D. All rights reserved.
* Author: Matt Thompson <matt@extent3d.com> * Author: Matt Thompson <matt@extent3d.com>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* config/or1k/src/or1k_bringup.c * boards/or1k/mor1kx/or1k/src/or1k_bringup.c
* *
* Copyright (C) 2018 Extent3D. All rights reserved. * Copyright (C) 2018 Extent3D. All rights reserved.
* Author: Matt Thompson <matt@extent3d.com> * Author: Matt Thompson <matt@extent3d.com>

View File

@ -1,4 +1,4 @@
boards/skp16c26/README.txt boards/renesas/m32262f8/skp16c26/README.txt
^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^
1. The buildroot package can be used to build an M16C toolchain. The toolchain 1. The buildroot package can be used to build an M16C toolchain. The toolchain

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/renesas/skp16c26/include/board.h * boards/renesas/m32262f8/skp16c26/include/board.h
* arch/board/board.h * arch/board/board.h
* *
* Copyright (C) 2009 Gregory Nutt. All rights reserved. * Copyright (C) 2009 Gregory Nutt. All rights reserved.
@ -32,25 +32,26 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
#ifndef __BOARDS_RENESAS_SKP16C26_INCLUDE_BOARD_H #ifndef __BOARDS_RENESAS_M32262F8_SKP16C26_INCLUDE_BOARD_H
#define __BOARDS_RENESAS_SKP16C26_INCLUDE_BOARD_H #define __BOARDS_RENESAS_M32262F8_SKP16C26_INCLUDE_BOARD_H
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/* User configuration checks ********************************************************/ /* User configuration checks ************************************************/
/* According to SKP16C26 documention, "SIO/UART1 pins are used for communication /* According to SKP16C26 documention, "SIO/UART1 pins are used for
* between the SKP16C26 board kernel and KD30 Debugger through the ICD. Do not * communication between the SKP16C26 board kernel and KD30 Debugger through
* connect these pins to any other circuit, as UART1 cannot be used in the user * the ICD. Do not connect these pins to any other circuit, as UART1 cannot
* program. For details, please see ICD (RTA-FoUSB-MON) User Manual on Target M16C * be used in the user program.
* For details, please see ICD (RTA-FoUSB-MON) User Manual on Target M16C
* ROM Monitor Resources or related ICD application notes." * ROM Monitor Resources or related ICD application notes."
* *
* However, the schematic appears to show that SIO/UART2 is actual connection. * However, the schematic appears to show that SIO/UART2 is actual connection.
@ -61,13 +62,13 @@
# error "UART1/2 should not be used on SKP16C26" # error "UART1/2 should not be used on SKP16C26"
#endif #endif
/* Hardware defintitions ************************************************************/ /* Hardware defintitions ****************************************************/
/* Xin Freq */ /* Xin Freq */
#define M16C_XIN_FREQ 20000000 /* 20MHz */ #define M16C_XIN_FREQ 20000000 /* 20MHz */
/* Interrupt Priority Levels ********************************************************/ /* Interrupt Priority Levels ************************************************/
/* IPL settings */ /* IPL settings */
@ -117,18 +118,18 @@
/* *=FLASHING **=if INIRQ, SIGNAL, or ASSERTION will be flashing */ /* *=FLASHING **=if INIRQ, SIGNAL, or ASSERTION will be flashing */
/* BUTTON definitions **************************************************************/ /* BUTTON definitions *******************************************************/
#define SW1_PRESSED 0x01 /* Bit 0: 1=SW1 pressed */ #define SW1_PRESSED 0x01 /* Bit 0: 1=SW1 pressed */
#define SW2_PRESSED 0x02 /* Bit 1: 1=SW2 pressed */ #define SW2_PRESSED 0x02 /* Bit 1: 1=SW2 pressed */
#define SW3_PRESSED 0x04 /* Bit 2: 1=SW3 pressed */ #define SW3_PRESSED 0x04 /* Bit 2: 1=SW3 pressed */
/************************************************************************************ /****************************************************************************
* Inline Functions * Inline Functions
************************************************************************************/ ****************************************************************************/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#endif #endif
#endif /* __BOARDS_RENESAS_SKP16C26_INCLUDE_BOARD_H */ #endif /* __BOARDS_RENESAS_M32262F8_SKP16C26_INCLUDE_BOARD_H */

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/renesas/skp16c26/scripts/Make.defs # boards/renesas/m32262f8/skp16c26/scripts/Make.defs
# #
# Copyright (C) 2009, 2017 Gregory Nutt. All rights reserved. # Copyright (C) 2009, 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/renesas/skp16c26/scripts/skp16c26.ld * boards/renesas/m32262f8/skp16c26/scripts/skp16c26.ld
* *
* Copyright (C) 2009, 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2009, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/renesas/skp16c26/src/Makefile # boards/renesas/m32262f8/skp16c26/src/Makefile
# #
# Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. # Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/renesas/skp16c26/src/m16c_buttons.c * boards/renesas/m32262f8/skp16c26/src/m16c_buttons.c
* *
* Copyright (C) 2009, 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2009, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/renesas/scp16c26/src/m16c_lcd.c * boards/renesas/m32262f8/scp16c26/src/m16c_lcd.c
* *
* Copyright (C) 2009 Gregory Nutt. All rights reserved. * Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -31,11 +31,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -49,16 +49,16 @@
#ifdef CONFIG_SLCD #ifdef CONFIG_SLCD
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/* LCD dimensions *******************************************************************/ /* LCD dimensions ***********************************************************/
#define LCD_NLINES 2 /* Two lines */ #define LCD_NLINES 2 /* Two lines */
#define LCD_NCHARS 8 /* Eight characters per line */ #define LCD_NCHARS 8 /* Eight characters per line */
/* LCD commands *********************************************************************/ /* LCD commands *************************************************************/
#define LCD_CLEAR 0x01 /* Clear LCD display and home cursor */ #define LCD_CLEAR 0x01 /* Clear LCD display and home cursor */
#define CURSOR_MODE_DEC 0x04 /* Cursor auto decrement after R/W */ #define CURSOR_MODE_DEC 0x04 /* Cursor auto decrement after R/W */
@ -75,20 +75,20 @@
#define LCD_HOME_L1 0x80 /* Move cursor to line 1 */ #define LCD_HOME_L1 0x80 /* Move cursor to line 1 */
#define LCD_HOME_L2 0xc0 /* Move cursor to line 2 */ #define LCD_HOME_L2 0xc0 /* Move cursor to line 2 */
/************************************************************************************ /****************************************************************************
* Private Data * Private Data
************************************************************************************/ ****************************************************************************/
static uint8_t g_nchars; /* Number of characters in lines 2 */ static uint8_t g_nchars; /* Number of characters in lines 2 */
static uint8_t g_line[LCD_NCHARS]; /* The content of lines 2 */ static uint8_t g_line[LCD_NCHARS]; /* The content of lines 2 */
/************************************************************************************ /****************************************************************************
* Private Functions * Private Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: up_lcddelay * Name: up_lcddelay
************************************************************************************/ ****************************************************************************/
static void up_lcddelay(uint16_t count) static void up_lcddelay(uint16_t count)
{ {
@ -99,9 +99,9 @@ static void up_lcddelay(uint16_t count)
} }
} }
/************************************************************************************ /****************************************************************************
* Name: up_setrs * Name: up_setrs
************************************************************************************/ ****************************************************************************/
static inline void up_setrs(bool data) static inline void up_setrs(bool data)
{ {
@ -120,9 +120,9 @@ static inline void up_setrs(bool data)
putreg8(regval, M16C_P6); putreg8(regval, M16C_P6);
} }
/************************************************************************************ /****************************************************************************
* Name: up_seten * Name: up_seten
************************************************************************************/ ****************************************************************************/
static inline void up_seten(void) static inline void up_seten(void)
{ {
@ -133,9 +133,9 @@ static inline void up_seten(void)
putreg8(regval, M16C_P6); putreg8(regval, M16C_P6);
} }
/************************************************************************************ /****************************************************************************
* Name: up_clren * Name: up_clren
************************************************************************************/ ****************************************************************************/
static inline void up_clren(void) static inline void up_clren(void)
{ {
@ -146,9 +146,9 @@ static inline void up_clren(void)
putreg8(regval, M16C_P6); putreg8(regval, M16C_P6);
} }
/************************************************************************************ /****************************************************************************
* Name: up_enpluse * Name: up_enpluse
************************************************************************************/ ****************************************************************************/
static inline void up_enpulse(bool data) static inline void up_enpulse(bool data)
{ {
@ -159,16 +159,16 @@ static inline void up_enpulse(bool data)
if (!data) up_lcddelay(0); /* Longer delay for control writes */ if (!data) up_lcddelay(0); /* Longer delay for control writes */
} }
/************************************************************************************ /****************************************************************************
* Name: up_lcdwrite * Name: up_lcdwrite
************************************************************************************/ ****************************************************************************/
void up_lcdwrite(bool data, uint8_t ch) void up_lcdwrite(bool data, uint8_t ch)
{ {
up_setrs(data); /* Set RS appropriately */ up_setrs(data); /* Set RS appropriately */
/* Write upper nibble first. Only the lower 4 bits of P9 are valid. The upper four /* Write upper nibble first. Only the lower 4 bits of P9 are valid.
* bits are reserved and must be zero. * The upper four bits are reserved and must be zero.
*/ */
putreg8(ch >> 4, M16C_P9); putreg8(ch >> 4, M16C_P9);
@ -180,9 +180,9 @@ void up_lcdwrite(bool data, uint8_t ch)
up_enpulse(data); up_enpulse(data);
} }
/************************************************************************************ /****************************************************************************
* Name: up_scroll * Name: up_scroll
************************************************************************************/ ****************************************************************************/
static void up_scroll(void) static void up_scroll(void)
{ {
@ -206,13 +206,13 @@ static void up_scroll(void)
g_nchars = 0; g_nchars = 0;
} }
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: up_lcdinit * Name: up_lcdinit
************************************************************************************/ ****************************************************************************/
void up_lcdinit(void) void up_lcdinit(void)
{ {
@ -255,9 +255,9 @@ void up_lcdinit(void)
up_lcdwrite(false, LCD_HOME_L1); up_lcdwrite(false, LCD_HOME_L1);
} }
/************************************************************************************ /****************************************************************************
* Name: up_lcdputc * Name: up_lcdputc
************************************************************************************/ ****************************************************************************/
void up_lcdputc(char ch) void up_lcdputc(char ch)
{ {
@ -268,8 +268,8 @@ void up_lcdputc(char ch)
up_scroll(); up_scroll();
} }
/* Should we wrap to truncate at the end of line??? Let's truncate. In either /* Should we wrap to truncate at the end of line??? Let's truncate.
* case, let's ignore all other non-printable characters. * In either case, let's ignore all other non-printable characters.
*/ */
else if (g_nchars < LCD_NCHARS && isprint(ch)) else if (g_nchars < LCD_NCHARS && isprint(ch))

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/renesas/scp16c26/src/m16c_lcdconsole.c * boards/renesas/m32262f8/scp16c26/src/m16c_lcdconsole.c
* *
* Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -31,11 +31,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -59,31 +59,31 @@
#if !defined(HAVE_SERIALCONSOLE) && defined(CONFIG_SLCD) && \ #if !defined(HAVE_SERIALCONSOLE) && defined(CONFIG_SLCD) && \
defined(CONFIG_SLCD_CONSOLE) defined(CONFIG_SLCD_CONSOLE)
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Private Data * Private Data
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Private Functions * Private Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: up_earlyconsoleinit * Name: up_earlyconsoleinit
* *
* Description: * Description:
* Performs the low level UART initialization early in debug so that the serial * Performs the low level UART initialization early in debug so that the
* console will be available during bootup. This must be called before * serial console will be available during bootup.
* up_consoleinit. * This must be called before up_consoleinit.
* *
************************************************************************************/ ****************************************************************************/
#ifdef USE_EARLYSERIALINIT #ifdef USE_EARLYSERIALINIT
# warning "You probably need to define CONFIG_ARCH_LOWCONSOLE" # warning "You probably need to define CONFIG_ARCH_LOWCONSOLE"
@ -93,14 +93,14 @@ void up_earlyconsoleinit(void)
} }
#endif #endif
/************************************************************************************ /****************************************************************************
* Name: up_consoleinit * Name: up_consoleinit
* *
* Description: * Description:
* Register serial console and serial ports. This assumes that * Register serial console and serial ports. This assumes that
* up_earlyconsoleinit was called previously. * up_earlyconsoleinit was called previously.
* *
************************************************************************************/ ****************************************************************************/
#if USE_SERIALDRIVER #if USE_SERIALDRIVER
# warning "You probably need to define CONFIG_ARCH_LOWCONSOLE" # warning "You probably need to define CONFIG_ARCH_LOWCONSOLE"
@ -108,30 +108,30 @@ void up_consoleinit(void)
{ {
/* There is probably a problem if we are here */ /* There is probably a problem if we are here */
lowconsole_init(); lowconsole_init();
} }
#endif #endif
/************************************************************************************ /****************************************************************************
* Name: up_lowputc * Name: up_lowputc
* *
* Description: * Description:
* Output one character on the console * Output one character on the console
* *
************************************************************************************/ ****************************************************************************/
void up_lowputc(char ch) void up_lowputc(char ch)
{ {
up_lcdputc(ch); up_lcdputc(ch);
} }
/************************************************************************************ /****************************************************************************
* Name: up_putc * Name: up_putc
* *
* Description: * Description:
* Output one character on the console * Output one character on the console
* *
************************************************************************************/ ****************************************************************************/
int up_putc(int ch) int up_putc(int ch)
{ {

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/renesas/scp16c26/src/m16c_leds.c * boards/renesas/m32262f8/scp16c26/src/m16c_leds.c
* *
* Copyright (C) 2009, 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2009, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -31,11 +31,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -50,11 +50,13 @@
#ifdef CONFIG_ARCH_LEDS #ifdef CONFIG_ARCH_LEDS
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/* The SKP62C26 has 3 LEDs control by bits 0 and 2 in port 7 and bit 0 in port 8. */ /* The SKP62C26 has 3 LEDs control by bits
* 0 and 2 in port 7 and bit 0 in port 8.
*/
#define GREEN_LED (1 << 2) /* Bit 2, port 7 */ #define GREEN_LED (1 << 2) /* Bit 2, port 7 */
#define YELLOW_LED (1 << 4) /* Bit 4, port 7 */ #define YELLOW_LED (1 << 4) /* Bit 4, port 7 */
@ -80,13 +82,13 @@
#define RED_LED_PORT M16C_P8 #define RED_LED_PORT M16C_P8
#define RED_DIR_PORT M16C_PD8 #define RED_DIR_PORT M16C_PD8
/************************************************************************************ /****************************************************************************
* Private Types * Private Types
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Private Data * Private Data
************************************************************************************/ ****************************************************************************/
static const uint8_t g_ledstate[7] = static const uint8_t g_ledstate[7] =
{ {
@ -103,13 +105,13 @@ static const uint8_t g_ledstate[7] =
static uint8_t g_prevled[3]; static uint8_t g_prevled[3];
static uint8_t g_nestlevel; static uint8_t g_nestlevel;
/************************************************************************************ /****************************************************************************
* Private Functions * Private Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: m16c_setleds * Name: m16c_setleds
************************************************************************************/ ****************************************************************************/
static void m16c_setleds(uint8_t gybits, uint8_t rbit) static void m16c_setleds(uint8_t gybits, uint8_t rbit)
{ {
@ -126,13 +128,13 @@ static void m16c_setleds(uint8_t gybits, uint8_t rbit)
putreg8(regval, RED_LED_PORT); putreg8(regval, RED_LED_PORT);
} }
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: board_autoled_initialize * Name: board_autoled_initialize
************************************************************************************/ ****************************************************************************/
void board_autoled_initialize(void) void board_autoled_initialize(void)
{ {
@ -141,7 +143,7 @@ void board_autoled_initialize(void)
/* Make sure that the LEDs are in the OFF state */ /* Make sure that the LEDs are in the OFF state */
regval = getreg8(GREENYELLOW_LED_PORT); regval = getreg8(GREENYELLOW_LED_PORT);
regval |= (GREEN_LED_OFF |YELLOW_LED_OFF); regval |= (GREEN_LED_OFF | YELLOW_LED_OFF);
putreg8(regval, GREENYELLOW_LED_PORT); putreg8(regval, GREENYELLOW_LED_PORT);
regval = getreg8(RED_LED_PORT); regval = getreg8(RED_LED_PORT);
@ -151,7 +153,7 @@ void board_autoled_initialize(void)
/* Set the direction to output */ /* Set the direction to output */
regval = getreg8(GREENYELLOW_DIR_PORT); regval = getreg8(GREENYELLOW_DIR_PORT);
regval |= (GREEN_LED |YELLOW_LED); regval |= (GREEN_LED | YELLOW_LED);
putreg8(regval, GREENYELLOW_DIR_PORT); putreg8(regval, GREENYELLOW_DIR_PORT);
regval = getreg8(RED_DIR_PORT); regval = getreg8(RED_DIR_PORT);
@ -159,16 +161,16 @@ void board_autoled_initialize(void)
putreg8(regval, RED_DIR_PORT); putreg8(regval, RED_DIR_PORT);
} }
/************************************************************************************ /****************************************************************************
* Name: board_autoled_on * Name: board_autoled_on
************************************************************************************/ ****************************************************************************/
void board_autoled_on(int led) void board_autoled_on(int led)
{ {
uint8_t ledset; uint8_t ledset;
/* If this is the ASSERTION led, preserve the Y&G bits from the last setting and /* If this is the ASSERTION led, preserve the Y&G bits from the last setting
* set the RED LED on. * and set the RED LED on.
*/ */
if (led == LED_ASSERTION) if (led == LED_ASSERTION)
@ -195,21 +197,24 @@ void board_autoled_on(int led)
} }
} }
/************************************************************************************ /****************************************************************************
* Name: board_autoled_off * Name: board_autoled_off
************************************************************************************/ ****************************************************************************/
void board_autoled_off(int led) void board_autoled_off(int led)
{ {
uint8_t ledset; uint8_t ledset;
/* If this is the ASSERTION led then what we do depends on the previous state */ /* If this is the ASSERTION led then what we do depends on
* the previous state
*/
if (led == LED_ASSERTION) if (led == LED_ASSERTION)
{ {
/* If the previous state was one of the nested states (INIRQ, SIGNAL, or ASSERTION), /* If the previous state was one of the nested states
* then turn the green and yellow LEDs all off. That way we can distinguish * (INIRQ, SIGNAL, or ASSERTION),
* that case from the simple cases. * then turn the green and yellow LEDs all off.
* That way we can distinguish that case from the simple cases.
*/ */
if (g_nestlevel > 0) if (g_nestlevel > 0)
@ -225,7 +230,8 @@ void board_autoled_off(int led)
} }
else if (led > 0 && led < LED_ASSERTION) else if (led > 0 && led < LED_ASSERTION)
{ {
/* If this was one of the nested states, then we want to back to the LED setting /* If this was one of the nested states,
* then we want to back to the LED setting
* before entering that nested statel. * before entering that nested statel.
*/ */
@ -243,7 +249,7 @@ void board_autoled_off(int led)
ledset = g_ledstate[led]; ledset = g_ledstate[led];
m16c_setleds(ledset & GREENYELLOW_LED_MASK, ledset & RED_LED_MASK); m16c_setleds(ledset & GREENYELLOW_LED_MASK, ledset & RED_LED_MASK);
g_prevled[g_nestlevel]= led; g_prevled[g_nestlevel] = led;
} }
} }

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/renesas/skp16c26/src/scp16c26.h * boards/renesas/m32262f8/skp16c26/src/scp16c26.h
* *
* Copyright (C) 2009 Gregory Nutt. All rights reserved. * Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -31,33 +31,33 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
#ifndef __BOARDS_RENESAS_SKP16C26_SRC_SKP16C26_H #ifndef __BOARDS_RENESAS_M32262F8_SKP16C26_SRC_SKP16C26_H
#define __BOARDS_RENESAS_SKP16C26_SRC_SKP16C26_H #define __BOARDS_RENESAS_M32262F8_SKP16C26_SRC_SKP16C26_H
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Inline Functions * Inline Functions
************************************************************************************/ ****************************************************************************/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#endif #endif
/************************************************************************************ /****************************************************************************
* Public Function Prototypes * Public Function Prototypes
************************************************************************************/ ****************************************************************************/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#endif #endif
#endif /* __BOARDS_RENESAS_SKP16C26_SRC_SKP16C26_H */ #endif /* __BOARDS_RENESAS_M32262F8_SKP16C26_SRC_SKP16C26_H */

View File

@ -114,7 +114,7 @@ Architecture selection
implemented in. implemented in.
CONFIG_ARCH_BOARD - identifies the boards/ subdirectory and, hence, CONFIG_ARCH_BOARD - identifies the boards/ subdirectory and, hence,
the board that supports the particular chip or SoC. This the board that supports the particular chip or SoC. This
should be us7032evb1 for (boards/us7032evb1). should be us7032evb1 for (boards/renesas/sh7032/us7032evb1).
CONFIG_ARCH_BOARD_US7032EVB1 - for use in C code CONFIG_ARCH_BOARD_US7032EVB1 - for use in C code
CONFIG_ENDIAN_BIG - the SH-1 usually runs big-endian CONFIG_ENDIAN_BIG - the SH-1 usually runs big-endian
CONFIG_ARCH_NOINTC - define if the architecture does not CONFIG_ARCH_NOINTC - define if the architecture does not

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/renesas/us7032evb1/include/board.h * boards/renesas/sh7032/us7032evb1/include/board.h
* *
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
* *
****************************************************************************/ ****************************************************************************/
#ifndef _CONFIGS_US7032EVB1_BOARD_H #ifndef __BOARDS_RENESAS_SH7032_US7032EVB1_BOARD_H
#define _CONFIGS_US7032EVB1_BOARD_H #define __BOARDS_RENESAS_SH7032_US7032EVB1_BOARD_H
/**************************************************************************** /****************************************************************************
* Included Files * Included Files
@ -77,7 +77,8 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#ifdef __cplusplus #ifdef __cplusplus
#define EXTERN extern "C" #define EXTERN extern "C"
extern "C" { extern "C"
{
#else #else
#define EXTERN extern #define EXTERN extern
#endif #endif
@ -92,4 +93,4 @@ extern "C" {
#endif #endif
#endif #endif
#endif /* _CONFIGS_US7032EVB1_BOARD_H */ #endif /* __BOARDS_RENESAS_SH7032_US7032EVB1_BOARD_H */

View File

@ -1,5 +1,5 @@
############################################################################## ##############################################################################
# boards/renesas/us7032evb1/scripts/Make.defs # boards/renesas/sh7032/us7032evb1/scripts/Make.defs
# #
# Copyright (C) 2008, 2017 Gregory Nutt. All rights reserved. # Copyright (C) 2008, 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/renesas/us7032evb1/nsh/ld.script * boards/renesas/sh7032/us7032evb1/nsh/ld.script
* *
* Copyright (C) 2008 Gregory Nutt. All rights reserved. * Copyright (C) 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/renesas/us7032evb1/shterm/Makefile # boards/renesas/sh7032/us7032evb1/shterm/Makefile
# #
# Copyright (C) 2008 Gregory Nutt. All rights reserved. # Copyright (C) 2008 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/renesas/us7032evb1/shterm/shterm.c * boards/renesas/sh7032/us7032evb1/shterm/shterm.c
* *
* Copyright(C) 2008-2009 Gregory Nutt. All rights reserved. * Copyright(C) 2008-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/ enesas/us7032evb1/src/Makefile # boards/renesas/sh7032/us7032evb1/src/Makefile
# #
# Copyright (C) 2008, 2012 Gregory Nutt. All rights reserved. # Copyright (C) 2008, 2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/ enesas/us7032evb1/src/sh1_leds.c * boards/renesas/sh7032/us7032evb1/src/sh1_leds.c
* *
* Copyright (C) 2008-2009, 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2008-2009, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/risc-v/gapuino/include/board.h * boards/risc-v/gap8/gapuino/include/board.h
* *
* Copyright (C) 2018 Gregory Nutt. All rights reserved. * Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: hhuysqt <1020988872@qq.com> * Author: hhuysqt <1020988872@qq.com>
@ -31,14 +31,14 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
#ifndef __BOARDS_RISC-V_GAPUINO_INCLUDE_BOARD_H #ifndef __BOARDS_RISC-V_GAP8_GAPUINO_INCLUDE_BOARD_H
#define __BOARDS_RISC-V_GAPUINO_INCLUDE_BOARD_H #define __BOARDS_RISC-V_GAP8_GAPUINO_INCLUDE_BOARD_H
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -46,13 +46,13 @@
# include <stdint.h> # include <stdint.h>
#endif #endif
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Public Data * Public Data
************************************************************************************/ ****************************************************************************/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
@ -65,13 +65,13 @@ extern "C"
#define EXTERN extern #define EXTERN extern
#endif #endif
/************************************************************************************ /****************************************************************************
* Public Function Prototypes * Public Function Prototypes
************************************************************************************/ ****************************************************************************/
#undef EXTERN #undef EXTERN
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __BOARDS_RISC-V_NR5M100_NEXYS4_INCLUDE_BOARD_H */ #endif /* __BOARDS_RISC-V_GAP8_GAPUINO_INCLUDE_BOARD_H */

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/risc-v/gapuino/scripts/Make.defs # boards/risc-v/gap8/gapuino/scripts/Make.defs
# #
# Copyright (C) 2018 Gregory Nutt. All rights reserved. # Copyright (C) 2018 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/risc-v/gapduino/scripts/ld.script * boards/risc-v/gap8/gapduino/scripts/ld.script
* *
* Copyright (C) 2018 Gregory Nutt. All rights reserved. * Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: hhuysqt <1020988872@qq.com> * Author: hhuysqt <1020988872@qq.com>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/risc-v/gapduino/src/gapduino_appinit.c * boards/risc-v/gap8/gapduino/src/gapduino_appinit.c
* *
* Copyright (C) 2018 Gregory Nutt. All rights reserved. * Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: hhuysqt <1020988872@qq.com> * Author: hhuysqt <1020988872@qq.com>

View File

@ -1,3 +1,38 @@
/****************************************************************************
* boards/risc-v/gap8/gapduino/src/gapduino_sysinit.c
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: hhuysqt <1020988872@qq.com>
*
* 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.
*
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Included Files * Included Files
****************************************************************************/ ****************************************************************************/
@ -79,7 +114,7 @@ uint32_t g_current_freq = 0;
void gapuino_sysinit(void) void gapuino_sysinit(void)
{ {
SCBC->ICACHE_ENABLE = 0xFFFFFFFF; SCBC->ICACHE_ENABLE = 0xffffffff;
gap8_setfreq(CONFIG_CORE_CLOCK_FREQ); gap8_setfreq(CONFIG_CORE_CLOCK_FREQ);
/* For debug usage */ /* For debug usage */

View File

@ -148,7 +148,7 @@ Debugger
./configure --enable-jlink --enable-maintainer-mode --enable-ftdi --prefix=~/riscv CFLAGS=-g ./configure --enable-jlink --enable-maintainer-mode --enable-ftdi --prefix=~/riscv CFLAGS=-g
The configuration scripts for openocd and nr5m100-nexys4 have been provided in the The configuration scripts for openocd and nr5m100-nexys4 have been provided in the
nuttx/boards/nr5m100-nexys4/scripts directory. They are configured to use a J-LINK JTAG nuttx/boards/nr5m100/nr5m100-nexys4/scripts directory. They are configured to use a J-LINK JTAG
probe and to search for the IQ-Analog (the company I work for) IDCODE and part number for probe and to search for the IQ-Analog (the company I work for) IDCODE and part number for
the FPGA board (7a10 for Artix xc7a100 part on the Digilent Nexys4 board). With FPGA the FPGA board (7a10 for Artix xc7a100 part on the Digilent Nexys4 board). With FPGA
source directly from the nr5m100 github site (to be provided), this ID will match the source directly from the nr5m100 github site (to be provided), this ID will match the

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/risc-v/nr5m100-nexys4/include/board.h * boards/risc-v/nr5m100/nr5m100-nexys4/include/board.h
* include/arch/board/board.h * include/arch/board/board.h
* *
* Copyright (C) 2012-2013, 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2012-2013, 2016 Gregory Nutt. All rights reserved.
@ -37,14 +37,14 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
#ifndef __BOARDS_RISC-V_NR5M100_NEXYS4_INCLUDE_BOARD_H #ifndef __BOARDS_RISC-V_NR5M100_NR5M100_NEXYS4_INCLUDE_BOARD_H
#define __BOARDS_RISC-V_NR5M100_NEXYS4_INCLUDE_BOARD_H #define __BOARDS_RISC-V_NR5M100_NR5M100_NEXYS4_INCLUDE_BOARD_H
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -54,24 +54,26 @@
#include "nr5.h" #include "nr5.h"
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/* Clocking *****************************************************************/
/* Clocking *************************************************************************/
/* The NR5M100_Nexys4 system uses a 100 MHz main oscillator */ /* The NR5M100_Nexys4 system uses a 100 MHz main oscillator */
#define NR5_HCLK_FREQUENCY 100000000ul #define NR5_HCLK_FREQUENCY 100000000ul
#define NR5_SCLK_FREQUENCY 100000000ul #define NR5_SCLK_FREQUENCY 100000000ul
/* Timer Frequencies are the same as the HCLK frequency /* Timer Frequencies are the same as the HCLK frequency */
*/
#define NR5_TIMER_FREQUENCY NR5_HCLK_FREQUENCY #define NR5_TIMER_FREQUENCY NR5_HCLK_FREQUENCY
/* LED definitions ******************************************************************/ /* LED definitions **********************************************************/
/* If CONFIG_ARCH_LEDS is not defined, then the user can control the LEDs in any
* way. The following definitions are used to access individual LEDs. /* If CONFIG_ARCH_LEDS is not defined, then the user can control
* the LEDs in any way.
* The following definitions are used to access individual LEDs.
*/ */
/* LED index values for use with stm32_setled() */ /* LED index values for use with stm32_setled() */
@ -97,8 +99,9 @@
#define BOARD_LED3_BIT (1 << BOARD_LED3) #define BOARD_LED3_BIT (1 << BOARD_LED3)
#define BOARD_LED4_BIT (1 << BOARD_LED4) #define BOARD_LED4_BIT (1 << BOARD_LED4)
/* If CONFIG_ARCH_LEDs is defined, then NuttX will control the 4 LEDs on board the /* If CONFIG_ARCH_LEDs is defined, then NuttX will control the 4 LEDs
* stm32f4discovery. The following definitions describe how NuttX controls the LEDs: * on the board.
* The following definitions describe how NuttX controls the LEDs:
*/ */
#define LED_STARTED 0 /* LED1 */ #define LED_STARTED 0 /* LED1 */
@ -110,8 +113,7 @@
#define LED_ASSERTION 6 /* LED1 + LED2 + LED3 */ #define LED_ASSERTION 6 /* LED1 + LED2 + LED3 */
#define LED_PANIC 7 /* N/C + N/C + N/C + LED4 */ #define LED_PANIC 7 /* N/C + N/C + N/C + LED4 */
/* Button definitions ***************************************************************/ /* Button definitions *******************************************************/
/* The STM32F4 Discovery supports one button: */
#define BUTTON_USER 0 #define BUTTON_USER 0
@ -121,9 +123,9 @@
#endif /* 0 */ #endif /* 0 */
/************************************************************************************ /****************************************************************************
* Public Data * Public Data
************************************************************************************/ ****************************************************************************/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
@ -136,19 +138,21 @@ extern "C"
#define EXTERN extern #define EXTERN extern
#endif #endif
/************************************************************************************ /****************************************************************************
* Public Function Prototypes * Public Function Prototypes
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: nr5_ledinit, nr5_setled, and nr5_setleds * Name: nr5_ledinit, nr5_setled, and nr5_setleds
* *
* Description: * Description:
* If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If * If CONFIG_ARCH_LEDS is defined,
* CONFIG_ARCH_LEDS is not defined, then the following interfacesare available to * then NuttX will control the on-board LEDs.
* If CONFIG_ARCH_LEDS is not defined,
* then the following interfacesare available to
* control the LEDs from user applications. * control the LEDs from user applications.
* *
************************************************************************************/ ****************************************************************************/
#ifndef CONFIG_ARCH_LEDS #ifndef CONFIG_ARCH_LEDS
void nr5_ledinit(void); void nr5_ledinit(void);
@ -161,5 +165,5 @@ void nr5_setleds(uint8_t ledset);
} }
#endif #endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __BOARDS_RISC-V_NR5M100_NEXYS4_INCLUDE_BOARD_H */ #endif /* __BOARDS_RISC-V_NR5M100_NR5M100_NEXYS4_INCLUDE_BOARD_H */

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/risc-v/stm32f4discovery/nsh/Make.defs # boards/risc-v/nr5m100/nr5m100-nexys4/scripts/Make.defs
# #
# Copyright (C) 2011-2013 Gregory Nutt. All rights reserved. # Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/risc-v/nr5m100-nexys4/scripts/ld.script * boards/risc-v/nr5m100/nr5m100-nexys4/scripts/ld.script
* *
* Copyright (C) 2011-2013 Gregory Nutt. All rights reserved. * Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
* Copyright (C) 2016 Ken Pettit. * Copyright (C) 2016 Ken Pettit.

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/risc-v/nr5m100-nexys4/scripts/nr5m1xx.cfg # boards/risc-v/nr5m100/nr5m100-nexys4/scripts/nr5m1xx.cfg
# #
# Copyright (C) 2016 Ken Pettit. All rights reserved. # Copyright (C) 2016 Ken Pettit. All rights reserved.
# Author: Ken Pettit <pettitkd@gmail.com> # Author: Ken Pettit <pettitkd@gmail.com>

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/risc-v/nr5m100-nexys4/scripts/openocd.cfg # boards/risc-v/nr5m100/nr5m100-nexys4/scripts/openocd.cfg
# #
# Copyright (C) 2016 Ken Pettit. All rights reserved. # Copyright (C) 2016 Ken Pettit. All rights reserved.
# Author: Ken Pettit <pettitkd@gmail.com> # Author: Ken Pettit <pettitkd@gmail.com>

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/nr5m100-nexys4/src/Makefile # boards/risc-v/nr5m100/nr5m100-nexys4/src/Makefile
# #
# Copyright (C) 2016 Ken Pettit. All rights reserved. # Copyright (C) 2016 Ken Pettit. All rights reserved.
# Author: Ken Pettit <pettitkd@gmail.com> # Author: Ken Pettit <pettitkd@gmail.com>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/risc-v//nr5m100-nexys4/src/nr5_appinit.c * boards/risc-v/nr5m100/nr5m100-nexys4/src/nr5_appinit.c
* *
* Copyright (C) 2012-2013, 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2012-2013, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -81,6 +81,5 @@
int board_app_initialize(uintptr_t arg) int board_app_initialize(uintptr_t arg)
{ {
return OK; return OK;
} }

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/risc-v/nr5m100_nexys4/src/nr5_autoleds.c * boards/risc-v/nr5m100/nr5m100_nexys4/src/nr5_autoleds.c
* *
* Copyright (C) 2016 Ken Pettit. All rights reserved. * Copyright (C) 2016 Ken Pettit. All rights reserved.
* Author: Ken Pettit <pettitkd@gmail.com> * Author: Ken Pettit <pettitkd@gmail.com>
@ -31,11 +31,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -43,29 +43,29 @@
#include <arch/board/board.h> #include <arch/board/board.h>
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Private Functions * Private Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: board_autoled_on * Name: board_autoled_on
* *
* Description: * Description:
* All NR5 architectures must provide the following entry point. This entry point * All NR5 architectures must provide the following entry point.
* is called early in the intitialization -- after all memory has been configured * This entry point is called early in the intitialization -- after all
* and mapped but before any devices have been initialized. * memory has been configured and mapped but before any devices have been
* initialized.
* *
************************************************************************************/ ****************************************************************************/
void board_autoled_on(int led) void board_autoled_on(int led)
{ {
} }

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/risc-v/nr5m100_nexys4/src/nr5_boot.c * boards/risc-v/nr5m100/nr5m100_nexys4/src/nr5_boot.c
* *
* Copyright (C) 2016 Ken Pettit. All rights reserved. * Copyright (C) 2016 Ken Pettit. All rights reserved.
* Author: Ken Pettit <pettitkd@gmail.com> * Author: Ken Pettit <pettitkd@gmail.com>
@ -31,11 +31,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -43,27 +43,28 @@
#include <arch/board/board.h> #include <arch/board/board.h>
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Private Functions * Private Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: nr5_boardinitialize * Name: nr5_boardinitialize
* *
* Description: * Description:
* All NR5 architectures must provide the following entry point. This entry point * All NR5 architectures must provide the following entry point.
* is called early in the intitialization -- after all memory has been configured * This entry point is called early in the intitialization -- after all
* and mapped but before any devices have been initialized. * memory has been configured and mapped but before any devices have been
* initialized.
* *
************************************************************************************/ ****************************************************************************/
void nr5_boardinitialize(void) void nr5_boardinitialize(void)
{ {

View File

@ -1,3 +1,3 @@
/**************************************************************************** /****************************************************************************
* boards/sim/sim/include/board.h * boards/sim/sim/sim/include/board.h
****************************************************************************/ ****************************************************************************/

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/sim/scripts/Make.defs # boards/sim/sim/sim/scripts/Make.defs
# #
# Copyright (C) 2008, 2011-2012, 2017-2018 Gregory Nutt. All rights # Copyright (C) 2008, 2011-2012, 2017-2018 Gregory Nutt. All rights
# reserved. # reserved.

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/sim/sim/scripts/gnu-elf.ld * boards/sim/sim/sim/scripts/gnu-elf.ld
* *
* Copyright (C) 2014 Gregory Nutt. All rights reserved. * Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/sim/src/Makefile # boards/sim/sim/sim/src/Makefile
# #
# Copyright (C) 2007, 2008, 2011-2012, 2015 Gregory Nutt. All rights reserved. # Copyright (C) 2007, 2008, 2011-2012, 2015 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* config/sim/src/sim.h * boards/sim/sim/sim/src/sim.h
* *
* Copyright (C) 2015-2016, 2018 Gregory Nutt. All rights reserved. * Copyright (C) 2015-2016, 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
* *
****************************************************************************/ ****************************************************************************/
#ifndef __BOARDS_SIM_SIM_SRC_SIM_H #ifndef __BOARDS_SIM_SIM_SIM_SRC_SIM_H
#define __BOARDS_SIM_SIM_SRC_SIM_H #define __BOARDS_SIM_SIM_SIM_SRC_SIM_H
/**************************************************************************** /****************************************************************************
* Included Files * Included Files
@ -45,6 +45,7 @@
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* procfs File System */ /* procfs File System */
#ifdef CONFIG_FS_PROCFS #ifdef CONFIG_FS_PROCFS
@ -84,9 +85,9 @@ int sim_bringup(void);
* - It will then, optionally, build a ROMFS filesystem image containing * - It will then, optionally, build a ROMFS filesystem image containing
* the data base. * the data base.
* *
* The ROMFS filesystem image can that be mounted during the boot-up sequence * The ROMFS filesystem image can that be mounted during the boot-up
* so that it is available for the localtime logic. There are two steps to * sequence so that it is available for the localtime logic.
* doing this: * There are two steps todoing this:
* *
* - First, a ROM disk device must be created. This is done by calling * - First, a ROM disk device must be created. This is done by calling
* the function romdisk_register() as described in * the function romdisk_register() as described in
@ -144,4 +145,4 @@ int sim_gpio_initialize(void);
int sim_tsc_setup(int minor); int sim_tsc_setup(int minor);
#endif #endif
#endif /* __BOARDS_SIM_SIM_SRC_SIM_H */ #endif /* __BOARDS_SIM_SIM_SIM_SRC_SIM_H */

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/sim/sim/src/sim_appinit.c * boards/sim/sim/sim/src/sim_appinit.c
* *
* Copyright (C) 2015-2016 Gregory Nutt. All rights reserved. * Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* config/sim/src/sim_boot.c * boards/sim/sim/sim/src/sim_boot.c
* *
* Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/sim/sim/src/sam_bringup.c * boards/sim/sim/sim/src/sam_bringup.c
* *
* Copyright (C) 2015, 2018 Gregory Nutt. All rights reserved. * Copyright (C) 2015, 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/sim/sim/src/sim_gpio.c * boards/sim/sim/sim/src/sim_gpio.c
* *
* Copyright (C) 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -160,7 +160,8 @@ static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value)
FAR struct simgpio_dev_s *simgpio = (FAR struct simgpio_dev_s *)dev; FAR struct simgpio_dev_s *simgpio = (FAR struct simgpio_dev_s *)dev;
DEBUGASSERT(simgpio != NULL && value != NULL); DEBUGASSERT(simgpio != NULL && value != NULL);
gpioinfo("Reading %d (next=%d)\n", (int)simgpio->value, (int)!simgpio->value); gpioinfo("Reading %d (next=%d)\n",
(int)simgpio->value, (int)!simgpio->value);
*value = simgpio->value; *value = simgpio->value;
simgpio->value = !simgpio->value; simgpio->value = !simgpio->value;

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/sim/sim/src/sim_ioexpander.c * boards/sim/sim/sim/src/sim_ioexpander.c
* *
* Copyright (C) 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* config/sim/src/sim_touchscreen.c * boards/sim/sim/sim/src/sim_touchscreen.c
* *
* Copyright (C) 2011, 2016-2018 Gregory Nutt. All rights reserved. * Copyright (C) 2011, 2016-2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -64,7 +64,9 @@
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Configuration ************************************************************/ /* Configuration ************************************************************/
/* Pick a background color */ /* Pick a background color */
#ifndef CONFIG_EXAMPLES_TOUCHSCREEN_BGCOLOR #ifndef CONFIG_EXAMPLES_TOUCHSCREEN_BGCOLOR
@ -107,7 +109,7 @@ static FAR void *sim_listener(FAR void *arg)
/* Process events forever */ /* Process events forever */
for (;;) for (; ; )
{ {
/* Handle the next event. If we were configured blocking, then /* Handle the next event. If we were configured blocking, then
* we will stay right here until the next event is received. Since * we will stay right here until the next event is received. Since
@ -206,33 +208,33 @@ int sim_tsc_setup(int minor)
return ret; return ret;
} }
#endif #endif
/* Start a separate thread to listen for server events. This is probably /* Start a separate thread to listen for server events.
* the least efficient way to do this, but it makes this example flow more * This is probably the least efficient way to do this,
* smoothly. * but it makes this example flow more smoothly.
*/ */
(void)pthread_attr_init(&attr); (void)pthread_attr_init(&attr);
param.sched_priority = CONFIG_SIM_LISTENERPRIO; param.sched_priority = CONFIG_SIM_LISTENERPRIO;
(void)pthread_attr_setschedparam(&attr, &param); (void)pthread_attr_setschedparam(&attr, &param);
(void)pthread_attr_setstacksize(&attr, CONFIG_SIM_LISTENER_STACKSIZE); (void)pthread_attr_setstacksize(&attr, CONFIG_SIM_LISTENER_STACKSIZE);
ret = pthread_create(&thread, &attr, sim_listener, NULL); ret = pthread_create(&thread, &attr, sim_listener, NULL);
if (ret != 0) if (ret != 0)
{ {
gerr("ERROR: pthread_create failed: %d\n", ret); gerr("ERROR: pthread_create failed: %d\n", ret);
return -ret; return -ret;
} }
/* Don't return until we are connected to the server */ /* Don't return until we are connected to the server */
while (!g_simtc.connected) while (!g_simtc.connected)
{ {
/* Wait for the listener thread to wake us up when we really /* Wait for the listener thread to wake us up when we really
* are connected. * are connected.
*/ */
(void)sem_wait(&g_simtc.eventsem); (void)sem_wait(&g_simtc.eventsem);
} }
} }
else else
{ {

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* config/sim/src/sim_zoneinfo.c * boards/sim/sim/sim/src/sim_zoneinfo.c
* *
* Copyright (C) 2015-2016 Gregory Nutt. All rights reserved. * Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -91,9 +91,9 @@
* - It will then, optionally, build a ROMFS filesystem image containing * - It will then, optionally, build a ROMFS filesystem image containing
* the data base. * the data base.
* *
* The ROMFS filesystem image can that be mounted during the boot-up sequence * The ROMFS filesystem image can that be mounted during the boot-up
* so that it is available for the localtime logic. There are two steps to * sequence so that it is available for the localtime logic.
* doing this: * There are two steps to doing this:
* *
* - First, a ROM disk device must be created. This is done by calling * - First, a ROM disk device must be created. This is done by calling
* the function romdisk_register() as described in * the function romdisk_register() as described in
@ -116,8 +116,8 @@
int sim_zoneinfo(int minor) int sim_zoneinfo(int minor)
{ {
char devname[32]; char devname[32];
int ret; int ret;
/* Create a RAM disk for the test */ /* Create a RAM disk for the test */

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/x86/qemu-i486/include/board.h * boards/x86/qemu/qemu-i486/include/board.h
* include/arch/board/board.h * include/arch/board/board.h
* *
* Copyright (C) 2011 Gregory Nutt. All rights reserved. * Copyright (C) 2011 Gregory Nutt. All rights reserved.
@ -32,42 +32,42 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
#ifndef __BOARDS_X86_QEMU_I486_INCLUDE_BOARD_H #ifndef __BOARDS_X86_QEMU_QEMU_I486_INCLUDE_BOARD_H
#define __BOARDS_X86_QEMU_I486_INCLUDE_BOARD_H #define __BOARDS_X86_QEMU_QEMU_QEMU_I486_INCLUDE_BOARD_H
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/* Clocking *************************************************************************/ /* Clocking *****************************************************************/
/* Programmable interval timer (PIT) */ /* Programmable interval timer (PIT) */
#define PIT_CLOCK 1041816 /* PIT input clock */ #define PIT_CLOCK 1041816 /* PIT input clock */
/* LED definitions ******************************************************************/ /* LED definitions **********************************************************/
/* Button definitions ***************************************************************/ /* Button definitions *******************************************************/
/* Alternate pin selections *********************************************************/ /* Alternate pin selections *************************************************/
/************************************************************************************ /****************************************************************************
* Public Types * Public Types
************************************************************************************/ ****************************************************************************/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/************************************************************************************ /****************************************************************************
* Public Data * Public Data
************************************************************************************/ ****************************************************************************/
#undef EXTERN #undef EXTERN
#if defined(__cplusplus) #if defined(__cplusplus)
@ -78,9 +78,9 @@ extern "C"
#define EXTERN extern #define EXTERN extern
#endif #endif
/************************************************************************************ /****************************************************************************
* Public Function Prototypes * Public Function Prototypes
************************************************************************************/ ****************************************************************************/
#undef EXTERN #undef EXTERN
#if defined(__cplusplus) #if defined(__cplusplus)
@ -88,4 +88,4 @@ extern "C"
#endif #endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __BOARDS_X86_QEMU_I486_INCLUDE_BOARD_H */ #endif /* __BOARDS_X86_QEMU_QEMU_QEMU_I486_INCLUDE_BOARD_H */

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/qemu-i486/scripts/Make.defs # boards/x86/qemu/qemu-i486/scripts/Make.defs
# #
# Copyright (C) 2011, 2014, 2017 Gregory Nutt. All rights reserved. # Copyright (C) 2011, 2014, 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/<EFBFBD>/qemu-i486/scripts/qemu.ld * boards/x86/qemu/qemu-i486/scripts/qemu.ld
* *
* Copyright (C) 2011, 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2011, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/qemu-i486/src/Makefile # boards/x86/qemu/qemu-i486/src/Makefile
# #
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/x86/qemu-i486/src/qemu_boot.c * boards/x86/qemu/qemu-i486/src/qemu_boot.c
* *
* Copyright (C) 2011, 2014-2015 Gregory Nutt. All rights reserved. * Copyright (C) 2011, 2014-2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -31,11 +31,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -50,27 +50,28 @@
#include "qemu.h" #include "qemu.h"
#include "qemu_i486.h" #include "qemu_i486.h"
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Private Functions * Private Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: x86_boardinitialize * Name: x86_boardinitialize
* *
* Description: * Description:
* All x86 architectures must provide the following entry point. This entry point * All x86 architectures must provide the following entry point.
* is called early in the initialization -- after all memory has been configured * This entry point is called early in the initialization -- after all
* and mapped but before any devices have been initialized. * memory has been configured and mapped but before any devices have been
* initialized.
* *
************************************************************************************/ ****************************************************************************/
void x86_boardinitialize(void) void x86_boardinitialize(void)
{ {

View File

@ -1,4 +1,4 @@
/************************************************************************************ /****************************************************************************
* boards/x86/qemu-i486/src/qemu_i486.h * boards/x86/qemu-i486/src/qemu_i486.h
* *
* Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved. * Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved.
@ -31,37 +31,37 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
#ifndef __BOARDS_X86_QEMU_I486_SRC_QEMU_I486_H #ifndef __BOARDS_X86_QEMU_QEMU_I486_SRC_QEMU_I486_H
#define __BOARDS_X86_QEMU_I486_SRC_QEMU_I486_H #define __BOARDS_X86_QEMU_QEMU_I486_SRC_QEMU_I486_H
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/compiler.h> #include <nuttx/compiler.h>
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/* GPIO Pin Definitions *************************************************************/ /* GPIO Pin Definitions *****************************************************/
/************************************************************************************ /****************************************************************************
* Public Types * Public Types
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Public data * Public data
************************************************************************************/ ****************************************************************************/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __BOARDS_X86_QEMU_I486_SRC_QEMU_I486_H */ #endif /* __BOARDS_X86_QEMU_QEMU_I486_SRC_QEMU_I486_H */

View File

@ -277,7 +277,7 @@ OpenOCD for the ESP32
to reflect the physical JTAG adapter connected. to reflect the physical JTAG adapter connected.
NOTE: A copy of this OpenOCD configuration file available in the NuttX NOTE: A copy of this OpenOCD configuration file available in the NuttX
source tree at nuttx/boards/esp32-core/scripts/esp32.cfg . It has these source tree at nuttx/boards/tensa/esp32/esp32-core/scripts/esp32.cfg . It has these
modifications: modifications:
- The referenced "set ESP32_RTOS none" line has been uncommented - The referenced "set ESP32_RTOS none" line has been uncommented
@ -533,7 +533,7 @@ OpenOCD for the ESP32
I did the initial bring-up using the IRAM configuration and OpenOCD. Here I did the initial bring-up using the IRAM configuration and OpenOCD. Here
is a synopsis of my debug steps: is a synopsis of my debug steps:
boards/esp32-core/nsh with boards/xtensa/esp32/esp32-core/configs/nsh with
CONFIG_DEBUG_ASSERTIONS=y CONFIG_DEBUG_ASSERTIONS=y
CONFIG_DEBUG_FEATURES=y CONFIG_DEBUG_FEATURES=y
@ -549,7 +549,7 @@ OpenOCD for the ESP32
Start OpenOCD: Start OpenOCD:
cd ../openocde-esp32 cd ../openocde-esp32
cp ../nuttx/boards/esp32-core/scripts/esp32.cfg . cp ../nuttx/boards/xtensa/esp32/esp32-core/scripts/esp32.cfg .
sudo ./src/openocd -s ./tcl/ -f tcl/interface/ftdi/olimex-arm-usb-ocd.cfg -f ./esp32.cfg sudo ./src/openocd -s ./tcl/ -f tcl/interface/ftdi/olimex-arm-usb-ocd.cfg -f ./esp32.cfg
Start GDB and load code: Start GDB and load code:
@ -648,8 +648,8 @@ NOTES:
to provide that logic -- hopefully that is coming. As a to provide that logic -- hopefully that is coming. As a
consequence, whatever clock setup was left when NuttX started is consequence, whatever clock setup was left when NuttX started is
used. For the case of execution out of IRAM with GDB, the used. For the case of execution out of IRAM with GDB, the
settings in boards/esp32-core/include/board.h work. To check settings in boards/xtensa/esp32/esp32-core/include/board.h work.
the timing, I use a stop watch and: To check the timing, I use a stop watch and:
nsh> sleep 60 nsh> sleep 60

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/xtensa/esp32-core/include/board.h * boards/xtensa/esp32/esp32-core/include/board.h
* *
* Copyright (C) 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,14 +33,15 @@
* *
****************************************************************************/ ****************************************************************************/
#ifndef __BOARDS_XTENSA_ESP32_CORE_INCLUDE_BOARD_H #ifndef __BOARDS_XTENSA_ESP32_ESP32_CORE_INCLUDE_BOARD_H
#define __BOARDS_XTENSA_ESP32_CORE_INCLUDE_BOARD_H #define __BOARDS_XTENSA_ESP32_ESP32_CORE_INCLUDE_BOARD_H
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Clocking ****************************************************************/ /* Clocking ****************************************************************/
/* The ESP32 Core board V2 is fitted with either a 26 a 40MHz crystal */ /* The ESP32 Core board V2 is fitted with either a 26 a 40MHz crystal */
#ifdef CONFIG_ESP32CORE_XTAL_26MHz #ifdef CONFIG_ESP32CORE_XTAL_26MHz
@ -68,4 +69,4 @@
# define BOARD_CLOCK_FREQUENCY BOARD_XTAL_FREQUENCY # define BOARD_CLOCK_FREQUENCY BOARD_XTAL_FREQUENCY
#endif #endif
#endif /* __BOARDS_XTENSA_ESP32_CORE_INCLUDE_BOARD_H */ #endif /* __BOARDS_XTENSA_ESP32_ESP32_CORE_INCLUDE_BOARD_H */

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/esp32-core/scripts/Make.defs # boards/xtensa/esp32/esp32-core/scripts/Make.defs
# #
# Copyright (C) 2016-2017 Gregory Nutt. All rights reserved. # Copyright (C) 2016-2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/xtensa/elf32-core/scripts/esp32.template * boards/xtensa/esp23/esp32-core/scripts/esp32.template
* ESP32 Linker Script Memory Layout * ESP32 Linker Script Memory Layout
* *
* This file describes the memory layout (memory blocks) as virtual * This file describes the memory layout (memory blocks) as virtual

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/xtensa/elf32-core/scripts/esp32_flash.ld * boards/xtensa/esp32/esp32-core/scripts/esp32_flash.ld
****************************************************************************/ ****************************************************************************/
/* Default entry point: */ /* Default entry point: */

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/xtensa/elf32-core/scripts/esp32_iram.ld * boards/xtensa/esp32/esp32-core/scripts/esp32_iram.ld
****************************************************************************/ ****************************************************************************/
/* Default entry point: */ /* Default entry point: */

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/xtensa/elf32-core/scripts/esp32_peripherals.ld * boards/xtensa/esp32/esp32-core/scripts/esp32_peripherals.ld
****************************************************************************/ ****************************************************************************/
PROVIDE ( UART0 = 0x3ff40000 ); PROVIDE ( UART0 = 0x3ff40000 );

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards//srp32-core/Makefile # boards/xtensa/esp32/esp32-core/src/Makefile
# #
# Copyright (C) 2016 Gregory Nutt. All rights reserved. # Copyright (C) 2016 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/xtensa/esp32-core/src/esp32-core.h * boards/xtensa/esp32/esp32-core/src/esp32-core.h
* *
* Copyright (C) 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
* *
****************************************************************************/ ****************************************************************************/
#ifndef __BOARDS_XTENSA_ESP32_CORE_SRC_ESP32_CORE_H #ifndef __BOARDS_XTENSA_ESP32_ESP32_CORE_SRC_ESP32_CORE_H
#define __BOARDS_XTENSA_ESP32_CORE_SRC_ESP32_CORE_H #define __BOARDS_XTENSA_ESP32_ESP32_CORE_SRC_ESP32_CORE_H
/**************************************************************************** /****************************************************************************
* Included Files * Included Files
@ -79,4 +79,4 @@
int esp32_bringup(void); int esp32_bringup(void);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __BOARDS_XTENSA_ESP32_CORE_SRC_ESP32_CORE_H */ #endif /* __BOARDS_XTENSA_ESP32_ESP32_CORE_SRC_ESP32_CORE_H */

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* config/esp32-core/src/esp32_appinit.c * boards/xtensa/esp32/esp32-core/src/esp32_appinit.c
* *
* Copyright (C) 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/************************************************************************************ /****************************************************************************
* boards/xtensa/esp32-core/src/esp32_boot.c * boards/xtensa/esp32/esp32-core/src/esp32_boot.c
* *
* Copyright (C) 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -31,11 +31,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -46,27 +46,28 @@
#include "esp32-core.h" #include "esp32-core.h"
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Private Functions * Private Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: esp32_board_initialize * Name: esp32_board_initialize
* *
* Description: * Description:
* All STM32 architectures must provide the following entry point. This entry point * All STM32 architectures must provide the following entry point.
* is called early in the initialization -- after all memory has been configured * This entry point is called early in the initialization -- after all
* and mapped but before any devices have been initialized. * memory has been configured and mapped but before any devices have been
* initialized.
* *
************************************************************************************/ ****************************************************************************/
void esp32_board_initialize(void) void esp32_board_initialize(void)
{ {

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* config/esp32-core/src/esp32_bringup.c * boards/xtensa/esp32/esp32-core/src/esp32_bringup.c
* *
* Copyright (C) 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -107,7 +107,8 @@ Other Versions
If you use any version of ZDS-II or if you install ZDS-II at any location If you use any version of ZDS-II or if you install ZDS-II at any location
other than the default location, you will have to modify other than the default location, you will have to modify
arch/z16/src/z16f/Kconfig and boards/z16f2800100zcog/scripts/Make.defs. arch/z16/src/z16f/Kconfig and
boards/z16/z16f2811/z16f2800100zcog/scripts/Make.defs.
Simply edit that file, changing 5.0.1 to whatever. Simply edit that file, changing 5.0.1 to whatever.
Patches Patches
@ -130,8 +131,8 @@ attempt to recover the parameters from the stack and a failure then follows.
This bug prevents the use of NSH with the ZNEO. However, a patch has been This bug prevents the use of NSH with the ZNEO. However, a patch has been
developed that works around the problem. That patch can be found at developed that works around the problem. That patch can be found at
boards/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch. In boards/z16/z16f2811/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch.
that directory is also a bash script that will apply that patch for you. In that directory is also a bash script that will apply that patch for you.
The patch would be applied when NuttX is configured as follows: The patch would be applied when NuttX is configured as follows:

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/z16/z16f2800100zcog/board.h * boards/z16/z16f2811/z16f2800100zcog/board.h
* *
* Copyright (C) 2008, 2014 Gregory Nutt. All rights reserved. * Copyright (C) 2008, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
* *
****************************************************************************/ ****************************************************************************/
#ifndef __BOARDS_Z16_Z16F2800100ZCOG_INCLUDE_BOARD_H #ifndef __BOARDS_Z16_Z16F2811_Z16F2800100ZCOG_INCLUDE_BOARD_H
#define __BOARDS_Z16_Z16F2800100ZCOG_INCLUDE_BOARD_H #define __BOARDS_Z16_Z16F2811_Z16F2800100ZCOG_INCLUDE_BOARD_H
/**************************************************************************** /****************************************************************************
* Included Files * Included Files
@ -112,7 +112,8 @@
#undef EXTERN #undef EXTERN
#if defined(__cplusplus) #if defined(__cplusplus)
#define EXTERN extern "C" #define EXTERN extern "C"
extern "C" { extern "C"
{
#else #else
#define EXTERN extern #define EXTERN extern
#endif #endif
@ -122,4 +123,4 @@ extern "C" {
} }
#endif #endif
#endif /* __BOARDS_Z16_Z16F2800100ZCOG_INCLUDE_BOARD_H */ #endif /* __BOARDS_Z16_Z16F2811_Z16F2800100ZCOG_INCLUDE_BOARD_H */

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/z16f2800100zcog/scripts/Make.defs # boards/z16/z16f2811/z16f2800100zcog/scripts/Make.defs
# #
# Copyright (C) 2014, 2017 Gregory Nutt. All rights reserved. # Copyright (C) 2014, 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/****************************************************************************/ /****************************************************************************/
/* boards/z16/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd */ /* boards/z16/z16f2811/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd */
/* */ /* */
/* Copyright (C) 2008, 2014, 2017 Gregory Nutt. All rights reserved. */ /* Copyright (C) 2008, 2014, 2017 Gregory Nutt. All rights reserved. */
/* Author: Gregory Nutt <gnutt@nuttx.org> */ /* Author: Gregory Nutt <gnutt@nuttx.org> */

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/z16f2800100zcog/Makefile # boards/z16/z16f2811/z16f2800100zcog/Makefile
# #
# Copyright (C) 2008, 2012 Gregory Nutt. All rights reserved. # Copyright (C) 2008, 2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/z16/z16f2800100zcog/src/z16f_boot.c * boards/z16/z16f2811/z16f2800100zcog/src/z16f_boot.c
* *
* Copyright (C) 2008, 2014 Gregory Nutt. All rights reserved. * Copyright (C) 2008, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -67,7 +67,7 @@ static void z16f_gpioinit(void)
putreg8(getreg8(Z16F_GPIOA_DD) | 0x87, Z16F_GPIOA_DD); putreg8(getreg8(Z16F_GPIOA_DD) | 0x87, Z16F_GPIOA_DD);
putreg8(getreg8(Z16F_GPIOA_OUT) | 0x07, Z16F_GPIOA_OUT); putreg8(getreg8(Z16F_GPIOA_OUT) | 0x07, Z16F_GPIOA_OUT);
putreg8(getreg8(Z16F_GPIOA_DD) & 0xF8, Z16F_GPIOA_DD); putreg8(getreg8(Z16F_GPIOA_DD) & 0xf8, Z16F_GPIOA_DD);
/* Configure rate switch port */ /* Configure rate switch port */

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/z16/z16f2800100zcog/z16f_leds.c * boards/z16/z16f2811/z16f2800100zcog/z16f_leds.c
* *
* Copyright (C) 2008, 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2008, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -78,7 +78,7 @@ void board_autoled_initialize(void)
/* The following is performed up_board_initialize() as well */ /* The following is performed up_board_initialize() as well */
putreg8(getreg8(Z16F_GPIOA_OUT) | 0x07, Z16F_GPIOA_OUT); putreg8(getreg8(Z16F_GPIOA_OUT) | 0x07, Z16F_GPIOA_OUT);
putreg8(getreg8(Z16F_GPIOA_DD) & 0xF8, Z16F_GPIOA_DD); putreg8(getreg8(Z16F_GPIOA_DD) & 0xf8, Z16F_GPIOA_DD);
} }
/**************************************************************************** /****************************************************************************

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
############################################################################ ############################################################################
# boards/z16f2800100zcog/tools/dopatch.sh # boards/z16/z16f2811/z16f2800100zcog/tools/dopatch.sh
# #
# Copyright (C) 2014 Gregory Nutt. All rights reserved. # Copyright (C) 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -71,7 +71,7 @@ Other Versions
If you use any version of ZDS-II other than 5.1.1, 5.2.1, or 5.3.0 or If you use any version of ZDS-II other than 5.1.1, 5.2.1, or 5.3.0 or
if you install ZDS-II at any location other than the default location, if you install ZDS-II at any location other than the default location,
you will have to modify three files: (1) arch/arm/z80/src/ez80/Kconfig, you will have to modify three files: (1) arch/arm/z80/src/ez80/Kconfig,
(2) boards/ez80f910200kitg/scripts/Make.defs and, perhaps, (3) (2) boards/z80/ez80/ez80f910200kitg/scripts/Make.defs and, perhaps, (3)
arch/z80/src/ez80/Toolchain.defs. arch/z80/src/ez80/Toolchain.defs.
Configuration Subdirectories Configuration Subdirectories

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* arch/ez80f910200kitg/include/board.h * arch/z80/ez80/ez80f910200kitg/include/board.h
* *
* Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. * Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
* *
****************************************************************************/ ****************************************************************************/
#ifndef __ARCH_BOARD_BOARD_H #ifndef __BOARDS_Z80_EZ80_EZ80f910200KITG_INCLUDE_BOARD_H
#define __ARCH_BOARD_BOARD_H #define __BOARDS_Z80_EZ80_EZ80f910200KITG_INCLUDE_BOARD_H
/**************************************************************************** /****************************************************************************
* Included Files * Included Files
@ -67,7 +67,8 @@
#undef EXTERN #undef EXTERN
#if defined(__cplusplus) #if defined(__cplusplus)
#define EXTERN extern "C" #define EXTERN extern "C"
extern "C" { extern "C"
{
#else #else
#define EXTERN extern #define EXTERN extern
#endif #endif
@ -77,4 +78,4 @@ extern "C" {
} }
#endif #endif
#endif /* __ARCH_BOARD_BOARD_H */ #endif /* __BOARDS_Z80_EZ80_EZ80f910200KITG_INCLUDE_BOARD_H */

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/ez80f910200kitg/scripts/Make.defs # boards/z80/ez80/ez80f910200kitg/scripts/Make.defs
# #
# Copyright (C) 2008, 2009, 2013 Gregory Nutt. All rights reserved. # Copyright (C) 2008, 2009, 2013 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/****************************************************************************/ /****************************************************************************/
/* boards/z80/ez80f910200kitg/scripts/ez80f910200kitg.linkcmd */ /* boards/z80/ez80/ez80f910200kitg/scripts/ez80f910200kitg.linkcmd */
/* */ /* */
/* Copyright (C) 2008 Gregory Nutt. All rights reserved. */ /* Copyright (C) 2008 Gregory Nutt. All rights reserved. */
/* Author: Gregory Nutt <gnutt@nuttx.org> */ /* Author: Gregory Nutt <gnutt@nuttx.org> */

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/ez80f910200kitg/Makefile # boards/z80/ez80/ez80f910200kitg/src/Makefile
# #
# Copyright (C) 2008, 2012 Gregory Nutt. All rights reserved. # Copyright (C) 2008, 2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/z80/ez80f910200kitg/src/ez80_boot.c * boards/z80/ez80/ez80f910200kitg/src/ez80_boot.c
* *
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/z80/ez80f910200kitg/src/ez80_leds.c * boards/z80/ez80/ez80f910200kitg/src/ez80_leds.c
* *
* Copyright (C) 2008-2009, 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2008-2009, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* arch/ez80f910200zco/include/board.h * boards/z80/ez80/ez80f910200zco/include/board.h
* *
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
* *
****************************************************************************/ ****************************************************************************/
#ifndef __ARCH_BOARD_BOARD_H #ifndef __BOARDS_Z80_EZ80_EZ80F910200ZCO_INCLUDE_BOARD_H
#define __ARCH_BOARD_BOARD_H #define __BOARDS_Z80_EZ80_EZ80F910200ZCO_INCLUDE_BOARD_H
/**************************************************************************** /****************************************************************************
* Included Files * Included Files
@ -75,7 +75,8 @@
#undef EXTERN #undef EXTERN
#if defined(__cplusplus) #if defined(__cplusplus)
#define EXTERN extern "C" #define EXTERN extern "C"
extern "C" { extern "C"
{
#else #else
#define EXTERN extern #define EXTERN extern
#endif #endif
@ -85,4 +86,4 @@ extern "C" {
} }
#endif #endif
#endif /* __ARCH_BOARD_BOARD_H */ #endif /* __BOARDS_Z80_EZ80_EZ80F910200ZCO_INCLUDE__BOARD_H */

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/ez80f910200zco/nsh/Make.defs # boards/z80/ez80/ez80f910200zco/scripts/Make.defs
# #
# Copyright (C) 2009, 2012-2013 Gregory Nutt. All rights reserved. # Copyright (C) 2009, 2012-2013 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/****************************************************************************/ /****************************************************************************/
/* boards/z80/ez80f910200zco/scripts/ez80f910200zco.linkcmd */ /* boards/z80/ez80/ez80f910200zco/scripts/ez80f910200zco.linkcmd */
/* */ /* */
/* Copyright (C) 2009, 2017 Gregory Nutt. All rights reserved. */ /* Copyright (C) 2009, 2017 Gregory Nutt. All rights reserved. */
/* Author: Gregory Nutt <gnutt@nuttx.org> */ /* Author: Gregory Nutt <gnutt@nuttx.org> */

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/ez80f910200zco/Makefile # boards/z80/ez80/ez80f910200zco/Makefile
# #
# Copyright (C) 2008 Gregory Nutt. All rights reserved. # Copyright (C) 2008 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/z80/ez80f910200zco/src/ez80_boot.c * boards/z80/ez80/ez80f910200zco/src/ez80_boot.c
* *
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/z80/ez80f910200zco/src/ez80_leds.c * boards/z80/ez80/ez80f910200zco/src/ez80_leds.c
* *
* Copyright (C) 2008-2009, 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2008-2009, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

Some files were not shown because too many files have changed in this diff Show More