diff --git a/boards/misoc/lm32/misoc/README.txt b/boards/misoc/lm32/misoc/README.txt index cec3e9bd4c..d47ed056ce 100644 --- a/boards/misoc/lm32/misoc/README.txt +++ b/boards/misoc/lm32/misoc/README.txt @@ -60,11 +60,11 @@ Buildroot Toolchain 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 - 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 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 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. diff --git a/boards/misoc/lm32/misoc/include/board.h b/boards/misoc/lm32/misoc/include/board.h index b434a503f0..76bc7984ce 100644 --- a/boards/misoc/lm32/misoc/include/board.h +++ b/boards/misoc/lm32/misoc/include/board.h @@ -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. * Author: Gregory Nutt @@ -48,6 +48,7 @@ ****************************************************************************/ /* Clocking *****************************************************************/ + /* Assume default CLKDIV8 fuse setting is overridden to CLKDIV1 */ #define BOARD_XTAL_FREQ 14745600 /* 14.7456MHz crystal */ @@ -55,6 +56,7 @@ #define BOARD_TOSCK_CLOCK 32768 /* TOSC = 32.768KHz */ /* LED definitions **********************************************************/ + /* 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 * status (Active). None are available for software use. diff --git a/boards/misoc/lm32/misoc/scripts/lm32.ld b/boards/misoc/lm32/misoc/scripts/lm32.ld index 1f334fa46d..9de8677477 100644 --- a/boards/misoc/lm32/misoc/scripts/lm32.ld +++ b/boards/misoc/lm32/misoc/scripts/lm32.ld @@ -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. * Author: Gregory Nutt diff --git a/boards/misoc/lm32/misoc/scripts/minerva.ld b/boards/misoc/lm32/misoc/scripts/minerva.ld index cf32617e26..5d9f01030a 100644 --- a/boards/misoc/lm32/misoc/scripts/minerva.ld +++ b/boards/misoc/lm32/misoc/scripts/minerva.ld @@ -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. * Author: Gregory Nutt diff --git a/boards/misoc/lm32/misoc/src/Makefile b/boards/misoc/lm32/misoc/src/Makefile index bd2e213aa2..73403033ae 100644 --- a/boards/misoc/lm32/misoc/src/Makefile +++ b/boards/misoc/lm32/misoc/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/misoc/src/Makefile +# boards/misoc/lm32/misoc/src/Makefile # # Copyright (C) 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/misoc/lm32/misoc/src/lm32_boot.c b/boards/misoc/lm32/misoc/src/lm32_boot.c index a28e1b63d6..7e5f4977fb 100644 --- a/boards/misoc/lm32/misoc/src/lm32_boot.c +++ b/boards/misoc/lm32/misoc/src/lm32_boot.c @@ -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. * Author: Gregory Nutt @@ -32,11 +32,11 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Included Files - ************************************************************************************/ + ****************************************************************************/ #include @@ -44,24 +44,25 @@ #include -/************************************************************************************ +/**************************************************************************** * Public Functions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Name: lm32_board_initialize * * 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 * configured and mapped but before any devices have been initialized. * - ************************************************************************************/ + ****************************************************************************/ void lm32_board_initialize(void) { - /* Configure SSP chip selects if 1) at least one SSP is enabled, and 2) the weak - * function atmega_spidev_initialize() has been brought into the link. + /* Configure SSP chip selects if 1) at least one SSP is enabled, and 2) + * the weak function atmega_spidev_initialize() has been brought into + * the link. */ /* Configure on-board LEDs if LED support has been selected. */ diff --git a/boards/misoc/lm32/misoc/src/misoc.h b/boards/misoc/lm32/misoc/src/misoc.h index 277255e937..83acd467cb 100644 --- a/boards/misoc/lm32/misoc/src/misoc.h +++ b/boards/misoc/lm32/misoc/src/misoc.h @@ -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. * Author: Gregory Nutt @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_MISOC_MISOC_SRC_MISOC_H -#define __BOARDS_MISOC_MISOC_SRC_MISOC_H +#ifndef __BOARDS_MISOC_LM32_MISOC_SRC_MISOC_H +#define __BOARDS_MISOC_LM32_MISOC_SRC_MISOC_H /**************************************************************************** * Included Files @@ -69,25 +69,25 @@ extern "C" #define EXTERN extern #endif -/************************************************************************************ +/**************************************************************************** * Name: lm32_spidev_initialize * * Description: * Called to configure SPI chip select GPIO pins for the Amber Web Server. * - ************************************************************************************/ + ****************************************************************************/ #if defined(CONFIG_AVR_SPI1) || defined(CONFIG_AVR_SPI2) void weak_function lm32_spidev_initialize(void); #endif -/************************************************************************************ +/**************************************************************************** * Name: lm32_led_initialize * * Description: * Configure on-board LEDs if LED support has been selected. * - ************************************************************************************/ + ****************************************************************************/ #ifdef CONFIG_ARCH_LEDS void lm32_led_initialize(void); @@ -99,4 +99,4 @@ void lm32_led_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_MISOC_MISOC_SRC_MISOC_H */ +#endif /* __BOARDS_MISOC_LM32_MISOC_SRC_MISOC_H */ diff --git a/boards/or1k/mor1kx/or1k/include/board.h b/boards/or1k/mor1kx/or1k/include/board.h index b274b7922c..5cf8228006 100644 --- a/boards/or1k/mor1kx/or1k/include/board.h +++ b/boards/or1k/mor1kx/or1k/include/board.h @@ -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. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_OR1K_OR1K_INCLUDE_BOARD_H -#define __BOARDS_OR1K_OR1K_INCLUDE_BOARD_H +#ifndef __BOARDS_OR1K_MOR1KX_OR1K_INCLUDE_BOARD_H +#define __BOARDS_OR1K_MOR1KX_OR1K_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -57,4 +57,4 @@ * Public Functions ****************************************************************************/ -#endif /* __BOARDS_OR1K_OR1K_INCLUDE_BOARD_H */ +#endif /* __BOARDS_OR1K_MOR1KX_OR1K_INCLUDE_BOARD_H */ diff --git a/boards/or1k/mor1kx/or1k/scripts/Make.defs b/boards/or1k/mor1kx/or1k/scripts/Make.defs index b3b8c76615..bdcf1c3015 100644 --- a/boards/or1k/mor1kx/or1k/scripts/Make.defs +++ b/boards/or1k/mor1kx/or1k/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/or1k/scripts/Make.defs +# boards/or1k/mor1kx/or1k/scripts/Make.defs # # Copyright (C) 2018 Gregory Nutt. All rights reserved. # Author: Matt Thompson diff --git a/boards/or1k/mor1kx/or1k/scripts/flash.ld b/boards/or1k/mor1kx/or1k/scripts/flash.ld index 447bbe968f..3375b14d39 100644 --- a/boards/or1k/mor1kx/or1k/scripts/flash.ld +++ b/boards/or1k/mor1kx/or1k/scripts/flash.ld @@ -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. * Author: Gregory Nutt diff --git a/boards/or1k/mor1kx/or1k/src/Makefile b/boards/or1k/mor1kx/or1k/src/Makefile index a2aaea6265..f5b63b6fec 100644 --- a/boards/or1k/mor1kx/or1k/src/Makefile +++ b/boards/or1k/mor1kx/or1k/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/or1k/src/Makefile +# boards/or1k/mor1kx/or1k/src/Makefile # # Copyright (C) 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/or1k/mor1kx/or1k/src/or1k.h b/boards/or1k/mor1kx/or1k/src/or1k.h index f3908fa4ab..b8258bff03 100644 --- a/boards/or1k/mor1kx/or1k/src/or1k.h +++ b/boards/or1k/mor1kx/or1k/src/or1k.h @@ -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. * Author: Gregory Nutt @@ -31,14 +31,14 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************************************/ + ****************************************************************************/ -#ifndef __BOARDS_OR1K_OR1K_SRC_OR1K_H -#define __BOARDS_OR1K_OR1K_SRC_OR1K_H +#ifndef __BOARDS_OR1K_MOR1KX_OR1K_SRC_OR1K_H +#define __BOARDS_OR1K_MOR1KX_OR1K_SRC_OR1K_H -/************************************************************************************ +/**************************************************************************** * Public Function Prototypes - ************************************************************************************/ + ****************************************************************************/ /**************************************************************************** * Name: or1k_bringup @@ -56,4 +56,4 @@ int or1k_bringup(void); -#endif /* __BOARDS_OR1K_OR1K_SRC_OR1K_H */ +#endif /* __BOARDS_OR1K_MOR1KX_OR1K_SRC_OR1K_H */ diff --git a/boards/or1k/mor1kx/or1k/src/or1k_appinit.c b/boards/or1k/mor1kx/or1k/src/or1k_appinit.c index ab42265212..f796603024 100644 --- a/boards/or1k/mor1kx/or1k/src/or1k_appinit.c +++ b/boards/or1k/mor1kx/or1k/src/or1k_appinit.c @@ -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. * Author: Gregory Nutt diff --git a/boards/or1k/mor1kx/or1k/src/or1k_autoled.c b/boards/or1k/mor1kx/or1k/src/or1k_autoled.c index fbe5bbddef..ccd7fc3217 100644 --- a/boards/or1k/mor1kx/or1k/src/or1k_autoled.c +++ b/boards/or1k/mor1kx/or1k/src/or1k_autoled.c @@ -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. * Author: Gregory Nutt diff --git a/boards/or1k/mor1kx/or1k/src/or1k_boot.c b/boards/or1k/mor1kx/or1k/src/or1k_boot.c index 64b827e352..5821456dc9 100644 --- a/boards/or1k/mor1kx/or1k/src/or1k_boot.c +++ b/boards/or1k/mor1kx/or1k/src/or1k_boot.c @@ -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. * Author: Matt Thompson diff --git a/boards/or1k/mor1kx/or1k/src/or1k_bringup.c b/boards/or1k/mor1kx/or1k/src/or1k_bringup.c index af62686ee4..25b3662756 100644 --- a/boards/or1k/mor1kx/or1k/src/or1k_bringup.c +++ b/boards/or1k/mor1kx/or1k/src/or1k_bringup.c @@ -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. * Author: Matt Thompson diff --git a/boards/renesas/m32262f8/skp16c26/README.txt b/boards/renesas/m32262f8/skp16c26/README.txt index 54bcc03603..f0fa8417fe 100644 --- a/boards/renesas/m32262f8/skp16c26/README.txt +++ b/boards/renesas/m32262f8/skp16c26/README.txt @@ -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 diff --git a/boards/renesas/m32262f8/skp16c26/include/board.h b/boards/renesas/m32262f8/skp16c26/include/board.h index 7aeb9ce6ff..4defdfea56 100644 --- a/boards/renesas/m32262f8/skp16c26/include/board.h +++ b/boards/renesas/m32262f8/skp16c26/include/board.h @@ -1,5 +1,5 @@ -/************************************************************************************ - * boards/renesas/skp16c26/include/board.h +/**************************************************************************** + * boards/renesas/m32262f8/skp16c26/include/board.h * arch/board/board.h * * 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 * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************************************/ + ****************************************************************************/ -#ifndef __BOARDS_RENESAS_SKP16C26_INCLUDE_BOARD_H -#define __BOARDS_RENESAS_SKP16C26_INCLUDE_BOARD_H +#ifndef __BOARDS_RENESAS_M32262F8_SKP16C26_INCLUDE_BOARD_H +#define __BOARDS_RENESAS_M32262F8_SKP16C26_INCLUDE_BOARD_H -/************************************************************************************ +/**************************************************************************** * Included Files - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Pre-processor Definitions - ************************************************************************************/ + ****************************************************************************/ -/* User configuration checks ********************************************************/ +/* User configuration checks ************************************************/ -/* According to SKP16C26 documention, "SIO/UART1 pins are used for communication - * between the SKP16C26 board kernel and KD30 Debugger through the ICD. Do not - * connect these pins to any other circuit, as UART1 cannot be used in the user - * program. For details, please see ICD (RTA-FoUSB-MON) User Manual on Target M16C +/* According to SKP16C26 documention, "SIO/UART1 pins are used for + * communication between the SKP16C26 board kernel and KD30 Debugger through + * the ICD. Do not connect these pins to any other circuit, as UART1 cannot + * 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." * * 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" #endif -/* Hardware defintitions ************************************************************/ +/* Hardware defintitions ****************************************************/ /* Xin Freq */ #define M16C_XIN_FREQ 20000000 /* 20MHz */ -/* Interrupt Priority Levels ********************************************************/ +/* Interrupt Priority Levels ************************************************/ /* IPL settings */ @@ -117,18 +118,18 @@ /* *=FLASHING **=if INIRQ, SIGNAL, or ASSERTION will be flashing */ -/* BUTTON definitions **************************************************************/ +/* BUTTON definitions *******************************************************/ #define SW1_PRESSED 0x01 /* Bit 0: 1=SW1 pressed */ #define SW2_PRESSED 0x02 /* Bit 1: 1=SW2 pressed */ #define SW3_PRESSED 0x04 /* Bit 2: 1=SW3 pressed */ -/************************************************************************************ +/**************************************************************************** * Inline Functions - ************************************************************************************/ + ****************************************************************************/ #ifndef __ASSEMBLY__ #endif -#endif /* __BOARDS_RENESAS_SKP16C26_INCLUDE_BOARD_H */ +#endif /* __BOARDS_RENESAS_M32262F8_SKP16C26_INCLUDE_BOARD_H */ diff --git a/boards/renesas/m32262f8/skp16c26/scripts/Make.defs b/boards/renesas/m32262f8/skp16c26/scripts/Make.defs index 9fec23bcb9..f6961dedc4 100644 --- a/boards/renesas/m32262f8/skp16c26/scripts/Make.defs +++ b/boards/renesas/m32262f8/skp16c26/scripts/Make.defs @@ -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. # Author: Gregory Nutt diff --git a/boards/renesas/m32262f8/skp16c26/scripts/skp16c26.ld b/boards/renesas/m32262f8/skp16c26/scripts/skp16c26.ld index c6d36b6541..83a56e1726 100644 --- a/boards/renesas/m32262f8/skp16c26/scripts/skp16c26.ld +++ b/boards/renesas/m32262f8/skp16c26/scripts/skp16c26.ld @@ -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. * Author: Gregory Nutt diff --git a/boards/renesas/m32262f8/skp16c26/src/Makefile b/boards/renesas/m32262f8/skp16c26/src/Makefile index 91f488ef21..26335724cf 100644 --- a/boards/renesas/m32262f8/skp16c26/src/Makefile +++ b/boards/renesas/m32262f8/skp16c26/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/renesas/skp16c26/src/Makefile +# boards/renesas/m32262f8/skp16c26/src/Makefile # # Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/renesas/m32262f8/skp16c26/src/m16c_buttons.c b/boards/renesas/m32262f8/skp16c26/src/m16c_buttons.c index d7f668e147..4647decb57 100644 --- a/boards/renesas/m32262f8/skp16c26/src/m16c_buttons.c +++ b/boards/renesas/m32262f8/skp16c26/src/m16c_buttons.c @@ -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. * Author: Gregory Nutt diff --git a/boards/renesas/m32262f8/skp16c26/src/m16c_lcd.c b/boards/renesas/m32262f8/skp16c26/src/m16c_lcd.c index cb869d2164..31def78db3 100644 --- a/boards/renesas/m32262f8/skp16c26/src/m16c_lcd.c +++ b/boards/renesas/m32262f8/skp16c26/src/m16c_lcd.c @@ -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. * Author: Gregory Nutt @@ -31,11 +31,11 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Included Files - ************************************************************************************/ + ****************************************************************************/ #include @@ -49,16 +49,16 @@ #ifdef CONFIG_SLCD -/************************************************************************************ +/**************************************************************************** * Pre-processor Definitions - ************************************************************************************/ + ****************************************************************************/ -/* LCD dimensions *******************************************************************/ +/* LCD dimensions ***********************************************************/ #define LCD_NLINES 2 /* Two lines */ #define LCD_NCHARS 8 /* Eight characters per line */ -/* LCD commands *********************************************************************/ +/* LCD commands *************************************************************/ #define LCD_CLEAR 0x01 /* Clear LCD display and home cursor */ #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_L2 0xc0 /* Move cursor to line 2 */ -/************************************************************************************ +/**************************************************************************** * Private Data - ************************************************************************************/ + ****************************************************************************/ static uint8_t g_nchars; /* Number of characters in lines 2 */ static uint8_t g_line[LCD_NCHARS]; /* The content of lines 2 */ -/************************************************************************************ +/**************************************************************************** * Private Functions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Name: up_lcddelay - ************************************************************************************/ + ****************************************************************************/ static void up_lcddelay(uint16_t count) { @@ -99,9 +99,9 @@ static void up_lcddelay(uint16_t count) } } -/************************************************************************************ +/**************************************************************************** * Name: up_setrs - ************************************************************************************/ + ****************************************************************************/ static inline void up_setrs(bool data) { @@ -120,9 +120,9 @@ static inline void up_setrs(bool data) putreg8(regval, M16C_P6); } -/************************************************************************************ +/**************************************************************************** * Name: up_seten - ************************************************************************************/ + ****************************************************************************/ static inline void up_seten(void) { @@ -133,9 +133,9 @@ static inline void up_seten(void) putreg8(regval, M16C_P6); } -/************************************************************************************ +/**************************************************************************** * Name: up_clren - ************************************************************************************/ + ****************************************************************************/ static inline void up_clren(void) { @@ -146,9 +146,9 @@ static inline void up_clren(void) putreg8(regval, M16C_P6); } -/************************************************************************************ +/**************************************************************************** * Name: up_enpluse - ************************************************************************************/ + ****************************************************************************/ 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 */ } -/************************************************************************************ +/**************************************************************************** * Name: up_lcdwrite - ************************************************************************************/ + ****************************************************************************/ void up_lcdwrite(bool data, uint8_t ch) { up_setrs(data); /* Set RS appropriately */ - /* Write upper nibble first. Only the lower 4 bits of P9 are valid. The upper four - * bits are reserved and must be zero. + /* Write upper nibble first. Only the lower 4 bits of P9 are valid. + * The upper four bits are reserved and must be zero. */ putreg8(ch >> 4, M16C_P9); @@ -180,9 +180,9 @@ void up_lcdwrite(bool data, uint8_t ch) up_enpulse(data); } -/************************************************************************************ +/**************************************************************************** * Name: up_scroll - ************************************************************************************/ + ****************************************************************************/ static void up_scroll(void) { @@ -206,13 +206,13 @@ static void up_scroll(void) g_nchars = 0; } -/************************************************************************************ +/**************************************************************************** * Public Functions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Name: up_lcdinit - ************************************************************************************/ + ****************************************************************************/ void up_lcdinit(void) { @@ -255,9 +255,9 @@ void up_lcdinit(void) up_lcdwrite(false, LCD_HOME_L1); } -/************************************************************************************ +/**************************************************************************** * Name: up_lcdputc - ************************************************************************************/ + ****************************************************************************/ void up_lcdputc(char ch) { @@ -268,8 +268,8 @@ void up_lcdputc(char ch) up_scroll(); } - /* Should we wrap to truncate at the end of line??? Let's truncate. In either - * case, let's ignore all other non-printable characters. + /* Should we wrap to truncate at the end of line??? Let's truncate. + * In either case, let's ignore all other non-printable characters. */ else if (g_nchars < LCD_NCHARS && isprint(ch)) diff --git a/boards/renesas/m32262f8/skp16c26/src/m16c_lcdconsole.c b/boards/renesas/m32262f8/skp16c26/src/m16c_lcdconsole.c index 16fbdca855..380b84884a 100644 --- a/boards/renesas/m32262f8/skp16c26/src/m16c_lcdconsole.c +++ b/boards/renesas/m32262f8/skp16c26/src/m16c_lcdconsole.c @@ -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. * Author: Gregory Nutt @@ -31,11 +31,11 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Included Files - ************************************************************************************/ + ****************************************************************************/ #include @@ -59,31 +59,31 @@ #if !defined(HAVE_SERIALCONSOLE) && defined(CONFIG_SLCD) && \ defined(CONFIG_SLCD_CONSOLE) -/************************************************************************************ +/**************************************************************************** * Pre-processor Definitions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Private Data - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Private Functions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Public Functions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Name: up_earlyconsoleinit * * Description: - * Performs the low level UART initialization early in debug so that the serial - * console will be available during bootup. This must be called before - * up_consoleinit. + * Performs the low level UART initialization early in debug so that the + * serial console will be available during bootup. + * This must be called before up_consoleinit. * - ************************************************************************************/ + ****************************************************************************/ #ifdef USE_EARLYSERIALINIT # warning "You probably need to define CONFIG_ARCH_LOWCONSOLE" @@ -93,14 +93,14 @@ void up_earlyconsoleinit(void) } #endif -/************************************************************************************ +/**************************************************************************** * Name: up_consoleinit * * Description: * Register serial console and serial ports. This assumes that * up_earlyconsoleinit was called previously. * - ************************************************************************************/ + ****************************************************************************/ #if USE_SERIALDRIVER # 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 */ - lowconsole_init(); + lowconsole_init(); } #endif -/************************************************************************************ +/**************************************************************************** * Name: up_lowputc * * Description: * Output one character on the console * - ************************************************************************************/ + ****************************************************************************/ void up_lowputc(char ch) { up_lcdputc(ch); } -/************************************************************************************ +/**************************************************************************** * Name: up_putc * * Description: * Output one character on the console * - ************************************************************************************/ + ****************************************************************************/ int up_putc(int ch) { diff --git a/boards/renesas/m32262f8/skp16c26/src/m16c_leds.c b/boards/renesas/m32262f8/skp16c26/src/m16c_leds.c index 242f8cf0ed..068c0b94a4 100644 --- a/boards/renesas/m32262f8/skp16c26/src/m16c_leds.c +++ b/boards/renesas/m32262f8/skp16c26/src/m16c_leds.c @@ -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. * Author: Gregory Nutt @@ -31,11 +31,11 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Included Files - ************************************************************************************/ + ****************************************************************************/ #include @@ -50,11 +50,13 @@ #ifdef CONFIG_ARCH_LEDS -/************************************************************************************ +/**************************************************************************** * 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 YELLOW_LED (1 << 4) /* Bit 4, port 7 */ @@ -80,13 +82,13 @@ #define RED_LED_PORT M16C_P8 #define RED_DIR_PORT M16C_PD8 -/************************************************************************************ +/**************************************************************************** * Private Types - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Private Data - ************************************************************************************/ + ****************************************************************************/ 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_nestlevel; -/************************************************************************************ +/**************************************************************************** * Private Functions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Name: m16c_setleds - ************************************************************************************/ + ****************************************************************************/ 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); } -/************************************************************************************ +/**************************************************************************** * Public Functions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Name: board_autoled_initialize - ************************************************************************************/ + ****************************************************************************/ void board_autoled_initialize(void) { @@ -141,7 +143,7 @@ void board_autoled_initialize(void) /* Make sure that the LEDs are in the OFF state */ regval = getreg8(GREENYELLOW_LED_PORT); - regval |= (GREEN_LED_OFF |YELLOW_LED_OFF); + regval |= (GREEN_LED_OFF | YELLOW_LED_OFF); putreg8(regval, GREENYELLOW_LED_PORT); regval = getreg8(RED_LED_PORT); @@ -151,7 +153,7 @@ void board_autoled_initialize(void) /* Set the direction to output */ regval = getreg8(GREENYELLOW_DIR_PORT); - regval |= (GREEN_LED |YELLOW_LED); + regval |= (GREEN_LED | YELLOW_LED); putreg8(regval, GREENYELLOW_DIR_PORT); regval = getreg8(RED_DIR_PORT); @@ -159,16 +161,16 @@ void board_autoled_initialize(void) putreg8(regval, RED_DIR_PORT); } -/************************************************************************************ +/**************************************************************************** * Name: board_autoled_on - ************************************************************************************/ + ****************************************************************************/ void board_autoled_on(int led) { uint8_t ledset; - /* If this is the ASSERTION led, preserve the Y&G bits from the last setting and - * set the RED LED on. + /* If this is the ASSERTION led, preserve the Y&G bits from the last setting + * and set the RED LED on. */ if (led == LED_ASSERTION) @@ -195,21 +197,24 @@ void board_autoled_on(int led) } } -/************************************************************************************ +/**************************************************************************** * Name: board_autoled_off - ************************************************************************************/ + ****************************************************************************/ void board_autoled_off(int led) { 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 the previous state was one of the nested states (INIRQ, SIGNAL, or ASSERTION), - * then turn the green and yellow LEDs all off. That way we can distinguish - * that case from the simple cases. + /* If the previous state was one of the nested states + * (INIRQ, SIGNAL, or ASSERTION), + * then turn the green and yellow LEDs all off. + * That way we can distinguish that case from the simple cases. */ if (g_nestlevel > 0) @@ -225,7 +230,8 @@ void board_autoled_off(int led) } 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. */ @@ -243,7 +249,7 @@ void board_autoled_off(int led) ledset = g_ledstate[led]; m16c_setleds(ledset & GREENYELLOW_LED_MASK, ledset & RED_LED_MASK); - g_prevled[g_nestlevel]= led; + g_prevled[g_nestlevel] = led; } } diff --git a/boards/renesas/m32262f8/skp16c26/src/skp16c26.h b/boards/renesas/m32262f8/skp16c26/src/skp16c26.h index 39986b5932..7410ec0cdb 100644 --- a/boards/renesas/m32262f8/skp16c26/src/skp16c26.h +++ b/boards/renesas/m32262f8/skp16c26/src/skp16c26.h @@ -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. * Author: Gregory Nutt @@ -31,33 +31,33 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************************************/ + ****************************************************************************/ -#ifndef __BOARDS_RENESAS_SKP16C26_SRC_SKP16C26_H -#define __BOARDS_RENESAS_SKP16C26_SRC_SKP16C26_H +#ifndef __BOARDS_RENESAS_M32262F8_SKP16C26_SRC_SKP16C26_H +#define __BOARDS_RENESAS_M32262F8_SKP16C26_SRC_SKP16C26_H -/************************************************************************************ +/**************************************************************************** * Included Files - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Pre-processor Definitions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Inline Functions - ************************************************************************************/ + ****************************************************************************/ #ifndef __ASSEMBLY__ #endif -/************************************************************************************ +/**************************************************************************** * Public Function Prototypes - ************************************************************************************/ + ****************************************************************************/ #ifndef __ASSEMBLY__ #endif -#endif /* __BOARDS_RENESAS_SKP16C26_SRC_SKP16C26_H */ +#endif /* __BOARDS_RENESAS_M32262F8_SKP16C26_SRC_SKP16C26_H */ diff --git a/boards/renesas/sh7032/us7032evb1/README.txt b/boards/renesas/sh7032/us7032evb1/README.txt index 3a6ffc089b..a424459ba2 100644 --- a/boards/renesas/sh7032/us7032evb1/README.txt +++ b/boards/renesas/sh7032/us7032evb1/README.txt @@ -114,7 +114,7 @@ Architecture selection implemented in. CONFIG_ARCH_BOARD - identifies the boards/ subdirectory and, hence, 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_ENDIAN_BIG - the SH-1 usually runs big-endian CONFIG_ARCH_NOINTC - define if the architecture does not diff --git a/boards/renesas/sh7032/us7032evb1/include/board.h b/boards/renesas/sh7032/us7032evb1/include/board.h index 3742fc9390..b5bd5aabad 100644 --- a/boards/renesas/sh7032/us7032evb1/include/board.h +++ b/boards/renesas/sh7032/us7032evb1/include/board.h @@ -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. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef _CONFIGS_US7032EVB1_BOARD_H -#define _CONFIGS_US7032EVB1_BOARD_H +#ifndef __BOARDS_RENESAS_SH7032_US7032EVB1_BOARD_H +#define __BOARDS_RENESAS_SH7032_US7032EVB1_BOARD_H /**************************************************************************** * Included Files @@ -77,7 +77,8 @@ #ifndef __ASSEMBLY__ #ifdef __cplusplus #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -92,4 +93,4 @@ extern "C" { #endif #endif -#endif /* _CONFIGS_US7032EVB1_BOARD_H */ +#endif /* __BOARDS_RENESAS_SH7032_US7032EVB1_BOARD_H */ diff --git a/boards/renesas/sh7032/us7032evb1/scripts/Make.defs b/boards/renesas/sh7032/us7032evb1/scripts/Make.defs index eca0ee1246..0b46705f43 100644 --- a/boards/renesas/sh7032/us7032evb1/scripts/Make.defs +++ b/boards/renesas/sh7032/us7032evb1/scripts/Make.defs @@ -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. # Author: Gregory Nutt diff --git a/boards/renesas/sh7032/us7032evb1/scripts/sram.ld b/boards/renesas/sh7032/us7032evb1/scripts/sram.ld index 514b623dc0..42d32051b8 100644 --- a/boards/renesas/sh7032/us7032evb1/scripts/sram.ld +++ b/boards/renesas/sh7032/us7032evb1/scripts/sram.ld @@ -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. * Author: Gregory Nutt diff --git a/boards/renesas/sh7032/us7032evb1/shterm/Makefile b/boards/renesas/sh7032/us7032evb1/shterm/Makefile index f2ac7a63e2..7760764109 100644 --- a/boards/renesas/sh7032/us7032evb1/shterm/Makefile +++ b/boards/renesas/sh7032/us7032evb1/shterm/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/renesas/us7032evb1/shterm/Makefile +# boards/renesas/sh7032/us7032evb1/shterm/Makefile # # Copyright (C) 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/renesas/sh7032/us7032evb1/shterm/shterm.c b/boards/renesas/sh7032/us7032evb1/shterm/shterm.c index df7fb2edbb..c35a674e8d 100644 --- a/boards/renesas/sh7032/us7032evb1/shterm/shterm.c +++ b/boards/renesas/sh7032/us7032evb1/shterm/shterm.c @@ -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. * Author: Gregory Nutt diff --git a/boards/renesas/sh7032/us7032evb1/src/Makefile b/boards/renesas/sh7032/us7032evb1/src/Makefile index b123b140b1..94c9585932 100644 --- a/boards/renesas/sh7032/us7032evb1/src/Makefile +++ b/boards/renesas/sh7032/us7032evb1/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/ enesas/us7032evb1/src/Makefile +# boards/renesas/sh7032/us7032evb1/src/Makefile # # Copyright (C) 2008, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/renesas/sh7032/us7032evb1/src/sh1_leds.c b/boards/renesas/sh7032/us7032evb1/src/sh1_leds.c index 234e400acf..7ac844dca3 100644 --- a/boards/renesas/sh7032/us7032evb1/src/sh1_leds.c +++ b/boards/renesas/sh7032/us7032evb1/src/sh1_leds.c @@ -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. * Author: Gregory Nutt diff --git a/boards/risc-v/gap8/gapuino/include/board.h b/boards/risc-v/gap8/gapuino/include/board.h index 20c7bb5b5e..64637acaa6 100644 --- a/boards/risc-v/gap8/gapuino/include/board.h +++ b/boards/risc-v/gap8/gapuino/include/board.h @@ -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. * Author: hhuysqt <1020988872@qq.com> @@ -31,14 +31,14 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************************************/ + ****************************************************************************/ -#ifndef __BOARDS_RISC-V_GAPUINO_INCLUDE_BOARD_H -#define __BOARDS_RISC-V_GAPUINO_INCLUDE_BOARD_H +#ifndef __BOARDS_RISC-V_GAP8_GAPUINO_INCLUDE_BOARD_H +#define __BOARDS_RISC-V_GAP8_GAPUINO_INCLUDE_BOARD_H -/************************************************************************************ +/**************************************************************************** * Included Files - ************************************************************************************/ + ****************************************************************************/ #include @@ -46,13 +46,13 @@ # include #endif -/************************************************************************************ +/**************************************************************************** * Pre-processor Definitions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Public Data - ************************************************************************************/ + ****************************************************************************/ #ifndef __ASSEMBLY__ @@ -65,13 +65,13 @@ extern "C" #define EXTERN extern #endif -/************************************************************************************ +/**************************************************************************** * Public Function Prototypes - ************************************************************************************/ + ****************************************************************************/ #undef EXTERN #if defined(__cplusplus) } #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_RISC-V_NR5M100_NEXYS4_INCLUDE_BOARD_H */ +#endif /* __BOARDS_RISC-V_GAP8_GAPUINO_INCLUDE_BOARD_H */ diff --git a/boards/risc-v/gap8/gapuino/scripts/Make.defs b/boards/risc-v/gap8/gapuino/scripts/Make.defs index 0910b12d9b..3fbfb3c242 100644 --- a/boards/risc-v/gap8/gapuino/scripts/Make.defs +++ b/boards/risc-v/gap8/gapuino/scripts/Make.defs @@ -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. # Author: Gregory Nutt diff --git a/boards/risc-v/gap8/gapuino/scripts/ld.script b/boards/risc-v/gap8/gapuino/scripts/ld.script index 2d04a35a3c..df6bfcaa8e 100644 --- a/boards/risc-v/gap8/gapuino/scripts/ld.script +++ b/boards/risc-v/gap8/gapuino/scripts/ld.script @@ -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. * Author: hhuysqt <1020988872@qq.com> diff --git a/boards/risc-v/gap8/gapuino/src/gapuino_appinit.c b/boards/risc-v/gap8/gapuino/src/gapuino_appinit.c index 0004fe8b41..753b88ef10 100644 --- a/boards/risc-v/gap8/gapuino/src/gapuino_appinit.c +++ b/boards/risc-v/gap8/gapuino/src/gapuino_appinit.c @@ -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. * Author: hhuysqt <1020988872@qq.com> diff --git a/boards/risc-v/gap8/gapuino/src/gapuino_sysinit.c b/boards/risc-v/gap8/gapuino/src/gapuino_sysinit.c index e98c5e96f1..a2112c6a21 100644 --- a/boards/risc-v/gap8/gapuino/src/gapuino_sysinit.c +++ b/boards/risc-v/gap8/gapuino/src/gapuino_sysinit.c @@ -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 ****************************************************************************/ @@ -79,7 +114,7 @@ uint32_t g_current_freq = 0; void gapuino_sysinit(void) { - SCBC->ICACHE_ENABLE = 0xFFFFFFFF; + SCBC->ICACHE_ENABLE = 0xffffffff; gap8_setfreq(CONFIG_CORE_CLOCK_FREQ); /* For debug usage */ diff --git a/boards/risc-v/nr5m100/nr5m100-nexys4/README.txt b/boards/risc-v/nr5m100/nr5m100-nexys4/README.txt index 4b8d68711b..228be5de94 100644 --- a/boards/risc-v/nr5m100/nr5m100-nexys4/README.txt +++ b/boards/risc-v/nr5m100/nr5m100-nexys4/README.txt @@ -148,7 +148,7 @@ Debugger ./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 - 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 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 diff --git a/boards/risc-v/nr5m100/nr5m100-nexys4/include/board.h b/boards/risc-v/nr5m100/nr5m100-nexys4/include/board.h index 028945c8f2..c3d9563b32 100644 --- a/boards/risc-v/nr5m100/nr5m100-nexys4/include/board.h +++ b/boards/risc-v/nr5m100/nr5m100-nexys4/include/board.h @@ -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 * * 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 * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************************************/ + ****************************************************************************/ -#ifndef __BOARDS_RISC-V_NR5M100_NEXYS4_INCLUDE_BOARD_H -#define __BOARDS_RISC-V_NR5M100_NEXYS4_INCLUDE_BOARD_H +#ifndef __BOARDS_RISC-V_NR5M100_NR5M100_NEXYS4_INCLUDE_BOARD_H +#define __BOARDS_RISC-V_NR5M100_NR5M100_NEXYS4_INCLUDE_BOARD_H -/************************************************************************************ +/**************************************************************************** * Included Files - ************************************************************************************/ + ****************************************************************************/ #include @@ -54,24 +54,26 @@ #include "nr5.h" -/************************************************************************************ +/**************************************************************************** * Pre-processor Definitions - ************************************************************************************/ + ****************************************************************************/ + +/* Clocking *****************************************************************/ -/* Clocking *************************************************************************/ /* The NR5M100_Nexys4 system uses a 100 MHz main oscillator */ #define NR5_HCLK_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 -/* 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. +/* 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. */ /* LED index values for use with stm32_setled() */ @@ -97,8 +99,9 @@ #define BOARD_LED3_BIT (1 << BOARD_LED3) #define BOARD_LED4_BIT (1 << BOARD_LED4) -/* If CONFIG_ARCH_LEDs is defined, then NuttX will control the 4 LEDs on board the - * stm32f4discovery. The following definitions describe how NuttX controls the LEDs: +/* If CONFIG_ARCH_LEDs is defined, then NuttX will control the 4 LEDs + * on the board. + * The following definitions describe how NuttX controls the LEDs: */ #define LED_STARTED 0 /* LED1 */ @@ -110,8 +113,7 @@ #define LED_ASSERTION 6 /* LED1 + LED2 + LED3 */ #define LED_PANIC 7 /* N/C + N/C + N/C + LED4 */ -/* Button definitions ***************************************************************/ -/* The STM32F4 Discovery supports one button: */ +/* Button definitions *******************************************************/ #define BUTTON_USER 0 @@ -121,9 +123,9 @@ #endif /* 0 */ -/************************************************************************************ +/**************************************************************************** * Public Data - ************************************************************************************/ + ****************************************************************************/ #ifndef __ASSEMBLY__ @@ -136,19 +138,21 @@ extern "C" #define EXTERN extern #endif -/************************************************************************************ +/**************************************************************************** * Public Function Prototypes - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Name: nr5_ledinit, nr5_setled, and nr5_setleds * * Description: - * If CONFIG_ARCH_LEDS is defined, then NuttX will control the on-board LEDs. If - * CONFIG_ARCH_LEDS is not defined, then the following interfacesare available to + * If CONFIG_ARCH_LEDS is defined, + * 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. * - ************************************************************************************/ + ****************************************************************************/ #ifndef CONFIG_ARCH_LEDS void nr5_ledinit(void); @@ -161,5 +165,5 @@ void nr5_setleds(uint8_t ledset); } #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_RISC-V_NR5M100_NEXYS4_INCLUDE_BOARD_H */ +#endif /* __BOARDS_RISC-V_NR5M100_NR5M100_NEXYS4_INCLUDE_BOARD_H */ diff --git a/boards/risc-v/nr5m100/nr5m100-nexys4/scripts/Make.defs b/boards/risc-v/nr5m100/nr5m100-nexys4/scripts/Make.defs index 17cbb8e7a8..4ecdbf240d 100644 --- a/boards/risc-v/nr5m100/nr5m100-nexys4/scripts/Make.defs +++ b/boards/risc-v/nr5m100/nr5m100-nexys4/scripts/Make.defs @@ -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. # Author: Gregory Nutt diff --git a/boards/risc-v/nr5m100/nr5m100-nexys4/scripts/ld.script b/boards/risc-v/nr5m100/nr5m100-nexys4/scripts/ld.script index 6a7b61e896..03a3f253d8 100644 --- a/boards/risc-v/nr5m100/nr5m100-nexys4/scripts/ld.script +++ b/boards/risc-v/nr5m100/nr5m100-nexys4/scripts/ld.script @@ -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) 2016 Ken Pettit. diff --git a/boards/risc-v/nr5m100/nr5m100-nexys4/scripts/nr5m1xx.cfg b/boards/risc-v/nr5m100/nr5m100-nexys4/scripts/nr5m1xx.cfg index d8bb9049a6..a387d393cf 100644 --- a/boards/risc-v/nr5m100/nr5m100-nexys4/scripts/nr5m1xx.cfg +++ b/boards/risc-v/nr5m100/nr5m100-nexys4/scripts/nr5m1xx.cfg @@ -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. # Author: Ken Pettit diff --git a/boards/risc-v/nr5m100/nr5m100-nexys4/scripts/openocd.cfg b/boards/risc-v/nr5m100/nr5m100-nexys4/scripts/openocd.cfg index be490e691c..cbf01ffe46 100644 --- a/boards/risc-v/nr5m100/nr5m100-nexys4/scripts/openocd.cfg +++ b/boards/risc-v/nr5m100/nr5m100-nexys4/scripts/openocd.cfg @@ -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. # Author: Ken Pettit diff --git a/boards/risc-v/nr5m100/nr5m100-nexys4/src/Makefile b/boards/risc-v/nr5m100/nr5m100-nexys4/src/Makefile index 06eb50a361..e4eb8091b7 100644 --- a/boards/risc-v/nr5m100/nr5m100-nexys4/src/Makefile +++ b/boards/risc-v/nr5m100/nr5m100-nexys4/src/Makefile @@ -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. # Author: Ken Pettit diff --git a/boards/risc-v/nr5m100/nr5m100-nexys4/src/nr5_appinit.c b/boards/risc-v/nr5m100/nr5m100-nexys4/src/nr5_appinit.c index 15bac9768c..4cb4459d6e 100644 --- a/boards/risc-v/nr5m100/nr5m100-nexys4/src/nr5_appinit.c +++ b/boards/risc-v/nr5m100/nr5m100-nexys4/src/nr5_appinit.c @@ -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. * Author: Gregory Nutt @@ -81,6 +81,5 @@ int board_app_initialize(uintptr_t arg) { - return OK; } diff --git a/boards/risc-v/nr5m100/nr5m100-nexys4/src/nr5_autoleds.c b/boards/risc-v/nr5m100/nr5m100-nexys4/src/nr5_autoleds.c index 4b819f526d..3a28cf6b66 100644 --- a/boards/risc-v/nr5m100/nr5m100-nexys4/src/nr5_autoleds.c +++ b/boards/risc-v/nr5m100/nr5m100-nexys4/src/nr5_autoleds.c @@ -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. * Author: Ken Pettit @@ -31,11 +31,11 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Included Files - ************************************************************************************/ + ****************************************************************************/ #include @@ -43,29 +43,29 @@ #include -/************************************************************************************ +/**************************************************************************** * Pre-processor Definitions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Private Functions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Public Functions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Name: board_autoled_on * * Description: - * All NR5 architectures must provide the following entry point. This entry point - * is called early in the intitialization -- after all memory has been configured - * and mapped but before any devices have been initialized. + * All NR5 architectures must provide the following entry point. + * This entry point is called early in the intitialization -- after all + * memory has been configured and mapped but before any devices have been + * initialized. * - ************************************************************************************/ + ****************************************************************************/ void board_autoled_on(int led) { - } diff --git a/boards/risc-v/nr5m100/nr5m100-nexys4/src/nr5_boot.c b/boards/risc-v/nr5m100/nr5m100-nexys4/src/nr5_boot.c index 8711de8665..f53b4da7e5 100644 --- a/boards/risc-v/nr5m100/nr5m100-nexys4/src/nr5_boot.c +++ b/boards/risc-v/nr5m100/nr5m100-nexys4/src/nr5_boot.c @@ -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. * Author: Ken Pettit @@ -31,11 +31,11 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Included Files - ************************************************************************************/ + ****************************************************************************/ #include @@ -43,27 +43,28 @@ #include -/************************************************************************************ +/**************************************************************************** * Pre-processor Definitions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Private Functions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Public Functions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Name: nr5_boardinitialize * * Description: - * All NR5 architectures must provide the following entry point. This entry point - * is called early in the intitialization -- after all memory has been configured - * and mapped but before any devices have been initialized. + * All NR5 architectures must provide the following entry point. + * This entry point is called early in the intitialization -- after all + * memory has been configured and mapped but before any devices have been + * initialized. * - ************************************************************************************/ + ****************************************************************************/ void nr5_boardinitialize(void) { diff --git a/boards/sim/sim/sim/include/board.h b/boards/sim/sim/sim/include/board.h index 7837f3621c..6c490b25ae 100644 --- a/boards/sim/sim/sim/include/board.h +++ b/boards/sim/sim/sim/include/board.h @@ -1,3 +1,3 @@ /**************************************************************************** - * boards/sim/sim/include/board.h + * boards/sim/sim/sim/include/board.h ****************************************************************************/ diff --git a/boards/sim/sim/sim/scripts/Make.defs b/boards/sim/sim/sim/scripts/Make.defs index ee77ac577a..52c6016329 100644 --- a/boards/sim/sim/sim/scripts/Make.defs +++ b/boards/sim/sim/sim/scripts/Make.defs @@ -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 # reserved. diff --git a/boards/sim/sim/sim/scripts/gnu-elf.ld b/boards/sim/sim/sim/scripts/gnu-elf.ld index b39c7e67be..86fa5b4e84 100644 --- a/boards/sim/sim/sim/scripts/gnu-elf.ld +++ b/boards/sim/sim/sim/scripts/gnu-elf.ld @@ -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. * Author: Gregory Nutt diff --git a/boards/sim/sim/sim/src/Makefile b/boards/sim/sim/sim/src/Makefile index 4c04d808ad..107d6826f4 100644 --- a/boards/sim/sim/sim/src/Makefile +++ b/boards/sim/sim/sim/src/Makefile @@ -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. # Author: Gregory Nutt diff --git a/boards/sim/sim/sim/src/sim.h b/boards/sim/sim/sim/src/sim.h index 3de54490a3..6f0cd7ce16 100644 --- a/boards/sim/sim/sim/src/sim.h +++ b/boards/sim/sim/sim/src/sim.h @@ -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. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_SIM_SIM_SRC_SIM_H -#define __BOARDS_SIM_SIM_SRC_SIM_H +#ifndef __BOARDS_SIM_SIM_SIM_SRC_SIM_H +#define __BOARDS_SIM_SIM_SIM_SRC_SIM_H /**************************************************************************** * Included Files @@ -45,6 +45,7 @@ /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ + /* procfs File System */ #ifdef CONFIG_FS_PROCFS @@ -84,9 +85,9 @@ int sim_bringup(void); * - It will then, optionally, build a ROMFS filesystem image containing * the data base. * - * The ROMFS filesystem image can that be mounted during the boot-up sequence - * so that it is available for the localtime logic. There are two steps to - * doing this: + * The ROMFS filesystem image can that be mounted during the boot-up + * sequence so that it is available for the localtime logic. + * There are two steps todoing this: * * - First, a ROM disk device must be created. This is done by calling * the function romdisk_register() as described in @@ -144,4 +145,4 @@ int sim_gpio_initialize(void); int sim_tsc_setup(int minor); #endif -#endif /* __BOARDS_SIM_SIM_SRC_SIM_H */ \ No newline at end of file +#endif /* __BOARDS_SIM_SIM_SIM_SRC_SIM_H */ \ No newline at end of file diff --git a/boards/sim/sim/sim/src/sim_appinit.c b/boards/sim/sim/sim/src/sim_appinit.c index c553bedb11..851a8eaf3a 100644 --- a/boards/sim/sim/sim/src/sim_appinit.c +++ b/boards/sim/sim/sim/src/sim_appinit.c @@ -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. * Author: Gregory Nutt diff --git a/boards/sim/sim/sim/src/sim_boot.c b/boards/sim/sim/sim/src/sim_boot.c index 7cc7fe0fa2..fbbbb12e28 100644 --- a/boards/sim/sim/sim/src/sim_boot.c +++ b/boards/sim/sim/sim/src/sim_boot.c @@ -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. * Author: Gregory Nutt diff --git a/boards/sim/sim/sim/src/sim_bringup.c b/boards/sim/sim/sim/src/sim_bringup.c index 37828a0f9f..cd3423e1ed 100644 --- a/boards/sim/sim/sim/src/sim_bringup.c +++ b/boards/sim/sim/sim/src/sim_bringup.c @@ -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. * Author: Gregory Nutt diff --git a/boards/sim/sim/sim/src/sim_gpio.c b/boards/sim/sim/sim/src/sim_gpio.c index 76ff640887..1a3b2e26c2 100644 --- a/boards/sim/sim/sim/src/sim_gpio.c +++ b/boards/sim/sim/sim/src/sim_gpio.c @@ -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. * Author: Gregory Nutt @@ -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; 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; simgpio->value = !simgpio->value; diff --git a/boards/sim/sim/sim/src/sim_ioexpander.c b/boards/sim/sim/sim/src/sim_ioexpander.c index 42ab6dec3a..4facdec07b 100644 --- a/boards/sim/sim/sim/src/sim_ioexpander.c +++ b/boards/sim/sim/sim/src/sim_ioexpander.c @@ -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. * Author: Gregory Nutt diff --git a/boards/sim/sim/sim/src/sim_touchscreen.c b/boards/sim/sim/sim/src/sim_touchscreen.c index c9e9a58f28..d9a140b3c5 100644 --- a/boards/sim/sim/sim/src/sim_touchscreen.c +++ b/boards/sim/sim/sim/src/sim_touchscreen.c @@ -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. * Author: Gregory Nutt @@ -64,7 +64,9 @@ /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ + /* Configuration ************************************************************/ + /* Pick a background color */ #ifndef CONFIG_EXAMPLES_TOUCHSCREEN_BGCOLOR @@ -107,7 +109,7 @@ static FAR void *sim_listener(FAR void *arg) /* Process events forever */ - for (;;) + for (; ; ) { /* Handle the next event. If we were configured blocking, then * we will stay right here until the next event is received. Since @@ -206,33 +208,33 @@ int sim_tsc_setup(int minor) return ret; } #endif - /* Start a separate thread to listen for server events. This is probably - * the least efficient way to do this, but it makes this example flow more - * smoothly. - */ + /* Start a separate thread to listen for server events. + * This is probably the least efficient way to do this, + * but it makes this example flow more smoothly. + */ - (void)pthread_attr_init(&attr); - param.sched_priority = CONFIG_SIM_LISTENERPRIO; - (void)pthread_attr_setschedparam(&attr, ¶m); - (void)pthread_attr_setstacksize(&attr, CONFIG_SIM_LISTENER_STACKSIZE); + (void)pthread_attr_init(&attr); + param.sched_priority = CONFIG_SIM_LISTENERPRIO; + (void)pthread_attr_setschedparam(&attr, ¶m); + (void)pthread_attr_setstacksize(&attr, CONFIG_SIM_LISTENER_STACKSIZE); - ret = pthread_create(&thread, &attr, sim_listener, NULL); - if (ret != 0) - { - gerr("ERROR: pthread_create failed: %d\n", ret); - return -ret; - } + ret = pthread_create(&thread, &attr, sim_listener, NULL); + if (ret != 0) + { + gerr("ERROR: pthread_create failed: %d\n", 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) - { - /* Wait for the listener thread to wake us up when we really - * are connected. - */ + while (!g_simtc.connected) + { + /* Wait for the listener thread to wake us up when we really + * are connected. + */ (void)sem_wait(&g_simtc.eventsem); - } + } } else { diff --git a/boards/sim/sim/sim/src/sim_zoneinfo.c b/boards/sim/sim/sim/src/sim_zoneinfo.c index 6dd056152c..bbc9480c8b 100644 --- a/boards/sim/sim/sim/src/sim_zoneinfo.c +++ b/boards/sim/sim/sim/src/sim_zoneinfo.c @@ -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. * Author: Gregory Nutt @@ -91,9 +91,9 @@ * - It will then, optionally, build a ROMFS filesystem image containing * the data base. * - * The ROMFS filesystem image can that be mounted during the boot-up sequence - * so that it is available for the localtime logic. There are two steps to - * doing this: + * The ROMFS filesystem image can that be mounted during the boot-up + * sequence so that it is available for the localtime logic. + * There are two steps to doing this: * * - First, a ROM disk device must be created. This is done by calling * the function romdisk_register() as described in @@ -116,8 +116,8 @@ int sim_zoneinfo(int minor) { - char devname[32]; - int ret; + char devname[32]; + int ret; /* Create a RAM disk for the test */ diff --git a/boards/x86/qemu/qemu-i486/include/board.h b/boards/x86/qemu/qemu-i486/include/board.h index 2962712d34..02af733304 100644 --- a/boards/x86/qemu/qemu-i486/include/board.h +++ b/boards/x86/qemu/qemu-i486/include/board.h @@ -1,5 +1,5 @@ -/************************************************************************************ - * boards/x86/qemu-i486/include/board.h +/**************************************************************************** + * boards/x86/qemu/qemu-i486/include/board.h * include/arch/board/board.h * * 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 * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************************************/ + ****************************************************************************/ -#ifndef __BOARDS_X86_QEMU_I486_INCLUDE_BOARD_H -#define __BOARDS_X86_QEMU_I486_INCLUDE_BOARD_H +#ifndef __BOARDS_X86_QEMU_QEMU_I486_INCLUDE_BOARD_H +#define __BOARDS_X86_QEMU_QEMU_QEMU_I486_INCLUDE_BOARD_H -/************************************************************************************ +/**************************************************************************** * Included Files - ************************************************************************************/ + ****************************************************************************/ #include -/************************************************************************************ +/**************************************************************************** * Pre-processor Definitions - ************************************************************************************/ + ****************************************************************************/ -/* Clocking *************************************************************************/ +/* Clocking *****************************************************************/ /* Programmable interval timer (PIT) */ #define PIT_CLOCK 1041816 /* PIT input clock */ -/* LED definitions ******************************************************************/ +/* LED definitions **********************************************************/ -/* Button definitions ***************************************************************/ +/* Button definitions *******************************************************/ -/* Alternate pin selections *********************************************************/ +/* Alternate pin selections *************************************************/ -/************************************************************************************ +/**************************************************************************** * Public Types - ************************************************************************************/ + ****************************************************************************/ #ifndef __ASSEMBLY__ -/************************************************************************************ +/**************************************************************************** * Public Data - ************************************************************************************/ + ****************************************************************************/ #undef EXTERN #if defined(__cplusplus) @@ -78,9 +78,9 @@ extern "C" #define EXTERN extern #endif -/************************************************************************************ +/**************************************************************************** * Public Function Prototypes - ************************************************************************************/ + ****************************************************************************/ #undef EXTERN #if defined(__cplusplus) @@ -88,4 +88,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_X86_QEMU_I486_INCLUDE_BOARD_H */ +#endif /* __BOARDS_X86_QEMU_QEMU_QEMU_I486_INCLUDE_BOARD_H */ diff --git a/boards/x86/qemu/qemu-i486/scripts/Make.defs b/boards/x86/qemu/qemu-i486/scripts/Make.defs index ac8f2de135..e153be8967 100644 --- a/boards/x86/qemu/qemu-i486/scripts/Make.defs +++ b/boards/x86/qemu/qemu-i486/scripts/Make.defs @@ -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. # Author: Gregory Nutt diff --git a/boards/x86/qemu/qemu-i486/scripts/qemu.ld b/boards/x86/qemu/qemu-i486/scripts/qemu.ld index bfe3c34d81..455606e2d2 100644 --- a/boards/x86/qemu/qemu-i486/scripts/qemu.ld +++ b/boards/x86/qemu/qemu-i486/scripts/qemu.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/†/qemu-i486/scripts/qemu.ld + * boards/x86/qemu/qemu-i486/scripts/qemu.ld * * Copyright (C) 2011, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/x86/qemu/qemu-i486/src/Makefile b/boards/x86/qemu/qemu-i486/src/Makefile index 1faf790894..f4c619bb2b 100644 --- a/boards/x86/qemu/qemu-i486/src/Makefile +++ b/boards/x86/qemu/qemu-i486/src/Makefile @@ -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. # Author: Gregory Nutt diff --git a/boards/x86/qemu/qemu-i486/src/qemu_boot.c b/boards/x86/qemu/qemu-i486/src/qemu_boot.c index 95f4cb2f4c..7e89ee5161 100644 --- a/boards/x86/qemu/qemu-i486/src/qemu_boot.c +++ b/boards/x86/qemu/qemu-i486/src/qemu_boot.c @@ -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. * Author: Gregory Nutt @@ -31,11 +31,11 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Included Files - ************************************************************************************/ + ****************************************************************************/ #include @@ -50,27 +50,28 @@ #include "qemu.h" #include "qemu_i486.h" -/************************************************************************************ +/**************************************************************************** * Pre-processor Definitions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Private Functions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Public Functions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Name: x86_boardinitialize * * Description: - * All x86 architectures must provide the following entry point. This entry point - * is called early in the initialization -- after all memory has been configured - * and mapped but before any devices have been initialized. + * All x86 architectures must provide the following entry point. + * This entry point is called early in the initialization -- after all + * memory has been configured and mapped but before any devices have been + * initialized. * - ************************************************************************************/ + ****************************************************************************/ void x86_boardinitialize(void) { diff --git a/boards/x86/qemu/qemu-i486/src/qemu_i486.h b/boards/x86/qemu/qemu-i486/src/qemu_i486.h index a5bfc2a3d2..5716910bee 100644 --- a/boards/x86/qemu/qemu-i486/src/qemu_i486.h +++ b/boards/x86/qemu/qemu-i486/src/qemu_i486.h @@ -1,4 +1,4 @@ -/************************************************************************************ +/**************************************************************************** * boards/x86/qemu-i486/src/qemu_i486.h * * 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 * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************************************/ + ****************************************************************************/ -#ifndef __BOARDS_X86_QEMU_I486_SRC_QEMU_I486_H -#define __BOARDS_X86_QEMU_I486_SRC_QEMU_I486_H +#ifndef __BOARDS_X86_QEMU_QEMU_I486_SRC_QEMU_I486_H +#define __BOARDS_X86_QEMU_QEMU_I486_SRC_QEMU_I486_H -/************************************************************************************ +/**************************************************************************** * Included Files - ************************************************************************************/ + ****************************************************************************/ #include #include -/************************************************************************************ +/**************************************************************************** * Pre-processor Definitions - ************************************************************************************/ + ****************************************************************************/ -/* GPIO Pin Definitions *************************************************************/ +/* GPIO Pin Definitions *****************************************************/ -/************************************************************************************ +/**************************************************************************** * Public Types - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Public data - ************************************************************************************/ + ****************************************************************************/ #ifndef __ASSEMBLY__ -/************************************************************************************ +/**************************************************************************** * Public Functions - ************************************************************************************/ + ****************************************************************************/ #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_X86_QEMU_I486_SRC_QEMU_I486_H */ +#endif /* __BOARDS_X86_QEMU_QEMU_I486_SRC_QEMU_I486_H */ diff --git a/boards/xtensa/esp32/esp32-core/README.txt b/boards/xtensa/esp32/esp32-core/README.txt index 2683eafed8..a69e8592a9 100644 --- a/boards/xtensa/esp32/esp32-core/README.txt +++ b/boards/xtensa/esp32/esp32-core/README.txt @@ -277,7 +277,7 @@ OpenOCD for the ESP32 to reflect the physical JTAG adapter connected. 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: - 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 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_FEATURES=y @@ -549,7 +549,7 @@ OpenOCD for the ESP32 Start OpenOCD: 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 Start GDB and load code: @@ -648,8 +648,8 @@ NOTES: to provide that logic -- hopefully that is coming. As a consequence, whatever clock setup was left when NuttX started is used. For the case of execution out of IRAM with GDB, the - settings in boards/esp32-core/include/board.h work. To check - the timing, I use a stop watch and: + settings in boards/xtensa/esp32/esp32-core/include/board.h work. + To check the timing, I use a stop watch and: nsh> sleep 60 diff --git a/boards/xtensa/esp32/esp32-core/include/board.h b/boards/xtensa/esp32/esp32-core/include/board.h index b78ac149b1..4ed151f2b0 100644 --- a/boards/xtensa/esp32/esp32-core/include/board.h +++ b/boards/xtensa/esp32/esp32-core/include/board.h @@ -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. * Author: Gregory Nutt @@ -33,14 +33,15 @@ * ****************************************************************************/ -#ifndef __BOARDS_XTENSA_ESP32_CORE_INCLUDE_BOARD_H -#define __BOARDS_XTENSA_ESP32_CORE_INCLUDE_BOARD_H +#ifndef __BOARDS_XTENSA_ESP32_ESP32_CORE_INCLUDE_BOARD_H +#define __BOARDS_XTENSA_ESP32_ESP32_CORE_INCLUDE_BOARD_H /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ /* Clocking ****************************************************************/ + /* The ESP32 Core board V2 is fitted with either a 26 a 40MHz crystal */ #ifdef CONFIG_ESP32CORE_XTAL_26MHz @@ -68,4 +69,4 @@ # define BOARD_CLOCK_FREQUENCY BOARD_XTAL_FREQUENCY #endif -#endif /* __BOARDS_XTENSA_ESP32_CORE_INCLUDE_BOARD_H */ +#endif /* __BOARDS_XTENSA_ESP32_ESP32_CORE_INCLUDE_BOARD_H */ diff --git a/boards/xtensa/esp32/esp32-core/scripts/Make.defs b/boards/xtensa/esp32/esp32-core/scripts/Make.defs index 2356c2af6f..25a2e54a48 100644 --- a/boards/xtensa/esp32/esp32-core/scripts/Make.defs +++ b/boards/xtensa/esp32/esp32-core/scripts/Make.defs @@ -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. # Author: Gregory Nutt diff --git a/boards/xtensa/esp32/esp32-core/scripts/esp32.template b/boards/xtensa/esp32/esp32-core/scripts/esp32.template index b9750aa50f..02ef79938f 100644 --- a/boards/xtensa/esp32/esp32-core/scripts/esp32.template +++ b/boards/xtensa/esp32/esp32-core/scripts/esp32.template @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/xtensa/elf32-core/scripts/esp32.template + * boards/xtensa/esp23/esp32-core/scripts/esp32.template * ESP32 Linker Script Memory Layout * * This file describes the memory layout (memory blocks) as virtual diff --git a/boards/xtensa/esp32/esp32-core/scripts/esp32_flash.ld b/boards/xtensa/esp32/esp32-core/scripts/esp32_flash.ld index a830ea79cb..4d88a4f6f1 100644 --- a/boards/xtensa/esp32/esp32-core/scripts/esp32_flash.ld +++ b/boards/xtensa/esp32/esp32-core/scripts/esp32_flash.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/xtensa/elf32-core/scripts/esp32_flash.ld + * boards/xtensa/esp32/esp32-core/scripts/esp32_flash.ld ****************************************************************************/ /* Default entry point: */ diff --git a/boards/xtensa/esp32/esp32-core/scripts/esp32_iram.ld b/boards/xtensa/esp32/esp32-core/scripts/esp32_iram.ld index 5e7d954684..3ba33b7521 100644 --- a/boards/xtensa/esp32/esp32-core/scripts/esp32_iram.ld +++ b/boards/xtensa/esp32/esp32-core/scripts/esp32_iram.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/xtensa/elf32-core/scripts/esp32_iram.ld + * boards/xtensa/esp32/esp32-core/scripts/esp32_iram.ld ****************************************************************************/ /* Default entry point: */ diff --git a/boards/xtensa/esp32/esp32-core/scripts/esp32_peripherals.ld b/boards/xtensa/esp32/esp32-core/scripts/esp32_peripherals.ld index f44bb34646..81c7595619 100644 --- a/boards/xtensa/esp32/esp32-core/scripts/esp32_peripherals.ld +++ b/boards/xtensa/esp32/esp32-core/scripts/esp32_peripherals.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/xtensa/elf32-core/scripts/esp32_peripherals.ld + * boards/xtensa/esp32/esp32-core/scripts/esp32_peripherals.ld ****************************************************************************/ PROVIDE ( UART0 = 0x3ff40000 ); diff --git a/boards/xtensa/esp32/esp32-core/src/Makefile b/boards/xtensa/esp32/esp32-core/src/Makefile index ed47818af2..fb329fb8be 100644 --- a/boards/xtensa/esp32/esp32-core/src/Makefile +++ b/boards/xtensa/esp32/esp32-core/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards//srp32-core/Makefile +# boards/xtensa/esp32/esp32-core/src/Makefile # # Copyright (C) 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/xtensa/esp32/esp32-core/src/esp32-core.h b/boards/xtensa/esp32/esp32-core/src/esp32-core.h index 75f9ded4c7..a5a5bce757 100644 --- a/boards/xtensa/esp32/esp32-core/src/esp32-core.h +++ b/boards/xtensa/esp32/esp32-core/src/esp32-core.h @@ -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. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_XTENSA_ESP32_CORE_SRC_ESP32_CORE_H -#define __BOARDS_XTENSA_ESP32_CORE_SRC_ESP32_CORE_H +#ifndef __BOARDS_XTENSA_ESP32_ESP32_CORE_SRC_ESP32_CORE_H +#define __BOARDS_XTENSA_ESP32_ESP32_CORE_SRC_ESP32_CORE_H /**************************************************************************** * Included Files @@ -79,4 +79,4 @@ int esp32_bringup(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_XTENSA_ESP32_CORE_SRC_ESP32_CORE_H */ +#endif /* __BOARDS_XTENSA_ESP32_ESP32_CORE_SRC_ESP32_CORE_H */ diff --git a/boards/xtensa/esp32/esp32-core/src/esp32_appinit.c b/boards/xtensa/esp32/esp32-core/src/esp32_appinit.c index ba06d76ca3..e98c7fbdb1 100644 --- a/boards/xtensa/esp32/esp32-core/src/esp32_appinit.c +++ b/boards/xtensa/esp32/esp32-core/src/esp32_appinit.c @@ -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. * Author: Gregory Nutt diff --git a/boards/xtensa/esp32/esp32-core/src/esp32_boot.c b/boards/xtensa/esp32/esp32-core/src/esp32_boot.c index 40b3be7c9d..357b1253ab 100644 --- a/boards/xtensa/esp32/esp32-core/src/esp32_boot.c +++ b/boards/xtensa/esp32/esp32-core/src/esp32_boot.c @@ -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. * Author: Gregory Nutt @@ -31,11 +31,11 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Included Files - ************************************************************************************/ + ****************************************************************************/ #include @@ -46,27 +46,28 @@ #include "esp32-core.h" -/************************************************************************************ +/**************************************************************************** * Pre-processor Definitions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Private Functions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Public Functions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Name: esp32_board_initialize * * Description: - * All STM32 architectures must provide the following entry point. This entry point - * is called early in the initialization -- after all memory has been configured - * and mapped but before any devices have been initialized. + * All STM32 architectures must provide the following entry point. + * This entry point is called early in the initialization -- after all + * memory has been configured and mapped but before any devices have been + * initialized. * - ************************************************************************************/ + ****************************************************************************/ void esp32_board_initialize(void) { diff --git a/boards/xtensa/esp32/esp32-core/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-core/src/esp32_bringup.c index 9e8eb9f9f2..f2e0ce0c4a 100644 --- a/boards/xtensa/esp32/esp32-core/src/esp32_bringup.c +++ b/boards/xtensa/esp32/esp32-core/src/esp32_bringup.c @@ -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. * Author: Gregory Nutt diff --git a/boards/z16/z16f2811/z16f2800100zcog/README.txt b/boards/z16/z16f2811/z16f2800100zcog/README.txt index 0bf04a2bf0..23d73cefc3 100644 --- a/boards/z16/z16f2811/z16f2800100zcog/README.txt +++ b/boards/z16/z16f2811/z16f2800100zcog/README.txt @@ -107,7 +107,8 @@ Other Versions 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 - 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. 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 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 -that directory is also a bash script that will apply that patch for you. +boards/z16/z16f2811/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch. +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: diff --git a/boards/z16/z16f2811/z16f2800100zcog/include/board.h b/boards/z16/z16f2811/z16f2800100zcog/include/board.h index 5ccc3552b2..6a23819cd6 100644 --- a/boards/z16/z16f2811/z16f2800100zcog/include/board.h +++ b/boards/z16/z16f2811/z16f2800100zcog/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/z16/z16f2800100zcog/board.h + * boards/z16/z16f2811/z16f2800100zcog/board.h * * Copyright (C) 2008, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_Z16_Z16F2800100ZCOG_INCLUDE_BOARD_H -#define __BOARDS_Z16_Z16F2800100ZCOG_INCLUDE_BOARD_H +#ifndef __BOARDS_Z16_Z16F2811_Z16F2800100ZCOG_INCLUDE_BOARD_H +#define __BOARDS_Z16_Z16F2811_Z16F2800100ZCOG_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -112,7 +112,8 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -122,4 +123,4 @@ extern "C" { } #endif -#endif /* __BOARDS_Z16_Z16F2800100ZCOG_INCLUDE_BOARD_H */ +#endif /* __BOARDS_Z16_Z16F2811_Z16F2800100ZCOG_INCLUDE_BOARD_H */ diff --git a/boards/z16/z16f2811/z16f2800100zcog/scripts/Make.defs b/boards/z16/z16f2811/z16f2800100zcog/scripts/Make.defs index 811cd1eba4..54cd7096d3 100644 --- a/boards/z16/z16f2811/z16f2800100zcog/scripts/Make.defs +++ b/boards/z16/z16f2811/z16f2800100zcog/scripts/Make.defs @@ -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. # Author: Gregory Nutt diff --git a/boards/z16/z16f2811/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd b/boards/z16/z16f2811/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd index 57999c3b4a..72a6036d9a 100644 --- a/boards/z16/z16f2811/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd +++ b/boards/z16/z16f2811/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd @@ -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. */ /* Author: Gregory Nutt */ diff --git a/boards/z16/z16f2811/z16f2800100zcog/src/Makefile b/boards/z16/z16f2811/z16f2800100zcog/src/Makefile index 51bcf3e8c5..26733d1f6d 100644 --- a/boards/z16/z16f2811/z16f2800100zcog/src/Makefile +++ b/boards/z16/z16f2811/z16f2800100zcog/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/z16f2800100zcog/Makefile +# boards/z16/z16f2811/z16f2800100zcog/Makefile # # Copyright (C) 2008, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/z16/z16f2811/z16f2800100zcog/src/z16f_boot.c b/boards/z16/z16f2811/z16f2800100zcog/src/z16f_boot.c index 641dae3132..4b079c217c 100644 --- a/boards/z16/z16f2811/z16f2800100zcog/src/z16f_boot.c +++ b/boards/z16/z16f2811/z16f2800100zcog/src/z16f_boot.c @@ -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. * Author: Gregory Nutt @@ -67,7 +67,7 @@ static void z16f_gpioinit(void) putreg8(getreg8(Z16F_GPIOA_DD) | 0x87, Z16F_GPIOA_DD); 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 */ diff --git a/boards/z16/z16f2811/z16f2800100zcog/src/z16f_leds.c b/boards/z16/z16f2811/z16f2800100zcog/src/z16f_leds.c index 3a018958af..f7d32fafdf 100644 --- a/boards/z16/z16f2811/z16f2800100zcog/src/z16f_leds.c +++ b/boards/z16/z16f2811/z16f2800100zcog/src/z16f_leds.c @@ -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. * Author: Gregory Nutt @@ -78,7 +78,7 @@ void board_autoled_initialize(void) /* The following is performed up_board_initialize() as well */ 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); } /**************************************************************************** diff --git a/boards/z16/z16f2811/z16f2800100zcog/tools/dopatch.sh b/boards/z16/z16f2811/z16f2800100zcog/tools/dopatch.sh index 35e899f4bc..31bde5102a 100755 --- a/boards/z16/z16f2811/z16f2800100zcog/tools/dopatch.sh +++ b/boards/z16/z16f2811/z16f2800100zcog/tools/dopatch.sh @@ -1,6 +1,6 @@ #!/bin/sh ############################################################################ -# boards/z16f2800100zcog/tools/dopatch.sh +# boards/z16/z16f2811/z16f2800100zcog/tools/dopatch.sh # # Copyright (C) 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/z80/ez80/ez80f910200kitg/README.txt b/boards/z80/ez80/ez80f910200kitg/README.txt index eee27469d5..886d8db42a 100644 --- a/boards/z80/ez80/ez80f910200kitg/README.txt +++ b/boards/z80/ez80/ez80f910200kitg/README.txt @@ -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 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, - (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. Configuration Subdirectories diff --git a/boards/z80/ez80/ez80f910200kitg/include/board.h b/boards/z80/ez80/ez80f910200kitg/include/board.h index 72ddd59100..24592f7198 100644 --- a/boards/z80/ez80/ez80f910200kitg/include/board.h +++ b/boards/z80/ez80/ez80f910200kitg/include/board.h @@ -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. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __ARCH_BOARD_BOARD_H -#define __ARCH_BOARD_BOARD_H +#ifndef __BOARDS_Z80_EZ80_EZ80f910200KITG_INCLUDE_BOARD_H +#define __BOARDS_Z80_EZ80_EZ80f910200KITG_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -67,7 +67,8 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -77,4 +78,4 @@ extern "C" { } #endif -#endif /* __ARCH_BOARD_BOARD_H */ +#endif /* __BOARDS_Z80_EZ80_EZ80f910200KITG_INCLUDE_BOARD_H */ diff --git a/boards/z80/ez80/ez80f910200kitg/scripts/Make.defs b/boards/z80/ez80/ez80f910200kitg/scripts/Make.defs index ea1e95b8b9..d8d4331720 100644 --- a/boards/z80/ez80/ez80f910200kitg/scripts/Make.defs +++ b/boards/z80/ez80/ez80f910200kitg/scripts/Make.defs @@ -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. # Author: Gregory Nutt diff --git a/boards/z80/ez80/ez80f910200kitg/scripts/ez80f910200kitg.linkcmd b/boards/z80/ez80/ez80f910200kitg/scripts/ez80f910200kitg.linkcmd index bd7ad1896c..151c4b3836 100644 --- a/boards/z80/ez80/ez80f910200kitg/scripts/ez80f910200kitg.linkcmd +++ b/boards/z80/ez80/ez80f910200kitg/scripts/ez80f910200kitg.linkcmd @@ -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. */ /* Author: Gregory Nutt */ diff --git a/boards/z80/ez80/ez80f910200kitg/src/Makefile b/boards/z80/ez80/ez80f910200kitg/src/Makefile index 80104cd3bb..29f0a61463 100644 --- a/boards/z80/ez80/ez80f910200kitg/src/Makefile +++ b/boards/z80/ez80/ez80f910200kitg/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/ez80f910200kitg/Makefile +# boards/z80/ez80/ez80f910200kitg/src/Makefile # # Copyright (C) 2008, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/z80/ez80/ez80f910200kitg/src/ez80_boot.c b/boards/z80/ez80/ez80f910200kitg/src/ez80_boot.c index 6b4c7c1879..365d2e3851 100644 --- a/boards/z80/ez80/ez80f910200kitg/src/ez80_boot.c +++ b/boards/z80/ez80/ez80f910200kitg/src/ez80_boot.c @@ -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. * Author: Gregory Nutt diff --git a/boards/z80/ez80/ez80f910200kitg/src/ez80_leds.c b/boards/z80/ez80/ez80f910200kitg/src/ez80_leds.c index 8ffd7e7f45..ca394a9f3c 100644 --- a/boards/z80/ez80/ez80f910200kitg/src/ez80_leds.c +++ b/boards/z80/ez80/ez80f910200kitg/src/ez80_leds.c @@ -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. * Author: Gregory Nutt diff --git a/boards/z80/ez80/ez80f910200zco/include/board.h b/boards/z80/ez80/ez80f910200zco/include/board.h index 2c793be1a0..fe0dc4afe0 100644 --- a/boards/z80/ez80/ez80f910200zco/include/board.h +++ b/boards/z80/ez80/ez80f910200zco/include/board.h @@ -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. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __ARCH_BOARD_BOARD_H -#define __ARCH_BOARD_BOARD_H +#ifndef __BOARDS_Z80_EZ80_EZ80F910200ZCO_INCLUDE_BOARD_H +#define __BOARDS_Z80_EZ80_EZ80F910200ZCO_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -75,7 +75,8 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -85,4 +86,4 @@ extern "C" { } #endif -#endif /* __ARCH_BOARD_BOARD_H */ +#endif /* __BOARDS_Z80_EZ80_EZ80F910200ZCO_INCLUDE__BOARD_H */ diff --git a/boards/z80/ez80/ez80f910200zco/scripts/Make.defs b/boards/z80/ez80/ez80f910200zco/scripts/Make.defs index 4c518d53be..b8c41695f3 100644 --- a/boards/z80/ez80/ez80f910200zco/scripts/Make.defs +++ b/boards/z80/ez80/ez80f910200zco/scripts/Make.defs @@ -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. # Author: Gregory Nutt diff --git a/boards/z80/ez80/ez80f910200zco/scripts/ez80f910200zco.linkcmd b/boards/z80/ez80/ez80f910200zco/scripts/ez80f910200zco.linkcmd index bcf65a5f1e..ed95dd3a80 100644 --- a/boards/z80/ez80/ez80f910200zco/scripts/ez80f910200zco.linkcmd +++ b/boards/z80/ez80/ez80f910200zco/scripts/ez80f910200zco.linkcmd @@ -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. */ /* Author: Gregory Nutt */ diff --git a/boards/z80/ez80/ez80f910200zco/src/Makefile b/boards/z80/ez80/ez80f910200zco/src/Makefile index a7ea62911b..186f309024 100644 --- a/boards/z80/ez80/ez80f910200zco/src/Makefile +++ b/boards/z80/ez80/ez80f910200zco/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/ez80f910200zco/Makefile +# boards/z80/ez80/ez80f910200zco/Makefile # # Copyright (C) 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/z80/ez80/ez80f910200zco/src/ez80_boot.c b/boards/z80/ez80/ez80f910200zco/src/ez80_boot.c index 77f63eac4a..22b5130b64 100644 --- a/boards/z80/ez80/ez80f910200zco/src/ez80_boot.c +++ b/boards/z80/ez80/ez80f910200zco/src/ez80_boot.c @@ -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. * Author: Gregory Nutt diff --git a/boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c b/boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c index c5c4395854..6f2be97317 100644 --- a/boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c +++ b/boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c @@ -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. * Author: Gregory Nutt diff --git a/boards/z80/ez80/ez80f910200zco/src/ez80_leds.c b/boards/z80/ez80/ez80f910200zco/src/ez80_leds.c index 537ce90046..5b5d6c5410 100644 --- a/boards/z80/ez80/ez80f910200zco/src/ez80_leds.c +++ b/boards/z80/ez80/ez80f910200zco/src/ez80_leds.c @@ -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. * Author: Gregory Nutt diff --git a/boards/z80/ez80/ez80f910200zco/src/ez80f910200zco.h b/boards/z80/ez80/ez80f910200zco/src/ez80f910200zco.h index ee8ec3465e..3d7566e122 100644 --- a/boards/z80/ez80/ez80f910200zco/src/ez80f910200zco.h +++ b/boards/z80/ez80/ez80f910200zco/src/ez80f910200zco.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/ez80f910200zco/src/ez80f910200zco.h + * boards/z80/ez80/ez80f910200zco/src/ez80f910200zco.h * * Copyright (C) 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef _CONFIGS_EZ80F910200ZCO_SRC_EZ80F910200ZCO_H -#define _CONFIGS_EZ80F910200ZCO_SRC_EZ80F910200ZCO_H +#ifndef __BOARDS_Z80_EZ80_EZ80F910200ZCO_SRC_EZ80F910200ZCO_H +#define __BOARDS_Z80_EZ80_EZ80F910200ZCO_SRC_EZ80F910200ZCO_H /**************************************************************************** * Included Files @@ -118,19 +118,18 @@ * The TX signal at D4 indicates that data is tranmitted to the modem. */ - /* Push buttons: - * - * PB0 SW1 Bit 0 of GPIO Port B - * PB1 SW2 Bit 1 of GPIO Port B - * PB2 SW3 Bit 2 of GPIO Port B - * RESET SW4 - */ +/* Push buttons: + * + * PB0 SW1 Bit 0 of GPIO Port B + * PB1 SW2 Bit 1 of GPIO Port B + * PB2 SW3 Bit 2 of GPIO Port B + * RESET SW4 + */ #define EZ80_PB0_IRQ EZ80_PORTB0_IRQ /* Vector Oxa0 */ #define EZ80_PB1_IRQ EZ80_PORTB1_IRQ /* Vector Oxa4 */ #define EZ80_PB2_IRQ EZ80_PORTB2_IRQ /* Vector Oxa8 */ - /**************************************************************************** * Public Functions ****************************************************************************/ @@ -138,7 +137,8 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -148,4 +148,4 @@ extern "C" { } #endif -#endif /* _CONFIGS_EZ80F910200ZCO_SRC_EZ80F910200ZCO_H */ +#endif /* __BOARDS_Z80_EZ80_EZ80F910200ZCO_SRC_EZ80F910200ZCO_H */ diff --git a/boards/z80/ez80/makerlisp/include/board.h b/boards/z80/ez80/makerlisp/include/board.h index 018812f442..f9554e84ce 100644 --- a/boards/z80/ez80/makerlisp/include/board.h +++ b/boards/z80/ez80/makerlisp/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/makerlisp/include/board.h + * boards/z80/ez80/makerlisp/include/board.h * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_Z80_MAKERLISP_INCLUDE_BOARD_H -#define __BOARDS_Z80_MAKERLISP_INCLUDE_BOARD_H +#ifndef __BOARDS_Z80_EZ80_MAKERLISP_INCLUDE_BOARD_H +#define __BOARDS_Z80_EZ80_MAKERLISP_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -103,4 +103,4 @@ extern "C" } #endif -#endif /* __BOARDS_Z80_MAKERLISP_INCLUDE_BOARD_H */ +#endif /* __BOARDS_Z80_EZ80_MAKERLISP_INCLUDE_BOARD_H */ diff --git a/boards/z80/ez80/makerlisp/scripts/Make.defs b/boards/z80/ez80/makerlisp/scripts/Make.defs index ccc1187732..e0eccbf674 100644 --- a/boards/z80/ez80/makerlisp/scripts/Make.defs +++ b/boards/z80/ez80/makerlisp/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/makerlisp/nsh/Make.defs +# boards/z80/ez80/makerlisp/scripts/Make.defs # # Copyright (C) 2019 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/z80/ez80/makerlisp/scripts/makerlisp_copytoram.linkcmd b/boards/z80/ez80/makerlisp/scripts/makerlisp_copytoram.linkcmd index 8c12df0afc..388edfafbf 100644 --- a/boards/z80/ez80/makerlisp/scripts/makerlisp_copytoram.linkcmd +++ b/boards/z80/ez80/makerlisp/scripts/makerlisp_copytoram.linkcmd @@ -1,5 +1,5 @@ /****************************************************************************/ -/* boards/z80/makerlisp/scripts/makerlisp_copytoram.linkcmd */ +/* boards/z80/ez80/makerlisp/scripts/makerlisp_copytoram.linkcmd */ /* For configurations booting from flash but otherwise running out of RAM */ /* */ /* Copyright (C) 2019 Gregory Nutt. All rights reserved. */ diff --git a/boards/z80/ez80/makerlisp/scripts/makerlisp_flash.linkcmd b/boards/z80/ez80/makerlisp/scripts/makerlisp_flash.linkcmd index a7897cdc71..6000029046 100644 --- a/boards/z80/ez80/makerlisp/scripts/makerlisp_flash.linkcmd +++ b/boards/z80/ez80/makerlisp/scripts/makerlisp_flash.linkcmd @@ -1,5 +1,5 @@ /****************************************************************************/ -/* boards/z80/makerlisp/scripts/makerlisp_flash.linkcmd */ +/* boards/z80/ez80/makerlisp/scripts/makerlisp_flash.linkcmd */ /* For configurations running entirely out of FLASH */ /* */ /* Copyright (C) 2019 Gregory Nutt. All rights reserved. */ diff --git a/boards/z80/ez80/makerlisp/scripts/makerlisp_ram.linkcmd b/boards/z80/ez80/makerlisp/scripts/makerlisp_ram.linkcmd index 330600668d..63fd179954 100644 --- a/boards/z80/ez80/makerlisp/scripts/makerlisp_ram.linkcmd +++ b/boards/z80/ez80/makerlisp/scripts/makerlisp_ram.linkcmd @@ -1,5 +1,5 @@ /****************************************************************************/ -/* boards/z80/makerlisp/scripts/makerlisp_ram.linkcmd */ +/* boards/z80/ez80/makerlisp/scripts/makerlisp_ram.linkcmd */ /* For configurations running entirely out of RAM with nothing in FLASH */ /* */ /* Copyright (C) 2019 Gregory Nutt. All rights reserved. */ diff --git a/boards/z80/ez80/makerlisp/src/Makefile b/boards/z80/ez80/makerlisp/src/Makefile index c0036bf788..287ee0e5d8 100644 --- a/boards/z80/ez80/makerlisp/src/Makefile +++ b/boards/z80/ez80/makerlisp/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/makerlisp/Makefile +# boards/z80/ez80/makerlisp/Makefile # # Copyright (C) 2019 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/z80/ez80/makerlisp/src/ez80_appinit.c b/boards/z80/ez80/makerlisp/src/ez80_appinit.c index 7740be760d..dfa0b033f9 100644 --- a/boards/z80/ez80/makerlisp/src/ez80_appinit.c +++ b/boards/z80/ez80/makerlisp/src/ez80_appinit.c @@ -1,5 +1,5 @@ /**************************************************************************** - * config/makerlisp/src/ez80_appinit.c + * boards/z80/ez80/makerlisp/src/ez80_appinit.c * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/z80/ez80/makerlisp/src/ez80_boot.c b/boards/z80/ez80/makerlisp/src/ez80_boot.c index 56c149f8c4..e4d40433a7 100644 --- a/boards/z80/ez80/makerlisp/src/ez80_boot.c +++ b/boards/z80/ez80/makerlisp/src/ez80_boot.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/z80/makerlisp/src/ez80_boot.c + * boards/z80/ez80/makerlisp/src/ez80_boot.c * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -89,8 +89,8 @@ static void ez80_vga_initialize(void) /* Wait for VGA ready */ for (delay = 0; delay < VGA_MAX_DELAY; delay++) - { - if *(inp(EZ80_PB_DR) & EZ80_GPIOD1) != 0) + { + if ((inp(EZ80_PB_DR) & EZ80_GPIOD1) != 0) { vgapresent = true; break; diff --git a/boards/z80/ez80/makerlisp/src/ez80_bringup.c b/boards/z80/ez80/makerlisp/src/ez80_bringup.c index 8d26895aea..a8710b7d9f 100644 --- a/boards/z80/ez80/makerlisp/src/ez80_bringup.c +++ b/boards/z80/ez80/makerlisp/src/ez80_bringup.c @@ -1,5 +1,5 @@ /**************************************************************************** - * config/makerlisp/src/ez80_bringup.c + * boards/z80/ez80/makerlisp/src/ez80_bringup.c * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/z80/ez80/makerlisp/src/ez80_leds.c b/boards/z80/ez80/makerlisp/src/ez80_leds.c index 0cc67d82f9..341e67002e 100644 --- a/boards/z80/ez80/makerlisp/src/ez80_leds.c +++ b/boards/z80/ez80/makerlisp/src/ez80_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/z80/makerlisp/src/ez80_leds.c + * boards/z80/ez80/makerlisp/src/ez80_leds.c * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/z80/ez80/makerlisp/src/ez80_spi.c b/boards/z80/ez80/makerlisp/src/ez80_spi.c index 4ed0a8c38b..9448f01733 100644 --- a/boards/z80/ez80/makerlisp/src/ez80_spi.c +++ b/boards/z80/ez80/makerlisp/src/ez80_spi.c @@ -1,5 +1,5 @@ /***************************************************************************** - * boards/z80/makerlisp/src/ez80_spi.c + * boards/z80/ez80/makerlisp/src/ez80_spi.c * * Copyright (C) 2019 Greg Nutt. All rights reserved. * Author: Gregory Nutt @@ -110,7 +110,7 @@ void ez80_spidev_initialize(void) * 3. Add a call to ez80_spibus_initialize() in your low level * initialization logic * 4. The handle returned by ez80_spibus_initialize() may then be used to - * bind the SPI driver to higher level logic (e.g., calling + * bind the SPI driver to higher level logic (e.g., calling * mmcsd_spislotinitialize(), for example, will bind the SPI driver to * the SPI MMC/SD driver). * @@ -148,9 +148,9 @@ uint8_t ez80_spistatus(FAR struct spi_dev_s *dev, uint32_t devid) #ifdef HAVE_MMCSD if (devid == SPIDEV_MMCSD(0)) { - /* No card detect pin.. Always claim that the card is present in - * slot 0 - */ + /* No card detect pin.. Always claim that the card is present in + * slot 0 + */ status |= SPI_STATUS_PRESENT; } diff --git a/boards/z80/ez80/makerlisp/src/ez80_spimmcsd.c b/boards/z80/ez80/makerlisp/src/ez80_spimmcsd.c index a9ee50c861..178bb2cafc 100644 --- a/boards/z80/ez80/makerlisp/src/ez80_spimmcsd.c +++ b/boards/z80/ez80/makerlisp/src/ez80_spimmcsd.c @@ -1,5 +1,5 @@ /***************************************************************************** - * boards/z80/makerlisp/src/ez80_spimmcsd.c + * boards/z80/ez80/makerlisp/src/ez80_spimmcsd.c * * Copyright (C) 2019 Greg Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/z80/ez80/makerlisp/src/makerlisp.h b/boards/z80/ez80/makerlisp/src/makerlisp.h index 168ab4ea43..9747795529 100644 --- a/boards/z80/ez80/makerlisp/src/makerlisp.h +++ b/boards/z80/ez80/makerlisp/src/makerlisp.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/makerlisp/src/makerlisp.h + * boards/z80/ez80/makerlisp/src/makerlisp.h * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef _CONFIGS_MAKERLISP_SRC_MAKERLISP_H -#define _CONFIGS_MAKERLISP_SRC_MAKERLISP_H +#ifndef __BOARDS_Z80_EZ80_MAKERLISP_SRC_MAKERLISP_H +#define __BOARDS_Z80_EZ80_MAKERLISP_SRC_MAKERLISP_H /**************************************************************************** * Included Files @@ -147,4 +147,4 @@ void ez80_spidev_initialize(void); } #endif -#endif /* _CONFIGS_MAKERLISP_SRC_MAKERLISP_H */ +#endif /* __BOARDS_Z80_EZ80_MAKERLISP_SRC_MAKERLISP_H */ diff --git a/boards/z80/ez80/makerlisp/src/sd_main.c b/boards/z80/ez80/makerlisp/src/sd_main.c index 0618330b55..2c9f837bfa 100644 --- a/boards/z80/ez80/makerlisp/src/sd_main.c +++ b/boards/z80/ez80/makerlisp/src/sd_main.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/z80/makerlisp/src/sd_main.c + * boards/z80/ez80/makerlisp/src/sd_main.c * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/z80/z180/p112/include/board.h b/boards/z80/z180/p112/include/board.h index 0a7ef80f84..23c3c16e4d 100644 --- a/boards/z80/z180/p112/include/board.h +++ b/boards/z80/z180/p112/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/p112/include/board.h + * boards/z80/z180/p112/include/board.h * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_Z80_P112_INCLUDE_BOARD_H -#define __BOARDS_Z80_P112_INCLUDE_BOARD_H +#ifndef __BOARDS_Z80_Z180_P112_INCLUDE_BOARD_H +#define __BOARDS_Z80_Z180_P112_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -63,4 +63,4 @@ extern "C" } #endif -#endif /* __BOARDS_Z80_P112_INCLUDE_BOARD_H */ +#endif /* __BOARDS_Z80_Z180_P112_INCLUDE_BOARD_H */ diff --git a/boards/z80/z180/p112/scripts/Make.defs b/boards/z80/z180/p112/scripts/Make.defs index 157d5e0b72..77ab423e80 100644 --- a/boards/z80/z180/p112/scripts/Make.defs +++ b/boards/z80/z180/p112/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/p112/scripts/Make.defs +# boards/z80/z180/p112/scripts/Make.defs # # Copyright (C) 2012, 2014, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/z80/z180/p112/src/Makefile b/boards/z80/z180/p112/src/Makefile index 45e0dcd3f0..08d56c45bb 100644 --- a/boards/z80/z180/p112/src/Makefile +++ b/boards/z80/z180/p112/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/p112/src/Makefile +# boards/z80/z180/p112/src/Makefile # # Copyright (C) 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/z80/z8/z8encore000zco/README.txt b/boards/z80/z8/z8encore000zco/README.txt index 6ebc209d08..2a78cfb195 100644 --- a/boards/z80/z8/z8encore000zco/README.txt +++ b/boards/z80/z8/z8encore000zco/README.txt @@ -41,7 +41,7 @@ Version 5.0.0 Other Versions If you use any version of ZDS-II other than 5.0.0 or if you install ZDS-II at any location other than the default location, you will have to modify - the boards/z8encore000zco/*/Make.defs file and your PATH environment + the boards/z80/z8/z8encore000zco/*/Make.defs file and your PATH environment variable. Configuration Subdirectories diff --git a/boards/z80/z8/z8encore000zco/include/board.h b/boards/z80/z8/z8encore000zco/include/board.h index e693aebb82..e865b967aa 100644 --- a/boards/z80/z8/z8encore000zco/include/board.h +++ b/boards/z80/z8/z8encore000zco/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/z8encore000zco/include/board.h + * boards/z80/z8/z8encore000zco/include/board.h * * Copyright (C) 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __ARCH_BOARD_BOARD_H -#define __ARCH_BOARD_BOARD_H +#ifndef __BOARDS_Z80_Z8_Z8ENCORE000ZCO_INCLUDE_BOARD_H +#define __BOARDS_Z80_Z8_Z8ENCORE000ZCO_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -63,7 +63,8 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -73,4 +74,4 @@ extern "C" { } #endif -#endif /* __ARCH_BOARD_BOARD_H */ +#endif /* __BOARDS_Z80_Z8_Z8ENCORE000ZCO__BOARD_H */ diff --git a/boards/z80/z8/z8encore000zco/src/Makefile b/boards/z80/z8/z8encore000zco/src/Makefile index ac4ff6efcb..ea80a2cccb 100644 --- a/boards/z80/z8/z8encore000zco/src/Makefile +++ b/boards/z80/z8/z8encore000zco/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/z8encore000zco/Makefile +# boards/z80/z8/z8encore000zco/src/Makefile # # Copyright (C) 2008, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/z80/z8/z8encore000zco/src/z8_boot.c b/boards/z80/z8/z8encore000zco/src/z8_boot.c index 6367090d92..dd65c62afc 100644 --- a/boards/z80/z8/z8encore000zco/src/z8_boot.c +++ b/boards/z80/z8/z8encore000zco/src/z8_boot.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/z80/z8encore000zco/src/z8_boot.c + * boards/z80/z8/z8encore000zco/src/z8_boot.c * * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/z80/z8/z8encore000zco/src/z8_leds.c b/boards/z80/z8/z8encore000zco/src/z8_leds.c index 88496e8c9f..217e5cba0f 100644 --- a/boards/z80/z8/z8encore000zco/src/z8_leds.c +++ b/boards/z80/z8/z8encore000zco/src/z8_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/z80/z8encore000zco/src/z8_leds.c + * boards/z80/z8/z8encore000zco/src/z8_leds.c * * Copyright (C) 2008-2009, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/z80/z8/z8f64200100kit/README.txt b/boards/z80/z8/z8f64200100kit/README.txt index 9d669d26d7..43ef211cdc 100644 --- a/boards/z80/z8/z8f64200100kit/README.txt +++ b/boards/z80/z8/z8f64200100kit/README.txt @@ -41,8 +41,8 @@ Version 5.0.0 Other Versions If you use any version of ZDS-II other than 5.0.0 or if you install ZDS-II at any location other than the default location, you will have to modify - the boards/z8f64200100kit/*/Make.defs file and also your PATH environment - variable. + the boards/z80/z8/z8f64200100kit/*/Make.defs file and also your PATH + environment variable. It has been a long time since the z8 port has been used. A lot has changed so it would most likely require a modest effort to get the diff --git a/boards/z80/z8/z8f64200100kit/include/board.h b/boards/z80/z8/z8f64200100kit/include/board.h index 4576a935d8..ac64ea4d8d 100644 --- a/boards/z80/z8/z8f64200100kit/include/board.h +++ b/boards/z80/z8/z8f64200100kit/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/z8f64200100kit/include/board.h + * boards/z80/z8/z8f64200100kit/include/board.h * * Copyright (C) 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __ARCH_BOARD_BOARD_H -#define __ARCH_BOARD_BOARD_H +#ifndef __BOARDS_Z80_Z8_Z8F64200100KIT_INCLUDE_BOARD_H +#define __BOARDS_Z80_Z8_Z8F64200100KIT_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -63,7 +63,8 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -73,4 +74,4 @@ extern "C" { } #endif -#endif /* __ARCH_BOARD_BOARD_H */ +#endif /* __BOARDS_Z80_Z8_Z8F64200100KIT_INCLUDE_BOARD_H */ diff --git a/boards/z80/z8/z8f64200100kit/src/Makefile b/boards/z80/z8/z8f64200100kit/src/Makefile index 3464271316..57e66dadeb 100644 --- a/boards/z80/z8/z8f64200100kit/src/Makefile +++ b/boards/z80/z8/z8f64200100kit/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/z8f64200100kit/Makefile +# boards/z80/z8/z8f64200100kit/src/Makefile # # Copyright (C) 2008, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/z80/z8/z8f64200100kit/src/z8_boot.c b/boards/z80/z8/z8f64200100kit/src/z8_boot.c index ab8b07ba95..367317930f 100644 --- a/boards/z80/z8/z8f64200100kit/src/z8_boot.c +++ b/boards/z80/z8/z8f64200100kit/src/z8_boot.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/z80/z8f64200100kit/src/z8_boot.c + * boards/z80/z8/z8f64200100kit/src/z8_boot.c * * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/z80/z8/z8f64200100kit/src/z8_leds.c b/boards/z80/z8/z8f64200100kit/src/z8_leds.c index 87181cee6c..47e76da42a 100644 --- a/boards/z80/z8/z8f64200100kit/src/z8_leds.c +++ b/boards/z80/z8/z8f64200100kit/src/z8_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/z80/z8f64200100kit/src/z8_leds.c + * boards/z80/z8/z8f64200100kit/src/z8_leds.c * * Copyright (C) 2008-2009, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/z80/z80/z80sim/include/board.h b/boards/z80/z80/z80sim/include/board.h index 62132acc6e..28d0fb507f 100644 --- a/boards/z80/z80/z80sim/include/board.h +++ b/boards/z80/z80/z80sim/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/z80/z80sim/include/board.h + * boards/z80/z80/z80sim/include/board.h * * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __ARCH_BOARD_BOARD_H -#define __ARCH_BOARD_BOARD_H +#ifndef __BOARDS_Z80_Z80_Z80SIM_INCLUDE_BOARD_H +#define __BOARDS_Z80_Z80_Z80SIM_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -50,7 +50,8 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -63,4 +64,4 @@ EXTERN char z80_lowgetc(void) __naked; } #endif -#endif /* __ARCH_BOARD_BOARD_H */ +#endif /* __BOARDS_Z80_Z80_Z80SIM_INCLUDE_BOARD_H */ diff --git a/boards/z80/z80/z80sim/scripts/Make.defs b/boards/z80/z80/z80sim/scripts/Make.defs index 3a1939ca0c..cae4d93fd8 100644 --- a/boards/z80/z80/z80sim/scripts/Make.defs +++ b/boards/z80/z80/z80sim/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/z80/z80sim/scripts/Make.defs +# boards/z80/z80/z80sim/scripts/Make.defs # # Copyright (C) 2007, 2008, 2012, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/z80/z80/z80sim/src/z80_irq.c b/boards/z80/z80/z80sim/src/z80_irq.c index 0c8b12feae..01b2ad9a01 100644 --- a/boards/z80/z80/z80sim/src/z80_irq.c +++ b/boards/z80/z80/z80sim/src/z80_irq.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/z80/z80sim/src/z80_irq.c + * boards/z80/z80/z80sim/src/z80_irq.c * * Copyright (C) 2007-2009, 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/z80/z80/z80sim/src/z80_lowputc.c b/boards/z80/z80/z80sim/src/z80_lowputc.c index 50ca0e39c8..c5dee52235 100644 --- a/boards/z80/z80/z80sim/src/z80_lowputc.c +++ b/boards/z80/z80/z80sim/src/z80_lowputc.c @@ -1,5 +1,5 @@ -/******************************************************************************** - * boards/z80/z80sim/src//z80_lowputc.c +/**************************************************************************** + * boards/z80/z80/z80sim/src/z80_lowputc.c * * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -31,11 +31,11 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ********************************************************************************/ + ****************************************************************************/ -/******************************************************************************** +/**************************************************************************** * Included Files - ********************************************************************************/ + ****************************************************************************/ #include @@ -46,32 +46,32 @@ #include "z80_internal.h" -/******************************************************************************** +/**************************************************************************** * Pre-processor Definitions - ********************************************************************************/ + ****************************************************************************/ -/******************************************************************************** +/**************************************************************************** * Public Data - ********************************************************************************/ + ****************************************************************************/ -/******************************************************************************** +/**************************************************************************** * Private Data - ********************************************************************************/ + ****************************************************************************/ -/******************************************************************************** +/**************************************************************************** * Private Functions - ********************************************************************************/ + ****************************************************************************/ -/******************************************************************************** +/**************************************************************************** * Public Functions - ********************************************************************************/ + ****************************************************************************/ -/******************************************************************************** +/**************************************************************************** * Name: z80_lowputc * * Data sent to port 0xbe are echoed on stdout by the simulation * - ********************************************************************************/ + ****************************************************************************/ void z80_lowputc(char ch) __naked { @@ -84,12 +84,12 @@ void z80_lowputc(char ch) __naked ); } -/******************************************************************************** +/**************************************************************************** * Name: z80_lowgetc * * Data from stdin can be received on port 0xbe in the simulation * - ********************************************************************************/ + ****************************************************************************/ char z80_lowgetc(void) __naked { diff --git a/boards/z80/z80/z80sim/src/z80_serial.c b/boards/z80/z80/z80sim/src/z80_serial.c index 3ce9d556f5..beec65de75 100644 --- a/boards/z80/z80/z80sim/src/z80_serial.c +++ b/boards/z80/z80/z80sim/src/z80_serial.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/z80/z80sim/src/z80_serial.c + * boards/z80/z80/z80sim/src/z80_serial.c * * Copyright (C) 2007-2009, 2012, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -174,8 +174,9 @@ static void up_shutdown(FAR struct uart_dev_s *dev) * non-interrupt driven mode during the boot phase. * * RX and TX interrupts are not enabled by the attach method (unless the - * hardware supports multiple levels of interrupt enabling). The RX and TX - * interrupts are not enabled until the txint() and rxint() methods are called. + * hardware supports multiple levels of interrupt enabling). + * The RX and TX interrupts are not enabled until the txint() and rxint() + * methods are called. * ****************************************************************************/ @@ -189,8 +190,8 @@ static int up_attach(FAR struct uart_dev_s *dev) * * Description: * Detach UART interrupts. This method is called when the serial port is - * closed normally just before the shutdown method is called. The exception is - * the serial console which is never shutdown. + * closed normally just before the shutdown method is called. + * The exception is the serial console which is never shutdown. * ****************************************************************************/ diff --git a/boards/z80/z80/z80sim/src/z80_timerisr.c b/boards/z80/z80/z80sim/src/z80_timerisr.c index b6c1da4762..dd5937b704 100644 --- a/boards/z80/z80/z80sim/src/z80_timerisr.c +++ b/boards/z80/z80/z80sim/src/z80_timerisr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/z80/z80sim/src/z80_timerisr.c + * boards/z80/z80/z80sim/src/z80_timerisr.c * * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -61,10 +61,10 @@ int z80sim_timerisr(int irq, FAR chipreg_t *regs, void *arg) { - /* Process timer interrupt */ + /* Process timer interrupt */ - nxsched_process_timer(); - return 0; + nxsched_process_timer(); + return 0; } /****************************************************************************