From dd681d7fff4dcc39f46ebf9f7dbaf87511fc411f Mon Sep 17 00:00:00 2001 From: patacongo Date: Wed, 15 Aug 2012 17:58:54 +0000 Subject: [PATCH 01/31] Some repartitioning of STM32 functionality to better support a USB host driver git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5028 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/arch/arm/src/stm32/Make.defs | 6 + .../{stm32_usbhost.c => stm32_otgfshost.c} | 2 +- nuttx/arch/arm/src/stm32/stm32_usbhost.h | 31 +++++ nuttx/arch/arm/src/stm32/stm32f20xxx_rcc.c | 2 +- nuttx/arch/arm/src/stm32/stm32f40xxx_rcc.c | 2 +- nuttx/configs/stm3220g-eval/include/board.h | 4 +- nuttx/configs/stm3220g-eval/src/Makefile | 4 +- .../stm3220g-eval/src/stm3220g-internal.h | 57 ++++++--- nuttx/configs/stm3220g-eval/src/up_boot.c | 8 +- .../src/{up_usbdev.c => up_usb.c} | 109 +++++++++++++++++- nuttx/configs/stm3240g-eval/include/board.h | 4 +- .../configs/stm32f4discovery/include/board.h | 4 +- 12 files changed, 195 insertions(+), 38 deletions(-) rename nuttx/arch/arm/src/stm32/{stm32_usbhost.c => stm32_otgfshost.c} (99%) rename nuttx/configs/stm3220g-eval/src/{up_usbdev.c => up_usb.c} (54%) diff --git a/nuttx/arch/arm/src/stm32/Make.defs b/nuttx/arch/arm/src/stm32/Make.defs index 9cdf1314ec..24af16c951 100644 --- a/nuttx/arch/arm/src/stm32/Make.defs +++ b/nuttx/arch/arm/src/stm32/Make.defs @@ -76,6 +76,12 @@ CMN_CSRCS += stm32_otgfsdev.c endif endif +ifeq ($(CONFIG_USBHOST),y) +ifeq ($(CONFIG_STM32_OTGFS),y) +CMN_CSRCS += stm32_otgfshost.c +endif +endif + ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y) CHIP_ASRCS += stm32_vectors.S endif diff --git a/nuttx/arch/arm/src/stm32/stm32_usbhost.c b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c similarity index 99% rename from nuttx/arch/arm/src/stm32/stm32_usbhost.c rename to nuttx/arch/arm/src/stm32/stm32_otgfshost.c index 4bf6d646da..75283107e3 100644 --- a/nuttx/arch/arm/src/stm32/stm32_usbhost.c +++ b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c @@ -1,5 +1,5 @@ /******************************************************************************* - * arch/arm/src/stm32/stm32_usbhost.c + * arch/arm/src/stm32/stm32_otgfshost.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt diff --git a/nuttx/arch/arm/src/stm32/stm32_usbhost.h b/nuttx/arch/arm/src/stm32/stm32_usbhost.h index 854c327235..b4f8932670 100644 --- a/nuttx/arch/arm/src/stm32/stm32_usbhost.h +++ b/nuttx/arch/arm/src/stm32/stm32_usbhost.h @@ -47,6 +47,8 @@ #include "chip.h" #include "chip/stm32_otgfs.h" +#if defined(CONFIG_STM32_OTGFS) && defined(CONFIG_USBHOST) + /************************************************************************************ * Public Functions ************************************************************************************/ @@ -61,11 +63,40 @@ extern "C" { #define EXTERN extern #endif +/*********************************************************************************** + * Name: stm32_usbhost_vbusdrive + * + * Description: + * Enable/disable driving of VBUS 5V output. This function must be provided be + * each platform that implements the STM32 OTG FS host interface + * + * "On-chip 5 V VBUS generation is not supported. For this reason, a charge pump + * or, if 5 V are available on the application board, a basic power switch, must + * be added externally to drive the 5 V VBUS line. The external charge pump can + * be driven by any GPIO output. When the application decides to power on VBUS + * using the chosen GPIO, it must also set the port power bit in the host port + * control and status register (PPWR bit in OTG_FS_HPRT). + * + * "The application uses this field to control power to this port, and the core + * clears this bit on an overcurrent condition." + * + * Input Parameters: + * iface - For future growth to handle multiple USB host interface. Should be zero. + * enable - true: enable VBUS power; false: disable VBUS power + * + * Returned Value: + * None + * + ***********************************************************************************/ + +EXTERN void stm32_usbhost_vbusdrive(int iface, bool enable); + #undef EXTERN #if defined(__cplusplus) } #endif #endif /* __ASSEMBLY__ */ +#endif /* CONFIG_STM32_OTGFS && CONFIG_USBHOST */ #endif /* __ARCH_ARM_SRC_STM32_STM32_USBHOST_H */ diff --git a/nuttx/arch/arm/src/stm32/stm32f20xxx_rcc.c b/nuttx/arch/arm/src/stm32/stm32f20xxx_rcc.c index 8cfd405ded..335992524c 100644 --- a/nuttx/arch/arm/src/stm32/stm32f20xxx_rcc.c +++ b/nuttx/arch/arm/src/stm32/stm32f20xxx_rcc.c @@ -616,7 +616,7 @@ static void stm32_stdclockconfig(void) /* Set the PLL dividers and multiplers to configure the main PLL */ regval = (STM32_PLLCFG_PLLM | STM32_PLLCFG_PLLN |STM32_PLLCFG_PLLP | - RCC_PLLCFG_PLLSRC_HSE | STM32_PLLCFG_PPQ); + RCC_PLLCFG_PLLSRC_HSE | STM32_PLLCFG_PLLQ); putreg32(regval, STM32_RCC_PLLCFG); /* Enable the main PLL */ diff --git a/nuttx/arch/arm/src/stm32/stm32f40xxx_rcc.c b/nuttx/arch/arm/src/stm32/stm32f40xxx_rcc.c index 7ba341b2b8..45980f2889 100644 --- a/nuttx/arch/arm/src/stm32/stm32f40xxx_rcc.c +++ b/nuttx/arch/arm/src/stm32/stm32f40xxx_rcc.c @@ -618,7 +618,7 @@ static void stm32_stdclockconfig(void) /* Set the PLL dividers and multiplers to configure the main PLL */ regval = (STM32_PLLCFG_PLLM | STM32_PLLCFG_PLLN |STM32_PLLCFG_PLLP | - RCC_PLLCFG_PLLSRC_HSE | STM32_PLLCFG_PPQ); + RCC_PLLCFG_PLLSRC_HSE | STM32_PLLCFG_PLLQ); putreg32(regval, STM32_RCC_PLLCFG); /* Enable the main PLL */ diff --git a/nuttx/configs/stm3220g-eval/include/board.h b/nuttx/configs/stm3220g-eval/include/board.h index dc2f04b9e4..c70946000e 100644 --- a/nuttx/configs/stm3220g-eval/include/board.h +++ b/nuttx/configs/stm3220g-eval/include/board.h @@ -77,7 +77,7 @@ * PLLM : 25 (STM32_PLLCFG_PLLM) * PLLN : 240 (STM32_PLLCFG_PLLN) * PLLP : 2 (STM32_PLLCFG_PLLP) - * PLLQ : 5 (STM32_PLLCFG_PPQ) + * PLLQ : 5 (STM32_PLLCFG_PLLQ) * Main regulator output voltage : Scale1 mode Needed for high speed SYSCLK * Flash Latency(WS) : 5 * Prefetch Buffer : OFF @@ -117,7 +117,7 @@ #define STM32_PLLCFG_PLLM RCC_PLLCFG_PLLM(25) #define STM32_PLLCFG_PLLN RCC_PLLCFG_PLLN(240) #define STM32_PLLCFG_PLLP RCC_PLLCFG_PLLP_2 -#define STM32_PLLCFG_PPQ RCC_PLLCFG_PLLQ(5) +#define STM32_PLLCFG_PLLQ RCC_PLLCFG_PLLQ(5) #define STM32_SYSCLK_FREQUENCY 120000000ul diff --git a/nuttx/configs/stm3220g-eval/src/Makefile b/nuttx/configs/stm3220g-eval/src/Makefile index 96ad0d10c6..0aeb872d66 100644 --- a/nuttx/configs/stm3220g-eval/src/Makefile +++ b/nuttx/configs/stm3220g-eval/src/Makefile @@ -56,8 +56,8 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += up_buttons.c endif -ifeq ($(CONFIG_USBDEV),y) -CSRCS += up_usbdev.c +ifeq ($(CONFIG_STM32_OTGFS),y) +CSRCS += up_usb.c endif ifeq ($(CONFIG_STM32_FSMC),y) diff --git a/nuttx/configs/stm3220g-eval/src/stm3220g-internal.h b/nuttx/configs/stm3220g-eval/src/stm3220g-internal.h index 2391f3c4a3..a93b7cd0eb 100644 --- a/nuttx/configs/stm3220g-eval/src/stm3220g-internal.h +++ b/nuttx/configs/stm3220g-eval/src/stm3220g-internal.h @@ -134,9 +134,14 @@ * PF11 OTG_FS_Overcurrent */ -#define GPIO_OTGFS_VBUS (GPIO_INPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|GPIO_OPENDRAIN|GPIO_PORTA|GPIO_PIN9) -#define GPIO_OTGFS_PWRON (GPIO_OUTPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PORTH|GPIO_PIN5) -#define GPIO_OTGFS_OVER (GPIO_INPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PORTF|GPIO_PIN11) +#define GPIO_OTGFS_VBUS (GPIO_INPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|GPIO_OPENDRAIN|GPIO_PORTA|GPIO_PIN9) +#define GPIO_OTGFS_PWRON (GPIO_OUTPUT|GPIO_FLOAT|GPIO_OUTPUT_SET|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PORTH|GPIO_PIN5) + +#ifdef CONFIG_USBHOST +# define GPIO_OTGFS_OVER (GPIO_INPUT|GPIO_EXTI|GPIO_FLOAT|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PORTF|GPIO_PIN11) +#else +# define GPIO_OTGFS_OVER (GPIO_INPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PORTF|GPIO_PIN11) +#endif /* The STM3220G-EVAL has two STMPE811QTR I/O expanders on board both connected * to the STM32 via I2C1. They share a common interrupt line: PI2. @@ -212,47 +217,63 @@ void weak_function stm32_spiinitialize(void); -/************************************************************************************ +/**************************************************************************************************** * Name: stm32_usbinitialize * * Description: - * Called to setup USB-related GPIO pins for the STM3210E-EVAL board. + * Called from stm32_usbinitialize very early in inialization to setup USB-related GPIO pins for + * the STM3220G-EVAL board. * - ************************************************************************************/ + ****************************************************************************************************/ +#ifdef CONFIG_STM32_OTGFS void weak_function stm32_usbinitialize(void); +#endif -/************************************************************************************ +/**************************************************************************************************** + * Name: stm32_usbhost_initialize + * + * Description: + * Called at application startup time to initialize the USB host functionality. This function will + * start a thread that will monitor for device connection/disconnection events. + * + ****************************************************************************************************/ + +#if defined(CONFIG_STM32_OTGFS) && defined(CONFIG_USBHOST) +void stm32_usbhost_initialize(void); +#endif + +/**************************************************************************************************** * Name: stm32_extmemgpios * * Description: * Initialize GPIOs for external memory usage * - ************************************************************************************/ + ****************************************************************************************************/ #ifdef CONFIG_STM32_FSMC void stm32_extmemgpios(const uint32_t *gpios, int ngpios); #endif -/************************************************************************************ +/**************************************************************************************************** * Name: stm32_extmemaddr * * Description: * Initialize adress line GPIOs for external memory access * - ************************************************************************************/ + ****************************************************************************************************/ #ifdef CONFIG_STM32_FSMC void stm32_extmemaddr(int naddrs); #endif -/************************************************************************************ +/**************************************************************************************************** * Name: stm32_extmemdata * * Description: * Initialize data line GPIOs for external memory access * - ************************************************************************************/ + ****************************************************************************************************/ #ifdef CONFIG_STM32_FSMC void stm32_extmemdata(int ndata); @@ -264,7 +285,7 @@ void stm32_extmemdata(int ndata); * Description: * enable clocking to the FSMC module * - ************************************************************************************/ + ****************************************************************************************************/ #ifdef CONFIG_STM32_FSMC void stm32_enablefsmc(void); @@ -276,7 +297,7 @@ void stm32_enablefsmc(void); * Description: * enable clocking to the FSMC module * - ************************************************************************************/ + ****************************************************************************************************/ #ifdef CONFIG_STM32_FSMC void stm32_disablefsmc(void); @@ -306,7 +327,7 @@ void stm32_disablefsmc(void); * word and uses the needed byte only). The NBL[1:0] are always kept low * during read transactions. * - ************************************************************************************/ + ****************************************************************************************************/ #ifdef CONFIG_STM32_FSMC void stm32_selectsram(void); @@ -318,7 +339,7 @@ void stm32_selectsram(void); * Description: * Disable SRAM * - ************************************************************************************/ + ****************************************************************************************************/ #ifdef CONFIG_STM32_FSMC void stm32_deselectsram(void); @@ -330,7 +351,7 @@ void stm32_deselectsram(void); * Description: * Initialize to the LCD * - ************************************************************************************/ + ****************************************************************************************************/ #ifdef CONFIG_STM32_FSMC void stm32_selectlcd(void); @@ -342,7 +363,7 @@ void stm32_selectlcd(void); * Description: * Disable the LCD * - ************************************************************************************/ + ****************************************************************************************************/ #ifdef CONFIG_STM32_FSMC void stm32_deselectlcd(void); diff --git a/nuttx/configs/stm3220g-eval/src/up_boot.c b/nuttx/configs/stm3220g-eval/src/up_boot.c index 290f412336..fa24a86b44 100644 --- a/nuttx/configs/stm3220g-eval/src/up_boot.c +++ b/nuttx/configs/stm3220g-eval/src/up_boot.c @@ -88,12 +88,12 @@ void stm32_boardinitialize(void) stm32_selectsram(); #endif - /* Initialize USB is 1) USBDEV is selected, 2) the OTG FS controller is not - * disabled, and 3) the weak function stm32_usbinitialize() has been brought - * into the build. + /* Initialize USB if the 1) OTG FS controller is in the configuration and 2) + * the weak function stm32_usbinitialize() has been brought into the build. + * Presumeably either CONFIG_USBDEV or CONFIG_USBHOST is also selected. */ -#if defined(CONFIG_USBDEV) && defined(CONFIG_STM32_OTGFS) +#ifdef CONFIG_STM32_OTGFS if (stm32_usbinitialize) { stm32_usbinitialize(); diff --git a/nuttx/configs/stm3220g-eval/src/up_usbdev.c b/nuttx/configs/stm3220g-eval/src/up_usb.c similarity index 54% rename from nuttx/configs/stm3220g-eval/src/up_usbdev.c rename to nuttx/configs/stm3220g-eval/src/up_usb.c index 10d99571c6..12cb2373f0 100644 --- a/nuttx/configs/stm3220g-eval/src/up_usbdev.c +++ b/nuttx/configs/stm3220g-eval/src/up_usb.c @@ -1,6 +1,6 @@ /************************************************************************************ - * configs/stm3220g-eval/src/up_usbdev.c - * arch/arm/src/board/up_boot.c + * configs/stm3220g-eval/src/up_usb.c + * arch/arm/src/board/up_usb.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -52,10 +52,19 @@ #include "stm32_internal.h" #include "stm3220g-internal.h" +#ifdef CONFIG_STM32_OTGFS + /************************************************************************************ * Definitions ************************************************************************************/ +#if defined(CONFIG_USBDEV) || defined(CONFIG_USBDEV) +# define HAVE_USB 1 +#else +# warning "CONFIG_STM32_OTGFS is enabled but neither CONFIG_USBDEV nor CONFIG_USBDEV" +# undef HAVE_USB +#endif + /************************************************************************************ * Private Functions ************************************************************************************/ @@ -68,23 +77,109 @@ * Name: stm32_usbinitialize * * Description: - * Called to setup USB-related GPIO pins for the STM3210E-EVAL board. + * Called from stm32_usbinitialize very early in inialization to setup USB-related + * GPIO pins for the STM3220G-EVAL board. * ************************************************************************************/ void stm32_usbinitialize(void) { - /* The OTG FS has an internal soft pull-up */ +#ifdef HAVE_USB + /* The OTG FS has an internal soft pull-up. No GPIO configuration is required */ /* Configure the OTG FS VBUS sensing GPIO, Power On, and Overcurrent GPIOs */ -#ifdef CONFIG_STM32_OTGFS stm32_configgpio(GPIO_OTGFS_VBUS); stm32_configgpio(GPIO_OTGFS_PWRON); stm32_configgpio(GPIO_OTGFS_OVER); #endif } +/*********************************************************************************** + * Name: stm32_usbhost_initialize + * + * Description: + * Called at application startup time to initialize the USB host functionality. + * This function will start a thread that will monitor for device + * connection/disconnection events. + * + ***********************************************************************************/ + +#ifdef CONFIG_USBHOST +void stm32_usbhost_initialize(void) +{ +#warning "Missing logic" +} +#endif + +/*********************************************************************************** + * Name: stm32_usbhost_vbusdrive + * + * Description: + * Enable/disable driving of VBUS 5V output. This function must be provided be + * each platform that implements the STM32 OTG FS host interface + * + * "On-chip 5 V VBUS generation is not supported. For this reason, a charge pump + * or, if 5 V are available on the application board, a basic power switch, must + * be added externally to drive the 5 V VBUS line. The external charge pump can + * be driven by any GPIO output. When the application decides to power on VBUS + * using the chosen GPIO, it must also set the port power bit in the host port + * control and status register (PPWR bit in OTG_FS_HPRT). + * + * "The application uses this field to control power to this port, and the core + * clears this bit on an overcurrent condition." + * + * Input Parameters: + * iface - For future growth to handle multiple USB host interface. Should be zero. + * enable - true: enable VBUS power; false: disable VBUS power + * + * Returned Value: + * None + * + ***********************************************************************************/ + +#ifdef CONFIG_USBHOST +void stm32_usbhost_vbusdrive(int iface, bool enable) +{ + DEBUGASSERT(iface == 0); + + if (enable) + { + /* Enable the Power Switch by driving the enable pin low */ + + stm32_gpiowrite(GPIO_OTGFS_PWRON, false); + } + else + { + /* Disable the Power Switch by driving the enable pin high */ + + stm32_gpiowrite(GPIO_OTGFS_PWRON, true); + } +} +#endif + +/************************************************************************************ + * Name: stm32_setup_overcurrent + * + * Description: + * Setup to receive an interrupt-level callback if an overcurrent condition is + * detected. + * + * Input paramter: + * handler - New overcurrent interrupt handler + * + * Returned value: + * Old overcurrent interrupt handler + * + ************************************************************************************/ + +#ifdef CONFIG_USBHOST +xcpt_t stm32_setup_overcurrent(xcpt_t handler) +{ + return stm32_gpiosetevent(GPIO_OTGFS_OVER, true, true, true, handler); +} +#endif + /************************************************************************************ * Name: stm32_usbsuspend * @@ -96,8 +191,12 @@ void stm32_usbinitialize(void) * ************************************************************************************/ +#ifdef CONFIG_USBDEV void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) { ulldbg("resume: %d\n", resume); } +#endif + +#endif /* CONFIG_STM32_OTGFS */ diff --git a/nuttx/configs/stm3240g-eval/include/board.h b/nuttx/configs/stm3240g-eval/include/board.h index 6583552633..8fa7d0dd42 100755 --- a/nuttx/configs/stm3240g-eval/include/board.h +++ b/nuttx/configs/stm3240g-eval/include/board.h @@ -75,7 +75,7 @@ * PLLM : 25 (STM32_PLLCFG_PLLM) * PLLN : 336 (STM32_PLLCFG_PLLN) * PLLP : 2 (STM32_PLLCFG_PLLP) - * PLLQ : 7 (STM32_PLLCFG_PPQ) + * PLLQ : 7 (STM32_PLLCFG_PLLQ) * Main regulator output voltage : Scale1 mode Needed for high speed SYSCLK * Flash Latency(WS) : 5 * Prefetch Buffer : OFF @@ -114,7 +114,7 @@ #define STM32_PLLCFG_PLLM RCC_PLLCFG_PLLM(25) #define STM32_PLLCFG_PLLN RCC_PLLCFG_PLLN(336) #define STM32_PLLCFG_PLLP RCC_PLLCFG_PLLP_2 -#define STM32_PLLCFG_PPQ RCC_PLLCFG_PLLQ(7) +#define STM32_PLLCFG_PLLQ RCC_PLLCFG_PLLQ(7) #define STM32_SYSCLK_FREQUENCY 168000000ul diff --git a/nuttx/configs/stm32f4discovery/include/board.h b/nuttx/configs/stm32f4discovery/include/board.h index 414c78a645..3b9d970761 100644 --- a/nuttx/configs/stm32f4discovery/include/board.h +++ b/nuttx/configs/stm32f4discovery/include/board.h @@ -68,7 +68,7 @@ * PLLM : 8 (STM32_PLLCFG_PLLM) * PLLN : 336 (STM32_PLLCFG_PLLN) * PLLP : 2 (STM32_PLLCFG_PLLP) - * PLLQ : 7 (STM32_PLLCFG_PPQ) + * PLLQ : 7 (STM32_PLLCFG_PLLQ) * Main regulator output voltage : Scale1 mode Needed for high speed SYSCLK * Flash Latency(WS) : 5 * Prefetch Buffer : OFF @@ -107,7 +107,7 @@ #define STM32_PLLCFG_PLLM RCC_PLLCFG_PLLM(8) #define STM32_PLLCFG_PLLN RCC_PLLCFG_PLLN(336) #define STM32_PLLCFG_PLLP RCC_PLLCFG_PLLP_2 -#define STM32_PLLCFG_PPQ RCC_PLLCFG_PLLQ(7) +#define STM32_PLLCFG_PLLQ RCC_PLLCFG_PLLQ(7) #define STM32_SYSCLK_FREQUENCY 168000000ul From 5a8984c8007f939297395e73b330079d0fd632d9 Mon Sep 17 00:00:00 2001 From: patacongo Date: Wed, 15 Aug 2012 22:13:50 +0000 Subject: [PATCH 02/31] A little more STM32 USB host logic git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5029 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/arch/arm/src/stm32/stm32_otgfshost.c | 22 ++++- .../stm3220g-eval/src/stm3220g-internal.h | 2 +- nuttx/configs/stm3220g-eval/src/up_nsh.c | 22 +++-- nuttx/configs/stm3220g-eval/src/up_usb.c | 92 ++++++++++++++++++- 4 files changed, 127 insertions(+), 11 deletions(-) diff --git a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c index 75283107e3..57161088a7 100644 --- a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c +++ b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c @@ -314,7 +314,8 @@ static void stm32_disconnect(FAR struct usbhost_driver_s *drvr); /* Initialization **************************************************************/ -static inline void stm32_ep0init(struct stm32_usbhost_s *priv); +static inline void stm32_ep0init(FAR struct stm32_usbhost_s *priv); +static inline int stm32_hcdinitialize(FAR struct stm32_usbhost_s *priv); /******************************************************************************* * Private Data @@ -2434,6 +2435,25 @@ static inline void stm32_ep0init(struct stm32_usbhost_s *priv) stm32_putreg(regval, STM32_USBHOST_CTRL); } +/******************************************************************************* + * Name: stm32_hcdinitialize + * + * Description: + * Setup the host controller harware for normal operations. + * + * Input Parameters: + * priv -- USB host driver private data structure. + * + * Returned Value: + * Zero on success; a negated errno value on failure. + * + *******************************************************************************/ + +static inline int stm32_hcdinitialize(FAR struct stm32_usbhost_s *priv) +{ +#warning "Missing Logic" +} + /******************************************************************************* * Public Functions *******************************************************************************/ diff --git a/nuttx/configs/stm3220g-eval/src/stm3220g-internal.h b/nuttx/configs/stm3220g-eval/src/stm3220g-internal.h index a93b7cd0eb..27f0a004c8 100644 --- a/nuttx/configs/stm3220g-eval/src/stm3220g-internal.h +++ b/nuttx/configs/stm3220g-eval/src/stm3220g-internal.h @@ -240,7 +240,7 @@ void weak_function stm32_usbinitialize(void); ****************************************************************************************************/ #if defined(CONFIG_STM32_OTGFS) && defined(CONFIG_USBHOST) -void stm32_usbhost_initialize(void); +int stm32_usbhost_initialize(void); #endif /**************************************************************************************************** diff --git a/nuttx/configs/stm3220g-eval/src/up_nsh.c b/nuttx/configs/stm3220g-eval/src/up_nsh.c index b296f229b2..3b061902ba 100644 --- a/nuttx/configs/stm3220g-eval/src/up_nsh.c +++ b/nuttx/configs/stm3220g-eval/src/up_nsh.c @@ -148,25 +148,22 @@ int nsh_archinitialize(void) #ifdef CONFIG_STM32_SPI1 /* Get the SPI port */ - message("nsh_archinitialize: Initializing SPI port 1\n"); spi = up_spiinitialize(1); if (!spi) { message("nsh_archinitialize: Failed to initialize SPI port 0\n"); return -ENODEV; } - message("nsh_archinitialize: Successfully initialized SPI port 0\n"); /* Now bind the SPI interface to the M25P64/128 SPI FLASH driver */ - message("nsh_archinitialize: Bind SPI to the SPI flash driver\n"); mtd = m25p_initialize(spi); if (!mtd) { message("nsh_archinitialize: Failed to bind SPI port 0 to the SPI FLASH driver\n"); return -ENODEV; } - message("nsh_archinitialize: Successfully bound SPI port 0 to the SPI FLASH driver\n"); + #warning "Now what are we going to do with this SPI FLASH driver?" #endif @@ -187,15 +184,12 @@ int nsh_archinitialize(void) /* Now bind the SDIO interface to the MMC/SD driver */ - message("nsh_archinitialize: Bind SDIO to the MMC/SD driver, minor=%d\n", - CONFIG_NSH_MMCSDMINOR); ret = mmcsd_slotinitialize(CONFIG_NSH_MMCSDMINOR, sdio); if (ret != OK) { message("nsh_archinitialize: Failed to bind SDIO to the MMC/SD driver: %d\n", ret); return ret; } - message("nsh_archinitialize: Successfully bound SDIO to the MMC/SD driver\n"); /* Then let's guess and say that there is a card in the slot. I need to check to * see if the STM3220G-EVAL board supports a GPIO to detect if there is a card in @@ -204,5 +198,19 @@ int nsh_archinitialize(void) sdio_mediachange(sdio, true); #endif + + /* Initialize USB host operation. stm32_usbhost_initialize() starts a thread + * will monitor for USB connection and disconnection events. + */ + +#if defined(CONFIG_STM32_OTGFS) && defined(CONFIG_USBHOST) + ret = stm32_usbhost_initialize(); + if (ret != OK) + { + message("nsh_archinitialize: Failed to initialize USB host: %d\n", ret); + return ret; + } +#endif + return OK; } diff --git a/nuttx/configs/stm3220g-eval/src/up_usb.c b/nuttx/configs/stm3220g-eval/src/up_usb.c index 12cb2373f0..374d974ffc 100644 --- a/nuttx/configs/stm3220g-eval/src/up_usb.c +++ b/nuttx/configs/stm3220g-eval/src/up_usb.c @@ -46,6 +46,7 @@ #include #include +#include #include #include "up_arch.h" @@ -65,10 +66,67 @@ # undef HAVE_USB #endif +#ifndef CONFIG_USBHOST_DEFPRIO +# define CONFIG_USBHOST_DEFPRIO 50 +#endif + +#ifndef CONFIG_USBHOST_STACKSIZE +# define CONFIG_USBHOST_STACKSIZE 1024 +#endif + +/************************************************************************************ + * Private Data + ************************************************************************************/ + +#ifdef CONFIG_NSH_HAVEUSBHOST +static struct usbhost_driver_s *g_drvr; +#endif + /************************************************************************************ * Private Functions ************************************************************************************/ +/**************************************************************************** + * Name: usbhost_waiter + * + * Description: + * Wait for USB devices to be connected. + * + ****************************************************************************/ + +#ifdef CONFIG_NSH_HAVEUSBHOST +static int usbhost_waiter(int argc, char *argv[]) +{ + bool connected = false; + int ret; + + uvdbg("Running\n"); + for (;;) + { + /* Wait for the device to change state */ + + ret = DRVR_WAIT(g_drvr, connected); + DEBUGASSERT(ret == OK); + + connected = !connected; + uvdbg("%s\n", connected ? "connected" : "disconnected"); + + /* Did we just become connected? */ + + if (connected) + { + /* Yes.. enumerate the newly connected device */ + + (void)DRVR_ENUMERATE(g_drvr); + } + } + + /* Keep the compiler from complaining */ + + return 0; +} +#endif + /************************************************************************************ * Public Functions ************************************************************************************/ @@ -106,9 +164,39 @@ void stm32_usbinitialize(void) ***********************************************************************************/ #ifdef CONFIG_USBHOST -void stm32_usbhost_initialize(void) +int stm32_usbhost_initialize(void) { -#warning "Missing logic" + int pid; + int ret; + + /* First, register all of the class drivers needed to support the drivers + * that we care about: + */ + + uvdbg("Register class drivers\n"); + ret = usbhost_storageinit(); + if (ret != OK) + { + udbg("Failed to register the mass storage class\n"); + } + + /* Then get an instance of the USB host interface */ + + uvdbg("Initialize USB host\n"); + g_drvr = usbhost_initialize(0); + if (g_drvr) + { + /* Start a thread to handle device connection. */ + + uvdbg("Start usbhost_waiter\n"); + + pid = TASK_CREATE("usbhost", CONFIG_USBHOST_DEFPRIO, + CONFIG_USBHOST_STACKSIZE, + (main_t)usbhost_waiter, (const char **)NULL); + return pid < 0 ? -ENOEXEC : OK; + } + + return -ENODEV; } #endif From 3f9f7e6d3c8710e829dc5516603745be883dc530 Mon Sep 17 00:00:00 2001 From: patacongo Date: Thu, 16 Aug 2012 15:00:34 +0000 Subject: [PATCH 03/31] mkconfig now calculates DRAM_END if not provided git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5030 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/ChangeLog | 2 ++ nuttx/Makefile | 8 ++++---- nuttx/tools/mkconfig.c | 7 +++++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 48f1866c33..e589fac759 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -3168,3 +3168,5 @@ serial.c. * arch/arm/src/stm32/stm32_spi.c: SPI driver can now survice re- initialization (Mike Smith). + * tools/mkconfig.c: If CONFIG_DRAM_END is not specified, this tool + will provide default definition of (CONFIG_DRAM_START + CONFIG_DRAM_SIZE) diff --git a/nuttx/Makefile b/nuttx/Makefile index ea83d69ee2..b0a17efd25 100644 --- a/nuttx/Makefile +++ b/nuttx/Makefile @@ -276,8 +276,8 @@ include/stdarg.h: endif # Targets used to build include/nuttx/version.h. Creation of version.h is -# part of the overall NuttX configuration sequency. Notice that the -# tools/mkversion tool is cuilt and used to create include/nuttx/version.h +# part of the overall NuttX configuration sequence. Notice that the +# tools/mkversion tool is built and used to create include/nuttx/version.h tools/mkversion: @$(MAKE) -C tools -f Makefile.host TOPDIR="$(TOPDIR)" mkversion @@ -293,8 +293,8 @@ include/nuttx/version.h: $(TOPDIR)/.version tools/mkversion @tools/mkversion $(TOPDIR) > include/nuttx/version.h # Targets used to build include/nuttx/config.h. Creation of config.h is -# part of the overall NuttX configuration sequency. Notice that the -# tools/mkconfig tool is cuilt and used to create include/nuttx/config.h +# part of the overall NuttX configuration sequence. Notice that the +# tools/mkconfig tool is built and used to create include/nuttx/config.h tools/mkconfig: @$(MAKE) -C tools -f Makefile.host TOPDIR="$(TOPDIR)" mkconfig diff --git a/nuttx/tools/mkconfig.c b/nuttx/tools/mkconfig.c index 97e2a9c34c..b3749266c1 100644 --- a/nuttx/tools/mkconfig.c +++ b/nuttx/tools/mkconfig.c @@ -174,6 +174,12 @@ int main(int argc, char **argv, char **envp) printf("#ifndef CONFIG_MM_REGIONS\n"); printf("# define CONFIG_MM_REGIONS 1\n"); printf("#endif\n\n"); + printf("/* If the end of RAM is not specified then it is assumed to be the beginning\n"); + printf(" * of RAM plus the RAM size.\n"); + printf(" */\n\n"); + printf("#ifndef CONFIG_DRAM_END\n"); + printf("# define CONFIG_DRAM_END (CONFIG_DRAM_START+CONFIG_DRAM_SIZE)\n"); + printf("#endif\n\n"); printf("/* If no file streams are configured, then make certain that buffered I/O\n"); printf(" * support is disabled\n"); printf(" */\n\n"); @@ -256,6 +262,7 @@ int main(int argc, char **argv, char **envp) printf("# undef CONFIG_DEBUG_USB\n"); printf("# undef CONFIG_DEBUG_GRAPHICS\n"); printf("# undef CONFIG_DEBUG_GPIO\n"); + printf("# undef CONFIG_DEBUG_SPI\n"); printf("# undef CONFIG_DEBUG_STACK\n"); printf("#endif\n\n"); printf("#endif /* __INCLUDE_NUTTX_CONFIG_H */\n"); From a740bc83357a124b339337c904d87041eb8cb6f7 Mon Sep 17 00:00:00 2001 From: patacongo Date: Thu, 16 Aug 2012 22:48:26 +0000 Subject: [PATCH 04/31] Evolving STM32 USB host support git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5031 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h | 14 +- .../arm/src/stm32/chip/stm32f20xxx_pinmap.h | 2 +- .../arm/src/stm32/chip/stm32f40xxx_pinmap.h | 2 +- nuttx/arch/arm/src/stm32/stm32_otgfsdev.c | 26 +- nuttx/arch/arm/src/stm32/stm32_otgfshost.c | 1135 +++-------------- 5 files changed, 214 insertions(+), 965 deletions(-) diff --git a/nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h b/nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h index d3bf7eb547..d04f2a67ff 100644 --- a/nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h +++ b/nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h @@ -46,6 +46,12 @@ /**************************************************************************************************** * Pre-processor Definitions ****************************************************************************************************/ +/* General definitions */ + +#define OTGFS_EPTYPE_CTRL (0) /* Control */ +#define OTGFS_EPTYPE_ISOC (1) /* Isochronous */ +#define OTGFS_EPTYPE_BULK (2) /* Bulk */ +#define OTGFS_EPTYPE_INTR (3) /* Interrupt */ /* Register Offsets *********************************************************************************/ /* Core global control and status registers */ @@ -125,8 +131,8 @@ #define STM32_OTGFS_HCTSIZ3_OFFSET 0x0570 /* Host channel-3 interrupt register */ #define STM32_OTGFS_HCTSIZ4_OFFSET 0x0590 /* Host channel-4 interrupt register */ #define STM32_OTGFS_HCTSIZ5_OFFSET 0x05b0 /* Host channel-5 interrupt register */ -#define STM32_OTGFS_HCTSIZ6_OFFSET 0x05d9 /* Host channel-6 interrupt register */ -#define STM32_OTGFS_HCTSIZ7_OFFSET 0x05f9 /* Host channel-7 interrupt register */ +#define STM32_OTGFS_HCTSIZ6_OFFSET 0x05d0 /* Host channel-6 interrupt register */ +#define STM32_OTGFS_HCTSIZ7_OFFSET 0x05f0 /* Host channel-7 interrupt register */ /* Device-mode control and status registers */ @@ -559,7 +565,7 @@ # define OTGFS_HNPTXSTS_EPNUM_SHIFT (27) /* Bits 27-30: Endpoint number */ # define OTGFS_HNPTXSTS_EPNUM_MASK (15 << OTGFS_HNPTXSTS_EPNUM_SHIFT) /* Bit 31 Reserved, must be kept at reset value */ -/* general core configuration register */ +/* General core configuration register */ /* Bits 15:0 Reserved, must be kept at reset value */ #define OTGFS_GCCFG_PWRDWN (1 << 16) /* Bit 16: Power down */ /* Bit 17 Reserved, must be kept at reset value */ @@ -695,7 +701,7 @@ #define OTGFS_HCINT_STALL (1 << 3) /* Bit 3: STALL response received interrupt */ #define OTGFS_HCINT_NAK (1 << 4) /* Bit 4: NAK response received interrupt */ #define OTGFS_HCINT_ACK (1 << 5) /* Bit 5: ACK response received/transmitted interrupt */ -#define OTGFS_HCINTMSK_NYET (1 << 6) /* Bit 6: response received interrupt mask */ +#define OTGFS_HCINT_NYET (1 << 6) /* Bit 6: Response received interrupt */ #define OTGFS_HCINT_TXERR (1 << 7) /* Bit 7: Transaction error */ #define OTGFS_HCINT_BBERR (1 << 8) /* Bit 8: Babble error */ #define OTGFS_HCINT_FRMOR (1 << 9) /* Bit 9: Frame overrun */ diff --git a/nuttx/arch/arm/src/stm32/chip/stm32f20xxx_pinmap.h b/nuttx/arch/arm/src/stm32/chip/stm32f20xxx_pinmap.h index 2c8587855e..c59cd565a2 100644 --- a/nuttx/arch/arm/src/stm32/chip/stm32f20xxx_pinmap.h +++ b/nuttx/arch/arm/src/stm32/chip/stm32f20xxx_pinmap.h @@ -365,7 +365,7 @@ #define GPIO_JTMS_SWDIO (GPIO_ALT|GPIO_AF0|GPIO_PORTA|GPIO_PIN13) #define GPIO_JTRST (GPIO_ALT|GPIO_AF0|GPIO_PORTB|GPIO_PIN4) -/* OTG FS/HS */ +/* OTG FS/HS (VBUS PA9 is not an alternate configuration) */ #define GPIO_OTGFS_DM (GPIO_ALT|GPIO_FLOAT|GPIO_AF10|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PORTA|GPIO_PIN11) #define GPIO_OTGFS_DP (GPIO_ALT|GPIO_FLOAT|GPIO_AF10|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PORTA|GPIO_PIN12) diff --git a/nuttx/arch/arm/src/stm32/chip/stm32f40xxx_pinmap.h b/nuttx/arch/arm/src/stm32/chip/stm32f40xxx_pinmap.h index a588b56a27..ae2436a70f 100644 --- a/nuttx/arch/arm/src/stm32/chip/stm32f40xxx_pinmap.h +++ b/nuttx/arch/arm/src/stm32/chip/stm32f40xxx_pinmap.h @@ -365,7 +365,7 @@ #define GPIO_JTMS_SWDIO (GPIO_ALT|GPIO_AF0|GPIO_PORTA|GPIO_PIN13) #define GPIO_JTRST (GPIO_ALT|GPIO_AF0|GPIO_PORTB|GPIO_PIN4) -/* OTG FS/HS */ +/* OTG FS/HS (VBUS PA9 is not an alternate configuration) */ #define GPIO_OTGFS_DM (GPIO_ALT|GPIO_FLOAT|GPIO_AF10|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PORTA|GPIO_PIN11) #define GPIO_OTGFS_DP (GPIO_ALT|GPIO_FLOAT|GPIO_AF10|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PORTA|GPIO_PIN12) diff --git a/nuttx/arch/arm/src/stm32/stm32_otgfsdev.c b/nuttx/arch/arm/src/stm32/stm32_otgfsdev.c index 39c40d80ab..81c919cdfd 100644 --- a/nuttx/arch/arm/src/stm32/stm32_otgfsdev.c +++ b/nuttx/arch/arm/src/stm32/stm32_otgfsdev.c @@ -4086,7 +4086,7 @@ static void *stm32_ep_allocbuffer(FAR struct usbdev_ep_s *ep, unsigned bytes) * *******************************************************************************/ -#ifdef CONFIG_LPC313x_USBDEV_DMA +#ifdef CONFIG_STM32_USBDEV_DMA static void stm32_ep_freebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf) { usbtrace(TRACE_EPFREEBUFFER, privep->epphy); @@ -4645,7 +4645,6 @@ static int stm32_wakeup(struct usbdev_s *dev) regval &= ~(OTGFS_PCGCCTL_STPPCLK | OTGFS_PCGCCTL_GATEHCLK); stm32_putreg(regval, STM32_OTGFS_PCGCCTL); #endif - /* Activate Remote wakeup signaling */ regval = stm32_getreg(STM32_OTGFS_DCTL); @@ -4971,7 +4970,7 @@ static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv) #ifndef CONFIG_USBDEV_VBUSSENSING regval |= OTGFS_GCCFG_NOVBUSSENS; #endif -#ifdef CONFIG_USBDEV_SOFOUTPUT +#ifdef CONFIG_STM32_OTGFS_SOFOUTPUT regval |= OTGFS_GCCFG_SOFOUTEN; #endif stm32_putreg(regval, STM32_OTGFS_GCCFG); @@ -5173,12 +5172,29 @@ void up_usbinitialize(void) * current detection. */ - /* Configure OTG FS alternate function pins */ + /* Configure OTG FS alternate function pins + * + * PIN* SIGNAL DIRECTION + * ---- ----------- ---------- + * PA8 OTG_FS_SOF SOF clock output + * PA9 OTG_FS_VBUS VBUS input for device, Driven by external regulator by + * host (not an alternate function) + * PA10 OTG_FS_ID OTG ID pin (only needed in Dual mode) + * PA11 OTG_FS_DM D- I/O + * PA12 OTG_FS_DP D+ I/O + * + * *Pins may vary from device-to-device. + */ stm32_configgpio(GPIO_OTGFS_DM); stm32_configgpio(GPIO_OTGFS_DP); - stm32_configgpio(GPIO_OTGFS_ID); + stm32_configgpio(GPIO_OTGFS_ID); /* Only needed for OTG */ + + /* SOF output pin configuration is configurable. */ + +#ifdef CONFIG_STM32_OTGFS_SOFOUTPUT stm32_configgpio(GPIO_OTGFS_SOF); +#endif /* Uninitialize the hardware so that we know that we are starting from a * known state. */ diff --git a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c index 57161088a7..6e7f8e41d1 100644 --- a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c +++ b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c @@ -60,15 +60,28 @@ #include "up_arch.h" #include "up_internal.h" -#include "stm32_usbhost.h" +#include "stm32_otgfs.h" + +#if defined(CONFIG_USBHOST) && defined(CONFIG_STM32_OTGFS) /******************************************************************************* * Definitions *******************************************************************************/ /* Configuration ***************************************************************/ +/* Pre-requistites (partial) */ -/* All I/O buffers must lie in AHB SRAM because of the OHCI DMA. It might be +#ifndef CONFIG_STM32_SYSCFG +# error "CONFIG_STM32_SYSCFG is required" +#endif + +/* Default RX buffer size */ + +#ifndef CONFIG_STM32_OTGFS_RXBUFSIZE +# define CONFIG_STM32_OTGFS_RXBUFSIZE 512 +#endif + +/* All I/O buffers must lie in AHB SRAM because of the OTGFS DMA. It might be * okay if no I/O buffers are used *IF* the application can guarantee that all * end-user I/O buffers reside in AHB SRAM. */ @@ -77,13 +90,20 @@ # warning "No IO buffers allocated" #endif -/* OHCI Setup ******************************************************************/ +/* HCD Setup *******************************************************************/ +/* Hardware capabilities */ + +#define STM32_NHOST_CHANNELS 8 /* Number of host channels */ +#define STM32_MAX_PACKET_SIZE 64 /* Full speed max packet size */ +#define STM32_EP0_MAX_PACKET_SIZE 64 /* EP0 FS max packet size */ +#define STM32_MAX_TX_FIFOS 15 /* Max number of TX FIFOs */ + /* Frame Interval / Periodic Start */ #define BITS_PER_FRAME 12000 #define FI (BITS_PER_FRAME-1) #define FSMPS ((6 * (FI - 210)) / 7) -#define DEFAULT_FMINTERVAL ((FSMPS << OHCI_FMINT_FSMPS_SHIFT) | FI) +#define DEFAULT_FMINTERVAL ((FSMPS << OTGFS_FMINT_FSMPS_SHIFT) | FI) #define DEFAULT_PERSTART (((9 * BITS_PER_FRAME) / 10) - 1) /* CLKCTRL enable bits */ @@ -93,48 +113,82 @@ /* Interrupt enable bits */ #ifdef CONFIG_DEBUG_USB -# define STM32_DEBUG_INTS (OHCI_INT_SO|OHCI_INT_RD|OHCI_INT_UE|OHCI_INT_OC) +# define STM32_DEBUG_INTS (OTGFS_INT_SO|OTGFS_INT_RD|OTGFS_INT_UE|OTGFS_INT_OC) #else # define STM32_DEBUG_INTS 0 #endif -#define STM32_NORMAL_INTS (OHCI_INT_WDH|OHCI_INT_RHSC) +#define STM32_NORMAL_INTS (OTGFS_INT_WDH|OTGFS_INT_RHSC) #define STM32_ALL_INTS (STM32_NORMAL_INTS|STM32_DEBUG_INTS) -/* Dump GPIO registers */ +/* Ever-present MIN/MAX macros */ -#if defined(CONFIG_STM32_USBHOST_REGDEBUG) && defined(CONFIG_DEBUG_GPIO) -# define usbhost_dumpgpio() \ - do { \ - stm32_dumpgpio(GPIO_USB_DP, "D+ P0.29; D- P0.30"); \ - stm32_dumpgpio(GPIO_USB_UPLED, "LED P1:18; PPWR P1:19 PWRD P1:22 PVRCR P1:27"); \ - } while (0); -#else -# define usbhost_dumpgpio() +#ifndef MIN +# define MIN(a, b) (((a) < (b)) ? (a) : (b)) #endif -/* USB Host Memory *************************************************************/ - -/* Helper definitions */ - -#define HCCA ((struct ohci_hcca_s *)STM32_HCCA_BASE) -#define TDTAIL ((struct stm32_gtd_s *)STM32_TDTAIL_ADDR) -#define EDCTRL ((struct stm32_ed_s *)STM32_EDCTRL_ADDR) - -/* Periodic intervals 2, 4, 8, 16,and 32 supported */ - -#define MIN_PERINTERVAL 2 -#define MAX_PERINTERVAL 32 - -/* Descriptors *****************************************************************/ - -/* TD delay interrupt value */ - -#define TD_DELAY(n) (uint32_t)((n) << GTD_STATUS_DI_SHIFT) +#ifndef MAX +# define MAX(a, b) (((a) > (b)) ? (a) : (b)) +#endif /******************************************************************************* * Private Types *******************************************************************************/ +/* USB Speeds */ + +enum stm32_usbspeed_e +{ + USBSPEED_LOW = 0, /* USB low speed */ + USBSPEED_FULL, /* USB full speed (default) */ + USBSPEED_HIGH /* USB high speed (not supported by OTG FS) */ +}; + +/* This enumeration represents the state of one TX channel */ + +enum stm32_chstate_e +{ + CHSTATE_IDLE = 0, /* Inactive */ + CHSTATE_XFRC, /* Transfer complete */ + CHSTATE_NAK, /* NAK received */ + CHSTATE_NYET, /* NotYet received */ + CHSTATE_STALL, /* Endpoint stalled */ + CHSTATE_TXERR, /* Transfer error received */ + CHSTATE_DTERR /* Data error received */ +}; + +/* This enumeration describes the state of the transfer on one TX channel */ + +enum stm32_rqstate_e +{ + RQSTATE_IDLE = 0, /* No request in progress */ + RQSTATE_DONE, /* Request complete */ + RQSTATE_NOTREADY, /* Channel not ready */ + RQSTATE_ERROR, /* An error occurred */ + RQSTATE_STALL /* Endpoint is stalled */ +}; + +/* This structure retains the state of one host channel */ + +struct stn32_chan_s +{ + volatile uint8_t chstate; /* See enum stm32_chstate_e */ + volatile uint8_t rqstate; /* See enum stm32_rqstate_e */ + uint8_t devaddr; /* Device address */ + uint8_t epno; /* Device endpoint number */ + uint8_t speed; /* See enum stm32_usbspeed_e */ + uint8_t eptype; /* See OTGFS_EPTYPE_* definitions */ + uint8_t pid; /* Data PID */ + bool isin; /* True: IN endpoint */ + volatile uint16_t nerrors; /* Number of errors detecgted */ + volatile uint16_t xfrd; /* Number of bytes transferred */ + uint16_t channel; /* Encoded channel info */ + uint16_t maxpacket; /* Max packet size */ + uint16_t buflen; /* Buffer length (remaining) */ + uint16_t xfrlen; /* Number of bytes transferrred */ + uint8_t *buffer; /* Transfer buffer pointer */ + uint8_t intoggle; /* IN data toggle */ + uint8_t outtoggle; /* OUT data toggle */ +}; /* This structure retains the state of the USB host controller */ @@ -151,65 +205,21 @@ struct stm32_usbhost_s struct usbhost_class_s *class; - /* Driver status */ + /* Overall driver status */ volatile bool connected; /* Connected to device */ volatile bool lowspeed; /* Low speed device attached. */ volatile bool rhswait; /* TRUE: Thread is waiting for Root Hub Status change */ -#ifndef CONFIG_USBHOST_INT_DISABLE - uint8_t ininterval; /* Minimum periodic IN EP polling interval: 2, 4, 6, 16, or 32 */ - uint8_t outinterval; /* Minimum periodic IN EP polling interval: 2, 4, 6, 16, or 32 */ -#endif sem_t exclsem; /* Support mutually exclusive access */ sem_t rhssem; /* Semaphore to wait Writeback Done Head event */ -}; -/* The OCHI expects the size of an endpoint descriptor to be 16 bytes. - * However, the size allocated for an endpoint descriptor is 32 bytes in - * stm32_ohciram.h. This extra 16-bytes is used by the OHCI host driver in - * order to maintain additional endpoint-specific data. - */ + /* The state of each host channel */ -struct stm32_ed_s -{ - /* Hardware specific fields */ + struct stn32_chan_s chan[STM32_MAX_TX_FIFOS]; - struct ohci_ed_s hw; + /* The RX buffer */ - /* Software specific fields */ - - uint8_t xfrtype; /* Transfer type. See SB_EP_ATTR_XFER_* in usb.h */ - uint8_t interval; /* Periodic EP polling interval: 2, 4, 6, 16, or 32 */ - volatile uint8_t tdstatus; /* TD control status bits from last Writeback Done Head event */ - volatile bool wdhwait; /* TRUE: Thread is waiting for WDH interrupt */ - sem_t wdhsem; /* Semaphore used to wait for Writeback Done Head event */ - /* Unused bytes follow, depending on the size of sem_t */ -}; - -/* The OCHI expects the size of an transfer descriptor to be 16 bytes. - * However, the size allocated for an endpoint descriptor is 32 bytes in - * stm32_ohciram.h. This extra 16-bytes is used by the OHCI host driver in - * order to maintain additional endpoint-specific data. - */ - -struct stm32_gtd_s -{ - /* Hardware specific fields */ - - struct ohci_gtd_s hw; - - /* Software specific fields */ - - struct stm32_ed_s *ed; /* Pointer to parent ED */ - uint8_t pad[12]; -}; - -/* The following is used to manage lists of free EDs, TDs, and TD buffers */ - -struct stm32_list_s -{ - struct stm32_list_s *flink; /* Link to next buffer in the list */ - /* Variable length buffer data follows */ + uint8_t rxbuffer[CONFIG_STM32_OTGFS_RXBUFSIZE]; }; /******************************************************************************* @@ -222,12 +232,15 @@ struct stm32_list_s static void stm32_printreg(uint32_t addr, uint32_t val, bool iswrite); static void stm32_checkreg(uint32_t addr, uint32_t val, bool iswrite); static uint32_t stm32_getreg(uint32_t addr); -static void stm32_putreg(uint32_t val, uint32_t addr); +static void stm32_putreg(uint32_t addr, uint32_t value); #else # define stm32_getreg(addr) getreg32(addr) # define stm32_putreg(val,addr) putreg32(val,addr) #endif +static inline void stm32_modifyreg(uint32_t addr, uint32_t clrbits, + uint32_t setbits); + /* Semaphores ******************************************************************/ static void stm32_takesem(sem_t *sem); @@ -238,54 +251,16 @@ static void stm32_takesem(sem_t *sem); static inline uint16_t stm32_getle16(const uint8_t *val); static void stm32_putle16(uint8_t *dest, uint16_t val); -/* OHCI memory pool helper functions *******************************************/ - -static inline void stm32_edfree(struct stm32_ed_s *ed); -static struct stm32_gtd_s *stm32_tdalloc(void); -static void stm32_tdfree(struct stm32_gtd_s *buffer); -static uint8_t *stm32_tballoc(void); -static void stm32_tbfree(uint8_t *buffer); -#if STM32_IOBUFFERS > 0 -static uint8_t *stm32_allocio(void); -static void stm32_freeio(uint8_t *buffer); -#endif - /* ED list helper functions ****************************************************/ -static inline int stm32_addbulked(struct stm32_usbhost_s *priv, - struct stm32_ed_s *ed); -static inline int stm32_rembulked(struct stm32_usbhost_s *priv, - struct stm32_ed_s *ed); - #if !defined(CONFIG_USBHOST_INT_DISABLE) || !defined(CONFIG_USBHOST_ISOC_DISABLE) static unsigned int stm32_getinterval(uint8_t interval); static void stm32_setinttab(uint32_t value, unsigned int interval, unsigned int offset); #endif -static inline int stm32_addinted(struct stm32_usbhost_s *priv, - const FAR struct usbhost_epdesc_s *epdesc, - struct stm32_ed_s *ed); -static inline int stm32_reminted(struct stm32_usbhost_s *priv, - struct stm32_ed_s *ed); - -static inline int stm32_addisoced(struct stm32_usbhost_s *priv, - const FAR struct usbhost_epdesc_s *epdesc, - struct stm32_ed_s *ed); -static inline int stm32_remisoced(struct stm32_usbhost_s *priv, - struct stm32_ed_s *ed); - -/* Descriptor helper functions *************************************************/ - -static int stm32_enqueuetd(struct stm32_usbhost_s *priv, - struct stm32_ed_s *ed, uint32_t dirpid, - uint32_t toggle, volatile uint8_t *buffer, - size_t buflen); -static int stm32_ctrltd(struct stm32_usbhost_s *priv, uint32_t dirpid, - uint8_t *buffer, size_t buflen); - /* Interrupt handling **********************************************************/ -static int stm32_usbinterrupt(int irq, FAR void *context); +static int stm32_otgfs_interrupt(int irq, FAR void *context); /* USB host controller operations **********************************************/ @@ -486,6 +461,19 @@ static void stm32_putreg(uint32_t val, uint32_t addr) } #endif +/******************************************************************************* + * Name: stm32_modifyreg + * + * Description: + * Modify selected bits of an STM32 register. + * + *******************************************************************************/ + +static inline void stm32_modifyreg(uint32_t addr, uint32_t clrbits, uint32_t setbits) +{ + stm32_putreg(addr, (((stm32_getreg(addr)) & ~clrbits) | setbits)); +} + /**************************************************************************** * Name: stm32_takesem * @@ -536,263 +524,6 @@ static void stm32_putle16(uint8_t *dest, uint16_t val) dest[1] = val >> 8; } -/******************************************************************************* - * Name: stm32_edfree - * - * Description: - * Return an endpoint descriptor to the free list - * - *******************************************************************************/ - -static inline void stm32_edfree(struct stm32_ed_s *ed) -{ - struct stm32_list_s *entry = (struct stm32_list_s *)ed; - - /* Put the ED back into the free list */ - - entry->flink = g_edfree; - g_edfree = entry; -} - -/******************************************************************************* - * Name: stm32_tdalloc - * - * Description: - * Allocate an transfer descriptor from the free list - * - * Assumptions: - * - Never called from an interrupt handler. - * - Protected from conconcurrent access to the TD pool by the interrupt - * handler - * - Protection from re-entrance must be assured by the caller - * - *******************************************************************************/ - -static struct stm32_gtd_s *stm32_tdalloc(void) -{ - struct stm32_gtd_s *ret; - irqstate_t flags; - - /* Disable interrupts momentarily so that stm32_tdfree is not called from the - * interrupt handler. - */ - - flags = irqsave(); - ret = (struct stm32_gtd_s *)g_tdfree; - if (ret) - { - g_tdfree = ((struct stm32_list_s*)ret)->flink; - } - - irqrestore(flags); - return ret; -} - -/******************************************************************************* - * Name: stm32_tdfree - * - * Description: - * Return an transfer descriptor to the free list - * - * Assumptions: - * - Only called from the WDH interrupt handler (and during initialization). - * - Interrupts are disabled in any case. - * - *******************************************************************************/ - -static void stm32_tdfree(struct stm32_gtd_s *td) -{ - struct stm32_list_s *tdfree = (struct stm32_list_s *)td; - - /* This should not happen but just to be safe, don't free the common, pre- - * allocated tail TD. - */ - - if (tdfree != NULL && td != TDTAIL) - { - tdfree->flink = g_tdfree; - g_tdfree = tdfree; - } -} - -/******************************************************************************* - * Name: stm32_tballoc - * - * Description: - * Allocate an request/descriptor transfer buffer from the free list - * - * Assumptions: - * - Never called from an interrupt handler. - * - Protection from re-entrance must be assured by the caller - * - *******************************************************************************/ - -static uint8_t *stm32_tballoc(void) -{ - uint8_t *ret = (uint8_t *)g_tbfree; - if (ret) - { - g_tbfree = ((struct stm32_list_s*)ret)->flink; - } - return ret; -} - -/******************************************************************************* - * Name: stm32_tbfree - * - * Description: - * Return an request/descriptor transfer buffer to the free list - * - *******************************************************************************/ - -static void stm32_tbfree(uint8_t *buffer) -{ - struct stm32_list_s *tbfree = (struct stm32_list_s *)buffer; - - if (tbfree) - { - tbfree->flink = g_tbfree; - g_tbfree = tbfree; - } -} - -/******************************************************************************* - * Name: stm32_allocio - * - * Description: - * Allocate an IO buffer from the free list - * - * Assumptions: - * - Never called from an interrupt handler. - * - Protection from re-entrance must be assured by the caller - * - *******************************************************************************/ - -#if STM32_IOBUFFERS > 0 -static uint8_t *stm32_allocio(void) -{ - uint8_t *ret = (uint8_t *)g_iofree; - if (ret) - { - g_iofree = ((struct stm32_list_s*)ret)->flink; - } - return ret; -} -#endif - -/******************************************************************************* - * Name: stm32_freeio - * - * Description: - * Return an TD buffer to the free list - * - *******************************************************************************/ - -#if STM32_IOBUFFERS > 0 -static void stm32_freeio(uint8_t *buffer) -{ - struct stm32_list_s *iofree = (struct stm32_list_s *)buffer; - iofree->flink = g_iofree; - g_iofree = iofree; -} -#endif - -/******************************************************************************* - * Name: stm32_addbulked - * - * Description: - * Helper function to add an ED to the bulk list. - * - *******************************************************************************/ - -static inline int stm32_addbulked(struct stm32_usbhost_s *priv, - struct stm32_ed_s *ed) -{ -#ifndef CONFIG_USBHOST_BULK_DISABLE - uint32_t regval; - - /* Add the new bulk ED to the head of the bulk list */ - - ed->hw.nexted = stm32_getreg(STM32_USBHOST_BULKHEADED); - stm32_putreg((uint32_t)ed, STM32_USBHOST_BULKHEADED); - - /* BulkListEnable. This bit is set to enable the processing of the - * Bulk list. Note: once enabled, it remains. We really should - * never modify the bulk list while BLE is set. - */ - - regval = stm32_getreg(STM32_USBHOST_CTRL); - regval |= OHCI_CTRL_BLE; - stm32_putreg(regval, STM32_USBHOST_CTRL); - return OK; -#else - return -ENOSYS; -#endif -} - -/******************************************************************************* - * Name: stm32_rembulked - * - * Description: - * Helper function remove an ED from the bulk list. - * - *******************************************************************************/ - -static inline int stm32_rembulked(struct stm32_usbhost_s *priv, - struct stm32_ed_s *ed) -{ -#ifndef CONFIG_USBHOST_BULK_DISABLE - struct stm32_ed_s *curr; - struct stm32_ed_s *prev; - uint32_t regval; - - /* Find the ED in the bulk list. NOTE: We really should never be mucking - * with the bulk list while BLE is set. - */ - - for (curr = (struct stm32_ed_s *)stm32_getreg(STM32_USBHOST_BULKHEADED), - prev = NULL; - curr && curr != ed; - prev = curr, curr = (struct stm32_ed_s *)curr->hw.nexted); - - /* Hmmm.. It would be a bug if we do not find the ED in the bulk list. */ - - DEBUGASSERT(curr != NULL); - - /* Remove the ED from the bulk list */ - - if (curr != NULL) - { - /* Is this ED the first on in the bulk list? */ - - if (prev == NULL) - { - /* Yes... set the head of the bulk list to skip over this ED */ - - stm32_putreg(ed->hw.nexted, STM32_USBHOST_BULKHEADED); - - /* If the bulk list is now empty, then disable it */ - - regval = stm32_getreg(STM32_USBHOST_CTRL); - regval &= ~OHCI_CTRL_BLE; - stm32_putreg(regval, STM32_USBHOST_CTRL); - } - else - { - /* No.. set the forward link of the previous ED in the list - * skip over this ED. - */ - - prev->hw.nexted = ed->hw.nexted; - } - } - - return OK; -#else - return -ENOSYS; -#endif -} - /******************************************************************************* * Name: stm32_getinterval * @@ -852,337 +583,6 @@ static void stm32_setinttab(uint32_t value, unsigned int interval, unsigned int } #endif -/******************************************************************************* - * Name: stm32_addinted - * - * Description: - * Helper function to add an ED to the HCCA interrupt table. - * - * To avoid reshuffling the table so much and to keep life simple in general, - * the following rules are applied: - * - * 1. IN EDs get the even entries, OUT EDs get the odd entries. - * 2. Add IN/OUT EDs are scheduled together at the minimum interval of all - * IN/OUT EDs. - * - * This has the following consequences: - * - * 1. The minimum support polling rate is 2MS, and - * 2. Some devices may get polled at a much higher rate than they request. - * - *******************************************************************************/ - -static inline int stm32_addinted(struct stm32_usbhost_s *priv, - const FAR struct usbhost_epdesc_s *epdesc, - struct stm32_ed_s *ed) -{ -#ifndef CONFIG_USBHOST_INT_DISABLE - unsigned int interval; - unsigned int offset; - uint32_t head; - uint32_t regval; - - /* Disable periodic list processing. Does this take effect immediately? Or - * at the next SOF... need to check. - */ - - regval = stm32_getreg(STM32_USBHOST_CTRL); - regval &= ~OHCI_CTRL_PLE; - stm32_putreg(regval, STM32_USBHOST_CTRL); - - /* Get the quanitized interval value associated with this ED and save it - * in the ED. - */ - - interval = stm32_getinterval(epdesc->interval); - ed->interval = interval; - uvdbg("interval: %d->%d\n", epdesc->interval, interval); - - /* Get the offset associated with the ED direction. IN EDs get the even - * entries, OUT EDs get the odd entries. - * - * Get the new, minimum interval. Add IN/OUT EDs are scheduled together - * at the minimum interval of all IN/OUT EDs. - */ - - if (epdesc->in) - { - offset = 0; - if (priv->ininterval > interval) - { - priv->ininterval = interval; - } - else - { - interval = priv->ininterval; - } - } - else - { - offset = 1; - if (priv->outinterval > interval) - { - priv->outinterval = interval; - } - else - { - interval = priv->outinterval; - } - } - uvdbg("min interval: %d offset: %d\n", interval, offset); - - /* Get the head of the first of the duplicated entries. The first offset - * entry is always guaranteed to contain the common ED list head. - */ - - head = HCCA->inttbl[offset]; - - /* Clear all current entries in the interrupt table for this direction */ - - stm32_setinttab(0, 2, offset); - - /* Add the new ED before the old head of the periodic ED list and set the - * new ED as the head ED in all of the appropriate entries of the HCCA - * interrupt table. - */ - - ed->hw.nexted = head; - stm32_setinttab((uint32_t)ed, interval, offset); - uvdbg("head: %08x next: %08x\n", ed, head); - - /* Re-enabled periodic list processing */ - - regval = stm32_getreg(STM32_USBHOST_CTRL); - regval |= OHCI_CTRL_PLE; - stm32_putreg(regval, STM32_USBHOST_CTRL); - return OK; -#else - return -ENOSYS; -#endif -} - -/******************************************************************************* - * Name: stm32_reminted - * - * Description: - * Helper function to remove an ED from the HCCA interrupt table. - * - * To avoid reshuffling the table so much and to keep life simple in general, - * the following rules are applied: - * - * 1. IN EDs get the even entries, OUT EDs get the odd entries. - * 2. Add IN/OUT EDs are scheduled together at the minimum interval of all - * IN/OUT EDs. - * - * This has the following consequences: - * - * 1. The minimum support polling rate is 2MS, and - * 2. Some devices may get polled at a much higher rate than they request. - * - *******************************************************************************/ - -static inline int stm32_reminted(struct stm32_usbhost_s *priv, - struct stm32_ed_s *ed) -{ -#ifndef CONFIG_USBHOST_INT_DISABLE - struct stm32_ed_s *head; - struct stm32_ed_s *curr; - struct stm32_ed_s *prev; - unsigned int interval; - unsigned int offset; - uint32_t regval; - - /* Disable periodic list processing. Does this take effect immediately? Or - * at the next SOF... need to check. - */ - - regval = stm32_getreg(STM32_USBHOST_CTRL); - regval &= ~OHCI_CTRL_PLE; - stm32_putreg(regval, STM32_USBHOST_CTRL); - - /* Get the offset associated with the ED direction. IN EDs get the even - * entries, OUT EDs get the odd entries. - */ - - if ((ed->hw.ctrl & ED_CONTROL_D_MASK) == ED_CONTROL_D_IN) - { - offset = 0; - } - else - { - offset = 1; - } - - /* Get the head of the first of the duplicated entries. The first offset - * entry is always guaranteed to contain the common ED list head. - */ - - head = (struct stm32_ed_s *)HCCA->inttbl[offset]; - uvdbg("ed: %08x head: %08x next: %08x offset: %d\n", - ed, head, head ? head->hw.nexted : 0, offset); - - /* Find the ED to be removed in the ED list */ - - for (curr = head, prev = NULL; - curr && curr != ed; - prev = curr, curr = (struct stm32_ed_s *)curr->hw.nexted); - - /* Hmmm.. It would be a bug if we do not find the ED in the bulk list. */ - - DEBUGASSERT(curr != NULL); - if (curr != NULL) - { - /* Clear all current entries in the interrupt table for this direction */ - - stm32_setinttab(0, 2, offset); - - /* Remove the ED from the list.. Is this ED the first on in the list? */ - - if (prev == NULL) - { - /* Yes... set the head of the bulk list to skip over this ED */ - - head = (struct stm32_ed_s *)ed->hw.nexted; - } - else - { - /* No.. set the forward link of the previous ED in the list - * skip over this ED. - */ - - prev->hw.nexted = ed->hw.nexted; - } - uvdbg("ed: %08x head: %08x next: %08x\n", - ed, head, head ? head->hw.nexted : 0); - - /* Calculate the new minimum interval for this list */ - - interval = MAX_PERINTERVAL; - for (curr = head; curr; curr = (struct stm32_ed_s *)curr->hw.nexted) - { - if (curr->interval < interval) - { - interval = curr->interval; - } - } - uvdbg("min interval: %d offset: %d\n", interval, offset); - - /* Save the new minimum interval */ - - if ((ed->hw.ctrl && ED_CONTROL_D_MASK) == ED_CONTROL_D_IN) - { - priv->ininterval = interval; - } - else - { - priv->outinterval = interval; - } - - /* Set the head ED in all of the appropriate entries of the HCCA interrupt - * table (head might be NULL). - */ - - stm32_setinttab((uint32_t)head, interval, offset); - } - - /* Re-enabled periodic list processing */ - - if (head != NULL) - { - regval = stm32_getreg(STM32_USBHOST_CTRL); - regval |= OHCI_CTRL_PLE; - stm32_putreg(regval, STM32_USBHOST_CTRL); - } - - return OK; -#else - return -ENOSYS; -#endif -} - -/******************************************************************************* - * Name: stm32_addisoced - * - * Description: - * Helper functions to add an ED to the periodic table. - * - *******************************************************************************/ - -static inline int stm32_addisoced(struct stm32_usbhost_s *priv, - const FAR struct usbhost_epdesc_s *epdesc, - struct stm32_ed_s *ed) -{ -#ifndef CONFIG_USBHOST_ISOC_DISABLE -# warning "Isochronous endpoints not yet supported" -#endif - return -ENOSYS; - -} - -/******************************************************************************* - * Name: stm32_remisoced - * - * Description: - * Helper functions to remove an ED from the periodic table. - * - *******************************************************************************/ - -static inline int stm32_remisoced(struct stm32_usbhost_s *priv, - struct stm32_ed_s *ed) -{ -#ifndef CONFIG_USBHOST_ISOC_DISABLE -# warning "Isochronous endpoints not yet supported" -#endif - return -ENOSYS; -} - -/******************************************************************************* - * Name: stm32_enqueuetd - * - * Description: - * Enqueue a transfer descriptor. Notice that this function only supports - * queue on TD per ED. - * - *******************************************************************************/ - -static int stm32_enqueuetd(struct stm32_usbhost_s *priv, - struct stm32_ed_s *ed, uint32_t dirpid, - uint32_t toggle, volatile uint8_t *buffer, size_t buflen) -{ - struct stm32_gtd_s *td; - int ret = -ENOMEM; - - /* Allocate a TD from the free list */ - - td = stm32_tdalloc(); - if (td != NULL) - { - /* Initialize the allocated TD and link it before the common tail TD. */ - - td->hw.ctrl = (GTD_STATUS_R | dirpid | TD_DELAY(0) | toggle | GTD_STATUS_CC_MASK); - TDTAIL->hw.ctrl = 0; - td->hw.cbp = (uint32_t)buffer; - TDTAIL->hw.cbp = 0; - td->hw.nexttd = (uint32_t)TDTAIL; - TDTAIL->hw.nexttd = 0; - td->hw.be = (uint32_t)(buffer + (buflen - 1)); - TDTAIL->hw.be = 0; - - /* Configure driver-only fields in the extended TD structure */ - - td->ed = ed; - - /* Link the td to the head of the ED's TD list */ - - ed->hw.headp = (uint32_t)td | ((ed->hw.headp) & ED_HEADP_C); - ed->hw.tailp = (uint32_t)TDTAIL; - - ret = OK; - } - - return ret; -} - /******************************************************************************* * Name: stm32_wdhwait * @@ -1267,10 +667,7 @@ static int stm32_ctrltd(struct stm32_usbhost_s *priv, uint32_t dirpid, /* Set ControlListFilled. This bit is used to indicate whether there are * TDs on the Control list. */ - - regval = stm32_getreg(STM32_USBHOST_CMDST); - regval |= OHCI_CMDST_CLF; - stm32_putreg(regval, STM32_USBHOST_CMDST); +#warning "Missing Logic" /* Wait for the Writeback Done Head interrupt */ @@ -1296,14 +693,14 @@ static int stm32_ctrltd(struct stm32_usbhost_s *priv, uint32_t dirpid, } /******************************************************************************* - * Name: stm32_usbinterrupt + * Name: stm32_otgfs_interrupt * * Description: * USB interrupt handler * *******************************************************************************/ -static int stm32_usbinterrupt(int irq, FAR void *context) +static int stm32_otgfs_interrupt(int irq, FAR void *context) { struct stm32_usbhost_s *priv = &g_usbhost; uint32_t intst; @@ -1311,9 +708,7 @@ static int stm32_usbinterrupt(int irq, FAR void *context) uint32_t regval; /* Read Interrupt Status and mask out interrupts that are not enabled. */ - - intst = stm32_getreg(STM32_USBHOST_INTST); - regval = stm32_getreg(STM32_USBHOST_INTEN); +#warning "Missing Logic" ullvdbg("INST: %08x INTEN: %08x\n", intst, regval); pending = intst & regval; @@ -1321,19 +716,19 @@ static int stm32_usbinterrupt(int irq, FAR void *context) { /* Root hub status change interrupt */ - if ((pending & OHCI_INT_RHSC) != 0) + if ((pending & OTGFS_INT_RHSC) != 0) { - uint32_t rhportst1 = stm32_getreg(STM32_USBHOST_RHPORTST1); +#warning "Missing Logic" ullvdbg("Root Hub Status Change, RHPORTST1: %08x\n", rhportst1); - if ((rhportst1 & OHCI_RHPORTST_CSC) != 0) + if ((rhportst1 & OTGFS_RHPORTST_CSC) != 0) { - uint32_t rhstatus = stm32_getreg(STM32_USBHOST_RHSTATUS); +#warning "Missing Logic" ullvdbg("Connect Status Change, RHSTATUS: %08x\n", rhstatus); /* If DRWE is set, Connect Status Change indicates a remote wake-up event */ - if (rhstatus & OHCI_RHSTATUS_DRWE) + if (rhstatus & OTGFS_RHSTATUS_DRWE) { ullvdbg("DRWE: Remote wake-up\n"); } @@ -1344,7 +739,7 @@ static int stm32_usbinterrupt(int irq, FAR void *context) { /* Check current connect status */ - if ((rhportst1 & OHCI_RHPORTST_CCS) != 0) + if ((rhportst1 & OTGFS_RHPORTST_CCS) != 0) { /* Connected ... Did we just become connected? */ @@ -1372,7 +767,7 @@ static int stm32_usbinterrupt(int irq, FAR void *context) * when CCS == 1. */ - priv->lowspeed = (rhportst1 & OHCI_RHPORTST_LSDA) != 0; + priv->lowspeed = (rhportst1 & OTGFS_RHPORTST_LSDA) != 0; ullvdbg("Speed:%s\n", priv->lowspeed ? "LOW" : "FULL"); } @@ -1411,23 +806,21 @@ static int stm32_usbinterrupt(int irq, FAR void *context) } /* Clear the status change interrupt */ - - stm32_putreg(OHCI_RHPORTST_CSC, STM32_USBHOST_RHPORTST1); +#warning "Missing Logic" } /* Check for port reset status change */ - if ((rhportst1 & OHCI_RHPORTST_PRSC) != 0) + if ((rhportst1 & OTGFS_RHPORTST_PRSC) != 0) { /* Release the RH port from reset */ - - stm32_putreg(OHCI_RHPORTST_PRSC, STM32_USBHOST_RHPORTST1); +#warning "Missing Logic" } } /* Writeback Done Head interrupt */ - if ((pending & OHCI_INT_WDH) != 0) + if ((pending & OTGFS_INT_WDH) != 0) { struct stm32_gtd_s *td; struct stm32_gtd_s *next; @@ -1467,7 +860,7 @@ static int stm32_usbinterrupt(int irq, FAR void *context) ulldbg("ERROR: ED xfrtype:%d TD CTRL:%08x/CC:%d RHPORTST1:%08x\n", ed->xfrtype, td->hw.ctrl, ed->tdstatus, - stm32_getreg(STM32_USBHOST_RHPORTST1)); + stm32_getreg(???)); } #endif @@ -1494,8 +887,7 @@ static int stm32_usbinterrupt(int irq, FAR void *context) #endif /* Clear interrupt status register */ - - stm32_putreg(intst, STM32_USBHOST_INTST); +#warning "Missing Logic" } return OK; @@ -1599,16 +991,14 @@ static int stm32_enumerate(FAR struct usbhost_driver_s *drvr) up_mdelay(100); /* Put RH port 1 in reset (the STM32 supports only a single downstream port) */ - - stm32_putreg(OHCI_RHPORTST_PRS, STM32_USBHOST_RHPORTST1); +#warning "Missing Logic" /* Wait for the port reset to complete */ - while ((stm32_getreg(STM32_USBHOST_RHPORTST1) & OHCI_RHPORTST_PRS) != 0); + while ((stm32_getreg(???) & ???) != 0); /* Release RH port 1 from reset and wait a bit */ - - stm32_putreg(OHCI_RHPORTST_PRSC, STM32_USBHOST_RHPORTST1); +#warning "Missing Logic" up_mdelay(200); /* Let the common usbhost_enumerate do all of the real work. Note that the @@ -2299,10 +1689,7 @@ static int stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, /* BulkListFilled. This bit is used to indicate whether there are any * TDs on the Bulk list. */ - - regval = stm32_getreg(STM32_USBHOST_CMDST); - regval |= OHCI_CMDST_BLF; - stm32_putreg(regval, STM32_USBHOST_CMDST); +#warning "Missing Logic" /* Wait for the Writeback Done Head interrupt */ @@ -2421,18 +1808,14 @@ static inline void stm32_ep0init(struct stm32_usbhost_s *priv) /* Set the head of the control list to the EP0 EDCTRL (this would have to * change if we want more than on control EP queued at a time). */ - - stm32_putreg(STM32_EDCTRL_ADDR, STM32_USBHOST_CTRLHEADED); +#warning "Missing Logic" /* ControlListEnable. This bit is set to enable the processing of the * Control list. Note: once enabled, it remains enabled and we may even * complete list processing before we get the bit set. We really * should never modify the control list while CLE is set. */ - - regval = stm32_getreg(STM32_USBHOST_CTRL); - regval |= OHCI_CTRL_CLE; - stm32_putreg(regval, STM32_USBHOST_CTRL); +#warning "Missing Logic" } /******************************************************************************* @@ -2485,231 +1868,75 @@ static inline int stm32_hcdinitialize(FAR struct stm32_usbhost_s *priv) FAR struct usbhost_driver_s *usbhost_initialize(int controller) { - struct stm32_usbhost_s *priv = &g_usbhost; - uint32_t regval; - uint8_t *buffer; - irqstate_t flags; - int i; - - /* Sanity checks. NOTE: If certain OS features are enabled, it may be - * necessary to increase the size of STM32_ED/TD_SIZE in stm32_ohciram.h + /* At present, there is only a single OTG FS device support. Hence it is + * pre-allocated as g_usbhost. However, in most code, the private data + * structure will be referenced using the 'priv' pointer (rather than the + * global data) in order to simplify any future support for multiple devices. */ + FAR struct stm32_usbhost_s *priv = &g_usbhost; + int ret; + + /* Sanity checks */ + DEBUGASSERT(controller == 0); - DEBUGASSERT(sizeof(struct stm32_ed_s) <= STM32_ED_SIZE); - DEBUGASSERT(sizeof(struct stm32_gtd_s) <= STM32_TD_SIZE); /* Initialize the state data structure */ sem_init(&priv->rhssem, 0, 0); sem_init(&priv->exclsem, 0, 1); -#ifndef CONFIG_USBHOST_INT_DISABLE - priv->ininterval = MAX_PERINTERVAL; - priv->outinterval = MAX_PERINTERVAL; + /* Reset the state of the host driver */ + + stm32_swreset(priv); + + /* Alternate function pin configuration. Here we assume that: + * + * 1. GPIOA, SYSCFG, and OTG FS peripheral clocking have already been\ + * enabled as part of the boot sequence. + * 2. Board-specific logic has already enabled other board specific GPIOs + * for things like soft pull-up, VBUS sensing, power controls, and over- + * current detection. + */ + + /* Configure OTG FS alternate function pins for DM, DP, ID, and SOF. + * + * PIN* SIGNAL DIRECTION + * ---- ----------- ---------- + * PA8 OTG_FS_SOF SOF clock output + * PA9 OTG_FS_VBUS VBUS input for device, Driven by external regulator by + * host (not an alternate function) + * PA10 OTG_FS_ID OTG ID pin (only needed in Dual mode) + * PA11 OTG_FS_DM D- I/O + * PA12 OTG_FS_DP D+ I/O + * + * *Pins may vary from device-to-device. + */ + + stm32_configgpio(GPIO_OTGFS_DM); + stm32_configgpio(GPIO_OTGFS_DP); + stm32_configgpio(GPIO_OTGFS_ID); /* Only needed for OTG */ + + /* SOF output pin configuration is configurable */ + +#ifdef CONFIG_STM32_OTGFS_SOFOUTPUT + stm32_configgpio(GPIO_OTGFS_SOF); #endif - /* Enable power by setting PCUSB in the PCONP register. Disable interrupts - * because this register may be shared with other drivers. - */ + /* Initialize the USB OTG FS core */ - flags = irqsave(); - regval = stm32_getreg(STM32_SYSCON_PCONP); - regval |= SYSCON_PCONP_PCUSB; - stm32_putreg(regval, STM32_SYSCON_PCONP); - irqrestore(flags); - - /* Enable clocking on USB (USB PLL clocking was initialized in very low- - * evel clock setup logic (see stm32_clockconfig.c)). We do still need - * to set up USBOTG CLKCTRL to enable clocking. - * - * NOTE: The PORTSEL clock needs to be enabled only when accessing OTGSTCTRL - */ - - stm32_putreg(STM32_CLKCTRL_ENABLES, STM32_USBOTG_CLKCTRL); - - /* Then wait for the clocks to be reported as "ON" */ - - do - { - regval = stm32_getreg(STM32_USBOTG_CLKST); - } - while ((regval & STM32_CLKCTRL_ENABLES) != STM32_CLKCTRL_ENABLES); - - /* Set the OTG status and control register. Bits 0:1 apparently mean: - * - * 00: U1=device, U2=host - * 01: U1=host, U2=host - * 10: reserved - * 11: U1=host, U2=device - * - * We need only select U1=host (Bit 0=1, Bit 1 is not used on STM32); - * NOTE: The PORTSEL clock needs to be enabled when accessing OTGSTCTRL - */ - - stm32_putreg(1, STM32_USBOTG_STCTRL); - - /* Now we can turn off the PORTSEL clock */ - - stm32_putreg((STM32_CLKCTRL_ENABLES & ~USBOTG_CLK_PORTSELCLK), STM32_USBOTG_CLKCTRL); - - /* Configure I/O pins */ - - usbhost_dumpgpio(); - stm32_configgpio(GPIO_USB_DP); /* Positive differential data */ - stm32_configgpio(GPIO_USB_DM); /* Negative differential data */ - stm32_configgpio(GPIO_USB_UPLED); /* GoodLink LED control signal */ - stm32_configgpio(GPIO_USB_PPWR); /* Port Power enable signal for USB port */ - stm32_configgpio(GPIO_USB_PWRD); /* Power Status for USB port (host power switch) */ - stm32_configgpio(GPIO_USB_OVRCR); /* USB port Over-Current status */ - usbhost_dumpgpio(); - - udbg("Initializing Host Stack\n"); - - /* Show AHB SRAM memory map */ - -#if 0 /* Useful if you have doubts about the layout */ - uvdbg("AHB SRAM:\n"); - uvdbg(" HCCA: %08x %d\n", STM32_HCCA_BASE, STM32_HCCA_SIZE); - uvdbg(" TDTAIL: %08x %d\n", STM32_TDTAIL_ADDR, STM32_TD_SIZE); - uvdbg(" EDCTRL: %08x %d\n", STM32_EDCTRL_ADDR, STM32_ED_SIZE); - uvdbg(" EDFREE: %08x %d\n", STM32_EDFREE_BASE, STM32_ED_SIZE); - uvdbg(" TDFREE: %08x %d\n", STM32_TDFREE_BASE, STM32_EDFREE_SIZE); - uvdbg(" TBFREE: %08x %d\n", STM32_TBFREE_BASE, STM32_TBFREE_SIZE); - uvdbg(" IOFREE: %08x %d\n", STM32_IOFREE_BASE, STM32_IOBUFFERS * CONFIG_USBHOST_IOBUFSIZE); -#endif - - /* Initialize all the TDs, EDs and HCCA to 0 */ - - memset((void*)HCCA, 0, sizeof(struct ohci_hcca_s)); - memset((void*)TDTAIL, 0, sizeof(struct ohci_gtd_s)); - memset((void*)EDCTRL, 0, sizeof(struct stm32_ed_s)); - sem_init(&EDCTRL->wdhsem, 0, 0); - - /* Initialize user-configurable EDs */ - - buffer = (uint8_t *)STM32_EDFREE_BASE; - for (i = 0; i < CONFIG_USBHOST_NEDS; i++) - { - /* Put the ED in a free list */ - - stm32_edfree((struct stm32_ed_s *)buffer); - buffer += STM32_ED_SIZE; - } - - /* Initialize user-configurable TDs */ - - buffer = (uint8_t *)STM32_TDFREE_BASE; - for (i = 0; i < CONFIG_USBHOST_NTDS; i++) - { - /* Put the ED in a free list */ - - stm32_tdfree((struct stm32_gtd_s *)buffer); - buffer += STM32_TD_SIZE; - } - - /* Initialize user-configurable request/descriptor transfer buffers */ - - buffer = (uint8_t *)STM32_TBFREE_BASE; - for (i = 0; i < CONFIG_USBHOST_TDBUFFERS; i++) - { - /* Put the TD buffer in a free list */ - - stm32_tbfree(buffer); - buffer += CONFIG_USBHOST_TDBUFSIZE; - } - -#if STM32_IOBUFFERS > 0 - /* Initialize user-configurable IO buffers */ - - buffer = (uint8_t *)STM32_IOFREE_BASE; - for (i = 0; i < STM32_IOBUFFERS; i++) - { - /* Put the IO buffer in a free list */ - - stm32_freeio(buffer); - buffer += CONFIG_USBHOST_IOBUFSIZE; - } -#endif - - /* Wait 50MS then perform hardware reset */ - - up_mdelay(50); - - stm32_putreg(0, STM32_USBHOST_CTRL); /* Hardware reset */ - stm32_putreg(0, STM32_USBHOST_CTRLHEADED); /* Initialize control list head to Zero */ - stm32_putreg(0, STM32_USBHOST_BULKHEADED); /* Initialize bulk list head to Zero */ - - /* Software reset */ - - stm32_putreg(OHCI_CMDST_HCR, STM32_USBHOST_CMDST); - - /* Write Fm interval (FI), largest data packet counter (FSMPS), and - * periodic start. - */ - - stm32_putreg(DEFAULT_FMINTERVAL, STM32_USBHOST_FMINT); - stm32_putreg(DEFAULT_PERSTART, STM32_USBHOST_PERSTART); - - /* Put HC in operational state */ - - regval = stm32_getreg(STM32_USBHOST_CTRL); - regval &= ~OHCI_CTRL_HCFS_MASK; - regval |= OHCI_CTRL_HCFS_OPER; - stm32_putreg(regval, STM32_USBHOST_CTRL); - - /* Set global power in HcRhStatus */ - - stm32_putreg(OHCI_RHSTATUS_SGP, STM32_USBHOST_RHSTATUS); - - /* Set HCCA base address */ - - stm32_putreg((uint32_t)HCCA, STM32_USBHOST_HCCA); - - /* Set up EP0 */ - - stm32_ep0init(priv); - - /* Clear pending interrupts */ - - regval = stm32_getreg(STM32_USBHOST_INTST); - stm32_putreg(regval, STM32_USBHOST_INTST); - - /* Enable OHCI interrupts */ - - stm32_putreg((STM32_ALL_INTS|OHCI_INT_MIE), STM32_USBHOST_INTEN); + stm32_hcdinitialize(priv); /* Attach USB host controller interrupt handler */ - if (irq_attach(STM32_IRQ_USB, stm32_usbinterrupt) != 0) + if (irq_attach(STM32_IRQ_OTGFS, stm32_otgfs_interrupt) != 0) { udbg("Failed to attach IRQ\n"); return NULL; } - /* Enable USB interrupts at the SYCON controller. Disable interrupts - * because this register may be shared with other drivers. - */ - - flags = irqsave(); - regval = stm32_getreg(STM32_SYSCON_USBINTST); - regval |= SYSCON_USBINTST_ENINTS; - stm32_putreg(regval, STM32_SYSCON_USBINTST); - irqrestore(flags); - - /* If there is a USB device in the slot at power up, then we will not - * get the status change interrupt to signal us that the device is - * connected. We need to set the initial connected state accordingly. - */ - - regval = stm32_getreg(STM32_USBHOST_RHPORTST1); - priv->connected = ((regval & OHCI_RHPORTST_CCS) != 0); - /* Enable interrupts at the interrupt controller */ - up_enable_irq(STM32_IRQ_USB); /* enable USB interrupt */ - udbg("USB host Initialized, Device connected:%s\n", - priv->connected ? "YES" : "NO"); - + up_enable_irq(STM32_IRQ_OTGFS); return &priv->drvr; } From e207f076c97d0811fa2b2befec056a8747f12c52 Mon Sep 17 00:00:00 2001 From: patacongo Date: Fri, 17 Aug 2012 14:07:48 +0000 Subject: [PATCH 05/31] Auto-configuration updates from Richard Cochran git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5032 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/arch/Kconfig | 37 +++++++++++++++++++- nuttx/arch/arm/Kconfig | 6 ---- nuttx/arch/avr/Kconfig | 40 +++++++++++++++++++++- nuttx/arch/avr/src/atmega/atmega_lowinit.c | 2 +- nuttx/arch/mips/Kconfig | 6 ---- nuttx/configs/amber/hello/defconfig | 11 +++--- nuttx/drivers/sensors/Make.defs | 3 ++ nuttx/sched/Kconfig | 2 +- 8 files changed, 85 insertions(+), 22 deletions(-) diff --git a/nuttx/arch/Kconfig b/nuttx/arch/Kconfig index 6e0e0fb9da..fea56b7392 100644 --- a/nuttx/arch/Kconfig +++ b/nuttx/arch/Kconfig @@ -19,11 +19,13 @@ config ARCH_ARM config ARCH_AVR bool "AVR" + select ARCH_NOINTC ---help--- Atmel 8-bit bit AVR and 32-bit AVR32 architectures config ARCH_HC bool "Freescale HC" + select ARCH_NOINTC ---help--- Freescale HC architectures (M9S12) @@ -39,7 +41,8 @@ config ARCH_RGMP http://rgmp.sourceforge.net/wiki/index.php/Main_Page. config ARCH_SH - bool "Rensas" + bool "Renesas" + select ARCH_NOINTC ---help--- Renesas architectures (SH and M16C). @@ -90,3 +93,35 @@ source arch/sim/Kconfig source arch/x86/Kconfig source arch/z16/Kconfig source arch/z80/Kconfig + +comment "Architecture Options" + +config ARCH_NOINTC + bool + default n + +config ARCH_STACKDUMP + bool "Dump stack on assertions" + default n + ---help--- + Enable to do stack dumps after assertions + +comment "Board Settings" + +config BOARD_LOOPSPERMSEC + int "Loops per millisecond" + help + Must be calibrated for correct operation of delay loops. + You simply use a stop watch to measure the 100 second delay + then adjust CONFIG_BOARD_LOOPSPERMSEC until it is actually + is 100 seconds. + +config DRAM_START + hex "DRAM start address" + help + The physical start address of installed RAM. + +config DRAM_SIZE + int "DRAM size" + help + The size in bytes of the installed RAM. diff --git a/nuttx/arch/arm/Kconfig b/nuttx/arch/arm/Kconfig index 40dcb11059..f587cc274c 100644 --- a/nuttx/arch/arm/Kconfig +++ b/nuttx/arch/arm/Kconfig @@ -118,12 +118,6 @@ config ARCH_CHIP default "stm32" if ARCH_CHIP_STM32 default "str71x" if ARCH_CHIP_STR71X -config ARCH_STACKDUMP - bool "Dump stack on assertions" - default n - ---help--- - Enable to do stack dumps after assertions - config ARCH_LEDS bool "Use board LEDs to show state" default y diff --git a/nuttx/arch/avr/Kconfig b/nuttx/arch/avr/Kconfig index c2ded90809..0fe839b795 100644 --- a/nuttx/arch/avr/Kconfig +++ b/nuttx/arch/avr/Kconfig @@ -4,6 +4,44 @@ # if ARCH_AVR + +choice + prompt "Toolchain" + default AVR_BUILDROOT + +config AVR_WINAVR + bool "WinAVR" + ---help--- + For Cygwin development environment on Windows machines, you + can use WinAVR: http://sourceforge.net/projects/winavr/files/ + + It is assumed in some places that WinAVR is installed at + C:/WinAVR. Edit the setenv.sh file if this is not the case. + + WARNING: There is an incompatible version of cygwin.dll in + the WinAVR/bin directory! Make sure that the path to the + correct cygwin.dll file precedes the path to the WinAVR + binaries! + +config AVR_LINUXGCC + bool "Linux GCC" + ---help--- + For Linux, there are widely available avr-gcc packages. On + Ubuntu, use: sudo apt-get install gcc-avr gdb-avr avr-libc + +config AVR_BUILDROOT + bool "Buildroot" + ---help--- + There is a DIY buildroot version for the AVR boards here: + http://sourceforge.net/projects/nuttx/files/buildroot/. See + the following section for details on building this toolchain. + + It is assumed in some places that buildroot toolchain is + available at ../misc/buildroot/build_avr. Edit the setenv.sh + file if this is not the case. + +endchoice + choice prompt "Atmel AVR chip selection" default ARCH_CHIP_AT32UC3B0256 @@ -65,7 +103,7 @@ config ARCH_AT32UC3 bool default y if ARCH_CHIP_AT32UC3B0256 -config ARCH +config ARCH_CHIP string default "atmega" if ARCH_ATMEGA default "at90usb" if ARCH_AT90USB diff --git a/nuttx/arch/avr/src/atmega/atmega_lowinit.c b/nuttx/arch/avr/src/atmega/atmega_lowinit.c index 8456f0e110..075a6413a8 100644 --- a/nuttx/arch/avr/src/atmega/atmega_lowinit.c +++ b/nuttx/arch/avr/src/atmega/atmega_lowinit.c @@ -128,7 +128,7 @@ void up_lowinit(void) /* Set the system clock divider to 1 */ - clock_prescale_set(clock_div_1); + XDIV = 0; /* Initialize the watchdog timer */ diff --git a/nuttx/arch/mips/Kconfig b/nuttx/arch/mips/Kconfig index 36f7f4f86b..001d032285 100644 --- a/nuttx/arch/mips/Kconfig +++ b/nuttx/arch/mips/Kconfig @@ -27,12 +27,6 @@ config ARCH_CHIP string default "pic32mx" if ARCH_CHIP_PIC32MX -config ARCH_STACKDUMP - bool "Dump stack on assertions" - default n - ---help--- - Enable to do stack dumps after assertions - config ARCH_LEDS bool "Use board LEDs to show state" default y diff --git a/nuttx/configs/amber/hello/defconfig b/nuttx/configs/amber/hello/defconfig index 8c828544d7..2b56cc0039 100644 --- a/nuttx/configs/amber/hello/defconfig +++ b/nuttx/configs/amber/hello/defconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/amber/hello/defconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -75,13 +75,12 @@ CONFIG_ARCH=avr CONFIG_ARCH_AVR=y CONFIG_ARCH_ATMEGA=y -CONFIG_ARCH_CHIP=atmega +CONFIG_ARCH_CHIP="atmega" CONFIG_ARCH_CHIP_ATMEGA128=y CONFIG_ARCH_BOARD=amber CONFIG_ARCH_BOARD_AMBER=y -CONFIG_BOARD_LOOPSPERMSEC=8079 -CONFIG_BOARD_LOOPSPERMSEC=(8*100) -CONFIG_DRAM_SIZE=(4*1024) +CONFIG_BOARD_LOOPSPERMSEC=800 +CONFIG_DRAM_SIZE=4096 CONFIG_DRAM_START=0x800100 CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_NOINTC=y diff --git a/nuttx/drivers/sensors/Make.defs b/nuttx/drivers/sensors/Make.defs index bd28ba0709..d04e7541e1 100644 --- a/nuttx/drivers/sensors/Make.defs +++ b/nuttx/drivers/sensors/Make.defs @@ -37,7 +37,10 @@ # These drivers depend on I2C support ifeq ($(CONFIG_I2C),y) + +ifeq ($(CONFIG_I2C_TRANSFER),y) CSRCS += lis331dl.c +endif ifeq ($(CONFIG_I2C_LM75),y) CSRCS += lm75.c diff --git a/nuttx/sched/Kconfig b/nuttx/sched/Kconfig index f822736387..9d7a38549d 100644 --- a/nuttx/sched/Kconfig +++ b/nuttx/sched/Kconfig @@ -204,7 +204,7 @@ config SCHED_ONEXIT_MAX config DISABLE_OS_API bool "Disable NuttX interfaces" - default n + default y ---help--- The following can be used to disable categories of APIs supported by the OS. If the compiler supports From a2162de80d911f2687aea9f6d0f15b14134e9e5e Mon Sep 17 00:00:00 2001 From: patacongo Date: Fri, 17 Aug 2012 14:54:09 +0000 Subject: [PATCH 06/31] Remove 'sudo' from Makefiles git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5033 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/arch/8051/src/Makefile | 2 +- nuttx/arch/z80/src/Makefile.sdcc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nuttx/arch/8051/src/Makefile b/nuttx/arch/8051/src/Makefile index 47d828b2f0..fe1995fd04 100644 --- a/nuttx/arch/8051/src/Makefile +++ b/nuttx/arch/8051/src/Makefile @@ -162,7 +162,7 @@ $(SDCCLIBDIR)/libmysdcc.lib: $(SDCCLIBDIR)/libsdcc.lib grep -v _strcpy | grep -v _memcmp | grep -v _memcpy | \ grep -v _memset \ > libmysdcc.lib - @sudo mv -f libmysdcc.lib $(SDCCLIBDIR)/libmysdcc.lib + @mv -f libmysdcc.lib $(SDCCLIBDIR)/libmysdcc.lib # This builds the libboard library in the board/ subdirectory diff --git a/nuttx/arch/z80/src/Makefile.sdcc b/nuttx/arch/z80/src/Makefile.sdcc index e88c2f2bd0..d5ff3b7930 100644 --- a/nuttx/arch/z80/src/Makefile.sdcc +++ b/nuttx/arch/z80/src/Makefile.sdcc @@ -101,7 +101,7 @@ $(SDCCLIBDIR)/myz80.lib: $(SDCCLIBDIR)/$(SDCCLIB) grep -v alloc | grep -v free | grep -v printf | \ grep -v _str | grep -v _mem | grep -v crt0\.o \ > myz80.lib - @sudo mv -f myz80.lib $(SDCCLIBDIR)/myz80.lib + @mv -f myz80.lib $(SDCCLIBDIR)/myz80.lib # Create a header file that contains addressing information needed by the code From f5e6e25c7e6084f6d460fff85b47f45666f14d07 Mon Sep 17 00:00:00 2001 From: patacongo Date: Fri, 17 Aug 2012 22:51:14 +0000 Subject: [PATCH 07/31] More STM32 USB host logic git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5034 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h | 10 +- nuttx/arch/arm/src/stm32/stm32_otgfshost.c | 1536 ++++++++++++------- 2 files changed, 965 insertions(+), 581 deletions(-) diff --git a/nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h b/nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h index d04f2a67ff..b7e8df1eff 100644 --- a/nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h +++ b/nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h @@ -417,7 +417,9 @@ #define OTGFS_GUSBCFG_TOCAL_SHIFT (0) /* Bits 0-2: FS timeout calibration */ #define OTGFS_GUSBCFG_TOCAL_MASK (7 << OTGFS_GUSBCFG_TOCAL_SHIFT) - /* Bits 3-6: Reserved, must be kept at reset value */ + /* Bits 3-5: Reserved, must be kept at reset value */ +#define OTGFS_GUSBCFG_PHYSEL (1 << 6) /* Bit 6: Full Speed serial transceiver select */ + /* Bit 7: Reserved, must be kept at reset value */ #define OTGFS_GUSBCFG_SRPCAP (1 << 8) /* Bit 8: SRP-capable */ #define OTGFS_GUSBCFG_HNPCAP (1 << 9) /* Bit 9: HNP-capable */ #define OTGFS_GUSBCFG_TRDT_SHIFT (10) /* Bits 10-13: USB turnaround time */ @@ -497,7 +499,7 @@ #define OTGFS_GRXSTSH_PKTSTS_MASK (15 << OTGFS_GRXSTSH_PKTSTS_SHIFT) # define OTGFS_GRXSTSH_PKTSTS_INRECVD (2 << OTGFS_GRXSTSH_PKTSTS_SHIFT) /* IN data packet received */ # define OTGFS_GRXSTSH_PKTSTS_INDONE (3 << OTGFS_GRXSTSH_PKTSTS_SHIFT) /* IN transfer completed */ -# define OTGFS_GRXSTSH_PKTSTS_DTOGERR (2 << OTGFS_GRXSTSH_PKTSTS_SHIFT) /* Data toggle error */ +# define OTGFS_GRXSTSH_PKTSTS_DTOGERR (5 << OTGFS_GRXSTSH_PKTSTS_SHIFT) /* Data toggle error */ # define OTGFS_GRXSTSH_PKTSTS_HALTED (7 << OTGFS_GRXSTSH_PKTSTS_SHIFT) /* Channel halted */ /* Bits 21-31: Reserved, must be kept at reset value */ /* Receive status debug read/OTG status read and pop registers (device mode) */ @@ -633,7 +635,7 @@ # define OTGFS_HPTXSTS_EPNUM_MASK (15 << OTGFS_HPTXSTS_EPNUM_SHIFT) # define OTGFS_HPTXSTS_ODD (1 << 24) /* Bit 31: Send in odd (vs even) frame */ -/* Host all channels interrupt and all channels interrupt mask registers */ +/* Host all channels interrupt and all channels interrupt mask registers */ #define OTGFS_HAINT(n) (1 << (n)) /* Bits 15:0 HAINTM: Channel interrupt */ @@ -670,7 +672,7 @@ /* Host channel-n characteristics register */ -#define OTGFS_HCCHAR0_MPSIZ_SHIFT (0) /* Bits 0-10: Maximum packet size */ +#define OTGFS_HCCHAR_MPSIZ_SHIFT (0) /* Bits 0-10: Maximum packet size */ #define OTGFS_HCCHAR_MPSIZ_MASK (0x7ff << OTGFS_HCCHAR_MPSIZ_SHIFT) #define OTGFS_HCCHAR_EPNUM_SHIFT (11) /* Bits 11-14: Endpoint number */ #define OTGFS_HCCHAR_EPNUM_MASK (15 << OTGFS_HCCHAR_EPNUM_SHIFT) diff --git a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c index 6e7f8e41d1..ab00f29cf9 100644 --- a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c +++ b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c @@ -81,13 +81,28 @@ # define CONFIG_STM32_OTGFS_RXBUFSIZE 512 #endif -/* All I/O buffers must lie in AHB SRAM because of the OTGFS DMA. It might be - * okay if no I/O buffers are used *IF* the application can guarantee that all - * end-user I/O buffers reside in AHB SRAM. - */ +/* Default RxFIFO size */ -#if STM32_IOBUFFERS < 1 -# warning "No IO buffers allocated" +#ifndef CONFIG_STM32_OTGFS_RXFIFO_SIZE +# define CONFIG_STM32_OTGFS_RXFIFO_SIZE 128 +#endif + +/* Default host non-periodic transmit FIFO size */ + +#ifndef CONFIG_STM32_OTGFS_RXFIFO_SIZE +# define CONFIG_STM32_OTGFS_RXFIFO_SIZE 128 +#endif + +/* Default host non-periodic transmit FIFO size */ + +#ifndef CONFIG_STM32_OTGFS_NPTXFIFO_SIZE +# define CONFIG_STM32_OTGFS_NPTXFIFO_SIZE 96 +#endif + +/* Default the host periodic Tx fifo size register (HPTXFSIZ) */ + +#ifndef CONFIG_STM32_OTGFS_PTXFIFO_SIZE +# define CONFIG_STM32_OTGFS_PTXFIFO_SIZE 96 #endif /* HCD Setup *******************************************************************/ @@ -98,28 +113,10 @@ #define STM32_EP0_MAX_PACKET_SIZE 64 /* EP0 FS max packet size */ #define STM32_MAX_TX_FIFOS 15 /* Max number of TX FIFOs */ -/* Frame Interval / Periodic Start */ +/* Delays **********************************************************************/ -#define BITS_PER_FRAME 12000 -#define FI (BITS_PER_FRAME-1) -#define FSMPS ((6 * (FI - 210)) / 7) -#define DEFAULT_FMINTERVAL ((FSMPS << OTGFS_FMINT_FSMPS_SHIFT) | FI) -#define DEFAULT_PERSTART (((9 * BITS_PER_FRAME) / 10) - 1) - -/* CLKCTRL enable bits */ - -#define STM32_CLKCTRL_ENABLES (USBOTG_CLK_HOSTCLK|USBOTG_CLK_PORTSELCLK|USBOTG_CLK_AHBCLK) - -/* Interrupt enable bits */ - -#ifdef CONFIG_DEBUG_USB -# define STM32_DEBUG_INTS (OTGFS_INT_SO|OTGFS_INT_RD|OTGFS_INT_UE|OTGFS_INT_OC) -#else -# define STM32_DEBUG_INTS 0 -#endif - -#define STM32_NORMAL_INTS (OTGFS_INT_WDH|OTGFS_INT_RHSC) -#define STM32_ALL_INTS (STM32_NORMAL_INTS|STM32_DEBUG_INTS) +#define STM32_READY_DELAY 200000 +#define STM32_FLUSH_DELAY 200000 /* Ever-present MIN/MAX macros */ @@ -143,34 +140,51 @@ enum stm32_usbspeed_e USBSPEED_HIGH /* USB high speed (not supported by OTG FS) */ }; +/* The following enumeration represents the various states of the USB host + * state machine + */ + +enum stm32_smstate_e +{ + SMSTATE_IDLE = 0, /* Not attached to a device (initial state) */ + SMSTATE_ATTACHED, /* Attached to a device */ + SMSTATE_DETACHED, /* Detached from a device */ + SMSTATE_ENUMERATION, /* Attached, enumerating */ + SMSTATE_CLASS_REQUEST, /* Enumeration complete, class bound */ + SMSTATE_CLASS, /* Process class standard control requests */ + SMSTATE_CTRLXFER, /* Process control transfer */ + SMSTATE_ERROR /* An irrecoverable error occurred */ +}; + /* This enumeration represents the state of one TX channel */ enum stm32_chstate_e { - CHSTATE_IDLE = 0, /* Inactive */ - CHSTATE_XFRC, /* Transfer complete */ - CHSTATE_NAK, /* NAK received */ - CHSTATE_NYET, /* NotYet received */ - CHSTATE_STALL, /* Endpoint stalled */ - CHSTATE_TXERR, /* Transfer error received */ - CHSTATE_DTERR /* Data error received */ + CHSTATE_IDLE = 0, /* Inactive (initial state) */ + CHSTATE_XFRC, /* Transfer complete */ + CHSTATE_NAK, /* NAK received */ + CHSTATE_NYET, /* NotYet received */ + CHSTATE_STALL, /* Endpoint stalled */ + CHSTATE_TXERR, /* Transfer error received */ + CHSTATE_DTERR /* Data error received */ }; /* This enumeration describes the state of the transfer on one TX channel */ enum stm32_rqstate_e { - RQSTATE_IDLE = 0, /* No request in progress */ - RQSTATE_DONE, /* Request complete */ - RQSTATE_NOTREADY, /* Channel not ready */ - RQSTATE_ERROR, /* An error occurred */ - RQSTATE_STALL /* Endpoint is stalled */ + RQSTATE_IDLE = 0, /* No request in progress (initial state) */ + RQSTATE_DONE, /* Request complete */ + RQSTATE_NOTREADY, /* Channel not ready */ + RQSTATE_ERROR, /* An error occurred */ + RQSTATE_STALL /* Endpoint is stalled */ }; /* This structure retains the state of one host channel */ struct stn32_chan_s { + sem_t chansem; /* Channel wait semaphore */ volatile uint8_t chstate; /* See enum stm32_chstate_e */ volatile uint8_t rqstate; /* See enum stm32_rqstate_e */ uint8_t devaddr; /* Device address */ @@ -178,7 +192,10 @@ struct stn32_chan_s uint8_t speed; /* See enum stm32_usbspeed_e */ uint8_t eptype; /* See OTGFS_EPTYPE_* definitions */ uint8_t pid; /* Data PID */ + uint8_t intoggle; /* IN data toggle */ + uint8_t outtoggle; /* OUT data toggle */ bool isin; /* True: IN endpoint */ + volatile bool chanwait; /* True: Thread is waiting for a channel event */ volatile uint16_t nerrors; /* Number of errors detecgted */ volatile uint16_t xfrd; /* Number of bytes transferred */ uint16_t channel; /* Encoded channel info */ @@ -186,8 +203,6 @@ struct stn32_chan_s uint16_t buflen; /* Buffer length (remaining) */ uint16_t xfrlen; /* Number of bytes transferrred */ uint8_t *buffer; /* Transfer buffer pointer */ - uint8_t intoggle; /* IN data toggle */ - uint8_t outtoggle; /* OUT data toggle */ }; /* This structure retains the state of the USB host controller */ @@ -207,11 +222,12 @@ struct stm32_usbhost_s /* Overall driver status */ - volatile bool connected; /* Connected to device */ - volatile bool lowspeed; /* Low speed device attached. */ - volatile bool rhswait; /* TRUE: Thread is waiting for Root Hub Status change */ - sem_t exclsem; /* Support mutually exclusive access */ - sem_t rhssem; /* Semaphore to wait Writeback Done Head event */ + uint8_t smstate; /* The state of the USB host state machine */ + uint8_t smprev; /* Preioius USB host state machine state */ + volatile bool connected; /* Connected to device */ + volatile bool eventwait; /* True: Thread is waiting for a port event */ + sem_t exclsem; /* Support mutually exclusive access */ + sem_t eventsem; /* Semaphore to wait for a port event */ /* The state of each host channel */ @@ -259,8 +275,35 @@ static void stm32_setinttab(uint32_t value, unsigned int interval, unsigned int #endif /* Interrupt handling **********************************************************/ +/* Third level interrupt handlers */ -static int stm32_otgfs_interrupt(int irq, FAR void *context); +static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, + int chidx); +static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, + int chidx); + +/* Second level interrupt handlers */ + +#ifdef CONFIG_STM32_OTGFS_SOFINTR +static inline void stm32_gint_sofisr(FAR struct stm32_usbhost_s *priv); +#endif +static inline void stm32_gint_rxflvlisr(FAR struct stm32_usbhost_s *priv); +static inline void stm32_gint_nptxfeisr(FAR struct stm32_usbhost_s *priv); +static inline void stm32_gint_ptxfeisr(FAR struct stm32_usbhost_s *priv); +static inline void stm32_gint_hcisr(FAR struct stm32_usbhost_s *priv); +static inline void stm32_gint_hprtisr(FAR struct stm32_usbhost_s *priv); +static inline void stm32_gint_discisr(FAR struct stm32_usbhost_s *priv); +static inline void stm32_gint_iisooxfrisr(FAR struct stm32_usbhost_s *priv); + +/* First level, global interrupt handler */ + +static int stm32_gint_isr(int irq, FAR void *context); + +/* Interrupt controls */ + +static void stm32_gint_enable(void); +static void stm32_gint_disable(void); +static inline int stm32_hostinit_enable(void); /* USB host controller operations **********************************************/ @@ -290,7 +333,12 @@ static void stm32_disconnect(FAR struct usbhost_driver_s *drvr); /* Initialization **************************************************************/ static inline void stm32_ep0init(FAR struct stm32_usbhost_s *priv); -static inline int stm32_hcdinitialize(FAR struct stm32_usbhost_s *priv); +static void stm32_portreset(FAR struct stm32_usbhost_s *priv); +static inline void stm32_flush_txfifos(uint32_t txfnum); +static inline void stm32_flush_rxfifo(void); +static void stm32_host_initialize(FAR struct stm32_usbhost_s *priv); +static inline void stm32_sw_initialize(FAR struct stm32_usbhost_s *priv); +static inline int stm32_hw_initialize(FAR struct stm32_usbhost_s *priv); /******************************************************************************* * Private Data @@ -584,7 +632,7 @@ static void stm32_setinttab(uint32_t value, unsigned int interval, unsigned int #endif /******************************************************************************* - * Name: stm32_wdhwait + * Name: stm32_chanwait * * Description: * Set the request for the Writeback Done Head event well BEFORE enabling the @@ -594,7 +642,7 @@ static void stm32_setinttab(uint32_t value, unsigned int interval, unsigned int * *******************************************************************************/ -static int stm32_wdhwait(struct stm32_usbhost_s *priv, struct stm32_ed_s *ed) +static int stm32_chanwait(struct stm32_usbhost_s *priv, struct stn32_chan_s *chan) { irqstate_t flags = irqsave(); int ret = -ENODEV; @@ -603,12 +651,12 @@ static int stm32_wdhwait(struct stm32_usbhost_s *priv, struct stm32_ed_s *ed) if (priv->connected) { - /* Yes.. then set wdhwait to indicate that we expect to be informed when + /* Yes.. then set chanwait to indicate that we expect to be informed when * either (1) the device is disconnected, or (2) the transfer completed. */ - ed->wdhwait = true; - ret = OK; + chan->chanwait = true; + ret = OK; } irqrestore(flags); @@ -640,7 +688,7 @@ static int stm32_ctrltd(struct stm32_usbhost_s *priv, uint32_t dirpid, * transfer. */ - ret = stm32_wdhwait(priv, EDCTRL); + ret = stm32_chanwait(priv, chan); if (ret != OK) { udbg("ERROR: Device disconnected\n"); @@ -659,240 +707,524 @@ static int stm32_ctrltd(struct stm32_usbhost_s *priv, uint32_t dirpid, } /* Then enqueue the transfer */ - - EDCTRL->tdstatus = TD_CC_NOERROR; - ret = stm32_enqueuetd(priv, EDCTRL, dirpid, toggle, buffer, buflen); - if (ret == OK) - { - /* Set ControlListFilled. This bit is used to indicate whether there are - * TDs on the Control list. - */ #warning "Missing Logic" - /* Wait for the Writeback Done Head interrupt */ + /* And wait for the transfer to complete */ - stm32_takesem(&EDCTRL->wdhsem); + stm32_takesem(&chan->chansem); - /* Check the TD completion status bits */ - - if (EDCTRL->tdstatus == TD_CC_NOERROR) - { - ret = OK; - } - else - { - uvdbg("Bad TD completion status: %d\n", EDCTRL->tdstatus); - ret = -EIO; - } - } + /* Check the transfer completion status bits */ +#warning "Missing Logic" /* Make sure that there is no outstanding request on this endpoint */ +#warning "Missing Logic" - EDCTRL->wdhwait = false; return ret; } /******************************************************************************* - * Name: stm32_otgfs_interrupt + * Name: stm32_gint_hcinisr * * Description: - * USB interrupt handler + * USB OTG FS host IN channels interrupt handler * *******************************************************************************/ -static int stm32_otgfs_interrupt(int irq, FAR void *context) +static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, + int chidx) +{ +#warning "Missing logic" +} + +/******************************************************************************* + * Name: stm32_gint_hcoutisr + * + * Description: + * USB OTG FS host OUT channels interrupt handler + * + *******************************************************************************/ + +static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, + int chidx) +{ +#warning "Missing logic" +} + +/******************************************************************************* + * Name: stm32_gint_sofisr + * + * Description: + * USB OTG FS start-of-frame interrupt handler + * + *******************************************************************************/ + +#ifdef CONFIG_STM32_OTGFS_SOFINTR +static inline void stm32_gint_sofisr(FAR struct stm32_usbhost_s *priv) +{ + /* Handle SOF interrupt */ +#warning "Do what?" + + /* Clear pending SOF interrupt */ + + stm32_putreg(STM32_OTGFS_GINTSTS, OTGFS_GINT_SOF); +} +#endif + +/******************************************************************************* + * Name: stm32_gint_rxflvlisr + * + * Description: + * USB OTG FS RxFIFO non-empty interrupt handler + * + *******************************************************************************/ + +static inline void stm32_gint_rxflvlisr(FAR struct stm32_usbhost_s *priv) +{ + FAR uint32_t *dest; + uint32_t grxsts; + uint32_t intmsk; + uint32_t hcchar; + uint32_t hctsiz; + uint32_t fifo; + int bcnt; + int bcnt32; + int chidx; + int i; + + /* Disable the RxFIFO non-empty interrupt */ + + intmsk = stm32_getreg(STM32_OTGFS_GINTMSK) + intmsk &= ~OTGFS_GINT_RXFLVL; + stm32_putreg(STM32_OTGFS_GINTMSK, intmsk); + + /* Read and pop the next status from the Rx FIFO */ + + grxsts = stm32_getreg(STM32_OTGFS_GRXSTSP); + + /* Isolate the channel number/index in the status word */ + + chidx = (grxsts & OTGFS_GRXSTSH_CHNUM_MASK) >> OTGFS_GRXSTSH_CHNUM_SHIFT; + + /* Get the host channel characteristics register (HCCHAR) for this channel */ + + hcchar = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); + + /* The process the interrupt according to the packet status */ + + switch (grxsts & OTGFS_GRXSTSH_PKTSTS_MASK) + { + case OTGFS_GRXSTSH_PKTSTS_INRECVD: /* IN data packet received */ + { + /* Read the data into the host buffer. */ + + int bcnt = (grxsts & OTGFS_GRXSTSH_BCNT_MASK) >> OTGFS_GRXSTSH_BCNT_SHIFT; + + if (bcnt > 0 && priv->chan[chidx].buffer != NULL) + { + /* Transfer the packet from the Rx FIFO into the user buffer */ + + FAR uint32_t *dest = (FAR uint32_t *)priv->chan[chidx].buffer; + uint32_t fifo = STM32_OTGFS_DFIFO_HCH(0); + uint32_t hctsiz; + int bcnt32 = (bcnt + 3) >> 2; + + for (i = 0; i < count32b; i++, dest += 4) + { + *dest++ = stm32_getreg(fifo); + } + + /* Manage multiple packet transfers */ + + priv->chan[chidx].buffer += bcnt; + priv->chan[chidx].xfrlen += bcnt; + priv->chan[chidx].xfrd = priv->chan[chidx].xfrlen; + + /* Check if more packets are expected */ + + hctsiz = stm32_getreg(STM32_OTGFS_HCTSIZ(chidx)); + if (hctsiz.b.pktcnt > 0) + { + /* Re-activate the channel when more packets are expected */ + + hcchar |= OTGFS_HCCHAR_CHENA; + hcchar &= ~OTGFS_HCCHAR_CHDIS; + stm32_putreg(STM32_OTGFS_HCCHAR(chidx), hcchar); + } + } + } + break; + + case OTGFS_GRXSTSH_PKTSTS_INDONE: /* IN transfer completed */ + case OTGFS_GRXSTSH_PKTSTS_DTOGERR: /* Data toggle error */ + case OTGFS_GRXSTSH_PKTSTS_HALTED: /* Channel halted */ + default: + break; + } + + /* Re-enable the RxFIFO non-empty interrupt */ + + intmsk |= OTGFS_GINT_RXFLVL; + stm32_putreg(STM32_OTGFS_GINTMSK, intmsk); +} + +/******************************************************************************* + * Name: stm32_gint_nptxfeisr + * + * Description: + * USB OTG FS non-periodic TxFIFO empty interrupt handler + * + *******************************************************************************/ + +static inline void stm32_gint_nptxfeisr(FAR struct stm32_usbhost_s *priv) +{ +#warning "Missing logic" +} + +/******************************************************************************* + * Name: stm32_gint_ptxfeisr + * + * Description: + * USB OTG FS periodic TxFIFO empty interrupt handler + * + *******************************************************************************/ + +static inline void stm32_gint_ptxfeisr(FAR struct stm32_usbhost_s *priv) +{ +#warning "Missing logic" +} + +/******************************************************************************* + * Name: stm32_gint_hcisr + * + * Description: + * USB OTG FS host channels interrupt handler + * + *******************************************************************************/ + +static inline void stm32_gint_hcisr(FAR struct stm32_usbhost_s *priv) +{ + uint32_t haint; + uint32_t hcchar; + int i = 0; + + /* Read the Host all channels interrupt register and test each bit in the + * register. Each bit i, i=0...(STM32_NHOST_CHANNELS-1), corresponds to + * a pending interrupt on channel i. + */ + + haint = stm32_getreg(STM32_OTGFS_HAINT); + for (i = 0; i < STM32_NHOST_CHANNELS; i++) + { + /* Is an interrupt pending on this channel? */ + + if ((haint & OTGFS_HAINT(i)) != 0) + { + /* Yes... read the HCCHAR register to get the direction bit */ + + hcchar = stm32_getreg(STM32_OTGFS_HCCHAR(i)); + + /* Was this an interrupt on an IN or an OUT channel? */ + + if ((hcchar & OTGFS_HCCHAR_EPDIR) != 0) + { + /* Handle the HC IN channel interrupt */ + + stm32_gint_hcinisr(priv, i); + } + else + { + /* Handle the HC OUT channel interrupt */ + + stm32_gint_hcoutisr(priv, i); + } + } + } +} + +/******************************************************************************* + * Name: stm32_gint_hprtisr + * + * Description: + * USB OTG FS host port interrupt handler + * + *******************************************************************************/ + +static inline void stm32_gint_hprtisr(FAR struct stm32_usbhost_s *priv) +{ +#warning "Missing logic" +} + +/******************************************************************************* + * Name: stm32_gint_discisr + * + * Description: + * USB OTG FS disconnect detected interrupt handler + * + *******************************************************************************/ + +static inline void stm32_gint_discisr(FAR struct stm32_usbhost_s *priv) { - struct stm32_usbhost_s *priv = &g_usbhost; - uint32_t intst; - uint32_t pending; uint32_t regval; - /* Read Interrupt Status and mask out interrupts that are not enabled. */ -#warning "Missing Logic" - ullvdbg("INST: %08x INTEN: %08x\n", intst, regval); + /* Were we previously connected? */ + + if !priv->connected) + { + /* Yes.. then we no longer connected */ + + ullvdbg("Disconnected\n"); + priv->connected = false; + + /* Are we bound to a class driver? */ + + if (priv->class) + { + /* Yes.. Disconnect the class driver */ + + CLASS_DISCONNECTED(priv->class); + priv->class = NULL; + } + + /* Notify any waiters that there is a change in the connection state */ + + if (priv->eventwait) + { + stm32_givesem(&priv->eventsem); + priv->eventwait = false; + } + } + + /* Clear the dicsonnect interrupt */ + + stm32_putreg(STM32_OTGFS_GINTSTS, OTGFS_GINT_DISC); +} + +/******************************************************************************* + * Name: stm32_gint_iisooxfrisr + * + * Description: + * USB OTG FS incomplete isochronous interrupt handler + * + *******************************************************************************/ + +static inline void stm32_gint_iisooxfrisr(FAR struct stm32_usbhost_s *priv) +{ + uint32_t regval; + + /* CHENA : Set to enable the channel + * CHDIS : Set to stop transmitting/receiving data on a channel + */ + + regval = stm32_getreg(STM32_OTGFS_HCCHAR(0)); + regval |= (OTGFS_HCCHAR_CHDIS | OTGFS_HCCHAR_CHENA); + stm32_putreg(STM32_OTGFS_HCCHAR(0), regval); + + /* Clear the incomplete isochronous OUT interrupt */ + + stm32_putreg(STM32_OTGFS_GINTSTS, OTGFS_GINT_IISOOXFR); +} + +/******************************************************************************* + * Name: stm32_gint_isr + * + * Description: + * USB OTG FS global interrupt handler + * + *******************************************************************************/ + +static int stm32_gint_isr(int irq, FAR void *context) +{ + /* At present, there is only support for a single OTG FS host. Hence it is + * pre-allocated as g_usbhost. However, in most code, the private data + * structure will be referenced using the 'priv' pointer (rather than the + * global data) in order to simplify any future support for multiple devices. + */ + + FAR struct stm32_usbhost_s *priv = &g_usbhost; + uint32_t pending; + + /* If OTG were supported, we would need to check if we are in host or + * device mode when the global interrupt occurs. Here we support only + * host mode + */ + + /* Get the unmasked bits in the GINT status */ + + pending = stm32_getreg(STM32_OTGFS_GINTSTS); + pending &= stm32_getreg(STM32_OTGFS_GINTMSK); + + /* The process each pending, unmasked GINT interrupts */ - pending = intst & regval; if (pending != 0) { - /* Root hub status change interrupt */ + ullvdbg("GINTSTS: %08x\n", pending); - if ((pending & OTGFS_INT_RHSC) != 0) + /* Handle the start of frame interrupt */ + +#ifdef CONFIG_STM32_OTGFS_SOFINTR + if ((pending & OTGFS_GINT_SOF) != 0) { -#warning "Missing Logic" - ullvdbg("Root Hub Status Change, RHPORTST1: %08x\n", rhportst1); - - if ((rhportst1 & OTGFS_RHPORTST_CSC) != 0) - { -#warning "Missing Logic" - ullvdbg("Connect Status Change, RHSTATUS: %08x\n", rhstatus); - - /* If DRWE is set, Connect Status Change indicates a remote wake-up event */ - - if (rhstatus & OTGFS_RHSTATUS_DRWE) - { - ullvdbg("DRWE: Remote wake-up\n"); - } - - /* Otherwise... Not a remote wake-up event */ - - else - { - /* Check current connect status */ - - if ((rhportst1 & OTGFS_RHPORTST_CCS) != 0) - { - /* Connected ... Did we just become connected? */ - - if (!priv->connected) - { - /* Yes.. connected. */ - - ullvdbg("Connected\n"); - priv->connected = true; - - /* Notify any waiters */ - - if (priv->rhswait) - { - stm32_givesem(&priv->rhssem); - priv->rhswait = false; - } - } - else - { - ulldbg("Spurious status change (connected)\n"); - } - - /* The LSDA (Low speed device attached) bit is valid - * when CCS == 1. - */ - - priv->lowspeed = (rhportst1 & OTGFS_RHPORTST_LSDA) != 0; - ullvdbg("Speed:%s\n", priv->lowspeed ? "LOW" : "FULL"); - } - - /* Check if we are now disconnected */ - - else if (priv->connected) - { - /* Yes.. disconnect the device */ - - ullvdbg("Disconnected\n"); - priv->connected = false; - priv->lowspeed = false; - - /* Are we bound to a class instance? */ - - if (priv->class) - { - /* Yes.. Disconnect the class */ - - CLASS_DISCONNECTED(priv->class); - priv->class = NULL; - } - - /* Notify any waiters for the Root Hub Status change event */ - - if (priv->rhswait) - { - stm32_givesem(&priv->rhssem); - priv->rhswait = false; - } - } - else - { - ulldbg("Spurious status change (disconnected)\n"); - } - } - - /* Clear the status change interrupt */ -#warning "Missing Logic" - } - - /* Check for port reset status change */ - - if ((rhportst1 & OTGFS_RHPORTST_PRSC) != 0) - { - /* Release the RH port from reset */ -#warning "Missing Logic" - } - } - - /* Writeback Done Head interrupt */ - - if ((pending & OTGFS_INT_WDH) != 0) - { - struct stm32_gtd_s *td; - struct stm32_gtd_s *next; - - /* The host controller just wrote the list of finished TDs into the HCCA - * done head. This may include multiple packets that were transferred - * in the preceding frame. - * - * Remove the TD(s) from the Writeback Done Head in the HCCA and return - * them to the free list. Note that this is safe because the hardware - * will not modify the writeback done head again until the WDH bit is - * cleared in the interrupt status register. - */ - - td = (struct stm32_gtd_s *)HCCA->donehead; - HCCA->donehead = 0; - - /* Process each TD in the write done list */ - - for (; td; td = next) - { - /* Get the ED in which this TD was enqueued */ - - struct stm32_ed_s *ed = td->ed; - DEBUGASSERT(ed != NULL); - - /* Save the condition code from the (single) TD status/control - * word. - */ - - ed->tdstatus = (td->hw.ctrl & GTD_STATUS_CC_MASK) >> GTD_STATUS_CC_SHIFT; - -#ifdef CONFIG_DEBUG_USB - if (ed->tdstatus != TD_CC_NOERROR) - { - /* The transfer failed for some reason... dump some diagnostic info. */ - - ulldbg("ERROR: ED xfrtype:%d TD CTRL:%08x/CC:%d RHPORTST1:%08x\n", - ed->xfrtype, td->hw.ctrl, ed->tdstatus, - stm32_getreg(???)); - } -#endif - - /* Return the TD to the free list */ - - next = (struct stm32_gtd_s *)td->hw.nexttd; - stm32_tdfree(td); - - /* And wake up the thread waiting for the WDH event */ - - if (ed->wdhwait) - { - stm32_givesem(&ed->wdhsem); - ed->wdhwait = false; - } - } - } - -#ifdef CONFIG_DEBUG_USB - if ((pending & STM32_DEBUG_INTS) != 0) - { - ulldbg("ERROR: Unhandled interrupts INTST:%08x\n", intst); + stm32_gint_sofisr(priv); } #endif - /* Clear interrupt status register */ -#warning "Missing Logic" + /* Handle the RxFIFO non-empty interrupt */ + + if ((pending & OTGFS_GINT_RXFLVL)) != 0) + { + stm32_gint_rxflvlisr(priv); + } + + /* Handle the non-periodic TxFIFO empty interrupt */ + + if ((pending & OTGFS_GINT_NPTXFE)) != 0) + { + stm32_gint_nptxfeisr(priv); + } + + /* Handle the periodic TxFIFO empty interrupt */ + + if ((pending & OTGFS_GINT_PTXFE)) != 0) + { + stm32_gint_ptxfeisr(priv); + } + + /* Handle the host channels interrupt */ + + if ((pending & OTGFS_GINT_HC)) != 0) + { + stm32_gint_hcisr(priv); + } + + /* Handle the host port interrupt */ + + if ((pending & OTGFS_GINT_HPRT)) != 0) + { + stm32_gint_hprtisr(priv); + } + + /* Handle the disconnect detected interrupt */ + + if ((pending & OTGFS_GINT_DISC)) != 0) + { + stm32_gint_discisr(priv); + } + + /* Handle the incomplete isochronous OUT transfer */ + + if ((pending & OTGFS_GINT_IISOOXFR)) != 0) + { + stm32_gint_iisooxfrisr(priv); + } } return OK; } +/******************************************************************************* + * Name: stm32_gint_enable and stm32_gint_disable + * + * Description: + * Respectively enable or disable the global OTG FS interrupt. + * + * Input Parameters: + * None + * + * Returned Value: + * None + * + *******************************************************************************/ + +static void stm32_gint_enable(void) +{ + uint32_t regval; + + /* Set the GINTMSK bit to unmask the interrupt */ + + regval = stm32_getreg(STM32_OTGFS_GAHBCFG) + regval |= OTGFS_GAHBCFG_GINTMSK; + stm32_putreg(OTGFS_GAHBCFG_GINTMSK, regval); +} + +static void stm32_gint_disable(void) +{ + uint32_t regval; + + /* Clear the GINTMSK bit to mask the interrupt */ + + regval = stm32_getreg(STM32_OTGFS_GAHBCFG) + regval &= ~OTGFS_GAHBCFG_GINTMSK; + stm32_putreg(OTGFS_GAHBCFG_GINTMSK, regval); +} + +/******************************************************************************* + * Name: stm32_hostinit_enable + * + * Description: + * Enable host interrupts. + * + * Input Parameters: + * None + * + * Returned Value: + * None + * + *******************************************************************************/ + +static inline void stm32_hostinit_enable(void) +{ + /* Disable all interrupts. */ + + stm32_putreg(STM32_OTGFS_GINTMSK, 0); + + /* Clear any pending interrupts. */ + + stm32_putreg(STM32_OTGFS_GINTSTS, 0xffffffff); + + /* Clear any pending USB OTG Interrupts (should be done elsewhere if OTG is supported) */ + + stm32_putreg(STM32_OTGFS_GOTGINT, 0xffffffff); + + /* Clear any pending USB OTG interrupts */ + + stm32_putreg(STM32_OTGFS_GINTSTS, 0xbfffffff); + + /* Enable the host interrupts */ + /* Common interrupts: + * + * OTGFS_GINT_WKUP : Resume/remote wakeup detected interrupt + * OTGFS_GINT_USBSUSP : USB suspend + */ + + regval = (OTGFS_GINT_WKUP | OTGFS_GINT_USBSUSP); + + /* If OTG were supported, we would need to enable the following as well: + * + * OTGFS_GINT_OTG : OTG interrupt + * OTGFS_GINT_SRQ : Session request/new session detected interrupt + * OTGFS_GINT_CIDSCHG : Connector ID status change + */ + + /* Host-specific interrupts + * + * OTGFS_GINT_SOF : Start of frame + * OTGFS_GINT_RXFLVL : RxFIFO non-empty + * OTGFS_GINT_IISOOXFR : Incomplete isochronous OUT transfer + * OTGFS_GINT_HPRT : Host port interrupt + * OTGFS_GINT_HC : Host channels interrupt + * OTGFS_GINT_DISC : Disconnect detected interrupt + */ + +#ifdef CONFIG_STM32_OTGFS_SOFINTR + regval |= (OTGFS_GINT_SOF | OTGFS_GINT_RXFLVL | OTGFS_GINT_IISOOXFR | + OTGFS_GINT_HPRT | OTGFS_GINT_HC | OTGFS_GINT_DISC); +#else + regval |= (OTGFS_GINT_RXFLVL | OTGFS_GINT_IISOOXFR | OTGFS_GINT_HPRT | + OTGFS_GINT_HC | OTGFS_GINT_DISC); +#endif + stm32_putreg(STM32_OTGFS_GINTMSK, regval); +} + /******************************************************************************* * USB Host Controller Operations *******************************************************************************/ @@ -933,8 +1265,8 @@ static int stm32_wait(FAR struct usbhost_driver_s *drvr, bool connected) { /* No... wait for the connection/disconnection */ - priv->rhswait = true; - stm32_takesem(&priv->rhssem); + priv->eventwait = true; + stm32_takesem(&priv->eventsem); } irqrestore(flags); @@ -1037,30 +1369,16 @@ static int stm32_enumerate(FAR struct usbhost_driver_s *drvr) static int stm32_ep0configure(FAR struct usbhost_driver_s *drvr, uint8_t funcaddr, uint16_t maxpacketsize) { - struct stm32_usbhost_s *priv = (struct stm32_usbhost_s *)drvr; + FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr; DEBUGASSERT(drvr && funcaddr < 128 && maxpacketsize < 2048); - /* We must have exclusive access to EP0 and the control list */ + /* We must have exclusive access to the USB host hardware and state structures */ stm32_takesem(&priv->exclsem); - - /* Set the EP0 ED control word */ - - EDCTRL->hw.ctrl = (uint32_t)funcaddr << ED_CONTROL_FA_SHIFT | - (uint32_t)maxpacketsize << ED_CONTROL_MPS_SHIFT; - - if (priv->lowspeed) - { - EDCTRL->hw.ctrl |= ED_CONTROL_S; - } - - /* Set the transfer type to control */ - - EDCTRL->xfrtype = USB_EP_ATTR_XFER_CONTROL; +#warning "Missing logic" stm32_givesem(&priv->exclsem); - uvdbg("EP0 CTRL:%08x\n", EDCTRL->hw.ctrl); return OK; } @@ -1090,7 +1408,6 @@ static int stm32_epalloc(FAR struct usbhost_driver_s *drvr, const FAR struct usbhost_epdesc_s *epdesc, usbhost_ep_t *ep) { struct stm32_usbhost_s *priv = (struct stm32_usbhost_s *)drvr; - struct stm32_ed_s *ed; int ret = -ENOMEM; /* Sanity check. NOTE that this method should only be called if a device is @@ -1099,110 +1416,22 @@ static int stm32_epalloc(FAR struct usbhost_driver_s *drvr, DEBUGASSERT(priv && epdesc && ep && priv->connected); - /* We must have exclusive access to the ED pool, the bulk list, the periodic list - * and the interrupt table. - */ + /* We must have exclusive access to the USB host hardware and state structures */ stm32_takesem(&priv->exclsem); - /* Take the next ED from the beginning of the free list */ + /* Get the direction of the endpoint */ - ed = (struct stm32_ed_s *)g_edfree; - if (ed) + if (epdesc->in) { - /* Remove the ED from the freelist */ - - g_edfree = ((struct stm32_list_s*)ed)->flink; - - /* Configure the endpoint descriptor. */ - - memset((void*)ed, 0, sizeof(struct stm32_ed_s)); - ed->hw.ctrl = (uint32_t)(epdesc->funcaddr) << ED_CONTROL_FA_SHIFT | - (uint32_t)(epdesc->addr) << ED_CONTROL_EN_SHIFT | - (uint32_t)(epdesc->mxpacketsize) << ED_CONTROL_MPS_SHIFT; - - /* Get the direction of the endpoint */ - - if (epdesc->in) - { - ed->hw.ctrl |= ED_CONTROL_D_IN; - } - else - { - ed->hw.ctrl |= ED_CONTROL_D_OUT; - } - - /* Check for a low-speed device */ - - if (priv->lowspeed) - { - ed->hw.ctrl |= ED_CONTROL_S; - } - - /* Set the transfer type */ - - ed->xfrtype = epdesc->xfrtype; - - /* Special Case isochronous transfer types */ - -#if 0 /* Isochronous transfers not yet supported */ - if (ed->xfrtype == USB_EP_ATTR_XFER_ISOC) - { - ed->hw.ctrl |= ED_CONTROL_F; - } -#endif - uvdbg("EP%d CTRL:%08x\n", epdesc->addr, ed->hw.ctrl); - - /* Initialize the semaphore that is used to wait for the endpoint - * WDH event. - */ - - sem_init(&ed->wdhsem, 0, 0); - - /* Link the common tail TD to the ED's TD list */ - - ed->hw.headp = (uint32_t)TDTAIL; - ed->hw.tailp = (uint32_t)TDTAIL; - - /* Now add the endpoint descriptor to the appropriate list */ - - switch (ed->xfrtype) - { - case USB_EP_ATTR_XFER_BULK: - ret = stm32_addbulked(priv, ed); - break; - - case USB_EP_ATTR_XFER_INT: - ret = stm32_addinted(priv, epdesc, ed); - break; - - case USB_EP_ATTR_XFER_ISOC: - ret = stm32_addisoced(priv, epdesc, ed); - break; - - case USB_EP_ATTR_XFER_CONTROL: - default: - ret = -EINVAL; - break; - } - - /* Was the ED successfully added? */ - - if (ret != OK) - { - /* No.. destroy it and report the error */ - - udbg("ERROR: Failed to queue ED for transfer type: %d\n", ed->xfrtype); - sem_destroy(&ed->wdhsem); - stm32_edfree(ed); - } - else - { - /* Yes.. return an opaque reference to the ED */ - - *ep = (usbhost_ep_t)ed; - } } + else + { + } + + /* Set the transfer type */ + + /* Special Case isochronous transfer types */ stm32_givesem(&priv->exclsem); return ret; @@ -1231,48 +1460,17 @@ static int stm32_epalloc(FAR struct usbhost_driver_s *drvr, static int stm32_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) { struct stm32_usbhost_s *priv = (struct stm32_usbhost_s *)drvr; - struct stm32_ed_s *ed = (struct stm32_ed_s *)ep; int ret; /* There should not be any pending, real TDs linked to this ED */ - DEBUGASSERT(ed && (ed->hw.headp & ED_HEADP_ADDR_MASK) == STM32_TDTAIL_ADDR); + DEBUGASSERT(drvr); - /* We must have exclusive access to the ED pool, the bulk list, the periodic list - * and the interrupt table. - */ + /* We must have exclusive access to the USB host hardware and state structures */ stm32_takesem(&priv->exclsem); +#warning "Missing logic" - /* Remove the ED to the correct list depending on the trasfer type */ - - switch (ed->xfrtype) - { - case USB_EP_ATTR_XFER_BULK: - ret = stm32_rembulked(priv, ed); - break; - - case USB_EP_ATTR_XFER_INT: - ret = stm32_reminted(priv, ed); - break; - - case USB_EP_ATTR_XFER_ISOC: - ret = stm32_remisoced(priv, ed); - break; - - case USB_EP_ATTR_XFER_CONTROL: - default: - ret = -EINVAL; - break; - } - - /* Destroy the semaphore */ - - sem_destroy(&ed->wdhsem); - - /* Put the ED back into the free list */ - - stm32_edfree(ed); stm32_givesem(&priv->exclsem); return ret; } @@ -1313,20 +1511,13 @@ static int stm32_alloc(FAR struct usbhost_driver_s *drvr, FAR uint8_t **buffer, FAR size_t *maxlen) { struct stm32_usbhost_s *priv = (struct stm32_usbhost_s *)drvr; - DEBUGASSERT(priv && buffer && maxlen); int ret = -ENOMEM; - /* We must have exclusive access to the transfer buffer pool */ + DEBUGASSERT(priv && buffer && maxlen); + /* We must have exclusive access to the USB host hardware and state structures */ stm32_takesem(&priv->exclsem); - - *buffer = stm32_tballoc(); - if (*buffer) - { - *maxlen = CONFIG_USBHOST_TDBUFSIZE; - ret = OK; - } - +#warning "Missing logic" stm32_givesem(&priv->exclsem); return ret; } @@ -1357,12 +1548,13 @@ static int stm32_alloc(FAR struct usbhost_driver_s *drvr, static int stm32_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer) { struct stm32_usbhost_s *priv = (struct stm32_usbhost_s *)drvr; - DEBUGASSERT(buffer); - /* We must have exclusive access to the transfer buffer pool */ + DEBUGASSERT(drvr && buffer); + + /* We must have exclusive access to the USB host hardware and state structures */ stm32_takesem(&priv->exclsem); - stm32_tbfree(buffer); +#warning "Missing logic" stm32_givesem(&priv->exclsem); return OK; } @@ -1398,21 +1590,7 @@ static int stm32_ioalloc(FAR struct usbhost_driver_s *drvr, FAR uint8_t **buffer, size_t buflen) { DEBUGASSERT(drvr && buffer); - -#if STM32_IOBUFFERS > 0 - if (buflen <= CONFIG_USBHOST_IOBUFSIZE) - { - FAR uint8_t *alloc = stm32_allocio(); - if (alloc) - { - *buffer = alloc; - return OK; - } - } - return -ENOMEM; -#else return -ENOSYS; -#endif } /************************************************************************************ @@ -1441,13 +1619,7 @@ static int stm32_ioalloc(FAR struct usbhost_driver_s *drvr, static int stm32_iofree(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer) { DEBUGASSERT(drvr && buffer); - -#if STM32_IOBUFFERS > 0 - stm32_freeio(buffer); - return OK; -#else return -ENOSYS; -#endif } /******************************************************************************* @@ -1498,7 +1670,7 @@ static int stm32_ctrlin(FAR struct usbhost_driver_s *drvr, req->type, req->req, req->value[1], req->value[0], req->index[1], req->index[0], req->len[1], req->len[0]); - /* We must have exclusive access to EP0 and the control list */ + /* We must have exclusive access to the USB host hardware and state structures */ stm32_takesem(&priv->exclsem); @@ -1534,7 +1706,7 @@ static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, req->type, req->req, req->value[1], req->value[0], req->index[1], req->index[0], req->len[1], req->len[0]); - /* We must have exclusive access to EP0 and the control list */ + /* We must have exclusive access to the USB host hardware and state structures */ stm32_takesem(&priv->exclsem); @@ -1593,7 +1765,6 @@ static int stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, FAR uint8_t *buffer, size_t buflen) { struct stm32_usbhost_s *priv = (struct stm32_usbhost_s *)drvr; - struct stm32_ed_s *ed = (struct stm32_ed_s *)ep; uint32_t dirpid; uint32_t regval; #if STM32_IOBUFFERS > 0 @@ -1602,67 +1773,17 @@ static int stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, bool in; int ret; - DEBUGASSERT(priv && ed && buffer && buflen > 0); + DEBUGASSERT(priv && chan && buffer && buflen > 0); - in = (ed->hw.ctrl & ED_CONTROL_D_MASK) == ED_CONTROL_D_IN; - uvdbg("EP%d %s toggle:%d maxpacket:%d buflen:%d\n", - (ed->hw.ctrl & ED_CONTROL_EN_MASK) >> ED_CONTROL_EN_SHIFT, - in ? "IN" : "OUT", - (ed->hw.headp & ED_HEADP_C) != 0 ? 1 : 0, - (ed->hw.ctrl & ED_CONTROL_MPS_MASK) >> ED_CONTROL_MPS_SHIFT, - buflen); - - /* We must have exclusive access to the endpoint, the TD pool, the I/O buffer - * pool, the bulk and interrupt lists, and the HCCA interrupt table. - */ + /* We must have exclusive access to the USB host hardware and state structures */ stm32_takesem(&priv->exclsem); - /* Allocate an IO buffer if the user buffer does not lie in AHB SRAM */ - -#if STM32_IOBUFFERS > 0 - if ((uintptr_t)buffer < STM32_SRAM_BANK0 || - (uintptr_t)buffer >= (STM32_SRAM_BANK0 + STM32_BANK0_SIZE + STM32_BANK1_SIZE)) - { - /* Will the transfer fit in an IO buffer? */ - - if (buflen > CONFIG_USBHOST_IOBUFSIZE) - { - uvdbg("buflen (%d) > IO buffer size (%d)\n", - buflen, CONFIG_USBHOST_IOBUFSIZE); - ret = -ENOMEM; - goto errout; - } - - /* Allocate an IO buffer in AHB SRAM */ - - origbuf = buffer; - buffer = stm32_allocio(); - if (!buffer) - { - uvdbg("IO buffer allocation failed\n"); - ret = -ENOMEM; - goto errout; - } - - /* If this is an OUT transaction, copy the user data into the AHB - * SRAM IO buffer. Sad... so inefficient. But without exposing - * the AHB SRAM to the final, end-user client I don't know of any - * way around this copy. - */ - - if (!in) - { - memcpy(buffer, origbuf, buflen); - } - } -#endif - /* Set the request for the Writeback Done Head event well BEFORE enabling the * transfer. */ - ret = stm32_wdhwait(priv, ed); + ret = stm32_chanwait(priv, chan); if (ret != OK) { udbg("ERROR: Device disconnected\n"); @@ -1680,60 +1801,20 @@ static int stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, dirpid = GTD_STATUS_DP_OUT; } - /* Then enqueue the transfer */ + /* Then enqueue the transfer and wait for the transfer to complete */ +#warning "Missing logic" - ed->tdstatus = TD_CC_NOERROR; - ret = stm32_enqueuetd(priv, ed, dirpid, GTD_STATUS_T_TOGGLE, buffer, buflen); - if (ret == OK) - { - /* BulkListFilled. This bit is used to indicate whether there are any - * TDs on the Bulk list. - */ + /* Wait for the transfer to complete */ #warning "Missing Logic" - /* Wait for the Writeback Done Head interrupt */ + stm32_takesem(&chan->chansem); - stm32_takesem(&ed->wdhsem); - - /* Check the TD completion status bits */ - - if (ed->tdstatus == TD_CC_NOERROR) - { - ret = OK; - } - else - { - uvdbg("Bad TD completion status: %d\n", ed->tdstatus); - ret = -EIO; - } - } + /* Check the transfer completion status */ +#warning "Missing Logic" errout: /* Make sure that there is no outstanding request on this endpoint */ - - ed->wdhwait = false; - - /* Free any temporary IO buffers */ - -#if STM32_IOBUFFERS > 0 - if (buffer && origbuf) - { - /* If this is an IN transaction, get the user data from the AHB - * SRAM IO buffer. Sad... so inefficient. But without exposing - * the AHB SRAM to the final, end-user client I don't know of any - * way around this copy. - */ - - if (in && ret == OK) - { - memcpy(origbuf, buffer, buflen); - } - - /* Then free the temporary I/O buffer */ - - stm32_freeio(buffer); - } -#endif +#warning "Missing Logic" stm32_givesem(&priv->exclsem); return ret; @@ -1794,35 +1875,265 @@ static inline void stm32_ep0init(struct stm32_usbhost_s *priv) (void)stm32_ep0configure(&priv->drvr, 1, 8); - /* Initialize the common tail TD. */ - - memset(TDTAIL, 0, sizeof(struct stm32_gtd_s)); - TDTAIL->ed = EDCTRL; - - /* Link the common tail TD to the ED's TD list */ - - memset(EDCTRL, 0, sizeof(struct stm32_ed_s)); - EDCTRL->hw.headp = (uint32_t)TDTAIL; - EDCTRL->hw.tailp = (uint32_t)TDTAIL; - - /* Set the head of the control list to the EP0 EDCTRL (this would have to - * change if we want more than on control EP queued at a time). - */ -#warning "Missing Logic" - - /* ControlListEnable. This bit is set to enable the processing of the - * Control list. Note: once enabled, it remains enabled and we may even - * complete list processing before we get the bit set. We really - * should never modify the control list while CLE is set. - */ -#warning "Missing Logic" +#warning "Missing logic" } /******************************************************************************* - * Name: stm32_hcdinitialize + * Name: stm32_portreset * * Description: - * Setup the host controller harware for normal operations. + * Reset the USB host port. + * + * NOTE: "Before starting to drive a USB reset, the application waits for the + * OTG interrupt triggered by the debounce done bit (DBCDNE bit in + * OTG_FS_GOTGINT), which indicates that the bus is stable again after the + * electrical debounce caused by the attachment of a pull-up resistor on DP + * (FS) or DM (LS). + * + * Input Parameters: + * priv -- USB host driver private data structure. + * + * Returned Value: + * None + * + *******************************************************************************/ + +static void stm32_portreset(FAR struct stm32_usbhost_s *priv) +{ + uint32_t regval; + + regval = stm32_getreg(STM32_OTGFS_HPRT); + retval &= ~(OTGFS_HPRT_PENA|OTGFS_HPRT_PCDET|OTGFS_HPRT_PENCHNG|OTGFS_HPRT_POCCHNG); + regval |= OTGFS_HPRT_PRST; + stm32_putreg(STM32_OTGFS_HPRT, regval); + + up_mdelay(10); + + regval &= ~OTGFS_HPRT_PRST; + stm32_putreg(STM32_OTGFS_HPRT, regval); + + up_mdelay(20); +} + +/******************************************************************************* + * Name: stm32_flush_txfifos + * + * Description: + * Flush the selected Tx FIFO. + * + * Input Parameters: + * priv -- USB host driver private data structure. + * + * Returned Value: + * None. + * + *******************************************************************************/ + +static inline void stm32_flush_txfifos(uint32_t txfnum) +{ + uint32_t regval; + uint32_t timeout; + + /* Initiate the TX FIFO flush operation */ + + regval = OTGFS_GRSTCTL_TXFFLSH | txfnum; + stm32_putreg(regval, STM32_OTGFS_GRSTCTL); + + /* Wait for the FLUSH to complete */ + + for (timeout = 0; timeout < STM32_FLUSH_DELAY; timeout++) + { + regval = stm32_getreg(STM32_OTGFS_GRSTCTL); + if ((regval & OTGFS_GRSTCTL_TXFFLSH) == 0) + { + break; + } + } + + /* Wait for 3 PHY Clocks */ + + up_udelay(3); +} + +/******************************************************************************* + * Name: stm32_flush_rxfifo + * + * Description: + * Flush the Rx FIFO. + * + * Input Parameters: + * priv -- USB host driver private data structure. + * + * Returned Value: + * None. + * + *******************************************************************************/ + +static inline void stm32_flush_rxfifo(void) +{ + uint32_t regval; + uint32_t timeout; + + /* Initiate the RX FIFO flush operation */ + + stm32_putreg(OTGFS_GRSTCTL_RXFFLSH, STM32_OTGFS_GRSTCTL); + + /* Wait for the FLUSH to complete */ + + for (timeout = 0; timeout < STM32_FLUSH_DELAY; timeout++) + { + regval = stm32_getreg(STM32_OTGFS_GRSTCTL); + if ((regval & OTGFS_GRSTCTL_RXFFLSH) == 0) + { + break; + } + } + + /* Wait for 3 PHY Clocks */ + + up_udelay(3); +} + +/******************************************************************************* + * Name: stm32_host_initialize + * + * Description: + * Initialize/re-initialize hardware for host mode operation. At present, + * this function is called only from stm32_hw_initialize(). But if OTG mode + * were supported, this function would also be called to swtich between + * host and device modes on a connector ID change interrupt. + * + * Input Parameters: + * priv -- USB host driver private data structure. + * + * Returned Value: + * None. + * + *******************************************************************************/ + +static void stm32_host_initialize(FAR struct stm32_usbhost_s *priv) +{ + uint32_t regval; + uint32_t offset; + int ret; + int i; + + /* Restart the PHY Clock */ + + stm32_putreg(STM32_OTGFS_PCGCCTL, 0); + + /* Initialize Host Configuration (HCFG) register */ + + regval = stm32_getreg(STM32_OTGFS_HCFG); + regval &= ~OTGFS_HCFG_FSLSPCS_MASK; + regval |= OTGFS_HCFG_FSLSPCS_FS48MHz; + stm32_putreg(STM32_OTGFS_HCFG, regval); + + /* Reset the host port */ + + stm32_portreset(priv); + + /* Clear the FS-/LS-only support bit in the HCFG register */ + + regval = stm32_getreg(STM32_OTGFS_HCFG); + regval &= ~OTGFS_HCFG_FSLSS; + stm32_putreg(STM32_OTGFS_HCFG, regval); + + /* Carve up FIFO memory for the Rx FIFO and the periodic and non-periodic Tx FIFOs */ + /* Configure Rx FIFO size (GRXFSIZ) */ + + stm32_putreg(STM32_OTGFS_GRXFSIZ, CONFIG_STM32_OTGFS_RXFIFO_SIZE); + offset = CONFIG_STM32_OTGFS_RXFIFO_SIZE; + + /* Setup the host non-periodic Tx FIFO size (HNPTXFSIZ) */ + + regval = (offset | (CONFIG_STM32_OTGFS_NPTXFIFO_SIZE << OTGFS_HNPTXFSIZ_NPTXFD_MASK); + stm32_putreg(STM32_OTGFS_DIEPTXF0_HNPTXFSIZ, regval); + offset += CONFIG_STM32_OTGFS_NPTXFIFO_SIZE + + /* Set up the host periodic Tx fifo size register (HPTXFSIZ) */ + + regval = (offset | (CONFIG_STM32_OTGFS_PTXFIFO_SIZE << OTGFS_HPTXFSIZ_PTXFD_SHIFT); + stm32_putreg(STM32_OTGFS_HPTXFSIZ, regval); + + /* If OTG were supported, we sould need to clear HNP enable bit in the + * USB_OTG control register about here. + */ + + /* Flush all FIFOs */ + + stm32_flush_txfifos(OTGFS_GRSTCTL_TXFNUM_HALL); + stm32_flush_rxfifo(); + + /* Clear all pending HC Interrupts */ + + for (i = 0; i < STM32_NHOST_CHANNELS; i++) + { + stm32_putreg(STM32_OTGFS_HCINT(i), 0xffffffff); + stm32_putreg(STM32_OTGFS_HCINTMSK(i), 0); + } + + /* Driver Vbus +5V (the smoke test). Should be done elsewhere in OTG + * mode. + */ + + stm32_usbhost_vbusdrive(0, true); + + /* Enable host interrupts */ + + stm32_hostinit_enable(priv); + return OK; +} + +/******************************************************************************* + * Name: stm32_sw_initialize + * + * Description: + * One-time setup of the host driver state structure. + * + * Input Parameters: + * priv -- USB host driver private data structure. + * + * Returned Value: + * None. + * + *******************************************************************************/ + +static inline void stm32_sw_initialize(FAR struct stm32_usbhost_s *priv) +{ + int i; + + /* Initialize the state data structure */ + + sem_init(&priv->eventsem, 0, 0); + sem_init(&priv->exclsem, 0, 1); + +#warning "Missing logic" + + /* Indicate that we are not connected */ + + priv->connected = false; + + /* Put all of the channels back in their initial state */ + + memset(priv-chan, 0, STM32_MAX_TX_FIFOS * sizeof(struct stn32_chan_s)); + + for (i = 0; i < STM32_MAX_TX_FIFOS; i++) + { + FAR struct stm32_chan_s *chan = &priv->chan[i]; + sem_init(&chan->chansem, 0, 0); + } + + /* Initialize endpoint zero packet size */ + + priv->chan[0].maxpacket = STM32_EP0_MAX_PACKET_SIZE; +} + +/******************************************************************************* + * Name: stm32_hw_initialize + * + * Description: + * One-time setup of the host controller harware for normal operations. * * Input Parameters: * priv -- USB host driver private data structure. @@ -1832,9 +2143,77 @@ static inline void stm32_ep0init(struct stm32_usbhost_s *priv) * *******************************************************************************/ -static inline int stm32_hcdinitialize(FAR struct stm32_usbhost_s *priv) +static inline int stm32_hw_initialize(FAR struct stm32_usbhost_s *priv) { -#warning "Missing Logic" + uint32_t regval; + int ret; + + /* Set the PHYSEL bit in the GUSBCFG register to select the OTG FS serial + * transceiver: "This bit is always 1 with write-only access" + */ + + regval = stm32_getreg(STM32_OTGFS_GUSBCFG);; + regval |= OTGFS_GUSBCFG_PHYSEL; + stm32_putreg(STM32_OTGFS_GUSBCFG, regval); + + /* Reset after a PHY select and set Host mode. First, wait for AHB master + * IDLE state. + */ + + for (timeout = 0; timeout < STM32_READY_DELAY; timeout++) + { + up_udelay(3); + regval = stm32_getreg(STM32_OTGFS_GRSTCTL); + if ((regval & OTGFS_GRSTCTL_AHBIDL) != 0) + { + break; + } + } + + /* Then perform the core soft reset. */ + + stm32_putreg(STM32_OTGFS_GRSTCTL, OTGFS_GRSTCTL_CSRST); + for (timeout = 0; timeout < STM32_READY_DELAY; timeout++) + { + regval = stm32_getreg(STM32_OTGFS_GRSTCTL); + if ((regval & OTGFS_GRSTCTL_CSRST) == 0) + { + break; + } + } + + /* Wait for 3 PHY Clocks */ + + up_udelay(3); + + /* Deactivate the power down */ + + regval = (OTGFS_GCCFG_PWRDWN | OTGFS_GCCFG_VBUSASEN | OTGFS_GCCFG_VBUSBSEN); +#ifndef CONFIG_USBDEV_VBUSSENSING + regval |= OTGFS_GCCFG_NOVBUSSENS; +#endif +#ifdef CONFIG_STM32_OTGFS_SOFOUTPUT + regval |= OTGFS_GCCFG_SOFOUTEN; +#endif + stm32_putreg(STM32_OTGFS_GCCFG, regval); + up_mdelay(20); + + /* Initialize OTG features: In order to support OTP, the HNPCAP and SRPCAP + * bits would need to be set in the GUSBCFG register about here. + */ + + /* Force Host Mode */ + + regval = stm32_getreg(STM32_OTGFS_GUSBCFG); + regval &= ~OTGFS_GUSBCFG_FDMOD; + regval |= OTGFS_GUSBCFG_FHMOD; + stm32_putreg(STM32_OTGFS_GUSBCFG, regval); + up_mdelay(50); + + /* Initialize host mode and return success */ + + stm32_host_initialize(priv); + return OK; } /******************************************************************************* @@ -1868,7 +2247,7 @@ static inline int stm32_hcdinitialize(FAR struct stm32_usbhost_s *priv) FAR struct usbhost_driver_s *usbhost_initialize(int controller) { - /* At present, there is only a single OTG FS device support. Hence it is + /* At present, there is only support for a single OTG FS host. Hence it is * pre-allocated as g_usbhost. However, in most code, the private data * structure will be referenced using the 'priv' pointer (rather than the * global data) in order to simplify any future support for multiple devices. @@ -1881,14 +2260,13 @@ FAR struct usbhost_driver_s *usbhost_initialize(int controller) DEBUGASSERT(controller == 0); - /* Initialize the state data structure */ + /* Make sure that interrupts from the OTG FS core are disabled */ - sem_init(&priv->rhssem, 0, 0); - sem_init(&priv->exclsem, 0, 1); + stm32_gint_disable(); /* Reset the state of the host driver */ - stm32_swreset(priv); + stm32_sw_initialize(priv); /* Alternate function pin configuration. Here we assume that: * @@ -1925,16 +2303,20 @@ FAR struct usbhost_driver_s *usbhost_initialize(int controller) /* Initialize the USB OTG FS core */ - stm32_hcdinitialize(priv); + stm32_hw_initialize(priv); /* Attach USB host controller interrupt handler */ - if (irq_attach(STM32_IRQ_OTGFS, stm32_otgfs_interrupt) != 0) + if (irq_attach(STM32_IRQ_OTGFS, stm32_gint_isr) != 0) { udbg("Failed to attach IRQ\n"); return NULL; } + /* Enable USB OTG FS global interrupts */ + + stm32_gint_enable(); + /* Enable interrupts at the interrupt controller */ up_enable_irq(STM32_IRQ_OTGFS); From 756715d077f25572078733d07f5b9192ab17a9eb Mon Sep 17 00:00:00 2001 From: patacongo Date: Sat, 18 Aug 2012 21:22:16 +0000 Subject: [PATCH 08/31] STM32 USB host driver update git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5035 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h | 2 + nuttx/arch/arm/src/stm32/stm32_otgfshost.c | 1009 ++++++++++++++++++- 2 files changed, 967 insertions(+), 44 deletions(-) diff --git a/nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h b/nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h index b7e8df1eff..1cb1c63837 100644 --- a/nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h +++ b/nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h @@ -633,6 +633,8 @@ # define OTGFS_HPTXSTS_TYPE_HALT (3 << OTGFS_HPTXSTS_TYPE_SHIFT) /* Disable channel command */ # define OTGFS_HPTXSTS_EPNUM_SHIFT (27) /* Bits 27-30: Endpoint number */ # define OTGFS_HPTXSTS_EPNUM_MASK (15 << OTGFS_HPTXSTS_EPNUM_SHIFT) +# define OTGFS_HPTXSTS_CHNUM_SHIFT (27) /* Bits 27-30: Channel number */ +# define OTGFS_HPTXSTS_CHNUM_MASK (15 << OTGFS_HPTXSTS_CHNUM_SHIFT) # define OTGFS_HPTXSTS_ODD (1 << 24) /* Bit 31: Send in odd (vs even) frame */ /* Host all channels interrupt and all channels interrupt mask registers */ diff --git a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c index ab00f29cf9..d888b2c225 100644 --- a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c +++ b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c @@ -75,12 +75,6 @@ # error "CONFIG_STM32_SYSCFG is required" #endif -/* Default RX buffer size */ - -#ifndef CONFIG_STM32_OTGFS_RXBUFSIZE -# define CONFIG_STM32_OTGFS_RXBUFSIZE 512 -#endif - /* Default RxFIFO size */ #ifndef CONFIG_STM32_OTGFS_RXFIFO_SIZE @@ -113,6 +107,10 @@ #define STM32_EP0_MAX_PACKET_SIZE 64 /* EP0 FS max packet size */ #define STM32_MAX_TX_FIFOS 15 /* Max number of TX FIFOs */ +/* The size of the RX buffer is the same as the size of the Rx FIFO (in bytes) */ + +#define STM32_OTGFS_RXBUFSIZE (CONFIG_STM32_OTGFS_RXFIFO_SIZE << 2) + /* Delays **********************************************************************/ #define STM32_READY_DELAY 200000 @@ -192,8 +190,8 @@ struct stn32_chan_s uint8_t speed; /* See enum stm32_usbspeed_e */ uint8_t eptype; /* See OTGFS_EPTYPE_* definitions */ uint8_t pid; /* Data PID */ - uint8_t intoggle; /* IN data toggle */ - uint8_t outtoggle; /* OUT data toggle */ + bool indata1; /* IN data toggle. True: DATA01 */ + bool outdata1; /* OUT data toggle. True: DATA01 */ bool isin; /* True: IN endpoint */ volatile bool chanwait; /* True: Thread is waiting for a channel event */ volatile uint16_t nerrors; /* Number of errors detecgted */ @@ -202,7 +200,7 @@ struct stn32_chan_s uint16_t maxpacket; /* Max packet size */ uint16_t buflen; /* Buffer length (remaining) */ uint16_t xfrlen; /* Number of bytes transferrred */ - uint8_t *buffer; /* Transfer buffer pointer */ + FAR uint8_t *buffer; /* Transfer buffer pointer */ }; /* This structure retains the state of the USB host controller */ @@ -235,7 +233,7 @@ struct stm32_usbhost_s /* The RX buffer */ - uint8_t rxbuffer[CONFIG_STM32_OTGFS_RXBUFSIZE]; + uint8_t rxbuffer[STM32_OTGFS_RXBUFSIZE]; }; /******************************************************************************* @@ -275,12 +273,17 @@ static void stm32_setinttab(uint32_t value, unsigned int interval, unsigned int #endif /* Interrupt handling **********************************************************/ -/* Third level interrupt handlers */ +/* Lower level interrupt handlers */ +static void stm32_gint_wrpacket(FAR struct stm32_usbhost_s *priv, + FAR uint8_t *buffer, int chidx, int buflen); +static void stm32_gint_halttxchan(FAR struct stm32_usbhost_s *priv, int chidx); static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, int chidx); static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, int chidx); +static void stm32_gint_connected(FAR struct stm32_usbhost_s *priv); +static inline void stm32_gint_disconnected(FAR struct stm32_usbhost_s *priv); /* Second level interrupt handlers */ @@ -336,6 +339,7 @@ static inline void stm32_ep0init(FAR struct stm32_usbhost_s *priv); static void stm32_portreset(FAR struct stm32_usbhost_s *priv); static inline void stm32_flush_txfifos(uint32_t txfnum); static inline void stm32_flush_rxfifo(void); +static void stm32_vbusdrive(FAR struct stm32_usbhost_s *priv, bool state); static void stm32_host_initialize(FAR struct stm32_usbhost_s *priv); static inline void stm32_sw_initialize(FAR struct stm32_usbhost_s *priv); static inline int stm32_hw_initialize(FAR struct stm32_usbhost_s *priv); @@ -722,6 +726,96 @@ static int stm32_ctrltd(struct stm32_usbhost_s *priv, uint32_t dirpid, return ret; } +/******************************************************************************* + * Name: stm32_gint_wrpacket + * + * Description: + * Transfer the 'buflen' bytes in 'buffer' to the Tx FIFO associated with + * 'chidx' (non-DMA). + * + *******************************************************************************/ + +static void stm32_gint_wrpacket(FAR struct stm32_usbhost_s *priv, + FAR uint8_t *buffer, int chidx, int buflen) +{ + FAR volatile uint32_t *fifo; + FAR uint32_t *src; + int buflen32; + + /* Get the number of 32-byte words associated with this byte size */ + + buflen32 = (buflen + 3) >> 2; + + /* Get the address of the Tx FIFO associated with this channel */ + + fifo = STM32_OTGFS_DFIFO_HCH(chidx); + + /* Transfer all of the data into the Tx FIFO */ + + src = (FAR uint32_t *)buffer; + for (; buflen32 > 0; buflen32--) + { + uint32_t data = *src++; + stm32_putreg(fifo, data); + } +} + +/******************************************************************************* + * Name: stm32_gint_halttxchan + * + * Description: + * Halt the Tx channel associated with 'chidx' by setting the CHannel DISable + * (CHDIS) bit in in the HCCHAR register. + * + *******************************************************************************/ + +static void stm32_gint_halttxchan(FAR struct stm32_usbhost_s *priv, int chidx) +{ + uint32_t hcchar; + uint32_t eptype; + uint32_t txsts; + + /* Prepare to set the CHannel DISable and the CHannel ENAble bits in the + * HCCHAR register. + */ + + hcchar = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); + hcchar |= (OTGFS_HCCHAR_CHDIS | OTGFS_HCCHAR_CHENA); + + /* Get the endpoint type from the HCCHAR register */ + + eptype = (hcchar & OTGFS_HCCHAR_EPTYP_MASK); + + if (eptype == OTGFS_HCCHAR_EPTYP_CTRL || eptype == OTGFS_HCCHAR_EPTYP_BULK) + { + /* Check if the non-periodic Tx FIFO is empty. */ + + txsts = stm32_getreg(STM32_OTGFS_HNPTXSTS); + if ((txsts & OTGFS_HNPTXSTS_NPTXFSAV_MASK) == 0) + { + /* The Tx FIFO is empty... disable the channel */ + + hcchar &= ~OTGFS_HCCHAR_CHENA; + } + } + else /* if (eptype == OTGFS_HCCHAR_EPTYP_ISOC || eptype == OTGFS_HCCHAR_EPTYP_INTR) */ + { + /* Check if the periodic Tx FIFO is empty. */ + + txsts = stm32_getreg(STM32_OTGFS_HPTXSTS); + if ((txsts & OTGFS_HPTXSTS_PTXFSAVL_MASK) == 0) + { + /* The Tx FIFO is empty... disable the channel */ + + hcchar &= ~OTGFS_HCCHAR_CHENA; + } + } + + /* Halt the channel by setting CHDIS in the HCCHAR */ + + stm32_putreg(STM32_OTGFS_HCCHAR(chidx), hcchar); +} + /******************************************************************************* * Name: stm32_gint_hcinisr * @@ -733,7 +827,266 @@ static int stm32_ctrltd(struct stm32_usbhost_s *priv, uint32_t dirpid, static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, int chidx) { -#warning "Missing logic" + uint32_t hcint; + uint32_t hcintmsk; + uint32_t hcchar; + uint32_t hctsiz; + unsigned int eptype; + + /* Read the HCINT register to get the pending HC interrupts. Read the + * HCINTMSK register to get the set of enabled HC interrupts. + */ + + hcint = stm32_getreg(STM32_OTGFS_HCINT(chidx)); + hcintmsk = stm32_getreg(STM32_OTGFS_HCINTMSK(chidx)); + + /* AND the two to get the set of enabled, pending HC interrupts */ + + pending = hcint & hcintmsk; + + /* Pre-fetch the HCCHAR register and extract the endpoint type. Those + * values are used in several cases. + */ + + hcchar = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); + eptype = (hcchar & OTGFS_HCCHAR_EPTYP_MASK) >> OTGFS_HCCHAR_EPTYP_SHIFT; + + /* Check for a pending ACK response received/transmitted (ACK) interrrupt */ + + if ((pending & OTGFS_HCINT_ACK) != 0) + { + /* Clear the pending the ACK response received/transmitted (ACK) interrupt */ + + hcint &= ~OTGFS_HCINT_ACK; + stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + } + + /* Check for a pending STALL response receive (STALL) interrrupt */ + + else if ((pending & OTGFS_HCINT_STALL) != 0) + { + /* Unmask the CHannel Halted (CHH) interrupt */ + + hcintmsk |= OTGFS_HCINT_CHH; + stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); + + /* Set the stall state */ + + priv->chan[chidx].chstate = CHSTATE_STALL; + + /* Clear the NAK and STALL Conditions. */ + + hcint &= ~(OTGFS_HCINT_NAK | OTGFS_HCINT_STALL); + stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + + /* Halt the Tx channel */ + + stm32_gint_halttxchan(priv, chidx); + + /* When there is a STALL, clear any pending NAK so that it is nor + * processed below. + */ + + pending &= ~OTGFS_HCINT_NAK; + } + + /* Check for a pending Data Toggle ERRor (DTERR) interrrupt */ + + else if ((pending & OTGFS_HCINT_DTERR) != 0) + { + /* Unmask the CHannel Halted (CHH) interrupt */ + + hcintmsk |= OTGFS_HCINT_CHH; + stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); + + /* Halt the Tx channel */ + + stm32_gint_halttxchan(priv, chidx); + + /* Clear the NAK and data toggle error conditions */ + + hcint &= ~(OTGFS_HCINT_NAK | OTGFS_HCINT_DTERR); + stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + + /* Set the Data Toggle ERRor (DTERR) state */ + + priv->chan[chidx].chstate = CHSTATE_DTERR; + } + + /* Check for a pending FRaMe OverRun (FRMOR) interrrupt */ + + if ((pending & OTGFS_HCINT_FRMOR) != 0) + { + /* Unmask the CHannel Halted (CHH) interrupt */ + + hcintmsk |= OTGFS_HCINT_CHH; + stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); + + /* Halt the Tx channel */ + + stm32_gint_halttxchan(priv, chidx); + + /* Clear the FRaMe OverRun (FRMOR) condition */ + + hcint &= ~OTGFS_HCINT_FRMOR; + stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + } + + /* Check for a pending TransFeR Completed (XFRC) interrrupt */ + + else if ((pending & OTGFS_HCINT_XFRC) != 0) + { + /* Set the trnansfer complete state and reset the error count */ + + priv->chan[chidx].chstate = CHSTATE_XFRC; + priv->chan[chidx].nerrors = 0; + + /* Clear the TransFeR Completed (XFRC) condition */ + + hcint &= ~OTGFS_HCINT_XFRC; + stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + + if ((eptype == OTGFS_HCCHAR_EPTYP_CTRL) || + (eptype == OTGFS_HCCHAR_EPTYP_BULK)) + { + /* Unmask the CHannel Halted (CHH) interrupt */ + + hcintmsk |= OTGFS_HCINT_CHH; + stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); + + /* Halt the Tx channel */ + + stm32_gint_halttxchan(priv, chidx); + + /* Clear any pending NAK condition */ + + hcint &= ~OTGFS_HCINT_NAK; + stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + + /* Toggle the IN data state */ + + priv->chan[chidx].indata1 ^= true; + } + else if (eptype == OTGFS_HCCHAR_EPTYP_INTR) + { + /* Force the next transfer on an ODD frame */ + + hcchar |= OTGFS_HCCHAR_ODDFRM; + stm32_putreg(STM32_OTGFS_HCCHAR(chidx), hcchar); + + /* Set the request done state */ + + priv->chan[chidx].rqstate = RQSTATE_DONE; + } + } + + /* Check for a pending CHannel Halted (CHH) interrrupt */ + + else if ((pending & OTGFS_HCINT_CHH) != 0) + { + /* Mask the CHannel Halted (CHH) interrupt */ + + hcintmsk &= ~OTGFS_HCINT_CHH; + stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); + + /* Update the request state based on the host state machine state */ + + if (priv->chan[chidx].chstate == CHSTATE_XFRC) + { + /* Set the request done state */ + + priv->chan[chidx].rqstate = RQSTATE_DONE; + } + else if (priv->chan[chidx].chstate == CHSTATE_STALL) + { + /* Set the request stall state */ + + priv->chan[chidx].rqstate = RQSTATE_STALL; + } + else if ((priv->chan[chidx].chstate == CHSTATE_TXERR) || + (priv->chan[chidx].chstate == CHSTATE_DTERR)) + { + /* Set the request error state */ + + priv->chan[chidx].nerrors = 0; + priv->chan[chidx].rqstate = RQSTATE_ERROR; + + } + else if (eptype == OTGFS_HCCHAR_EPTYP_INTR) + { + /* Toggle the IN data toggle */ + + priv->chan[chidx].indata1 ^= true; + } + + /* Clear the CHannel Halted (CHH) condition */ + + hcint &= ~OTGFS_HCINT_CHH; + stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + } + + /* Check for a pending Transaction ERror (TXERR) interrrupt */ + + else if ((pending & OTGFS_HCINT_TXERR) != 0) + { + /* Unmask the CHannel Halted (CHH) interrupt */ + + hcintmsk |= OTGFS_HCINT_CHH; + stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); + + /* Increment the error count and set the transaction error state */ + + priv->chan[chidx].nerrors++; + priv->chan[chidx].chstate = CHSTATE_TXERR; + + /* Halt the Tx channel */ + + stm32_gint_halttxchan(priv, chidx); + + /* Clear the Transaction ERror (TXERR) condition */ + + hcint &= ~OTGFS_HCINT_TXERR; + stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + } + + /* Check for a pending NAK response received (NAK) interrrupt */ + + else if ((pending & OTGFS_HCINT_NAK) != 0) + { + /* Handle the NAK based on the endpoint type */ + + if (eptype == OTGFS_HCCHAR_EPTYP_INTR) + { + /* Unmask the CHannel Halted (CHH) interrupt */ + + hcintmsk |= OTGFS_HCINT_CHH; + stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); + + /* Halt the Tx channel */ + + stm32_gint_halttxchan(priv, chidx); + } + else if ((eptype == OTGFS_HCCHAR_EPTYP_CTRL) || + (eptype == OTGFS_HCCHAR_EPTYP_BULK)) + { + /* Re-activate the channel by clearing CHDIS and assuring that + * CHENA is set + */ + + hcchar |= OTGFS_HCCHAR_CHENA; + hcchar &= ~OTGFS_HCCHAR_CHDIS; + stm32_putreg(STM32_OTGFS_HCCHAR(chidx), hcchar); + } + + /* Set the NAK state */ + + priv->chan[chidx].chstate = CHSTATE_NAK; + + /* Clear the NAK condition */ + + hcint &= ~OTGFS_HCINT_NAK; + stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + } } /******************************************************************************* @@ -747,7 +1100,332 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, int chidx) { -#warning "Missing logic" + uint32_t hcint; + uint32_t hcintmsk; + uint32_t pending; + uint32_t hcchar; + + /* Read the HCINT register to get the pending HC interrupts. Read the + * HCINTMSK register to get the set of enabled HC interrupts. + */ + + hcint = stm32_getreg(STM32_OTGFS_HCINT(chidx)); + hcintmsk = stm32_getreg(STM32_OTGFS_HCINTMSK(chidx)); + + /* AND the two to get the set of enabled, pending HC interrupts */ + + pending = hcint & hcintmsk; + + /* Check for a pending ACK response received/transmitted (ACK) interrrupt */ + + if ((pending & OTGFS_HCINT_ACK) != 0) + { + /* Clear the pending the ACK response received/transmitted (ACK) interrupt */ + + hcint &= ~OTGFS_HCINT_ACK; + stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + } + + /* Check for a pending FRaMe OverRun (FRMOR) interrrupt */ + + else if ((pending & OTGFS_HCINT_FRMOR) != 0) + { + /* Unmask the CHannel Halted (CHH) interrupt */ + + hcintmsk |= OTGFS_HCINT_CHH; + stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); + + /* Halt the Tx channel */ + + stm32_gint_halttxchan(priv, chidx); + + /* Clear the pending the FRaMe OverRun (FRMOR) interrupt */ + + hcint &= ~OTGFS_HCINT_FRMOR; + stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + } + + /* Check for a pending TransFeR Completed (XFRC) interrrupt */ + + else if ((pending & OTGFS_HCINT_XFRC) != 0) + { + priv->chan[chidx].nerrors = 0; + + /* Unmask the CHannel Halted (CHH) interrupt */ + + hcintmsk |= OTGFS_HCINT_CHH; + stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); + + /* Halt the Tx channel */ + + stm32_gint_halttxchan(priv, chidx); + + /* Clear the pending the TransFeR Completed (XFRC) interrupt */ + + hcint &= ~OTGFS_HCINT_XFRC; + stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + + /* Set the transfer completed state */ + + priv->chan[chidx].chstate = CHSTATE_XFRC; + } + + /* Check for a pending STALL response receive (STALL) interrrupt */ + + else if ((pending & OTGFS_HCINT_STALL) != 0) + { + /* Clear the pending the STALL response receiv (STALL) interrupt */ + + hcint &= ~OTGFS_HCINT_STALL; + stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + + /* Unmask the CHannel Halted (CHH) interrupt */ + + hcintmsk |= OTGFS_HCINT_CHH; + stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); + + /* Halt the Tx channel */ + + stm32_gint_halttxchan(priv, chidx); + + /* Set the stall state */ + + priv->chan[chidx].chstate = CHSTATE_STALL; + } + + /* Check for a pending NAK response received (NAK) interrrupt */ + + else if ((pending & OTGFS_HCINT_NAK) != 0) + { + uint32_t regval; + + /* Clear the error count */ + + priv->chan[chidx].nerrors = 0; + + /* Unmask the CHannel Halted (CHH) interrupt */ + + hcintmsk |= OTGFS_HCINT_CHH; + stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); + + /* Halt the Tx channel */ + + stm32_gint_halttxchan(priv, chidx); + + /* Clear the pending the NAK response received (NAK) interrupt */ + + hcint &= ~OTGFS_HCINT_NAK; + stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + + /* Set the NAK state */ + + priv->chan[chidx].chstate = CHSTATE_NAK; + } + + /* Check for a pending Transaction ERror (TXERR) interrrupt */ + + else if ((pending & OTGFS_HCINT_TXERR) != 0) + { + /* Unmask the CHannel Halted (CHH) interrupt */ + + hcintmsk |= OTGFS_HCINT_CHH; + stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); + + /* Halt the Tx channel */ + + stm32_gint_halttxchan(priv, chidx); + + /* Increment the number of errors */ + + priv->chan[chidx].nerrors++; + + /* Set the transaction error state */ + + priv->chan[chidx].chstate = CHSTATE_TXERR; + + /* Clear the pending the Transaction ERror (TXERR) interrupt */ + + hcint &= ~OTGFS_HCINT_TXERR; + stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + } + + /* Check for a pending response received (xxx) interrrupt */ + +#if 0 /* NYET is a reserved bit in the HCINT register */ + else if ((pending & OTGFS_HCINT_NYET) != 0) + { + priv->chan[chidx].nerrors = 0; + + /* Unmask the CHannel Halted (CHH) interrupt */ + + hcintmsk |= OTGFS_HCINT_CHH; + stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); + + /* Halt the Tx channel */ + + stm32_gint_halttxchan(priv, chidx); + + /* Clear the pending the response received (xxx) interrupt */ + + hcint &= ~OTGFS_HCINT_NYET; + stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + + /* Set the NYET state */ + + priv->chan[chidx].chstate = CHSTATE_NYET; + } +#endif + + /* Check for a pending Data Toggle ERRor (DTERR) interrrupt */ + + else if (pending & OTGFS_HCINT_DTERR) + { + /* Unmask the CHannel Halted (CHH) interrupt */ + + hcintmsk |= OTGFS_HCINT_CHH; + stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); + + /* Halt the Tx channel */ + + stm32_gint_halttxchan(priv, chidx); + + /* Set the data toggle error state */ + + priv->chan[chidx].chstate = CHSTATE_DTERR; + + /* Clear the pending the Data Toggle ERRor (DTERR) and NAK interrupts */ + + hcint &= ~(OTGFS_HCINT_DTERR | OTGFS_HCINT_NAK); + stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + } + + /* Check for a pending CHannel Halted (CHH) interrrupt */ + + else if ((pending & OTGFS_HCINT_CHH) != 0) + { + /* Mask the CHannel Halted (CHH) interrupt */ + + hcintmsk &= ~OTGFS_HCINT_CHH; + stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); + + if (priv->chan[chidx].chstate == CHSTATE_XFRC) + { + /* Set the request done state */ + + priv->chan[chidx].rqstate = RQSTATE_DONE; + + /* Read the HCCHAR register to get the HCCHAR register to get + * the endpoint type. + */ + + hcchar = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); + + /* Is it a bulk endpoint */ + + if ((hcchar & OTGFS_HCCHAR_EPTYP_MASK) == OTGFS_HCCHAR_EPTYP_BULK) + { + /* Yes... toggle the data out PID */ + + priv->chan[chidx].outdata1 ^= true; + } + } + else if (priv->chan[chidx].chstate == CHSTATE_NAK || + priv->chan[chidx].chstate == CHSTATE_NYET) + { + priv->chan[chidx].rqstate = RQSTATE_NOTREADY; + } + else if (priv->chan[chidx].chstate == CHSTATE_STALL) + { + /* Set the request stall state */ + + priv->chan[chidx].rqstate = RQSTATE_STALL; + } + else if (priv->chan[chidx].chstate == CHSTATE_TXERR) + { + /* Check the error count */ + + if (priv->chan[chidx].nerrors == 3) + { + /* If the error count exceeds a threshold, then set the request error state */ + + priv->chan[chidx].rqstate = RQSTATE_ERROR; + priv->chan[chidx].nerrors = 0; + } + } + + /* Clear the pending the CHannel Halted (CHH) interrupt */ + + hcint &= ~OTGFS_HCINT_CHH; + stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + } +} + +/******************************************************************************* + * Name: stm32_gint_connected + * + * Description: + * Handle a connection event. + * + *******************************************************************************/ + +static void stm32_gint_connected(FAR struct stm32_usbhost_s *priv) +{ + /* We we previously disconnected? */ + + if (!priv->connected) + { + /* Yes.. then now we are connected */ + + ullvdbg("Connected\n"); + priv->connected = true; + + /* Notify any waiters */ + + if (priv->eventwait) + { + stm32_givesem(&priv->eventsem); + priv->eventwait = false; + } + } +} + +/******************************************************************************* + * Name: stm32_gint_disconnected + * + * Description: + * Handle a disconnection event. + * + *******************************************************************************/ + +static inline void stm32_gint_disconnected(FAR struct stm32_usbhost_s *priv) +{ + /* Were we previously connected? */ + + if !priv->connected) + { + /* Yes.. then we no longer connected */ + + ullvdbg("Disconnected\n"); + priv->connected = false; + + /* Are we bound to a class driver? */ + + if (priv->class) + { + /* Yes.. Disconnect the class driver */ + + CLASS_DISCONNECTED(priv->class); + priv->class = NULL; + } + + /* Notify any waiters that there is a change in the connection state */ + + if (priv->eventwait) + { + stm32_givesem(&priv->eventsem); + priv->eventwait = false; + } + } } /******************************************************************************* @@ -842,7 +1520,7 @@ static inline void stm32_gint_rxflvlisr(FAR struct stm32_usbhost_s *priv) /* Check if more packets are expected */ hctsiz = stm32_getreg(STM32_OTGFS_HCTSIZ(chidx)); - if (hctsiz.b.pktcnt > 0) + if ((hctsiz & OTGFS_HCTSIZ_PKTCNT_MASK) != 0) { /* Re-activate the channel when more packets are expected */ @@ -877,7 +1555,71 @@ static inline void stm32_gint_rxflvlisr(FAR struct stm32_usbhost_s *priv) static inline void stm32_gint_nptxfeisr(FAR struct stm32_usbhost_s *priv) { -#warning "Missing logic" + uint32_t regval; + unsigned int buflen; + unsigned int buflen32; + unsigned int wrsize; + unsigned int avail32; + unsigned int chidx; + + /* Loop while there is data to be sent and where there is space available + * in the non-periodic Tx FIFO. + */ + + for (;;) + { + /* Read the status from the top of the non-periodic TxFIFO */ + + regval = stm32_getreg(STM32_OTGFS_HNPTXSTS); + + /* Extract the channel number and the number of 32-bit words available in + * the non-periodic Tx FIFO. + */ + + chidx = (regval & OTGFS_HNPTXSTS_CHNUM_MASK) >> OTGFS_HNPTXSTS_CHNUM_SHIFT; + avail32 = (regval & OTGFS_HNPTXSTS_NPTXFSAV_MASK) >> OTGFS_HNPTXSTS_NPTXFSAV_SHIFT; + + /* Get the number of words remaining to be sent */ + + buflen = priv->chan[chidx].buflen + buflen32 = (buflen + 3) >> 2; + + /* Break out of the loop if either (a) there is nothing more to be + * sent, or (2) there is insufficent space availabe in the non-periodic + * Tx FIFO to hold the next packet. + */ + + if (buflen == 0 || avail32 <= buflen32) + { + return; + } + + /* Get the number of bytes available in the non-periodic Tx FIFO. That + * is the maximum write size. + */ + + wrsize = avail32 << 2; + + /* Clip the actual write size to the number of bytes actually available + * to be sent. + */ + + if (wrsize > buflen) + { + /* This is the last packet to be sent. Clip to the amount of + * data to send in the last packet. + */ + + wrsize = buflen; + stm32_modifyreg(STM32_OTGFS_GINTMSK, OTGFS_GINT_NPTXFE, 0); + } + + stm32_gint_wrpacket(priv, priv->chan[chidx].buffer, chidx, wrsize); + + priv->chan[chidx].buffer += wrsize; + priv->chan[chidx].buflen -= wrsize; + priv->chan[chidx].xfrlen += wrsize; + } } /******************************************************************************* @@ -890,7 +1632,71 @@ static inline void stm32_gint_nptxfeisr(FAR struct stm32_usbhost_s *priv) static inline void stm32_gint_ptxfeisr(FAR struct stm32_usbhost_s *priv) { -#warning "Missing logic" + uint32_t regval; + unsigned int buflen; + unsigned int buflen32; + unsigned int wrsize; + unsigned int avail32; + unsigned int chidx; + + /* Loop while there is data to be sent and where there is space available + * in the periodic Tx FIFO. + */ + + for (;;) + { + /* Read the status from the top of the periodic TxFIFO */ + + regval = stm32_getreg(STM32_OTGFS_HPTXSTS); + + /* Extract the channel number and the number of 32-bit words available in + * the periodic Tx FIFO. + */ + + chidx = (regval & OTGFS_HPTXSTS_CHNUM_MASK) >> OTGFS_HPTXSTS_CHNUM_SHIFT; + avail32 = (regval & OTGFS_HPTXSTS_PTXFSAVL_MASK) >> OTGFS_HPTXSTS_PTXFSAVL_SHIFT; + + /* Get the number of words remaining to be sent */ + + buflen = priv->chan[chidx].buflen + buflen32 = (buflen + 3) >> 2; + + /* Break out of the loop if either (a) there is nothing more to be + * sent, or (2) there is insufficent space availabe in the periodic + * Tx FIFO to hold the next packet. + */ + + if (buflen == 0 || avail32 <= buflen32) + { + return; + } + + /* Get the number of bytes available in the periodic Tx FIFO. That is + * the maximum write size. + */ + + wrsize = avail32 << 2; + + /* Clip the actual write size to the number of bytes actually available + * to be sent. + */ + + if (wrsize > buflen) + { + /* This is the last packet to be sent. Clip to the amount of + * data to send in the last packet. + */ + + wrsize = buflen; + stm32_modifyreg(STM32_OTGFS_GINTMSK, OTGFS_GINT_PTXFE, 0); + } + + stm32_gint_wrpacket(priv, priv->chan[chidx].buffer, chidx, wrsize); + + priv->chan[chidx].buffer += wrsize; + priv->chan[chidx].buflen -= wrsize; + priv->chan[chidx].xfrlen += wrsize; + } } /******************************************************************************* @@ -951,7 +1757,103 @@ static inline void stm32_gint_hcisr(FAR struct stm32_usbhost_s *priv) static inline void stm32_gint_hprtisr(FAR struct stm32_usbhost_s *priv) { -#warning "Missing logic" + uint32_t hprt; + uint32_t newhprt; + uint32_t hcfg; + + /* Read the port status and control register (HPRT) */ + + hprt = stm32_getreg(STM32_OTGFS_HPRT); + + /* Setup to clear the interrupt bits in GINTSTS by setting the corresponding + * bits in the HPRT. + */ + + newhprt = hprt & ~(OTGFS_HPRT_PENA | OTGFS_HPRT_PCDET | + OTGFS_HPRT_PENCHNG | OTGFS_HPRT_POCCHNG); + + /* Check for Port Overcurrent CHaNGe (POCCHNG) */ + + if ((hprt & OTGFS_HPRT_POCCHNG) != 0) + { + /* Set up to clear the POCCHNG status in the new HPRT contents. */ + + newhprt |= OTGFS_HPRT_POCCHNG; + } + + /* Check for Port Connect DETected (PCDET). The core sets this bit when a + * device connection is detected. + */ + + if ((hprt & OTGFS_HPRT_PCDET) != 0) + { + /* Set up to clear the PCDET status in the new HPRT contents. Then + * process the new connection event. + */ + + newhprt |= OTGFS_HPRT_PCDET; + stm32_gint_connected(priv); + } + + /* Check for Port Enable CHaNGed (PENCHNG) */ + + if ((hprt & OTGFS_HPRT_PENCHNG) != 0) + { + /* Set up to clear the PENCHNG status in the new HPRT contents. */ + + newhprt |= OTGFS_HPRT_PENCHNG; + + /* Was the port enabled? */ + + if ((hprt & OTGFS_HPRT_PENA) != 0) + { + uint32_t hcfg; + + /* Yes.. handle the new connection event */ + + stm32_gint_connected(priv); + + /* Check the Host ConFiGuration register (HCFG) */ + + hcfg = stm32_getreg(STM32_OTGFS_HCFG); + + /* Is this a low speed or full speed connection (OTG FS does not + * support high speed) + */ + + if ((hprt & OTGFS_HPRT_PSPD_MASK) == OTGFS_HPRT_PSPD_LS) + { + /* Set the Host Frame Interval Register for the 6KHz speed */ + + stm32_putreg(STM32_OTGFS_HFIR, 6000); + + if ((hcfg & OTGFS_HCFG_FSLSPCS_MASK) != OTGFS_HCFG_FSLSPCS_LS6MHz) + { + hcfg &= ~OTGFS_HCFG_FSLSPCS_MASK; + hcfg |= OTGFS_HCFG_FSLSPCS_LS6MHz; + stm32_putreg(STM32_OTGFS_HCFG, hcfg); + } + } + else /* if ((hprt & OTGFS_HPRT_PSPD_MASK) == OTGFS_HPRT_PSPD_FS) */ + { + stm32_putreg(STM32_OTGFS_HFIR, 48000); + if ((hcfg & OTGFS_HCFG_FSLSPCS_MASK) != OTGFS_HCFG_FSLSPCS_FS48MHz) + { + hcfg &= ~OTGFS_HCFG_FSLSPCS_MASK; + hcfg |= OTGFS_HCFG_FSLSPCS_FS48MHz; + stm32_putreg(STM32_OTGFS_HCFG, hcfg); + } + } + + /* Reset the port */ + + stm32_portreset(priv); + } + } + + /* Clear port interrupts by setting bits in the HPRT */ + + stm32_putreg(STM32_OTGFS_HPRT, newhprt); } /******************************************************************************* @@ -966,33 +1868,9 @@ static inline void stm32_gint_discisr(FAR struct stm32_usbhost_s *priv) { uint32_t regval; - /* Were we previously connected? */ + /* Handle the disconnection event */ - if !priv->connected) - { - /* Yes.. then we no longer connected */ - - ullvdbg("Disconnected\n"); - priv->connected = false; - - /* Are we bound to a class driver? */ - - if (priv->class) - { - /* Yes.. Disconnect the class driver */ - - CLASS_DISCONNECTED(priv->class); - priv->class = NULL; - } - - /* Notify any waiters that there is a change in the connection state */ - - if (priv->eventwait) - { - stm32_givesem(&priv->eventsem); - priv->eventwait = false; - } - } + stm32_gint_disconnected(priv); /* Clear the dicsonnect interrupt */ @@ -1994,6 +2872,49 @@ static inline void stm32_flush_rxfifo(void) up_udelay(3); } +/******************************************************************************* + * Name: stm32_vbusdrive + * + * Description: + * Drive the Vbus +5V. + * + * Input Parameters: + * priv - USB host driver private data structure. + * state - True: Drive, False: Don't drive + * + * Returned Value: + * None. + * + *******************************************************************************/ + +static void stm32_vbusdrive(FAR struct stm32_usbhost_s *priv, bool state) +{ + uint32_t regval; + + /* Enable/disable the external charge pump */ + + stm32_usbhost_vbusdrive(state); + + /* Turn on the Host port power. */ + + regval = stm32_getreg(STM32_OTGFS_HPRT); + regval &= ~(OTGFS_HPRT_PENA|OTGFS_HPRT_PCDET|OTGFS_HPRT_PENCHNG|OTGFS_HPRT_POCCHNG); + + if (((regval & OTGFS_HPRT_PPWR) == 0) && state) + { + regval |= OTGFS_HPRT_PPWR; + stm32_putreg(STM32_OTGFS_HPRT, regval); + } + + if (((regval & OTGFS_HPRT_PPWR) != 0) && !state) + { + regval &= ~OTGFS_HPRT_PPWR; + stm32_putreg(STM32_OTGFS_HPRT, regval); + } + + up_mdelay(200); +} + /******************************************************************************* * Name: stm32_host_initialize * @@ -2077,7 +2998,7 @@ static void stm32_host_initialize(FAR struct stm32_usbhost_s *priv) * mode. */ - stm32_usbhost_vbusdrive(0, true); + stm32_vbusdrive(priv, true); /* Enable host interrupts */ From ba31404b97b156e018fe1dc3ae0f28e4a8e080a2 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sat, 18 Aug 2012 22:57:17 +0000 Subject: [PATCH 09/31] Move duplicate LCD orieations settings from configs/*/Kconfig to drivers/lcd/Kconfig git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5036 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/configs/stm3210e-eval/Kconfig | 29 +---------------- nuttx/configs/stm3220g-eval/Kconfig | 49 +---------------------------- nuttx/configs/stm3240g-eval/Kconfig | 49 +---------------------------- nuttx/drivers/lcd/Kconfig | 39 +++++++++++++++++++++++ 4 files changed, 42 insertions(+), 124 deletions(-) diff --git a/nuttx/configs/stm3210e-eval/Kconfig b/nuttx/configs/stm3210e-eval/Kconfig index a40a7548ba..ba366f93d4 100644 --- a/nuttx/configs/stm3210e-eval/Kconfig +++ b/nuttx/configs/stm3210e-eval/Kconfig @@ -28,34 +28,7 @@ config ARCH_IRQBUTTONS config STM3210E_LCD bool "Select support for the STM3210E-EVAL LCD" default y - depends on STM32_FSMC - -choice - prompt "STM3210E-EVAL LCD Orientation" - default LCD_LANDSCAPE - depends on STM3210E_LCD - -config LCD_LANDSCAPE - bool "320x240 landscape display" - ---help--- - Define for 320x240 display "landscape" support. Default is this 320x240 - "landscape" orientation (this setting is informative only... not used). - -config LCD_PORTRAIT - bool "240x320 portrait display" - ---help--- - Define for 240x320 display "portrait" orientation support. In this - orientation, the STM3210E-EVAL's LCD ribbon cable is at the bottom of - the display. Default is 320x240 "landscape" orientation. - -config LCD_RPORTRAIT - bool "240x320 reverse portrait display" - ---help--- - Define for 240x320 display "reverse portrait" orientation support. In - this orientation, the STM3210E-EVAL's LCD ribbon cable is at the top - of the display. Default is 320x240 "landscape" orientation. - -endchoice + depends on LCD && STM32_FSMC config LCD_BACKLIGHT bool "LCD backlight support" diff --git a/nuttx/configs/stm3220g-eval/Kconfig b/nuttx/configs/stm3220g-eval/Kconfig index e248d2e68d..200cb11c17 100644 --- a/nuttx/configs/stm3220g-eval/Kconfig +++ b/nuttx/configs/stm3220g-eval/Kconfig @@ -26,54 +26,7 @@ config ARCH_IRQBUTTONS config STM3220G_LCD bool "Select support for the STM3210E-EVAL LCD" default y - depends on STM32_FSMC - -choice - prompt "STM3220G-EVAL LCD Orientation" - default LCD_LANDSCAPE - depends on STM3220G_LCD - -config LCD_LANDSCAPE - bool "320x240 landscape display" - ---help--- - Define for 320x240 display "landscape" support. Default is this 320x240 - "landscape" orientation. - - For the STM3220G-EVAL board, the edge opposite from the row of buttons - is used as the top of the display in this orientation. - -config LCD_RLANDSCAPE - bool "320x240 reverse landscape display" - ---help--- - Define for 320x240 display "reverse landscape" support. Default is this 320x240 - "landscape" orientation. - - For the STM3220G-EVAL board, the edge next to the row of buttons - is used as the top of the display in this orientation. - -config LCD_PORTRAIT - bool "240x320 portrait display" - ---help--- - Define for 240x320 display "portrait" orientation support. In this - orientation, the STM3210E-EVAL's LCD ribbon cable is at the bottom of - the display. Default is 320x240 "landscape" orientation. - - In this orientation, the top of the display is to the left - of the buttons (if the board is held so that the buttons are at the - botton of the board). - -config LCD_RPORTRAIT - bool "240x320 reverse portrait display" - ---help--- - Define for 240x320 display "reverse portrait" orientation support. In - this orientation, the STM3210E-EVAL's LCD ribbon cable is at the top - of the display. Default is 320x240 "landscape" orientation. - - In this orientation, the top of the display is to the right - of the buttons (if the board is held so that the buttons are at the - botton of the board). - -endchoice + depends on LCD && STM32_FSMC config LCD_RDSHIFT int "LCD data shift" diff --git a/nuttx/configs/stm3240g-eval/Kconfig b/nuttx/configs/stm3240g-eval/Kconfig index af84f91920..e3ad59df85 100644 --- a/nuttx/configs/stm3240g-eval/Kconfig +++ b/nuttx/configs/stm3240g-eval/Kconfig @@ -26,54 +26,7 @@ config ARCH_IRQBUTTONS config STM3240G_LCD bool "Select support for the STM3210E-EVAL LCD" default y - depends on STM32_FSMC - -choice - prompt "STM3240G-EVAL LCD Orientation" - default LCD_LANDSCAPE - depends on STM3240G_LCD - -config LCD_LANDSCAPE - bool "320x240 landscape display" - ---help--- - Define for 320x240 display "landscape" support. Default is this 320x240 - "landscape" orientation. - - For the STM3240G-EVAL board, the edge opposite from the row of buttons - is used as the top of the display in this orientation. - -config LCD_RLANDSCAPE - bool "320x240 reverse landscape display" - ---help--- - Define for 320x240 display "reverse landscape" support. Default is this 320x240 - "landscape" orientation. - - For the STM3240G-EVAL board, the edge next to the row of buttons - is used as the top of the display in this orientation. - -config LCD_PORTRAIT - bool "240x320 portrait display" - ---help--- - Define for 240x320 display "portrait" orientation support. In this - orientation, the STM3210E-EVAL's LCD ribbon cable is at the bottom of - the display. Default is 320x240 "landscape" orientation. - - In this orientation, the top of the display is to the left - of the buttons (if the board is held so that the buttons are at the - botton of the board). - -config LCD_RPORTRAIT - bool "240x320 reverse portrait display" - ---help--- - Define for 240x320 display "reverse portrait" orientation support. In - this orientation, the STM3210E-EVAL's LCD ribbon cable is at the top - of the display. Default is 320x240 "landscape" orientation. - - In this orientation, the top of the display is to the right - of the buttons (if the board is held so that the buttons are at the - botton of the board). - -endchoice + depends on LCD && STM32_FSMC config LCD_RDSHIFT int "LCD data shift" diff --git a/nuttx/drivers/lcd/Kconfig b/nuttx/drivers/lcd/Kconfig index af94ac16a3..081a79c89d 100644 --- a/nuttx/drivers/lcd/Kconfig +++ b/nuttx/drivers/lcd/Kconfig @@ -173,3 +173,42 @@ config LCD_UG9664HSWAG01 ug-9664hswag01.c. OLED Display Module, UG-9664HSWAG01", Univision Technology Inc. Used with the LPC Xpresso and Embedded Artists base board. + +choice + prompt "LCD Orientation" + default LCD_LANDSCAPE + depends on LCD + ---help--- + Some LCD drivers may support displays in different orientations. + If the LCD driver supports this capability, than these are configuration + options to select that display orientation. + +config LCD_LANDSCAPE + bool "Landscape orientation" + ---help--- + Define for "landscape" orientation support. Landscape mode refers one + of two orientations where the the display is wider than it is tall + (LCD_RLANDSCAPE is the other). This is the default orientation. + +config LCD_PORTRAIT + bool "Portrait orientation" + ---help--- + Define for "portrait" orientation support. Portrait mode refers one + of two orientations where the the display is taller than it is wide + (LCD_RPORTAIT is the other). + +config LCD_RPORTRAIT + bool "Reverse portrait display" + ---help--- + Define for "reverse portrait" orientation support. Reverse portrait mode + refers one of two orientations where the the display is taller than it is + wide (LCD_PORTAIT is the other). + +config LCD_RLANDSCAPE + bool "Reverse landscape orientation" + ---help--- + Define for "reverse landscape" orientation support. Reverse landscape mode + refers one of two orientations where the the display is wider than it is + tall (LCD_LANDSCAPE is the other). + +endchoice From c3f866cc2c446a03e034f234c141722360e4b266 Mon Sep 17 00:00:00 2001 From: patacongo Date: Mon, 20 Aug 2012 00:57:14 +0000 Subject: [PATCH 10/31] Progress on STM32 OTG FS host driver git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5037 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/ChangeLog | 3 + nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h | 9 +- nuttx/arch/arm/src/stm32/stm32_otgfshost.c | 1060 +++++++++++++++---- nuttx/configs/stm3210e-eval/Kconfig | 3 + nuttx/configs/stm3220g-eval/Kconfig | 3 + nuttx/configs/stm3240g-eval/Kconfig | 3 + nuttx/drivers/Kconfig | 4 + 7 files changed, 855 insertions(+), 230 deletions(-) diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index e589fac759..502c0e352c 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -3170,3 +3170,6 @@ initialization (Mike Smith). * tools/mkconfig.c: If CONFIG_DRAM_END is not specified, this tool will provide default definition of (CONFIG_DRAM_START + CONFIG_DRAM_SIZE) + * arch/arm/src/stm32/stm32_otgfshost.c: Renamed from stm32_usbhost.c. + This is nearly code complete and, with any luck, will be available + in NuttX-6.22. diff --git a/nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h b/nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h index 1cb1c63837..f6966a5983 100644 --- a/nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h +++ b/nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h @@ -53,6 +53,12 @@ #define OTGFS_EPTYPE_BULK (2) /* Bulk */ #define OTGFS_EPTYPE_INTR (3) /* Interrupt */ +#define OTGFS_PID_DATA0 (0) +#define OTGFS_PID_DATA2 (1) +#define OTGFS_PID_DATA1 (2) +#define OTGFS_PID_MDATA (3) /* Non-control */ +#define OTGFS_PID_SETUP (3) /* Control */ + /* Register Offsets *********************************************************************************/ /* Core global control and status registers */ @@ -722,7 +728,8 @@ # define OTGFS_HCTSIZ_DPID_DATA0 (0 << OTGFS_HCTSIZ_DPID_SHIFT) # define OTGFS_HCTSIZ_DPID_DATA2 (1 << OTGFS_HCTSIZ_DPID_SHIFT) # define OTGFS_HCTSIZ_DPID_DATA1 (2 << OTGFS_HCTSIZ_DPID_SHIFT) -# define OTGFS_HCTSIZ_DPID_MDATA (3 << OTGFS_HCTSIZ_DPID_SHIFT) +# define OTGFS_HCTSIZ_DPID_MDATA (3 << OTGFS_HCTSIZ_DPID_SHIFT) /* Non-control */ +# define OTGFS_HCTSIZ_PID_SETUP (3 << OTGFS_HCTSIZ_DPID_SHIFT) /* Control */ /* Bit 31 Reserved, must be kept at reset value */ /* Device-mode control and status registers */ diff --git a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c index d888b2c225..65365534ef 100644 --- a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c +++ b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c @@ -102,19 +102,20 @@ /* HCD Setup *******************************************************************/ /* Hardware capabilities */ -#define STM32_NHOST_CHANNELS 8 /* Number of host channels */ -#define STM32_MAX_PACKET_SIZE 64 /* Full speed max packet size */ -#define STM32_EP0_MAX_PACKET_SIZE 64 /* EP0 FS max packet size */ -#define STM32_MAX_TX_FIFOS 15 /* Max number of TX FIFOs */ - -/* The size of the RX buffer is the same as the size of the Rx FIFO (in bytes) */ - -#define STM32_OTGFS_RXBUFSIZE (CONFIG_STM32_OTGFS_RXFIFO_SIZE << 2) +#define STM32_NHOST_CHANNELS 8 /* Number of host channels */ +#define STM32_MAX_PACKET_SIZE 64 /* Full speed max packet size */ +#define STM32_EP0_DEF_PACKET_SIZE 8 /* EP0 default packet size */ +#define STM32_EP0_MAX_PACKET_SIZE 64 /* EP0 FS max packet size */ +#define STM32_MAX_TX_FIFOS 15 /* Max number of TX FIFOs */ +#define STM32_MAX_PKTCOUNT 256 /* Max packet count */ +#define STM32_RETRY_COUNT 3 /* Number of retries */ +#define STM32_DEF_DEVADDR 0 /* Default device address */ /* Delays **********************************************************************/ -#define STM32_READY_DELAY 200000 -#define STM32_FLUSH_DELAY 200000 +#define STM32_READY_DELAY 200000 /* In loop counts */ +#define STM32_FLUSH_DELAY 200000 /* In loop counts */ +#define STM32_NOTREADY_DELAY 5000 /* In frames */ /* Ever-present MIN/MAX macros */ @@ -129,29 +130,17 @@ /******************************************************************************* * Private Types *******************************************************************************/ -/* USB Speeds */ - -enum stm32_usbspeed_e -{ - USBSPEED_LOW = 0, /* USB low speed */ - USBSPEED_FULL, /* USB full speed (default) */ - USBSPEED_HIGH /* USB high speed (not supported by OTG FS) */ -}; /* The following enumeration represents the various states of the USB host - * state machine + * state machine (for debug purposes only) */ enum stm32_smstate_e { - SMSTATE_IDLE = 0, /* Not attached to a device (initial state) */ + SMSTATE_DETACHED = 0, /* Not attached to a device */ SMSTATE_ATTACHED, /* Attached to a device */ - SMSTATE_DETACHED, /* Detached from a device */ - SMSTATE_ENUMERATION, /* Attached, enumerating */ - SMSTATE_CLASS_REQUEST, /* Enumeration complete, class bound */ - SMSTATE_CLASS, /* Process class standard control requests */ - SMSTATE_CTRLXFER, /* Process control transfer */ - SMSTATE_ERROR /* An irrecoverable error occurred */ + SMSTATE_ENUM, /* Attached, enumerating */ + SMSTATE_CLASS_BOUND, /* Enumeration complete, class bound */ }; /* This enumeration represents the state of one TX channel */ @@ -167,36 +156,23 @@ enum stm32_chstate_e CHSTATE_DTERR /* Data error received */ }; -/* This enumeration describes the state of the transfer on one TX channel */ - -enum stm32_rqstate_e -{ - RQSTATE_IDLE = 0, /* No request in progress (initial state) */ - RQSTATE_DONE, /* Request complete */ - RQSTATE_NOTREADY, /* Channel not ready */ - RQSTATE_ERROR, /* An error occurred */ - RQSTATE_STALL /* Endpoint is stalled */ -}; - /* This structure retains the state of one host channel */ -struct stn32_chan_s +struct stm32_chan_s { - sem_t chansem; /* Channel wait semaphore */ + sem_t waitsem; /* Channel wait semaphore */ + volatile uint8_t result; /* The result of the transfer */ volatile uint8_t chstate; /* See enum stm32_chstate_e */ - volatile uint8_t rqstate; /* See enum stm32_rqstate_e */ - uint8_t devaddr; /* Device address */ - uint8_t epno; /* Device endpoint number */ - uint8_t speed; /* See enum stm32_usbspeed_e */ + uint8_t epno; /* Device endpoint number (0-127) */ uint8_t eptype; /* See OTGFS_EPTYPE_* definitions */ uint8_t pid; /* Data PID */ + bool inuse; /* True: This channel is "in use" */ bool indata1; /* IN data toggle. True: DATA01 */ bool outdata1; /* OUT data toggle. True: DATA01 */ bool isin; /* True: IN endpoint */ - volatile bool chanwait; /* True: Thread is waiting for a channel event */ + volatile bool waiter; /* True: Thread is waiting for a channel event */ volatile uint16_t nerrors; /* Number of errors detecgted */ volatile uint16_t xfrd; /* Number of bytes transferred */ - uint16_t channel; /* Encoded channel info */ uint16_t maxpacket; /* Max packet size */ uint16_t buflen; /* Buffer length (remaining) */ uint16_t xfrlen; /* Number of bytes transferrred */ @@ -221,7 +197,11 @@ struct stm32_usbhost_s /* Overall driver status */ uint8_t smstate; /* The state of the USB host state machine */ - uint8_t smprev; /* Preioius USB host state machine state */ + uint8_t devaddr; /* Device address */ + uint8_t ep0in; /* EP0 IN control channel index */ + uint8_t ep0out; /* EP0 OUT control channel index */ + uint8_t ep0size; /* EP0 max packet size */ + bool lowspeed; /* True: low speed device */ volatile bool connected; /* Connected to device */ volatile bool eventwait; /* True: Thread is waiting for a port event */ sem_t exclsem; /* Support mutually exclusive access */ @@ -229,11 +209,7 @@ struct stm32_usbhost_s /* The state of each host channel */ - struct stn32_chan_s chan[STM32_MAX_TX_FIFOS]; - - /* The RX buffer */ - - uint8_t rxbuffer[STM32_OTGFS_RXBUFSIZE]; + struct stm32_chan_s chan[STM32_MAX_TX_FIFOS]; }; /******************************************************************************* @@ -265,12 +241,29 @@ static void stm32_takesem(sem_t *sem); static inline uint16_t stm32_getle16(const uint8_t *val); static void stm32_putle16(uint8_t *dest, uint16_t val); -/* ED list helper functions ****************************************************/ +/* Channel management **********************************************************/ -#if !defined(CONFIG_USBHOST_INT_DISABLE) || !defined(CONFIG_USBHOST_ISOC_DISABLE) -static unsigned int stm32_getinterval(uint8_t interval); -static void stm32_setinttab(uint32_t value, unsigned int interval, unsigned int offset); -#endif +static int stm32_chan_alloc(FAR struct stm32_usbhost_s *priv); +static void stm32_chan_free(FAR struct stm32_usbhost_s *priv, int chidx); +static inline void stm32_chan_freeall(FAR struct stm32_usbhost_s *priv); +static void stm32_chan_configure(FAR struct stm32_usbhost_s *priv, int chidx); +static int stm32_chan_waitsetup(FAR struct stm32_usbhost_s *priv, + FAR struct stm32_chan_s *chan); +static void stm32_chan_wait(FAR struct stm32_usbhost_s *priv, + FAR struct stm32_chan_s *chan); +static void stm32_chan_wakeup(FAR struct stm32_usbhost_s *priv, + FAR struct stm32_chan_s *chan); + +/* Control/data transfer logic *************************************************/ + +static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx); +static inline uint32_t stm32_getframe(void); +static int stm32_ctrl_sendsetup(FAR struct stm32_usbhost_s *priv, + FAR const struct usb_ctrlreq_s *req); +static int stm32_ctrl_senddata(FAR struct stm32_usbhost_s *priv, + FAR uint8_t *buffer, unsigned int buflen); +static int stm32_ctrl_recvdata(FAR struct stm32_usbhost_s *priv, + FAR uint8_t *buffer, unsigned int buflen); /* Interrupt handling **********************************************************/ /* Lower level interrupt handlers */ @@ -283,7 +276,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, int chidx); static void stm32_gint_connected(FAR struct stm32_usbhost_s *priv); -static inline void stm32_gint_disconnected(FAR struct stm32_usbhost_s *priv); +static void stm32_gint_disconnected(FAR struct stm32_usbhost_s *priv); /* Second level interrupt handlers */ @@ -577,76 +570,207 @@ static void stm32_putle16(uint8_t *dest, uint16_t val) } /******************************************************************************* - * Name: stm32_getinterval + * Name: stm32_chan_alloc * * Description: - * Convert the endpoint polling interval into a HCCA table increment + * Allocate a channel. * *******************************************************************************/ -#if !defined(CONFIG_USBHOST_INT_DISABLE) || !defined(CONFIG_USBHOST_ISOC_DISABLE) -static unsigned int stm32_getinterval(uint8_t interval) +static int stm32_chan_alloc(FAR struct stm32_usbhost_s *priv) { - /* The bInterval field of the endpoint descriptor contains the polling interval - * for interrupt and isochronous endpoints. For other types of endpoint, this - * value should be ignored. bInterval is provided in units of 1MS frames. - */ + int chidx; - if (interval < 3) + /* Search the table of channels */ + + for (chidx = 0 ; chidx < STM32_NHOST_CHANNELS ; chidx++) { - return 2; - } - else if (interval < 7) - { - return 4; - } - else if (interval < 15) - { - return 8; - } - else if (interval < 31) - { - return 16; - } - else - { - return 32; + /* Is this channel available? */ + + if (!priv->chan[chidx].inuse) + { + /* Yes... make it "in use" and return the index */ + + priv->chan[chidx].inuse = true; + return chidx; + } } + + /* All of the channels are "in-use" */ + + return -EBUSY; } -#endif /******************************************************************************* - * Name: stm32_setinttab + * Name: stm32_chan_free * * Description: - * Set the interrupt table to the selected value using the provided interval - * and offset. + * Free a previoiusly allocated channel. * *******************************************************************************/ -#if !defined(CONFIG_USBHOST_INT_DISABLE) || !defined(CONFIG_USBHOST_ISOC_DISABLE) -static void stm32_setinttab(uint32_t value, unsigned int interval, unsigned int offset) +static void stm32_chan_free(FAR struct stm32_usbhost_s *priv, int chidx) { - unsigned int i; - for (i = offset; i < HCCA_INTTBL_WSIZE; i += interval) - { - HCCA->inttbl[i] = value; - } + DEBUGASSERT((unsigned)chidx < STM32_NHOST_CHANNELS); + priv-priv->chan[chidx].inuse = false; } -#endif /******************************************************************************* - * Name: stm32_chanwait + * Name: stm32_chan_freeall * * Description: - * Set the request for the Writeback Done Head event well BEFORE enabling the + * Free all channels. + * + *******************************************************************************/ + +static inline void stm32_chan_freeall(FAR struct stm32_usbhost_s *priv) +{ + uint8_t chidx; + + /* Clear address an "in-use" flag for all host channels */ + + for (chidx = 2; chidx < STM32_NHOST_CHANNELS ; chidx ++) + { + priv->chan[chidx].inuse = false; + } +} + +/******************************************************************************* + * Name: stm32_chan_configure + * + * Description: + * Configure or re-configure a host channel. Host channels are configured + * when endpoint is allocated and EP0 (only) is re-configured with the + * max packet size or device address changes. + * + *******************************************************************************/ + +static void stm32_chan_configure(FAR struct stm32_usbhost_s *priv, int chidx) +{ + uint32_t regval; + + /* Clear any old pending interrupts for this host channel. */ + + stm32_putreg(STM32_OTGFS_HCINT(chidx), 0xffffffff); + + /* Enable channel interrupts required for transfers on this channel. */ + + regval = 0; + + switch (priv->chan[chidx].eptype) + { + case OTGFS_EPTYPE_CTRL: + case OTGFS_EPTYPE_BULK: + { + /* Interrupts required for CTRL and BULK endpoints */ + + regval |= (OTGFS_HCINT_XFRC | OTGFS_HCINT_STALL | OTGFS_HCINT_NAK | + OTGFS_HCINT_TXERR | OTGFS_HCINT_DTERR); + + /* Additional setting for IN/OUT endpoints */ + + if (priv->chan[chidx].isin) + { + regval |= OTGFS_HCINT_BBERR; + } + else + { + regval |= OTGFS_HCINT_NYET; + } + } + break; + + case OTGFS_EPTYPE_INTR: + { + /* Interrupts required for INTR endpoints */ + + regval |= (OTGFS_HCINT_XFRC | OTGFS_HCINT_STALL | OTGFS_HCINT_NAK | + OTGFS_HCINT_TXERR | OTGFS_HCINT_FRMOR | OTGFS_HCINT_DTERR); + + /* Additional setting for IN endpoints */ + + if (priv->chan[chidx].isin) + { + regval |= OTGFS_HCINT_BBERR; + } + } + break; + + case OTGFS_EPTYPE_ISOC: + { + /* Interrupts required for ISOC endpoints */ + + regval |= (OTGFS_HCINT_XFRC | OTGFS_HCINT_ACK | OTGFS_HCINT_FRMOR); + + /* Additional setting for IN endpoints */ + + if (priv->chan[chidx].isin) + { + regval |= (OTGFS_HCINT_TXERR | OTGFS_HCINT_BBERR); + } + } + break; + } + + stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); + + /* Enable the top level host channel interrupt. */ + + stm32_modifyreg(STM32_OTGFS_HAINTMSK, 0, OTGFS_HAINT(chidx)); + + /* Make sure host channel interrupts are enabled. */ + + stm32_modifyreg(STM32_OTGFS_GINTMSK, 0, OTGFS_GINT_HC); + + /* Program the HCCHAR register */ + + regval = ((uint32_t)priv->chan[chidx].maxpacket << OTGFS_HCCHAR_MPSIZ_SHIFT) | + ((uint32_t)priv->chan[chidx].epno << OTGFS_HCCHAR_EPNUM_SHIFT) | + ((uint32_t)priv->chan[chidx].eptype << OTGFS_HCCHAR_EPTYP_SHIFT) | + ((uint32_t)priv->devaddr << OTGFS_HCCHAR_DAD_SHIFT) | + + /* Special case settings for low speed devices */ + + if (priv->lowspeed) + { + regval |= OTGFS_HCCHAR_LSDEV; + } + + /* Special case settings for IN endpoints */ + + if (priv->chan[chidx].isin) + { + regval |= OTGFS_HCCHAR_EPDIR_IN; + } + + /* Special case settings for INTR endpoints */ + + if (priv->chan[chidx].eptype == OTGFS_EPTYPE_INTR) + { + regval |= OTGFS_HCCHAR_ODDFRM; + } + + /* Write the channel configuration */ + + stm32_putreg(STM32_OTGFS_HCCHAR(chidx), regval); +} + +/******************************************************************************* + * Name: stm32_chan_waitsetup + * + * Description: + * Set the request for the transfer complete event well BEFORE enabling the * transfer (as soon as we are absolutely committed to the to avoid transfer). * We do this to minimize race conditions. This logic would have to be expanded * if we want to have more than one packet in flight at a time! * + * Assumptions: + * Called from a normal thread context BEFORE the transfer has been started. + * *******************************************************************************/ -static int stm32_chanwait(struct stm32_usbhost_s *priv, struct stn32_chan_s *chan) +static int stm32_chan_waitsetup(FAR struct stm32_usbhost_s *priv, + FAR struct stm32_chan_s *chan) { irqstate_t flags = irqsave(); int ret = -ENODEV; @@ -655,12 +779,12 @@ static int stm32_chanwait(struct stm32_usbhost_s *priv, struct stn32_chan_s *cha if (priv->connected) { - /* Yes.. then set chanwait to indicate that we expect to be informed when + /* Yes.. then set waiter to indicate that we expect to be informed when * either (1) the device is disconnected, or (2) the transfer completed. */ - chan->chanwait = true; - ret = OK; + chan->waiter = true; + ret = OK; } irqrestore(flags); @@ -668,62 +792,415 @@ static int stm32_chanwait(struct stm32_usbhost_s *priv, struct stn32_chan_s *cha } /******************************************************************************* - * Name: stm32_ctrltd + * Name: stm32_chan_wait * * Description: - * Process a IN or OUT request on the control endpoint. This function - * will enqueue the request and wait for it to complete. Only one transfer - * may be queued; Neither these methods nor the transfer() method can be - * called again until the control transfer functions returns. + * Wait for a transfer on a channel to complete. * - * These are blocking methods; these functions will not return until the - * control transfer has completed. + * Assumptions: + * Called from a normal thread context * *******************************************************************************/ -static int stm32_ctrltd(struct stm32_usbhost_s *priv, uint32_t dirpid, - uint8_t *buffer, size_t buflen) +static void stm32_chan_wait(FAR struct stm32_usbhost_s *priv, + FAR struct stm32_chan_s *chan) { - uint32_t toggle; - uint32_t regval; + irqstate_t flags; int ret; - /* Set the request for the Writeback Done Head event well BEFORE enabling the - * transfer. + /* Disable interrupts so that the following operations will be atomic. On + * the OTG FS global interrupt needs to be disabled. However, here we disable + * all interrupts to exploit that fact that interrupts will be re-enabled + * while we wait. */ - ret = stm32_chanwait(priv, chan); + flags = irqsave(); + + /* Loop, testing for an end of transfer conditino. The channel 'result' + * was set to EBUSY and 'waiter' was set to true before the transfer; 'waiter' + * will be set to false and 'result' will be set appropriately when the + * tranfer is completed. + */ + + do + { + /* Wait for the transfer to complete. NOTE the transfer may already + * completed before we get here or the transfer may complete while we + * wait here. + */ + + ret = sem_wait(chan->waitsem); + + /* sem_wait should succeeed. But it is possible that we could be + * awakened by a signal too. + */ + + DEBUGASSERT(ret == OK || get_errno() == EINTR); + } + while (chan->waiter); + + /* The transfer is complete */ + + irqrestore(flags); +} + +/******************************************************************************* + * Name: stm32_chan_wakeup + * + * Description: + * A channel transfer has completed... wakeup any threads waiting for the + * transfer to complete. + * + * Assumptions: + * This function is called from the transfer complete interrupt handler for + * the channel. Interrupts are disabled. + * + *******************************************************************************/ + +static void stm32_chan_wakeup(FAR struct stm32_usbhost_s *priv, + FAR struct stm32_chan_s *chan) +{ + /* Is there a thread waiting for this transfer to complete? */ + + if (priv->chan[chidx].result != EBUSY && chan->waiter) + { + stm32_givesem(&chan->waitsem); + chan->waiter = false; + } +} + +/******************************************************************************* + * Name: stm32_transfer_start + * + * Description: + * Start at transfer on the select IN or OUT channel. + * + *******************************************************************************/ + +static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx) +{ + uint32_t regval; + unsigned int npackets; + unsigned int maxpacket; + unsigned int buflen32; + unsigned int avail32; + + /* Set up the initial state of the transfer */ + + priv->chan[chidx].result = EBUSY; + priv->chan[chidx].xfrlen = 0; + + /* Compute the expected number of packets associated to the transfer. + * If it is a IN endpoint, then we need to round down to the number + * of full, maximally sized packets that can fit in the read buffer. + */ + + mxpacket = priv->chan[chidx].maxpacket; + if (priv->chan[chidx].isin) + { + npackets = priv->chan[chidx].buflen / maxpacket; + + /* A read buffer must at least one max packet size in length */ + + DEBUGASSERT(npackets > 0); + + /* For the buffer length to an even multiple of maxpacket */ + + priv->chan[chidx].buflen = npackets * maxpacket; + } + + /* If it is an OUT endpoint, then we need round up to include any + * possible partial, final packet. + */ + + else if (priv->chan[chidx].buflen > 0) + { + npackets = (priv->chan[chidx].buflen + maxpacket - 1) / maxpacket; + } + + /* Otherwise, we are sending a single zero-length packet */ + + else + { + npackets = 1; + } + + /* Clip it the buffer length if it exceeds the maximum number of + * packets that can be transferred (this should not happen). + */ + + if (npackets > STM32_MAX_PKTCOUNT) + { + npackets = STM32_MAX_PKTCOUNT; + priv->chan[chidx].buflen = STM32_MAX_PKTCOUNT * maxpacket; + } + + /* Setup the HCTSIZn register */ + + regval = ((uint32_t)priv->chan[chidx].buflen << OTGFS_HCTSIZ_XFRSIZ_SHIFT) | + ((uint32_t)npackets << OTGFS_HCTSIZ_PKTCNT_SHIFT) | + ((uint32_t)priv->chan[chidx].pid << OTGFS_HCTSIZ_DPID_SHIFT); + stm32_putreg(STM32_OTGFS_HCTSIZ(chidx), regval); + + /* Setup the HCCHAR register: Frame oddness and host channel enable */ + + regval = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); + + /* Check for an even frame */ + + if ((stm32_getreg(STM32_OTGFS_HFNUM) & 1) == 0) + { + regval |= OTGFS_HCCHAR_ODDFRM; + } + + regval &= ~OTGFS_HCCHAR_CHDIS; + regval |= OTGFS_HCCHAR_CHENA; + stm32_putreg(STM32_OTGFS_HCCHAR(chidx), regval); + + /* If this is an out transfer, then we need to do more.. we need to copy the + * outgoing data into the correct TxFIFO. + */ + + if (!priv->chan[chidx].isin && priv->chan[chidx].buflen > 0) + { + /* Handle non-periodic (CTRL and BULK) OUT transfers differently than + * perioci (INTR and ISOC) OUT transfers. + */ + + buflen32 = (priv->chan[chidx].buflen + 3) >> 2; + switch (priv->chan[chidx].eptype) + { + case OTGFS_EPTYPE_CTRL: /* Non periodic transfer */ + case OTGFS_EPTYPE_BULK: + { + /* Read the Non-periodic Tx FIFO status register */ + + regval = stm32_getreg(STM32_OTGFS_HNPTXSTS); + avail32 = (regval & OTGFS_HNPTXSTS_NPTXFSAV_MASK) >> OTGFS_HNPTXSTS_NPTXFSAV_SHIFT; + + /* Check if there is enough space in the Tx FIFO space */ + + if (buflen32 > avail32) + { + /* Insufficient space... Enable the Non-periodic Tx FIFO + * interrupt to handle the transfer when the Tx FIFO is empty. + */ + + stm32_modifyreg(STM32_OTGFS_GINTMSK, 0, OTGFS_GINT_NPTXFE); + } + } + break; + + /* Periodic transfer */ + + case OTGFS_EPTYPE_INTR: + case OTGFS_EPTYPE_ISOC: + /* Read the Non-periodic Tx FIFO status register */ + + regval = stm32_getreg(STM32_OTGFS_HPTXSTS); + avail32 = (regval & OTGFS_HPTXSTS_PTXFSAVL_MASK) >> OTGFS_HPTXSTS_PTXFSAVL_SHIFT; + + /* Check if there is enough space in FIFO space */ + + if (buflen32 > avail32) + { + /* Need to process data in OTGFS_GINT_PTXFE interrupt */ + + stm32_modifyreg(STM32_OTGFS_GINTMSK, 0, OTGFS_GINT_PTXFE); + } + break; + + default: + break; + } + + /* Write packet into the Tx FIFO. */ + + stm32_gint_wrpacket(priv, priv->chan[chidx].buffer, chidx, priv->chan[chidx].buflen); + } +} + + +/******************************************************************************* + * Name: stm32_getframe + * + * Description: + * Get the current frame number. + * + *******************************************************************************/ + +static inline uint16_t stm32_getframe(void) +{ + return (stm32_getreg(STM32_OTGFS_HFNUM) & OTGFS_HFNUM_FRNUM_MASK); +} + +/******************************************************************************* + * Name: stm32_ctrl_sendsetup + * + * Description: + * Send an IN/OUT SETUP packet. + * + *******************************************************************************/ + +static int stm32_ctrl_sendsetup(FAR struct stm32_usbhost_s *priv, + FAR const struct usb_ctrlreq_s *req) +{ + FAR struct stm32_chan_s *chan; + uint16_t start = stm32_getframe(); + uint16_t elapsed; + int ret; + + chan = &priv->chan[priv->ep0out]; + + /* Loop while the device reports NAK (and a timeout is not exceeded */ + + do + { + /* Send the SETUP packet */ + + chan->pid = OTGFS_PID_SETUP; + chan->buffer = (FAR uint8_t *)req; + chan->buflen = USB_SIZEOF_CTRLREQ; + + /* Set up for the wait BEFORE starting the transfer */ + + ret = stm32_chan_waitsetup(priv, chan) + if (ret != OK) + { + udbg("ERROR: Device disconnected\n"); + return ret; + } + + /* Start the transfer */ + + stm32_transfer_start(priv, priv->ep0out); + + /* Wait for the transfer to complete */ + + stm32_chan_wait(priv, chan); + + /* Get the result of the transfer */ + + ret = -(int)chan->result; + if (ret != -EGAIN) + { + return ret; + } + + /* Get the elpased time (in frames) */ + + elapsed = stm32_getframe() - start; + } + while (elapsed < STM32_NOTREADY_DELAY); + + return -ETIMEDOUT; +} + +/******************************************************************************* + * Name: stm32_ctrl_senddata + * + * Description: + * Send data in the data phase of an OUT control transfer. Or send status + * in the status phase of an IN control transfer + * + *******************************************************************************/ + +static int stm32_ctrl_senddata(FAR struct stm32_usbhost_s *priv, + FAR uint8_t *buffer, unsigned int buflen) +{ + FAR struct stm32_chan_s *chan = &priv->chan[priv->ep0out]; + + /* Save buffer information */ + + chan->buffer = buffer; + chan->buflen = buflen; + + /* Set the DATA PID */ + + if (buflen == 0) + { + /* For status OUT stage with buflen == 0, set PID DATA1 */ + + chan->outdata1 = true; + } + + /* Set the Data PID as per the outdata1 boolean */ + + if (!chan->outdata1) + { + /* Use PID == DATA0 */ + + chan->pid = OTGFS_PID_DATA0; + } + else + { + /* Put the PID 1 */ + + chan->pid = OTGFS_PID_DATA1 ; + } + + /* Set up for the wait BEFORE starting the transfer */ + + ret = stm32_chan_waitsetup(priv, chan) if (ret != OK) { udbg("ERROR: Device disconnected\n"); return ret; } - /* Configure the toggle field in the TD */ + /* Start the transfer */ - if (dirpid == GTD_STATUS_DP_SETUP) + stm32_transfer_start(priv, priv->ep0out); + + /* Wait for the transfer to complete */ + + stm32_chan_wait(priv, chan); + + /* Return the result of the transfer */ + + return -(int)chan->result; +} + +/******************************************************************************* + * Name: stm32_ctrl_recvdata + * + * Description: + * Receive data in the data phase of an IN control transfer. Or receive status + * in the status phase of an OUT control transfer + * + *******************************************************************************/ + +static int stm32_ctrl_recvdata(FAR struct stm32_usbhost_s *priv, + FAR uint8_t *buffer, unsigned int buflen); +{ + FAR struct stm32_chan_s *chan = &priv->chan[pric->ep0in]; + + /* Save buffer information */ + + chan->pid = OTGFS_PID_DATA1; + chan->buffer = buffer; + chan->buflen = buflen; + + /* Set up for the wait BEFORE starting the transfer */ + + ret = stm32_chan_waitsetup(priv, chan) + if (ret != OK) { - toggle = GTD_STATUS_T_DATA0; - } - else - { - toggle = GTD_STATUS_T_DATA1; + udbg("ERROR: Device disconnected\n"); + return ret; } - /* Then enqueue the transfer */ -#warning "Missing Logic" + /* Start the transfer */ - /* And wait for the transfer to complete */ + stm32_transfer_start(priv, pric->ep0in); - stm32_takesem(&chan->chansem); + /* Wait for the transfer to complete */ - /* Check the transfer completion status bits */ -#warning "Missing Logic" + stm32_chan_wait(priv, chan); - /* Make sure that there is no outstanding request on this endpoint */ -#warning "Missing Logic" + /* Return the result of the transfer */ - return ret; + return -(int)chan->result; } /******************************************************************************* @@ -827,6 +1304,7 @@ static void stm32_gint_halttxchan(FAR struct stm32_usbhost_s *priv, int chidx) static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, int chidx) { + FAR struct stm32_chan_s *chan = &priv->chan[chidx]; uint32_t hcint; uint32_t hcintmsk; uint32_t hcchar; @@ -872,7 +1350,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, /* Set the stall state */ - priv->chan[chidx].chstate = CHSTATE_STALL; + chan->chstate = CHSTATE_STALL; /* Clear the NAK and STALL Conditions. */ @@ -910,7 +1388,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, /* Set the Data Toggle ERRor (DTERR) state */ - priv->chan[chidx].chstate = CHSTATE_DTERR; + chan->chstate = CHSTATE_DTERR; } /* Check for a pending FRaMe OverRun (FRMOR) interrrupt */ @@ -938,8 +1416,8 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, { /* Set the trnansfer complete state and reset the error count */ - priv->chan[chidx].chstate = CHSTATE_XFRC; - priv->chan[chidx].nerrors = 0; + chan->chstate = CHSTATE_XFRC; + chan->nerrors = 0; /* Clear the TransFeR Completed (XFRC) condition */ @@ -965,7 +1443,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, /* Toggle the IN data state */ - priv->chan[chidx].indata1 ^= true; + chan->indata1 ^= true; } else if (eptype == OTGFS_HCCHAR_EPTYP_INTR) { @@ -976,7 +1454,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, /* Set the request done state */ - priv->chan[chidx].rqstate = RQSTATE_DONE; + chan->result = OK; } } @@ -991,32 +1469,32 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, /* Update the request state based on the host state machine state */ - if (priv->chan[chidx].chstate == CHSTATE_XFRC) + if (chan->chstate == CHSTATE_XFRC) { /* Set the request done state */ - priv->chan[chidx].rqstate = RQSTATE_DONE; + chan->result = OK; } - else if (priv->chan[chidx].chstate == CHSTATE_STALL) + else if (chan->chstate == CHSTATE_STALL) { /* Set the request stall state */ - priv->chan[chidx].rqstate = RQSTATE_STALL; + chan->result = EPERM; } - else if ((priv->chan[chidx].chstate == CHSTATE_TXERR) || - (priv->chan[chidx].chstate == CHSTATE_DTERR)) + else if ((chan->chstate == CHSTATE_TXERR) || + (chan->chstate == CHSTATE_DTERR)) { /* Set the request error state */ - priv->chan[chidx].nerrors = 0; - priv->chan[chidx].rqstate = RQSTATE_ERROR; + chan->nerrors = 0; + chan->result = EIO; } else if (eptype == OTGFS_HCCHAR_EPTYP_INTR) { /* Toggle the IN data toggle */ - priv->chan[chidx].indata1 ^= true; + chan->indata1 ^= true; } /* Clear the CHannel Halted (CHH) condition */ @@ -1036,8 +1514,8 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, /* Increment the error count and set the transaction error state */ - priv->chan[chidx].nerrors++; - priv->chan[chidx].chstate = CHSTATE_TXERR; + chan->nerrors++; + chan->chstate = CHSTATE_TXERR; /* Halt the Tx channel */ @@ -1080,13 +1558,17 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, /* Set the NAK state */ - priv->chan[chidx].chstate = CHSTATE_NAK; + chan->chstate = CHSTATE_NAK; /* Clear the NAK condition */ hcint &= ~OTGFS_HCINT_NAK; stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); } + + /* Check for a transfer complete event */ + + stm32_chan_wakeup(priv, chan); } /******************************************************************************* @@ -1100,6 +1582,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, int chidx) { + FAR struct stm32_chan_s *chan = &priv->chan[chidx]; uint32_t hcint; uint32_t hcintmsk; uint32_t pending; @@ -1149,7 +1632,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, else if ((pending & OTGFS_HCINT_XFRC) != 0) { - priv->chan[chidx].nerrors = 0; + chan->nerrors = 0; /* Unmask the CHannel Halted (CHH) interrupt */ @@ -1167,7 +1650,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, /* Set the transfer completed state */ - priv->chan[chidx].chstate = CHSTATE_XFRC; + chan->chstate = CHSTATE_XFRC; } /* Check for a pending STALL response receive (STALL) interrrupt */ @@ -1190,7 +1673,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, /* Set the stall state */ - priv->chan[chidx].chstate = CHSTATE_STALL; + chan->chstate = CHSTATE_STALL; } /* Check for a pending NAK response received (NAK) interrrupt */ @@ -1201,7 +1684,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, /* Clear the error count */ - priv->chan[chidx].nerrors = 0; + chan->nerrors = 0; /* Unmask the CHannel Halted (CHH) interrupt */ @@ -1219,7 +1702,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, /* Set the NAK state */ - priv->chan[chidx].chstate = CHSTATE_NAK; + chan->chstate = CHSTATE_NAK; } /* Check for a pending Transaction ERror (TXERR) interrrupt */ @@ -1237,11 +1720,11 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, /* Increment the number of errors */ - priv->chan[chidx].nerrors++; + chan->nerrors++; /* Set the transaction error state */ - priv->chan[chidx].chstate = CHSTATE_TXERR; + chan->chstate = CHSTATE_TXERR; /* Clear the pending the Transaction ERror (TXERR) interrupt */ @@ -1254,7 +1737,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, #if 0 /* NYET is a reserved bit in the HCINT register */ else if ((pending & OTGFS_HCINT_NYET) != 0) { - priv->chan[chidx].nerrors = 0; + chan->nerrors = 0; /* Unmask the CHannel Halted (CHH) interrupt */ @@ -1272,7 +1755,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, /* Set the NYET state */ - priv->chan[chidx].chstate = CHSTATE_NYET; + chan->chstate = CHSTATE_NYET; } #endif @@ -1291,7 +1774,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, /* Set the data toggle error state */ - priv->chan[chidx].chstate = CHSTATE_DTERR; + chan->chstate = CHSTATE_DTERR; /* Clear the pending the Data Toggle ERRor (DTERR) and NAK interrupts */ @@ -1308,11 +1791,11 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, hcintmsk &= ~OTGFS_HCINT_CHH; stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); - if (priv->chan[chidx].chstate == CHSTATE_XFRC) + if (chan->chstate == CHSTATE_XFRC) { /* Set the request done state */ - priv->chan[chidx].rqstate = RQSTATE_DONE; + chan->result = OK; /* Read the HCCHAR register to get the HCCHAR register to get * the endpoint type. @@ -1326,30 +1809,30 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, { /* Yes... toggle the data out PID */ - priv->chan[chidx].outdata1 ^= true; + chan->outdata1 ^= true; } } - else if (priv->chan[chidx].chstate == CHSTATE_NAK || - priv->chan[chidx].chstate == CHSTATE_NYET) + else if (chan->chstate == CHSTATE_NAK || + chan->chstate == CHSTATE_NYET) { - priv->chan[chidx].rqstate = RQSTATE_NOTREADY; + chan->result = EGAIN; } - else if (priv->chan[chidx].chstate == CHSTATE_STALL) + else if (chan->chstate == CHSTATE_STALL) { /* Set the request stall state */ - priv->chan[chidx].rqstate = RQSTATE_STALL; + chan->result = EPERM; } - else if (priv->chan[chidx].chstate == CHSTATE_TXERR) + else if (chan->chstate == CHSTATE_TXERR) { /* Check the error count */ - if (priv->chan[chidx].nerrors == 3) + if (chan->nerrors == 3) { /* If the error count exceeds a threshold, then set the request error state */ - priv->chan[chidx].rqstate = RQSTATE_ERROR; - priv->chan[chidx].nerrors = 0; + chan->result = EIO; + chan->nerrors = 0; } } @@ -1358,6 +1841,10 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, hcint &= ~OTGFS_HCINT_CHH; stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); } + + /* Check for a transfer complete event */ + + stm32_chan_wakeup(priv, chan); } /******************************************************************************* @@ -1378,10 +1865,12 @@ static void stm32_gint_connected(FAR struct stm32_usbhost_s *priv) ullvdbg("Connected\n"); priv->connected = true; + DEBUGASSERT(priv->smstate == SMTATE_IDLE); /* Notify any waiters */ - if (priv->eventwait) + priv->smstate = SMSTATE_ATTACHED; + if (priv->eventwait) { stm32_givesem(&priv->eventsem); priv->eventwait = false; @@ -1397,7 +1886,7 @@ static void stm32_gint_connected(FAR struct stm32_usbhost_s *priv) * *******************************************************************************/ -static inline void stm32_gint_disconnected(FAR struct stm32_usbhost_s *priv) +static void stm32_gint_disconnected(FAR struct stm32_usbhost_s *priv) { /* Were we previously connected? */ @@ -1418,7 +1907,13 @@ static inline void stm32_gint_disconnected(FAR struct stm32_usbhost_s *priv) priv->class = NULL; } - /* Notify any waiters that there is a change in the connection state */ + /* Re-Initilaize Host for new Enumeration */ + + stm32_swreset(priv); + stm32_chan_freeall(priv); + priv->smstate = SMSTATE_DETACHED; + + /* Notify any waiters that there is a change in the connection state */ if (priv->eventwait) { @@ -2183,6 +2678,9 @@ static int stm32_wait(FAR struct usbhost_driver_s *drvr, bool connected) static int stm32_enumerate(FAR struct usbhost_driver_s *drvr) { struct stm32_usbhost_s *priv = (struct stm32_usbhost_s *)drvr; + uint32_t regval; + int chidx; + int ret; /* Are we connected to a device? The caller should have called the wait() * method first to be assured that a device is connected. @@ -2195,28 +2693,74 @@ static int stm32_enumerate(FAR struct usbhost_driver_s *drvr) udbg("Not connected\n"); return -ENODEV; } + DEBUGASSERT(priv->smstate == SMSTATE_ATTACHED); + /* Allocate and initialize the control OUT channel */ + + chidx = stm32_chan_alloc(priv); + DEBUGASSERT(chidx >= 0); + + priv->ep0out = chidx; + priv->chan[chidx].epno = 0; + priv->chan[chidx].isin = false; + priv->chan[chidx].eptype = OTGFS_EPTYPE_CTRL; + priv->chan[chidx].maxpacket = STM32_EP0_DEF_PACKET_SIZE; + priv->chan[chidx].indata1 = false; + priv->chan[chidx].outdata1 = false; + + /* Allocate and initialize the control IN channel */ + + chidx = stm32_chan_alloc(priv); + DEBUGASSERT(chidx >= 0); + + priv->ep0in = chidx; + priv->chan[chidx].epno = 0; + priv->chan[chidx].isin = true; + priv->chan[chidx].eptype = OTGFS_EPTYPE_CTRL; + priv->chan[chidx].maxpacket = STM32_EP0_DEF_PACKET_SIZE; + priv->chan[chidx].indata1 = false; + priv->chan[chidx].outdata1 = false; + /* USB 2.0 spec says at least 50ms delay before port reset */ up_mdelay(100); - /* Put RH port 1 in reset (the STM32 supports only a single downstream port) */ -#warning "Missing Logic" + /* Reset the host port */ - /* Wait for the port reset to complete */ + stm32_portreset(priv); - while ((stm32_getreg(???) & ???) != 0); + /* Get the current device speed */ - /* Release RH port 1 from reset and wait a bit */ -#warning "Missing Logic" - up_mdelay(200); + regval = stm32_getreg(STM32_OTGFS_HPRT); + priv->lowspeed = ((regval & OTGFS_HPRT_PSPD_MASK) == OTGFS_HPRT_PSPD_LS); + + /* Configure control channels */ + + stm32_chan_configure(priv, priv->ep0out) ; + stm32_chan_configure(priv, priv->ep0in) ; /* Let the common usbhost_enumerate do all of the real work. Note that the * FunctionAddress (USB address) is hardcoded to one. */ uvdbg("Enumerate the device\n"); - return usbhost_enumerate(drvr, 1, &priv->class); + priv->smstate = SMSTATE_ENUM + ret = usbhost_enumerate(drvr, 1, &priv->class); + + /* The enumeration may fail either because of some HCD interfaces failure + * or because the device class is not supported. In either case, we just + * need to perform the disconnection operation and make ready for a new + * enumeration. + */ + + if (ret < 0) + { + /* Return to the disconnected state */ + + stm32_gint_disconnected(priv); + } + + return ret; } /************************************************************************************ @@ -2224,8 +2768,8 @@ static int stm32_enumerate(FAR struct usbhost_driver_s *drvr) * * Description: * Configure endpoint 0. This method is normally used internally by the - * enumerate() method but is made available at the interface to support - * an external implementation of the enumeration logic. + * enumerate() method but is made available at the interface to support an + * external implementation of the enumeration logic. * * Input Parameters: * drvr - The USB host driver instance obtained as a parameter from the call to @@ -2254,9 +2798,23 @@ static int stm32_ep0configure(FAR struct usbhost_driver_s *drvr, uint8_t funcadd /* We must have exclusive access to the USB host hardware and state structures */ stm32_takesem(&priv->exclsem); -#warning "Missing logic" - stm32_givesem(&priv->exclsem); + /* Save the device address and EP0 max packet size */ + + priv->devaddr = funcaddr; + priv->ep0size = maxpacketsize; + + /* Configure the EP0 OUT channel */ + + priv->chan[priv->ep0out].maxpacket = maxpacketsize; + stm32_chan_configure(priv, priv->ep0out); + + /* Configure the EP0 IN channel */ + + priv->chan[priv->ep0in].maxpacket = maxpacketsize; + stm32_chan_configure(priv, priv->ep0in); + + stm32_givesem(&priv->exclsem); return OK; } @@ -2540,7 +3098,7 @@ static int stm32_ctrlin(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer) { struct stm32_usbhost_s *priv = (struct stm32_usbhost_s *)drvr; - uint16_t len; + uint16_t buflen; int ret; DEBUGASSERT(drvr && req); @@ -2548,23 +3106,50 @@ static int stm32_ctrlin(FAR struct usbhost_driver_s *drvr, req->type, req->req, req->value[1], req->value[0], req->index[1], req->index[0], req->len[1], req->len[0]); + /* Extract values from the request */ + + buflen = stm32_getle16(req->len); + /* We must have exclusive access to the USB host hardware and state structures */ stm32_takesem(&priv->exclsem); - len = stm32_getle16(req->len); - ret = stm32_ctrltd(priv, GTD_STATUS_DP_SETUP, (uint8_t*)req, USB_SIZEOF_CTRLREQ); - if (ret == OK) + /* Loop, retrying until the retry count expires */ + + for (retries = 0; retries < STM32_RETRY_COUNT; retries++) { - if (len) + /* Send the SETUP request */ + + ret = stm32_ctrl_sendsetup(priv, req); + if (ret < 0) { - ret = stm32_ctrltd(priv, GTD_STATUS_DP_IN, buffer, len); + udbg("stm32_ctrl_sendsetup failed: %d\n", ret); + return ret; } + /* Handle the IN data phase (if any) */ + + if (buflen > 0) + { + ret = stm32_ctrl_recvdata(priv, buffer, buflen); + if (ret < 0) + { + udbg("stm32_ctrl_recvdata failed: %d\n", ret); + continue; + } + } + + /* Handle the status OUT phase */ + + priv->chan[priv->ep0out].outdata1 ^= true; + ret = stm32_ctrl_senddata(priv, buffer, buflen); if (ret == OK) { - ret = stm32_ctrltd(priv, GTD_STATUS_DP_OUT, NULL, 0); + break; } + + udbg("stm32_ctrl_senddata failed: %d\n", ret); + ret = -ETIMEDOUT; } stm32_givesem(&priv->exclsem); @@ -2576,7 +3161,8 @@ static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, FAR const uint8_t *buffer) { struct stm32_usbhost_s *priv = (struct stm32_usbhost_s *)drvr; - uint16_t len; + uint16_t buflen; + int retries; int ret; DEBUGASSERT(drvr && req); @@ -2584,23 +3170,52 @@ static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, req->type, req->req, req->value[1], req->value[0], req->index[1], req->index[0], req->len[1], req->len[0]); + /* Extract values from the request */ + + buflen = stm32_getle16(req->len); + /* We must have exclusive access to the USB host hardware and state structures */ stm32_takesem(&priv->exclsem); - len = stm32_getle16(req->len); - ret = stm32_ctrltd(priv, GTD_STATUS_DP_SETUP, (uint8_t*)req, USB_SIZEOF_CTRLREQ); - if (ret == OK) + /* Loop, retrying until the retry count expires */ + + for (retries = 0; retries < STM32_RETRY_COUNT; retries++) { - if (len) + /* Send the SETUP request */ + + ret = stm32_ctrl_sendsetup(priv, req); + if (ret < 0) { - ret = stm32_ctrltd(priv, GTD_STATUS_DP_OUT, (uint8_t*)buffer, len); + udbg("stm32_ctrl_sendsetup failed: %d\n", ret); + continue; } + /* Handle the data OUT phase (if any) */ + + if (buflen > 0) + { + /* Start DATA out transfer (only one DATA packet) */ + + priv->chan[priv->ep0out].outdata1 = true; + ret = stm32_ctrl_senddata(priv, NULL, 0); + if (ret < 0) + { + udbg("stm32_ctrl_senddata failed: %d\n", ret); + continue; + } + } + + /* Handle the status IN phase */ + + ret = stm32_ctrl_recvdata(priv, NULL, 0); if (ret == OK) { - ret = stm32_ctrltd(priv, GTD_STATUS_DP_IN, NULL, 0); + break; } + + udbg("stm32_ctrl_recvdata failed: %d\n", ret); + ret = -ETIMEDOUT; } stm32_givesem(&priv->exclsem); @@ -2657,35 +3272,24 @@ static int stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, stm32_takesem(&priv->exclsem); - /* Set the request for the Writeback Done Head event well BEFORE enabling the - * transfer. - */ + /* Set up for the wait BEFORE starting the transfer */ - ret = stm32_chanwait(priv, chan); + ret = stm32_chan_waitsetup(priv, chan); if (ret != OK) { udbg("ERROR: Device disconnected\n"); goto errout; } - /* Get the direction of the endpoint */ - - if (in) - { - dirpid = GTD_STATUS_DP_IN; - } - else - { - dirpid = GTD_STATUS_DP_OUT; - } - - /* Then enqueue the transfer and wait for the transfer to complete */ + /* Start the transfer */ #warning "Missing logic" /* Wait for the transfer to complete */ -#warning "Missing Logic" - stm32_takesem(&chan->chansem); + stm32_chan_wait(priv, chan); + + /* Get the result of the transfer */ + /* Check the transfer completion status */ #warning "Missing Logic" @@ -3029,25 +3633,23 @@ static inline void stm32_sw_initialize(FAR struct stm32_usbhost_s *priv) sem_init(&priv->eventsem, 0, 0); sem_init(&priv->exclsem, 0, 1); -#warning "Missing logic" - - /* Indicate that we are not connected */ - + priv->smstate = SMSTATE_DETACHED; + priv->ep0size = STM32_EP0_MAX_PACKET_SIZE; + priv->devaddr = STM32_DEF_DEVADDR; priv->connected = false; + priv->lowspeed = false; - /* Put all of the channels back in their initial state */ + /* Put all of the channels back in their initial, allocated state */ - memset(priv-chan, 0, STM32_MAX_TX_FIFOS * sizeof(struct stn32_chan_s)); + memset(priv-chan, 0, STM32_MAX_TX_FIFOS * sizeof(struct stm32_chan_s)); + + /* Initialize each channel */ for (i = 0; i < STM32_MAX_TX_FIFOS; i++) { FAR struct stm32_chan_s *chan = &priv->chan[i]; - sem_init(&chan->chansem, 0, 0); + sem_init(&chan->waitsem, 0, 0); } - - /* Initialize endpoint zero packet size */ - - priv->chan[0].maxpacket = STM32_EP0_MAX_PACKET_SIZE; } /******************************************************************************* diff --git a/nuttx/configs/stm3210e-eval/Kconfig b/nuttx/configs/stm3210e-eval/Kconfig index ba366f93d4..1af4dcd35a 100644 --- a/nuttx/configs/stm3210e-eval/Kconfig +++ b/nuttx/configs/stm3210e-eval/Kconfig @@ -29,6 +29,9 @@ config STM3210E_LCD bool "Select support for the STM3210E-EVAL LCD" default y depends on LCD && STM32_FSMC + ---help--- + Enable support for the LCD on the STM3210E-EVAL board. See additional, + LCD-common settings in the drivers/lcd Kconfig file. config LCD_BACKLIGHT bool "LCD backlight support" diff --git a/nuttx/configs/stm3220g-eval/Kconfig b/nuttx/configs/stm3220g-eval/Kconfig index 200cb11c17..3f4ef350c4 100644 --- a/nuttx/configs/stm3220g-eval/Kconfig +++ b/nuttx/configs/stm3220g-eval/Kconfig @@ -27,6 +27,9 @@ config STM3220G_LCD bool "Select support for the STM3210E-EVAL LCD" default y depends on LCD && STM32_FSMC + ---help--- + Enable support for the LCD on the STM3220G-EVAL board. See additional, + LCD-common settings in the drivers/lcd Kconfig file. config LCD_RDSHIFT int "LCD data shift" diff --git a/nuttx/configs/stm3240g-eval/Kconfig b/nuttx/configs/stm3240g-eval/Kconfig index e3ad59df85..9c56a5381b 100644 --- a/nuttx/configs/stm3240g-eval/Kconfig +++ b/nuttx/configs/stm3240g-eval/Kconfig @@ -27,6 +27,9 @@ config STM3240G_LCD bool "Select support for the STM3210E-EVAL LCD" default y depends on LCD && STM32_FSMC + ---help--- + Enable support for the LCD on the STM3240G-EVAL board. See additional, + LCD-common settings in the drivers/lcd Kconfig file. config LCD_RDSHIFT int "LCD data shift" diff --git a/nuttx/drivers/Kconfig b/nuttx/drivers/Kconfig index 6d4c5fc6ae..f898626505 100644 --- a/nuttx/drivers/Kconfig +++ b/nuttx/drivers/Kconfig @@ -182,6 +182,10 @@ menuconfig LCD Drivers for parallel and serial LCD and OLED type devices. These drivers support interfaces as defined in include/nuttx/lcd/lcd.h + This selection is necessary to enable support for LCD drivers in + drivers/lcd as well as for board-specific LCD drivers in the configs/ + subdirectories. + if LCD source drivers/lcd/Kconfig endif From 6211f4726edd588fa2381201443bc5da8589c5ed Mon Sep 17 00:00:00 2001 From: patacongo Date: Mon, 20 Aug 2012 12:44:15 +0000 Subject: [PATCH 11/31] CONFIG_DRAM_END configuration change from Richard Cochran git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5038 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/configs/amber/README.txt | 4 - nuttx/configs/amber/hello/defconfig | 2 - nuttx/configs/avr32dev1/README.txt | 896 +++++++++--------- nuttx/configs/avr32dev1/nsh/defconfig | 2 - nuttx/configs/avr32dev1/ostest/defconfig | 2 - nuttx/configs/c5471evm/README.txt | 2 - nuttx/configs/c5471evm/httpd/defconfig | 5 +- nuttx/configs/c5471evm/nettest/defconfig | 5 +- nuttx/configs/c5471evm/nsh/defconfig | 5 +- nuttx/configs/c5471evm/ostest/defconfig | 5 +- .../configs/compal_e88/nsh_highram/defconfig | 5 +- .../compal_e99/nsh_compalram/defconfig | 5 +- .../configs/compal_e99/nsh_highram/defconfig | 5 +- nuttx/configs/demo9s12ne64/README.txt | 2 - nuttx/configs/demo9s12ne64/ostest/defconfig | 2 - nuttx/configs/eagle100/README.txt | 4 - nuttx/configs/eagle100/httpd/defconfig | 2 - nuttx/configs/eagle100/nettest/defconfig | 2 - nuttx/configs/eagle100/nsh/defconfig | 2 - nuttx/configs/eagle100/nxflat/defconfig | 2 - nuttx/configs/eagle100/ostest/defconfig | 2 - nuttx/configs/eagle100/thttpd/defconfig | 2 - nuttx/configs/ekk-lm3s9b96/README.txt | 4 - nuttx/configs/ekk-lm3s9b96/nsh/defconfig | 2 - nuttx/configs/ekk-lm3s9b96/ostest/defconfig | 2 - nuttx/configs/hymini-stm32v/README.txt | 4 - nuttx/configs/hymini-stm32v/buttons/defconfig | 2 - nuttx/configs/hymini-stm32v/nsh/defconfig | 2 - nuttx/configs/hymini-stm32v/nsh2/defconfig | 2 - nuttx/configs/hymini-stm32v/nx/defconfig | 2 - nuttx/configs/hymini-stm32v/nxlines/defconfig | 2 - .../configs/hymini-stm32v/usbserial/defconfig | 2 - .../hymini-stm32v/usbstorage/defconfig | 2 - nuttx/configs/kwikstik-k40/README.txt | 4 - nuttx/configs/kwikstik-k40/ostest/defconfig | 2 - nuttx/configs/lincoln60/README.txt | 4 - nuttx/configs/lincoln60/nsh/defconfig | 2 - nuttx/configs/lincoln60/ostest/defconfig | 2 - nuttx/configs/lm3s6432-s2e/README.txt | 4 - nuttx/configs/lm3s6432-s2e/nsh/defconfig | 2 - nuttx/configs/lm3s6432-s2e/ostest/defconfig | 2 - nuttx/configs/lm3s6965-ek/README.txt | 4 - nuttx/configs/lm3s6965-ek/nsh/defconfig | 2 - nuttx/configs/lm3s6965-ek/nx/defconfig | 2 - nuttx/configs/lm3s6965-ek/ostest/defconfig | 2 - nuttx/configs/lm3s8962-ek/README.txt | 4 - nuttx/configs/lm3s8962-ek/nsh/defconfig | 2 - nuttx/configs/lm3s8962-ek/nx/defconfig | 2 - nuttx/configs/lm3s8962-ek/ostest/defconfig | 2 - nuttx/configs/lpc4330-xplorer/README.txt | 4 - nuttx/configs/lpc4330-xplorer/nsh/defconfig | 2 - .../configs/lpc4330-xplorer/ostest/defconfig | 2 - nuttx/configs/lpcxpresso-lpc1768/README.txt | 4 - .../lpcxpresso-lpc1768/dhcpd/defconfig | 2 - .../configs/lpcxpresso-lpc1768/nsh/defconfig | 2 - nuttx/configs/lpcxpresso-lpc1768/nx/defconfig | 2 - .../lpcxpresso-lpc1768/ostest/defconfig | 2 - .../lpcxpresso-lpc1768/thttpd/defconfig | 2 - .../lpcxpresso-lpc1768/usbstorage/defconfig | 2 - nuttx/configs/mbed/README.txt | 4 - nuttx/configs/mbed/hidkbd/defconfig | 2 - nuttx/configs/mbed/nsh/defconfig | 2 - nuttx/configs/mcu123-lpc214x/README.txt | 2 - .../mcu123-lpc214x/composite/defconfig | 1 - nuttx/configs/mcu123-lpc214x/nsh/defconfig | 1 - nuttx/configs/mcu123-lpc214x/ostest/defconfig | 1 - .../mcu123-lpc214x/usbserial/defconfig | 1 - .../mcu123-lpc214x/usbstorage/defconfig | 1 - nuttx/configs/micropendous3/README.txt | 4 - nuttx/configs/micropendous3/hello/defconfig | 2 - nuttx/configs/mirtoo/README.txt | 4 - nuttx/configs/mirtoo/nsh/defconfig | 2 - nuttx/configs/mirtoo/nxffs/defconfig | 2 - nuttx/configs/mirtoo/ostest/defconfig | 2 - nuttx/configs/ne64badge/README.txt | 2 - nuttx/configs/ne64badge/ostest/defconfig | 2 - nuttx/configs/nucleus2g/README.txt | 4 - nuttx/configs/nucleus2g/nsh/defconfig | 2 - nuttx/configs/nucleus2g/ostest/defconfig | 2 - nuttx/configs/nucleus2g/usbserial/defconfig | 2 - nuttx/configs/nucleus2g/usbstorage/defconfig | 2 - nuttx/configs/olimex-lpc1766stk/README.txt | 4 - .../configs/olimex-lpc1766stk/ftpc/defconfig | 2 - .../olimex-lpc1766stk/hidkbd/defconfig | 2 - .../olimex-lpc1766stk/nettest/defconfig | 2 - nuttx/configs/olimex-lpc1766stk/nsh/defconfig | 2 - nuttx/configs/olimex-lpc1766stk/nx/defconfig | 2 - .../olimex-lpc1766stk/ostest/defconfig | 2 - .../olimex-lpc1766stk/slip-httpd/defconfig | 2 - .../olimex-lpc1766stk/thttpd/defconfig | 2 - .../olimex-lpc1766stk/usbserial/defconfig | 2 - .../olimex-lpc1766stk/usbstorage/defconfig | 2 - .../configs/olimex-lpc1766stk/wlan/defconfig | 2 - nuttx/configs/olimex-lpc2378/nsh/defconfig | 1 - nuttx/configs/olimex-lpc2378/ostest/defconfig | 1 - .../configs/olimex-strp711/nettest/defconfig | 1 - nuttx/configs/olimex-strp711/nsh/defconfig | 1 - nuttx/configs/olimex-strp711/ostest/defconfig | 1 - nuttx/configs/pcblogic-pic32mx/README.txt | 4 - nuttx/configs/pcblogic-pic32mx/nsh/defconfig | 2 - .../configs/pcblogic-pic32mx/ostest/defconfig | 2 - nuttx/configs/pic32-starterkit/README.txt | 4 - nuttx/configs/pic32-starterkit/nsh/defconfig | 2 - nuttx/configs/pic32-starterkit/nsh2/defconfig | 2 - .../configs/pic32-starterkit/ostest/defconfig | 2 - nuttx/configs/pic32mx7mmb/README.txt | 4 - nuttx/configs/pic32mx7mmb/nsh/defconfig | 2 - nuttx/configs/pic32mx7mmb/ostest/defconfig | 2 - nuttx/configs/qemu-i486/nsh/defconfig | 2 - nuttx/configs/qemu-i486/ostest/defconfig | 2 - nuttx/configs/sam3u-ek/README.txt | 4 - nuttx/configs/sam3u-ek/knsh/defconfig | 2 - nuttx/configs/sam3u-ek/nsh/defconfig | 2 - nuttx/configs/sam3u-ek/nx/defconfig | 2 - nuttx/configs/sam3u-ek/ostest/defconfig | 2 - nuttx/configs/sam3u-ek/touchscreen/defconfig | 2 - nuttx/configs/skp16c26/ostest/defconfig | 2 - nuttx/configs/stm3210e-eval/README.txt | 4 - nuttx/configs/stm3210e-eval/RIDE/defconfig | 2 - nuttx/configs/stm3210e-eval/buttons/defconfig | 2 - .../configs/stm3210e-eval/composite/defconfig | 2 - nuttx/configs/stm3210e-eval/nsh/defconfig | 2 - nuttx/configs/stm3210e-eval/nsh2/defconfig | 2 - nuttx/configs/stm3210e-eval/nx/defconfig | 2 - .../configs/stm3210e-eval/nxconsole/defconfig | 2 - nuttx/configs/stm3210e-eval/nxlines/defconfig | 2 - nuttx/configs/stm3210e-eval/nxtext/defconfig | 2 - nuttx/configs/stm3210e-eval/ostest/defconfig | 2 - nuttx/configs/stm3210e-eval/pm/defconfig | 2 - .../configs/stm3210e-eval/usbserial/defconfig | 2 - .../stm3210e-eval/usbstorage/defconfig | 2 - nuttx/configs/stm3220g-eval/README.txt | 4 - nuttx/configs/stm3220g-eval/dhcpd/defconfig | 2 - nuttx/configs/stm3220g-eval/nettest/defconfig | 2 - nuttx/configs/stm3220g-eval/nsh/defconfig | 2 - nuttx/configs/stm3220g-eval/nsh2/defconfig | 2 - nuttx/configs/stm3220g-eval/nxwm/defconfig | 2 - nuttx/configs/stm3220g-eval/ostest/defconfig | 2 - nuttx/configs/stm3220g-eval/telnetd/defconfig | 2 - nuttx/configs/stm3240g-eval/README.txt | 4 - nuttx/configs/stm3240g-eval/dhcpd/defconfig | 2 - nuttx/configs/stm3240g-eval/nettest/defconfig | 2 - nuttx/configs/stm3240g-eval/nsh/defconfig | 2 - nuttx/configs/stm3240g-eval/nsh2/defconfig | 2 - .../configs/stm3240g-eval/nxconsole/defconfig | 2 - nuttx/configs/stm3240g-eval/nxwm/defconfig | 2 - nuttx/configs/stm3240g-eval/ostest/defconfig | 2 - nuttx/configs/stm3240g-eval/telnetd/defconfig | 2 - nuttx/configs/stm32f4discovery/README.txt | 4 - nuttx/configs/stm32f4discovery/nsh/defconfig | 2 - .../stm32f4discovery/nxlines/defconfig | 2 - .../configs/stm32f4discovery/ostest/defconfig | 2 - nuttx/configs/stm32f4discovery/pm/defconfig | 2 - nuttx/configs/sure-pic32mx/README.txt | 4 - nuttx/configs/sure-pic32mx/nsh/defconfig | 2 - nuttx/configs/sure-pic32mx/ostest/defconfig | 2 - nuttx/configs/sure-pic32mx/usbnsh/defconfig | 2 - nuttx/configs/teensy/README.txt | 4 - nuttx/configs/teensy/hello/defconfig | 2 - nuttx/configs/teensy/nsh/defconfig | 2 - nuttx/configs/teensy/usbstorage/defconfig | 2 - nuttx/configs/twr-k60n512/README.txt | 4 - nuttx/configs/twr-k60n512/nsh/defconfig | 2 - nuttx/configs/twr-k60n512/ostest/defconfig | 2 - nuttx/configs/ubw32/README.txt | 4 - nuttx/configs/ubw32/nsh/defconfig | 2 - nuttx/configs/ubw32/ostest/defconfig | 2 - nuttx/configs/us7032evb1/nsh/defconfig | 1 - nuttx/configs/us7032evb1/ostest/defconfig | 1 - nuttx/configs/vsn/README.txt | 4 - nuttx/configs/vsn/nsh/defconfig | 2 - 171 files changed, 467 insertions(+), 836 deletions(-) diff --git a/nuttx/configs/amber/README.txt b/nuttx/configs/amber/README.txt index e91ea38110..9ef22917e3 100644 --- a/nuttx/configs/amber/README.txt +++ b/nuttx/configs/amber/README.txt @@ -413,10 +413,6 @@ Amber Web Server Configuration Options CONFIG_DRAM_START=0x800100 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that have LEDs diff --git a/nuttx/configs/amber/hello/defconfig b/nuttx/configs/amber/hello/defconfig index 2b56cc0039..828c2fbdc2 100644 --- a/nuttx/configs/amber/hello/defconfig +++ b/nuttx/configs/amber/hello/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_NOINTC - define if the architecture does not # support an interrupt controller or otherwise cannot support # APIs like up_enable_irq() and up_disable_irq(). @@ -82,7 +81,6 @@ CONFIG_ARCH_BOARD_AMBER=y CONFIG_BOARD_LOOPSPERMSEC=800 CONFIG_DRAM_SIZE=4096 CONFIG_DRAM_START=0x800100 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_NOINTC=y CONFIG_ARCH_IRQPRIO=n CONFIG_ARCH_INTERRUPTSTACK=n diff --git a/nuttx/configs/avr32dev1/README.txt b/nuttx/configs/avr32dev1/README.txt index fcd2d9727d..68d0192274 100755 --- a/nuttx/configs/avr32dev1/README.txt +++ b/nuttx/configs/avr32dev1/README.txt @@ -1,450 +1,446 @@ -README -^^^^^^ - -This is the README file for the NuttX port to the Atmel AVR32DEV1 board. - -Contents -^^^^^^^^ - - * GPIO Pin Configuration - * Serial Connection - * Toolchains - * Development Environment - * GNU Toolchains - * IDEs - - Makefile Build - - Native Build - * AVR32 Bootloader - - Boot Sequence - - Link Address - - Entering the ISP - - BatchISP - * Reset - * Make Tip - * AVR32DEV1 Configuration Options - * Configurations - -GPIO Pin Configuration -^^^^^^^^^^^^^^^^^^^^^^ - -The only GPIO pin usage is for LEDs (2) and Buttons (2): - - PIN 13 PA7 LED1 - PIN 14 PA8 LED2 - PIN 24 PB2 KEY1 - PIN 25 PB3 KEY2 - -(See configs/avr32dev/src/avr32dev_internal.h). And also for -crystals (4), JTAG (1), and USB (1): - - PIN 30 PA11 XIN32 - PIN 31 PA12 XOUT32 - PIN 35 PA15 EVTO (JTAG) - PIN 39 PA18 X1IN - PIN 40 PA19 X1OUT - PIN 61 PA26 ID (USB) - -All GPIO pins are brought out through connectors J1 (PINS 33-64) -and J2 (PINS 1-32). - -NOTE: There seems to be some difference in labeling for OSC0 and -OSC1 between MCUZone.com and Atmel: - - Oscillator pinout - -------------------------- -------------------- - QFP48 QFP64 Pad Oscillator AVR32DEV1 - PIN PIN PIN LABEL - ----- ----- ---- --------- -------------------- - 30 39 PA18 XIN0 X1IN (12MHz) - 41 PA28 XIN1 PA28 (no crystal) - 22 30 PA11 XIN32 XIN32 (32KHz) - 31 40 PA19 XOUT0 X1OUT (12Mhz) - 42 PA29 XOUT1 PA29 (no crystal) - 23 31 PA12 XOUT32 XOUT32 (32 Khz) - ----- ----- ---- --------- -------------------- - -NOTE 1: These crystal inputs/outputs are analog signals and my -assumption is that they need no pin multiplexing setting to -enable them for the external crystal function. - -NOTE 2: There is no support for OSC1. - -NOTE 3: There are solder pads for the 32KHz OSC32, but the -crystal is not populated on my board. Therefore, the RTC will -have to run from the (uncalibrated) RCOSC. - -Serial Connection -^^^^^^^^^^^^^^^^^ - -USART1 is the default USART1 used in the configuration files to -provide a serial console (of course, that can be easily changed -by editting the configuration file). The AVR32DEV1 board has no -RS-232 drivers or connectors on board. I use an off-board MAX232 -module that I got on eBay (search for MAX232 if you want to find -one). I connect the MAX232 board as follows: - -In configs/avr32dev/include/board.h: - - #define PINMUX_USART1_RXD PINMUX_USART1_RXD_1 - #define PINMUX_USART1_TXD PINMUX_USART1_TXD_1 - -In arch/avr/src/at32uc3/at32uc3b_pinmux.h: - - #define PINMUX_USART1_RXD_1 (GPIO_PERIPH | GPIO_FUNCD | GPIO_PORTA | 17) - #define PINMUX_USART1_TXD_1 (GPIO_PERIPH | GPIO_FUNCA | GPIO_PORTA | 23) - -PA17 and PA23 are avaiable from the AVR32DEV1: - - FUNC GPIO PIN Header 16X2 (J1) MX232 Board - ---- ----- ----- ---------------- ------------ - RXD PA17 PIN37 Pin 5 PIN4 RXD (5V TTL/CMOS) - TXD PA23 PIN47 Pin 15 PIN3 TXD (5V TTL/CMOS) - PIN2 GND - PIN1 VCC (5V) - - Voltage on GPIO Pins with respect to Ground for TCK, RESET_N, PA03-PA08, - PA11-PA12, PA18-PA19, PA28-PA31............................-0.3 to 3.6V - Other Pins ............................................... -0.3 to 5.5V - - I get the 5V from another USB port (using the 5V power cable that normally - provides the extra current needed by my USB IDE drive). - -Development Environment -^^^^^^^^^^^^^^^^^^^^^^^ - - Either Linux or Cygwin on Windows can be used for the development environment. - The source has been built only using the GNU toolchain (see below). Other - toolchains will likely cause problems. Testing was performed using the Cygwin - environment. - -GNU Toolchains -^^^^^^^^^^^^^^ - -Atmel Toolchain: - - The build logic in these directories assume that you are using the GNU - toolchain with the Atmel patches. The patch file, pre-patched tool - sources,and pre-built binaries are available from the Atmel website. - - CONFIG_AVR32_AVRTOOLSW=y # Use the windows version - CONFIG_AVR32_AVRTOOLSL=y # Ue the Linux version - - NOTE: The NuttX builtroot cannot be used to build the AVR32 toolchain. - This is because the Atmel patches that add support for the AVR32 are not - included in the NuttX buildroot. - -WinAVR: - - Another option for use under Windows is WinAVR: - http://sourceforge.net/projects/winavr/files/. WinAVR includes the - AVR32 toolchain as well as the AVR toolchain and various support - libraries and header files. - -IDEs -^^^^ - - NuttX is built using command-line make. It can be used with an IDE, but some - effort will be required to create the project. - - Makefile Build - -------------- - Under Eclipse, it is pretty easy to set up an "empty makefile project" and - simply use the NuttX makefile to build the system. That is almost for free - under Linux. Under Windows, you will need to set up the "Cygwin GCC" empty - makefile project in order to work with Windows (Google for "Eclipse Cygwin" - - there is a lot of help on the internet). - - Native Build - ------------ - Here are a few tips before you start that effort: - - 1) Select the toolchain that you will be using in your .config file - 2) Start the NuttX build at least one time from the Cygwin command line - before trying to create your project. This is necessary to create - certain auto-generated files and directories that will be needed. - 3) Set up include pathes: You will need include/, arch/avr/src/at32uc3, - arch/avr/src/common, arch/arm/src/avr, and sched/. - 4) All assembly files need to have the definition option -D __ASSEMBLY__ - on the command line. - - Startup files will probably cause you some headaches. The NuttX startup file - is arch/avr/src/avr3/up_nommuhead.S. - -AVR32 Bootloader -^^^^^^^^^^^^^^^^ - - Boot Sequence - ------------- - - "An AVR UC3 part having the bootloader programmed resets as any other - part at 80000000h. Bootloader execution begins here. The bootloader - first performs the boot process to know whether it should start the - USB DFU ISP or the application. If the tested conditions indicate - that the USB DFU ISP should be started, then execution continues in - the bootloader area, i.e. between 80000000h and 80002000h, else - the bootloader launches the application at 80002000h." - - Link Address - ------------ - - The linker scripts (ld.script) assume that you are using the DFU - bootloader. The bootloader resides at 0x8000:0000 and so the ld.script - files link the application to execute after the bootloader at - 0x8000:2000. To link so that NuttX boots directly without using the - bootloader, change the flash definition from: - - flash (rxai!w) : ORIGIN = 0x80002000, LENGTH = 256K - 8K - - to: - flash (rxai!w) : ORIGIN = 0x80000000, LENGTH = 256K - - Or to use the MSC bootloader: - - flash (rxai!w) : ORIGIN = 0x80008000, LENGTH = 256K - 32K - - Entering the ISP - ---------------- - - In order to use the USB port to download the FLASH(ISP), you need to - use the S3(PA13) to make CPU return to boot status. In this mode, the - on chip bootloader will run, making the ISP possible. - - BatchISP - -------- - - Unlike other Atmel parts, the AVR32 will not work with the FLIP GUI - program. Instead, you must use the command-line loader call BatchISP. - If need to download FLIP from the atmel.com website, install the USB - driver in the FLIP usb directory. Then in the bin directory where - you installed FLIP, you will also find batchisp.exe. - - NOTE: The AVR32DEV1 setenv.sh files will add the path to the BatchISP - bin directory to the Cygwin PATH variable. If you use a different - version of FLIP or if you install FLIP in a different location, you - will need to modify the setenv.sh files. - - Notes from "AVR32 UC3 USB DFU Bootloader" (doc7745.pdf) - - "To launch BatchISP, open a command prompt. Windows or Cygwin command - prompt can be used provided that the bin folder of the FLIP installation - directory is in the PATH (Windows’ or Cygwin’s) environment variable. - When running BatchISP on AT32UC3xxxxx, the target part has to be specified - with -device at32uc3xxxxx and the communication port with -hardware usb. - Commands can then be placed after -operation. These commands are executed - in order. BatchISP options can be placed in a text file invoked using - -cmdfile rather than on the command line. - - "BatchISP works with an internal ISP buffer per target memory. These ISP - buffers can be filled from several sources. All target operations (program, - verify, read) are performed using these buffers." - - The following BatchISP command line will erase FLASH, write the nuttx binary - into FLASH, and reset the AVR32. This command line is available in the - script config/avr32dev1/tools/doisp.sh: - - batchisp -device at32uc3b0256 -hardware usb -operation erase f memory flash \ - blankcheck loadbuffer nuttx.elf program verify start reset 0 - - "BatchISP main commands available on AT32UC3xxxxx are: - - - ASSERT { PASS | FAIL } changes the displayed results of the following - operations according to the expected behavior. - - ONFAIL { ASK | ABORT | RETRY | IGNORE } changes the interactive behavior - of BatchISP in case of failure. - - WAIT inserts a pause between two ISP operations. - - ECHO displays a message. - - ERASE F erases internal flash contents, except the bootloader. - - MEMORY { FLASH | SECURITY | CONFIGURATION | BOOTLOADER | SIGNATURE | USER } - selects a target memory on which to apply the following operations. - - ADDRANGE selects in the current target memory an - address range on which to apply the following operations. - - BLANKCHECK checks that the selected address range is erased. - - FILLBUFFER fills the ISP buffer with a byte value. - - LOADBUFFER { | } loads the ISP buffer from an - input file. - - PROGRAM programs the selected address range with the ISP buffer. - - VERIFY verifies that the selected address range has the same contents - as the ISP buffer. - - READ reads the selected address range to the ISP buffer. - - SAVEBUFFER { HEX386 | HEX86 } saves the ISP buffer to an - output file. - - START { RESET | NORESET } 0 starts the execution of the programmed - application with an optional hardware reset of the target. - - "The AT32UC3xxxxx memories made available by BatchISP are: - - - FLASH: This memory is the internal flash array of the target, including the - bootloader protected area. E.g. on AT32UC3A0512 (512-kB internal flash), - addresses from 0 to 0x7FFFF can be accessed in this memory. - - SECURITY: This memory contains only one byte. The least significant bit - of this byte reflects the value of the target Security bit which can only - be set to 1. Once set, the only accepted commands will be ERASE and START. - After an ERASE command, all commands are accepted until the end of the - non-volatile ISP session, even if the Security bit is set. - - CONFIGURATION: This memory contains one byte per target general-purpose - fuse bit. The least significant bit of each byte reflects the value of - the corresponding GP fuse bit. - - BOOTLOADER: This memory contains three bytes concerning the ISP: the ISP - version in BCD format without the major version number (always 1), the - ISP ID0 and the ISP ID1. - - SIGNATURE: This memory contains four bytes concerning the part: the product - manufacturer ID, the product family ID, the product ID and the product - revision. - - USER: This memory is the internal flash User page of the target, with - addresses from 0 to 0x1FF. - - "For further details about BatchISP commands, launch batchisp -h or see the - help files installed with FLIP ..." - -Reset -^^^^^ - - I don't trust the reset button -- if you reset and something weird happens, - try a full power cycle. - -Make Tip -^^^^^^^^ - - Because this build uses a native Windows toolchain and the native Windows - tools do not understand Cygwin's symbolic links, the NuttX make system does - something weird: It copies the configuration directories instead of linking - to them (it could, perhaps, use the NTFS 'mklink' command, but it doesn't). - - A consequence of this is that you can easily get confused when you edit - a file in one of the "linked" directories, re-build NuttX, and then not see your - changes when you run the program. That is because build is still using the - version of the file in the copied directory, not your modified file! To work - around this annoying behavior, do the following when you re-build: - - make clean_context all <-- Remove and re-copy all of the directories, then make all - doisp.sh <-- Load the code onto the board. - -AVR32DEV1 Configuration Options -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - - CONFIG_ARCH - Identifies the arch/ subdirectory. This should - be set to: - - CONFIG_ARCH=avr - - CONFIG_ARCH_family - For use in C code: - - CONFIG_ARCH_AVR=y - - CONFIG_ARCH_architecture - For use in C code: - - CONFIG_ARCH_AVR32=y - - CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory - - CONFIG_ARCH_CHIP=at32uc3 - - CONFIG_ARCH_CHIP_name - For use in C code to identify the exact - chip: - - CONFIG_ARCH_CHIP_AT32UC3B0256 - - CONFIG_ARCH_BOARD - Identifies the configs subdirectory and - hence, the board that supports the particular chip or SoC. - - CONFIG_ARCH_BOARD=avr32dev1 (for the AV32DEV1 board) - - CONFIG_ARCH_BOARD_name - For use in C code - - CONFIG_ARCH_BOARD_AVR32DEV1 - - CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation - of delay loops - - CONFIG_ENDIAN_BIG - define if big endian (default is little - endian) - - CONFIG_DRAM_SIZE - Describes the installed DRAM (SRAM in this case): - - CONFIG_DRAM_SIZE=0x00010000 (64Kb) - - CONFIG_DRAM_START - The start address of installed DRAM - - CONFIG_DRAM_START=0x20000000 - - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - - CONFIG_ARCH_IRQPRIO - The AT32UC3B0256 supports interrupt prioritization - - CONFIG_ARCH_IRQPRIO=y - - CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that - have LEDs - - CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt - stack. If defined, this symbol is the size of the interrupt - stack in bytes. If not defined, the user task stacks will be - used during interrupt handling. - - CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions - - CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to board architecture. - - CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that - cause a 100 second delay during boot-up. This 100 second delay - serves no purpose other than it allows you to calibratre - CONFIG_ARCH_LOOPSPERMSEC. You simply use a stop watch to measure - the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until - the delay actually is 100 seconds. - - Individual subsystems can be enabled: - - CONFIG_AVR32_GPIOIRQ - GPIO interrupt support - CONFIG_AVR32_GPIOIRQSETA - Set of GPIOs on PORTA that support interrupts - CONFIG_AVR32_GPIOIRQSETB - Set of GPIOs on PORTB that support interrupts - - CONFIG_AVR32_USARTn - Enable support for USARTn - CONFIG_AVR32_USARTn_RS232 - Configure USARTn as an RS232 interface. - CONFIG_AVR32_USARTn_SPI - Configure USARTn as an SPI interface. - CONFIG_AVR32_USARTn_RS485 - Configure USARTn as an RS485 interface. - CONFIG_AVR32_USARTn_MAN - Configure USARTn as an Manchester interface. - CONFIG_AVR32_USARTn_MODEM - Configure USARTn as an Modem interface. - CONFIG_AVR32_USARTn_IRDA - Configure USARTn as an IRDA interface. - CONFIG_AVR32_USARTn_ISO786 - Configure USARTn as an ISO786 interface. - - AT32UC3B0256 specific device driver settings - - CONFIG_USARTn_SERIAL_CONSOLE - selects the USARTn for the - console and ttys0 (default is the USART0). - CONFIG_USARTn_RXBUFSIZE - Characters are buffered as received. - This specific the size of the receive buffer - CONFIG_USARTn_TXBUFSIZE - Characters are buffered before - being sent. This specific the size of the transmit buffer - CONFIG_USARTn_BAUD - The configure BAUD of the USART. Must be - CONFIG_USARTn_BITS - The number of bits. Must be either 7 or 8. - CONFIG_USARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity - CONFIG_USARTn_2STOP - Two stop bits - -Configurations -^^^^^^^^^^^^^^ - -Each Stellaris LM3S6965 Evaluation Kit configuration is maintained in a -sudirectory and can be selected as follow: - - cd tools - ./configure.sh avr32dev1/ - cd - - . ./setenv.sh - -Where is one of the following: - - nsh: - Configures the NuttShell (nsh) located at examples/nsh. The - Configuration enables only the serial NSH interface. - - ostest: - This configuration directory, performs a simple OS test using - examples/ostest. - - NOTE: Round-robin scheduling is disabled in this test because - the RR test in examples/ostest declares data structures that - are too large for the poor little uc3 SRAM. - - +README +^^^^^^ + +This is the README file for the NuttX port to the Atmel AVR32DEV1 board. + +Contents +^^^^^^^^ + + * GPIO Pin Configuration + * Serial Connection + * Toolchains + * Development Environment + * GNU Toolchains + * IDEs + - Makefile Build + - Native Build + * AVR32 Bootloader + - Boot Sequence + - Link Address + - Entering the ISP + - BatchISP + * Reset + * Make Tip + * AVR32DEV1 Configuration Options + * Configurations + +GPIO Pin Configuration +^^^^^^^^^^^^^^^^^^^^^^ + +The only GPIO pin usage is for LEDs (2) and Buttons (2): + + PIN 13 PA7 LED1 + PIN 14 PA8 LED2 + PIN 24 PB2 KEY1 + PIN 25 PB3 KEY2 + +(See configs/avr32dev/src/avr32dev_internal.h). And also for +crystals (4), JTAG (1), and USB (1): + + PIN 30 PA11 XIN32 + PIN 31 PA12 XOUT32 + PIN 35 PA15 EVTO (JTAG) + PIN 39 PA18 X1IN + PIN 40 PA19 X1OUT + PIN 61 PA26 ID (USB) + +All GPIO pins are brought out through connectors J1 (PINS 33-64) +and J2 (PINS 1-32). + +NOTE: There seems to be some difference in labeling for OSC0 and +OSC1 between MCUZone.com and Atmel: + + Oscillator pinout + -------------------------- -------------------- + QFP48 QFP64 Pad Oscillator AVR32DEV1 + PIN PIN PIN LABEL + ----- ----- ---- --------- -------------------- + 30 39 PA18 XIN0 X1IN (12MHz) + 41 PA28 XIN1 PA28 (no crystal) + 22 30 PA11 XIN32 XIN32 (32KHz) + 31 40 PA19 XOUT0 X1OUT (12Mhz) + 42 PA29 XOUT1 PA29 (no crystal) + 23 31 PA12 XOUT32 XOUT32 (32 Khz) + ----- ----- ---- --------- -------------------- + +NOTE 1: These crystal inputs/outputs are analog signals and my +assumption is that they need no pin multiplexing setting to +enable them for the external crystal function. + +NOTE 2: There is no support for OSC1. + +NOTE 3: There are solder pads for the 32KHz OSC32, but the +crystal is not populated on my board. Therefore, the RTC will +have to run from the (uncalibrated) RCOSC. + +Serial Connection +^^^^^^^^^^^^^^^^^ + +USART1 is the default USART1 used in the configuration files to +provide a serial console (of course, that can be easily changed +by editting the configuration file). The AVR32DEV1 board has no +RS-232 drivers or connectors on board. I use an off-board MAX232 +module that I got on eBay (search for MAX232 if you want to find +one). I connect the MAX232 board as follows: + +In configs/avr32dev/include/board.h: + + #define PINMUX_USART1_RXD PINMUX_USART1_RXD_1 + #define PINMUX_USART1_TXD PINMUX_USART1_TXD_1 + +In arch/avr/src/at32uc3/at32uc3b_pinmux.h: + + #define PINMUX_USART1_RXD_1 (GPIO_PERIPH | GPIO_FUNCD | GPIO_PORTA | 17) + #define PINMUX_USART1_TXD_1 (GPIO_PERIPH | GPIO_FUNCA | GPIO_PORTA | 23) + +PA17 and PA23 are avaiable from the AVR32DEV1: + + FUNC GPIO PIN Header 16X2 (J1) MX232 Board + ---- ----- ----- ---------------- ------------ + RXD PA17 PIN37 Pin 5 PIN4 RXD (5V TTL/CMOS) + TXD PA23 PIN47 Pin 15 PIN3 TXD (5V TTL/CMOS) + PIN2 GND + PIN1 VCC (5V) + + Voltage on GPIO Pins with respect to Ground for TCK, RESET_N, PA03-PA08, + PA11-PA12, PA18-PA19, PA28-PA31............................-0.3 to 3.6V + Other Pins ............................................... -0.3 to 5.5V + + I get the 5V from another USB port (using the 5V power cable that normally + provides the extra current needed by my USB IDE drive). + +Development Environment +^^^^^^^^^^^^^^^^^^^^^^^ + + Either Linux or Cygwin on Windows can be used for the development environment. + The source has been built only using the GNU toolchain (see below). Other + toolchains will likely cause problems. Testing was performed using the Cygwin + environment. + +GNU Toolchains +^^^^^^^^^^^^^^ + +Atmel Toolchain: + + The build logic in these directories assume that you are using the GNU + toolchain with the Atmel patches. The patch file, pre-patched tool + sources,and pre-built binaries are available from the Atmel website. + + CONFIG_AVR32_AVRTOOLSW=y # Use the windows version + CONFIG_AVR32_AVRTOOLSL=y # Ue the Linux version + + NOTE: The NuttX builtroot cannot be used to build the AVR32 toolchain. + This is because the Atmel patches that add support for the AVR32 are not + included in the NuttX buildroot. + +WinAVR: + + Another option for use under Windows is WinAVR: + http://sourceforge.net/projects/winavr/files/. WinAVR includes the + AVR32 toolchain as well as the AVR toolchain and various support + libraries and header files. + +IDEs +^^^^ + + NuttX is built using command-line make. It can be used with an IDE, but some + effort will be required to create the project. + + Makefile Build + -------------- + Under Eclipse, it is pretty easy to set up an "empty makefile project" and + simply use the NuttX makefile to build the system. That is almost for free + under Linux. Under Windows, you will need to set up the "Cygwin GCC" empty + makefile project in order to work with Windows (Google for "Eclipse Cygwin" - + there is a lot of help on the internet). + + Native Build + ------------ + Here are a few tips before you start that effort: + + 1) Select the toolchain that you will be using in your .config file + 2) Start the NuttX build at least one time from the Cygwin command line + before trying to create your project. This is necessary to create + certain auto-generated files and directories that will be needed. + 3) Set up include pathes: You will need include/, arch/avr/src/at32uc3, + arch/avr/src/common, arch/arm/src/avr, and sched/. + 4) All assembly files need to have the definition option -D __ASSEMBLY__ + on the command line. + + Startup files will probably cause you some headaches. The NuttX startup file + is arch/avr/src/avr3/up_nommuhead.S. + +AVR32 Bootloader +^^^^^^^^^^^^^^^^ + + Boot Sequence + ------------- + + "An AVR UC3 part having the bootloader programmed resets as any other + part at 80000000h. Bootloader execution begins here. The bootloader + first performs the boot process to know whether it should start the + USB DFU ISP or the application. If the tested conditions indicate + that the USB DFU ISP should be started, then execution continues in + the bootloader area, i.e. between 80000000h and 80002000h, else + the bootloader launches the application at 80002000h." + + Link Address + ------------ + + The linker scripts (ld.script) assume that you are using the DFU + bootloader. The bootloader resides at 0x8000:0000 and so the ld.script + files link the application to execute after the bootloader at + 0x8000:2000. To link so that NuttX boots directly without using the + bootloader, change the flash definition from: + + flash (rxai!w) : ORIGIN = 0x80002000, LENGTH = 256K - 8K + + to: + flash (rxai!w) : ORIGIN = 0x80000000, LENGTH = 256K + + Or to use the MSC bootloader: + + flash (rxai!w) : ORIGIN = 0x80008000, LENGTH = 256K - 32K + + Entering the ISP + ---------------- + + In order to use the USB port to download the FLASH(ISP), you need to + use the S3(PA13) to make CPU return to boot status. In this mode, the + on chip bootloader will run, making the ISP possible. + + BatchISP + -------- + + Unlike other Atmel parts, the AVR32 will not work with the FLIP GUI + program. Instead, you must use the command-line loader call BatchISP. + If need to download FLIP from the atmel.com website, install the USB + driver in the FLIP usb directory. Then in the bin directory where + you installed FLIP, you will also find batchisp.exe. + + NOTE: The AVR32DEV1 setenv.sh files will add the path to the BatchISP + bin directory to the Cygwin PATH variable. If you use a different + version of FLIP or if you install FLIP in a different location, you + will need to modify the setenv.sh files. + + Notes from "AVR32 UC3 USB DFU Bootloader" (doc7745.pdf) + + "To launch BatchISP, open a command prompt. Windows or Cygwin command + prompt can be used provided that the bin folder of the FLIP installation + directory is in the PATH (Windows’ or Cygwin’s) environment variable. + When running BatchISP on AT32UC3xxxxx, the target part has to be specified + with -device at32uc3xxxxx and the communication port with -hardware usb. + Commands can then be placed after -operation. These commands are executed + in order. BatchISP options can be placed in a text file invoked using + -cmdfile rather than on the command line. + + "BatchISP works with an internal ISP buffer per target memory. These ISP + buffers can be filled from several sources. All target operations (program, + verify, read) are performed using these buffers." + + The following BatchISP command line will erase FLASH, write the nuttx binary + into FLASH, and reset the AVR32. This command line is available in the + script config/avr32dev1/tools/doisp.sh: + + batchisp -device at32uc3b0256 -hardware usb -operation erase f memory flash \ + blankcheck loadbuffer nuttx.elf program verify start reset 0 + + "BatchISP main commands available on AT32UC3xxxxx are: + + - ASSERT { PASS | FAIL } changes the displayed results of the following + operations according to the expected behavior. + - ONFAIL { ASK | ABORT | RETRY | IGNORE } changes the interactive behavior + of BatchISP in case of failure. + - WAIT inserts a pause between two ISP operations. + - ECHO displays a message. + - ERASE F erases internal flash contents, except the bootloader. + - MEMORY { FLASH | SECURITY | CONFIGURATION | BOOTLOADER | SIGNATURE | USER } + selects a target memory on which to apply the following operations. + - ADDRANGE selects in the current target memory an + address range on which to apply the following operations. + - BLANKCHECK checks that the selected address range is erased. + - FILLBUFFER fills the ISP buffer with a byte value. + - LOADBUFFER { | } loads the ISP buffer from an + input file. + - PROGRAM programs the selected address range with the ISP buffer. + - VERIFY verifies that the selected address range has the same contents + as the ISP buffer. + - READ reads the selected address range to the ISP buffer. + - SAVEBUFFER { HEX386 | HEX86 } saves the ISP buffer to an + output file. + - START { RESET | NORESET } 0 starts the execution of the programmed + application with an optional hardware reset of the target. + + "The AT32UC3xxxxx memories made available by BatchISP are: + + - FLASH: This memory is the internal flash array of the target, including the + bootloader protected area. E.g. on AT32UC3A0512 (512-kB internal flash), + addresses from 0 to 0x7FFFF can be accessed in this memory. + - SECURITY: This memory contains only one byte. The least significant bit + of this byte reflects the value of the target Security bit which can only + be set to 1. Once set, the only accepted commands will be ERASE and START. + After an ERASE command, all commands are accepted until the end of the + non-volatile ISP session, even if the Security bit is set. + - CONFIGURATION: This memory contains one byte per target general-purpose + fuse bit. The least significant bit of each byte reflects the value of + the corresponding GP fuse bit. + - BOOTLOADER: This memory contains three bytes concerning the ISP: the ISP + version in BCD format without the major version number (always 1), the + ISP ID0 and the ISP ID1. + - SIGNATURE: This memory contains four bytes concerning the part: the product + manufacturer ID, the product family ID, the product ID and the product + revision. + - USER: This memory is the internal flash User page of the target, with + addresses from 0 to 0x1FF. + + "For further details about BatchISP commands, launch batchisp -h or see the + help files installed with FLIP ..." + +Reset +^^^^^ + + I don't trust the reset button -- if you reset and something weird happens, + try a full power cycle. + +Make Tip +^^^^^^^^ + + Because this build uses a native Windows toolchain and the native Windows + tools do not understand Cygwin's symbolic links, the NuttX make system does + something weird: It copies the configuration directories instead of linking + to them (it could, perhaps, use the NTFS 'mklink' command, but it doesn't). + + A consequence of this is that you can easily get confused when you edit + a file in one of the "linked" directories, re-build NuttX, and then not see your + changes when you run the program. That is because build is still using the + version of the file in the copied directory, not your modified file! To work + around this annoying behavior, do the following when you re-build: + + make clean_context all <-- Remove and re-copy all of the directories, then make all + doisp.sh <-- Load the code onto the board. + +AVR32DEV1 Configuration Options +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + CONFIG_ARCH - Identifies the arch/ subdirectory. This should + be set to: + + CONFIG_ARCH=avr + + CONFIG_ARCH_family - For use in C code: + + CONFIG_ARCH_AVR=y + + CONFIG_ARCH_architecture - For use in C code: + + CONFIG_ARCH_AVR32=y + + CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory + + CONFIG_ARCH_CHIP=at32uc3 + + CONFIG_ARCH_CHIP_name - For use in C code to identify the exact + chip: + + CONFIG_ARCH_CHIP_AT32UC3B0256 + + CONFIG_ARCH_BOARD - Identifies the configs subdirectory and + hence, the board that supports the particular chip or SoC. + + CONFIG_ARCH_BOARD=avr32dev1 (for the AV32DEV1 board) + + CONFIG_ARCH_BOARD_name - For use in C code + + CONFIG_ARCH_BOARD_AVR32DEV1 + + CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation + of delay loops + + CONFIG_ENDIAN_BIG - define if big endian (default is little + endian) + + CONFIG_DRAM_SIZE - Describes the installed DRAM (SRAM in this case): + + CONFIG_DRAM_SIZE=0x00010000 (64Kb) + + CONFIG_DRAM_START - The start address of installed DRAM + + CONFIG_DRAM_START=0x20000000 + + CONFIG_ARCH_IRQPRIO - The AT32UC3B0256 supports interrupt prioritization + + CONFIG_ARCH_IRQPRIO=y + + CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that + have LEDs + + CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt + stack. If defined, this symbol is the size of the interrupt + stack in bytes. If not defined, the user task stacks will be + used during interrupt handling. + + CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions + + CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to board architecture. + + CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that + cause a 100 second delay during boot-up. This 100 second delay + serves no purpose other than it allows you to calibratre + CONFIG_ARCH_LOOPSPERMSEC. You simply use a stop watch to measure + the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until + the delay actually is 100 seconds. + + Individual subsystems can be enabled: + + CONFIG_AVR32_GPIOIRQ - GPIO interrupt support + CONFIG_AVR32_GPIOIRQSETA - Set of GPIOs on PORTA that support interrupts + CONFIG_AVR32_GPIOIRQSETB - Set of GPIOs on PORTB that support interrupts + + CONFIG_AVR32_USARTn - Enable support for USARTn + CONFIG_AVR32_USARTn_RS232 - Configure USARTn as an RS232 interface. + CONFIG_AVR32_USARTn_SPI - Configure USARTn as an SPI interface. + CONFIG_AVR32_USARTn_RS485 - Configure USARTn as an RS485 interface. + CONFIG_AVR32_USARTn_MAN - Configure USARTn as an Manchester interface. + CONFIG_AVR32_USARTn_MODEM - Configure USARTn as an Modem interface. + CONFIG_AVR32_USARTn_IRDA - Configure USARTn as an IRDA interface. + CONFIG_AVR32_USARTn_ISO786 - Configure USARTn as an ISO786 interface. + + AT32UC3B0256 specific device driver settings + + CONFIG_USARTn_SERIAL_CONSOLE - selects the USARTn for the + console and ttys0 (default is the USART0). + CONFIG_USARTn_RXBUFSIZE - Characters are buffered as received. + This specific the size of the receive buffer + CONFIG_USARTn_TXBUFSIZE - Characters are buffered before + being sent. This specific the size of the transmit buffer + CONFIG_USARTn_BAUD - The configure BAUD of the USART. Must be + CONFIG_USARTn_BITS - The number of bits. Must be either 7 or 8. + CONFIG_USARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity + CONFIG_USARTn_2STOP - Two stop bits + +Configurations +^^^^^^^^^^^^^^ + +Each Stellaris LM3S6965 Evaluation Kit configuration is maintained in a +sudirectory and can be selected as follow: + + cd tools + ./configure.sh avr32dev1/ + cd - + . ./setenv.sh + +Where is one of the following: + + nsh: + Configures the NuttShell (nsh) located at examples/nsh. The + Configuration enables only the serial NSH interface. + + ostest: + This configuration directory, performs a simple OS test using + examples/ostest. + + NOTE: Round-robin scheduling is disabled in this test because + the RR test in examples/ostest declares data structures that + are too large for the poor little uc3 SRAM. + + diff --git a/nuttx/configs/avr32dev1/nsh/defconfig b/nuttx/configs/avr32dev1/nsh/defconfig index afbd08fae7..99f3a538ef 100755 --- a/nuttx/configs/avr32dev1/nsh/defconfig +++ b/nuttx/configs/avr32dev1/nsh/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_NOINTC - define if the architecture does not # support an interrupt controller or otherwise cannot support # APIs like up_enable_irq() and up_disable_irq(). @@ -83,7 +82,6 @@ CONFIG_ARCH_BOARD_AVR32DEV1=y CONFIG_BOARD_LOOPSPERMSEC=1140 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x00000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_NOINTC=y CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n diff --git a/nuttx/configs/avr32dev1/ostest/defconfig b/nuttx/configs/avr32dev1/ostest/defconfig index 59c5080db7..c00113c06b 100755 --- a/nuttx/configs/avr32dev1/ostest/defconfig +++ b/nuttx/configs/avr32dev1/ostest/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_NOINTC - define if the architecture does not # support an interrupt controller or otherwise cannot support # APIs like up_enable_irq() and up_disable_irq(). @@ -83,7 +82,6 @@ CONFIG_ARCH_BOARD_AVR32DEV1=y CONFIG_BOARD_LOOPSPERMSEC=1140 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x00000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_NOINTC=y CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n diff --git a/nuttx/configs/c5471evm/README.txt b/nuttx/configs/c5471evm/README.txt index 1e127d5658..1329ee6d82 100644 --- a/nuttx/configs/c5471evm/README.txt +++ b/nuttx/configs/c5471evm/README.txt @@ -73,8 +73,6 @@ ARM/C5471-specific Configuration Options CONFIG_ROM_VECTORS - should be defined for the C5471 because the interrupt vectors are in ROM - CONFIG_DRAM_END - the size of installed DRAM. Unique to c5471 - CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that have LEDs diff --git a/nuttx/configs/c5471evm/httpd/defconfig b/nuttx/configs/c5471evm/httpd/defconfig index eb09501691..4b9c656c1c 100644 --- a/nuttx/configs/c5471evm/httpd/defconfig +++ b/nuttx/configs/c5471evm/httpd/defconfig @@ -50,7 +50,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_ENDIAN_BIG - define if big endian (default is little endian) # CONFIG_ROM_VECTORS - unique to c5471 -# CONFIG_DRAM_END - the size of installed DRAM. # Unique to c5471 # CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to c5471. # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt @@ -68,11 +67,13 @@ CONFIG_ARCH_BOARD=c5471evm CONFIG_ARCH_BOARD_C5471EVM=y CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_ROM_VECTORS=n -CONFIG_DRAM_END=0x11000000 CONFIG_ARCH_LEDS=y CONFIG_ARCH_INTERRUPTSTACK=0 CONFIG_ARCH_STACKDUMP=y +CONFIG_DRAM_START=0 +CONFIG_DRAM_SIZE=0x11000000 + # # C5471 specific device driver settings # diff --git a/nuttx/configs/c5471evm/nettest/defconfig b/nuttx/configs/c5471evm/nettest/defconfig index 96d221cf1c..dac94afe4a 100644 --- a/nuttx/configs/c5471evm/nettest/defconfig +++ b/nuttx/configs/c5471evm/nettest/defconfig @@ -50,7 +50,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_ENDIAN_BIG - define if big endian (default is little endian) # CONFIG_ROM_VECTORS - unique to c5471 -# CONFIG_DRAM_END - the size of installed DRAM. # Unique to c5471 # CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to c5471. # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt @@ -68,11 +67,13 @@ CONFIG_ARCH_BOARD=c5471evm CONFIG_ARCH_BOARD_C5471EVM=y CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_ROM_VECTORS=n -CONFIG_DRAM_END=0x11000000 CONFIG_ARCH_LEDS=y CONFIG_ARCH_INTERRUPTSTACK=0 CONFIG_ARCH_STACKDUMP=y +CONFIG_DRAM_START=0 +CONFIG_DRAM_SIZE=0x11000000 + # # General build options # diff --git a/nuttx/configs/c5471evm/nsh/defconfig b/nuttx/configs/c5471evm/nsh/defconfig index dedbd8bdee..67384f5993 100644 --- a/nuttx/configs/c5471evm/nsh/defconfig +++ b/nuttx/configs/c5471evm/nsh/defconfig @@ -50,7 +50,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_ENDIAN_BIG - define if big endian (default is little endian) # CONFIG_ROM_VECTORS - unique to c5471 -# CONFIG_DRAM_END - the size of installed DRAM. # Unique to c5471 # CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to c5471. # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt @@ -68,11 +67,13 @@ CONFIG_ARCH_BOARD=c5471evm CONFIG_ARCH_BOARD_C5471EVM=y CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_ROM_VECTORS=n -CONFIG_DRAM_END=0x11000000 CONFIG_ARCH_LEDS=y CONFIG_ARCH_INTERRUPTSTACK=0 CONFIG_ARCH_STACKDUMP=y +CONFIG_DRAM_START=0 +CONFIG_DRAM_SIZE=0x11000000 + # # C5471 specific device driver settings # diff --git a/nuttx/configs/c5471evm/ostest/defconfig b/nuttx/configs/c5471evm/ostest/defconfig index f24a607f13..3b57c80422 100644 --- a/nuttx/configs/c5471evm/ostest/defconfig +++ b/nuttx/configs/c5471evm/ostest/defconfig @@ -50,7 +50,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_ENDIAN_BIG - define if big endian (default is little endian) # CONFIG_ROM_VECTORS - unique to c5471 -# CONFIG_DRAM_END - the size of installed DRAM. # Unique to c5471 # CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to c5471. # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt @@ -68,11 +67,13 @@ CONFIG_ARCH_BOARD=c5471evm CONFIG_ARCH_BOARD_C5471EVM=y CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_ROM_VECTORS=n -CONFIG_DRAM_END=0x11000000 CONFIG_ARCH_LEDS=y CONFIG_ARCH_INTERRUPTSTACK=0 CONFIG_ARCH_STACKDUMP=y +CONFIG_DRAM_START=0 +CONFIG_DRAM_SIZE=0x11000000 + # # C5471 specific device driver settings # diff --git a/nuttx/configs/compal_e88/nsh_highram/defconfig b/nuttx/configs/compal_e88/nsh_highram/defconfig index 1e63f5a1dd..f8894c92a3 100644 --- a/nuttx/configs/compal_e88/nsh_highram/defconfig +++ b/nuttx/configs/compal_e88/nsh_highram/defconfig @@ -50,7 +50,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_ENDIAN_BIG - define if big endian (default is little endian) # CONFIG_ROM_VECTORS - unique to c5471 -# CONFIG_DRAM_END - the size of installed DRAM. # Unique to c5471 # CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to c5471. # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt @@ -68,11 +67,13 @@ CONFIG_ARCH_BOARD=compal_e88 CONFIG_ARCH_BOARD_COMPALE88=y CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_ROM_VECTORS=n -CONFIG_DRAM_END=0x00840000 CONFIG_ARCH_LEDS=n CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_STACKDUMP=y +CONFIG_DRAM_START=0 +CONFIG_DRAM_SIZE=0x00840000 + # # C5471 specific device driver settings # diff --git a/nuttx/configs/compal_e99/nsh_compalram/defconfig b/nuttx/configs/compal_e99/nsh_compalram/defconfig index f391e2a65e..cfac844722 100644 --- a/nuttx/configs/compal_e99/nsh_compalram/defconfig +++ b/nuttx/configs/compal_e99/nsh_compalram/defconfig @@ -50,7 +50,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_ENDIAN_BIG - define if big endian (default is little endian) # CONFIG_ROM_VECTORS - unique to c5471 -# CONFIG_DRAM_END - the size of installed DRAM. # Unique to c5471 # CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to c5471. # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt @@ -68,7 +67,6 @@ CONFIG_ARCH_BOARD=compal_e99 CONFIG_ARCH_BOARD_COMPALE99=y CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_ROM_VECTORS=n -CONFIG_DRAM_END=0x00840000 CONFIG_MM_REGIONS=2 CONFIG_HEAP2_START=0x01000000 CONFIG_HEAP2_END=0x01200000 @@ -76,6 +74,9 @@ CONFIG_ARCH_LEDS=n CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_STACKDUMP=y +CONFIG_DRAM_START=0 +CONFIG_DRAM_SIZE=0x00840000 + # # C5471 specific device driver settings # diff --git a/nuttx/configs/compal_e99/nsh_highram/defconfig b/nuttx/configs/compal_e99/nsh_highram/defconfig index f538cbb74b..ad1e47b026 100644 --- a/nuttx/configs/compal_e99/nsh_highram/defconfig +++ b/nuttx/configs/compal_e99/nsh_highram/defconfig @@ -50,7 +50,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_ENDIAN_BIG - define if big endian (default is little endian) # CONFIG_ROM_VECTORS - unique to c5471 -# CONFIG_DRAM_END - the size of installed DRAM. # Unique to c5471 # CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to c5471. # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt @@ -68,7 +67,6 @@ CONFIG_ARCH_BOARD=compal_e99 CONFIG_ARCH_BOARD_COMPALE99=y CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_ROM_VECTORS=n -CONFIG_DRAM_END=0x00840000 CONFIG_MM_REGIONS=2 CONFIG_HEAP2_START=0x01000000 CONFIG_HEAP2_END=0x01200000 @@ -76,6 +74,9 @@ CONFIG_ARCH_LEDS=n CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_STACKDUMP=y +CONFIG_DRAM_START=0 +CONFIG_DRAM_SIZE=0x00840000 + # # C5471 specific device driver settings # diff --git a/nuttx/configs/demo9s12ne64/README.txt b/nuttx/configs/demo9s12ne64/README.txt index 58fb44434a..0b8f776901 100755 --- a/nuttx/configs/demo9s12ne64/README.txt +++ b/nuttx/configs/demo9s12ne64/README.txt @@ -296,8 +296,6 @@ HCS12/DEMO9S12NEC64-specific Configuration Options CONFIG_DRAM_START - The start address of installed RAM - CONFIG_DRAM_END - Should be (CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that have LEDs diff --git a/nuttx/configs/demo9s12ne64/ostest/defconfig b/nuttx/configs/demo9s12ne64/ostest/defconfig index b12b56e66b..3ec27669ce 100755 --- a/nuttx/configs/demo9s12ne64/ostest/defconfig +++ b/nuttx/configs/demo9s12ne64/ostest/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed RAM. # CONFIG_DRAM_START - The start address of RAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_NOINTC - define if the architecture does not # support an interrupt controller or otherwise cannot support # APIs like up_enable_irq() and up_disable_irq(). @@ -82,7 +81,6 @@ CONFIG_ARCH_BOARD_DEMOS92S12NEC64=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_NOINTC=y CONFIG_ARCH_IRQPRIO=n CONFIG_ARCH_INTERRUPTSTACK=n diff --git a/nuttx/configs/eagle100/README.txt b/nuttx/configs/eagle100/README.txt index 7979ca16c5..28d51b518f 100644 --- a/nuttx/configs/eagle100/README.txt +++ b/nuttx/configs/eagle100/README.txt @@ -252,10 +252,6 @@ Eagle100-specific Configuration Options CONFIG_DRAM_START=0x20000000 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_IRQPRIO - The LM3S6918 supports interrupt prioritization CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/eagle100/httpd/defconfig b/nuttx/configs/eagle100/httpd/defconfig index 5c0b8b28a9..ec2db7d36e 100644 --- a/nuttx/configs/eagle100/httpd/defconfig +++ b/nuttx/configs/eagle100/httpd/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LM3S6918 supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -78,7 +77,6 @@ CONFIG_ARCH_BOARD_EAGLE100=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/eagle100/nettest/defconfig b/nuttx/configs/eagle100/nettest/defconfig index bd225e7af1..ebc5be23ab 100644 --- a/nuttx/configs/eagle100/nettest/defconfig +++ b/nuttx/configs/eagle100/nettest/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LM3S6918 supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -78,7 +77,6 @@ CONFIG_ARCH_BOARD_EAGLE100=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/eagle100/nsh/defconfig b/nuttx/configs/eagle100/nsh/defconfig index 7f97b19653..b99367e647 100644 --- a/nuttx/configs/eagle100/nsh/defconfig +++ b/nuttx/configs/eagle100/nsh/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LM3S6918 supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -78,7 +77,6 @@ CONFIG_ARCH_BOARD_EAGLE100=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/eagle100/nxflat/defconfig b/nuttx/configs/eagle100/nxflat/defconfig index 49221f4fab..db0557a52c 100644 --- a/nuttx/configs/eagle100/nxflat/defconfig +++ b/nuttx/configs/eagle100/nxflat/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LM3S6918 supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -78,7 +77,6 @@ CONFIG_ARCH_BOARD_EAGLE100=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/eagle100/ostest/defconfig b/nuttx/configs/eagle100/ostest/defconfig index 1aae6ce3ae..f4048f08bf 100644 --- a/nuttx/configs/eagle100/ostest/defconfig +++ b/nuttx/configs/eagle100/ostest/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LM3S6918 supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -78,7 +77,6 @@ CONFIG_ARCH_BOARD_EAGLE100=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/eagle100/thttpd/defconfig b/nuttx/configs/eagle100/thttpd/defconfig index 8241fa7bed..6ed845d699 100644 --- a/nuttx/configs/eagle100/thttpd/defconfig +++ b/nuttx/configs/eagle100/thttpd/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LM3S6918 supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -78,7 +77,6 @@ CONFIG_ARCH_BOARD_EAGLE100=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/ekk-lm3s9b96/README.txt b/nuttx/configs/ekk-lm3s9b96/README.txt index 9c4e1ba695..a6dcab87de 100644 --- a/nuttx/configs/ekk-lm3s9b96/README.txt +++ b/nuttx/configs/ekk-lm3s9b96/README.txt @@ -274,10 +274,6 @@ Stellaris EKK-LM3S9B96 Evaluation Kit Configuration Options CONFIG_DRAM_START=0x20000000 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_IRQPRIO - The LM3S6918 supports interrupt prioritization CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/ekk-lm3s9b96/nsh/defconfig b/nuttx/configs/ekk-lm3s9b96/nsh/defconfig index e7eacb2f91..382de7f2fe 100644 --- a/nuttx/configs/ekk-lm3s9b96/nsh/defconfig +++ b/nuttx/configs/ekk-lm3s9b96/nsh/defconfig @@ -52,7 +52,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LM3S6B96 supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -77,7 +76,6 @@ CONFIG_ARCH_BOARD_EKKLM3S9B96=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00018000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/ekk-lm3s9b96/ostest/defconfig b/nuttx/configs/ekk-lm3s9b96/ostest/defconfig index bb7d02647e..6cfedb59fd 100644 --- a/nuttx/configs/ekk-lm3s9b96/ostest/defconfig +++ b/nuttx/configs/ekk-lm3s9b96/ostest/defconfig @@ -52,7 +52,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LM3S6965 supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -77,7 +76,6 @@ CONFIG_ARCH_BOARD_EKKLM3S9B96=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00018000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/hymini-stm32v/README.txt b/nuttx/configs/hymini-stm32v/README.txt index 43a4127964..ddb62e84e6 100755 --- a/nuttx/configs/hymini-stm32v/README.txt +++ b/nuttx/configs/hymini-stm32v/README.txt @@ -319,10 +319,6 @@ HY-Mini specific Configuration Options CONFIG_DRAM_START=0x20000000 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_IRQPRIO - The STM32F103V supports interrupt prioritization CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/hymini-stm32v/buttons/defconfig b/nuttx/configs/hymini-stm32v/buttons/defconfig index 80099c1333..af9de4a125 100644 --- a/nuttx/configs/hymini-stm32v/buttons/defconfig +++ b/nuttx/configs/hymini-stm32v/buttons/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -80,7 +79,6 @@ CONFIG_ARCH_BOARD_HYMINI_STM32V=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x0000C000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/hymini-stm32v/nsh/defconfig b/nuttx/configs/hymini-stm32v/nsh/defconfig index e11f809d54..b8ad080fe5 100755 --- a/nuttx/configs/hymini-stm32v/nsh/defconfig +++ b/nuttx/configs/hymini-stm32v/nsh/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_HYMINI_STM32V=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x0000C000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/hymini-stm32v/nsh2/defconfig b/nuttx/configs/hymini-stm32v/nsh2/defconfig index fea9830fb2..0b0cbfda42 100644 --- a/nuttx/configs/hymini-stm32v/nsh2/defconfig +++ b/nuttx/configs/hymini-stm32v/nsh2/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_HYMINI_STM32V=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x0000C000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/hymini-stm32v/nx/defconfig b/nuttx/configs/hymini-stm32v/nx/defconfig index a53fbba415..f32afd1b91 100644 --- a/nuttx/configs/hymini-stm32v/nx/defconfig +++ b/nuttx/configs/hymini-stm32v/nx/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_HYMINI_STM32V=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x0000C000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/hymini-stm32v/nxlines/defconfig b/nuttx/configs/hymini-stm32v/nxlines/defconfig index 4d7533817f..1439b4d559 100644 --- a/nuttx/configs/hymini-stm32v/nxlines/defconfig +++ b/nuttx/configs/hymini-stm32v/nxlines/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -80,7 +79,6 @@ CONFIG_ARCH_BOARD_HYMINI_STM32V=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x0000C000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/hymini-stm32v/usbserial/defconfig b/nuttx/configs/hymini-stm32v/usbserial/defconfig index 37dcb860ce..c1abc15dc6 100755 --- a/nuttx/configs/hymini-stm32v/usbserial/defconfig +++ b/nuttx/configs/hymini-stm32v/usbserial/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -80,7 +79,6 @@ CONFIG_ARCH_BOARD_HYMINI_STM32V=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x0000C000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/hymini-stm32v/usbstorage/defconfig b/nuttx/configs/hymini-stm32v/usbstorage/defconfig index 4c52c48392..b783a1f6ae 100755 --- a/nuttx/configs/hymini-stm32v/usbstorage/defconfig +++ b/nuttx/configs/hymini-stm32v/usbstorage/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -80,7 +79,6 @@ CONFIG_ARCH_BOARD_HYMINI_STM32V=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x0000C000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/kwikstik-k40/README.txt b/nuttx/configs/kwikstik-k40/README.txt index 285b2e0999..ea6d9dee6b 100644 --- a/nuttx/configs/kwikstik-k40/README.txt +++ b/nuttx/configs/kwikstik-k40/README.txt @@ -337,10 +337,6 @@ KwikStik-K40-specific Configuration Options CONFIG_DRAM_START=0x20000000 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_IRQPRIO - The Kinetis K40 supports interrupt prioritization CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/kwikstik-k40/ostest/defconfig b/nuttx/configs/kwikstik-k40/ostest/defconfig index d5a077c42b..709a5585aa 100755 --- a/nuttx/configs/kwikstik-k40/ostest/defconfig +++ b/nuttx/configs/kwikstik-k40/ostest/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The K40X256VLQ100 supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_KWIKSTIK_K40=y CONFIG_BOARD_LOOPSPERMSEC=9535 CONFIG_DRAM_START=0x1fff8000 CONFIG_DRAM_SIZE= 0x00010000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/lincoln60/README.txt b/nuttx/configs/lincoln60/README.txt index 6ad37d363c..d94666d901 100644 --- a/nuttx/configs/lincoln60/README.txt +++ b/nuttx/configs/lincoln60/README.txt @@ -239,10 +239,6 @@ Lincoln 60 Configuration Options CONFIG_DRAM_START=0x10000000 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/lincoln60/nsh/defconfig b/nuttx/configs/lincoln60/nsh/defconfig index 1aec842782..4f3219e6d4 100644 --- a/nuttx/configs/lincoln60/nsh/defconfig +++ b/nuttx/configs/lincoln60/nsh/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_LINCOLN60=y CONFIG_BOARD_LOOPSPERMSEC=7982 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x10000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/lincoln60/ostest/defconfig b/nuttx/configs/lincoln60/ostest/defconfig index 6be405482e..b3087f3a72 100644 --- a/nuttx/configs/lincoln60/ostest/defconfig +++ b/nuttx/configs/lincoln60/ostest/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_LINCOLN60=y CONFIG_BOARD_LOOPSPERMSEC=8111 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x10000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/lm3s6432-s2e/README.txt b/nuttx/configs/lm3s6432-s2e/README.txt index 8cba45260b..a5b0b566b2 100644 --- a/nuttx/configs/lm3s6432-s2e/README.txt +++ b/nuttx/configs/lm3s6432-s2e/README.txt @@ -268,10 +268,6 @@ Stellaris MDL-S2E Reference Design Configuration Options CONFIG_DRAM_START=0x20000000 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_IRQPRIO - The LM3S6918 supports interrupt prioritization CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/lm3s6432-s2e/nsh/defconfig b/nuttx/configs/lm3s6432-s2e/nsh/defconfig index a8a39f2d11..b10e2a176f 100644 --- a/nuttx/configs/lm3s6432-s2e/nsh/defconfig +++ b/nuttx/configs/lm3s6432-s2e/nsh/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LM3S6432 supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -76,7 +75,6 @@ CONFIG_ARCH_BOARD_LM3S6432S2E=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00008000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/lm3s6432-s2e/ostest/defconfig b/nuttx/configs/lm3s6432-s2e/ostest/defconfig index 09d0ab1d2a..1e73dff550 100644 --- a/nuttx/configs/lm3s6432-s2e/ostest/defconfig +++ b/nuttx/configs/lm3s6432-s2e/ostest/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LM3S6432 supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -76,7 +75,6 @@ CONFIG_ARCH_BOARD_LM3S6432S2E=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00008000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/lm3s6965-ek/README.txt b/nuttx/configs/lm3s6965-ek/README.txt index 5f122d03a6..5b26b41c81 100755 --- a/nuttx/configs/lm3s6965-ek/README.txt +++ b/nuttx/configs/lm3s6965-ek/README.txt @@ -336,10 +336,6 @@ Stellaris LM3S6965 Evaluation Kit Configuration Options CONFIG_DRAM_START=0x20000000 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_IRQPRIO - The LM3S6918 supports interrupt prioritization CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/lm3s6965-ek/nsh/defconfig b/nuttx/configs/lm3s6965-ek/nsh/defconfig index 2621c81473..e84f1b137f 100755 --- a/nuttx/configs/lm3s6965-ek/nsh/defconfig +++ b/nuttx/configs/lm3s6965-ek/nsh/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LM3S6965 supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -76,7 +75,6 @@ CONFIG_ARCH_BOARD_LM3S6965EK=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/lm3s6965-ek/nx/defconfig b/nuttx/configs/lm3s6965-ek/nx/defconfig index c3dd32ee41..4152534462 100755 --- a/nuttx/configs/lm3s6965-ek/nx/defconfig +++ b/nuttx/configs/lm3s6965-ek/nx/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LM3S6965 supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -76,7 +75,6 @@ CONFIG_ARCH_BOARD_LM3S6965EK=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/lm3s6965-ek/ostest/defconfig b/nuttx/configs/lm3s6965-ek/ostest/defconfig index eac76216e0..6206284638 100755 --- a/nuttx/configs/lm3s6965-ek/ostest/defconfig +++ b/nuttx/configs/lm3s6965-ek/ostest/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LM3S6965 supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -76,7 +75,6 @@ CONFIG_ARCH_BOARD_LM3S6965EK=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/lm3s8962-ek/README.txt b/nuttx/configs/lm3s8962-ek/README.txt index 796f602341..c1e0b9fea4 100755 --- a/nuttx/configs/lm3s8962-ek/README.txt +++ b/nuttx/configs/lm3s8962-ek/README.txt @@ -320,10 +320,6 @@ Stellaris LM3S8962 Evaluation Kit Configuration Options CONFIG_DRAM_START=0x20000000 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_IRQPRIO - The LM3S6918 supports interrupt prioritization CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/lm3s8962-ek/nsh/defconfig b/nuttx/configs/lm3s8962-ek/nsh/defconfig index c1cb66690b..cab96f28e5 100755 --- a/nuttx/configs/lm3s8962-ek/nsh/defconfig +++ b/nuttx/configs/lm3s8962-ek/nsh/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LM3S8962 supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -76,7 +75,6 @@ CONFIG_ARCH_BOARD_LM3S8962EK=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/lm3s8962-ek/nx/defconfig b/nuttx/configs/lm3s8962-ek/nx/defconfig index 1fc5306dc7..8336207a8d 100755 --- a/nuttx/configs/lm3s8962-ek/nx/defconfig +++ b/nuttx/configs/lm3s8962-ek/nx/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LM3S8962 supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -76,7 +75,6 @@ CONFIG_ARCH_BOARD_LM3S8962EK=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/lm3s8962-ek/ostest/defconfig b/nuttx/configs/lm3s8962-ek/ostest/defconfig index 4fe57412cd..9baeaf7803 100755 --- a/nuttx/configs/lm3s8962-ek/ostest/defconfig +++ b/nuttx/configs/lm3s8962-ek/ostest/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LM3S8962 supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -76,7 +75,6 @@ CONFIG_ARCH_BOARD_LM3S8962EK=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/lpc4330-xplorer/README.txt b/nuttx/configs/lpc4330-xplorer/README.txt index 4cd867c32b..c9dd08ac5a 100644 --- a/nuttx/configs/lpc4330-xplorer/README.txt +++ b/nuttx/configs/lpc4330-xplorer/README.txt @@ -666,10 +666,6 @@ LPC4330-Xplorer Configuration Options CONFIG_DRAM_START=0x10000000 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_IRQPRIO - The LPC43xx supports interrupt prioritization CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/lpc4330-xplorer/nsh/defconfig b/nuttx/configs/lpc4330-xplorer/nsh/defconfig index d168a947a7..3fdb53ad45 100644 --- a/nuttx/configs/lpc4330-xplorer/nsh/defconfig +++ b/nuttx/configs/lpc4330-xplorer/nsh/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The Cortex-M4 supports interrupt prioritization # CONFIG_ARCH_FPU - The Cortex-M4 supports a floating point unit (FPU) # (But, unfortunately, most versions of GCC do not support it). @@ -84,7 +83,6 @@ CONFIG_ARCH_BOARD_LPC4330_XPLORER=y CONFIG_BOARD_LOOPSPERMSEC=18535 CONFIG_DRAM_SIZE=(72*1024) CONFIG_DRAM_START=0x10080000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_FPU=n CONFIG_ARCH_INTERRUPTSTACK=n diff --git a/nuttx/configs/lpc4330-xplorer/ostest/defconfig b/nuttx/configs/lpc4330-xplorer/ostest/defconfig index ddf27ee72f..40ceb025f2 100644 --- a/nuttx/configs/lpc4330-xplorer/ostest/defconfig +++ b/nuttx/configs/lpc4330-xplorer/ostest/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The Cortex-M4 supports interrupt prioritization # CONFIG_ARCH_FPU - The Cortex-M4 supports a floating point unit (FPU) # (But, unfortunately, most versions of GCC do not support it). @@ -84,7 +83,6 @@ CONFIG_ARCH_BOARD_LPC4330_XPLORER=y CONFIG_BOARD_LOOPSPERMSEC=18535 CONFIG_DRAM_SIZE=(72*1024) CONFIG_DRAM_START=0x10080000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_FPU=n CONFIG_ARCH_INTERRUPTSTACK=n diff --git a/nuttx/configs/lpcxpresso-lpc1768/README.txt b/nuttx/configs/lpcxpresso-lpc1768/README.txt index 5632d0e827..402d528816 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/README.txt +++ b/nuttx/configs/lpcxpresso-lpc1768/README.txt @@ -568,10 +568,6 @@ LPCXpresso Configuration Options CONFIG_DRAM_START=0x10000000 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig index ce4f45162f..564d7c7964 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig +++ b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_LPCXPRESSO=y CONFIG_BOARD_LOOPSPERMSEC=8079 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x10000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig b/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig index 18d1f5c73a..e1376f7bc7 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig +++ b/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_LPCXPRESSO=y CONFIG_BOARD_LOOPSPERMSEC=8079 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x10000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig b/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig index a9415d3db8..07851a6284 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig +++ b/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_LPCXPRESSO=y CONFIG_BOARD_LOOPSPERMSEC=8079 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x10000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig b/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig index 9dacfef1c6..027cdc0dbb 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig +++ b/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_LPCXPRESSO=y CONFIG_BOARD_LOOPSPERMSEC=8079 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x10000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig b/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig index 081310a2b2..76b0d97819 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig +++ b/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_LPCXPRESSO=y CONFIG_BOARD_LOOPSPERMSEC=8079 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x10000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig index 344dde798f..ffc2a276f0 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig +++ b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_LPCXPRESSO=y CONFIG_BOARD_LOOPSPERMSEC=8079 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x10000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/mbed/README.txt b/nuttx/configs/mbed/README.txt index 0b98d90853..b649230651 100755 --- a/nuttx/configs/mbed/README.txt +++ b/nuttx/configs/mbed/README.txt @@ -209,10 +209,6 @@ mbed Configuration Options CONFIG_DRAM_START=0x10000000 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/mbed/hidkbd/defconfig b/nuttx/configs/mbed/hidkbd/defconfig index db15a9d212..4b15b76ad7 100644 --- a/nuttx/configs/mbed/hidkbd/defconfig +++ b/nuttx/configs/mbed/hidkbd/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_MBED=y CONFIG_BOARD_LOOPSPERMSEC=7982 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x10000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/mbed/nsh/defconfig b/nuttx/configs/mbed/nsh/defconfig index 058606a09f..d0b8cf43c7 100755 --- a/nuttx/configs/mbed/nsh/defconfig +++ b/nuttx/configs/mbed/nsh/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_MBED=y CONFIG_BOARD_LOOPSPERMSEC=7982 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x10000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/mcu123-lpc214x/README.txt b/nuttx/configs/mcu123-lpc214x/README.txt index 35afa9ac82..7c760caa21 100644 --- a/nuttx/configs/mcu123-lpc214x/README.txt +++ b/nuttx/configs/mcu123-lpc214x/README.txt @@ -259,8 +259,6 @@ ARM/LPC214X-specific Configuration Options CONFIG_DRAM_START - The start address of installed RAM - CONFIG_DRAM_END - Should be (CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that have LEDs diff --git a/nuttx/configs/mcu123-lpc214x/composite/defconfig b/nuttx/configs/mcu123-lpc214x/composite/defconfig index 701d1e91f5..43da96fdf2 100644 --- a/nuttx/configs/mcu123-lpc214x/composite/defconfig +++ b/nuttx/configs/mcu123-lpc214x/composite/defconfig @@ -69,7 +69,6 @@ CONFIG_BOARD_LOOPSPERMSEC=3270 CONFIG_ARCH_LEDS=y CONFIG_DRAM_SIZE=0x00008000 CONFIG_DRAM_START=0x40000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/mcu123-lpc214x/nsh/defconfig b/nuttx/configs/mcu123-lpc214x/nsh/defconfig index 934825cb3d..3a7bfddb98 100644 --- a/nuttx/configs/mcu123-lpc214x/nsh/defconfig +++ b/nuttx/configs/mcu123-lpc214x/nsh/defconfig @@ -69,7 +69,6 @@ CONFIG_BOARD_LOOPSPERMSEC=3270 CONFIG_ARCH_LEDS=y CONFIG_DRAM_SIZE=0x00008000 CONFIG_DRAM_START=0x40000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_INTERRUPTSTACK=0 CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/mcu123-lpc214x/ostest/defconfig b/nuttx/configs/mcu123-lpc214x/ostest/defconfig index 8540617ee0..5a6107ce32 100644 --- a/nuttx/configs/mcu123-lpc214x/ostest/defconfig +++ b/nuttx/configs/mcu123-lpc214x/ostest/defconfig @@ -69,7 +69,6 @@ CONFIG_BOARD_LOOPSPERMSEC=3270 CONFIG_ARCH_LEDS=y CONFIG_DRAM_SIZE=0x00008000 CONFIG_DRAM_START=0x40000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_INTERRUPTSTACK=0 CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig index 84ee234b73..19063f108f 100644 --- a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig +++ b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig @@ -69,7 +69,6 @@ CONFIG_BOARD_LOOPSPERMSEC=3270 CONFIG_ARCH_LEDS=y CONFIG_DRAM_SIZE=0x00008000 CONFIG_DRAM_START=0x40000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig index ea968df7b3..f43eeda3fe 100644 --- a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig +++ b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig @@ -69,7 +69,6 @@ CONFIG_BOARD_LOOPSPERMSEC=3270 CONFIG_ARCH_LEDS=y CONFIG_DRAM_SIZE=0x00008000 CONFIG_DRAM_START=0x40000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/micropendous3/README.txt b/nuttx/configs/micropendous3/README.txt index 1a72edc288..e7b2041aa5 100644 --- a/nuttx/configs/micropendous3/README.txt +++ b/nuttx/configs/micropendous3/README.txt @@ -432,10 +432,6 @@ Micropendous3 Configuration Options CONFIG_DRAM_START=0x800100 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that have LEDs diff --git a/nuttx/configs/micropendous3/hello/defconfig b/nuttx/configs/micropendous3/hello/defconfig index 46d70f510e..2f7c9fa7d2 100644 --- a/nuttx/configs/micropendous3/hello/defconfig +++ b/nuttx/configs/micropendous3/hello/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_NOINTC - define if the architecture does not # support an interrupt controller or otherwise cannot support # APIs like up_enable_irq() and up_disable_irq(). @@ -82,7 +81,6 @@ CONFIG_ARCH_BOARD_MICROPENDOUS3=y CONFIG_BOARD_LOOPSPERMSEC=(8*108) CONFIG_DRAM_SIZE=(4*1024) CONFIG_DRAM_START=0x800100 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_NOINTC=y CONFIG_ARCH_IRQPRIO=n CONFIG_ARCH_INTERRUPTSTACK=n diff --git a/nuttx/configs/mirtoo/README.txt b/nuttx/configs/mirtoo/README.txt index 24f6314ef0..b2d0c5790d 100644 --- a/nuttx/configs/mirtoo/README.txt +++ b/nuttx/configs/mirtoo/README.txt @@ -698,10 +698,6 @@ PIC32MX Configuration Options CONFIG_DRAM_START=0xa0000000 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_IRQPRIO - The PIC32MXx supports interrupt prioritization CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/mirtoo/nsh/defconfig b/nuttx/configs/mirtoo/nsh/defconfig index 779398a20b..646375671b 100644 --- a/nuttx/configs/mirtoo/nsh/defconfig +++ b/nuttx/configs/mirtoo/nsh/defconfig @@ -52,7 +52,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_NOINTC - define if the architecture does not # support an interrupt controller or otherwise cannot support # APIs like up_enable_irq() and up_disable_irq(). @@ -92,7 +91,6 @@ CONFIG_ARCH_BOARD_MIRTOO=y CONFIG_BOARD_LOOPSPERMSEC=8079 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0xa0000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/mirtoo/nxffs/defconfig b/nuttx/configs/mirtoo/nxffs/defconfig index af8d0d0b0f..f208034757 100644 --- a/nuttx/configs/mirtoo/nxffs/defconfig +++ b/nuttx/configs/mirtoo/nxffs/defconfig @@ -52,7 +52,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_NOINTC - define if the architecture does not # support an interrupt controller or otherwise cannot support # APIs like up_enable_irq() and up_disable_irq(). @@ -92,7 +91,6 @@ CONFIG_ARCH_BOARD_MIRTOO=y CONFIG_BOARD_LOOPSPERMSEC=8079 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0xa0000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/mirtoo/ostest/defconfig b/nuttx/configs/mirtoo/ostest/defconfig index e76d81258b..bba530c831 100644 --- a/nuttx/configs/mirtoo/ostest/defconfig +++ b/nuttx/configs/mirtoo/ostest/defconfig @@ -52,7 +52,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_NOINTC - define if the architecture does not # support an interrupt controller or otherwise cannot support # APIs like up_enable_irq() and up_disable_irq(). @@ -92,7 +91,6 @@ CONFIG_ARCH_BOARD_MIRTOO=y CONFIG_BOARD_LOOPSPERMSEC=8079 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0xa0000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/ne64badge/README.txt b/nuttx/configs/ne64badge/README.txt index d1a5a904c1..48a19264e5 100755 --- a/nuttx/configs/ne64badge/README.txt +++ b/nuttx/configs/ne64badge/README.txt @@ -403,8 +403,6 @@ HCS12/NE64BADGE-specific Configuration Options CONFIG_DRAM_START - The start address of installed RAM - CONFIG_DRAM_END - Should be (CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that have LEDs diff --git a/nuttx/configs/ne64badge/ostest/defconfig b/nuttx/configs/ne64badge/ostest/defconfig index de6e00d85e..f420b3976d 100755 --- a/nuttx/configs/ne64badge/ostest/defconfig +++ b/nuttx/configs/ne64badge/ostest/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed RAM. # CONFIG_DRAM_START - The start address of RAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_NOINTC - define if the architecture does not # support an interrupt controller or otherwise cannot support # APIs like up_enable_irq() and up_disable_irq(). @@ -82,7 +81,6 @@ CONFIG_ARCH_BOARD_NE64BADGE=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_NOINTC=y CONFIG_ARCH_IRQPRIO=n CONFIG_ARCH_INTERRUPTSTACK=n diff --git a/nuttx/configs/nucleus2g/README.txt b/nuttx/configs/nucleus2g/README.txt index df4776301c..81bd2fe65d 100755 --- a/nuttx/configs/nucleus2g/README.txt +++ b/nuttx/configs/nucleus2g/README.txt @@ -321,10 +321,6 @@ Nucleus 2G Configuration Options CONFIG_DRAM_START=0x10000000 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/nucleus2g/nsh/defconfig b/nuttx/configs/nucleus2g/nsh/defconfig index 8001f0e87f..607eac73ca 100755 --- a/nuttx/configs/nucleus2g/nsh/defconfig +++ b/nuttx/configs/nucleus2g/nsh/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_NUCLEUS2G=y CONFIG_BOARD_LOOPSPERMSEC=7982 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x10000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/nucleus2g/ostest/defconfig b/nuttx/configs/nucleus2g/ostest/defconfig index b488dd8de5..3363ffbc1c 100755 --- a/nuttx/configs/nucleus2g/ostest/defconfig +++ b/nuttx/configs/nucleus2g/ostest/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_NUCLEUS2G=y CONFIG_BOARD_LOOPSPERMSEC=7982 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x10000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/nucleus2g/usbserial/defconfig b/nuttx/configs/nucleus2g/usbserial/defconfig index aa48558a46..01a8bd970d 100755 --- a/nuttx/configs/nucleus2g/usbserial/defconfig +++ b/nuttx/configs/nucleus2g/usbserial/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_NUCLEUS2G=y CONFIG_BOARD_LOOPSPERMSEC=7982 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x10000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/nucleus2g/usbstorage/defconfig b/nuttx/configs/nucleus2g/usbstorage/defconfig index de87daa053..bc29d45cc1 100755 --- a/nuttx/configs/nucleus2g/usbstorage/defconfig +++ b/nuttx/configs/nucleus2g/usbstorage/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_NUCLEUS2G=y CONFIG_BOARD_LOOPSPERMSEC=7982 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x10000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/olimex-lpc1766stk/README.txt b/nuttx/configs/olimex-lpc1766stk/README.txt index b81826e301..19cf66167e 100755 --- a/nuttx/configs/olimex-lpc1766stk/README.txt +++ b/nuttx/configs/olimex-lpc1766stk/README.txt @@ -617,10 +617,6 @@ Olimex LPC1766-STK Configuration Options CONFIG_DRAM_START=0x10000000 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig b/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig index 221fe83713..40c98ed970 100755 --- a/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_LPC1766STK=y CONFIG_BOARD_LOOPSPERMSEC=8111 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x10000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig b/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig index 6365a1720d..bc773c2d65 100755 --- a/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_LPC1766STK=y CONFIG_BOARD_LOOPSPERMSEC=8111 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x10000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/olimex-lpc1766stk/nettest/defconfig b/nuttx/configs/olimex-lpc1766stk/nettest/defconfig index 8c0b87b3ff..f7c971d9f2 100755 --- a/nuttx/configs/olimex-lpc1766stk/nettest/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/nettest/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_LPC1766STK=y CONFIG_BOARD_LOOPSPERMSEC=8111 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x10000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig index b234b77a1b..90b4af8cd2 100755 --- a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_LPC1766STK=y CONFIG_BOARD_LOOPSPERMSEC=8111 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x10000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/olimex-lpc1766stk/nx/defconfig b/nuttx/configs/olimex-lpc1766stk/nx/defconfig index 696ee655cf..5a5525c7f4 100755 --- a/nuttx/configs/olimex-lpc1766stk/nx/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/nx/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_LPC1766STK=y CONFIG_BOARD_LOOPSPERMSEC=8111 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x10000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/olimex-lpc1766stk/ostest/defconfig b/nuttx/configs/olimex-lpc1766stk/ostest/defconfig index 2628aa1fa2..c44d800e17 100755 --- a/nuttx/configs/olimex-lpc1766stk/ostest/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/ostest/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_LPC1766STK=y CONFIG_BOARD_LOOPSPERMSEC=8111 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x10000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig b/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig index 0a9bae2c80..dcde1987e2 100755 --- a/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_LPC1766STK=y CONFIG_BOARD_LOOPSPERMSEC=8111 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x10000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig b/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig index 82b4e8ebf6..eadb386299 100755 --- a/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_LPC1766STK=y CONFIG_BOARD_LOOPSPERMSEC=8111 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x10000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig b/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig index 2e2049cf83..5adb89207f 100755 --- a/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_LPC1766STK=y CONFIG_BOARD_LOOPSPERMSEC=8111 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x10000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig b/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig index 75b1612699..ac2a4a3844 100755 --- a/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_LPC1766STK=y CONFIG_BOARD_LOOPSPERMSEC=8111 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x10000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/olimex-lpc1766stk/wlan/defconfig b/nuttx/configs/olimex-lpc1766stk/wlan/defconfig index b8583e81db..d0f80b550a 100755 --- a/nuttx/configs/olimex-lpc1766stk/wlan/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/wlan/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_LPC1766STK=y CONFIG_BOARD_LOOPSPERMSEC=8111 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0x10000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/olimex-lpc2378/nsh/defconfig b/nuttx/configs/olimex-lpc2378/nsh/defconfig index fc9f29e295..b029dbc757 100755 --- a/nuttx/configs/olimex-lpc2378/nsh/defconfig +++ b/nuttx/configs/olimex-lpc2378/nsh/defconfig @@ -78,7 +78,6 @@ CONFIG_BOARD_LOOPSPERMSEC=3270 CONFIG_ARCH_LEDS=y CONFIG_DRAM_SIZE=0x00008000 CONFIG_DRAM_START=0x40000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_INTERRUPTSTACK= CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/olimex-lpc2378/ostest/defconfig b/nuttx/configs/olimex-lpc2378/ostest/defconfig index c83e92a681..f971212b5a 100755 --- a/nuttx/configs/olimex-lpc2378/ostest/defconfig +++ b/nuttx/configs/olimex-lpc2378/ostest/defconfig @@ -78,7 +78,6 @@ CONFIG_BOARD_LOOPSPERMSEC=3270 CONFIG_ARCH_LEDS=y CONFIG_DRAM_SIZE=0x00008000 CONFIG_DRAM_START=0x40000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_INTERRUPTSTACK= CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/olimex-strp711/nettest/defconfig b/nuttx/configs/olimex-strp711/nettest/defconfig index f740b18aed..6af2cb17ad 100755 --- a/nuttx/configs/olimex-strp711/nettest/defconfig +++ b/nuttx/configs/olimex-strp711/nettest/defconfig @@ -79,7 +79,6 @@ CONFIG_ARCH_LEDS=y CONFIG_ARCH_BUTTONS=y CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_INTERRUPTSTACK=0 CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/olimex-strp711/nsh/defconfig b/nuttx/configs/olimex-strp711/nsh/defconfig index c279dd75b7..85b4c503af 100644 --- a/nuttx/configs/olimex-strp711/nsh/defconfig +++ b/nuttx/configs/olimex-strp711/nsh/defconfig @@ -79,7 +79,6 @@ CONFIG_ARCH_LEDS=y CONFIG_ARCH_BUTTONS=y CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_INTERRUPTSTACK=0 CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/olimex-strp711/ostest/defconfig b/nuttx/configs/olimex-strp711/ostest/defconfig index 412c69367e..250a68ad2f 100644 --- a/nuttx/configs/olimex-strp711/ostest/defconfig +++ b/nuttx/configs/olimex-strp711/ostest/defconfig @@ -79,7 +79,6 @@ CONFIG_ARCH_LEDS=y CONFIG_ARCH_BUTTONS=y CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_INTERRUPTSTACK=0 CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/pcblogic-pic32mx/README.txt b/nuttx/configs/pcblogic-pic32mx/README.txt index 37836bc588..c15bd45a0e 100644 --- a/nuttx/configs/pcblogic-pic32mx/README.txt +++ b/nuttx/configs/pcblogic-pic32mx/README.txt @@ -384,10 +384,6 @@ PIC32MX Configuration Options CONFIG_DRAM_START=0xa0000000 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_IRQPRIO - The PIC32MXx supports interrupt prioritization CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/pcblogic-pic32mx/nsh/defconfig b/nuttx/configs/pcblogic-pic32mx/nsh/defconfig index 5386fac86d..e5f0a29096 100644 --- a/nuttx/configs/pcblogic-pic32mx/nsh/defconfig +++ b/nuttx/configs/pcblogic-pic32mx/nsh/defconfig @@ -52,7 +52,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_NOINTC - define if the architecture does not # support an interrupt controller or otherwise cannot support # APIs like up_enable_irq() and up_disable_irq(). @@ -92,7 +91,6 @@ CONFIG_ARCH_BOARD_PCBLOGICPIC32MX=y CONFIG_BOARD_LOOPSPERMSEC=8079 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0xa0000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/pcblogic-pic32mx/ostest/defconfig b/nuttx/configs/pcblogic-pic32mx/ostest/defconfig index 89f88bae87..802ab48ccf 100644 --- a/nuttx/configs/pcblogic-pic32mx/ostest/defconfig +++ b/nuttx/configs/pcblogic-pic32mx/ostest/defconfig @@ -52,7 +52,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_NOINTC - define if the architecture does not # support an interrupt controller or otherwise cannot support # APIs like up_enable_irq() and up_disable_irq(). @@ -92,7 +91,6 @@ CONFIG_ARCH_BOARD_PCBLOGICPIC32MX=y CONFIG_BOARD_LOOPSPERMSEC=8079 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0xa0000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/pic32-starterkit/README.txt b/nuttx/configs/pic32-starterkit/README.txt index e8c62bf0f0..31d84798c0 100644 --- a/nuttx/configs/pic32-starterkit/README.txt +++ b/nuttx/configs/pic32-starterkit/README.txt @@ -831,10 +831,6 @@ PIC32MX Configuration Options CONFIG_DRAM_START=0xa0000000 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_IRQPRIO - The PIC32MXx supports interrupt prioritization CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/pic32-starterkit/nsh/defconfig b/nuttx/configs/pic32-starterkit/nsh/defconfig index 6eb4f4cc6b..bdfeb770d9 100644 --- a/nuttx/configs/pic32-starterkit/nsh/defconfig +++ b/nuttx/configs/pic32-starterkit/nsh/defconfig @@ -54,7 +54,6 @@ # the delay actually is 100 seconds. # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_NOINTC - define if the architecture does not # support an interrupt controller or otherwise cannot support # APIs like up_enable_irq() and up_disable_irq(). @@ -91,7 +90,6 @@ CONFIG_ARCH_BOARD_PIC32_STARTERKIT=y CONFIG_BOARD_LOOPSPERMSEC=7245 CONFIG_DRAM_SIZE=(128*1024) CONFIG_DRAM_START=0xa0000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/pic32-starterkit/nsh2/defconfig b/nuttx/configs/pic32-starterkit/nsh2/defconfig index 2af37faf9e..f3e754b7e4 100644 --- a/nuttx/configs/pic32-starterkit/nsh2/defconfig +++ b/nuttx/configs/pic32-starterkit/nsh2/defconfig @@ -54,7 +54,6 @@ # the delay actually is 100 seconds. # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_NOINTC - define if the architecture does not # support an interrupt controller or otherwise cannot support # APIs like up_enable_irq() and up_disable_irq(). @@ -91,7 +90,6 @@ CONFIG_ARCH_BOARD_PIC32_STARTERKIT=y CONFIG_BOARD_LOOPSPERMSEC=7245 CONFIG_DRAM_SIZE=(128*1024) CONFIG_DRAM_START=0xa0000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/pic32-starterkit/ostest/defconfig b/nuttx/configs/pic32-starterkit/ostest/defconfig index a8bb1af9fb..4f5c9d005a 100644 --- a/nuttx/configs/pic32-starterkit/ostest/defconfig +++ b/nuttx/configs/pic32-starterkit/ostest/defconfig @@ -54,7 +54,6 @@ # the delay actually is 100 seconds. # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_NOINTC - define if the architecture does not # support an interrupt controller or otherwise cannot support # APIs like up_enable_irq() and up_disable_irq(). @@ -91,7 +90,6 @@ CONFIG_ARCH_BOARD_PIC32_STARTERKIT=y CONFIG_BOARD_LOOPSPERMSEC=7245 CONFIG_DRAM_SIZE=(128*1024) CONFIG_DRAM_START=0xa0000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/pic32mx7mmb/README.txt b/nuttx/configs/pic32mx7mmb/README.txt index 5c079d2046..adf83e2f4d 100644 --- a/nuttx/configs/pic32mx7mmb/README.txt +++ b/nuttx/configs/pic32mx7mmb/README.txt @@ -409,10 +409,6 @@ PIC32MX Configuration Options CONFIG_DRAM_START=0xa0000000 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_IRQPRIO - The PIC32MXx supports interrupt prioritization CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/pic32mx7mmb/nsh/defconfig b/nuttx/configs/pic32mx7mmb/nsh/defconfig index a9d2370079..412e0a2dff 100644 --- a/nuttx/configs/pic32mx7mmb/nsh/defconfig +++ b/nuttx/configs/pic32mx7mmb/nsh/defconfig @@ -54,7 +54,6 @@ # the delay actually is 100 seconds. # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_NOINTC - define if the architecture does not # support an interrupt controller or otherwise cannot support # APIs like up_enable_irq() and up_disable_irq(). @@ -91,7 +90,6 @@ CONFIG_ARCH_BOARD_PIC32MX7MMB=y CONFIG_BOARD_LOOPSPERMSEC=7245 CONFIG_DRAM_SIZE=(128*1024) CONFIG_DRAM_START=0xa0000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/pic32mx7mmb/ostest/defconfig b/nuttx/configs/pic32mx7mmb/ostest/defconfig index fd897e34d3..691dbab8e8 100644 --- a/nuttx/configs/pic32mx7mmb/ostest/defconfig +++ b/nuttx/configs/pic32mx7mmb/ostest/defconfig @@ -54,7 +54,6 @@ # the delay actually is 100 seconds. # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_NOINTC - define if the architecture does not # support an interrupt controller or otherwise cannot support # APIs like up_enable_irq() and up_disable_irq(). @@ -91,7 +90,6 @@ CONFIG_ARCH_BOARD_PIC32MX7MMB=y CONFIG_BOARD_LOOPSPERMSEC=7245 CONFIG_DRAM_SIZE=(128*1024) CONFIG_DRAM_START=0xa0000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/qemu-i486/nsh/defconfig b/nuttx/configs/qemu-i486/nsh/defconfig index 03d0351da6..9b9f1a3f26 100644 --- a/nuttx/configs/qemu-i486/nsh/defconfig +++ b/nuttx/configs/qemu-i486/nsh/defconfig @@ -48,7 +48,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_NOINTC - define if the architecture does not # support an interrupt controller or otherwise cannot support # APIs like up_enable_irq() and up_disable_irq(). @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_QEMU_I486=y CONFIG_BOARD_LOOPSPERMSEC=999 CONFIG_DRAM_SIZE=0x00100000 CONFIG_DRAM_START=0x00100000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_NOINTC=n CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_LEDS=n diff --git a/nuttx/configs/qemu-i486/ostest/defconfig b/nuttx/configs/qemu-i486/ostest/defconfig index d5c1cc494c..3bdef6c958 100644 --- a/nuttx/configs/qemu-i486/ostest/defconfig +++ b/nuttx/configs/qemu-i486/ostest/defconfig @@ -48,7 +48,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_NOINTC - define if the architecture does not # support an interrupt controller or otherwise cannot support # APIs like up_enable_irq() and up_disable_irq(). @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_QEMU_I486=y CONFIG_BOARD_LOOPSPERMSEC=999 CONFIG_DRAM_SIZE=0x00100000 CONFIG_DRAM_START=0x00100000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_NOINTC=n CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_LEDS=n diff --git a/nuttx/configs/sam3u-ek/README.txt b/nuttx/configs/sam3u-ek/README.txt index 510d2f1e65..cb0b82c8f7 100755 --- a/nuttx/configs/sam3u-ek/README.txt +++ b/nuttx/configs/sam3u-ek/README.txt @@ -233,10 +233,6 @@ SAM3U-EK-specific Configuration Options CONFIG_DRAM_START=0x20000000 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_IRQPRIO - The SAM3UF103Z supports interrupt prioritization CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/sam3u-ek/knsh/defconfig b/nuttx/configs/sam3u-ek/knsh/defconfig index ebb40af675..766eada4aa 100755 --- a/nuttx/configs/sam3u-ek/knsh/defconfig +++ b/nuttx/configs/sam3u-ek/knsh/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_SAM3UEK=y CONFIG_BOARD_LOOPSPERMSEC=4768 CONFIG_DRAM_SIZE=0x00008000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/sam3u-ek/nsh/defconfig b/nuttx/configs/sam3u-ek/nsh/defconfig index 487c24c647..05c9f5ddd2 100755 --- a/nuttx/configs/sam3u-ek/nsh/defconfig +++ b/nuttx/configs/sam3u-ek/nsh/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_SAM3UEK=y CONFIG_BOARD_LOOPSPERMSEC=4768 CONFIG_DRAM_SIZE=0x00008000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/sam3u-ek/nx/defconfig b/nuttx/configs/sam3u-ek/nx/defconfig index 0be6c00032..7d799b9ff5 100755 --- a/nuttx/configs/sam3u-ek/nx/defconfig +++ b/nuttx/configs/sam3u-ek/nx/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_SAM3UEK=y CONFIG_BOARD_LOOPSPERMSEC=4768 CONFIG_DRAM_SIZE=0x00008000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/sam3u-ek/ostest/defconfig b/nuttx/configs/sam3u-ek/ostest/defconfig index 5fe5d065a0..832c96163f 100755 --- a/nuttx/configs/sam3u-ek/ostest/defconfig +++ b/nuttx/configs/sam3u-ek/ostest/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_SAM3UEK=y CONFIG_BOARD_LOOPSPERMSEC=4768 CONFIG_DRAM_SIZE=0x00008000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/sam3u-ek/touchscreen/defconfig b/nuttx/configs/sam3u-ek/touchscreen/defconfig index 30e5ed6e81..7e56a949ea 100755 --- a/nuttx/configs/sam3u-ek/touchscreen/defconfig +++ b/nuttx/configs/sam3u-ek/touchscreen/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_SAM3UEK=y CONFIG_BOARD_LOOPSPERMSEC=4768 CONFIG_DRAM_SIZE=0x00008000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/skp16c26/ostest/defconfig b/nuttx/configs/skp16c26/ostest/defconfig index 6ab7318e65..f9fccf4bfe 100644 --- a/nuttx/configs/skp16c26/ostest/defconfig +++ b/nuttx/configs/skp16c26/ostest/defconfig @@ -53,7 +53,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the internal SRAM. # CONFIG_DRAM_START - The start address of internal SRAM -# CONFIG_DRAM_END - The end+1 address of internal SRAM # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt # stack in bytes. If not defined, the user task stacks will be @@ -73,7 +72,6 @@ CONFIG_ARCH_NOINTC=y CONFIG_ENDIAN_BIG=y CONFIG_DRAM_SIZE=0x00800 CONFIG_DRAM_START=0x00400 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_BOARD_LOOPSPERMSEC=16945 CONFIG_ARCH_INTERRUPTSTACK=128 CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/stm3210e-eval/README.txt b/nuttx/configs/stm3210e-eval/README.txt index 975e85ceda..0d292565eb 100755 --- a/nuttx/configs/stm3210e-eval/README.txt +++ b/nuttx/configs/stm3210e-eval/README.txt @@ -419,10 +419,6 @@ STM3210E-EVAL-specific Configuration Options CONFIG_DRAM_START=0x20000000 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_IRQPRIO - The STM32F103Z supports interrupt prioritization CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/stm3210e-eval/RIDE/defconfig b/nuttx/configs/stm3210e-eval/RIDE/defconfig index 0def352a8a..b7d628b502 100755 --- a/nuttx/configs/stm3210e-eval/RIDE/defconfig +++ b/nuttx/configs/stm3210e-eval/RIDE/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/stm3210e-eval/buttons/defconfig b/nuttx/configs/stm3210e-eval/buttons/defconfig index bcae6fccca..e1ea2cfc04 100644 --- a/nuttx/configs/stm3210e-eval/buttons/defconfig +++ b/nuttx/configs/stm3210e-eval/buttons/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -80,7 +79,6 @@ CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/stm3210e-eval/composite/defconfig b/nuttx/configs/stm3210e-eval/composite/defconfig index 3c7e83f145..62d9eb07f2 100755 --- a/nuttx/configs/stm3210e-eval/composite/defconfig +++ b/nuttx/configs/stm3210e-eval/composite/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/stm3210e-eval/nsh/defconfig b/nuttx/configs/stm3210e-eval/nsh/defconfig index 982ab281e8..c4245b133f 100755 --- a/nuttx/configs/stm3210e-eval/nsh/defconfig +++ b/nuttx/configs/stm3210e-eval/nsh/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/stm3210e-eval/nsh2/defconfig b/nuttx/configs/stm3210e-eval/nsh2/defconfig index ebe8fc5be5..22afd76f91 100644 --- a/nuttx/configs/stm3210e-eval/nsh2/defconfig +++ b/nuttx/configs/stm3210e-eval/nsh2/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/stm3210e-eval/nx/defconfig b/nuttx/configs/stm3210e-eval/nx/defconfig index 5488ae8910..a3514b096a 100644 --- a/nuttx/configs/stm3210e-eval/nx/defconfig +++ b/nuttx/configs/stm3210e-eval/nx/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/stm3210e-eval/nxconsole/defconfig b/nuttx/configs/stm3210e-eval/nxconsole/defconfig index a84fc81344..261e09bb9e 100644 --- a/nuttx/configs/stm3210e-eval/nxconsole/defconfig +++ b/nuttx/configs/stm3210e-eval/nxconsole/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/stm3210e-eval/nxlines/defconfig b/nuttx/configs/stm3210e-eval/nxlines/defconfig index b1e4f960a8..8e4ee57e73 100644 --- a/nuttx/configs/stm3210e-eval/nxlines/defconfig +++ b/nuttx/configs/stm3210e-eval/nxlines/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/stm3210e-eval/nxtext/defconfig b/nuttx/configs/stm3210e-eval/nxtext/defconfig index 097287fb47..b90364ec80 100644 --- a/nuttx/configs/stm3210e-eval/nxtext/defconfig +++ b/nuttx/configs/stm3210e-eval/nxtext/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/stm3210e-eval/ostest/defconfig b/nuttx/configs/stm3210e-eval/ostest/defconfig index f70ba0a81b..9238a59a9c 100755 --- a/nuttx/configs/stm3210e-eval/ostest/defconfig +++ b/nuttx/configs/stm3210e-eval/ostest/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/stm3210e-eval/pm/defconfig b/nuttx/configs/stm3210e-eval/pm/defconfig index 2e135dbefe..f2b47598b4 100644 --- a/nuttx/configs/stm3210e-eval/pm/defconfig +++ b/nuttx/configs/stm3210e-eval/pm/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/stm3210e-eval/usbserial/defconfig b/nuttx/configs/stm3210e-eval/usbserial/defconfig index e0c17d7f7d..28af3b1caf 100755 --- a/nuttx/configs/stm3210e-eval/usbserial/defconfig +++ b/nuttx/configs/stm3210e-eval/usbserial/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/stm3210e-eval/usbstorage/defconfig b/nuttx/configs/stm3210e-eval/usbstorage/defconfig index aef6d11c2f..0109f2da40 100755 --- a/nuttx/configs/stm3210e-eval/usbstorage/defconfig +++ b/nuttx/configs/stm3210e-eval/usbstorage/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/stm3220g-eval/README.txt b/nuttx/configs/stm3220g-eval/README.txt index a064503f1d..43d9b382e2 100644 --- a/nuttx/configs/stm3220g-eval/README.txt +++ b/nuttx/configs/stm3220g-eval/README.txt @@ -468,10 +468,6 @@ STM3220G-EVAL-specific Configuration Options CONFIG_DRAM_START=0x20000000 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - In addition to internal SRAM, SRAM may also be available through the FSMC. In order to use FSMC SRAM, the following additional things need to be present in the NuttX configuration file: diff --git a/nuttx/configs/stm3220g-eval/dhcpd/defconfig b/nuttx/configs/stm3220g-eval/dhcpd/defconfig index e01d3cf91d..c71d7cfede 100644 --- a/nuttx/configs/stm3220g-eval/dhcpd/defconfig +++ b/nuttx/configs/stm3220g-eval/dhcpd/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The STM3220xxx supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_STM3220G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/stm3220g-eval/nettest/defconfig b/nuttx/configs/stm3220g-eval/nettest/defconfig index 3be35afa4f..56a205e4b0 100644 --- a/nuttx/configs/stm3220g-eval/nettest/defconfig +++ b/nuttx/configs/stm3220g-eval/nettest/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The STM3220xxx supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_STM3220G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/stm3220g-eval/nsh/defconfig b/nuttx/configs/stm3220g-eval/nsh/defconfig index 09462fc564..a0f7a64be2 100644 --- a/nuttx/configs/stm3220g-eval/nsh/defconfig +++ b/nuttx/configs/stm3220g-eval/nsh/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The STM3220xxx supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_STM3220G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/stm3220g-eval/nsh2/defconfig b/nuttx/configs/stm3220g-eval/nsh2/defconfig index 8a9dbf07fa..08f0b0f265 100644 --- a/nuttx/configs/stm3220g-eval/nsh2/defconfig +++ b/nuttx/configs/stm3220g-eval/nsh2/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The STM3220xxx supports interrupt prioritization # (But, unfortunately, GCC does not support it). # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt @@ -80,7 +79,6 @@ CONFIG_ARCH_BOARD_STM3220G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/stm3220g-eval/nxwm/defconfig b/nuttx/configs/stm3220g-eval/nxwm/defconfig index bf5569a9c8..d49b8c7658 100644 --- a/nuttx/configs/stm3220g-eval/nxwm/defconfig +++ b/nuttx/configs/stm3220g-eval/nxwm/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The STM3220xxx supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_STM3220G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/stm3220g-eval/ostest/defconfig b/nuttx/configs/stm3220g-eval/ostest/defconfig index 663efded4b..8eb5e5ec11 100644 --- a/nuttx/configs/stm3220g-eval/ostest/defconfig +++ b/nuttx/configs/stm3220g-eval/ostest/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The STM3220xxx supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_STM3220G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/stm3220g-eval/telnetd/defconfig b/nuttx/configs/stm3220g-eval/telnetd/defconfig index f9d588ad12..f96f6d76a8 100644 --- a/nuttx/configs/stm3220g-eval/telnetd/defconfig +++ b/nuttx/configs/stm3220g-eval/telnetd/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The STM3220xxx supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_STM3220G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/stm3240g-eval/README.txt b/nuttx/configs/stm3240g-eval/README.txt index 59d12a8848..49e939a238 100755 --- a/nuttx/configs/stm3240g-eval/README.txt +++ b/nuttx/configs/stm3240g-eval/README.txt @@ -582,10 +582,6 @@ STM3240G-EVAL-specific Configuration Options CONFIG_DRAM_START=0x20000000 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_STM32_CCMEXCLUDE - Exclude CCM SRAM from the HEAP In addition to internal SRAM, SRAM may also be available through the FSMC. diff --git a/nuttx/configs/stm3240g-eval/dhcpd/defconfig b/nuttx/configs/stm3240g-eval/dhcpd/defconfig index 81d1321433..a4c26bc4db 100644 --- a/nuttx/configs/stm3240g-eval/dhcpd/defconfig +++ b/nuttx/configs/stm3240g-eval/dhcpd/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The STM3240xxx supports interrupt prioritization # CONFIG_ARCH_FPU - The STM3240xxx supports a floating point unit (FPU) # (But, unfortunately, GCC does not support it). @@ -81,7 +80,6 @@ CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_FPU=n CONFIG_ARCH_INTERRUPTSTACK=n diff --git a/nuttx/configs/stm3240g-eval/nettest/defconfig b/nuttx/configs/stm3240g-eval/nettest/defconfig index 76f39275fe..d3b2af33a8 100644 --- a/nuttx/configs/stm3240g-eval/nettest/defconfig +++ b/nuttx/configs/stm3240g-eval/nettest/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The STM3240xxx supports interrupt prioritization # CONFIG_ARCH_FPU - The STM3240xxx supports a floating point unit (FPU) # (But, unfortunately, GCC does not support it). @@ -81,7 +80,6 @@ CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_FPU=n CONFIG_ARCH_INTERRUPTSTACK=n diff --git a/nuttx/configs/stm3240g-eval/nsh/defconfig b/nuttx/configs/stm3240g-eval/nsh/defconfig index 16c6258f38..2f4c323271 100644 --- a/nuttx/configs/stm3240g-eval/nsh/defconfig +++ b/nuttx/configs/stm3240g-eval/nsh/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The STM3240xxx supports interrupt prioritization # CONFIG_ARCH_FPU - The STM3240xxx supports a floating point unit (FPU) # (But, unfortunately, GCC does not support it). @@ -81,7 +80,6 @@ CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_FPU=n CONFIG_ARCH_INTERRUPTSTACK=n diff --git a/nuttx/configs/stm3240g-eval/nsh2/defconfig b/nuttx/configs/stm3240g-eval/nsh2/defconfig index 9a35fd75fe..c4b9df773a 100644 --- a/nuttx/configs/stm3240g-eval/nsh2/defconfig +++ b/nuttx/configs/stm3240g-eval/nsh2/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The STM3240xxx supports interrupt prioritization # CONFIG_ARCH_FPU - The STM3240xxx supports a floating point unit (FPU) # (But, unfortunately, GCC does not support it). @@ -81,7 +80,6 @@ CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_FPU=n CONFIG_ARCH_INTERRUPTSTACK=n diff --git a/nuttx/configs/stm3240g-eval/nxconsole/defconfig b/nuttx/configs/stm3240g-eval/nxconsole/defconfig index 57e6a19e5c..3c9f15e2d4 100644 --- a/nuttx/configs/stm3240g-eval/nxconsole/defconfig +++ b/nuttx/configs/stm3240g-eval/nxconsole/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The STM3240xxx supports interrupt prioritization # CONFIG_ARCH_FPU - The STM3240xxx supports a floating point unit (FPU) # (But, unfortunately, GCC does not support it). @@ -81,7 +80,6 @@ CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_FPU=n CONFIG_ARCH_INTERRUPTSTACK=n diff --git a/nuttx/configs/stm3240g-eval/nxwm/defconfig b/nuttx/configs/stm3240g-eval/nxwm/defconfig index ff44fa2852..3816279704 100644 --- a/nuttx/configs/stm3240g-eval/nxwm/defconfig +++ b/nuttx/configs/stm3240g-eval/nxwm/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The STM3240xxx supports interrupt prioritization # CONFIG_ARCH_FPU - The STM3240xxx supports a floating point unit (FPU) # (But, unfortunately, GCC does not support it). @@ -81,7 +80,6 @@ CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_FPU=n CONFIG_ARCH_INTERRUPTSTACK=n diff --git a/nuttx/configs/stm3240g-eval/ostest/defconfig b/nuttx/configs/stm3240g-eval/ostest/defconfig index 98e3aa3183..bfe63c1365 100644 --- a/nuttx/configs/stm3240g-eval/ostest/defconfig +++ b/nuttx/configs/stm3240g-eval/ostest/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The STM3240xxx supports interrupt prioritization # CONFIG_ARCH_FPU - The STM3240xxx supports a floating point unit (FPU) # (But, unfortunately, GCC does not support it). @@ -81,7 +80,6 @@ CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_FPU=n CONFIG_ARCH_INTERRUPTSTACK=n diff --git a/nuttx/configs/stm3240g-eval/telnetd/defconfig b/nuttx/configs/stm3240g-eval/telnetd/defconfig index f75fb46397..3ca3dd87c1 100644 --- a/nuttx/configs/stm3240g-eval/telnetd/defconfig +++ b/nuttx/configs/stm3240g-eval/telnetd/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The STM3240xxx supports interrupt prioritization # CONFIG_ARCH_FPU - The STM3240xxx supports a floating point unit (FPU) # (But, unfortunately, GCC does not support it). @@ -81,7 +80,6 @@ CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_FPU=n CONFIG_ARCH_INTERRUPTSTACK=n diff --git a/nuttx/configs/stm32f4discovery/README.txt b/nuttx/configs/stm32f4discovery/README.txt index 387a76431f..09a2bb2b00 100755 --- a/nuttx/configs/stm32f4discovery/README.txt +++ b/nuttx/configs/stm32f4discovery/README.txt @@ -695,10 +695,6 @@ STM32F4Discovery-specific Configuration Options CONFIG_DRAM_START=0x20000000 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_STM32_CCMEXCLUDE - Exclude CCM SRAM from the HEAP In addition to internal SRAM, SRAM may also be available through the FSMC. diff --git a/nuttx/configs/stm32f4discovery/nsh/defconfig b/nuttx/configs/stm32f4discovery/nsh/defconfig index 2280bbf9ab..4be8ea7918 100644 --- a/nuttx/configs/stm32f4discovery/nsh/defconfig +++ b/nuttx/configs/stm32f4discovery/nsh/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The STM32F4Discovery supports interrupt prioritization # CONFIG_ARCH_FPU - The STM32F4Discovery supports a floating point unit (FPU) # (But, unfortunately, GCC does not support it). @@ -81,7 +80,6 @@ CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_FPU=n CONFIG_ARCH_INTERRUPTSTACK=n diff --git a/nuttx/configs/stm32f4discovery/nxlines/defconfig b/nuttx/configs/stm32f4discovery/nxlines/defconfig index c5515c426c..28dd44adc1 100644 --- a/nuttx/configs/stm32f4discovery/nxlines/defconfig +++ b/nuttx/configs/stm32f4discovery/nxlines/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The STM32F4Discovery supports interrupt prioritization # CONFIG_ARCH_FPU - The STM32F4Discovery supports a floating point unit (FPU) # (But, unfortunately, GCC does not support it). @@ -81,7 +80,6 @@ CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_FPU=n CONFIG_ARCH_INTERRUPTSTACK=n diff --git a/nuttx/configs/stm32f4discovery/ostest/defconfig b/nuttx/configs/stm32f4discovery/ostest/defconfig index a984d26a17..066fb4017f 100644 --- a/nuttx/configs/stm32f4discovery/ostest/defconfig +++ b/nuttx/configs/stm32f4discovery/ostest/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The STM32F4Discovery supports interrupt prioritization # CONFIG_ARCH_FPU - The STM32F4Discovery supports a floating point unit (FPU) # (But, unfortunately, GCC does not support it). @@ -81,7 +80,6 @@ CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_FPU=n CONFIG_ARCH_INTERRUPTSTACK=n diff --git a/nuttx/configs/stm32f4discovery/pm/defconfig b/nuttx/configs/stm32f4discovery/pm/defconfig index 49ced00068..136c5c1f2d 100644 --- a/nuttx/configs/stm32f4discovery/pm/defconfig +++ b/nuttx/configs/stm32f4discovery/pm/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The STM32F4Discovery supports interrupt prioritization # CONFIG_ARCH_FPU - The STM32F4Discovery supports a floating point unit (FPU) # (But, unfortunately, GCC does not support it). @@ -81,7 +80,6 @@ CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_FPU=n CONFIG_ARCH_INTERRUPTSTACK=n diff --git a/nuttx/configs/sure-pic32mx/README.txt b/nuttx/configs/sure-pic32mx/README.txt index bd206a2626..ad98356980 100644 --- a/nuttx/configs/sure-pic32mx/README.txt +++ b/nuttx/configs/sure-pic32mx/README.txt @@ -456,10 +456,6 @@ PIC32MX Configuration Options CONFIG_DRAM_START=0xa0000000 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_IRQPRIO - The PIC32MXx supports interrupt prioritization CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/sure-pic32mx/nsh/defconfig b/nuttx/configs/sure-pic32mx/nsh/defconfig index a49a1a4f52..926aac26b2 100644 --- a/nuttx/configs/sure-pic32mx/nsh/defconfig +++ b/nuttx/configs/sure-pic32mx/nsh/defconfig @@ -54,7 +54,6 @@ # the delay actually is 100 seconds. # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_NOINTC - define if the architecture does not # support an interrupt controller or otherwise cannot support # APIs like up_enable_irq() and up_disable_irq(). @@ -93,7 +92,6 @@ CONFIG_ARCH_DBDP11212=n CONFIG_BOARD_LOOPSPERMSEC=4275 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0xa0000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/sure-pic32mx/ostest/defconfig b/nuttx/configs/sure-pic32mx/ostest/defconfig index 960298699d..4ddbdbc9ac 100644 --- a/nuttx/configs/sure-pic32mx/ostest/defconfig +++ b/nuttx/configs/sure-pic32mx/ostest/defconfig @@ -54,7 +54,6 @@ # the delay actually is 100 seconds. # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_NOINTC - define if the architecture does not # support an interrupt controller or otherwise cannot support # APIs like up_enable_irq() and up_disable_irq(). @@ -93,7 +92,6 @@ CONFIG_ARCH_DBDP11212=n CONFIG_BOARD_LOOPSPERMSEC=4275 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0xa0000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/sure-pic32mx/usbnsh/defconfig b/nuttx/configs/sure-pic32mx/usbnsh/defconfig index 3a26c5ba23..7571bee37d 100644 --- a/nuttx/configs/sure-pic32mx/usbnsh/defconfig +++ b/nuttx/configs/sure-pic32mx/usbnsh/defconfig @@ -54,7 +54,6 @@ # the delay actually is 100 seconds. # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_NOINTC - define if the architecture does not # support an interrupt controller or otherwise cannot support # APIs like up_enable_irq() and up_disable_irq(). @@ -93,7 +92,6 @@ CONFIG_ARCH_DBDP11212=n CONFIG_BOARD_LOOPSPERMSEC=4275 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0xa0000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/teensy/README.txt b/nuttx/configs/teensy/README.txt index 14708ab415..979d8e0e78 100644 --- a/nuttx/configs/teensy/README.txt +++ b/nuttx/configs/teensy/README.txt @@ -429,10 +429,6 @@ Teensy++ Configuration Options CONFIG_DRAM_START=0x800100 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that have LEDs diff --git a/nuttx/configs/teensy/hello/defconfig b/nuttx/configs/teensy/hello/defconfig index 29e8a37c9b..dc5e58d650 100644 --- a/nuttx/configs/teensy/hello/defconfig +++ b/nuttx/configs/teensy/hello/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_NOINTC - define if the architecture does not # support an interrupt controller or otherwise cannot support # APIs like up_enable_irq() and up_disable_irq(). @@ -82,7 +81,6 @@ CONFIG_ARCH_BOARD_TEENSY=y CONFIG_BOARD_LOOPSPERMSEC=(8*108) CONFIG_DRAM_SIZE=(8*1024) CONFIG_DRAM_START=0x800100 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_NOINTC=y CONFIG_ARCH_IRQPRIO=n CONFIG_ARCH_INTERRUPTSTACK=n diff --git a/nuttx/configs/teensy/nsh/defconfig b/nuttx/configs/teensy/nsh/defconfig index 49ca067286..68c2c97f5e 100755 --- a/nuttx/configs/teensy/nsh/defconfig +++ b/nuttx/configs/teensy/nsh/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_NOINTC - define if the architecture does not # support an interrupt controller or otherwise cannot support # APIs like up_enable_irq() and up_disable_irq(). @@ -82,7 +81,6 @@ CONFIG_ARCH_BOARD_TEENSY=y CONFIG_BOARD_LOOPSPERMSEC=(8*108) CONFIG_DRAM_SIZE=(8*1024) CONFIG_DRAM_START=0x800100 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_NOINTC=y CONFIG_ARCH_IRQPRIO=n CONFIG_ARCH_INTERRUPTSTACK=n diff --git a/nuttx/configs/teensy/usbstorage/defconfig b/nuttx/configs/teensy/usbstorage/defconfig index 2ea9d51ab3..570c7f881b 100755 --- a/nuttx/configs/teensy/usbstorage/defconfig +++ b/nuttx/configs/teensy/usbstorage/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_NOINTC - define if the architecture does not # support an interrupt controller or otherwise cannot support # APIs like up_enable_irq() and up_disable_irq(). @@ -82,7 +81,6 @@ CONFIG_ARCH_BOARD_TEENSY=y CONFIG_BOARD_LOOPSPERMSEC=(8*108) CONFIG_DRAM_SIZE=(8*1024) CONFIG_DRAM_START=0x800100 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_NOINTC=y CONFIG_ARCH_IRQPRIO=n CONFIG_ARCH_INTERRUPTSTACK=n diff --git a/nuttx/configs/twr-k60n512/README.txt b/nuttx/configs/twr-k60n512/README.txt index 9ad7c18535..5cb273a398 100644 --- a/nuttx/configs/twr-k60n512/README.txt +++ b/nuttx/configs/twr-k60n512/README.txt @@ -474,10 +474,6 @@ TWR-K60N512-specific Configuration Options CONFIG_DRAM_START=0x20000000 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_IRQPRIO - The Kinetis K60 supports interrupt prioritization CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/twr-k60n512/nsh/defconfig b/nuttx/configs/twr-k60n512/nsh/defconfig index cf54ffc06d..84359b388b 100644 --- a/nuttx/configs/twr-k60n512/nsh/defconfig +++ b/nuttx/configs/twr-k60n512/nsh/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The K60X512VMD100 supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_TWR_K60N512=y CONFIG_BOARD_LOOPSPERMSEC=9535 CONFIG_DRAM_START=0x1fff0000 CONFIG_DRAM_SIZE=0x00020000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/twr-k60n512/ostest/defconfig b/nuttx/configs/twr-k60n512/ostest/defconfig index feba4c0a6e..e82877d529 100644 --- a/nuttx/configs/twr-k60n512/ostest/defconfig +++ b/nuttx/configs/twr-k60n512/ostest/defconfig @@ -51,7 +51,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The K60X512VMD100 supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -79,7 +78,6 @@ CONFIG_ARCH_BOARD_TWR_K60N512=y CONFIG_BOARD_LOOPSPERMSEC=9535 CONFIG_DRAM_START=0x1fff0000 CONFIG_DRAM_SIZE=0x00020000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/ubw32/README.txt b/nuttx/configs/ubw32/README.txt index a1652403bf..f8afb88e4f 100644 --- a/nuttx/configs/ubw32/README.txt +++ b/nuttx/configs/ubw32/README.txt @@ -429,10 +429,6 @@ PIC32MX Configuration Options CONFIG_DRAM_START=0xa0000000 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_IRQPRIO - The PIC32MXx supports interrupt prioritization CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/ubw32/nsh/defconfig b/nuttx/configs/ubw32/nsh/defconfig index 6025493289..3bd34a8de9 100644 --- a/nuttx/configs/ubw32/nsh/defconfig +++ b/nuttx/configs/ubw32/nsh/defconfig @@ -52,7 +52,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_NOINTC - define if the architecture does not # support an interrupt controller or otherwise cannot support # APIs like up_enable_irq() and up_disable_irq(). @@ -92,7 +91,6 @@ CONFIG_ARCH_BOARD_UBW32=y CONFIG_BOARD_LOOPSPERMSEC=8079 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0xa0000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/ubw32/ostest/defconfig b/nuttx/configs/ubw32/ostest/defconfig index 2aef9c3ec1..4f30de55d5 100644 --- a/nuttx/configs/ubw32/ostest/defconfig +++ b/nuttx/configs/ubw32/ostest/defconfig @@ -52,7 +52,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_NOINTC - define if the architecture does not # support an interrupt controller or otherwise cannot support # APIs like up_enable_irq() and up_disable_irq(). @@ -92,7 +91,6 @@ CONFIG_ARCH_BOARD_UBW32=y CONFIG_BOARD_LOOPSPERMSEC=8079 CONFIG_DRAM_SIZE=(32*1024) CONFIG_DRAM_START=0xa0000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/us7032evb1/nsh/defconfig b/nuttx/configs/us7032evb1/nsh/defconfig index 2ab2fe7870..75a97f5c76 100644 --- a/nuttx/configs/us7032evb1/nsh/defconfig +++ b/nuttx/configs/us7032evb1/nsh/defconfig @@ -78,7 +78,6 @@ CONFIG_ARCH_LEDS=y CONFIG_ARCH_BUTTONS=y CONFIG_DRAM_SIZE=0x0000e000 CONFIG_DRAM_START=0x0a002000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_INTERRUPTSTACK=0 CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/us7032evb1/ostest/defconfig b/nuttx/configs/us7032evb1/ostest/defconfig index 31bd8b214a..f1b8998072 100644 --- a/nuttx/configs/us7032evb1/ostest/defconfig +++ b/nuttx/configs/us7032evb1/ostest/defconfig @@ -78,7 +78,6 @@ CONFIG_ARCH_LEDS=y CONFIG_ARCH_BUTTONS=y CONFIG_DRAM_SIZE=0x0000e000 CONFIG_DRAM_START=0x0a002000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_INTERRUPTSTACK=0 CONFIG_ARCH_STACKDUMP=y diff --git a/nuttx/configs/vsn/README.txt b/nuttx/configs/vsn/README.txt index 1cbe359506..9a9209ebe1 100644 --- a/nuttx/configs/vsn/README.txt +++ b/nuttx/configs/vsn/README.txt @@ -214,10 +214,6 @@ VSN-specific Configuration Options CONFIG_DRAM_START=0x20000000 - CONFIG_DRAM_END - Last address+1 of installed RAM - - CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) - CONFIG_ARCH_IRQPRIO - The STM32F103Z supports interrupt prioritization CONFIG_ARCH_IRQPRIO=y diff --git a/nuttx/configs/vsn/nsh/defconfig b/nuttx/configs/vsn/nsh/defconfig index 36d6841554..0282d31e78 100755 --- a/nuttx/configs/vsn/nsh/defconfig +++ b/nuttx/configs/vsn/nsh/defconfig @@ -53,7 +53,6 @@ # CONFIG_BOARD_LOOPSPERMSEC - for delay loops # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_DRAM_START - The start address of DRAM (physical) -# CONFIG_DRAM_END - Last address+1 of installed RAM # CONFIG_ARCH_IRQPRIO - The ST32F103Z supports interrupt prioritization # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt # stack. If defined, this symbol is the size of the interrupt @@ -82,7 +81,6 @@ CONFIG_ARCH_BOARD_VSN=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 CONFIG_DRAM_START=0x20000000 -CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_STACKDUMP=y From 4f56a72bea99bc7c58f79cef50333ec8c24f15d3 Mon Sep 17 00:00:00 2001 From: patacongo Date: Mon, 20 Aug 2012 13:55:19 +0000 Subject: [PATCH 12/31] STM32 USB host driver is code compelte (but untested) git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5039 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/arch/arm/src/stm32/stm32_otgfshost.c | 307 ++++++++++++--------- nuttx/include/nuttx/usb/usbhost.h | 4 +- 2 files changed, 181 insertions(+), 130 deletions(-) diff --git a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c index 65365534ef..74ee71169a 100644 --- a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c +++ b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c @@ -239,12 +239,11 @@ static void stm32_takesem(sem_t *sem); /* Byte stream access helper functions *****************************************/ static inline uint16_t stm32_getle16(const uint8_t *val); -static void stm32_putle16(uint8_t *dest, uint16_t val); /* Channel management **********************************************************/ static int stm32_chan_alloc(FAR struct stm32_usbhost_s *priv); -static void stm32_chan_free(FAR struct stm32_usbhost_s *priv, int chidx); +static inline void stm32_chan_free(FAR struct stm32_usbhost_s *priv, int chidx); static inline void stm32_chan_freeall(FAR struct stm32_usbhost_s *priv); static void stm32_chan_configure(FAR struct stm32_usbhost_s *priv, int chidx); static int stm32_chan_waitsetup(FAR struct stm32_usbhost_s *priv, @@ -308,7 +307,8 @@ static int stm32_enumerate(FAR struct usbhost_driver_s *drvr); static int stm32_ep0configure(FAR struct usbhost_driver_s *drvr, uint8_t funcaddr, uint16_t maxpacketsize); static int stm32_epalloc(FAR struct usbhost_driver_s *drvr, - const FAR struct usbhost_epdesc_s *epdesc, usbhost_ep_t *ep); + FAR const FAR struct usbhost_epdesc_s *epdesc, + FAR usbhost_ep_t *ep); static int stm32_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep); static int stm32_alloc(FAR struct usbhost_driver_s *drvr, FAR uint8_t **buffer, FAR size_t *maxlen); @@ -328,7 +328,6 @@ static void stm32_disconnect(FAR struct usbhost_driver_s *drvr); /* Initialization **************************************************************/ -static inline void stm32_ep0init(FAR struct stm32_usbhost_s *priv); static void stm32_portreset(FAR struct stm32_usbhost_s *priv); static inline void stm32_flush_txfifos(uint32_t txfnum); static inline void stm32_flush_rxfifo(void); @@ -367,15 +366,6 @@ static struct stm32_usbhost_s g_usbhost = .class = NULL, }; -/* This is a free list of EDs and TD buffers */ - -static struct stm32_list_s *g_edfree; /* List of unused EDs */ -static struct stm32_list_s *g_tdfree; /* List of unused TDs */ -static struct stm32_list_s *g_tbfree; /* List of unused transfer buffers */ -#if STM32_IOBUFFERS > 0 -static struct stm32_list_s *g_iofree; /* List of unused I/O buffers */ -#endif - /******************************************************************************* * Public Data *******************************************************************************/ @@ -555,20 +545,6 @@ static inline uint16_t stm32_getle16(const uint8_t *val) return (uint16_t)val[1] << 8 | (uint16_t)val[0]; } -/**************************************************************************** - * Name: stm32_putle16 - * - * Description: - * Put a (possibly unaligned) 16-bit little endian value. - * - *******************************************************************************/ - -static void stm32_putle16(uint8_t *dest, uint16_t val) -{ - dest[0] = val & 0xff; /* Little endian means LS byte first in byte stream */ - dest[1] = val >> 8; -} - /******************************************************************************* * Name: stm32_chan_alloc * @@ -612,7 +588,7 @@ static int stm32_chan_alloc(FAR struct stm32_usbhost_s *priv) static void stm32_chan_free(FAR struct stm32_usbhost_s *priv, int chidx) { DEBUGASSERT((unsigned)chidx < STM32_NHOST_CHANNELS); - priv-priv->chan[chidx].inuse = false; + priv->chan[chidx].inuse = false; } /******************************************************************************* @@ -802,8 +778,8 @@ static int stm32_chan_waitsetup(FAR struct stm32_usbhost_s *priv, * *******************************************************************************/ -static void stm32_chan_wait(FAR struct stm32_usbhost_s *priv, - FAR struct stm32_chan_s *chan) +static int stm32_chan_wait(FAR struct stm32_usbhost_s *priv, + FAR struct stm32_chan_s *chan) { irqstate_t flags; int ret; @@ -839,9 +815,11 @@ static void stm32_chan_wait(FAR struct stm32_usbhost_s *priv, } while (chan->waiter); - /* The transfer is complete */ - + /* The transfer is complete re-enable interrupts and return the result */ + + ret = -(int)chan->result; irqrestore(flags); + return ret; } /******************************************************************************* @@ -1077,13 +1055,10 @@ static int stm32_ctrl_sendsetup(FAR struct stm32_usbhost_s *priv, /* Wait for the transfer to complete */ - stm32_chan_wait(priv, chan); - - /* Get the result of the transfer */ - - ret = -(int)chan->result; + ret = stm32_chan_wait(priv, chan); if (ret != -EGAIN) { + udbg("Transfer failed: %d\n", ret); return ret; } @@ -1152,13 +1127,9 @@ static int stm32_ctrl_senddata(FAR struct stm32_usbhost_s *priv, stm32_transfer_start(priv, priv->ep0out); - /* Wait for the transfer to complete */ + /* Wait for the transfer to complete and return the result */ - stm32_chan_wait(priv, chan); - - /* Return the result of the transfer */ - - return -(int)chan->result; + return stm32_chan_wait(priv, chan); } /******************************************************************************* @@ -1194,13 +1165,9 @@ static int stm32_ctrl_recvdata(FAR struct stm32_usbhost_s *priv, stm32_transfer_start(priv, pric->ep0in); - /* Wait for the transfer to complete */ + /* Wait for the transfer to complete and return the result */ - stm32_chan_wait(priv, chan); - - /* Return the result of the transfer */ - - return -(int)chan->result; + return stm32_chan_wait(priv, chan); } /******************************************************************************* @@ -2641,6 +2608,7 @@ static int stm32_wait(FAR struct usbhost_driver_s *drvr, bool connected) priv->eventwait = true; stm32_takesem(&priv->eventsem); } + irqrestore(flags); udbg("Connected:%s\n", priv->connected ? "YES" : "NO"); @@ -2693,6 +2661,7 @@ static int stm32_enumerate(FAR struct usbhost_driver_s *drvr) udbg("Not connected\n"); return -ENODEV; } + DEBUGASSERT(priv->smstate == SMSTATE_ATTACHED); /* Allocate and initialize the control OUT channel */ @@ -2841,10 +2810,13 @@ static int stm32_ep0configure(FAR struct usbhost_driver_s *drvr, uint8_t funcadd ************************************************************************************/ static int stm32_epalloc(FAR struct usbhost_driver_s *drvr, - const FAR struct usbhost_epdesc_s *epdesc, usbhost_ep_t *ep) + FAR const FAR struct usbhost_epdesc_s *epdesc, + FAR usbhost_ep_t *ep) { - struct stm32_usbhost_s *priv = (struct stm32_usbhost_s *)drvr; - int ret = -ENOMEM; + FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr; + FAR struct stm32_chan_s *chan; + int chidx; + int ret; /* Sanity check. NOTE that this method should only be called if a device is * connected (because we need a valid low speed indication). @@ -2856,19 +2828,40 @@ static int stm32_epalloc(FAR struct usbhost_driver_s *drvr, stm32_takesem(&priv->exclsem); - /* Get the direction of the endpoint */ + /* Allocate a host channel for the endpoint */ - if (epdesc->in) - { - } - else + chidx = stm32_chan_alloc(priv) + if (chidx < 0) { + udbg("Failed to allocate a host channel\n"); + ret = -ENOMEM; + goto errout; } - /* Set the transfer type */ + /* Decode the endpoint descriptor to initialize the channel data structures. + * Note: Here we depend on the fact that the endpoint point type is + * encoded in the same way in the endpoint descriptor as it is in the OTG + * FS hardware. + */ - /* Special Case isochronous transfer types */ + chan = &priv->chan[chidx]; + chan->epno = epdesc->addr & USB_EPNO_MASK; + chan->isin = ((epdesc->addr & USB_DIR_MASK) == USB_DIR_IN); + chan->eptype = eptype->attr & USB_EP_ATTR_XFERTYPE_MASK; + chan->maxpacket = stm32_getle16(epdesc->maxpacket); + chan->indata1 = false; + chan->outdata1 = false; + /* Then configure the endpoint */ + + stm32_chan_configure(priv, chidx) ; + + /* Return the index to the allocated channel as the endpoint "handle" */ + + *ep = (usbhost_ep_t)chidx; + ret = OK; + +errout: stm32_givesem(&priv->exclsem); return ret; } @@ -2896,19 +2889,24 @@ static int stm32_epalloc(FAR struct usbhost_driver_s *drvr, static int stm32_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) { struct stm32_usbhost_s *priv = (struct stm32_usbhost_s *)drvr; - int ret; + int chidx = (int)ep; - /* There should not be any pending, real TDs linked to this ED */ - - DEBUGASSERT(drvr); + DEBUGASSERT(priv && ep < STM32_MAX_TX_FIFOS); /* We must have exclusive access to the USB host hardware and state structures */ stm32_takesem(&priv->exclsem); -#warning "Missing logic" + + /* Halt the channel */ + + stm32_gint_halttxchan(priv, chidx); + + /* Mark the channel avaiable */ + + stm32_chan_free(priv, chidx); stm32_givesem(&priv->exclsem); - return ret; + return OK; } /******************************************************************************* @@ -2946,16 +2944,19 @@ static int stm32_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) static int stm32_alloc(FAR struct usbhost_driver_s *drvr, FAR uint8_t **buffer, FAR size_t *maxlen) { - struct stm32_usbhost_s *priv = (struct stm32_usbhost_s *)drvr; - int ret = -ENOMEM; + FAR uint8_t *alloc; - DEBUGASSERT(priv && buffer && maxlen); - /* We must have exclusive access to the USB host hardware and state structures */ + DEBUGASSERT(drvr && buffer && maxlen && *maxlen > 0); - stm32_takesem(&priv->exclsem); -#warning "Missing logic" - stm32_givesem(&priv->exclsem); - return ret; + /* There is no special memory requirement */ + + alloc = (FAR uint8_t *)malloc(*maxlen); + if (!alloc) + { + return -ENOMEM; + } + + return OK; } /******************************************************************************* @@ -2983,15 +2984,10 @@ static int stm32_alloc(FAR struct usbhost_driver_s *drvr, static int stm32_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer) { - struct stm32_usbhost_s *priv = (struct stm32_usbhost_s *)drvr; + /* There is no special memory requirement */ DEBUGASSERT(drvr && buffer); - - /* We must have exclusive access to the USB host hardware and state structures */ - - stm32_takesem(&priv->exclsem); -#warning "Missing logic" - stm32_givesem(&priv->exclsem); + free(buffer); return OK; } @@ -3025,8 +3021,19 @@ static int stm32_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer) static int stm32_ioalloc(FAR struct usbhost_driver_s *drvr, FAR uint8_t **buffer, size_t buflen) { - DEBUGASSERT(drvr && buffer); - return -ENOSYS; + FAR uint8_t *alloc; + + DEBUGASSERT(drvr && buffer && buflen > 0); + + /* There is no special memory requirement */ + + alloc = (FAR uint8_t *)malloc(buflen); + if (!alloc) + { + return -ENOMEM; + } + + return OK; } /************************************************************************************ @@ -3054,8 +3061,11 @@ static int stm32_ioalloc(FAR struct usbhost_driver_s *drvr, static int stm32_iofree(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer) { + /* There is no special memory requirement */ + DEBUGASSERT(drvr && buffer); - return -ENOSYS; + free(buffer); + return OK; } /******************************************************************************* @@ -3257,16 +3267,13 @@ static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, static int stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, FAR uint8_t *buffer, size_t buflen) { - struct stm32_usbhost_s *priv = (struct stm32_usbhost_s *)drvr; - uint32_t dirpid; - uint32_t regval; -#if STM32_IOBUFFERS > 0 - uint8_t *origbuf = NULL; -#endif - bool in; + struct stm32_usbhost_s *priv = (struct stm32_usbhost_s *)drvr; + FAR struct stm32_chan_s *chan; + unsigned int chidx = (unsigned int)ep; int ret; - DEBUGASSERT(priv && chan && buffer && buflen > 0); + DEBUGASSERT(priv && buffer && ep < STM32_MAX_TX_FIFOS && buflen > 0); + chan = &priv->chan[chidx]; /* We must have exclusive access to the USB host hardware and state structures */ @@ -3281,23 +3288,93 @@ static int stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, goto errout; } + /* Set up for the transfer based on the direction and the endpoint type */ + + switch (chan->eptype) + { + default: + case OTGFS_EPTYPE_CTRL: /* Control */ + { + /* This kind of transfer on control endpoints other than EP0 are not + * currently supported + */ + + ret = -ENOSYS; + goto errout; + } + + case OTGFS_EPTYPE_ISOC: /* Isochronous */ + { + /* Set up the IN/OUT data PID */ + + chan->pid = OTGFS_PID_DATA0; + } + break; + + case OTGFS_EPTYPE_BULK: /* Bulk */ + { + /* Handle the bulk transfer based on the direction of the transfer. */ + + if (chan->isin) + { + /* Setup the IN data PID */ + + chan->pid = chan->indata1 ? OTGFS_PID_DATA1 : OTGFS_PID_DATA0; + } + else + { + /* Setup the OUT data PID */ + + chan->pid = chan->outdata1 ? OTGFS_PID_DATA1 : OTGFS_PID_DATA0; + } + } + break; + + case OTGFS_EPTYPE_INTR: /* Interrupt */ + { + /* Handle the interrupt transfer based on the direction of the + * transfer. + */ + + if (chan->isin) + { + /* Setup the OUT data PID */ + + chan->pid = chan->indata1 ? OTGFS_PID_DATA1 : OTGFS_PID_DATA0; + + /* Toggle the IN data PID for the next transfer */ + + chan->indata1 ^= true; + } + else + { + /* Setup the OUT data PID */ + + chan->pid = chan->outdata1 ? OTGFS_PID_DATA1 : OTGFS_PID_DATA0; + + /* Toggle the OUT data PID for the next transfer */ + + chan->outdata1 ^= true; + } + } + } + /* Start the transfer */ -#warning "Missing logic" + + chan->buffer = buffer; + chan->buflen = buflen; - /* Wait for the transfer to complete */ + stm32_transfer_start(priv, chidx); - stm32_chan_wait(priv, chan); + /* Wait for the transfer to complete and get the result */ - /* Get the result of the transfer */ - - - /* Check the transfer completion status */ -#warning "Missing Logic" + ret = stm32_chan_wait(priv, chan); + if (ret < 0) + { + udbg("Transfer failed: %d\n", ret); + } errout: - /* Make sure that there is no outstanding request on this endpoint */ -#warning "Missing Logic" - stm32_givesem(&priv->exclsem); return ret; } @@ -3334,32 +3411,6 @@ static void stm32_disconnect(FAR struct usbhost_driver_s *drvr) /******************************************************************************* * Initialization *******************************************************************************/ -/******************************************************************************* - * Name: stm32_ep0init - * - * Description: - * Initialize ED for EP0, add it to the control ED list, and enable control - * transfers. - * - * Input Parameters: - * priv - private driver state instance. - * - * Returned Values: - * None - * - *******************************************************************************/ - -static inline void stm32_ep0init(struct stm32_usbhost_s *priv) -{ - uint32_t regval; - - /* Set up some default values */ - - (void)stm32_ep0configure(&priv->drvr, 1, 8); - -#warning "Missing logic" -} - /******************************************************************************* * Name: stm32_portreset * diff --git a/nuttx/include/nuttx/usb/usbhost.h b/nuttx/include/nuttx/usb/usbhost.h index 133fd4387a..058f5403e5 100644 --- a/nuttx/include/nuttx/usb/usbhost.h +++ b/nuttx/include/nuttx/usb/usbhost.h @@ -553,7 +553,7 @@ struct usbhost_class_s }; /* This structure describes one endpoint. It is used as an input to the - * allocep() method. Most of this information comes from the endpoint + * epalloc() method. Most of this information comes from the endpoint * descriptor. */ @@ -567,7 +567,7 @@ struct usbhost_epdesc_s uint16_t mxpacketsize; /* Max packetsize */ }; -/* This type represents one endpoint configured by the allocep() method. +/* This type represents one endpoint configured by the epalloc() method. * The actual form is know only internally to the USB host controller * (for example, for an OHCI driver, this would probably be a pointer * to an endpoint descriptor). From 27bd0bbee4acfbafd97be1a6a23db84762757906 Mon Sep 17 00:00:00 2001 From: patacongo Date: Mon, 20 Aug 2012 16:06:39 +0000 Subject: [PATCH 13/31] Changes for clean STM32 USB host driver build git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5040 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/arch/arm/src/stm32/stm32_otgfshost.c | 215 +++++++++++---------- nuttx/arch/arm/src/stm32/stm32_usbhost.h | 26 +++ nuttx/configs/stm3220g-eval/README.txt | 31 ++- nuttx/configs/stm3220g-eval/nsh/defconfig | 32 ++- nuttx/configs/stm3220g-eval/src/up_nsh.c | 64 +++--- nuttx/configs/stm3220g-eval/src/up_usb.c | 10 +- nuttx/configs/stm3240g-eval/README.txt | 32 ++- nuttx/configs/stm32f4discovery/README.txt | 23 +++ nuttx/drivers/usbhost/usbhost_enumerate.c | 8 +- nuttx/drivers/usbhost/usbhost_hidkbd.c | 6 +- nuttx/include/nuttx/usb/usbhost.h | 2 +- 11 files changed, 309 insertions(+), 140 deletions(-) diff --git a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c index 74ee71169a..821194eb87 100644 --- a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c +++ b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c @@ -60,15 +60,37 @@ #include "up_arch.h" #include "up_internal.h" -#include "stm32_otgfs.h" +#include "stm32_usbhost.h" #if defined(CONFIG_USBHOST) && defined(CONFIG_STM32_OTGFS) /******************************************************************************* * Definitions *******************************************************************************/ - /* Configuration ***************************************************************/ +/* + * STM32 USB OTG FS Host Driver Support + * + * Pre-requisites + * + * CONFIG_USBHOST - Enable general USB host support + * CONFIG_STM32_OTGFS - Enable the STM32 USB OTG FS block + * CONFIG_STM32_SYSCFG - Needed + * + * Options: + * + * CONFIG_STM32_OTGFS_RXFIFO_SIZE - Size of the RX FIFO in 32-bit words. + * Default 128 (512 bytes) + * CONFIG_STM32_OTGFS_NPTXFIFO_SIZE - Size of the non-periodic Tx FIFO + * in 32-bit words. Default 96 (384 bytes) + * CONFIG_STM32_OTGFS_PTXFIFO_SIZE - Size of the periodic Tx FIFO in 32-bit + * words. Default 96 (384 bytes) + * CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts. Why would you ever + * want to do that? + * CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access + * debug. Depends on CONFIG_DEBUG. + */ + /* Pre-requistites (partial) */ #ifndef CONFIG_STM32_SYSCFG @@ -83,12 +105,6 @@ /* Default host non-periodic transmit FIFO size */ -#ifndef CONFIG_STM32_OTGFS_RXFIFO_SIZE -# define CONFIG_STM32_OTGFS_RXFIFO_SIZE 128 -#endif - -/* Default host non-periodic transmit FIFO size */ - #ifndef CONFIG_STM32_OTGFS_NPTXFIFO_SIZE # define CONFIG_STM32_OTGFS_NPTXFIFO_SIZE 96 #endif @@ -99,6 +115,12 @@ # define CONFIG_STM32_OTGFS_PTXFIFO_SIZE 96 #endif +/* Register debug depends on CONFIG_DEBUG */ + +#ifndef CONFIG_DEBUG +# undef CONFIG_STM32_USBHOST_REGDEBUG +#endif + /* HCD Setup *******************************************************************/ /* Hardware capabilities */ @@ -169,7 +191,7 @@ struct stm32_chan_s bool inuse; /* True: This channel is "in use" */ bool indata1; /* IN data toggle. True: DATA01 */ bool outdata1; /* OUT data toggle. True: DATA01 */ - bool isin; /* True: IN endpoint */ + bool in; /* True: IN endpoint */ volatile bool waiter; /* True: Thread is waiting for a channel event */ volatile uint16_t nerrors; /* Number of errors detecgted */ volatile uint16_t xfrd; /* Number of bytes transferred */ @@ -248,15 +270,15 @@ static inline void stm32_chan_freeall(FAR struct stm32_usbhost_s *priv); static void stm32_chan_configure(FAR struct stm32_usbhost_s *priv, int chidx); static int stm32_chan_waitsetup(FAR struct stm32_usbhost_s *priv, FAR struct stm32_chan_s *chan); -static void stm32_chan_wait(FAR struct stm32_usbhost_s *priv, - FAR struct stm32_chan_s *chan); +static int stm32_chan_wait(FAR struct stm32_usbhost_s *priv, + FAR struct stm32_chan_s *chan); static void stm32_chan_wakeup(FAR struct stm32_usbhost_s *priv, FAR struct stm32_chan_s *chan); /* Control/data transfer logic *************************************************/ static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx); -static inline uint32_t stm32_getframe(void); +static inline uint16_t stm32_getframe(void); static int stm32_ctrl_sendsetup(FAR struct stm32_usbhost_s *priv, FAR const struct usb_ctrlreq_s *req); static int stm32_ctrl_senddata(FAR struct stm32_usbhost_s *priv, @@ -298,7 +320,7 @@ static int stm32_gint_isr(int irq, FAR void *context); static void stm32_gint_enable(void); static void stm32_gint_disable(void); -static inline int stm32_hostinit_enable(void); +static inline void stm32_hostinit_enable(void); /* USB host controller operations **********************************************/ @@ -645,7 +667,7 @@ static void stm32_chan_configure(FAR struct stm32_usbhost_s *priv, int chidx) /* Additional setting for IN/OUT endpoints */ - if (priv->chan[chidx].isin) + if (priv->chan[chidx].in) { regval |= OTGFS_HCINT_BBERR; } @@ -665,7 +687,7 @@ static void stm32_chan_configure(FAR struct stm32_usbhost_s *priv, int chidx) /* Additional setting for IN endpoints */ - if (priv->chan[chidx].isin) + if (priv->chan[chidx].in) { regval |= OTGFS_HCINT_BBERR; } @@ -680,7 +702,7 @@ static void stm32_chan_configure(FAR struct stm32_usbhost_s *priv, int chidx) /* Additional setting for IN endpoints */ - if (priv->chan[chidx].isin) + if (priv->chan[chidx].in) { regval |= (OTGFS_HCINT_TXERR | OTGFS_HCINT_BBERR); } @@ -688,7 +710,7 @@ static void stm32_chan_configure(FAR struct stm32_usbhost_s *priv, int chidx) break; } - stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); + stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), regval); /* Enable the top level host channel interrupt. */ @@ -703,7 +725,7 @@ static void stm32_chan_configure(FAR struct stm32_usbhost_s *priv, int chidx) regval = ((uint32_t)priv->chan[chidx].maxpacket << OTGFS_HCCHAR_MPSIZ_SHIFT) | ((uint32_t)priv->chan[chidx].epno << OTGFS_HCCHAR_EPNUM_SHIFT) | ((uint32_t)priv->chan[chidx].eptype << OTGFS_HCCHAR_EPTYP_SHIFT) | - ((uint32_t)priv->devaddr << OTGFS_HCCHAR_DAD_SHIFT) | + ((uint32_t)priv->devaddr << OTGFS_HCCHAR_DAD_SHIFT); /* Special case settings for low speed devices */ @@ -714,7 +736,7 @@ static void stm32_chan_configure(FAR struct stm32_usbhost_s *priv, int chidx) /* Special case settings for IN endpoints */ - if (priv->chan[chidx].isin) + if (priv->chan[chidx].in) { regval |= OTGFS_HCCHAR_EPDIR_IN; } @@ -805,7 +827,7 @@ static int stm32_chan_wait(FAR struct stm32_usbhost_s *priv, * wait here. */ - ret = sem_wait(chan->waitsem); + ret = sem_wait(&chan->waitsem); /* sem_wait should succeeed. But it is possible that we could be * awakened by a signal too. @@ -840,7 +862,7 @@ static void stm32_chan_wakeup(FAR struct stm32_usbhost_s *priv, { /* Is there a thread waiting for this transfer to complete? */ - if (priv->chan[chidx].result != EBUSY && chan->waiter) + if (chan->result != EBUSY && chan->waiter) { stm32_givesem(&chan->waitsem); chan->waiter = false; @@ -873,8 +895,8 @@ static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx) * of full, maximally sized packets that can fit in the read buffer. */ - mxpacket = priv->chan[chidx].maxpacket; - if (priv->chan[chidx].isin) + maxpacket = priv->chan[chidx].maxpacket; + if (priv->chan[chidx].in) { npackets = priv->chan[chidx].buflen / maxpacket; @@ -939,7 +961,7 @@ static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx) * outgoing data into the correct TxFIFO. */ - if (!priv->chan[chidx].isin && priv->chan[chidx].buflen > 0) + if (!priv->chan[chidx].in && priv->chan[chidx].buflen > 0) { /* Handle non-periodic (CTRL and BULK) OUT transfers differently than * perioci (INTR and ISOC) OUT transfers. @@ -1009,7 +1031,7 @@ static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx) static inline uint16_t stm32_getframe(void) { - return (stm32_getreg(STM32_OTGFS_HFNUM) & OTGFS_HFNUM_FRNUM_MASK); + return (uint16_t)(stm32_getreg(STM32_OTGFS_HFNUM) & OTGFS_HFNUM_FRNUM_MASK); } /******************************************************************************* @@ -1042,7 +1064,7 @@ static int stm32_ctrl_sendsetup(FAR struct stm32_usbhost_s *priv, /* Set up for the wait BEFORE starting the transfer */ - ret = stm32_chan_waitsetup(priv, chan) + ret = stm32_chan_waitsetup(priv, chan); if (ret != OK) { udbg("ERROR: Device disconnected\n"); @@ -1056,7 +1078,7 @@ static int stm32_ctrl_sendsetup(FAR struct stm32_usbhost_s *priv, /* Wait for the transfer to complete */ ret = stm32_chan_wait(priv, chan); - if (ret != -EGAIN) + if (ret != -EAGAIN) { udbg("Transfer failed: %d\n", ret); return ret; @@ -1084,6 +1106,7 @@ static int stm32_ctrl_senddata(FAR struct stm32_usbhost_s *priv, FAR uint8_t *buffer, unsigned int buflen) { FAR struct stm32_chan_s *chan = &priv->chan[priv->ep0out]; + int ret; /* Save buffer information */ @@ -1101,22 +1124,11 @@ static int stm32_ctrl_senddata(FAR struct stm32_usbhost_s *priv, /* Set the Data PID as per the outdata1 boolean */ - if (!chan->outdata1) - { - /* Use PID == DATA0 */ - - chan->pid = OTGFS_PID_DATA0; - } - else - { - /* Put the PID 1 */ - - chan->pid = OTGFS_PID_DATA1 ; - } + chan->pid = chan->outdata1 ? OTGFS_PID_DATA1 : OTGFS_PID_DATA0; /* Set up for the wait BEFORE starting the transfer */ - ret = stm32_chan_waitsetup(priv, chan) + ret = stm32_chan_waitsetup(priv, chan); if (ret != OK) { udbg("ERROR: Device disconnected\n"); @@ -1142,9 +1154,10 @@ static int stm32_ctrl_senddata(FAR struct stm32_usbhost_s *priv, *******************************************************************************/ static int stm32_ctrl_recvdata(FAR struct stm32_usbhost_s *priv, - FAR uint8_t *buffer, unsigned int buflen); + FAR uint8_t *buffer, unsigned int buflen) { - FAR struct stm32_chan_s *chan = &priv->chan[pric->ep0in]; + FAR struct stm32_chan_s *chan = &priv->chan[priv->ep0in]; + int ret; /* Save buffer information */ @@ -1154,7 +1167,7 @@ static int stm32_ctrl_recvdata(FAR struct stm32_usbhost_s *priv, /* Set up for the wait BEFORE starting the transfer */ - ret = stm32_chan_waitsetup(priv, chan) + ret = stm32_chan_waitsetup(priv, chan); if (ret != OK) { udbg("ERROR: Device disconnected\n"); @@ -1163,7 +1176,7 @@ static int stm32_ctrl_recvdata(FAR struct stm32_usbhost_s *priv, /* Start the transfer */ - stm32_transfer_start(priv, pric->ep0in); + stm32_transfer_start(priv, priv->ep0in); /* Wait for the transfer to complete and return the result */ @@ -1182,8 +1195,8 @@ static int stm32_ctrl_recvdata(FAR struct stm32_usbhost_s *priv, static void stm32_gint_wrpacket(FAR struct stm32_usbhost_s *priv, FAR uint8_t *buffer, int chidx, int buflen) { - FAR volatile uint32_t *fifo; FAR uint32_t *src; + uint32_t fifo; int buflen32; /* Get the number of 32-byte words associated with this byte size */ @@ -1275,7 +1288,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, uint32_t hcint; uint32_t hcintmsk; uint32_t hcchar; - uint32_t hctsiz; + uint32_t pending; unsigned int eptype; /* Read the HCINT register to get the pending HC interrupts. Read the @@ -1647,8 +1660,6 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, else if ((pending & OTGFS_HCINT_NAK) != 0) { - uint32_t regval; - /* Clear the error count */ chan->nerrors = 0; @@ -1782,7 +1793,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, else if (chan->chstate == CHSTATE_NAK || chan->chstate == CHSTATE_NYET) { - chan->result = EGAIN; + chan->result = EAGAIN; } else if (chan->chstate == CHSTATE_STALL) { @@ -1832,7 +1843,7 @@ static void stm32_gint_connected(FAR struct stm32_usbhost_s *priv) ullvdbg("Connected\n"); priv->connected = true; - DEBUGASSERT(priv->smstate == SMTATE_IDLE); + DEBUGASSERT(priv->smstate == SMSTATE_DETACHED); /* Notify any waiters */ @@ -1857,12 +1868,11 @@ static void stm32_gint_disconnected(FAR struct stm32_usbhost_s *priv) { /* Were we previously connected? */ - if !priv->connected) + if (!priv->connected) { /* Yes.. then we no longer connected */ ullvdbg("Disconnected\n"); - priv->connected = false; /* Are we bound to a class driver? */ @@ -1876,9 +1886,12 @@ static void stm32_gint_disconnected(FAR struct stm32_usbhost_s *priv) /* Re-Initilaize Host for new Enumeration */ - stm32_swreset(priv); + priv->smstate = SMSTATE_DETACHED; + priv->ep0size = STM32_EP0_MAX_PACKET_SIZE; + priv->devaddr = STM32_DEF_DEVADDR; + priv->connected = false; + priv->lowspeed = false; stm32_chan_freeall(priv); - priv->smstate = SMSTATE_DETACHED; /* Notify any waiters that there is a change in the connection state */ @@ -1933,7 +1946,7 @@ static inline void stm32_gint_rxflvlisr(FAR struct stm32_usbhost_s *priv) /* Disable the RxFIFO non-empty interrupt */ - intmsk = stm32_getreg(STM32_OTGFS_GINTMSK) + intmsk = stm32_getreg(STM32_OTGFS_GINTMSK); intmsk &= ~OTGFS_GINT_RXFLVL; stm32_putreg(STM32_OTGFS_GINTMSK, intmsk); @@ -1957,18 +1970,16 @@ static inline void stm32_gint_rxflvlisr(FAR struct stm32_usbhost_s *priv) { /* Read the data into the host buffer. */ - int bcnt = (grxsts & OTGFS_GRXSTSH_BCNT_MASK) >> OTGFS_GRXSTSH_BCNT_SHIFT; - + bcnt = (grxsts & OTGFS_GRXSTSH_BCNT_MASK) >> OTGFS_GRXSTSH_BCNT_SHIFT; if (bcnt > 0 && priv->chan[chidx].buffer != NULL) { /* Transfer the packet from the Rx FIFO into the user buffer */ - FAR uint32_t *dest = (FAR uint32_t *)priv->chan[chidx].buffer; - uint32_t fifo = STM32_OTGFS_DFIFO_HCH(0); - uint32_t hctsiz; - int bcnt32 = (bcnt + 3) >> 2; + dest = (FAR uint32_t *)priv->chan[chidx].buffer; + fifo = STM32_OTGFS_DFIFO_HCH(0); + bcnt32 = (bcnt + 3) >> 2; - for (i = 0; i < count32b; i++, dest += 4) + for (i = 0; i < bcnt32; i++) { *dest++ = stm32_getreg(fifo); } @@ -2043,7 +2054,7 @@ static inline void stm32_gint_nptxfeisr(FAR struct stm32_usbhost_s *priv) /* Get the number of words remaining to be sent */ - buflen = priv->chan[chidx].buflen + buflen = priv->chan[chidx].buflen; buflen32 = (buflen + 3) >> 2; /* Break out of the loop if either (a) there is nothing more to be @@ -2120,7 +2131,7 @@ static inline void stm32_gint_ptxfeisr(FAR struct stm32_usbhost_s *priv) /* Get the number of words remaining to be sent */ - buflen = priv->chan[chidx].buflen + buflen = priv->chan[chidx].buflen; buflen32 = (buflen + 3) >> 2; /* Break out of the loop if either (a) there is nothing more to be @@ -2269,8 +2280,6 @@ static inline void stm32_gint_hprtisr(FAR struct stm32_usbhost_s *priv) if ((hprt & OTGFS_HPRT_PENA) != 0) { - uint32_t hcfg; - /* Yes.. handle the new connection event */ stm32_gint_connected(priv); @@ -2328,8 +2337,6 @@ static inline void stm32_gint_hprtisr(FAR struct stm32_usbhost_s *priv) static inline void stm32_gint_discisr(FAR struct stm32_usbhost_s *priv) { - uint32_t regval; - /* Handle the disconnection event */ stm32_gint_disconnected(priv); @@ -2410,49 +2417,49 @@ static int stm32_gint_isr(int irq, FAR void *context) /* Handle the RxFIFO non-empty interrupt */ - if ((pending & OTGFS_GINT_RXFLVL)) != 0) + if ((pending & OTGFS_GINT_RXFLVL) != 0) { stm32_gint_rxflvlisr(priv); } /* Handle the non-periodic TxFIFO empty interrupt */ - if ((pending & OTGFS_GINT_NPTXFE)) != 0) + if ((pending & OTGFS_GINT_NPTXFE) != 0) { stm32_gint_nptxfeisr(priv); } /* Handle the periodic TxFIFO empty interrupt */ - if ((pending & OTGFS_GINT_PTXFE)) != 0) + if ((pending & OTGFS_GINT_PTXFE) != 0) { stm32_gint_ptxfeisr(priv); } /* Handle the host channels interrupt */ - if ((pending & OTGFS_GINT_HC)) != 0) + if ((pending & OTGFS_GINT_HC) != 0) { stm32_gint_hcisr(priv); } /* Handle the host port interrupt */ - if ((pending & OTGFS_GINT_HPRT)) != 0) + if ((pending & OTGFS_GINT_HPRT) != 0) { stm32_gint_hprtisr(priv); } /* Handle the disconnect detected interrupt */ - if ((pending & OTGFS_GINT_DISC)) != 0) + if ((pending & OTGFS_GINT_DISC) != 0) { stm32_gint_discisr(priv); } /* Handle the incomplete isochronous OUT transfer */ - if ((pending & OTGFS_GINT_IISOOXFR)) != 0) + if ((pending & OTGFS_GINT_IISOOXFR) != 0) { stm32_gint_iisooxfrisr(priv); } @@ -2481,7 +2488,7 @@ static void stm32_gint_enable(void) /* Set the GINTMSK bit to unmask the interrupt */ - regval = stm32_getreg(STM32_OTGFS_GAHBCFG) + regval = stm32_getreg(STM32_OTGFS_GAHBCFG); regval |= OTGFS_GAHBCFG_GINTMSK; stm32_putreg(OTGFS_GAHBCFG_GINTMSK, regval); } @@ -2492,7 +2499,7 @@ static void stm32_gint_disable(void) /* Clear the GINTMSK bit to mask the interrupt */ - regval = stm32_getreg(STM32_OTGFS_GAHBCFG) + regval = stm32_getreg(STM32_OTGFS_GAHBCFG); regval &= ~OTGFS_GAHBCFG_GINTMSK; stm32_putreg(OTGFS_GAHBCFG_GINTMSK, regval); } @@ -2513,6 +2520,8 @@ static void stm32_gint_disable(void) static inline void stm32_hostinit_enable(void) { + uint32_t regval; + /* Disable all interrupts. */ stm32_putreg(STM32_OTGFS_GINTMSK, 0); @@ -2671,7 +2680,7 @@ static int stm32_enumerate(FAR struct usbhost_driver_s *drvr) priv->ep0out = chidx; priv->chan[chidx].epno = 0; - priv->chan[chidx].isin = false; + priv->chan[chidx].in = false; priv->chan[chidx].eptype = OTGFS_EPTYPE_CTRL; priv->chan[chidx].maxpacket = STM32_EP0_DEF_PACKET_SIZE; priv->chan[chidx].indata1 = false; @@ -2684,7 +2693,7 @@ static int stm32_enumerate(FAR struct usbhost_driver_s *drvr) priv->ep0in = chidx; priv->chan[chidx].epno = 0; - priv->chan[chidx].isin = true; + priv->chan[chidx].in = true; priv->chan[chidx].eptype = OTGFS_EPTYPE_CTRL; priv->chan[chidx].maxpacket = STM32_EP0_DEF_PACKET_SIZE; priv->chan[chidx].indata1 = false; @@ -2713,7 +2722,7 @@ static int stm32_enumerate(FAR struct usbhost_driver_s *drvr) */ uvdbg("Enumerate the device\n"); - priv->smstate = SMSTATE_ENUM + priv->smstate = SMSTATE_ENUM; ret = usbhost_enumerate(drvr, 1, &priv->class); /* The enumeration may fail either because of some HCD interfaces failure @@ -2810,7 +2819,7 @@ static int stm32_ep0configure(FAR struct usbhost_driver_s *drvr, uint8_t funcadd ************************************************************************************/ static int stm32_epalloc(FAR struct usbhost_driver_s *drvr, - FAR const FAR struct usbhost_epdesc_s *epdesc, + FAR const struct usbhost_epdesc_s *epdesc, FAR usbhost_ep_t *ep) { FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr; @@ -2830,7 +2839,7 @@ static int stm32_epalloc(FAR struct usbhost_driver_s *drvr, /* Allocate a host channel for the endpoint */ - chidx = stm32_chan_alloc(priv) + chidx = stm32_chan_alloc(priv); if (chidx < 0) { udbg("Failed to allocate a host channel\n"); @@ -2846,9 +2855,9 @@ static int stm32_epalloc(FAR struct usbhost_driver_s *drvr, chan = &priv->chan[chidx]; chan->epno = epdesc->addr & USB_EPNO_MASK; - chan->isin = ((epdesc->addr & USB_DIR_MASK) == USB_DIR_IN); - chan->eptype = eptype->attr & USB_EP_ATTR_XFERTYPE_MASK; - chan->maxpacket = stm32_getle16(epdesc->maxpacket); + chan->in = epdesc->in; + chan->eptype = epdesc->xfrtype; + chan->maxpacket = epdesc->mxpacketsize; chan->indata1 = false; chan->outdata1 = false; @@ -2891,7 +2900,7 @@ static int stm32_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) struct stm32_usbhost_s *priv = (struct stm32_usbhost_s *)drvr; int chidx = (int)ep; - DEBUGASSERT(priv && ep < STM32_MAX_TX_FIFOS); + DEBUGASSERT(priv && chidx < STM32_MAX_TX_FIFOS); /* We must have exclusive access to the USB host hardware and state structures */ @@ -3109,7 +3118,8 @@ static int stm32_ctrlin(FAR struct usbhost_driver_s *drvr, { struct stm32_usbhost_s *priv = (struct stm32_usbhost_s *)drvr; uint16_t buflen; - int ret; + int retries; + int ret; DEBUGASSERT(drvr && req); uvdbg("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n", @@ -3173,7 +3183,7 @@ static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, struct stm32_usbhost_s *priv = (struct stm32_usbhost_s *)drvr; uint16_t buflen; int retries; - int ret; + int ret; DEBUGASSERT(drvr && req); uvdbg("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n", @@ -3272,7 +3282,7 @@ static int stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, unsigned int chidx = (unsigned int)ep; int ret; - DEBUGASSERT(priv && buffer && ep < STM32_MAX_TX_FIFOS && buflen > 0); + DEBUGASSERT(priv && buffer && chidx < STM32_MAX_TX_FIFOS && buflen > 0); chan = &priv->chan[chidx]; /* We must have exclusive access to the USB host hardware and state structures */ @@ -3315,7 +3325,7 @@ static int stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, { /* Handle the bulk transfer based on the direction of the transfer. */ - if (chan->isin) + if (chan->in) { /* Setup the IN data PID */ @@ -3336,7 +3346,7 @@ static int stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, * transfer. */ - if (chan->isin) + if (chan->in) { /* Setup the OUT data PID */ @@ -3436,7 +3446,7 @@ static void stm32_portreset(FAR struct stm32_usbhost_s *priv) uint32_t regval; regval = stm32_getreg(STM32_OTGFS_HPRT); - retval &= ~(OTGFS_HPRT_PENA|OTGFS_HPRT_PCDET|OTGFS_HPRT_PENCHNG|OTGFS_HPRT_POCCHNG); + regval &= ~(OTGFS_HPRT_PENA|OTGFS_HPRT_PCDET|OTGFS_HPRT_PENCHNG|OTGFS_HPRT_POCCHNG); regval |= OTGFS_HPRT_PRST; stm32_putreg(STM32_OTGFS_HPRT, regval); @@ -3548,7 +3558,7 @@ static void stm32_vbusdrive(FAR struct stm32_usbhost_s *priv, bool state) /* Enable/disable the external charge pump */ - stm32_usbhost_vbusdrive(state); + stm32_usbhost_vbusdrive(0, state); /* Turn on the Host port power. */ @@ -3591,7 +3601,6 @@ static void stm32_host_initialize(FAR struct stm32_usbhost_s *priv) { uint32_t regval; uint32_t offset; - int ret; int i; /* Restart the PHY Clock */ @@ -3623,13 +3632,13 @@ static void stm32_host_initialize(FAR struct stm32_usbhost_s *priv) /* Setup the host non-periodic Tx FIFO size (HNPTXFSIZ) */ - regval = (offset | (CONFIG_STM32_OTGFS_NPTXFIFO_SIZE << OTGFS_HNPTXFSIZ_NPTXFD_MASK); - stm32_putreg(STM32_OTGFS_DIEPTXF0_HNPTXFSIZ, regval); - offset += CONFIG_STM32_OTGFS_NPTXFIFO_SIZE + regval = (offset | (CONFIG_STM32_OTGFS_NPTXFIFO_SIZE << OTGFS_HNPTXFSIZ_NPTXFD_SHIFT)); + stm32_putreg(STM32_OTGFS_HNPTXFSIZ, regval); + offset += CONFIG_STM32_OTGFS_NPTXFIFO_SIZE; /* Set up the host periodic Tx fifo size register (HPTXFSIZ) */ - regval = (offset | (CONFIG_STM32_OTGFS_PTXFIFO_SIZE << OTGFS_HPTXFSIZ_PTXFD_SHIFT); + regval = (offset | (CONFIG_STM32_OTGFS_PTXFIFO_SIZE << OTGFS_HPTXFSIZ_PTXFD_SHIFT)); stm32_putreg(STM32_OTGFS_HPTXFSIZ, regval); /* If OTG were supported, we sould need to clear HNP enable bit in the @@ -3657,8 +3666,7 @@ static void stm32_host_initialize(FAR struct stm32_usbhost_s *priv) /* Enable host interrupts */ - stm32_hostinit_enable(priv); - return OK; + stm32_hostinit_enable(); } /******************************************************************************* @@ -3692,7 +3700,7 @@ static inline void stm32_sw_initialize(FAR struct stm32_usbhost_s *priv) /* Put all of the channels back in their initial, allocated state */ - memset(priv-chan, 0, STM32_MAX_TX_FIFOS * sizeof(struct stm32_chan_s)); + memset(priv->chan, 0, STM32_MAX_TX_FIFOS * sizeof(struct stm32_chan_s)); /* Initialize each channel */ @@ -3720,7 +3728,7 @@ static inline void stm32_sw_initialize(FAR struct stm32_usbhost_s *priv) static inline int stm32_hw_initialize(FAR struct stm32_usbhost_s *priv) { uint32_t regval; - int ret; + unsigned long timeout; /* Set the PHYSEL bit in the GUSBCFG register to select the OTG FS serial * transceiver: "This bit is always 1 with write-only access" @@ -3828,7 +3836,6 @@ FAR struct usbhost_driver_s *usbhost_initialize(int controller) */ FAR struct stm32_usbhost_s *priv = &g_usbhost; - int ret; /* Sanity checks */ @@ -3896,3 +3903,5 @@ FAR struct usbhost_driver_s *usbhost_initialize(int controller) up_enable_irq(STM32_IRQ_OTGFS); return &priv->drvr; } + +#endif /* CONFIG_USBHOST && CONFIG_STM32_OTGFS */ diff --git a/nuttx/arch/arm/src/stm32/stm32_usbhost.h b/nuttx/arch/arm/src/stm32/stm32_usbhost.h index b4f8932670..d9bce33f77 100644 --- a/nuttx/arch/arm/src/stm32/stm32_usbhost.h +++ b/nuttx/arch/arm/src/stm32/stm32_usbhost.h @@ -49,6 +49,32 @@ #if defined(CONFIG_STM32_OTGFS) && defined(CONFIG_USBHOST) +/************************************************************************************ + * Public Functions + ************************************************************************************/ +/* + * STM32 USB OTG FS Host Driver Support + * + * Pre-requisites + * + * CONFIG_USBHOST - Enable general USB host support + * CONFIG_STM32_OTGFS - Enable the STM32 USB OTG FS block + * CONFIG_STM32_SYSCFG - Needed + * + * Options: + * + * CONFIG_STM32_OTGFS_RXFIFO_SIZE - Size of the RX FIFO in 32-bit words. + * Default 128 (512 bytes) + * CONFIG_STM32_OTGFS_NPTXFIFO_SIZE - Size of the non-periodic Tx FIFO + * in 32-bit words. Default 96 (384 bytes) + * CONFIG_STM32_OTGFS_PTXFIFO_SIZE - Size of the periodic Tx FIFO in 32-bit + * words. Default 96 (384 bytes) + * CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts. Why would you ever + * want to do that? + * CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access + * debug. Depends on CONFIG_DEBUG. + */ + /************************************************************************************ * Public Functions ************************************************************************************/ diff --git a/nuttx/configs/stm3220g-eval/README.txt b/nuttx/configs/stm3220g-eval/README.txt index 43d9b382e2..ad049ea4c5 100644 --- a/nuttx/configs/stm3220g-eval/README.txt +++ b/nuttx/configs/stm3220g-eval/README.txt @@ -669,6 +669,27 @@ STM3220G-EVAL-specific Configuration Options STM3220G-EVAL LCD Hardware Configuration + STM32 USB OTG FS Host Driver Support + + Pre-requisites + + CONFIG_USBHOST - Enable general USB host support + CONFIG_STM32_OTGFS - Enable the STM32 USB OTG FS block + CONFIG_STM32_SYSCFG - Needed + + Options: + + CONFIG_STM32_OTGFS_RXFIFO_SIZE - Size of the RX FIFO in 32-bit words. + Default 128 (512 bytes) + CONFIG_STM32_OTGFS_NPTXFIFO_SIZE - Size of the non-periodic Tx FIFO + in 32-bit words. Default 96 (384 bytes) + CONFIG_STM32_OTGFS_PTXFIFO_SIZE - Size of the periodic Tx FIFO in 32-bit + words. Default 96 (384 bytes) + CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts. Why would you ever + want to do that? + CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access + debug. Depends on CONFIG_DEBUG. + Configurations ============== @@ -834,7 +855,15 @@ Where is one of the following: CONFIG_NX=y : Enable graphics suppport CONFIG_MM_REGIONS=2 : When FSMC is enabled, so is the on-board SRAM memory region - 8. This configuration requires that jumper JP22 be set to enable RS-232 operation. + 8. USB OTG FS Device or Host Support + + CONFIG_USBDEV - Enable USB device support + CONFIG_USBHOST - Enable USB host support + CONFIG_STM32_OTGFS - Enable the STM32 USB OTG FS block + CONFIG_STM32_SYSCFG - Needed + CONFIG_SCHED_WORKQUEUE - Worker thread support is required + + 9. This configuration requires that jumper JP22 be set to enable RS-232 operation. nsh2: ----- diff --git a/nuttx/configs/stm3220g-eval/nsh/defconfig b/nuttx/configs/stm3220g-eval/nsh/defconfig index a0f7a64be2..a6c4db2547 100644 --- a/nuttx/configs/stm3220g-eval/nsh/defconfig +++ b/nuttx/configs/stm3220g-eval/nsh/defconfig @@ -998,7 +998,7 @@ CONFIG_STMPE811_THRESHX=26 CONFIG_STMPE811_THRESHY=34 # -# USB Device Configuration +# STM32 USB OTG FS Device Configuration # # CONFIG_USBDEV # Enables USB device support @@ -1025,6 +1025,36 @@ CONFIG_USBDEV_MAXPOWER=100 CONFIG_USBDEV_TRACE=n CONFIG_USBDEV_TRACE_NRECORDS=128 +# +# STM32 USB OTG FS Host Configuration +# +# Pre-requisites +# +# CONFIG_USBHOST - Enable general USB host support +# CONFIG_STM32_OTGFS - Enable the STM32 USB OTG FS block +# CONFIG_STM32_SYSCFG - Needed +# CONFIG_SCHED_WORKQUEUE - Worker thread support is required +# +# Options: +# +# CONFIG_STM32_OTGFS_RXFIFO_SIZE - Size of the RX FIFO in 32-bit words. +# Default 128 (512 bytes) +# CONFIG_STM32_OTGFS_NPTXFIFO_SIZE - Size of the non-periodic Tx FIFO +# in 32-bit words. Default 96 (384 bytes) +# CONFIG_STM32_OTGFS_PTXFIFO_SIZE - Size of the periodic Tx FIFO in 32-bit +# words. Default 96 (384 bytes) +# CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts. Why would you ever +# want to do that? +# CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access +# debug. Depends on CONFIG_DEBUG. +# +CONFIG_USBHOST=n +# ONFIG_STM32_OTGFS_RXFIFO_SIZE +#CONFIG_STM32_OTGFS_NPTXFIFO_SIZE +#CONFIG_STM32_OTGFS_PTXFIFO_SIZE +CONFIG_STM32_OTGFS_SOFINTR=n +CONFIG_STM32_USBHOST_REGDEBUG=n + # # USB Serial Device Configuration # diff --git a/nuttx/configs/stm3220g-eval/src/up_nsh.c b/nuttx/configs/stm3220g-eval/src/up_nsh.c index 3b061902ba..e1359de96a 100644 --- a/nuttx/configs/stm3220g-eval/src/up_nsh.c +++ b/nuttx/configs/stm3220g-eval/src/up_nsh.c @@ -55,7 +55,12 @@ # include #endif +#ifdef CONFIG_STM32_OTGFS +# include "stm32_usbhost.h" +#endif + #include "stm32_internal.h" +#include "stm3220g-internal.h" /**************************************************************************** * Pre-Processor Definitions @@ -67,29 +72,19 @@ #undef CONFIG_STM32_SPI1 -/* PORT and SLOT number probably depend on the board configuration */ +/* MMCSD PORT and SLOT number probably depend on the board configuration */ -#ifdef CONFIG_ARCH_BOARD_STM3220G_EVAL -# define CONFIG_NSH_HAVEUSBDEV 1 -# define CONFIG_NSH_HAVEMMCSD 1 -# if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0 -# error "Only one MMC/SD slot" -# undef CONFIG_NSH_MMCSDSLOTNO -# endif -# ifndef CONFIG_NSH_MMCSDSLOTNO -# define CONFIG_NSH_MMCSDSLOTNO 0 -# endif -#else - /* Add configuration for new STM32 boards here */ -# error "Unrecognized STM32 board" -# undef CONFIG_NSH_HAVEUSBDEV -# undef CONFIG_NSH_HAVEMMCSD +#define HAVE_USBDEV 1 +#define HAVE_MMCSD 1 +#define HAVE_USBHOST 1 + +#if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0 +# error "Only one MMC/SD slot" +# undef CONFIG_NSH_MMCSDSLOTNO #endif -/* Can't support USB features if USB is not enabled */ - -#ifndef CONFIG_USBDEV -# undef CONFIG_NSH_HAVEUSBDEV +#ifndef CONFIG_NSH_MMCSDSLOTNO +# define CONFIG_NSH_MMCSDSLOTNO 0 #endif /* Can't support MMC/SD features if mountpoints are disabled or if SDIO support @@ -97,13 +92,32 @@ */ #if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_STM32_SDIO) -# undef CONFIG_NSH_HAVEMMCSD +# undef HAVE_MMCSD #endif #ifndef CONFIG_NSH_MMCSDMINOR # define CONFIG_NSH_MMCSDMINOR 0 #endif +/* Can't support USB host or device features if USB OTG FS is not enabled */ + +#ifndef CONFIG_STM32_OTGFS +# undef HAVE_USBDEV +# undef HAVE_USBHOST +#endif + +/* Can't support USB device is USB device is not enabled */ + +#ifndef CONFIG_USBDEV +# undef HAVE_USBDEV +#endif + +/* Can't support USB host is USB host is not enabled */ + +#ifndef CONFIG_USBHOST +# undef HAVE_USBHOST +#endif + /* Debug ********************************************************************/ #ifdef CONFIG_CPP_HAVE_VARARGS @@ -138,8 +152,10 @@ int nsh_archinitialize(void) FAR struct spi_dev_s *spi; FAR struct mtd_dev_s *mtd; #endif -#ifdef CONFIG_NSH_HAVEMMCSD +#ifdef HAVE_MMCSD FAR struct sdio_dev_s *sdio; +#endif +#if defined(HAVE_MMCSD) || defined (HAVE_USBHOST) int ret; #endif @@ -169,7 +185,7 @@ int nsh_archinitialize(void) /* Mount the SDIO-based MMC/SD block driver */ -#ifdef CONFIG_NSH_HAVEMMCSD +#ifdef HAVE_MMCSD /* First, get an instance of the SDIO interface */ message("nsh_archinitialize: Initializing SDIO slot %d\n", @@ -203,7 +219,7 @@ int nsh_archinitialize(void) * will monitor for USB connection and disconnection events. */ -#if defined(CONFIG_STM32_OTGFS) && defined(CONFIG_USBHOST) +#ifdef HAVE_USBHOST ret = stm32_usbhost_initialize(); if (ret != OK) { diff --git a/nuttx/configs/stm3220g-eval/src/up_usb.c b/nuttx/configs/stm3220g-eval/src/up_usb.c index 374d974ffc..be303a8a5b 100644 --- a/nuttx/configs/stm3220g-eval/src/up_usb.c +++ b/nuttx/configs/stm3220g-eval/src/up_usb.c @@ -43,6 +43,8 @@ #include #include #include +#include +#include #include #include @@ -59,10 +61,10 @@ * Definitions ************************************************************************************/ -#if defined(CONFIG_USBDEV) || defined(CONFIG_USBDEV) +#if defined(CONFIG_USBDEV) || defined(CONFIG_USBHOST) # define HAVE_USB 1 #else -# warning "CONFIG_STM32_OTGFS is enabled but neither CONFIG_USBDEV nor CONFIG_USBDEV" +# warning "CONFIG_STM32_OTGFS is enabled but neither CONFIG_USBDEV nor CONFIG_USBHOST" # undef HAVE_USB #endif @@ -78,7 +80,7 @@ * Private Data ************************************************************************************/ -#ifdef CONFIG_NSH_HAVEUSBHOST +#ifdef CONFIG_USBHOST static struct usbhost_driver_s *g_drvr; #endif @@ -94,7 +96,7 @@ static struct usbhost_driver_s *g_drvr; * ****************************************************************************/ -#ifdef CONFIG_NSH_HAVEUSBHOST +#ifdef CONFIG_USBHOST static int usbhost_waiter(int argc, char *argv[]) { bool connected = false; diff --git a/nuttx/configs/stm3240g-eval/README.txt b/nuttx/configs/stm3240g-eval/README.txt index 49e939a238..c8c1fdfa76 100755 --- a/nuttx/configs/stm3240g-eval/README.txt +++ b/nuttx/configs/stm3240g-eval/README.txt @@ -831,6 +831,28 @@ STM3240G-EVAL-specific Configuration Options CONFIG_STM32_ILI9320_DISABLE (includes ILI9321) CONFIG_STM32_ILI9325_DISABLE + STM32 USB OTG FS Host Driver Support + + Pre-requisites + + CONFIG_USBHOST - Enable USB host support + CONFIG_STM32_OTGFS - Enable the STM32 USB OTG FS block + CONFIG_STM32_SYSCFG - Needed + CONFIG_SCHED_WORKQUEUE - Worker thread support is required + + Options: + + CONFIG_STM32_OTGFS_RXFIFO_SIZE - Size of the RX FIFO in 32-bit words. + Default 128 (512 bytes) + CONFIG_STM32_OTGFS_NPTXFIFO_SIZE - Size of the non-periodic Tx FIFO + in 32-bit words. Default 96 (384 bytes) + CONFIG_STM32_OTGFS_PTXFIFO_SIZE - Size of the periodic Tx FIFO in 32-bit + words. Default 96 (384 bytes) + CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts. Why would you ever + want to do that? + CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access + debug. Depends on CONFIG_DEBUG. + Configurations ============== @@ -996,7 +1018,15 @@ Where is one of the following: CONFIG_NX=y : Enable graphics suppport CONFIG_MM_REGIONS=3 : When FSMC is enabled, so is the on-board SRAM memory region - 8. This configuration requires that jumper JP22 be set to enable RS-232 + 8. USB OTG FS Device or Host Support + + CONFIG_USBDEV - Enable USB device support + CONFIG_USBHOST - Enable USB host support + CONFIG_STM32_OTGFS - Enable the STM32 USB OTG FS block + CONFIG_STM32_SYSCFG - Needed + CONFIG_SCHED_WORKQUEUE - Worker thread support is required + + 9. This configuration requires that jumper JP22 be set to enable RS-232 operation. nsh2: diff --git a/nuttx/configs/stm32f4discovery/README.txt b/nuttx/configs/stm32f4discovery/README.txt index 09a2bb2b00..a1fe2c3560 100755 --- a/nuttx/configs/stm32f4discovery/README.txt +++ b/nuttx/configs/stm32f4discovery/README.txt @@ -883,6 +883,29 @@ STM32F4Discovery-specific Configuration Options CONFIG_SDIO_WIDTH_D1_ONLY - Select 1-bit transfer mode. Default: 4-bit transfer mode. + STM32 USB OTG FS Host Driver Support + + Pre-requisites + + CONFIG_USBDEV - Enable USB device support + CONFIG_USBHOST - Enable USB host support + CONFIG_STM32_OTGFS - Enable the STM32 USB OTG FS block + CONFIG_STM32_SYSCFG - Needed + CONFIG_SCHED_WORKQUEUE - Worker thread support is required + + Options: + + CONFIG_STM32_OTGFS_RXFIFO_SIZE - Size of the RX FIFO in 32-bit words. + Default 128 (512 bytes) + CONFIG_STM32_OTGFS_NPTXFIFO_SIZE - Size of the non-periodic Tx FIFO + in 32-bit words. Default 96 (384 bytes) + CONFIG_STM32_OTGFS_PTXFIFO_SIZE - Size of the periodic Tx FIFO in 32-bit + words. Default 96 (384 bytes) + CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts. Why would you ever + want to do that? + CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access + debug. Depends on CONFIG_DEBUG. + Configurations ============== diff --git a/nuttx/drivers/usbhost/usbhost_enumerate.c b/nuttx/drivers/usbhost/usbhost_enumerate.c index 8e1cd80e71..7ab055b574 100644 --- a/nuttx/drivers/usbhost/usbhost_enumerate.c +++ b/nuttx/drivers/usbhost/usbhost_enumerate.c @@ -122,8 +122,8 @@ static void usbhost_putle16(uint8_t *dest, uint16_t val) * *******************************************************************************/ -static inline int usbhost_devdesc(const struct usb_devdesc_s *devdesc, - struct usbhost_id_s *id) +static inline int usbhost_devdesc(FAR const struct usb_devdesc_s *devdesc, + FAR struct usbhost_id_s *id) { /* Clear the ID info */ @@ -131,7 +131,7 @@ static inline int usbhost_devdesc(const struct usb_devdesc_s *devdesc, /* Pick off the class ID info */ - id->base = devdesc->class; + id->base = devdesc->classid; id->subclass = devdesc->subclass; id->proto = devdesc->protocol; @@ -194,7 +194,7 @@ static inline int usbhost_configdesc(const uint8_t *configdesc, int cfglen, */ DEBUGASSERT(remaining >= sizeof(struct usb_ifdesc_s)); - id->base = ifdesc->class; + id->base = ifdesc->classid; id->subclass = ifdesc->subclass; id->proto = ifdesc->protocol; uvdbg("class:%d subclass:%d protocol:%d\n", diff --git a/nuttx/drivers/usbhost/usbhost_hidkbd.c b/nuttx/drivers/usbhost/usbhost_hidkbd.c index ce951e1e63..73224ff5c0 100644 --- a/nuttx/drivers/usbhost/usbhost_hidkbd.c +++ b/nuttx/drivers/usbhost/usbhost_hidkbd.c @@ -255,7 +255,9 @@ static inline int usbhost_devinit(FAR struct usbhost_state_s *priv); static inline uint16_t usbhost_getle16(const uint8_t *val); static inline void usbhost_putle16(uint8_t *dest, uint16_t val); static inline uint32_t usbhost_getle32(const uint8_t *val); +#if 0 /* Not used */ static void usbhost_putle32(uint8_t *dest, uint32_t val); +#endif /* Transfer descriptor memory management */ @@ -701,7 +703,7 @@ static int usbhost_kbdpoll(int argc, char *argv[]) #if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_VERBOSE) unsigned int npolls = 0; #endif - unsigned int nerrors; + unsigned int nerrors = 0; int ret; uvdbg("Started\n"); @@ -1381,6 +1383,7 @@ static inline uint32_t usbhost_getle32(const uint8_t *val) * ****************************************************************************/ +#if 0 /* Not used */ static void usbhost_putle32(uint8_t *dest, uint32_t val) { /* Little endian means LS halfword first in byte stream */ @@ -1388,6 +1391,7 @@ static void usbhost_putle32(uint8_t *dest, uint32_t val) usbhost_putle16(dest, (uint16_t)(val & 0xffff)); usbhost_putle16(dest+2, (uint16_t)(val >> 16)); } +#endif /**************************************************************************** * Name: usbhost_tdalloc diff --git a/nuttx/include/nuttx/usb/usbhost.h b/nuttx/include/nuttx/usb/usbhost.h index 058f5403e5..c68cb4712e 100644 --- a/nuttx/include/nuttx/usb/usbhost.h +++ b/nuttx/include/nuttx/usb/usbhost.h @@ -562,7 +562,7 @@ struct usbhost_epdesc_s uint8_t addr; /* Endpoint address */ bool in; /* Direction: true->IN */ uint8_t funcaddr; /* USB address of function containing endpoint */ - uint8_t xfrtype; /* Transfer type. See SB_EP_ATTR_XFER_* in usb.h */ + uint8_t xfrtype; /* Transfer type. See USB_EP_ATTR_XFER_* in usb.h */ uint8_t interval; /* Polling interval */ uint16_t mxpacketsize; /* Max packetsize */ }; From f58b0085d751ed0130f8dcdb7ebac19784d462ba Mon Sep 17 00:00:00 2001 From: patacongo Date: Mon, 20 Aug 2012 16:14:57 +0000 Subject: [PATCH 14/31] Changes for good auto-configuration of Micropendous3 board git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5041 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/configs/Kconfig | 6 +++--- nuttx/configs/micropendous3/hello/defconfig | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nuttx/configs/Kconfig b/nuttx/configs/Kconfig index 2f6595dbdc..fc5cf7a0ff 100644 --- a/nuttx/configs/Kconfig +++ b/nuttx/configs/Kconfig @@ -194,7 +194,7 @@ config ARCH_BOARD_MCU123 lpc214x development board. This OS is also built with the arm-elf toolchain*. The port supports serial, timer0, spi, and usb. -config ARCH_BOARD_MICROPENDOUS +config ARCH_BOARD_MICROPENDOUS3 bool "Opendous Micropendous 3 board" depends on ARCH_CHIP_AT90USB646 || ARCH_CHIP_AT90USB647 || ARCH_CHIP_AT90USB1286 || ARCH_CHIP_AT90USB1287 ---help--- @@ -509,7 +509,7 @@ config ARCH_BOARD default "m68322evb" if ARCH_BOARD_M68332EVB default "mbed" if ARCH_BOARD_MBED default "mcu123-lpc214x" if ARCH_BOARD_MCU123 - default "micropendous3" if ARCH_BOARD_MICROPENDOUS + default "micropendous3" if ARCH_BOARD_MICROPENDOUS3 default "mirtoo" if ARCH_BOARD_MIRTOO default "mx1ads" if ARCH_BOARD_MX1ADS default "ne64badge" if ARCH_BOARD_NE64BADGE @@ -613,7 +613,7 @@ endif if ARCH_BOARD_MCU123 source "configs/mcu123-lpc214x/Kconfig" endif -if ARCH_BOARD_MICROPENDOUS +if ARCH_BOARD_MICROPENDOUS3 source "configs/micropendous3/Kconfig" endif if ARCH_BOARD_MIRTOO diff --git a/nuttx/configs/micropendous3/hello/defconfig b/nuttx/configs/micropendous3/hello/defconfig index 2f7c9fa7d2..f41c228494 100644 --- a/nuttx/configs/micropendous3/hello/defconfig +++ b/nuttx/configs/micropendous3/hello/defconfig @@ -71,15 +71,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=avr +CONFIG_ARCH="avr" CONFIG_ARCH_AVR=y CONFIG_ARCH_AT90USB=y -CONFIG_ARCH_CHIP=at90usb +CONFIG_ARCH_CHIP="at90usb" CONFIG_ARCH_CHIP_AT90USB647=y -CONFIG_ARCH_BOARD=micropendous3 +CONFIG_ARCH_BOARD="micropendous3" CONFIG_ARCH_BOARD_MICROPENDOUS3=y -CONFIG_BOARD_LOOPSPERMSEC=(8*108) -CONFIG_DRAM_SIZE=(4*1024) +CONFIG_BOARD_LOOPSPERMSEC=864 +CONFIG_DRAM_SIZE=4096 CONFIG_DRAM_START=0x800100 CONFIG_ARCH_NOINTC=y CONFIG_ARCH_IRQPRIO=n @@ -282,7 +282,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 From 5a4b8d9930418be2229895c113624e99b94c80f3 Mon Sep 17 00:00:00 2001 From: patacongo Date: Mon, 20 Aug 2012 21:22:03 +0000 Subject: [PATCH 15/31] Early STM32 USB OTF FS host debug changes git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5042 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/arch/arm/src/stm32/stm32_otgfshost.c | 103 ++++++++++++--------- 1 file changed, 58 insertions(+), 45 deletions(-) diff --git a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c index 821194eb87..398f2dff69 100644 --- a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c +++ b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c @@ -197,7 +197,7 @@ struct stm32_chan_s volatile uint16_t xfrd; /* Number of bytes transferred */ uint16_t maxpacket; /* Max packet size */ uint16_t buflen; /* Buffer length (remaining) */ - uint16_t xfrlen; /* Number of bytes transferrred */ + uint16_t xfrlen; /* Number of bytes transferred */ FAR uint8_t *buffer; /* Transfer buffer pointer */ }; @@ -247,7 +247,7 @@ static uint32_t stm32_getreg(uint32_t addr); static void stm32_putreg(uint32_t addr, uint32_t value); #else # define stm32_getreg(addr) getreg32(addr) -# define stm32_putreg(val,addr) putreg32(val,addr) +# define stm32_putreg(addr,val) putreg32(val,addr) #endif static inline void stm32_modifyreg(uint32_t addr, uint32_t clrbits, @@ -506,7 +506,7 @@ static uint32_t stm32_getreg(uint32_t addr) *******************************************************************************/ #ifdef CONFIG_STM32_USBHOST_REGDEBUG -static void stm32_putreg(uint32_t val, uint32_t addr) +static void stm32_putreg(uint32_t addr, uint32_t val) { /* Check if we need to print this value */ @@ -978,7 +978,7 @@ static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx) regval = stm32_getreg(STM32_OTGFS_HNPTXSTS); avail32 = (regval & OTGFS_HNPTXSTS_NPTXFSAV_MASK) >> OTGFS_HNPTXSTS_NPTXFSAV_SHIFT; - /* Check if there is enough space in the Tx FIFO space */ + /* Check if there is enough space available in the Tx FIFO */ if (buflen32 > avail32) { @@ -1230,7 +1230,7 @@ static void stm32_gint_halttxchan(FAR struct stm32_usbhost_s *priv, int chidx) { uint32_t hcchar; uint32_t eptype; - uint32_t txsts; + unsigned int avail; /* Prepare to set the CHannel DISable and the CHannel ENAble bits in the * HCCHAR register. @@ -1243,29 +1243,28 @@ static void stm32_gint_halttxchan(FAR struct stm32_usbhost_s *priv, int chidx) eptype = (hcchar & OTGFS_HCCHAR_EPTYP_MASK); + /* Check for space in the Tx FIFO to issue the halt */ + if (eptype == OTGFS_HCCHAR_EPTYP_CTRL || eptype == OTGFS_HCCHAR_EPTYP_BULK) { - /* Check if the non-periodic Tx FIFO is empty. */ + /* Get the number of words available in the non-periodic Tx FIFO. */ - txsts = stm32_getreg(STM32_OTGFS_HNPTXSTS); - if ((txsts & OTGFS_HNPTXSTS_NPTXFSAV_MASK) == 0) - { - /* The Tx FIFO is empty... disable the channel */ - - hcchar &= ~OTGFS_HCCHAR_CHENA; - } + avail = stm32_getreg(STM32_OTGFS_HNPTXSTS) & OTGFS_HNPTXSTS_NPTXFSAV_MASK; } else /* if (eptype == OTGFS_HCCHAR_EPTYP_ISOC || eptype == OTGFS_HCCHAR_EPTYP_INTR) */ { - /* Check if the periodic Tx FIFO is empty. */ + /* Get the number of words available in the non-periodic Tx FIFO. */ - txsts = stm32_getreg(STM32_OTGFS_HPTXSTS); - if ((txsts & OTGFS_HPTXSTS_PTXFSAVL_MASK) == 0) - { - /* The Tx FIFO is empty... disable the channel */ + avail = stm32_getreg(STM32_OTGFS_HPTXSTS) & OTGFS_HPTXSTS_PTXFSAVL_MASK; + } - hcchar &= ~OTGFS_HCCHAR_CHENA; - } + /* Check if there is any space available in the Tx FIFO. */ + + if (avail == 0) + { + /* The Tx FIFO is full... disable the channel */ + + hcchar &= ~OTGFS_HCCHAR_CHENA; } /* Halt the channel by setting CHDIS in the HCCHAR */ @@ -1309,7 +1308,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, hcchar = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); eptype = (hcchar & OTGFS_HCCHAR_EPTYP_MASK) >> OTGFS_HCCHAR_EPTYP_SHIFT; - /* Check for a pending ACK response received/transmitted (ACK) interrrupt */ + /* Check for a pending ACK response received/transmitted (ACK) interrupt */ if ((pending & OTGFS_HCINT_ACK) != 0) { @@ -1319,7 +1318,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); } - /* Check for a pending STALL response receive (STALL) interrrupt */ + /* Check for a pending STALL response receive (STALL) interrupt */ else if ((pending & OTGFS_HCINT_STALL) != 0) { @@ -1348,7 +1347,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, pending &= ~OTGFS_HCINT_NAK; } - /* Check for a pending Data Toggle ERRor (DTERR) interrrupt */ + /* Check for a pending Data Toggle ERRor (DTERR) interrupt */ else if ((pending & OTGFS_HCINT_DTERR) != 0) { @@ -1371,7 +1370,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, chan->chstate = CHSTATE_DTERR; } - /* Check for a pending FRaMe OverRun (FRMOR) interrrupt */ + /* Check for a pending FRaMe OverRun (FRMOR) interrupt */ if ((pending & OTGFS_HCINT_FRMOR) != 0) { @@ -1390,7 +1389,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); } - /* Check for a pending TransFeR Completed (XFRC) interrrupt */ + /* Check for a pending TransFeR Completed (XFRC) interrupt */ else if ((pending & OTGFS_HCINT_XFRC) != 0) { @@ -1438,7 +1437,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, } } - /* Check for a pending CHannel Halted (CHH) interrrupt */ + /* Check for a pending CHannel Halted (CHH) interrupt */ else if ((pending & OTGFS_HCINT_CHH) != 0) { @@ -1483,7 +1482,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); } - /* Check for a pending Transaction ERror (TXERR) interrrupt */ + /* Check for a pending Transaction ERror (TXERR) interrupt */ else if ((pending & OTGFS_HCINT_TXERR) != 0) { @@ -1507,7 +1506,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); } - /* Check for a pending NAK response received (NAK) interrrupt */ + /* Check for a pending NAK response received (NAK) interrupt */ else if ((pending & OTGFS_HCINT_NAK) != 0) { @@ -1579,7 +1578,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, pending = hcint & hcintmsk; - /* Check for a pending ACK response received/transmitted (ACK) interrrupt */ + /* Check for a pending ACK response received/transmitted (ACK) interrupt */ if ((pending & OTGFS_HCINT_ACK) != 0) { @@ -1589,7 +1588,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); } - /* Check for a pending FRaMe OverRun (FRMOR) interrrupt */ + /* Check for a pending FRaMe OverRun (FRMOR) interrupt */ else if ((pending & OTGFS_HCINT_FRMOR) != 0) { @@ -1608,7 +1607,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); } - /* Check for a pending TransFeR Completed (XFRC) interrrupt */ + /* Check for a pending TransFeR Completed (XFRC) interrupt */ else if ((pending & OTGFS_HCINT_XFRC) != 0) { @@ -1633,7 +1632,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, chan->chstate = CHSTATE_XFRC; } - /* Check for a pending STALL response receive (STALL) interrrupt */ + /* Check for a pending STALL response receive (STALL) interrupt */ else if ((pending & OTGFS_HCINT_STALL) != 0) { @@ -1656,7 +1655,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, chan->chstate = CHSTATE_STALL; } - /* Check for a pending NAK response received (NAK) interrrupt */ + /* Check for a pending NAK response received (NAK) interrupt */ else if ((pending & OTGFS_HCINT_NAK) != 0) { @@ -1683,7 +1682,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, chan->chstate = CHSTATE_NAK; } - /* Check for a pending Transaction ERror (TXERR) interrrupt */ + /* Check for a pending Transaction ERror (TXERR) interrupt */ else if ((pending & OTGFS_HCINT_TXERR) != 0) { @@ -1710,7 +1709,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); } - /* Check for a pending response received (xxx) interrrupt */ + /* Check for a pending response received (xxx) interrupt */ #if 0 /* NYET is a reserved bit in the HCINT register */ else if ((pending & OTGFS_HCINT_NYET) != 0) @@ -1737,7 +1736,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, } #endif - /* Check for a pending Data Toggle ERRor (DTERR) interrrupt */ + /* Check for a pending Data Toggle ERRor (DTERR) interrupt */ else if (pending & OTGFS_HCINT_DTERR) { @@ -1760,7 +1759,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); } - /* Check for a pending CHannel Halted (CHH) interrrupt */ + /* Check for a pending CHannel Halted (CHH) interrupt */ else if ((pending & OTGFS_HCINT_CHH) != 0) { @@ -1962,7 +1961,7 @@ static inline void stm32_gint_rxflvlisr(FAR struct stm32_usbhost_s *priv) hcchar = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); - /* The process the interrupt according to the packet status */ + /* Then process the interrupt according to the packet status */ switch (grxsts & OTGFS_GRXSTSH_PKTSTS_MASK) { @@ -2239,7 +2238,8 @@ static inline void stm32_gint_hprtisr(FAR struct stm32_usbhost_s *priv) hprt = stm32_getreg(STM32_OTGFS_HPRT); /* Setup to clear the interrupt bits in GINTSTS by setting the corresponding - * bits in the HPRT. + * bits in the HPRT. The HCINT interrupt bit is cleared when the appropriate + * status bits in the HPRT register are cleared. */ newhprt = hprt & ~(OTGFS_HPRT_PENA | OTGFS_HPRT_PCDET | @@ -2298,27 +2298,40 @@ static inline void stm32_gint_hprtisr(FAR struct stm32_usbhost_s *priv) stm32_putreg(STM32_OTGFS_HFIR, 6000); + /* Are we switching from FS to LS? */ + if ((hcfg & OTGFS_HCFG_FSLSPCS_MASK) != OTGFS_HCFG_FSLSPCS_LS6MHz) { + /* Yes... configure for LS */ + hcfg &= ~OTGFS_HCFG_FSLSPCS_MASK; hcfg |= OTGFS_HCFG_FSLSPCS_LS6MHz; stm32_putreg(STM32_OTGFS_HCFG, hcfg); + + /* And reset the port */ + + stm32_portreset(priv); } } else /* if ((hprt & OTGFS_HPRT_PSPD_MASK) == OTGFS_HPRT_PSPD_FS) */ { stm32_putreg(STM32_OTGFS_HFIR, 48000); + + /* Are we switching from LS to FS? */ + if ((hcfg & OTGFS_HCFG_FSLSPCS_MASK) != OTGFS_HCFG_FSLSPCS_FS48MHz) { + /* Yes... configure for FS */ + hcfg &= ~OTGFS_HCFG_FSLSPCS_MASK; hcfg |= OTGFS_HCFG_FSLSPCS_FS48MHz; stm32_putreg(STM32_OTGFS_HCFG, hcfg); + + /* And reset the port */ + + stm32_portreset(priv); } } - - /* Reset the port */ - - stm32_portreset(priv); } } @@ -2490,7 +2503,7 @@ static void stm32_gint_enable(void) regval = stm32_getreg(STM32_OTGFS_GAHBCFG); regval |= OTGFS_GAHBCFG_GINTMSK; - stm32_putreg(OTGFS_GAHBCFG_GINTMSK, regval); + stm32_putreg(STM32_OTGFS_GAHBCFG, regval); } static void stm32_gint_disable(void) @@ -2501,7 +2514,7 @@ static void stm32_gint_disable(void) regval = stm32_getreg(STM32_OTGFS_GAHBCFG); regval &= ~OTGFS_GAHBCFG_GINTMSK; - stm32_putreg(OTGFS_GAHBCFG_GINTMSK, regval); + stm32_putreg(STM32_OTGFS_GAHBCFG, regval); } /******************************************************************************* From 42d23b06d9fd8d3cce24e9ed63d6822bf0582402 Mon Sep 17 00:00:00 2001 From: patacongo Date: Tue, 21 Aug 2012 18:13:35 +0000 Subject: [PATCH 16/31] Several bug fixes for STM32 OTG FS host driver git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5043 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h | 26 +- nuttx/arch/arm/src/stm32/stm32_otgfshost.c | 446 ++++++++++---------- 2 files changed, 228 insertions(+), 244 deletions(-) diff --git a/nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h b/nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h index f6966a5983..ee34172cfd 100644 --- a/nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h +++ b/nuttx/arch/arm/src/stm32/chip/stm32_otgfs.h @@ -205,6 +205,10 @@ #define STM32_OTGFS_DOEPTSIZ2_OFFSET 0x00b50 /* Device OUT endpoint-2 transfer size register */ #define STM32_OTGFS_DOEPTSIZ3_OFFSET 0x00b70 /* Device OUT endpoint-3 transfer size register */ +/* Power and clock gating registers */ + +#define STM32_OTGFS_PCGCCTL_OFFSET 0x0e00 /* Power and clock gating control register */ + /* Data FIFO (DFIFO) access registers */ #define STM32_OTGFS_DFIFO_DEP_OFFSET(n) (0x1000 + ((n) << 12)) @@ -216,15 +220,11 @@ #define STM32_OTGFS_DFIFO_DEP1_OFFSET 0x2000 /* 0x2000-0x2ffc Device IN/OUT Endpoint 1 DFIFO Write/Read Access */ #define STM32_OTGFS_DFIFO_HCH1_OFFSET 0x2000 /* 0x2000-0x2ffc Host OUT/IN Channel 1 DFIFO Read/Write Access */ -#define STM32_OTGFS_DFIFO_DEP2_OFFSET 0x3000 /* 0x3000-0x3ffc Device IN/OUT Endpoint 1 DFIFO Write/Read Access */ -#define STM32_OTGFS_DFIFO_HCH2_OFFSET 0x3000 /* 0x3000-0x3ffc Host OUT/IN Channel 1 DFIFO Read/Write Access */ +#define STM32_OTGFS_DFIFO_DEP2_OFFSET 0x3000 /* 0x3000-0x3ffc Device IN/OUT Endpoint 2 DFIFO Write/Read Access */ +#define STM32_OTGFS_DFIFO_HCH2_OFFSET 0x3000 /* 0x3000-0x3ffc Host OUT/IN Channel 2 DFIFO Read/Write Access */ -#define STM32_OTGFS_DFIFO_DEP3_OFFSET 0x4000 /* 0x4000-0x4ffc Device IN/OUT Endpoint 1 DFIFO Write/Read Access */ -#define STM32_OTGFS_DFIFO_HCH3_OFFSET 0x4000 /* 0x4000-0x4ffc Host OUT/IN Channel 1 DFIFO Read/Write Access */ - -/* Power and clock gating registers */ - -#define STM32_OTGFS_PCGCCTL_OFFSET 0x0e00 /* Power and clock gating control register */ +#define STM32_OTGFS_DFIFO_DEP3_OFFSET 0x4000 /* 0x4000-0x4ffc Device IN/OUT Endpoint 3 DFIFO Write/Read Access */ +#define STM32_OTGFS_DFIFO_HCH3_OFFSET 0x4000 /* 0x4000-0x4ffc Host OUT/IN Channel 3 DFIFO Read/Write Access */ /* Register Addresses *******************************************************************************/ @@ -361,6 +361,10 @@ #define STM32_OTGFS_DOEPTSIZ2 (STM32_OTGFS_BASE+STM32_OTGFS_DOEPTSIZ2_OFFSET) #define STM32_OTGFS_DOEPTSIZ3 (STM32_OTGFS_BASE+STM32_OTGFS_DOEPTSIZ3_OFFSET) +/* Power and clock gating registers */ + +#define STM32_OTGFS_PCGCCTL (STM32_OTGFS_BASE+STM32_OTGFS_PCGCCTL_OFFSET) + /* Data FIFO (DFIFO) access registers */ #define STM32_OTGFS_DFIFO_DEP(n) (STM32_OTGFS_BASE+STM32_OTGFS_DFIFO_DEP_OFFSET(n)) @@ -378,10 +382,6 @@ #define STM32_OTGFS_DFIFO_DEP3 (STM32_OTGFS_BASE+STM32_OTGFS_DFIFO_DEP3_OFFSET) #define STM32_OTGFS_DFIFO_HCH3 (STM32_OTGFS_BASE+STM32_OTGFS_DFIFO_HCH3_OFFSET) -/* Power and clock gating registers */ - -#define STM32_OTGFS_PCGCCTL (STM32_OTGFS_BASE+STM32_OTGFS_PCGCCTL_OFFSET) - /* Register Bitfield Definitions ********************************************************************/ /* Core global control and status registers */ @@ -1006,8 +1006,6 @@ # define OTGFS_DOEPTSIZ_RXDPID_DATA1 (2 << OTGFS_DOEPTSIZ_RXDPID_SHIFT) # define OTGFS_DOEPTSIZ_RXDPID_MDATA (3 << OTGFS_DOEPTSIZ_RXDPID_SHIFT) /* Bit 31: Reserved, must be kept at reset value */ -/* Power and clock gating registers */ - /* Power and clock gating control register */ #define OTGFS_PCGCCTL_STPPCLK (1 << 0) /* Bit 0: Stop PHY clock */ diff --git a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c index 398f2dff69..e6ea2de06d 100644 --- a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c +++ b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c @@ -268,6 +268,7 @@ static int stm32_chan_alloc(FAR struct stm32_usbhost_s *priv); static inline void stm32_chan_free(FAR struct stm32_usbhost_s *priv, int chidx); static inline void stm32_chan_freeall(FAR struct stm32_usbhost_s *priv); static void stm32_chan_configure(FAR struct stm32_usbhost_s *priv, int chidx); +static void stm32_chan_halt(FAR struct stm32_usbhost_s *priv, int chidx); static int stm32_chan_waitsetup(FAR struct stm32_usbhost_s *priv, FAR struct stm32_chan_s *chan); static int stm32_chan_wait(FAR struct stm32_usbhost_s *priv, @@ -291,7 +292,6 @@ static int stm32_ctrl_recvdata(FAR struct stm32_usbhost_s *priv, static void stm32_gint_wrpacket(FAR struct stm32_usbhost_s *priv, FAR uint8_t *buffer, int chidx, int buflen); -static void stm32_gint_halttxchan(FAR struct stm32_usbhost_s *priv, int chidx); static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, int chidx); static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, @@ -610,6 +610,13 @@ static int stm32_chan_alloc(FAR struct stm32_usbhost_s *priv) static void stm32_chan_free(FAR struct stm32_usbhost_s *priv, int chidx) { DEBUGASSERT((unsigned)chidx < STM32_NHOST_CHANNELS); + + /* Halt the channel */ + + stm32_chan_halt(priv, chidx); + + /* Mark the channel available */ + priv->chan[chidx].inuse = false; } @@ -625,11 +632,11 @@ static inline void stm32_chan_freeall(FAR struct stm32_usbhost_s *priv) { uint8_t chidx; - /* Clear address an "in-use" flag for all host channels */ + /* Free all host channels */ for (chidx = 2; chidx < STM32_NHOST_CHANNELS ; chidx ++) { - priv->chan[chidx].inuse = false; + stm32_chan_free(priv, chidx); } } @@ -753,6 +760,82 @@ static void stm32_chan_configure(FAR struct stm32_usbhost_s *priv, int chidx) stm32_putreg(STM32_OTGFS_HCCHAR(chidx), regval); } +/******************************************************************************* + * Name: stm32_chan_halt + * + * Description: + * Halt the channel associated with 'chidx' by setting the CHannel DISable + * (CHDIS) bit in in the HCCHAR register. + * + *******************************************************************************/ + +static void stm32_chan_halt(FAR struct stm32_usbhost_s *priv, int chidx) +{ + uint32_t hcchar; + uint32_t intmsk; + uint32_t eptype; + unsigned int avail; + + /* "The application can disable any channel by programming the OTG_FS_HCCHARx + * register with the CHDIS and CHENA bits set to 1. This enables the OTG_FS + * host to flush the posted requests (if any) and generates a channel halted + * interrupt. The application must wait for the CHH interrupt in OTG_FS_HCINTx + * before reallocating the channel for other transactions. The OTG_FS host + * does not interrupt the transaction that has already been started on the + * USB." + */ + + hcchar = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); + hcchar |= (OTGFS_HCCHAR_CHDIS | OTGFS_HCCHAR_CHENA); + + /* Get the endpoint type from the HCCHAR register */ + + eptype = (hcchar & OTGFS_HCCHAR_EPTYP_MASK); + + /* Check for space in the Tx FIFO to issue the halt. + * + * "Before disabling a channel, the application must ensure that there is at + * least one free space available in the non-periodic request queue (when + * disabling a non-periodic channel) or the periodic request queue (when + * disabling a periodic channel). The application can simply flush the + * posted requests when the Request queue is full (before disabling the + * channel), by programming the OTG_FS_HCCHARx register with the CHDIS bit + * set to 1, and the CHENA bit cleared to 0. + */ + + if (eptype == OTGFS_HCCHAR_EPTYP_CTRL || eptype == OTGFS_HCCHAR_EPTYP_BULK) + { + /* Get the number of words available in the non-periodic Tx FIFO. */ + + avail = stm32_getreg(STM32_OTGFS_HNPTXSTS) & OTGFS_HNPTXSTS_NPTXFSAV_MASK; + } + else /* if (eptype == OTGFS_HCCHAR_EPTYP_ISOC || eptype == OTGFS_HCCHAR_EPTYP_INTR) */ + { + /* Get the number of words available in the non-periodic Tx FIFO. */ + + avail = stm32_getreg(STM32_OTGFS_HPTXSTS) & OTGFS_HPTXSTS_PTXFSAVL_MASK; + } + + /* Check if there is any space available in the Tx FIFO. */ + + if (avail == 0) + { + /* The Tx FIFO is full... disable the channel to flush the requests */ + + hcchar &= ~OTGFS_HCCHAR_CHENA; + } + + /* Unmask the CHannel Halted (CHH) interrupt */ + + intmsk = stm32_getreg(STM32_OTGFS_HCINTMSK(chidx)); + intmsk |= OTGFS_HCINT_CHH; + stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), intmsk); + + /* Halt the channel by setting CHDIS (and maybe CHENA) in the HCCHAR */ + + stm32_putreg(STM32_OTGFS_HCCHAR(chidx), hcchar); +} + /******************************************************************************* * Name: stm32_chan_waitsetup * @@ -891,49 +974,51 @@ static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx) priv->chan[chidx].xfrlen = 0; /* Compute the expected number of packets associated to the transfer. - * If it is a IN endpoint, then we need to round down to the number - * of full, maximally sized packets that can fit in the read buffer. + * If the transfer length is zero (or less than the size of one maximum + * size packet), then one packet is expected. + */ + + /* If the transfer size is greater than one packet, then xalculate the + * number of packets that will be received/sent, including any partial + * final packet. */ maxpacket = priv->chan[chidx].maxpacket; - if (priv->chan[chidx].in) - { - npackets = priv->chan[chidx].buflen / maxpacket; - /* A read buffer must at least one max packet size in length */ - - DEBUGASSERT(npackets > 0); - - /* For the buffer length to an even multiple of maxpacket */ - - priv->chan[chidx].buflen = npackets * maxpacket; - } - - /* If it is an OUT endpoint, then we need round up to include any - * possible partial, final packet. - */ - - else if (priv->chan[chidx].buflen > 0) + if (priv->chan[chidx].buflen > maxpacket) { npackets = (priv->chan[chidx].buflen + maxpacket - 1) / maxpacket; + + /* Clip if the buffer length if it exceeds the maximum number of + * packets that can be transferred (this should not happen). + */ + + if (npackets > STM32_MAX_PKTCOUNT) + { + npackets = STM32_MAX_PKTCOUNT; + priv->chan[chidx].buflen = STM32_MAX_PKTCOUNT * maxpacket; + } } - - /* Otherwise, we are sending a single zero-length packet */ - else { + /* One packet will be sent/received (might be a zero length packet) */ + npackets = 1; } - /* Clip it the buffer length if it exceeds the maximum number of - * packets that can be transferred (this should not happen). + /* If it is an IN transfer, then adjust the size of the buffer UP to + * a full number of packets. Hmmm... couldn't this cause an overrun + * into unallocated memory? */ - if (npackets > STM32_MAX_PKTCOUNT) +#if 0 /* Think about this */ + if (priv->chan[chidx].in) { - npackets = STM32_MAX_PKTCOUNT; - priv->chan[chidx].buflen = STM32_MAX_PKTCOUNT * maxpacket; + /* Force the buffer length to an even multiple of maxpacket */ + + priv->chan[chidx].buflen = npackets * maxpacket; } +#endif /* Setup the HCTSIZn register */ @@ -957,8 +1042,8 @@ static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx) regval |= OTGFS_HCCHAR_CHENA; stm32_putreg(STM32_OTGFS_HCCHAR(chidx), regval); - /* If this is an out transfer, then we need to do more.. we need to copy the - * outgoing data into the correct TxFIFO. + /* If this is an out transfer, then we need to do more.. we need to copy + * the outgoing data into the correct TxFIFO. */ if (!priv->chan[chidx].in && priv->chan[chidx].buflen > 0) @@ -1016,11 +1101,11 @@ static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx) /* Write packet into the Tx FIFO. */ - stm32_gint_wrpacket(priv, priv->chan[chidx].buffer, chidx, priv->chan[chidx].buflen); + stm32_gint_wrpacket(priv, priv->chan[chidx].buffer, chidx, + priv->chan[chidx].buflen); } } - /******************************************************************************* * Name: stm32_getframe * @@ -1078,9 +1163,23 @@ static int stm32_ctrl_sendsetup(FAR struct stm32_usbhost_s *priv, /* Wait for the transfer to complete */ ret = stm32_chan_wait(priv, chan); + + /* Return on success and for all failures other than EAGAIN. EAGAIN + * means that the device NAKed the SETUP command and that we should + * try a few more times. + */ + if (ret != -EAGAIN) { - udbg("Transfer failed: %d\n", ret); + /* Output some debug information if the transfer failed */ + + if (ret < 0) + { + udbg("Transfer failed: %d\n", ret); + } + + /* Return the result in any event */ + return ret; } @@ -1217,61 +1316,6 @@ static void stm32_gint_wrpacket(FAR struct stm32_usbhost_s *priv, } } -/******************************************************************************* - * Name: stm32_gint_halttxchan - * - * Description: - * Halt the Tx channel associated with 'chidx' by setting the CHannel DISable - * (CHDIS) bit in in the HCCHAR register. - * - *******************************************************************************/ - -static void stm32_gint_halttxchan(FAR struct stm32_usbhost_s *priv, int chidx) -{ - uint32_t hcchar; - uint32_t eptype; - unsigned int avail; - - /* Prepare to set the CHannel DISable and the CHannel ENAble bits in the - * HCCHAR register. - */ - - hcchar = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); - hcchar |= (OTGFS_HCCHAR_CHDIS | OTGFS_HCCHAR_CHENA); - - /* Get the endpoint type from the HCCHAR register */ - - eptype = (hcchar & OTGFS_HCCHAR_EPTYP_MASK); - - /* Check for space in the Tx FIFO to issue the halt */ - - if (eptype == OTGFS_HCCHAR_EPTYP_CTRL || eptype == OTGFS_HCCHAR_EPTYP_BULK) - { - /* Get the number of words available in the non-periodic Tx FIFO. */ - - avail = stm32_getreg(STM32_OTGFS_HNPTXSTS) & OTGFS_HNPTXSTS_NPTXFSAV_MASK; - } - else /* if (eptype == OTGFS_HCCHAR_EPTYP_ISOC || eptype == OTGFS_HCCHAR_EPTYP_INTR) */ - { - /* Get the number of words available in the non-periodic Tx FIFO. */ - - avail = stm32_getreg(STM32_OTGFS_HPTXSTS) & OTGFS_HPTXSTS_PTXFSAVL_MASK; - } - - /* Check if there is any space available in the Tx FIFO. */ - - if (avail == 0) - { - /* The Tx FIFO is full... disable the channel */ - - hcchar &= ~OTGFS_HCCHAR_CHENA; - } - - /* Halt the channel by setting CHDIS in the HCCHAR */ - - stm32_putreg(STM32_OTGFS_HCCHAR(chidx), hcchar); -} - /******************************************************************************* * Name: stm32_gint_hcinisr * @@ -1314,31 +1358,26 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, { /* Clear the pending the ACK response received/transmitted (ACK) interrupt */ - hcint &= ~OTGFS_HCINT_ACK; - stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_ACK); } /* Check for a pending STALL response receive (STALL) interrupt */ else if ((pending & OTGFS_HCINT_STALL) != 0) { - /* Unmask the CHannel Halted (CHH) interrupt */ - - hcintmsk |= OTGFS_HCINT_CHH; - stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); - /* Set the stall state */ chan->chstate = CHSTATE_STALL; /* Clear the NAK and STALL Conditions. */ - hcint &= ~(OTGFS_HCINT_NAK | OTGFS_HCINT_STALL); - stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + stm32_putreg(STM32_OTGFS_HCINT(chidx), (OTGFS_HCINT_NAK | OTGFS_HCINT_STALL)); - /* Halt the Tx channel */ + /* Halt the channel when a STALL, TXERR, BBERR or DTERR interrupt is + * received on the channel. + */ - stm32_gint_halttxchan(priv, chidx); + stm32_chan_halt(priv, chidx); /* When there is a STALL, clear any pending NAK so that it is nor * processed below. @@ -1351,19 +1390,15 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, else if ((pending & OTGFS_HCINT_DTERR) != 0) { - /* Unmask the CHannel Halted (CHH) interrupt */ + /* Halt the channel when a STALL, TXERR, BBERR or DTERR interrupt is + * received on the channel. + */ - hcintmsk |= OTGFS_HCINT_CHH; - stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); - - /* Halt the Tx channel */ - - stm32_gint_halttxchan(priv, chidx); + stm32_chan_halt(priv, chidx); /* Clear the NAK and data toggle error conditions */ - hcint &= ~(OTGFS_HCINT_NAK | OTGFS_HCINT_DTERR); - stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + stm32_putreg(STM32_OTGFS_HCINT(chidx), (OTGFS_HCINT_NAK | OTGFS_HCINT_DTERR)); /* Set the Data Toggle ERRor (DTERR) state */ @@ -1374,51 +1409,38 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, if ((pending & OTGFS_HCINT_FRMOR) != 0) { - /* Unmask the CHannel Halted (CHH) interrupt */ + /* Halt the channel (probably not necessary for FRMOR) */ - hcintmsk |= OTGFS_HCINT_CHH; - stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); - - /* Halt the Tx channel */ - - stm32_gint_halttxchan(priv, chidx); + stm32_chan_halt(priv, chidx); /* Clear the FRaMe OverRun (FRMOR) condition */ - hcint &= ~OTGFS_HCINT_FRMOR; - stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_FRMOR); } /* Check for a pending TransFeR Completed (XFRC) interrupt */ else if ((pending & OTGFS_HCINT_XFRC) != 0) { - /* Set the trnansfer complete state and reset the error count */ + /* Set the transfer complete state and reset the error count */ chan->chstate = CHSTATE_XFRC; chan->nerrors = 0; /* Clear the TransFeR Completed (XFRC) condition */ - hcint &= ~OTGFS_HCINT_XFRC; - stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_XFRC); if ((eptype == OTGFS_HCCHAR_EPTYP_CTRL) || (eptype == OTGFS_HCCHAR_EPTYP_BULK)) { - /* Unmask the CHannel Halted (CHH) interrupt */ + /* Halt the channel ( probably not necessary for XFRC) */ - hcintmsk |= OTGFS_HCINT_CHH; - stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); - - /* Halt the Tx channel */ - - stm32_gint_halttxchan(priv, chidx); + stm32_chan_halt(priv, chidx); /* Clear any pending NAK condition */ - hcint &= ~OTGFS_HCINT_NAK; - stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_NAK); /* Toggle the IN data state */ @@ -1443,6 +1465,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, { /* Mask the CHannel Halted (CHH) interrupt */ + hcintmsk = stm32_getreg(STM32_OTGFS_HCINTMSK(chidx)); hcintmsk &= ~OTGFS_HCINT_CHH; stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); @@ -1478,32 +1501,27 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, /* Clear the CHannel Halted (CHH) condition */ - hcint &= ~OTGFS_HCINT_CHH; - stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_CHH); } /* Check for a pending Transaction ERror (TXERR) interrupt */ else if ((pending & OTGFS_HCINT_TXERR) != 0) { - /* Unmask the CHannel Halted (CHH) interrupt */ - - hcintmsk |= OTGFS_HCINT_CHH; - stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); - /* Increment the error count and set the transaction error state */ chan->nerrors++; chan->chstate = CHSTATE_TXERR; - /* Halt the Tx channel */ + /* Halt the channel when a STALL, TXERR, BBERR or DTERR interrupt is + * received on the channel. + */ - stm32_gint_halttxchan(priv, chidx); + stm32_chan_halt(priv, chidx); /* Clear the Transaction ERror (TXERR) condition */ - hcint &= ~OTGFS_HCINT_TXERR; - stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_TXERR); } /* Check for a pending NAK response received (NAK) interrupt */ @@ -1514,14 +1532,9 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, if (eptype == OTGFS_HCCHAR_EPTYP_INTR) { - /* Unmask the CHannel Halted (CHH) interrupt */ + /* Halt the channel (probably not necessary on NAK) */ - hcintmsk |= OTGFS_HCINT_CHH; - stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); - - /* Halt the Tx channel */ - - stm32_gint_halttxchan(priv, chidx); + stm32_chan_halt(priv, chidx); } else if ((eptype == OTGFS_HCCHAR_EPTYP_CTRL) || (eptype == OTGFS_HCCHAR_EPTYP_BULK)) @@ -1541,8 +1554,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, /* Clear the NAK condition */ - hcint &= ~OTGFS_HCINT_NAK; - stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_NAK); } /* Check for a transfer complete event */ @@ -1584,27 +1596,20 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, { /* Clear the pending the ACK response received/transmitted (ACK) interrupt */ - hcint &= ~OTGFS_HCINT_ACK; - stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_ACK); } /* Check for a pending FRaMe OverRun (FRMOR) interrupt */ else if ((pending & OTGFS_HCINT_FRMOR) != 0) { - /* Unmask the CHannel Halted (CHH) interrupt */ + /* Halt the channel (probably not necessary for FRMOR) */ - hcintmsk |= OTGFS_HCINT_CHH; - stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); - - /* Halt the Tx channel */ - - stm32_gint_halttxchan(priv, chidx); + stm32_chan_halt(priv, chidx); /* Clear the pending the FRaMe OverRun (FRMOR) interrupt */ - hcint &= ~OTGFS_HCINT_FRMOR; - stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_FRMOR); } /* Check for a pending TransFeR Completed (XFRC) interrupt */ @@ -1613,19 +1618,13 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, { chan->nerrors = 0; - /* Unmask the CHannel Halted (CHH) interrupt */ + /* Halt the channel (shouldn't be necessary on XFRC) */ - hcintmsk |= OTGFS_HCINT_CHH; - stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); - - /* Halt the Tx channel */ - - stm32_gint_halttxchan(priv, chidx); + stm32_chan_halt(priv, chidx); /* Clear the pending the TransFeR Completed (XFRC) interrupt */ - hcint &= ~OTGFS_HCINT_XFRC; - stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_XFRC); /* Set the transfer completed state */ @@ -1638,17 +1637,13 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, { /* Clear the pending the STALL response receiv (STALL) interrupt */ - hcint &= ~OTGFS_HCINT_STALL; - stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_STALL); - /* Unmask the CHannel Halted (CHH) interrupt */ + /* Halt the channel when a STALL, TXERR, BBERR or DTERR interrupt is + * received on the channel. + */ - hcintmsk |= OTGFS_HCINT_CHH; - stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); - - /* Halt the Tx channel */ - - stm32_gint_halttxchan(priv, chidx); + stm32_chan_halt(priv, chidx); /* Set the stall state */ @@ -1663,19 +1658,13 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, chan->nerrors = 0; - /* Unmask the CHannel Halted (CHH) interrupt */ + /* Halt the channel (probably not necessary on NAK) */ - hcintmsk |= OTGFS_HCINT_CHH; - stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); - - /* Halt the Tx channel */ - - stm32_gint_halttxchan(priv, chidx); + stm32_chan_halt(priv, chidx); /* Clear the pending the NAK response received (NAK) interrupt */ - hcint &= ~OTGFS_HCINT_NAK; - stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_NAK); /* Set the NAK state */ @@ -1686,14 +1675,11 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, else if ((pending & OTGFS_HCINT_TXERR) != 0) { - /* Unmask the CHannel Halted (CHH) interrupt */ + /* Halt the channel when a STALL, TXERR, BBERR or DTERR interrupt is + * received on the channel. + */ - hcintmsk |= OTGFS_HCINT_CHH; - stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); - - /* Halt the Tx channel */ - - stm32_gint_halttxchan(priv, chidx); + stm32_chan_halt(priv, chidx); /* Increment the number of errors */ @@ -1705,8 +1691,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, /* Clear the pending the Transaction ERror (TXERR) interrupt */ - hcint &= ~OTGFS_HCINT_TXERR; - stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_TXERR); } /* Check for a pending response received (xxx) interrupt */ @@ -1716,19 +1701,13 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, { chan->nerrors = 0; - /* Unmask the CHannel Halted (CHH) interrupt */ + /* Halt the channel */ - hcintmsk |= OTGFS_HCINT_CHH; - stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); - - /* Halt the Tx channel */ - - stm32_gint_halttxchan(priv, chidx); + stm32_chan_halt(priv, chidx); /* Clear the pending the response received (xxx) interrupt */ - hcint &= ~OTGFS_HCINT_NYET; - stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_NYET); /* Set the NYET state */ @@ -1740,14 +1719,11 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, else if (pending & OTGFS_HCINT_DTERR) { - /* Unmask the CHannel Halted (CHH) interrupt */ + /* Halt the channel when a STALL, TXERR, BBERR or DTERR interrupt is + * received on the channel. + */ - hcintmsk |= OTGFS_HCINT_CHH; - stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); - - /* Halt the Tx channel */ - - stm32_gint_halttxchan(priv, chidx); + stm32_chan_halt(priv, chidx); /* Set the data toggle error state */ @@ -1755,8 +1731,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, /* Clear the pending the Data Toggle ERRor (DTERR) and NAK interrupts */ - hcint &= ~(OTGFS_HCINT_DTERR | OTGFS_HCINT_NAK); - stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + stm32_putreg(STM32_OTGFS_HCINT(chidx), (OTGFS_HCINT_DTERR | OTGFS_HCINT_NAK)); } /* Check for a pending CHannel Halted (CHH) interrupt */ @@ -1765,6 +1740,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, { /* Mask the CHannel Halted (CHH) interrupt */ + hcintmsk = stm32_getreg(STM32_OTGFS_HCINTMSK(chidx)); hcintmsk &= ~OTGFS_HCINT_CHH; stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); @@ -1815,8 +1791,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, /* Clear the pending the CHannel Halted (CHH) interrupt */ - hcint &= ~OTGFS_HCINT_CHH; - stm32_putreg(STM32_OTGFS_HCINT(chidx), hcint); + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_CHH); } /* Check for a transfer complete event */ @@ -2408,15 +2383,28 @@ static int stm32_gint_isr(int irq, FAR void *context) * host mode */ - /* Get the unmasked bits in the GINT status */ + /* Loop while there are pending interrupts to process. This loop may save a + * little interrupt handling overhead. + */ - pending = stm32_getreg(STM32_OTGFS_GINTSTS); - pending &= stm32_getreg(STM32_OTGFS_GINTMSK); - - /* The process each pending, unmasked GINT interrupts */ - - if (pending != 0) + for (;;) { + /* Get the unmasked bits in the GINT status */ + + pending = stm32_getreg(STM32_OTGFS_GINTSTS); + pending &= stm32_getreg(STM32_OTGFS_GINTMSK); + + /* Return from the interrupt when there are no furhter pending + * interrupts. + */ + + if (pending == 0) + { + return OK; + } + + /* Otherwise, process each pending, unmasked GINT interrupts */ + ullvdbg("GINTSTS: %08x\n", pending); /* Handle the start of frame interrupt */ @@ -2478,6 +2466,8 @@ static int stm32_gint_isr(int irq, FAR void *context) } } + /* We won't get here */ + return OK; } @@ -2919,11 +2909,7 @@ static int stm32_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) stm32_takesem(&priv->exclsem); - /* Halt the channel */ - - stm32_gint_halttxchan(priv, chidx); - - /* Mark the channel avaiable */ + /* Halt the channel and mark the channel avaiable */ stm32_chan_free(priv, chidx); From 451e17f1831042ea35ec61c073f2fff47082fc4e Mon Sep 17 00:00:00 2001 From: patacongo Date: Tue, 21 Aug 2012 20:14:42 +0000 Subject: [PATCH 17/31] Several more bug fixes for STM32 OTG FS host driver git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5044 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c | 12 +++---- nuttx/arch/arm/src/stm32/stm32_otgfshost.c | 38 +++++++++++++++++----- nuttx/configs/stm3220g-eval/README.txt | 4 ++- nuttx/configs/stm3220g-eval/nsh/defconfig | 3 ++ nuttx/configs/stm3240g-eval/README.txt | 4 ++- nuttx/configs/stm32f4discovery/README.txt | 4 ++- nuttx/drivers/usbhost/usbhost_enumerate.c | 4 +-- nuttx/include/nuttx/usb/usbhost.h | 14 ++++---- 8 files changed, 56 insertions(+), 27 deletions(-) diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c b/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c index 17a14fea8c..154b953b72 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c @@ -1,9 +1,9 @@ /******************************************************************************* * arch/arm/src/lpc17xx/lpc17_usbhost.c * - * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2010-2012 Gregory Nutt. All rights reserved. * Authors: Rafael Noronha - * Gregory Nutt + * Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -1898,7 +1898,7 @@ static int lpc17_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) * Some hardware supports special memory in which request and descriptor data can * be accessed more efficiently. This method provides a mechanism to allocate * the request/descriptor memory. If the underlying hardware does not support - * such "special" memory, this functions may simply map to malloc. + * such "special" memory, this functions may simply map to kmalloc. * * This interface was optimized under a particular assumption. It was assumed * that the driver maintains a pool of small, pre-allocated buffers for descriptor @@ -1952,7 +1952,7 @@ static int lpc17_alloc(FAR struct usbhost_driver_s *drvr, * Some hardware supports special memory in which request and descriptor data can * be accessed more efficiently. This method provides a mechanism to free that * request/descriptor memory. If the underlying hardware does not support - * such "special" memory, this functions may simply map to free(). + * such "special" memory, this functions may simply map to kfree(). * * Input Parameters: * drvr - The USB host driver instance obtained as a parameter from the call to @@ -1988,7 +1988,7 @@ static int lpc17_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer) * Some hardware supports special memory in which larger IO buffers can * be accessed more efficiently. This method provides a mechanism to allocate * the request/descriptor memory. If the underlying hardware does not support - * such "special" memory, this functions may simply map to malloc. + * such "special" memory, this functions may simply map to kmalloc. * * This interface differs from DRVR_ALLOC in that the buffers are variable-sized. * @@ -2036,7 +2036,7 @@ static int lpc17_ioalloc(FAR struct usbhost_driver_s *drvr, * Some hardware supports special memory in which IO data can be accessed more * efficiently. This method provides a mechanism to free that IO buffer * memory. If the underlying hardware does not support such "special" memory, - * this functions may simply map to free(). + * this functions may simply map to kfree(). * * Input Parameters: * drvr - The USB host driver instance obtained as a parameter from the call to diff --git a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c index e6ea2de06d..7eb2313a4c 100644 --- a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c +++ b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c @@ -49,6 +49,7 @@ #include #include +#include #include #include @@ -89,6 +90,8 @@ * want to do that? * CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access * debug. Depends on CONFIG_DEBUG. + * CONFIG_STM32_USBHOST_PKTDUMP - Dump all incoming and outgoing USB + * packets. Depends on CONFIG_DEBUG. */ /* Pre-requistites (partial) */ @@ -119,6 +122,7 @@ #ifndef CONFIG_DEBUG # undef CONFIG_STM32_USBHOST_REGDEBUG +# undef CONFIG_STM32_USBHOST_PKTDUMP #endif /* HCD Setup *******************************************************************/ @@ -253,6 +257,12 @@ static void stm32_putreg(uint32_t addr, uint32_t value); static inline void stm32_modifyreg(uint32_t addr, uint32_t clrbits, uint32_t setbits); +#ifdef CONFIG_STM32_USBHOST_PKTDUMP +# define stm32_pktdump(m,b,n) lib_dumpbuffer(m,b,n) +#else +# define stm32_pktdump(m,b,n) +#endif + /* Semaphores ******************************************************************/ static void stm32_takesem(sem_t *sem); @@ -1298,6 +1308,8 @@ static void stm32_gint_wrpacket(FAR struct stm32_usbhost_s *priv, uint32_t fifo; int buflen32; + stm32_pktdump("Sending", buffer, buflen); + /* Get the number of 32-byte words associated with this byte size */ buflen32 = (buflen + 3) >> 2; @@ -1958,6 +1970,8 @@ static inline void stm32_gint_rxflvlisr(FAR struct stm32_usbhost_s *priv) *dest++ = stm32_getreg(fifo); } + stm32_pktdump("Received", priv->chan[chidx].buffer, bcnt); + /* Manage multiple packet transfers */ priv->chan[chidx].buffer += bcnt; @@ -2924,7 +2938,7 @@ static int stm32_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) * Some hardware supports special memory in which request and descriptor data can * be accessed more efficiently. This method provides a mechanism to allocate * the request/descriptor memory. If the underlying hardware does not support - * such "special" memory, this functions may simply map to malloc. + * such "special" memory, this functions may simply map to kmalloc. * * This interface was optimized under a particular assumption. It was assumed * that the driver maintains a pool of small, pre-allocated buffers for descriptor @@ -2958,12 +2972,15 @@ static int stm32_alloc(FAR struct usbhost_driver_s *drvr, /* There is no special memory requirement */ - alloc = (FAR uint8_t *)malloc(*maxlen); + alloc = (FAR uint8_t *)kmalloc(*maxlen); if (!alloc) { return -ENOMEM; } + /* Return the allocated buffer */ + + *buffer = alloc; return OK; } @@ -2974,7 +2991,7 @@ static int stm32_alloc(FAR struct usbhost_driver_s *drvr, * Some hardware supports special memory in which request and descriptor data can * be accessed more efficiently. This method provides a mechanism to free that * request/descriptor memory. If the underlying hardware does not support - * such "special" memory, this functions may simply map to free(). + * such "special" memory, this functions may simply map to kfree(). * * Input Parameters: * drvr - The USB host driver instance obtained as a parameter from the call to @@ -2995,7 +3012,7 @@ static int stm32_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer) /* There is no special memory requirement */ DEBUGASSERT(drvr && buffer); - free(buffer); + kfree(buffer); return OK; } @@ -3006,7 +3023,7 @@ static int stm32_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer) * Some hardware supports special memory in which larger IO buffers can * be accessed more efficiently. This method provides a mechanism to allocate * the request/descriptor memory. If the underlying hardware does not support - * such "special" memory, this functions may simply map to malloc. + * such "special" memory, this functions may simply map to kmalloc. * * This interface differs from DRVR_ALLOC in that the buffers are variable-sized. * @@ -3035,12 +3052,15 @@ static int stm32_ioalloc(FAR struct usbhost_driver_s *drvr, /* There is no special memory requirement */ - alloc = (FAR uint8_t *)malloc(buflen); + alloc = (FAR uint8_t *)kmalloc(buflen); if (!alloc) { return -ENOMEM; } + /* Return the allocated buffer */ + + *buffer = alloc; return OK; } @@ -3051,7 +3071,7 @@ static int stm32_ioalloc(FAR struct usbhost_driver_s *drvr, * Some hardware supports special memory in which IO data can be accessed more * efficiently. This method provides a mechanism to free that IO buffer * memory. If the underlying hardware does not support such "special" memory, - * this functions may simply map to free(). + * this functions may simply map to kfree(). * * Input Parameters: * drvr - The USB host driver instance obtained as a parameter from the call to @@ -3072,7 +3092,7 @@ static int stm32_iofree(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer) /* There is no special memory requirement */ DEBUGASSERT(drvr && buffer); - free(buffer); + kfree(buffer); return OK; } @@ -3161,7 +3181,7 @@ static int stm32_ctrlin(FAR struct usbhost_driver_s *drvr, /* Handle the status OUT phase */ priv->chan[priv->ep0out].outdata1 ^= true; - ret = stm32_ctrl_senddata(priv, buffer, buflen); + ret = stm32_ctrl_senddata(priv, NULL, 0); if (ret == OK) { break; diff --git a/nuttx/configs/stm3220g-eval/README.txt b/nuttx/configs/stm3220g-eval/README.txt index ad049ea4c5..a25db07a51 100644 --- a/nuttx/configs/stm3220g-eval/README.txt +++ b/nuttx/configs/stm3220g-eval/README.txt @@ -689,7 +689,9 @@ STM3220G-EVAL-specific Configuration Options want to do that? CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access debug. Depends on CONFIG_DEBUG. - + CONFIG_STM32_USBHOST_PKTDUMP - Dump all incoming and outgoing USB + packets. Depends on CONFIG_DEBUG. + Configurations ============== diff --git a/nuttx/configs/stm3220g-eval/nsh/defconfig b/nuttx/configs/stm3220g-eval/nsh/defconfig index a6c4db2547..5a3dd6643d 100644 --- a/nuttx/configs/stm3220g-eval/nsh/defconfig +++ b/nuttx/configs/stm3220g-eval/nsh/defconfig @@ -1047,6 +1047,8 @@ CONFIG_USBDEV_TRACE_NRECORDS=128 # want to do that? # CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access # debug. Depends on CONFIG_DEBUG. +# CONFIG_STM32_USBHOST_PKTDUMP - Dump all incoming and outgoing USB +# packets. Depends on CONFIG_DEBUG. # CONFIG_USBHOST=n # ONFIG_STM32_OTGFS_RXFIFO_SIZE @@ -1054,6 +1056,7 @@ CONFIG_USBHOST=n #CONFIG_STM32_OTGFS_PTXFIFO_SIZE CONFIG_STM32_OTGFS_SOFINTR=n CONFIG_STM32_USBHOST_REGDEBUG=n +CONFIG_STM32_USBHOST_PKTDUMP=n # # USB Serial Device Configuration diff --git a/nuttx/configs/stm3240g-eval/README.txt b/nuttx/configs/stm3240g-eval/README.txt index c8c1fdfa76..5f942819c3 100755 --- a/nuttx/configs/stm3240g-eval/README.txt +++ b/nuttx/configs/stm3240g-eval/README.txt @@ -852,7 +852,9 @@ STM3240G-EVAL-specific Configuration Options want to do that? CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access debug. Depends on CONFIG_DEBUG. - + CONFIG_STM32_USBHOST_PKTDUMP - Dump all incoming and outgoing USB + packets. Depends on CONFIG_DEBUG. + Configurations ============== diff --git a/nuttx/configs/stm32f4discovery/README.txt b/nuttx/configs/stm32f4discovery/README.txt index a1fe2c3560..e7dc573536 100755 --- a/nuttx/configs/stm32f4discovery/README.txt +++ b/nuttx/configs/stm32f4discovery/README.txt @@ -905,7 +905,9 @@ STM32F4Discovery-specific Configuration Options want to do that? CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access debug. Depends on CONFIG_DEBUG. - + CONFIG_STM32_USBHOST_PKTDUMP - Dump all incoming and outgoing USB + packets. Depends on CONFIG_DEBUG. + Configurations ============== diff --git a/nuttx/drivers/usbhost/usbhost_enumerate.c b/nuttx/drivers/usbhost/usbhost_enumerate.c index 7ab055b574..36bfa20d19 100644 --- a/nuttx/drivers/usbhost/usbhost_enumerate.c +++ b/nuttx/drivers/usbhost/usbhost_enumerate.c @@ -1,8 +1,8 @@ /******************************************************************************* * drivers/usbhost/usbhost_enumerate.c * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Authors: Gregory Nutt + * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. + * Authors: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/nuttx/include/nuttx/usb/usbhost.h b/nuttx/include/nuttx/usb/usbhost.h index c68cb4712e..b28db95511 100644 --- a/nuttx/include/nuttx/usb/usbhost.h +++ b/nuttx/include/nuttx/usb/usbhost.h @@ -1,7 +1,7 @@ /************************************************************************************ * include/nuttx/usb/usbhost.h * - * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2010-2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * References: @@ -284,7 +284,7 @@ * Some hardware supports special memory in which request and descriptor data can * be accessed more efficiently. This method provides a mechanism to allocate * the request/descriptor memory. If the underlying hardware does not support - * such "special" memory, this functions may simply map to malloc. + * such "special" memory, this functions may simply map to kmalloc. * * This interface was optimized under a particular assumption. It was assumed * that the driver maintains a pool of small, pre-allocated buffers for descriptor @@ -317,7 +317,7 @@ * Some hardware supports special memory in which request and descriptor data can * be accessed more efficiently. This method provides a mechanism to free that * request/descriptor memory. If the underlying hardware does not support - * such "special" memory, this functions may simply map to free(). + * such "special" memory, this functions may simply map to kfree(). * * Input Parameters: * drvr - The USB host driver instance obtained as a parameter from the call to @@ -342,7 +342,7 @@ * Some hardware supports special memory in which larger IO buffers can * be accessed more efficiently. This method provides a mechanism to allocate * the request/descriptor memory. If the underlying hardware does not support - * such "special" memory, this functions may simply map to malloc. + * such "special" memory, this functions may simply map to kmalloc. * * This interface differs from DRVR_ALLOC in that the buffers are variable-sized. * @@ -371,7 +371,7 @@ * Some hardware supports special memory in which IO data can be accessed more * efficiently. This method provides a mechanism to free that IO buffer * memory. If the underlying hardware does not support such "special" memory, - * this functions may simply map to free(). + * this functions may simply map to kfree(). * * Input Parameters: * drvr - The USB host driver instance obtained as a parameter from the call to @@ -615,7 +615,7 @@ struct usbhost_driver_s * be accessed more efficiently. The following methods provide a mechanism * to allocate and free the transfer descriptor memory. If the underlying * hardware does not support such "special" memory, these functions may - * simply map to malloc and free. + * simply map to kmalloc and kfree. * * This interface was optimized under a particular assumption. It was assumed * that the driver maintains a pool of small, pre-allocated buffers for descriptor @@ -630,7 +630,7 @@ struct usbhost_driver_s /* Some hardware supports special memory in which larger IO buffers can * be accessed more efficiently. This method provides a mechanism to allocate * the request/descriptor memory. If the underlying hardware does not support - * such "special" memory, this functions may simply map to malloc. + * such "special" memory, this functions may simply map to kmalloc. * * This interface differs from DRVR_ALLOC in that the buffers are variable-sized. */ From 9ab1bb8a53eea7aed48b7349d8bedac033115081 Mon Sep 17 00:00:00 2001 From: patacongo Date: Wed, 22 Aug 2012 12:27:05 +0000 Subject: [PATCH 18/31] PM update git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5045 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/configs/stm3210e-eval/src/up_idle.c | 57 ++++++++++++++++------- 1 file changed, 39 insertions(+), 18 deletions(-) diff --git a/nuttx/configs/stm3210e-eval/src/up_idle.c b/nuttx/configs/stm3210e-eval/src/up_idle.c index 5b9f3c9fae..910d0a9d6c 100644 --- a/nuttx/configs/stm3210e-eval/src/up_idle.c +++ b/nuttx/configs/stm3210e-eval/src/up_idle.c @@ -252,15 +252,47 @@ static void up_idlepm(void) enum pm_state_e newstate; int ret; - /* Decide, which power saving level can be obtained */ + /* The following is logic that is done after the wake-up from PM_STANDBY + * state. It decides whether to go back to the PM_NORMAL or to the deeper + * power-saving mode PM_SLEEP: If the alarm expired with no "normal" + * wake-up event, then PM_SLEEP is entered. + * + * Logically, this code belongs at the end of the PM_STANDBY case below, + * does not work in the position for some unkown reason. + */ + + if (oldstate == PM_STANDBY) + { + /* Were we awakened by the alarm? */ - newstate = pm_checkstate(); +#ifdef CONFIG_RTC_ALARM + if (g_alarmwakeup) + { + /* Yes.. Go to SLEEP mode */ + + newstate = PM_SLEEP; + } + else +#endif + { + /* Resume normal operation */ + + newstate = PM_NORMAL: + } + } + else +#endif + { + /* Let the PM system decide, which power saving level can be obtained */ + + newstate = pm_checkstate(); + } /* Check for state changes */ if (newstate != oldstate) { - lldbg("newstate= %d oldstate=%d\n", newstate, oldstate); + llvdbg("newstate= %d oldstate=%d\n", newstate, oldstate); sched_lock(); @@ -338,22 +370,11 @@ static void up_idlepm(void) { lldbg("Warning: Cancel alarm failed\n"); } - - /* Were we awakened by the alarm? */ - - if (g_alarmwakeup) - { - /* Yes.. Go to SLEEP mode */ - - pm_changestate(PM_SLEEP); - } - else #endif - { - /* Resume normal operation */ - - pm_changestate(PM_NORMAL); - } + /* Note: See the additional PM_STANDBY related logic at the + * beginning of this function. That logic is executed after + * this point. + */ } break; From b2fb8996acf58ec64e5fee06c85a5b4cf04836a1 Mon Sep 17 00:00:00 2001 From: patacongo Date: Wed, 22 Aug 2012 18:13:04 +0000 Subject: [PATCH 19/31] STM32 USB OTG FS host driver update (almost done) git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5046 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/arch/arm/src/stm32/stm32_otgfshost.c | 345 +++++++++++---------- nuttx/configs/stm3220g-eval/README.txt | 1 + nuttx/configs/stm3220g-eval/nsh/defconfig | 4 +- nuttx/configs/stm3240g-eval/README.txt | 1 + nuttx/configs/stm32f4discovery/README.txt | 1 + 5 files changed, 187 insertions(+), 165 deletions(-) diff --git a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c index 7eb2313a4c..9644d17e8c 100644 --- a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c +++ b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c @@ -86,6 +86,7 @@ * in 32-bit words. Default 96 (384 bytes) * CONFIG_STM32_OTGFS_PTXFIFO_SIZE - Size of the periodic Tx FIFO in 32-bit * words. Default 96 (384 bytes) + * CONFIG_STM32_OTGFS_DESCSIZE - Maximum size of a descriptor. Default: 128 * CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts. Why would you ever * want to do that? * CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access @@ -106,19 +107,25 @@ # define CONFIG_STM32_OTGFS_RXFIFO_SIZE 128 #endif -/* Default host non-periodic transmit FIFO size */ +/* Default host non-periodic Tx FIFO size */ #ifndef CONFIG_STM32_OTGFS_NPTXFIFO_SIZE # define CONFIG_STM32_OTGFS_NPTXFIFO_SIZE 96 #endif -/* Default the host periodic Tx fifo size register (HPTXFSIZ) */ +/* Default host periodic Tx fifo size register */ #ifndef CONFIG_STM32_OTGFS_PTXFIFO_SIZE # define CONFIG_STM32_OTGFS_PTXFIFO_SIZE 96 #endif -/* Register debug depends on CONFIG_DEBUG */ +/* Maximum size of a descriptor */ + +#ifndef CONFIG_STM32_OTGFS_DESCSIZE +# define CONFIG_STM32_OTGFS_DESCSIZE 128 +#endif + +/* Register/packet debug depends on CONFIG_DEBUG */ #ifndef CONFIG_DEBUG # undef CONFIG_STM32_USBHOST_REGDEBUG @@ -169,17 +176,19 @@ enum stm32_smstate_e SMSTATE_CLASS_BOUND, /* Enumeration complete, class bound */ }; -/* This enumeration represents the state of one TX channel */ +/* This enumeration provides the reason for the channel halt. */ -enum stm32_chstate_e +enum stm32_chreason_e { - CHSTATE_IDLE = 0, /* Inactive (initial state) */ - CHSTATE_XFRC, /* Transfer complete */ - CHSTATE_NAK, /* NAK received */ - CHSTATE_NYET, /* NotYet received */ - CHSTATE_STALL, /* Endpoint stalled */ - CHSTATE_TXERR, /* Transfer error received */ - CHSTATE_DTERR /* Data error received */ + CHREASON_IDLE = 0, /* Inactive (initial state) */ + CHREASON_FREED, /* Channel is no longer in use */ + CHREASON_XFRC, /* Transfer complete */ + CHREASON_NAK, /* NAK received */ + CHREASON_NYET, /* NotYet received */ + CHREASON_STALL, /* Endpoint stalled */ + CHREASON_TXERR, /* Transfer error received */ + CHREASON_DTERR, /* Data error received */ + CHREASON_FRMOR /* Frame overrun */ }; /* This structure retains the state of one host channel */ @@ -188,7 +197,7 @@ struct stm32_chan_s { sem_t waitsem; /* Channel wait semaphore */ volatile uint8_t result; /* The result of the transfer */ - volatile uint8_t chstate; /* See enum stm32_chstate_e */ + volatile uint8_t chreason; /* Channel halt reason. See enum stm32_chreason_e */ uint8_t epno; /* Device endpoint number (0-127) */ uint8_t eptype; /* See OTGFS_EPTYPE_* definitions */ uint8_t pid; /* Data PID */ @@ -197,7 +206,6 @@ struct stm32_chan_s bool outdata1; /* OUT data toggle. True: DATA01 */ bool in; /* True: IN endpoint */ volatile bool waiter; /* True: Thread is waiting for a channel event */ - volatile uint16_t nerrors; /* Number of errors detecgted */ volatile uint16_t xfrd; /* Number of bytes transferred */ uint16_t maxpacket; /* Max packet size */ uint16_t buflen; /* Buffer length (remaining) */ @@ -278,7 +286,8 @@ static int stm32_chan_alloc(FAR struct stm32_usbhost_s *priv); static inline void stm32_chan_free(FAR struct stm32_usbhost_s *priv, int chidx); static inline void stm32_chan_freeall(FAR struct stm32_usbhost_s *priv); static void stm32_chan_configure(FAR struct stm32_usbhost_s *priv, int chidx); -static void stm32_chan_halt(FAR struct stm32_usbhost_s *priv, int chidx); +static void stm32_chan_halt(FAR struct stm32_usbhost_s *priv, int chidx, + enum stm32_chreason_e chreason); static int stm32_chan_waitsetup(FAR struct stm32_usbhost_s *priv, FAR struct stm32_chan_s *chan); static int stm32_chan_wait(FAR struct stm32_usbhost_s *priv, @@ -623,7 +632,7 @@ static void stm32_chan_free(FAR struct stm32_usbhost_s *priv, int chidx) /* Halt the channel */ - stm32_chan_halt(priv, chidx); + stm32_chan_halt(priv, chidx, CHREASON_FREED); /* Mark the channel available */ @@ -779,13 +788,20 @@ static void stm32_chan_configure(FAR struct stm32_usbhost_s *priv, int chidx) * *******************************************************************************/ -static void stm32_chan_halt(FAR struct stm32_usbhost_s *priv, int chidx) +static void stm32_chan_halt(FAR struct stm32_usbhost_s *priv, int chidx, + enum stm32_chreason_e chreason) { uint32_t hcchar; uint32_t intmsk; uint32_t eptype; unsigned int avail; + /* Save the recon for the halt. We need this in the channel halt interrrupt + * handling logic to know what to do next. + */ + + priv->chan[chidx].chreason = (uint8_t)chreason; + /* "The application can disable any channel by programming the OTG_FS_HCCHARx * register with the CHDIS and CHENA bits set to 1. This enables the OTG_FS * host to flush the posted requests (if any) and generates a channel halted @@ -800,7 +816,7 @@ static void stm32_chan_halt(FAR struct stm32_usbhost_s *priv, int chidx) /* Get the endpoint type from the HCCHAR register */ - eptype = (hcchar & OTGFS_HCCHAR_EPTYP_MASK); + eptype = hcchar & OTGFS_HCCHAR_EPTYP_MASK; /* Check for space in the Tx FIFO to issue the halt. * @@ -953,7 +969,9 @@ static int stm32_chan_wait(FAR struct stm32_usbhost_s *priv, static void stm32_chan_wakeup(FAR struct stm32_usbhost_s *priv, FAR struct stm32_chan_s *chan) { - /* Is there a thread waiting for this transfer to complete? */ + /* Is the the transfer complete? Is there a thread waiting for this transfer + * to complete? + */ if (chan->result != EBUSY && chan->waiter) { @@ -1334,15 +1352,24 @@ static void stm32_gint_wrpacket(FAR struct stm32_usbhost_s *priv, * Description: * USB OTG FS host IN channels interrupt handler * + * One the completion of the transfer, the channel result byte may be set as + * follows: + * + * OK - Transfer completed successfully + * EAGAIN - If devices NAKs the transfer or NYET occurs + * EPERM - If the endpoint stalls + * EIO - On a TX or data error + * EPIPE - Frame overrun + * + * EBUSY in the result field indicates that the transfer has not completed. + * *******************************************************************************/ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, int chidx) { FAR struct stm32_chan_s *chan = &priv->chan[chidx]; - uint32_t hcint; - uint32_t hcintmsk; - uint32_t hcchar; + uint32_t regval; uint32_t pending; unsigned int eptype; @@ -1350,19 +1377,13 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, * HCINTMSK register to get the set of enabled HC interrupts. */ - hcint = stm32_getreg(STM32_OTGFS_HCINT(chidx)); - hcintmsk = stm32_getreg(STM32_OTGFS_HCINTMSK(chidx)); + pending = stm32_getreg(STM32_OTGFS_HCINT(chidx)); + regval = stm32_getreg(STM32_OTGFS_HCINTMSK(chidx)); /* AND the two to get the set of enabled, pending HC interrupts */ - pending = hcint & hcintmsk; - - /* Pre-fetch the HCCHAR register and extract the endpoint type. Those - * values are used in several cases. - */ - - hcchar = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); - eptype = (hcchar & OTGFS_HCCHAR_EPTYP_MASK) >> OTGFS_HCCHAR_EPTYP_SHIFT; + pending &= regval; + uvdbg("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending); /* Check for a pending ACK response received/transmitted (ACK) interrupt */ @@ -1377,10 +1398,6 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, else if ((pending & OTGFS_HCINT_STALL) != 0) { - /* Set the stall state */ - - chan->chstate = CHSTATE_STALL; - /* Clear the NAK and STALL Conditions. */ stm32_putreg(STM32_OTGFS_HCINT(chidx), (OTGFS_HCINT_NAK | OTGFS_HCINT_STALL)); @@ -1389,9 +1406,9 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, * received on the channel. */ - stm32_chan_halt(priv, chidx); + stm32_chan_halt(priv, chidx, CHREASON_STALL); - /* When there is a STALL, clear any pending NAK so that it is nor + /* When there is a STALL, clear any pending NAK so that it is not * processed below. */ @@ -1406,24 +1423,20 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, * received on the channel. */ - stm32_chan_halt(priv, chidx); + stm32_chan_halt(priv, chidx, CHREASON_DTERR); /* Clear the NAK and data toggle error conditions */ stm32_putreg(STM32_OTGFS_HCINT(chidx), (OTGFS_HCINT_NAK | OTGFS_HCINT_DTERR)); - - /* Set the Data Toggle ERRor (DTERR) state */ - - chan->chstate = CHSTATE_DTERR; } /* Check for a pending FRaMe OverRun (FRMOR) interrupt */ if ((pending & OTGFS_HCINT_FRMOR) != 0) { - /* Halt the channel (probably not necessary for FRMOR) */ + /* Halt the channel -- the CHH interrrupt is expected next */ - stm32_chan_halt(priv, chidx); + stm32_chan_halt(priv, chidx, CHREASON_FRMOR); /* Clear the FRaMe OverRun (FRMOR) condition */ @@ -1434,21 +1447,25 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, else if ((pending & OTGFS_HCINT_XFRC) != 0) { - /* Set the transfer complete state and reset the error count */ - - chan->chstate = CHSTATE_XFRC; - chan->nerrors = 0; - /* Clear the TransFeR Completed (XFRC) condition */ stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_XFRC); + /* Fetch the HCCHAR register and extract the endpoint type. Those + * values are used in several cases. + */ + + regval = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); + eptype = regval & OTGFS_HCCHAR_EPTYP_MASK; + + /* Then handle the transfer completion event based on the endpoint type */ + if ((eptype == OTGFS_HCCHAR_EPTYP_CTRL) || (eptype == OTGFS_HCCHAR_EPTYP_BULK)) { - /* Halt the channel ( probably not necessary for XFRC) */ + /* Halt the channel -- the CHH interrrupt is expected next */ - stm32_chan_halt(priv, chidx); + stm32_chan_halt(priv, chidx, CHREASON_XFRC); /* Clear any pending NAK condition */ @@ -1462,8 +1479,8 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, { /* Force the next transfer on an ODD frame */ - hcchar |= OTGFS_HCCHAR_ODDFRM; - stm32_putreg(STM32_OTGFS_HCCHAR(chidx), hcchar); + regval |= OTGFS_HCCHAR_ODDFRM; + stm32_putreg(STM32_OTGFS_HCCHAR(chidx), regval); /* Set the request done state */ @@ -1477,38 +1494,47 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, { /* Mask the CHannel Halted (CHH) interrupt */ - hcintmsk = stm32_getreg(STM32_OTGFS_HCINTMSK(chidx)); - hcintmsk &= ~OTGFS_HCINT_CHH; - stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); + regval = stm32_getreg(STM32_OTGFS_HCINTMSK(chidx)); + regval &= ~OTGFS_HCINT_CHH; + stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), regval); /* Update the request state based on the host state machine state */ - if (chan->chstate == CHSTATE_XFRC) + if (chan->chreason == CHREASON_XFRC) { - /* Set the request done state */ + /* Set the request done reult */ chan->result = OK; } - else if (chan->chstate == CHSTATE_STALL) + else if (chan->chreason == CHREASON_STALL) { - /* Set the request stall state */ + /* Set the request stall result */ chan->result = EPERM; } - else if ((chan->chstate == CHSTATE_TXERR) || - (chan->chstate == CHSTATE_DTERR)) + else if ((chan->chreason == CHREASON_TXERR) || + (chan->chreason == CHREASON_DTERR)) { - /* Set the request error state */ + /* Set the request I/O error result */ - chan->nerrors = 0; chan->result = EIO; } - else if (eptype == OTGFS_HCCHAR_EPTYP_INTR) + else /* if (chan->chreason == CHREASON_FRMOR) */ { - /* Toggle the IN data toggle */ + /* Fetch the HCCHAR register and check for an interrupt endpoint. */ - chan->indata1 ^= true; + regval = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); + if ((regval & OTGFS_HCCHAR_EPTYP_MASK) == OTGFS_HCCHAR_EPTYP_INTR) + { + /* Toggle the IN data toggle */ + + chan->indata1 ^= true; + } + + /* Set the frame overrun error result */ + + chan->result = EPIPE; } /* Clear the CHannel Halted (CHH) condition */ @@ -1520,16 +1546,11 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, else if ((pending & OTGFS_HCINT_TXERR) != 0) { - /* Increment the error count and set the transaction error state */ - - chan->nerrors++; - chan->chstate = CHSTATE_TXERR; - /* Halt the channel when a STALL, TXERR, BBERR or DTERR interrupt is * received on the channel. */ - stm32_chan_halt(priv, chidx); + stm32_chan_halt(priv, chidx, CHREASON_TXERR); /* Clear the Transaction ERror (TXERR) condition */ @@ -1540,30 +1561,45 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, else if ((pending & OTGFS_HCINT_NAK) != 0) { - /* Handle the NAK based on the endpoint type */ + /* Handle the NAK based on the endpoint type + * + * Fetch the HCCHAR register and extract the endpoint type. + */ + + regval = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); + eptype = regval & OTGFS_HCCHAR_EPTYP_MASK; + + /* Then process the NAK based on the endpoint type */ if (eptype == OTGFS_HCCHAR_EPTYP_INTR) { - /* Halt the channel (probably not necessary on NAK) */ + /* Halt the INTR channel -- the CHH interrrupt is expected next */ - stm32_chan_halt(priv, chidx); + stm32_chan_halt(priv, chidx, CHREASON_NAK); } - else if ((eptype == OTGFS_HCCHAR_EPTYP_CTRL) || - (eptype == OTGFS_HCCHAR_EPTYP_BULK)) + else { - /* Re-activate the channel by clearing CHDIS and assuring that - * CHENA is set + /* Re-activate CGRL and BULK channels */ + + if ((eptype == OTGFS_HCCHAR_EPTYP_CTRL) || + (eptype == OTGFS_HCCHAR_EPTYP_BULK)) + { + /* Re-activate the channel by clearing CHDIS and assuring that + * CHENA is set + */ + + regval |= OTGFS_HCCHAR_CHENA; + regval &= ~OTGFS_HCCHAR_CHDIS; + stm32_putreg(STM32_OTGFS_HCCHAR(chidx), regval); + } + + /* Set the result to EAGAIN to wake up any thread wait for the + * transfer to complete. */ - hcchar |= OTGFS_HCCHAR_CHENA; - hcchar &= ~OTGFS_HCCHAR_CHDIS; - stm32_putreg(STM32_OTGFS_HCCHAR(chidx), hcchar); + chan->result = EAGAIN; } - /* Set the NAK state */ - - chan->chstate = CHSTATE_NAK; - /* Clear the NAK condition */ stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_NAK); @@ -1580,27 +1616,37 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, * Description: * USB OTG FS host OUT channels interrupt handler * + * One the completion of the transfer, the channel result byte may be set as + * follows: + * + * OK - Transfer completed successfully + * EAGAIN - If devices NAKs the transfer or NYET occurs + * EPERM - If the endpoint stalls + * EIO - On a TX or data error + * EPIPE - Frame overrun + * + * EBUSY in the result field indicates that the transfer has not completed. + * *******************************************************************************/ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, int chidx) { FAR struct stm32_chan_s *chan = &priv->chan[chidx]; - uint32_t hcint; - uint32_t hcintmsk; + uint32_t regval; uint32_t pending; - uint32_t hcchar; /* Read the HCINT register to get the pending HC interrupts. Read the * HCINTMSK register to get the set of enabled HC interrupts. */ - hcint = stm32_getreg(STM32_OTGFS_HCINT(chidx)); - hcintmsk = stm32_getreg(STM32_OTGFS_HCINTMSK(chidx)); + pending = stm32_getreg(STM32_OTGFS_HCINT(chidx)); + regval = stm32_getreg(STM32_OTGFS_HCINTMSK(chidx)); /* AND the two to get the set of enabled, pending HC interrupts */ - pending = hcint & hcintmsk; + pending &= regval; + uvdbg("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending); /* Check for a pending ACK response received/transmitted (ACK) interrupt */ @@ -1617,7 +1663,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, { /* Halt the channel (probably not necessary for FRMOR) */ - stm32_chan_halt(priv, chidx); + stm32_chan_halt(priv, chidx, CHREASON_FRMOR); /* Clear the pending the FRaMe OverRun (FRMOR) interrupt */ @@ -1628,19 +1674,13 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, else if ((pending & OTGFS_HCINT_XFRC) != 0) { - chan->nerrors = 0; + /* Halt the channel -- the CHH interrrupt is expected next */ - /* Halt the channel (shouldn't be necessary on XFRC) */ - - stm32_chan_halt(priv, chidx); + stm32_chan_halt(priv, chidx, CHREASON_XFRC); /* Clear the pending the TransFeR Completed (XFRC) interrupt */ stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_XFRC); - - /* Set the transfer completed state */ - - chan->chstate = CHSTATE_XFRC; } /* Check for a pending STALL response receive (STALL) interrupt */ @@ -1655,32 +1695,20 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, * received on the channel. */ - stm32_chan_halt(priv, chidx); - - /* Set the stall state */ - - chan->chstate = CHSTATE_STALL; + stm32_chan_halt(priv, chidx, CHREASON_STALL); } /* Check for a pending NAK response received (NAK) interrupt */ else if ((pending & OTGFS_HCINT_NAK) != 0) { - /* Clear the error count */ + /* Halt the channel -- the CHH interrrupt is expected next */ - chan->nerrors = 0; - - /* Halt the channel (probably not necessary on NAK) */ - - stm32_chan_halt(priv, chidx); + stm32_chan_halt(priv, chidx, CHREASON_NAK); /* Clear the pending the NAK response received (NAK) interrupt */ stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_NAK); - - /* Set the NAK state */ - - chan->chstate = CHSTATE_NAK; } /* Check for a pending Transaction ERror (TXERR) interrupt */ @@ -1691,15 +1719,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, * received on the channel. */ - stm32_chan_halt(priv, chidx); - - /* Increment the number of errors */ - - chan->nerrors++; - - /* Set the transaction error state */ - - chan->chstate = CHSTATE_TXERR; + stm32_chan_halt(priv, chidx, CHREASON_TXERR); /* Clear the pending the Transaction ERror (TXERR) interrupt */ @@ -1711,19 +1731,13 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, #if 0 /* NYET is a reserved bit in the HCINT register */ else if ((pending & OTGFS_HCINT_NYET) != 0) { - chan->nerrors = 0; - /* Halt the channel */ - stm32_chan_halt(priv, chidx); + stm32_chan_halt(priv, chidx, CHREASON_NYET); /* Clear the pending the response received (xxx) interrupt */ stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_NYET); - - /* Set the NYET state */ - - chan->chstate = CHSTATE_NYET; } #endif @@ -1735,11 +1749,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, * received on the channel. */ - stm32_chan_halt(priv, chidx); - - /* Set the data toggle error state */ - - chan->chstate = CHSTATE_DTERR; + stm32_chan_halt(priv, chidx, CHREASON_DTERR); /* Clear the pending the Data Toggle ERRor (DTERR) and NAK interrupts */ @@ -1752,13 +1762,13 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, { /* Mask the CHannel Halted (CHH) interrupt */ - hcintmsk = stm32_getreg(STM32_OTGFS_HCINTMSK(chidx)); - hcintmsk &= ~OTGFS_HCINT_CHH; - stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), hcintmsk); + regval = stm32_getreg(STM32_OTGFS_HCINTMSK(chidx)); + regval &= ~OTGFS_HCINT_CHH; + stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), regval); - if (chan->chstate == CHSTATE_XFRC) + if (chan->chreason == CHREASON_XFRC) { - /* Set the request done state */ + /* Set the request done result */ chan->result = OK; @@ -1766,39 +1776,42 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, * the endpoint type. */ - hcchar = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); + regval = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); /* Is it a bulk endpoint */ - if ((hcchar & OTGFS_HCCHAR_EPTYP_MASK) == OTGFS_HCCHAR_EPTYP_BULK) + if ((regval & OTGFS_HCCHAR_EPTYP_MASK) == OTGFS_HCCHAR_EPTYP_BULK) { /* Yes... toggle the data out PID */ chan->outdata1 ^= true; } } - else if (chan->chstate == CHSTATE_NAK || - chan->chstate == CHSTATE_NYET) + else if (chan->chreason == CHREASON_NAK || + chan->chreason == CHREASON_NYET) { + /* Set the try again later result */ + chan->result = EAGAIN; } - else if (chan->chstate == CHSTATE_STALL) + else if (chan->chreason == CHREASON_STALL) { - /* Set the request stall state */ + /* Set the request stall result */ chan->result = EPERM; } - else if (chan->chstate == CHSTATE_TXERR) + else if ((chan->chreason == CHREASON_TXERR) || + (chan->chreason == CHREASON_DTERR)) { - /* Check the error count */ + /* Set the I/O failure result */ - if (chan->nerrors == 3) - { - /* If the error count exceeds a threshold, then set the request error state */ + chan->result = EIO; + } + else /* if (chan->chreason == CHREASON_FRMOR) */ + { + /* Set the frame error result */ - chan->result = EIO; - chan->nerrors = 0; - } + chan->result = EPIPE; } /* Clear the pending the CHannel Halted (CHH) interrupt */ @@ -1939,6 +1952,7 @@ static inline void stm32_gint_rxflvlisr(FAR struct stm32_usbhost_s *priv) /* Read and pop the next status from the Rx FIFO */ grxsts = stm32_getreg(STM32_OTGFS_GRXSTSP); + uvdbg("GRXSTS: %08x\n", grxsts); /* Isolate the channel number/index in the status word */ @@ -2405,7 +2419,7 @@ static int stm32_gint_isr(int irq, FAR void *context) { /* Get the unmasked bits in the GINT status */ - pending = stm32_getreg(STM32_OTGFS_GINTSTS); + pending = stm32_getreg(STM32_OTGFS_GINTSTS); pending &= stm32_getreg(STM32_OTGFS_GINTMSK); /* Return from the interrupt when there are no furhter pending @@ -2968,19 +2982,20 @@ static int stm32_alloc(FAR struct usbhost_driver_s *drvr, { FAR uint8_t *alloc; - DEBUGASSERT(drvr && buffer && maxlen && *maxlen > 0); + DEBUGASSERT(drvr && buffer && maxlen); - /* There is no special memory requirement */ + /* There is no special memory requirement for the STM32. */ - alloc = (FAR uint8_t *)kmalloc(*maxlen); + alloc = (FAR uint8_t *)kmalloc(CONFIG_STM32_OTGFS_DESCSIZE); if (!alloc) { return -ENOMEM; } - /* Return the allocated buffer */ + /* Return the allocated address and size of the descriptor buffer */ *buffer = alloc; + *maxlen = CONFIG_STM32_OTGFS_DESCSIZE; return OK; } @@ -3301,6 +3316,8 @@ static int stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, unsigned int chidx = (unsigned int)ep; int ret; + uvdbg("chidx: %d buflen: %d\n", (unsigned int)ep, buflen); + DEBUGASSERT(priv && buffer && chidx < STM32_MAX_TX_FIFOS && buflen > 0); chan = &priv->chan[chidx]; @@ -3367,7 +3384,7 @@ static int stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, if (chan->in) { - /* Setup the OUT data PID */ + /* Setup the IN data PID */ chan->pid = chan->indata1 ? OTGFS_PID_DATA1 : OTGFS_PID_DATA0; diff --git a/nuttx/configs/stm3220g-eval/README.txt b/nuttx/configs/stm3220g-eval/README.txt index a25db07a51..da29b15922 100644 --- a/nuttx/configs/stm3220g-eval/README.txt +++ b/nuttx/configs/stm3220g-eval/README.txt @@ -685,6 +685,7 @@ STM3220G-EVAL-specific Configuration Options in 32-bit words. Default 96 (384 bytes) CONFIG_STM32_OTGFS_PTXFIFO_SIZE - Size of the periodic Tx FIFO in 32-bit words. Default 96 (384 bytes) + CONFIG_STM32_OTGFS_DESCSIZE - Maximum size of a descriptor. Default: 128 CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts. Why would you ever want to do that? CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access diff --git a/nuttx/configs/stm3220g-eval/nsh/defconfig b/nuttx/configs/stm3220g-eval/nsh/defconfig index 5a3dd6643d..decc23e6ca 100644 --- a/nuttx/configs/stm3220g-eval/nsh/defconfig +++ b/nuttx/configs/stm3220g-eval/nsh/defconfig @@ -1043,6 +1043,7 @@ CONFIG_USBDEV_TRACE_NRECORDS=128 # in 32-bit words. Default 96 (384 bytes) # CONFIG_STM32_OTGFS_PTXFIFO_SIZE - Size of the periodic Tx FIFO in 32-bit # words. Default 96 (384 bytes) +# CONFIG_STM32_OTGFS_DESCSIZE - Maximum size of a descriptor. Default: 128 # CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts. Why would you ever # want to do that? # CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access @@ -1051,9 +1052,10 @@ CONFIG_USBDEV_TRACE_NRECORDS=128 # packets. Depends on CONFIG_DEBUG. # CONFIG_USBHOST=n -# ONFIG_STM32_OTGFS_RXFIFO_SIZE +#CONFIG_STM32_OTGFS_RXFIFO_SIZE #CONFIG_STM32_OTGFS_NPTXFIFO_SIZE #CONFIG_STM32_OTGFS_PTXFIFO_SIZE +#CONFIG_STM32_OTGFS_DESCSIZE CONFIG_STM32_OTGFS_SOFINTR=n CONFIG_STM32_USBHOST_REGDEBUG=n CONFIG_STM32_USBHOST_PKTDUMP=n diff --git a/nuttx/configs/stm3240g-eval/README.txt b/nuttx/configs/stm3240g-eval/README.txt index 5f942819c3..908fb93c85 100755 --- a/nuttx/configs/stm3240g-eval/README.txt +++ b/nuttx/configs/stm3240g-eval/README.txt @@ -848,6 +848,7 @@ STM3240G-EVAL-specific Configuration Options in 32-bit words. Default 96 (384 bytes) CONFIG_STM32_OTGFS_PTXFIFO_SIZE - Size of the periodic Tx FIFO in 32-bit words. Default 96 (384 bytes) + CONFIG_STM32_OTGFS_DESCSIZE - Maximum size of a descriptor. Default: 128 CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts. Why would you ever want to do that? CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access diff --git a/nuttx/configs/stm32f4discovery/README.txt b/nuttx/configs/stm32f4discovery/README.txt index e7dc573536..84f562d567 100755 --- a/nuttx/configs/stm32f4discovery/README.txt +++ b/nuttx/configs/stm32f4discovery/README.txt @@ -901,6 +901,7 @@ STM32F4Discovery-specific Configuration Options in 32-bit words. Default 96 (384 bytes) CONFIG_STM32_OTGFS_PTXFIFO_SIZE - Size of the periodic Tx FIFO in 32-bit words. Default 96 (384 bytes) + CONFIG_STM32_OTGFS_DESCSIZE - Maximum size of a descriptor. Default: 128 CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts. Why would you ever want to do that? CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access From f1d8a9efab1feae0ebc3bf8a78edfc4f321bba43 Mon Sep 17 00:00:00 2001 From: patacongo Date: Wed, 22 Aug 2012 21:04:17 +0000 Subject: [PATCH 20/31] STM32 USB OTG FS host driver -- updates for NAK and data toggle fixes git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5047 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/arch/arm/src/stm32/stm32_otgfshost.c | 317 ++++++++++----------- 1 file changed, 158 insertions(+), 159 deletions(-) diff --git a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c index 9644d17e8c..256751d125 100644 --- a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c +++ b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c @@ -187,7 +187,7 @@ enum stm32_chreason_e CHREASON_NYET, /* NotYet received */ CHREASON_STALL, /* Endpoint stalled */ CHREASON_TXERR, /* Transfer error received */ - CHREASON_DTERR, /* Data error received */ + CHREASON_DTERR, /* Data toggle error received */ CHREASON_FRMOR /* Frame overrun */ }; @@ -202,14 +202,13 @@ struct stm32_chan_s uint8_t eptype; /* See OTGFS_EPTYPE_* definitions */ uint8_t pid; /* Data PID */ bool inuse; /* True: This channel is "in use" */ - bool indata1; /* IN data toggle. True: DATA01 */ - bool outdata1; /* OUT data toggle. True: DATA01 */ + volatile bool indata1; /* IN data toggle. True: DATA01 (Bulk and INTR only) */ + volatile bool outdata1; /* OUT data toggle. True: DATA01 */ bool in; /* True: IN endpoint */ volatile bool waiter; /* True: Thread is waiting for a channel event */ - volatile uint16_t xfrd; /* Number of bytes transferred */ uint16_t maxpacket; /* Max packet size */ - uint16_t buflen; /* Buffer length (remaining) */ - uint16_t xfrlen; /* Number of bytes transferred */ + volatile uint16_t buflen; /* Buffer length (remaining) */ + volatile uint16_t inflight; /* Number of Tx bytes "in-flight" */ FAR uint8_t *buffer; /* Transfer buffer pointer */ }; @@ -230,7 +229,7 @@ struct stm32_usbhost_s /* Overall driver status */ - uint8_t smstate; /* The state of the USB host state machine */ + volatile uint8_t smstate; /* The state of the USB host state machine */ uint8_t devaddr; /* Device address */ uint8_t ep0in; /* EP0 IN control channel index */ uint8_t ep0out; /* EP0 OUT control channel index */ @@ -998,8 +997,8 @@ static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx) /* Set up the initial state of the transfer */ - priv->chan[chidx].result = EBUSY; - priv->chan[chidx].xfrlen = 0; + priv->chan[chidx].result = EBUSY; + priv->chan[chidx].inflight = 0; /* Compute the expected number of packets associated to the transfer. * If the transfer length is zero (or less than the size of one maximum @@ -1059,7 +1058,10 @@ static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx) regval = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); - /* Check for an even frame */ + /* Set/clear the Odd Frame bit. Check for an even frame; if so set Odd + * Frame. This field is applicable for only periodic (isochronous and + * interrupt) channels. + */ if ((stm32_getreg(STM32_OTGFS_HFNUM) & 1) == 0) { @@ -1344,6 +1346,10 @@ static void stm32_gint_wrpacket(FAR struct stm32_usbhost_s *priv, uint32_t data = *src++; stm32_putreg(fifo, data); } + + /* Increment the count of bytes "in-flight" in the Tx FIFO */ + + priv->chan[chidx].inflight += buflen; } /******************************************************************************* @@ -1371,7 +1377,6 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, FAR struct stm32_chan_s *chan = &priv->chan[chidx]; uint32_t regval; uint32_t pending; - unsigned int eptype; /* Read the HCINT register to get the pending HC interrupts. Read the * HCINTMSK register to get the set of enabled HC interrupts. @@ -1451,31 +1456,22 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_XFRC); - /* Fetch the HCCHAR register and extract the endpoint type. Those - * values are used in several cases. - */ - - regval = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); - eptype = regval & OTGFS_HCCHAR_EPTYP_MASK; - /* Then handle the transfer completion event based on the endpoint type */ - if ((eptype == OTGFS_HCCHAR_EPTYP_CTRL) || - (eptype == OTGFS_HCCHAR_EPTYP_BULK)) + if (chan->eptype == OTGFS_EPTYPE_CTRL || chan->eptype == OTGFS_EPTYPE_BULK) { /* Halt the channel -- the CHH interrrupt is expected next */ stm32_chan_halt(priv, chidx, CHREASON_XFRC); - /* Clear any pending NAK condition */ + /* Clear any pending NAK condition. The 'indata1' data toggle + * should have been appropriately updated by the the RxFIFO + * logic as each packet was received. + */ stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_NAK); - - /* Toggle the IN data state */ - - chan->indata1 ^= true; } - else if (eptype == OTGFS_HCCHAR_EPTYP_INTR) + else if (chan->eptype == OTGFS_EPTYPE_INTR) { /* Force the next transfer on an ODD frame */ @@ -1527,7 +1523,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, regval = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); if ((regval & OTGFS_HCCHAR_EPTYP_MASK) == OTGFS_HCCHAR_EPTYP_INTR) { - /* Toggle the IN data toggle */ + /* Toggle the IN data toggle (Used by Bulk and INTR only) */ chan->indata1 ^= true; } @@ -1561,45 +1557,23 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, else if ((pending & OTGFS_HCINT_NAK) != 0) { - /* Handle the NAK based on the endpoint type - * - * Fetch the HCCHAR register and extract the endpoint type. - */ + /* Re-activate CTRL and BULK channels */ - regval = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); - eptype = regval & OTGFS_HCCHAR_EPTYP_MASK; - - /* Then process the NAK based on the endpoint type */ - - if (eptype == OTGFS_HCCHAR_EPTYP_INTR) + if (chan->eptype == OTGFS_EPTYPE_CTRL || chan->eptype == OTGFS_EPTYPE_BULK) { - /* Halt the INTR channel -- the CHH interrrupt is expected next */ - - stm32_chan_halt(priv, chidx, CHREASON_NAK); - } - else - { - /* Re-activate CGRL and BULK channels */ - - if ((eptype == OTGFS_HCCHAR_EPTYP_CTRL) || - (eptype == OTGFS_HCCHAR_EPTYP_BULK)) - { - /* Re-activate the channel by clearing CHDIS and assuring that - * CHENA is set - */ - - regval |= OTGFS_HCCHAR_CHENA; - regval &= ~OTGFS_HCCHAR_CHDIS; - stm32_putreg(STM32_OTGFS_HCCHAR(chidx), regval); - } - - /* Set the result to EAGAIN to wake up any thread wait for the - * transfer to complete. + /* Re-activate the channel by clearing CHDIS and assuring that + * CHENA is set */ - chan->result = EAGAIN; + regval |= OTGFS_HCCHAR_CHENA; + regval &= ~OTGFS_HCCHAR_CHDIS; + stm32_putreg(STM32_OTGFS_HCCHAR(chidx), regval); } + /* Halt the channel -- the CHH interrrupt is expected next */ + + stm32_chan_halt(priv, chidx, CHREASON_NAK); + /* Clear the NAK condition */ stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_NAK); @@ -1674,6 +1648,14 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, else if ((pending & OTGFS_HCINT_XFRC) != 0) { + /* Decrement the number of bytes remaining by the number of + * bytes that were "in-flight". + */ + + priv->chan[chidx].buffer += priv->chan[chidx].inflight; + priv->chan[chidx].buflen -= priv->chan[chidx].inflight; + priv->chan[chidx].inflight = 0; + /* Halt the channel -- the CHH interrrupt is expected next */ stm32_chan_halt(priv, chidx, CHREASON_XFRC); @@ -1986,11 +1968,14 @@ static inline void stm32_gint_rxflvlisr(FAR struct stm32_usbhost_s *priv) stm32_pktdump("Received", priv->chan[chidx].buffer, bcnt); + /* Toggle the IN data pid (Used by Bulk and INTR only) */ + + priv->chan[chidx].indata1 ^= true; + /* Manage multiple packet transfers */ priv->chan[chidx].buffer += bcnt; - priv->chan[chidx].xfrlen += bcnt; - priv->chan[chidx].xfrd = priv->chan[chidx].xfrlen; + priv->chan[chidx].buflen -= bcnt; /* Check if more packets are expected */ @@ -2090,10 +2075,6 @@ static inline void stm32_gint_nptxfeisr(FAR struct stm32_usbhost_s *priv) } stm32_gint_wrpacket(priv, priv->chan[chidx].buffer, chidx, wrsize); - - priv->chan[chidx].buffer += wrsize; - priv->chan[chidx].buflen -= wrsize; - priv->chan[chidx].xfrlen += wrsize; } } @@ -2167,10 +2148,6 @@ static inline void stm32_gint_ptxfeisr(FAR struct stm32_usbhost_s *priv) } stm32_gint_wrpacket(priv, priv->chan[chidx].buffer, chidx, wrsize); - - priv->chan[chidx].buffer += wrsize; - priv->chan[chidx].buflen -= wrsize; - priv->chan[chidx].xfrlen += wrsize; } } @@ -3316,7 +3293,7 @@ static int stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, unsigned int chidx = (unsigned int)ep; int ret; - uvdbg("chidx: %d buflen: %d\n", (unsigned int)ep, buflen); + uvdbg("chidx: %d buflen: %d\n", (unsigned int)ep, buflen); DEBUGASSERT(priv && buffer && chidx < STM32_MAX_TX_FIFOS && buflen > 0); chan = &priv->chan[chidx]; @@ -3325,99 +3302,121 @@ static int stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, stm32_takesem(&priv->exclsem); - /* Set up for the wait BEFORE starting the transfer */ + /* Loop until the transfer completes (i.e., buflen is decremented to zero) + * or a fatal error occurs (any error other than a simple NAK) + */ - ret = stm32_chan_waitsetup(priv, chan); - if (ret != OK) - { - udbg("ERROR: Device disconnected\n"); - goto errout; - } - - /* Set up for the transfer based on the direction and the endpoint type */ - - switch (chan->eptype) - { - default: - case OTGFS_EPTYPE_CTRL: /* Control */ - { - /* This kind of transfer on control endpoints other than EP0 are not - * currently supported - */ - - ret = -ENOSYS; - goto errout; - } - - case OTGFS_EPTYPE_ISOC: /* Isochronous */ - { - /* Set up the IN/OUT data PID */ - - chan->pid = OTGFS_PID_DATA0; - } - break; - - case OTGFS_EPTYPE_BULK: /* Bulk */ - { - /* Handle the bulk transfer based on the direction of the transfer. */ - - if (chan->in) - { - /* Setup the IN data PID */ - - chan->pid = chan->indata1 ? OTGFS_PID_DATA1 : OTGFS_PID_DATA0; - } - else - { - /* Setup the OUT data PID */ - - chan->pid = chan->outdata1 ? OTGFS_PID_DATA1 : OTGFS_PID_DATA0; - } - } - break; - - case OTGFS_EPTYPE_INTR: /* Interrupt */ - { - /* Handle the interrupt transfer based on the direction of the - * transfer. - */ - - if (chan->in) - { - /* Setup the IN data PID */ - - chan->pid = chan->indata1 ? OTGFS_PID_DATA1 : OTGFS_PID_DATA0; - - /* Toggle the IN data PID for the next transfer */ - - chan->indata1 ^= true; - } - else - { - /* Setup the OUT data PID */ - - chan->pid = chan->outdata1 ? OTGFS_PID_DATA1 : OTGFS_PID_DATA0; - - /* Toggle the OUT data PID for the next transfer */ - - chan->outdata1 ^= true; - } - } - } - - /* Start the transfer */ - chan->buffer = buffer; chan->buflen = buflen; - stm32_transfer_start(priv, chidx); - - /* Wait for the transfer to complete and get the result */ - - ret = stm32_chan_wait(priv, chan); - if (ret < 0) + while (chan->buflen > 0) { - udbg("Transfer failed: %d\n", ret); + /* Set up for the wait BEFORE starting the transfer */ + + ret = stm32_chan_waitsetup(priv, chan); + if (ret != OK) + { + udbg("ERROR: Device disconnected\n"); + goto errout; + } + + /* Set up for the transfer based on the direction and the endpoint type */ + + switch (chan->eptype) + { + default: + case OTGFS_EPTYPE_CTRL: /* Control */ + { + /* This kind of transfer on control endpoints other than EP0 are not + * currently supported + */ + + ret = -ENOSYS; + goto errout; + } + + case OTGFS_EPTYPE_ISOC: /* Isochronous */ + { + /* Set up the IN/OUT data PID */ + + chan->pid = OTGFS_PID_DATA0; + } + break; + + case OTGFS_EPTYPE_BULK: /* Bulk */ + { + /* Handle the bulk transfer based on the direction of the transfer. */ + + if (chan->in) + { + /* Setup the IN data PID */ + + chan->pid = chan->indata1 ? OTGFS_PID_DATA1 : OTGFS_PID_DATA0; + } + else + { + /* Setup the OUT data PID */ + + chan->pid = chan->outdata1 ? OTGFS_PID_DATA1 : OTGFS_PID_DATA0; + } + } + break; + + case OTGFS_EPTYPE_INTR: /* Interrupt */ + { + /* Handle the interrupt transfer based on the direction of the + * transfer. + */ + + if (chan->in) + { + /* Setup the IN data PID */ + + chan->pid = chan->indata1 ? OTGFS_PID_DATA1 : OTGFS_PID_DATA0; + + /* The indata1 data toggle will be updated in the Rx FIFO + * interrupt handling logic as each packet is received. + */ + } + else + { + /* Setup the OUT data PID */ + + chan->pid = chan->outdata1 ? OTGFS_PID_DATA1 : OTGFS_PID_DATA0; + + /* Toggle the OUT data PID for the next transfer */ + + chan->outdata1 ^= true; + } + } + } + + /* Start the transfer */ + + stm32_transfer_start(priv, chidx); + + /* Wait for the transfer to complete and get the result */ + + ret = stm32_chan_wait(priv, chan); + + /* EGAIN indicates that the device NAKed the transfer and we need + * do try again. Anything else (success or other errors) will + * cause use to return + */ + + if (ret != -EAGAIN) + { + /* Output some debug info on an error */ + + if (ret < 0) + { + udbg("Transfer failed: %d\n", ret); + } + + /* Break out and return this result */ + + break; + } } errout: From 73220bb85431fc9b0c207ed6139b00aa51105d37 Mon Sep 17 00:00:00 2001 From: patacongo Date: Thu, 23 Aug 2012 19:50:04 +0000 Subject: [PATCH 21/31] Fixes several STM32 USB OTG FS host MSC write transfers git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5048 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/arch/arm/src/stm32/stm32_otgfshost.c | 440 +++++++++++++-------- 1 file changed, 278 insertions(+), 162 deletions(-) diff --git a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c index 256751d125..9e6b2615a0 100644 --- a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c +++ b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c @@ -234,6 +234,7 @@ struct stm32_usbhost_s uint8_t ep0in; /* EP0 IN control channel index */ uint8_t ep0out; /* EP0 OUT control channel index */ uint8_t ep0size; /* EP0 max packet size */ + uint8_t chidx; /* ID of channel waiting for space in Tx FIFO */ bool lowspeed; /* True: low speed device */ volatile bool connected; /* Connected to device */ volatile bool eventwait; /* True: Thread is waiting for a port event */ @@ -339,6 +340,7 @@ static int stm32_gint_isr(int irq, FAR void *context); static void stm32_gint_enable(void); static void stm32_gint_disable(void); static inline void stm32_hostinit_enable(void); +static void stm32_txfe_enable(FAR struct stm32_usbhost_s *priv, int chidx); /* USB host controller operations **********************************************/ @@ -974,6 +976,7 @@ static void stm32_chan_wakeup(FAR struct stm32_usbhost_s *priv, if (chan->result != EBUSY && chan->waiter) { + ullvdbg("Wakeup with result: %d\n", chan->result); stm32_givesem(&chan->waitsem); chan->waiter = false; } @@ -989,32 +992,38 @@ static void stm32_chan_wakeup(FAR struct stm32_usbhost_s *priv, static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx) { + FAR struct stm32_chan_s *chan; uint32_t regval; unsigned int npackets; unsigned int maxpacket; - unsigned int buflen32; - unsigned int avail32; + unsigned int avail; + unsigned int wrsize; + unsigned int minsize; /* Set up the initial state of the transfer */ - priv->chan[chidx].result = EBUSY; - priv->chan[chidx].inflight = 0; + chan = &priv->chan[chidx]; + uvdbg("chidx: %d buflen: %d\n", chidx, chan->buflen); + + chan->result = EBUSY; + chan->inflight = 0; + priv->chidx = chidx; /* Compute the expected number of packets associated to the transfer. * If the transfer length is zero (or less than the size of one maximum * size packet), then one packet is expected. */ - /* If the transfer size is greater than one packet, then xalculate the + /* If the transfer size is greater than one packet, then calculate the * number of packets that will be received/sent, including any partial * final packet. */ - maxpacket = priv->chan[chidx].maxpacket; + maxpacket = chan->maxpacket; - if (priv->chan[chidx].buflen > maxpacket) + if (chan->buflen > maxpacket) { - npackets = (priv->chan[chidx].buflen + maxpacket - 1) / maxpacket; + npackets = (chan->buflen + maxpacket - 1) / maxpacket; /* Clip if the buffer length if it exceeds the maximum number of * packets that can be transferred (this should not happen). @@ -1023,7 +1032,8 @@ static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx) if (npackets > STM32_MAX_PKTCOUNT) { npackets = STM32_MAX_PKTCOUNT; - priv->chan[chidx].buflen = STM32_MAX_PKTCOUNT * maxpacket; + chan->buflen = STM32_MAX_PKTCOUNT * maxpacket; + ulldbg("CLIP: chidx: %d buflen: %d\n", chidx, chan->buflen); } } else @@ -1039,19 +1049,19 @@ static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx) */ #if 0 /* Think about this */ - if (priv->chan[chidx].in) + if (chan->in) { /* Force the buffer length to an even multiple of maxpacket */ - priv->chan[chidx].buflen = npackets * maxpacket; + chan->buflen = npackets * maxpacket; } #endif /* Setup the HCTSIZn register */ - regval = ((uint32_t)priv->chan[chidx].buflen << OTGFS_HCTSIZ_XFRSIZ_SHIFT) | + regval = ((uint32_t)chan->buflen << OTGFS_HCTSIZ_XFRSIZ_SHIFT) | ((uint32_t)npackets << OTGFS_HCTSIZ_PKTCNT_SHIFT) | - ((uint32_t)priv->chan[chidx].pid << OTGFS_HCTSIZ_DPID_SHIFT); + ((uint32_t)chan->pid << OTGFS_HCTSIZ_DPID_SHIFT); stm32_putreg(STM32_OTGFS_HCTSIZ(chidx), regval); /* Setup the HCCHAR register: Frame oddness and host channel enable */ @@ -1076,63 +1086,76 @@ static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx) * the outgoing data into the correct TxFIFO. */ - if (!priv->chan[chidx].in && priv->chan[chidx].buflen > 0) + if (!chan->in && chan->buflen > 0) { /* Handle non-periodic (CTRL and BULK) OUT transfers differently than - * perioci (INTR and ISOC) OUT transfers. + * periodic (INTR and ISOC) OUT transfers. */ - buflen32 = (priv->chan[chidx].buflen + 3) >> 2; - switch (priv->chan[chidx].eptype) + minsize = MIN(chan->buflen, chan->maxpacket); + + switch (chan->eptype) { case OTGFS_EPTYPE_CTRL: /* Non periodic transfer */ case OTGFS_EPTYPE_BULK: { /* Read the Non-periodic Tx FIFO status register */ - regval = stm32_getreg(STM32_OTGFS_HNPTXSTS); - avail32 = (regval & OTGFS_HNPTXSTS_NPTXFSAV_MASK) >> OTGFS_HNPTXSTS_NPTXFSAV_SHIFT; - - /* Check if there is enough space available in the Tx FIFO */ - - if (buflen32 > avail32) - { - /* Insufficient space... Enable the Non-periodic Tx FIFO - * interrupt to handle the transfer when the Tx FIFO is empty. - */ - - stm32_modifyreg(STM32_OTGFS_GINTMSK, 0, OTGFS_GINT_NPTXFE); - } + regval = stm32_getreg(STM32_OTGFS_HNPTXSTS); + avail = ((regval & OTGFS_HNPTXSTS_NPTXFSAV_MASK) >> OTGFS_HNPTXSTS_NPTXFSAV_SHIFT) << 2; } break; - /* Periodic transfer */ + /* Periodic transfer */ - case OTGFS_EPTYPE_INTR: - case OTGFS_EPTYPE_ISOC: + case OTGFS_EPTYPE_INTR: + case OTGFS_EPTYPE_ISOC: + { /* Read the Non-periodic Tx FIFO status register */ - regval = stm32_getreg(STM32_OTGFS_HPTXSTS); - avail32 = (regval & OTGFS_HPTXSTS_PTXFSAVL_MASK) >> OTGFS_HPTXSTS_PTXFSAVL_SHIFT; - - /* Check if there is enough space in FIFO space */ - - if (buflen32 > avail32) - { - /* Need to process data in OTGFS_GINT_PTXFE interrupt */ - - stm32_modifyreg(STM32_OTGFS_GINTMSK, 0, OTGFS_GINT_PTXFE); - } - break; - - default: - break; + regval = stm32_getreg(STM32_OTGFS_HPTXSTS); + avail = ((regval & OTGFS_HPTXSTS_PTXFSAVL_MASK) >> OTGFS_HPTXSTS_PTXFSAVL_SHIFT) << 2; } + break; - /* Write packet into the Tx FIFO. */ + default: + DEBUGASSERT(false); + return; + } - stm32_gint_wrpacket(priv, priv->chan[chidx].buffer, chidx, - priv->chan[chidx].buflen); + /* Is there space in the TxFIFO to hold the minimum size packet? */ + + if (minsize <= avail) + { + /* Yes.. Get the size of the biggest thing that we can put in the Tx FIFO now */ + + wrsize = chan->buflen; + if (wrsize > avail) + { + /* Clip the write size to the number of full, max sized packets + * that will fit in the Tx FIFO. + */ + + unsigned int wrpackets = avail / chan->maxpacket; + wrsize = wrpackets * chan->maxpacket; + } + + /* Write packet into the Tx FIFO. */ + + stm32_gint_wrpacket(priv, chan->buffer, chidx, wrsize); + } + + /* Did we put the entire buffer into the Tx FIFO? */ + + if (chan->buflen > avail) + { + /* No, there was insufficient space to hold the entire transfer ... + * Enable the Tx FIFO interrupt to handle the transfer when the Tx + * FIFO becomes empty. + */ + + stm32_txfe_enable(priv, chidx); + } } } @@ -1388,7 +1411,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, /* AND the two to get the set of enabled, pending HC interrupts */ pending &= regval; - uvdbg("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending); + ullvdbg("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending); /* Check for a pending ACK response received/transmitted (ACK) interrupt */ @@ -1475,6 +1498,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, { /* Force the next transfer on an ODD frame */ + regval = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); regval |= OTGFS_HCCHAR_ODDFRM; stm32_putreg(STM32_OTGFS_HCCHAR(chidx), regval); @@ -1565,6 +1589,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, * CHENA is set */ + regval = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); regval |= OTGFS_HCCHAR_CHENA; regval &= ~OTGFS_HCCHAR_CHDIS; stm32_putreg(STM32_OTGFS_HCCHAR(chidx), regval); @@ -1620,7 +1645,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, /* AND the two to get the set of enabled, pending HC interrupts */ pending &= regval; - uvdbg("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending); + ullvdbg("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending); /* Check for a pending ACK response received/transmitted (ACK) interrupt */ @@ -1708,7 +1733,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_TXERR); } - /* Check for a pending response received (xxx) interrupt */ + /* Check for a NYET interrupt */ #if 0 /* NYET is a reserved bit in the HCINT register */ else if ((pending & OTGFS_HCINT_NYET) != 0) @@ -1717,7 +1742,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, stm32_chan_halt(priv, chidx, CHREASON_NYET); - /* Clear the pending the response received (xxx) interrupt */ + /* Clear the pending the NYET interrupt */ stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_NYET); } @@ -1934,7 +1959,7 @@ static inline void stm32_gint_rxflvlisr(FAR struct stm32_usbhost_s *priv) /* Read and pop the next status from the Rx FIFO */ grxsts = stm32_getreg(STM32_OTGFS_GRXSTSP); - uvdbg("GRXSTS: %08x\n", grxsts); + ullvdbg("GRXSTS: %08x\n", grxsts); /* Isolate the channel number/index in the status word */ @@ -2015,67 +2040,84 @@ static inline void stm32_gint_rxflvlisr(FAR struct stm32_usbhost_s *priv) static inline void stm32_gint_nptxfeisr(FAR struct stm32_usbhost_s *priv) { + FAR struct stm32_chan_s *chan; uint32_t regval; - unsigned int buflen; - unsigned int buflen32; unsigned int wrsize; - unsigned int avail32; + unsigned int minsize; + unsigned int avail; unsigned int chidx; - /* Loop while there is data to be sent and where there is space available - * in the non-periodic Tx FIFO. + /* Recover the index of the channel that is waiting for space in the Tx + * FIFO. */ - for (;;) + chidx = priv->chidx; + chan = &priv->chan[chidx]; + + /* Reduce the buffer size by the number of bytes that were previously placed + * in the Tx FIFO. + */ + + chan->buffer += chan->inflight; + chan->buflen -= chan->inflight; + chan->inflight = 0; + + /* If we have now transfered the entire buffer, then this transfer is + * complete (this case really should never happen because we disable + * the NPTXFE interrupt on the final packet). + */ + + if (chan->buflen <= 0) { - /* Read the status from the top of the non-periodic TxFIFO */ + /* Disable further Tx FIFO empty interrupts and bail. */ - regval = stm32_getreg(STM32_OTGFS_HNPTXSTS); - - /* Extract the channel number and the number of 32-bit words available in - * the non-periodic Tx FIFO. - */ - - chidx = (regval & OTGFS_HNPTXSTS_CHNUM_MASK) >> OTGFS_HNPTXSTS_CHNUM_SHIFT; - avail32 = (regval & OTGFS_HNPTXSTS_NPTXFSAV_MASK) >> OTGFS_HNPTXSTS_NPTXFSAV_SHIFT; - - /* Get the number of words remaining to be sent */ - - buflen = priv->chan[chidx].buflen; - buflen32 = (buflen + 3) >> 2; - - /* Break out of the loop if either (a) there is nothing more to be - * sent, or (2) there is insufficent space availabe in the non-periodic - * Tx FIFO to hold the next packet. - */ - - if (buflen == 0 || avail32 <= buflen32) - { - return; - } - - /* Get the number of bytes available in the non-periodic Tx FIFO. That - * is the maximum write size. - */ - - wrsize = avail32 << 2; - - /* Clip the actual write size to the number of bytes actually available - * to be sent. - */ - - if (wrsize > buflen) - { - /* This is the last packet to be sent. Clip to the amount of - * data to send in the last packet. - */ - - wrsize = buflen; - stm32_modifyreg(STM32_OTGFS_GINTMSK, OTGFS_GINT_NPTXFE, 0); - } - - stm32_gint_wrpacket(priv, priv->chan[chidx].buffer, chidx, wrsize); + stm32_modifyreg(STM32_OTGFS_GINTMSK, OTGFS_GINT_NPTXFE, 0); + return; } + + /* Read the status from the top of the non-periodic TxFIFO */ + + regval = stm32_getreg(STM32_OTGFS_HNPTXSTS); + + /* Extract the number of bytes available in the non-periodic Tx FIFO. */ + + avail = ((regval & OTGFS_HNPTXSTS_NPTXFSAV_MASK) >> OTGFS_HNPTXSTS_NPTXFSAV_SHIFT) << 2; + + /* Get minimal size packet that can be sent. Something is serioulsy + * configured wrong if one packet will not fit into the empty Tx FIFO. + */ + + minsize = MIN(chan->buflen, chan->maxpacket); + DEBUGASSERT(chan->buflen > 0 && avail >= minsize); + + /* Get the size to put in the Tx FIFO now */ + + wrsize = chan->buflen; + if (wrsize > avail) + { + /* Clip the write size to the number of full, max sized packets + * that will fit in the Tx FIFO. + */ + + unsigned int wrpackets = avail / chan->maxpacket; + wrsize = wrpackets * chan->maxpacket; + } + + /* Otherwise, this will be the last packet to be sent in this transaction. + * We now need to disable further NPTXFE interrupts. + */ + + else + { + stm32_modifyreg(STM32_OTGFS_GINTMSK, OTGFS_GINT_NPTXFE, 0); + } + + /* Write the next group of packets into the Tx FIFO */ + + ullvdbg("HNPTXSTS: %08x chidx: %d avail: %d buflen: %d wrsize: %d\n", + regval, chidx, avail, chan->buflen, wrsize); + + stm32_gint_wrpacket(priv, chan->buffer, chidx, wrsize); } /******************************************************************************* @@ -2088,67 +2130,84 @@ static inline void stm32_gint_nptxfeisr(FAR struct stm32_usbhost_s *priv) static inline void stm32_gint_ptxfeisr(FAR struct stm32_usbhost_s *priv) { + FAR struct stm32_chan_s *chan; uint32_t regval; - unsigned int buflen; - unsigned int buflen32; unsigned int wrsize; - unsigned int avail32; + unsigned int minsize; + unsigned int avail; unsigned int chidx; - /* Loop while there is data to be sent and where there is space available - * in the periodic Tx FIFO. + /* Recover the index of the channel that is waiting for space in the Tx + * FIFO. */ - for (;;) + chidx = priv->chidx; + chan = &priv->chan[chidx]; + + /* Reduce the buffer size by the number of bytes that were previously placed + * in the Tx FIFO. + */ + + chan->buffer += chan->inflight; + chan->buflen -= chan->inflight; + chan->inflight = 0; + + /* If we have now transfered the entire buffer, then this transfer is + * complete (this case really should never happen because we disable + * the PTXFE interrupt on the final packet). + */ + + if (chan->buflen <= 0) { - /* Read the status from the top of the periodic TxFIFO */ + /* Disable further Tx FIFO empty interrupts and bail. */ - regval = stm32_getreg(STM32_OTGFS_HPTXSTS); - - /* Extract the channel number and the number of 32-bit words available in - * the periodic Tx FIFO. - */ - - chidx = (regval & OTGFS_HPTXSTS_CHNUM_MASK) >> OTGFS_HPTXSTS_CHNUM_SHIFT; - avail32 = (regval & OTGFS_HPTXSTS_PTXFSAVL_MASK) >> OTGFS_HPTXSTS_PTXFSAVL_SHIFT; - - /* Get the number of words remaining to be sent */ - - buflen = priv->chan[chidx].buflen; - buflen32 = (buflen + 3) >> 2; - - /* Break out of the loop if either (a) there is nothing more to be - * sent, or (2) there is insufficent space availabe in the periodic - * Tx FIFO to hold the next packet. - */ - - if (buflen == 0 || avail32 <= buflen32) - { - return; - } - - /* Get the number of bytes available in the periodic Tx FIFO. That is - * the maximum write size. - */ - - wrsize = avail32 << 2; - - /* Clip the actual write size to the number of bytes actually available - * to be sent. - */ - - if (wrsize > buflen) - { - /* This is the last packet to be sent. Clip to the amount of - * data to send in the last packet. - */ - - wrsize = buflen; - stm32_modifyreg(STM32_OTGFS_GINTMSK, OTGFS_GINT_PTXFE, 0); - } - - stm32_gint_wrpacket(priv, priv->chan[chidx].buffer, chidx, wrsize); + stm32_modifyreg(STM32_OTGFS_GINTMSK, OTGFS_GINT_PTXFE, 0); + return; } + + /* Read the status from the top of the periodic TxFIFO */ + + regval = stm32_getreg(STM32_OTGFS_HPTXSTS); + + /* Extract the number of bytes available in the periodic Tx FIFO. */ + + avail = ((regval & OTGFS_HPTXSTS_PTXFSAVL_MASK) >> OTGFS_HPTXSTS_PTXFSAVL_SHIFT) << 2; + + /* Get minimal size packet that can be sent. Something is serioulsy + * configured wrong if one packet will not fit into the empty Tx FIFO. + */ + + minsize = MIN(chan->buflen, chan->maxpacket); + DEBUGASSERT(chan->buflen > 0 && avail >= minsize); + + /* Get the size to put in the Tx FIFO now */ + + wrsize = chan->buflen; + if (wrsize > avail) + { + /* Clip the write size to the number of full, max sized packets + * that will fit in the Tx FIFO. + */ + + unsigned int wrpackets = avail / chan->maxpacket; + wrsize = wrpackets * chan->maxpacket; + } + + /* Otherwise, this will be the last packet to be sent in this transaction. + * We now need to disable further PTXFE interrupts. + */ + + else + { + stm32_modifyreg(STM32_OTGFS_GINTMSK, OTGFS_GINT_PTXFE, 0); + } + + /* Write the next group of packets into the Tx FIFO */ + + ullvdbg("HPTXSTS: %08x chidx: %d avail: %d buflen: %d wrsize: %d\n", + regval, chidx, avail, chan->buflen, wrsize); + + stm32_gint_wrpacket(priv, chan->buffer, chidx, wrsize); } /******************************************************************************* @@ -2582,6 +2641,63 @@ static inline void stm32_hostinit_enable(void) stm32_putreg(STM32_OTGFS_GINTMSK, regval); } +/******************************************************************************* + * Name: stm32_txfe_enable + * + * Description: + * Enable Tx FIFO empty interrupts. This is necessary when the entire + * transfer will not fit into Tx FIFO. The transfer will then be completed + * when the Tx FIFO is empty. NOTE: The Tx FIFO interrupt is disabled + * the the fifo empty interrupt handler when the transfer is complete. + * + * Input Parameters: + * priv - Driver state structure reference + * chidx - The channel that requires the Tx FIFO empty interrupt + * + * Returned Value: + * None + * + * Assumptions: + * Called from user task context. Interrupts must be disabled to assure + * exclusive access to the GINTMSK register. + * + *******************************************************************************/ + +static void stm32_txfe_enable(FAR struct stm32_usbhost_s *priv, int chidx) +{ + FAR struct stm32_chan_s *chan = &priv->chan[chidx]; + irqstate_t flags; + uint32_t regval; + + /* Disable all interrupts so that we have exclusive access to the GINTMSK + * (it would be sufficent just to disable the GINT interrupt). + */ + + flags = irqsave(); + + /* Should we enable the periodic or non-peridic Tx FIFO empty interrupts */ + + regval = stm32_getreg(STM32_OTGFS_GINTMSK); + switch (chan->eptype) + { + default: + case OTGFS_EPTYPE_CTRL: /* Non periodic transfer */ + case OTGFS_EPTYPE_BULK: + regval |= OTGFS_GINT_NPTXFE; + break; + + case OTGFS_EPTYPE_INTR: /* Periodic transfer */ + case OTGFS_EPTYPE_ISOC: + regval |= OTGFS_GINT_PTXFE; + break; + } + + /* Enable interrupts */ + + stm32_putreg(STM32_OTGFS_GINTMSK, regval); + irqrestore(flags); +} + /******************************************************************************* * USB Host Controller Operations *******************************************************************************/ @@ -2612,7 +2728,7 @@ static inline void stm32_hostinit_enable(void) static int stm32_wait(FAR struct usbhost_driver_s *drvr, bool connected) { - struct stm32_usbhost_s *priv = (struct stm32_usbhost_s *)drvr; + FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr; irqstate_t flags; /* Are we already connected? */ @@ -3291,7 +3407,7 @@ static int stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, struct stm32_usbhost_s *priv = (struct stm32_usbhost_s *)drvr; FAR struct stm32_chan_s *chan; unsigned int chidx = (unsigned int)ep; - int ret; + int ret = OK; uvdbg("chidx: %d buflen: %d\n", (unsigned int)ep, buflen); From 1dff49d24fddf9e30182cf78941f9f45c96140cc Mon Sep 17 00:00:00 2001 From: patacongo Date: Thu, 23 Aug 2012 21:13:24 +0000 Subject: [PATCH 22/31] STM32 OTG FS host driver: Fix some bad NAK handling git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5049 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/arch/arm/src/stm32/stm32_otgfshost.c | 29 ++++++++++++++++------ 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c index 9e6b2615a0..06d35a04ac 100644 --- a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c +++ b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c @@ -1538,11 +1538,12 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, /* Set the request I/O error result */ chan->result = EIO; - } - else /* if (chan->chreason == CHREASON_FRMOR) */ + else if (chan->chreason == CHREASON_NAK) { - /* Fetch the HCCHAR register and check for an interrupt endpoint. */ + /* Halt on NAK only happens on an INTR channel. Fetch the HCCHAR register + * and check for an interrupt endpoint. + */ regval = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); if ((regval & OTGFS_HCCHAR_EPTYP_MASK) == OTGFS_HCCHAR_EPTYP_INTR) @@ -1552,6 +1553,12 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, chan->indata1 ^= true; } + /* Set the NAK error result */ + + chan->result = EAGAIN; + } + else /* if (chan->chreason == CHREASON_FRMOR) */ + { /* Set the frame overrun error result */ chan->result = EPIPE; @@ -1581,9 +1588,19 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, else if ((pending & OTGFS_HCINT_NAK) != 0) { + /* Halt the interrupt channel */ + + if (chan->eptype == OTGFS_EPTYPE_CTRL) + { + /* Halt the channel -- the CHH interrrupt is expected next */ + + stm32_chan_halt(priv, chidx, CHREASON_NAK); + } + /* Re-activate CTRL and BULK channels */ - if (chan->eptype == OTGFS_EPTYPE_CTRL || chan->eptype == OTGFS_EPTYPE_BULK) + else if (chan->eptype == OTGFS_EPTYPE_CTRL || + chan->eptype == OTGFS_EPTYPE_BULK) { /* Re-activate the channel by clearing CHDIS and assuring that * CHENA is set @@ -1595,10 +1612,6 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, stm32_putreg(STM32_OTGFS_HCCHAR(chidx), regval); } - /* Halt the channel -- the CHH interrrupt is expected next */ - - stm32_chan_halt(priv, chidx, CHREASON_NAK); - /* Clear the NAK condition */ stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_NAK); From 2ac38983012ba13bdfb82eceb3e940e4ccac9ca3 Mon Sep 17 00:00:00 2001 From: patacongo Date: Thu, 23 Aug 2012 22:46:36 +0000 Subject: [PATCH 23/31] Lots of defconfig changes for compatibility with the configuration tool git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5050 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/configs/amber/hello/defconfig | 28 ++++++------ nuttx/configs/avr32dev1/nsh/defconfig | 32 +++++++------- nuttx/configs/avr32dev1/ostest/defconfig | 32 +++++++------- nuttx/configs/c5471evm/httpd/defconfig | 32 +++++++------- nuttx/configs/c5471evm/nettest/defconfig | 32 +++++++------- nuttx/configs/c5471evm/nsh/defconfig | 32 +++++++------- nuttx/configs/c5471evm/ostest/defconfig | 32 +++++++------- .../configs/compal_e88/nsh_highram/defconfig | 32 +++++++------- .../compal_e99/nsh_compalram/defconfig | 32 +++++++------- .../configs/compal_e99/nsh_highram/defconfig | 32 +++++++------- nuttx/configs/demo9s12ne64/ostest/defconfig | 30 ++++++------- nuttx/configs/ea3131/nsh/defconfig | 40 ++++++++--------- nuttx/configs/ea3131/ostest/defconfig | 40 ++++++++--------- nuttx/configs/ea3131/pgnsh/defconfig | 40 ++++++++--------- nuttx/configs/ea3131/usbserial/defconfig | 40 ++++++++--------- nuttx/configs/ea3131/usbstorage/defconfig | 40 ++++++++--------- nuttx/configs/ea3152/ostest/defconfig | 38 ++++++++-------- nuttx/configs/eagle100/httpd/defconfig | 32 +++++++------- nuttx/configs/eagle100/nettest/defconfig | 26 +++++------ nuttx/configs/eagle100/nsh/defconfig | 26 +++++------ nuttx/configs/eagle100/nxflat/defconfig | 26 +++++------ nuttx/configs/eagle100/ostest/defconfig | 26 +++++------ nuttx/configs/eagle100/thttpd/defconfig | 32 +++++++------- nuttx/configs/ekk-lm3s9b96/nsh/defconfig | 26 +++++------ nuttx/configs/ekk-lm3s9b96/ostest/defconfig | 26 +++++------ .../configs/ez80f910200kitg/ostest/defconfig | 32 +++++++------- nuttx/configs/ez80f910200zco/dhcpd/defconfig | 44 +++++++++---------- nuttx/configs/ez80f910200zco/httpd/defconfig | 44 +++++++++---------- .../configs/ez80f910200zco/nettest/defconfig | 38 ++++++++-------- nuttx/configs/ez80f910200zco/nsh/defconfig | 38 ++++++++-------- nuttx/configs/ez80f910200zco/ostest/defconfig | 38 ++++++++-------- nuttx/configs/ez80f910200zco/poll/defconfig | 38 ++++++++-------- nuttx/configs/hymini-stm32v/buttons/defconfig | 30 ++++++------- nuttx/configs/hymini-stm32v/nsh/defconfig | 30 ++++++------- nuttx/configs/hymini-stm32v/nsh2/defconfig | 10 ++--- nuttx/configs/hymini-stm32v/nx/defconfig | 30 ++++++------- nuttx/configs/hymini-stm32v/nxlines/defconfig | 16 +++---- .../configs/hymini-stm32v/usbserial/defconfig | 30 ++++++------- .../hymini-stm32v/usbstorage/defconfig | 30 ++++++------- nuttx/configs/kwikstik-k40/ostest/defconfig | 30 ++++++------- nuttx/configs/lincoln60/nsh/defconfig | 32 +++++++------- nuttx/configs/lincoln60/ostest/defconfig | 32 +++++++------- nuttx/configs/lm3s6432-s2e/nsh/defconfig | 26 +++++------ nuttx/configs/lm3s6432-s2e/ostest/defconfig | 26 +++++------ nuttx/configs/lm3s6965-ek/nsh/defconfig | 26 +++++------ nuttx/configs/lm3s6965-ek/nx/defconfig | 26 +++++------ nuttx/configs/lm3s6965-ek/ostest/defconfig | 26 +++++------ nuttx/configs/lm3s8962-ek/nsh/defconfig | 26 +++++------ nuttx/configs/lm3s8962-ek/nx/defconfig | 26 +++++------ nuttx/configs/lm3s8962-ek/ostest/defconfig | 26 +++++------ nuttx/configs/lpc4330-xplorer/nsh/defconfig | 32 +++++++------- .../configs/lpc4330-xplorer/ostest/defconfig | 32 +++++++------- .../lpcxpresso-lpc1768/dhcpd/defconfig | 38 ++++++++-------- .../configs/lpcxpresso-lpc1768/nsh/defconfig | 32 +++++++------- nuttx/configs/lpcxpresso-lpc1768/nx/defconfig | 32 +++++++------- .../lpcxpresso-lpc1768/ostest/defconfig | 32 +++++++------- .../lpcxpresso-lpc1768/thttpd/defconfig | 38 ++++++++-------- .../lpcxpresso-lpc1768/usbstorage/defconfig | 32 +++++++------- nuttx/configs/m68332evb/defconfig | 10 ++--- nuttx/configs/mbed/hidkbd/defconfig | 32 +++++++------- nuttx/configs/mbed/nsh/defconfig | 32 +++++++------- .../mcu123-lpc214x/composite/defconfig | 12 ++--- nuttx/configs/mcu123-lpc214x/nsh/defconfig | 12 ++--- nuttx/configs/mcu123-lpc214x/ostest/defconfig | 12 ++--- .../mcu123-lpc214x/usbserial/defconfig | 12 ++--- .../mcu123-lpc214x/usbstorage/defconfig | 12 ++--- nuttx/configs/micropendous3/hello/defconfig | 22 +++++----- nuttx/configs/mirtoo/nsh/defconfig | 32 +++++++------- nuttx/configs/mirtoo/nxffs/defconfig | 32 +++++++------- nuttx/configs/mirtoo/ostest/defconfig | 32 +++++++------- nuttx/configs/mx1ads/ostest/defconfig | 26 +++++------ nuttx/configs/ne64badge/ostest/defconfig | 30 ++++++------- nuttx/configs/ntosd-dm320/nettest/defconfig | 26 +++++------ nuttx/configs/ntosd-dm320/nsh/defconfig | 26 +++++------ nuttx/configs/ntosd-dm320/ostest/defconfig | 26 +++++------ nuttx/configs/ntosd-dm320/poll/defconfig | 32 +++++++------- nuttx/configs/ntosd-dm320/thttpd/defconfig | 32 +++++++------- nuttx/configs/ntosd-dm320/udp/defconfig | 34 +++++++------- nuttx/configs/ntosd-dm320/uip/defconfig | 26 +++++------ nuttx/configs/nucleus2g/nsh/defconfig | 32 +++++++------- nuttx/configs/nucleus2g/ostest/defconfig | 32 +++++++------- nuttx/configs/nucleus2g/usbserial/defconfig | 32 +++++++------- nuttx/configs/nucleus2g/usbstorage/defconfig | 32 +++++++------- .../configs/olimex-lpc1766stk/ftpc/defconfig | 38 ++++++++-------- .../olimex-lpc1766stk/hidkbd/defconfig | 32 +++++++------- .../olimex-lpc1766stk/nettest/defconfig | 32 +++++++------- nuttx/configs/olimex-lpc1766stk/nsh/defconfig | 32 +++++++------- nuttx/configs/olimex-lpc1766stk/nx/defconfig | 32 +++++++------- .../olimex-lpc1766stk/ostest/defconfig | 32 +++++++------- .../olimex-lpc1766stk/slip-httpd/defconfig | 38 ++++++++-------- .../olimex-lpc1766stk/thttpd/defconfig | 38 ++++++++-------- .../olimex-lpc1766stk/usbserial/defconfig | 32 +++++++------- .../olimex-lpc1766stk/usbstorage/defconfig | 32 +++++++------- .../configs/olimex-lpc1766stk/wlan/defconfig | 38 ++++++++-------- nuttx/configs/olimex-lpc2378/nsh/defconfig | 12 ++--- nuttx/configs/olimex-lpc2378/ostest/defconfig | 12 ++--- nuttx/configs/olimex-stm32-p107/nsh/defconfig | 30 ++++++------- .../olimex-stm32-p107/ostest/defconfig | 30 ++++++------- .../configs/olimex-strp711/nettest/defconfig | 24 +++++----- nuttx/configs/olimex-strp711/nsh/defconfig | 12 ++--- nuttx/configs/olimex-strp711/ostest/defconfig | 12 ++--- nuttx/configs/pcblogic-pic32mx/nsh/defconfig | 32 +++++++------- .../configs/pcblogic-pic32mx/ostest/defconfig | 32 +++++++------- nuttx/configs/pic32-starterkit/nsh/defconfig | 32 +++++++------- nuttx/configs/pic32-starterkit/nsh2/defconfig | 32 +++++++------- .../configs/pic32-starterkit/ostest/defconfig | 32 +++++++------- nuttx/configs/pic32mx7mmb/nsh/defconfig | 32 +++++++------- nuttx/configs/pic32mx7mmb/ostest/defconfig | 32 +++++++------- nuttx/configs/pjrc-8051/defconfig | 10 ++--- nuttx/configs/qemu-i486/nsh/defconfig | 26 +++++------ nuttx/configs/qemu-i486/ostest/defconfig | 26 +++++------ nuttx/configs/rgmp/arm/default/defconfig | 24 +++++----- nuttx/configs/rgmp/arm/nsh/defconfig | 24 +++++----- nuttx/configs/rgmp/x86/default/defconfig | 24 +++++----- nuttx/configs/rgmp/x86/nsh/defconfig | 24 +++++----- nuttx/configs/sam3u-ek/knsh/defconfig | 30 ++++++------- nuttx/configs/sam3u-ek/nsh/defconfig | 30 ++++++------- nuttx/configs/sam3u-ek/nx/defconfig | 30 ++++++------- nuttx/configs/sam3u-ek/ostest/defconfig | 30 ++++++------- nuttx/configs/sam3u-ek/touchscreen/defconfig | 30 ++++++------- nuttx/configs/sim/mount/defconfig | 24 +++++----- nuttx/configs/sim/nettest/defconfig | 24 +++++----- nuttx/configs/sim/nsh/defconfig | 28 ++++++------ nuttx/configs/sim/nsh2/defconfig | 28 ++++++------ nuttx/configs/sim/nx/defconfig | 24 +++++----- nuttx/configs/sim/nx11/defconfig | 24 +++++----- nuttx/configs/sim/nxffs/defconfig | 24 +++++----- nuttx/configs/sim/nxwm/defconfig | 28 ++++++------ nuttx/configs/sim/ostest/defconfig | 24 +++++----- nuttx/configs/sim/pashello/defconfig | 24 +++++----- nuttx/configs/sim/touchscreen/defconfig | 24 +++++----- nuttx/configs/skp16c26/ostest/defconfig | 26 +++++------ nuttx/configs/stm3210e-eval/RIDE/defconfig | 30 ++++++------- nuttx/configs/stm3210e-eval/buttons/defconfig | 30 ++++++------- .../configs/stm3210e-eval/composite/defconfig | 30 ++++++------- nuttx/configs/stm3210e-eval/nsh/defconfig | 30 ++++++------- nuttx/configs/stm3210e-eval/nsh2/defconfig | 30 ++++++------- nuttx/configs/stm3210e-eval/nx/defconfig | 30 ++++++------- .../configs/stm3210e-eval/nxconsole/defconfig | 30 ++++++------- nuttx/configs/stm3210e-eval/nxlines/defconfig | 30 ++++++------- nuttx/configs/stm3210e-eval/nxtext/defconfig | 30 ++++++------- nuttx/configs/stm3210e-eval/ostest/defconfig | 30 ++++++------- nuttx/configs/stm3210e-eval/pm/defconfig | 30 ++++++------- .../configs/stm3210e-eval/usbserial/defconfig | 30 ++++++------- .../stm3210e-eval/usbstorage/defconfig | 30 ++++++------- nuttx/configs/stm3220g-eval/dhcpd/defconfig | 38 ++++++++-------- nuttx/configs/stm3220g-eval/nettest/defconfig | 32 +++++++------- nuttx/configs/stm3220g-eval/nsh/defconfig | 32 +++++++------- nuttx/configs/stm3220g-eval/nsh2/defconfig | 32 +++++++------- nuttx/configs/stm3220g-eval/nxwm/defconfig | 32 +++++++------- nuttx/configs/stm3220g-eval/ostest/defconfig | 32 +++++++------- nuttx/configs/stm3220g-eval/telnetd/defconfig | 38 ++++++++-------- nuttx/configs/stm3240g-eval/dhcpd/defconfig | 38 ++++++++-------- nuttx/configs/stm3240g-eval/nettest/defconfig | 32 +++++++------- nuttx/configs/stm3240g-eval/nsh/defconfig | 32 +++++++------- nuttx/configs/stm3240g-eval/nsh2/defconfig | 32 +++++++------- .../configs/stm3240g-eval/nxconsole/defconfig | 32 +++++++------- nuttx/configs/stm3240g-eval/nxwm/defconfig | 32 +++++++------- nuttx/configs/stm3240g-eval/ostest/defconfig | 32 +++++++------- nuttx/configs/stm3240g-eval/telnetd/defconfig | 38 ++++++++-------- nuttx/configs/stm32f4discovery/nsh/defconfig | 30 ++++++------- .../stm32f4discovery/nxlines/defconfig | 30 ++++++------- .../configs/stm32f4discovery/ostest/defconfig | 30 ++++++------- nuttx/configs/stm32f4discovery/pm/defconfig | 30 ++++++------- nuttx/configs/sure-pic32mx/nsh/defconfig | 32 +++++++------- nuttx/configs/sure-pic32mx/ostest/defconfig | 32 +++++++------- nuttx/configs/sure-pic32mx/usbnsh/defconfig | 32 +++++++------- nuttx/configs/teensy/hello/defconfig | 34 +++++++------- nuttx/configs/teensy/nsh/defconfig | 34 +++++++------- nuttx/configs/teensy/src/up_spi.c | 2 +- nuttx/configs/teensy/usbstorage/defconfig | 34 +++++++------- nuttx/configs/twr-k60n512/nsh/defconfig | 30 ++++++------- nuttx/configs/twr-k60n512/ostest/defconfig | 30 ++++++------- nuttx/configs/ubw32/nsh/defconfig | 32 +++++++------- nuttx/configs/ubw32/ostest/defconfig | 32 +++++++------- nuttx/configs/us7032evb1/nsh/defconfig | 12 ++--- nuttx/configs/us7032evb1/ostest/defconfig | 12 ++--- nuttx/configs/vsn/nsh/defconfig | 30 ++++++------- nuttx/configs/xtrs/nsh/defconfig | 12 ++--- nuttx/configs/xtrs/ostest/defconfig | 12 ++--- nuttx/configs/xtrs/pashello/defconfig | 12 ++--- .../configs/z16f2800100zcog/ostest/defconfig | 12 ++--- .../z16f2800100zcog/pashello/defconfig | 12 ++--- nuttx/configs/z80sim/nsh/defconfig | 12 ++--- nuttx/configs/z80sim/ostest/defconfig | 12 ++--- nuttx/configs/z80sim/pashello/defconfig | 12 ++--- nuttx/configs/z8encore000zco/ostest/defconfig | 12 ++--- nuttx/configs/z8f64200100kit/ostest/defconfig | 12 ++--- 188 files changed, 2657 insertions(+), 2657 deletions(-) diff --git a/nuttx/configs/amber/hello/defconfig b/nuttx/configs/amber/hello/defconfig index 828c2fbdc2..1bd025f77f 100644 --- a/nuttx/configs/amber/hello/defconfig +++ b/nuttx/configs/amber/hello/defconfig @@ -71,12 +71,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=avr +CONFIG_ARCH="avr" CONFIG_ARCH_AVR=y CONFIG_ARCH_ATMEGA=y CONFIG_ARCH_CHIP="atmega" CONFIG_ARCH_CHIP_ATMEGA128=y -CONFIG_ARCH_BOARD=amber +CONFIG_ARCH_BOARD="amber" CONFIG_ARCH_BOARD_AMBER=y CONFIG_BOARD_LOOPSPERMSEC=800 CONFIG_DRAM_SIZE=4096 @@ -255,7 +255,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -287,7 +287,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -613,9 +613,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -637,10 +637,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -695,9 +695,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/avr32dev1/nsh/defconfig b/nuttx/configs/avr32dev1/nsh/defconfig index 99f3a538ef..6c4d57c2db 100755 --- a/nuttx/configs/avr32dev1/nsh/defconfig +++ b/nuttx/configs/avr32dev1/nsh/defconfig @@ -71,16 +71,16 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=avr +CONFIG_ARCH="avr" CONFIG_ARCH_AVR=y CONFIG_ARCH_AVR32=y -CONFIG_ARCH_CHIP=at32uc3 +CONFIG_ARCH_CHIP="at32uc3" CONFIG_ARCH_CHIP_AT32UC3B0256=y CONFIG_ENDIAN_BIG=y -CONFIG_ARCH_BOARD=avr32dev1 +CONFIG_ARCH_BOARD="avr32dev1" CONFIG_ARCH_BOARD_AVR32DEV1=y CONFIG_BOARD_LOOPSPERMSEC=1140 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0x00000000 CONFIG_ARCH_NOINTC=y CONFIG_ARCH_IRQPRIO=y @@ -297,7 +297,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -329,7 +329,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -642,9 +642,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -652,10 +652,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -710,9 +710,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/avr32dev1/ostest/defconfig b/nuttx/configs/avr32dev1/ostest/defconfig index c00113c06b..ca7cf170ee 100755 --- a/nuttx/configs/avr32dev1/ostest/defconfig +++ b/nuttx/configs/avr32dev1/ostest/defconfig @@ -71,16 +71,16 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=avr +CONFIG_ARCH="avr" CONFIG_ARCH_AVR=y CONFIG_ARCH_AVR32=y -CONFIG_ARCH_CHIP=at32uc3 +CONFIG_ARCH_CHIP="at32uc3" CONFIG_ARCH_CHIP_AT32UC3B0256=y CONFIG_ENDIAN_BIG=y -CONFIG_ARCH_BOARD=avr32dev1 +CONFIG_ARCH_BOARD="avr32dev1" CONFIG_ARCH_BOARD_AVR32DEV1=y CONFIG_BOARD_LOOPSPERMSEC=1140 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0x00000000 CONFIG_ARCH_NOINTC=y CONFIG_ARCH_IRQPRIO=y @@ -297,7 +297,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -329,7 +329,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -642,9 +642,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -652,10 +652,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -710,9 +710,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/c5471evm/httpd/defconfig b/nuttx/configs/c5471evm/httpd/defconfig index 4b9c656c1c..da2bc6db08 100644 --- a/nuttx/configs/c5471evm/httpd/defconfig +++ b/nuttx/configs/c5471evm/httpd/defconfig @@ -58,12 +58,12 @@ # used during interrupt handling. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM7TDMI=y -CONFIG_ARCH_CHIP=c5471 +CONFIG_ARCH_CHIP="c5471" CONFIG_ARCH_CHIP_C5471=y -CONFIG_ARCH_BOARD=c5471evm +CONFIG_ARCH_BOARD="c5471evm" CONFIG_ARCH_BOARD_C5471EVM=y CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_ROM_VECTORS=n @@ -381,9 +381,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip CONFIG_EXAMPLE_UIP_NOMAC=y -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=y # @@ -391,10 +391,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=y CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/nsh @@ -404,9 +404,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # Settings for examples/wget @@ -417,9 +417,9 @@ CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) # CONFIG_EXAMPLE_WGET_NETMASK - Network mask CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html" CONFIG_EXAMPLE_WGET_NOMAC=y -CONFIG_EXAMPLE_WGET_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_WGET_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002 +CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/c5471evm/nettest/defconfig b/nuttx/configs/c5471evm/nettest/defconfig index dac94afe4a..c53cdb702f 100644 --- a/nuttx/configs/c5471evm/nettest/defconfig +++ b/nuttx/configs/c5471evm/nettest/defconfig @@ -58,12 +58,12 @@ # used during interrupt handling. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM7TDMI=y -CONFIG_ARCH_CHIP=c5471 +CONFIG_ARCH_CHIP="c5471" CONFIG_ARCH_CHIP_C5471=y -CONFIG_ARCH_BOARD=c5471evm +CONFIG_ARCH_BOARD="c5471evm" CONFIG_ARCH_BOARD_C5471EVM=y CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_ROM_VECTORS=n @@ -381,9 +381,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip CONFIG_EXAMPLE_UIP_NOMAC=y -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -391,10 +391,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/nsh @@ -404,9 +404,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # Settings for examples/wget @@ -417,9 +417,9 @@ CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) # CONFIG_EXAMPLE_WGET_NETMASK - Network mask CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html" CONFIG_EXAMPLE_WGET_NOMAC=y -CONFIG_EXAMPLE_WGET_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_WGET_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002 +CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/c5471evm/nsh/defconfig b/nuttx/configs/c5471evm/nsh/defconfig index 67384f5993..bc7145f7ea 100644 --- a/nuttx/configs/c5471evm/nsh/defconfig +++ b/nuttx/configs/c5471evm/nsh/defconfig @@ -58,12 +58,12 @@ # used during interrupt handling. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM7TDMI=y -CONFIG_ARCH_CHIP=c5471 +CONFIG_ARCH_CHIP="c5471" CONFIG_ARCH_CHIP_C5471=y -CONFIG_ARCH_BOARD=c5471evm +CONFIG_ARCH_BOARD="c5471evm" CONFIG_ARCH_BOARD_C5471EVM=y CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_ROM_VECTORS=n @@ -381,9 +381,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip CONFIG_EXAMPLE_UIP_NOMAC=y -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -391,10 +391,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/nsh @@ -404,9 +404,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # Settings for examples/wget @@ -417,9 +417,9 @@ CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) # CONFIG_EXAMPLE_WGET_NETMASK - Network mask CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html" CONFIG_EXAMPLE_WGET_NOMAC=y -CONFIG_EXAMPLE_WGET_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_WGET_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002 +CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/c5471evm/ostest/defconfig b/nuttx/configs/c5471evm/ostest/defconfig index 3b57c80422..3a74cb270a 100644 --- a/nuttx/configs/c5471evm/ostest/defconfig +++ b/nuttx/configs/c5471evm/ostest/defconfig @@ -58,12 +58,12 @@ # used during interrupt handling. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM7TDMI=y -CONFIG_ARCH_CHIP=c5471 +CONFIG_ARCH_CHIP="c5471" CONFIG_ARCH_CHIP_C5471=y -CONFIG_ARCH_BOARD=c5471evm +CONFIG_ARCH_BOARD="c5471evm" CONFIG_ARCH_BOARD_C5471EVM=y CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_ROM_VECTORS=n @@ -381,9 +381,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip CONFIG_EXAMPLE_UIP_NOMAC=y -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -391,10 +391,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/nsh @@ -404,9 +404,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # Settings for examples/wget @@ -417,9 +417,9 @@ CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) # CONFIG_EXAMPLE_WGET_NETMASK - Network mask CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html" CONFIG_EXAMPLE_WGET_NOMAC=y -CONFIG_EXAMPLE_WGET_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_WGET_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002 +CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/compal_e88/nsh_highram/defconfig b/nuttx/configs/compal_e88/nsh_highram/defconfig index f8894c92a3..611bf6e799 100644 --- a/nuttx/configs/compal_e88/nsh_highram/defconfig +++ b/nuttx/configs/compal_e88/nsh_highram/defconfig @@ -58,12 +58,12 @@ # used during interrupt handling. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM7TDMI=y -CONFIG_ARCH_CHIP=calypso +CONFIG_ARCH_CHIP="calypso" CONFIG_ARCH_CHIP_CALYPSO=y -CONFIG_ARCH_BOARD=compal_e88 +CONFIG_ARCH_BOARD="compal_e88" CONFIG_ARCH_BOARD_COMPALE88=y CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_ROM_VECTORS=n @@ -401,9 +401,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip CONFIG_EXAMPLE_UIP_NOMAC=y -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -411,10 +411,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/nsh @@ -425,9 +425,9 @@ CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_STACKSIZE=4096 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_BUILTIN_APPS=y # @@ -443,9 +443,9 @@ CONFIG_EXAMPLES_HELLO_BUILTIN=y # CONFIG_EXAMPLE_WGET_NETMASK - Network mask CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html" CONFIG_EXAMPLE_WGET_NOMAC=y -CONFIG_EXAMPLE_WGET_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_WGET_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002 +CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/compal_e99/nsh_compalram/defconfig b/nuttx/configs/compal_e99/nsh_compalram/defconfig index cfac844722..fe551816cc 100644 --- a/nuttx/configs/compal_e99/nsh_compalram/defconfig +++ b/nuttx/configs/compal_e99/nsh_compalram/defconfig @@ -58,12 +58,12 @@ # used during interrupt handling. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM7TDMI=y -CONFIG_ARCH_CHIP=calypso +CONFIG_ARCH_CHIP="calypso" CONFIG_ARCH_CHIP_CALYPSO=y -CONFIG_ARCH_BOARD=compal_e99 +CONFIG_ARCH_BOARD="compal_e99" CONFIG_ARCH_BOARD_COMPALE99=y CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_ROM_VECTORS=n @@ -407,9 +407,9 @@ CONFIG_EXAMPLES_HELLO_BUILTIN=y # # Settings for examples/uip CONFIG_EXAMPLE_UIP_NOMAC=y -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -417,10 +417,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/nsh @@ -431,9 +431,9 @@ CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_STACKSIZE=4096 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_BUILTIN_APPS=y # @@ -445,9 +445,9 @@ CONFIG_NSH_BUILTIN_APPS=y # CONFIG_EXAMPLE_WGET_NETMASK - Network mask CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html" CONFIG_EXAMPLE_WGET_NOMAC=y -CONFIG_EXAMPLE_WGET_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_WGET_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002 +CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/compal_e99/nsh_highram/defconfig b/nuttx/configs/compal_e99/nsh_highram/defconfig index ad1e47b026..658ad0236c 100644 --- a/nuttx/configs/compal_e99/nsh_highram/defconfig +++ b/nuttx/configs/compal_e99/nsh_highram/defconfig @@ -58,12 +58,12 @@ # used during interrupt handling. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM7TDMI=y -CONFIG_ARCH_CHIP=calypso +CONFIG_ARCH_CHIP="calypso" CONFIG_ARCH_CHIP_CALYPSO=y -CONFIG_ARCH_BOARD=compal_e99 +CONFIG_ARCH_BOARD="compal_e99" CONFIG_ARCH_BOARD_COMPALE99=y CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_ROM_VECTORS=n @@ -404,9 +404,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip CONFIG_EXAMPLE_UIP_NOMAC=y -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -414,10 +414,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/nsh @@ -428,9 +428,9 @@ CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_STACKSIZE=4096 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_BUILTIN_APPS=y # @@ -489,9 +489,9 @@ CONFIG_EXAMPLES_NXTEXT_DEVNO=0 # CONFIG_EXAMPLE_WGET_NETMASK - Network mask CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html" CONFIG_EXAMPLE_WGET_NOMAC=y -CONFIG_EXAMPLE_WGET_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_WGET_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002 +CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/demo9s12ne64/ostest/defconfig b/nuttx/configs/demo9s12ne64/ostest/defconfig index 3ec27669ce..448688b3ac 100755 --- a/nuttx/configs/demo9s12ne64/ostest/defconfig +++ b/nuttx/configs/demo9s12ne64/ostest/defconfig @@ -71,12 +71,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=hc +CONFIG_ARCH="hc" CONFIG_ARCH_HC=y CONFIG_ARCH_HCS12=y -CONFIG_ARCH_CHIP=m9s12 +CONFIG_ARCH_CHIP="m9s12" CONFIG_ARCH_CHIP_MCS92S12NEC64=y -CONFIG_ARCH_BOARD=demo9s12ne64 +CONFIG_ARCH_BOARD="demo9s12ne64" CONFIG_ARCH_BOARD_DEMOS92S12NEC64=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 @@ -276,7 +276,7 @@ CONFIG_PASS1_OBJECT= # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -308,7 +308,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=256 CONFIG_SIG_SIGWORK=4 @@ -618,9 +618,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -628,10 +628,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -686,9 +686,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/ea3131/nsh/defconfig b/nuttx/configs/ea3131/nsh/defconfig index faf83a23f0..8377265db0 100644 --- a/nuttx/configs/ea3131/nsh/defconfig +++ b/nuttx/configs/ea3131/nsh/defconfig @@ -2,7 +2,7 @@ # configs/ea3131/nsh/defconfig # # Copyright (C) 2010 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt +# Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -73,12 +73,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM926EJS=y -CONFIG_ARCH_CHIP=lpc31xx +CONFIG_ARCH_CHIP="lpc31xx" CONFIG_ARCH_CHIP_LPC3131=y -CONFIG_ARCH_BOARD=ea3131 +CONFIG_ARCH_BOARD="ea3131" CONFIG_ARCH_BOARD_EA3131=y CONFIG_BOARD_LOOPSPERMSEC=16945 CONFIG_DRAM_SIZE=0x00030000 @@ -144,15 +144,15 @@ CONFIG_LPC31XX_UART=y # CONFIG_LPC31XX_EXTSRAM0=n CONFIG_LPC31XX_EXTSRAM0HEAP=n -CONFIG_LPC31XX_EXTSRAM0SIZE=(128*1024) +CONFIG_LPC31XX_EXTSRAM0SIZE=131072 CONFIG_LPC31XX_EXTSRAM1=n CONFIG_LPC31XX_EXTSRAM1HEAP=n -CONFIG_LPC31XX_EXTSRAM1SIZE=(128*1024) +CONFIG_LPC31XX_EXTSRAM1SIZE=131072 CONFIG_LPC31XX_EXTSDRAM=n CONFIG_LPC31XX_EXTSDRAMHEAP=n -CONFIG_LPC31XX_EXTSDRAMSIZE=(64*1024*1024) +CONFIG_LPC31XX_EXTSDRAMSIZE=67108864 CONFIG_LPC31XX_EXTNAND=n -CONFIG_LPC31XX_EXTNANDSIZE=(64*1024*1024) +CONFIG_LPC31XX_EXTNANDSIZE=67108864 # # LPC31XX specific device driver settings @@ -284,7 +284,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -316,7 +316,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -627,9 +627,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -638,10 +638,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -696,9 +696,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/ea3131/ostest/defconfig b/nuttx/configs/ea3131/ostest/defconfig index 395ea9a9b8..c3e584d63a 100644 --- a/nuttx/configs/ea3131/ostest/defconfig +++ b/nuttx/configs/ea3131/ostest/defconfig @@ -2,7 +2,7 @@ # configs/ea3131/ostest/defconfig # # Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt +# Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -73,12 +73,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM926EJS=y -CONFIG_ARCH_CHIP=lpc31xx +CONFIG_ARCH_CHIP="lpc31xx" CONFIG_ARCH_CHIP_LPC3131=y -CONFIG_ARCH_BOARD=ea3131 +CONFIG_ARCH_BOARD="ea3131" CONFIG_ARCH_BOARD_EA3131=y CONFIG_BOARD_LOOPSPERMSEC=16945 CONFIG_DRAM_SIZE=0x00030000 @@ -144,15 +144,15 @@ CONFIG_LPC31XX_UART=y # CONFIG_LPC31XX_EXTSRAM0=n CONFIG_LPC31XX_EXTSRAM0HEAP=n -CONFIG_LPC31XX_EXTSRAM0SIZE=(128*1024) +CONFIG_LPC31XX_EXTSRAM0SIZE=131072 CONFIG_LPC31XX_EXTSRAM1=n CONFIG_LPC31XX_EXTSRAM1HEAP=n -CONFIG_LPC31XX_EXTSRAM1SIZE=(128*1024) +CONFIG_LPC31XX_EXTSRAM1SIZE=131072 CONFIG_LPC31XX_EXTSDRAM=n CONFIG_LPC31XX_EXTSDRAMHEAP=n -CONFIG_LPC31XX_EXTSDRAMSIZE=(64*1024*1024) +CONFIG_LPC31XX_EXTSDRAMSIZE=67108864 CONFIG_LPC31XX_EXTNAND=n -CONFIG_LPC31XX_EXTNANDSIZE=(64*1024*1024) +CONFIG_LPC31XX_EXTNANDSIZE=67108864 # # LPC31XX specific device driver settings @@ -284,7 +284,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -316,7 +316,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -627,9 +627,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -638,10 +638,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -696,9 +696,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/ea3131/pgnsh/defconfig b/nuttx/configs/ea3131/pgnsh/defconfig index 3033b94238..fb769383b5 100644 --- a/nuttx/configs/ea3131/pgnsh/defconfig +++ b/nuttx/configs/ea3131/pgnsh/defconfig @@ -2,7 +2,7 @@ # configs/ea3131/pgnsh/defconfig # # Copyright (C) 2010 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt +# Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -73,12 +73,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM926EJS=y -CONFIG_ARCH_CHIP=lpc31xx +CONFIG_ARCH_CHIP="lpc31xx" CONFIG_ARCH_CHIP_LPC3131=y -CONFIG_ARCH_BOARD=ea3131 +CONFIG_ARCH_BOARD="ea3131" CONFIG_ARCH_BOARD_EA3131=y CONFIG_BOARD_LOOPSPERMSEC=16945 CONFIG_DRAM_SIZE=0x00030000 @@ -144,15 +144,15 @@ CONFIG_LPC31XX_UART=y # CONFIG_LPC31XX_EXTSRAM0=n CONFIG_LPC31XX_EXTSRAM0HEAP=n -CONFIG_LPC31XX_EXTSRAM0SIZE=(128*1024) +CONFIG_LPC31XX_EXTSRAM0SIZE=131072 CONFIG_LPC31XX_EXTSRAM1=n CONFIG_LPC31XX_EXTSRAM1HEAP=n -CONFIG_LPC31XX_EXTSRAM1SIZE=(128*1024) +CONFIG_LPC31XX_EXTSRAM1SIZE=131072 CONFIG_LPC31XX_EXTSDRAM=n CONFIG_LPC31XX_EXTSDRAMHEAP=n -CONFIG_LPC31XX_EXTSDRAMSIZE=(64*1024*1024) +CONFIG_LPC31XX_EXTSDRAMSIZE=67108864 CONFIG_LPC31XX_EXTNAND=n -CONFIG_LPC31XX_EXTNANDSIZE=(64*1024*1024) +CONFIG_LPC31XX_EXTNANDSIZE=67108864 # # LPC31XX specific device driver settings @@ -297,7 +297,7 @@ CONFIG_PASS1_OBJECT=locked.r # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -331,7 +331,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -778,9 +778,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -789,10 +789,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -847,9 +847,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/ea3131/usbserial/defconfig b/nuttx/configs/ea3131/usbserial/defconfig index 219ad9f728..4fe15f1584 100644 --- a/nuttx/configs/ea3131/usbserial/defconfig +++ b/nuttx/configs/ea3131/usbserial/defconfig @@ -2,7 +2,7 @@ # configs/ea3131/usbserial/defconfig # # Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt +# Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -73,12 +73,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM926EJS=y -CONFIG_ARCH_CHIP=lpc31xx +CONFIG_ARCH_CHIP="lpc31xx" CONFIG_ARCH_CHIP_LPC3131=y -CONFIG_ARCH_BOARD=ea3131 +CONFIG_ARCH_BOARD="ea3131" CONFIG_ARCH_BOARD_EA3131=y CONFIG_BOARD_LOOPSPERMSEC=16945 CONFIG_DRAM_SIZE=0x00030000 @@ -144,15 +144,15 @@ CONFIG_LPC31XX_UART=y # CONFIG_LPC31XX_EXTSRAM0=n CONFIG_LPC31XX_EXTSRAM0HEAP=n -CONFIG_LPC31XX_EXTSRAM0SIZE=(128*1024) +CONFIG_LPC31XX_EXTSRAM0SIZE=131072 CONFIG_LPC31XX_EXTSRAM1=n CONFIG_LPC31XX_EXTSRAM1HEAP=n -CONFIG_LPC31XX_EXTSRAM1SIZE=(128*1024) +CONFIG_LPC31XX_EXTSRAM1SIZE=131072 CONFIG_LPC31XX_EXTSDRAM=n CONFIG_LPC31XX_EXTSDRAMHEAP=n -CONFIG_LPC31XX_EXTSDRAMSIZE=(64*1024*1024) +CONFIG_LPC31XX_EXTSDRAMSIZE=67108864 CONFIG_LPC31XX_EXTNAND=n -CONFIG_LPC31XX_EXTNANDSIZE=(64*1024*1024) +CONFIG_LPC31XX_EXTNANDSIZE=67108864 # # LPC31XX specific device driver settings @@ -284,7 +284,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -318,7 +318,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -630,9 +630,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -641,10 +641,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -699,9 +699,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/ea3131/usbstorage/defconfig b/nuttx/configs/ea3131/usbstorage/defconfig index 27c9e0f298..fccdd439c5 100644 --- a/nuttx/configs/ea3131/usbstorage/defconfig +++ b/nuttx/configs/ea3131/usbstorage/defconfig @@ -2,7 +2,7 @@ # configs/ea3131/usbstorage/defconfig # # Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt +# Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -73,12 +73,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM926EJS=y -CONFIG_ARCH_CHIP=lpc31xx +CONFIG_ARCH_CHIP="lpc31xx" CONFIG_ARCH_CHIP_LPC3131=y -CONFIG_ARCH_BOARD=ea3131 +CONFIG_ARCH_BOARD="ea3131" CONFIG_ARCH_BOARD_EA3131=y CONFIG_BOARD_LOOPSPERMSEC=16945 CONFIG_DRAM_SIZE=0x00030000 @@ -144,15 +144,15 @@ CONFIG_LPC31XX_UART=y # CONFIG_LPC31XX_EXTSRAM0=n CONFIG_LPC31XX_EXTSRAM0HEAP=n -CONFIG_LPC31XX_EXTSRAM0SIZE=(128*1024) +CONFIG_LPC31XX_EXTSRAM0SIZE=131072 CONFIG_LPC31XX_EXTSRAM1=n CONFIG_LPC31XX_EXTSRAM1HEAP=n -CONFIG_LPC31XX_EXTSRAM1SIZE=(128*1024) +CONFIG_LPC31XX_EXTSRAM1SIZE=131072 CONFIG_LPC31XX_EXTSDRAM=n CONFIG_LPC31XX_EXTSDRAMHEAP=n -CONFIG_LPC31XX_EXTSDRAMSIZE=(64*1024*1024) +CONFIG_LPC31XX_EXTSDRAMSIZE=67108864 CONFIG_LPC31XX_EXTNAND=n -CONFIG_LPC31XX_EXTNANDSIZE=(64*1024*1024) +CONFIG_LPC31XX_EXTNANDSIZE=67108864 # # LPC31XX specific device driver settings @@ -284,7 +284,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -318,7 +318,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -630,9 +630,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -641,10 +641,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -699,9 +699,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/ea3152/ostest/defconfig b/nuttx/configs/ea3152/ostest/defconfig index 70b732f19d..928971b9a8 100644 --- a/nuttx/configs/ea3152/ostest/defconfig +++ b/nuttx/configs/ea3152/ostest/defconfig @@ -73,12 +73,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM926EJS=y -CONFIG_ARCH_CHIP=lpc31xx +CONFIG_ARCH_CHIP="lpc31xx" CONFIG_ARCH_CHIP_LPC3152=y -CONFIG_ARCH_BOARD=ea3152 +CONFIG_ARCH_BOARD="ea3152" CONFIG_ARCH_BOARD_EA3152=y CONFIG_BOARD_LOOPSPERMSEC=16945 CONFIG_DRAM_SIZE=0x00030000 @@ -144,15 +144,15 @@ CONFIG_LPC31XX_UART=y # CONFIG_LPC31XX_EXTSRAM0=n CONFIG_LPC31XX_EXTSRAM0HEAP=n -CONFIG_LPC31XX_EXTSRAM0SIZE=(128*1024) +CONFIG_LPC31XX_EXTSRAM0SIZE=131072 CONFIG_LPC31XX_EXTSRAM1=n CONFIG_LPC31XX_EXTSRAM1HEAP=n -CONFIG_LPC31XX_EXTSRAM1SIZE=(128*1024) +CONFIG_LPC31XX_EXTSRAM1SIZE=131072 CONFIG_LPC31XX_EXTSDRAM=n CONFIG_LPC31XX_EXTSDRAMHEAP=n -CONFIG_LPC31XX_EXTSDRAMSIZE=(64*1024*1024) +CONFIG_LPC31XX_EXTSDRAMSIZE=67108864 CONFIG_LPC31XX_EXTNAND=n -CONFIG_LPC31XX_EXTNANDSIZE=(64*1024*1024) +CONFIG_LPC31XX_EXTNANDSIZE=67108864 # # LPC31XX specific device driver settings @@ -284,7 +284,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -317,7 +317,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -628,9 +628,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -639,10 +639,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -697,9 +697,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/eagle100/httpd/defconfig b/nuttx/configs/eagle100/httpd/defconfig index ec2db7d36e..284e8d5d2a 100644 --- a/nuttx/configs/eagle100/httpd/defconfig +++ b/nuttx/configs/eagle100/httpd/defconfig @@ -67,12 +67,12 @@ # the 100 second delay then adjust CONFIG_BOARD_LOOPSPERMSEC until # the delay actually is 100 seconds. # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lm3s +CONFIG_ARCH_CHIP="lm3s" CONFIG_ARCH_CHIP_LM3S6918=y -CONFIG_ARCH_BOARD=eagle100 +CONFIG_ARCH_BOARD="eagle100" CONFIG_ARCH_BOARD_EAGLE100=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00010000 @@ -480,9 +480,9 @@ CONFIG_NETUTILS_HTTPD_DUMPPSTATE=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -502,10 +502,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -560,9 +560,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 @@ -583,9 +583,9 @@ CONFIG_NSH_MMCSDMINOR=0 # Settings for examples/dhcpd # CONFIG_EXAMPLE_DHCPD_NOMAC=y -CONFIG_EXAMPLE_DHCPD_IPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_DHCPD_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_DHCPD_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_DHCPD_IPADDR=0x0a000001 +CONFIG_EXAMPLE_DHCPD_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_DHCPD_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/eagle100/nettest/defconfig b/nuttx/configs/eagle100/nettest/defconfig index ebc5be23ab..ef9a79a681 100644 --- a/nuttx/configs/eagle100/nettest/defconfig +++ b/nuttx/configs/eagle100/nettest/defconfig @@ -67,12 +67,12 @@ # the 100 second delay then adjust CONFIG_BOARD_LOOPSPERMSEC until # the delay actually is 100 seconds. # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lm3s +CONFIG_ARCH_CHIP="lm3s" CONFIG_ARCH_CHIP_LM3S6918=y -CONFIG_ARCH_BOARD=eagle100 +CONFIG_ARCH_BOARD="eagle100" CONFIG_ARCH_BOARD_EAGLE100=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00010000 @@ -471,9 +471,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -493,10 +493,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -551,9 +551,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/eagle100/nsh/defconfig b/nuttx/configs/eagle100/nsh/defconfig index b99367e647..1d9b72faf1 100644 --- a/nuttx/configs/eagle100/nsh/defconfig +++ b/nuttx/configs/eagle100/nsh/defconfig @@ -67,12 +67,12 @@ # the 100 second delay then adjust CONFIG_BOARD_LOOPSPERMSEC until # the delay actually is 100 seconds. # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lm3s +CONFIG_ARCH_CHIP="lm3s" CONFIG_ARCH_CHIP_LM3S6918=y -CONFIG_ARCH_BOARD=eagle100 +CONFIG_ARCH_BOARD="eagle100" CONFIG_ARCH_BOARD_EAGLE100=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00010000 @@ -474,9 +474,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -484,10 +484,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -546,9 +546,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/eagle100/nxflat/defconfig b/nuttx/configs/eagle100/nxflat/defconfig index db0557a52c..e6e2da840f 100644 --- a/nuttx/configs/eagle100/nxflat/defconfig +++ b/nuttx/configs/eagle100/nxflat/defconfig @@ -67,12 +67,12 @@ # the 100 second delay then adjust CONFIG_BOARD_LOOPSPERMSEC until # the delay actually is 100 seconds. # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lm3s +CONFIG_ARCH_CHIP="lm3s" CONFIG_ARCH_CHIP_LM3S6918=y -CONFIG_ARCH_BOARD=eagle100 +CONFIG_ARCH_BOARD="eagle100" CONFIG_ARCH_BOARD_EAGLE100=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00010000 @@ -481,9 +481,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -491,10 +491,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -549,9 +549,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/eagle100/ostest/defconfig b/nuttx/configs/eagle100/ostest/defconfig index f4048f08bf..04e5ff77a8 100644 --- a/nuttx/configs/eagle100/ostest/defconfig +++ b/nuttx/configs/eagle100/ostest/defconfig @@ -67,12 +67,12 @@ # the 100 second delay then adjust CONFIG_BOARD_LOOPSPERMSEC until # the delay actually is 100 seconds. # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lm3s +CONFIG_ARCH_CHIP="lm3s" CONFIG_ARCH_CHIP_LM3S6918=y -CONFIG_ARCH_BOARD=eagle100 +CONFIG_ARCH_BOARD="eagle100" CONFIG_ARCH_BOARD_EAGLE100=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00010000 @@ -475,9 +475,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -485,10 +485,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -543,9 +543,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/eagle100/thttpd/defconfig b/nuttx/configs/eagle100/thttpd/defconfig index 6ed845d699..e266896d13 100644 --- a/nuttx/configs/eagle100/thttpd/defconfig +++ b/nuttx/configs/eagle100/thttpd/defconfig @@ -67,12 +67,12 @@ # the 100 second delay then adjust CONFIG_BOARD_LOOPSPERMSEC until # the delay actually is 100 seconds. # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lm3s +CONFIG_ARCH_CHIP="lm3s" CONFIG_ARCH_CHIP_LM3S6918=y -CONFIG_ARCH_BOARD=eagle100 +CONFIG_ARCH_BOARD="eagle100" CONFIG_ARCH_BOARD_EAGLE100=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00010000 @@ -545,7 +545,7 @@ CONFIG_NET_RESOLV_ENTRIES=4 # CONFIG_THTTPD_URLPATTERN - If defined, then it will be used to match # and verify referrers. CONFIG_THTTPD_PORT=80 -CONFIG_THTTPD_IPADDR=(10<<24|0<<16|0<<8|2) +CONFIG_THTTPD_IPADDR=0x0a000002 CONFIG_THTTPD_SERVER_ADDRESS="http://www.nuttx.org" CONFIG_THTTPD_SERVER_SOFTWARE="thttpd/2.25b 29dec2003-NuttX" CONFIG_THTTPD_PATH="/mnt/www" @@ -573,15 +573,15 @@ CONFIG_THTTPD_URLPATTERN=n # Additional settings for examples/thttpd # CONFIG_EXAMPLE_THTTPD_NOMAC=n -CONFIG_EXAMPLE_THTTPD_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_THTTPD_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_THTTPD_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_THTTPD_NETMASK=0xffffff00 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -589,10 +589,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -647,9 +647,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/ekk-lm3s9b96/nsh/defconfig b/nuttx/configs/ekk-lm3s9b96/nsh/defconfig index 382de7f2fe..37ca29ec12 100644 --- a/nuttx/configs/ekk-lm3s9b96/nsh/defconfig +++ b/nuttx/configs/ekk-lm3s9b96/nsh/defconfig @@ -66,12 +66,12 @@ # the 100 second delay then adjust CONFIG_BOARD_LOOPSPERMSEC until # the delay actually is 100 seconds. # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lm3s +CONFIG_ARCH_CHIP="lm3s" CONFIG_ARCH_CHIP_LM3S9B96=y -CONFIG_ARCH_BOARD=ekk-lm3s9b96 +CONFIG_ARCH_BOARD="ekk-lm3s9b96" CONFIG_ARCH_BOARD_EKKLM3S9B96=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00018000 @@ -489,9 +489,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -499,10 +499,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -557,9 +557,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/ekk-lm3s9b96/ostest/defconfig b/nuttx/configs/ekk-lm3s9b96/ostest/defconfig index 6cfedb59fd..11562cabe5 100644 --- a/nuttx/configs/ekk-lm3s9b96/ostest/defconfig +++ b/nuttx/configs/ekk-lm3s9b96/ostest/defconfig @@ -66,12 +66,12 @@ # the 100 second delay then adjust CONFIG_BOARD_LOOPSPERMSEC until # the delay actually is 100 seconds. # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lm3s +CONFIG_ARCH_CHIP="lm3s" CONFIG_ARCH_CHIP_LM3S9B96=y -CONFIG_ARCH_BOARD=ekk-lm3s9b96 +CONFIG_ARCH_BOARD="ekk-lm3s9b96" CONFIG_ARCH_BOARD_EKKLM3S9B96=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00018000 @@ -486,9 +486,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -496,10 +496,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -554,9 +554,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/ez80f910200kitg/ostest/defconfig b/nuttx/configs/ez80f910200kitg/ostest/defconfig index 4b436b82ae..b9a001ebf1 100644 --- a/nuttx/configs/ez80f910200kitg/ostest/defconfig +++ b/nuttx/configs/ez80f910200kitg/ostest/defconfig @@ -64,14 +64,14 @@ # CONFIG_ARCH_BUTTONS - Provide button APIs. Unique to board architecture. # CONFIG_ARCH_TIMERHOOK - Provide board-specific hooks into periodic timer logic. # -CONFIG_ARCH=z80 +CONFIG_ARCH="z80" CONFIG_ARCH_Z80=y -CONFIG_ARCH_CHIP=ez80 +CONFIG_ARCH_CHIP="ez80" CONFIG_ARCH_CHIP_EZ80=y CONFIG_ARCH_CHIP_EZ80F91=y CONFIG_ARCH_CHIP_EZ80F92=n CONFIG_ARCH_CHIP_EZ80F93=n -CONFIG_ARCH_BOARD=ez80f910200kitg +CONFIG_ARCH_BOARD="ez80f910200kitg" CONFIG_ARCH_BOARD_EZ80F910200KITG=y CONFIG_ARCH_NOINTC=n CONFIG_ARCH_IRQPRIO=n @@ -613,9 +613,9 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(192L<<24|168L<<16|0L<<8|128L) -CONFIG_EXAMPLE_UIP_DRIPADDR=(192L<<24|168L<<16|0L<<8|1L) -CONFIG_EXAMPLE_UIP_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -623,10 +623,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(192L<<24|168L<<16|0L<<8|128L) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(192L<<24|168L<<16|0L<<8|1L) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(192L<<24|168L<<16|0L<<8|106L) +CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a # # Settings for examples/ostest @@ -676,9 +676,9 @@ CONFIG_NSH_TELNET=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 @@ -748,9 +748,9 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0" # CONFIG_EXAMPLE_WGET_NETMASK - Network mask CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html" CONFIG_EXAMPLE_WGET_NOMAC=y -CONFIG_EXAMPLE_WGET_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_WGET_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002 +CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/ez80f910200zco/dhcpd/defconfig b/nuttx/configs/ez80f910200zco/dhcpd/defconfig index 9a819235c0..85c0881577 100644 --- a/nuttx/configs/ez80f910200zco/dhcpd/defconfig +++ b/nuttx/configs/ez80f910200zco/dhcpd/defconfig @@ -64,14 +64,14 @@ # CONFIG_ARCH_BUTTONS - Provide button APIs. Unique to board architecture. # CONFIG_ARCH_TIMERHOOK - Provide board-specific hooks into periodic timer logic. # -CONFIG_ARCH=z80 +CONFIG_ARCH="z80" CONFIG_ARCH_Z80=y -CONFIG_ARCH_CHIP=ez80 +CONFIG_ARCH_CHIP="ez80" CONFIG_ARCH_CHIP_EZ80=y CONFIG_ARCH_CHIP_EZ80F91=y CONFIG_ARCH_CHIP_EZ80F92=n CONFIG_ARCH_CHIP_EZ80F93=n -CONFIG_ARCH_BOARD=ez80f910200zco +CONFIG_ARCH_BOARD="ez80f910200zco" CONFIG_ARCH_BOARD_EZ80F910200ZCO=y CONFIG_ARCH_NOINTC=n CONFIG_ARCH_IRQPRIO=n @@ -622,15 +622,15 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Settings for examples/poll CONFIG_EXAMPLE_POLL_NOMAC=y -CONFIG_EXAMPLE_POLL_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_POLL_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_POLL_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_POLL_IPADDR=0x0a000002 +CONFIG_EXAMPLE_POLL_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_POLL_NETMASK=0xffffff00 # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_UIP_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -650,10 +650,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -703,9 +703,9 @@ CONFIG_NSH_TELNET=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 @@ -724,9 +724,9 @@ CONFIG_NSH_MMCSDMINOR=0 # # Settings for examples/dhcpd CONFIG_EXAMPLE_DHCPD_NOMAC=y -CONFIG_EXAMPLE_DHCPD_IPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_DHCPD_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_DHCPD_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_DHCPD_IPADDR=0x0a000001 +CONFIG_EXAMPLE_DHCPD_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_DHCPD_NETMASK=0xffffff00 # # Settings for examples/nx @@ -782,9 +782,9 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0" # CONFIG_EXAMPLE_WGET_NETMASK - Network mask CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html" CONFIG_EXAMPLE_WGET_NOMAC=y -CONFIG_EXAMPLE_WGET_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_WGET_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002 +CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/ez80f910200zco/httpd/defconfig b/nuttx/configs/ez80f910200zco/httpd/defconfig index 0c5a155797..9eda29217e 100644 --- a/nuttx/configs/ez80f910200zco/httpd/defconfig +++ b/nuttx/configs/ez80f910200zco/httpd/defconfig @@ -64,14 +64,14 @@ # CONFIG_ARCH_BUTTONS - Provide button APIs. Unique to board architecture. # CONFIG_ARCH_TIMERHOOK - Provide board-specific hooks into periodic timer logic. # -CONFIG_ARCH=z80 +CONFIG_ARCH="z80" CONFIG_ARCH_Z80=y -CONFIG_ARCH_CHIP=ez80 +CONFIG_ARCH_CHIP="ez80" CONFIG_ARCH_CHIP_EZ80=y CONFIG_ARCH_CHIP_EZ80F91=y CONFIG_ARCH_CHIP_EZ80F92=n CONFIG_ARCH_CHIP_EZ80F93=n -CONFIG_ARCH_BOARD=ez80f910200zco +CONFIG_ARCH_BOARD="ez80f910200zco" CONFIG_ARCH_BOARD_EZ80F910200ZCO=y CONFIG_ARCH_NOINTC=n CONFIG_ARCH_IRQPRIO=n @@ -630,15 +630,15 @@ CONFIG_NETUTILS_HTTPD_DUMPPSTATE=n # # Settings for examples/poll CONFIG_EXAMPLE_POLL_NOMAC=y -CONFIG_EXAMPLE_POLL_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_POLL_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_POLL_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_POLL_IPADDR=0x0a000002 +CONFIG_EXAMPLE_POLL_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_POLL_NETMASK=0xffffff00 # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_UIP_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -658,10 +658,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -711,9 +711,9 @@ CONFIG_NSH_TELNET=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 @@ -732,9 +732,9 @@ CONFIG_NSH_MMCSDMINOR=0 # # Settings for examples/dhcpd CONFIG_EXAMPLE_DHCPD_NOMAC=y -CONFIG_EXAMPLE_DHCPD_IPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_DHCPD_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_DHCPD_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_DHCPD_IPADDR=0x0a000001 +CONFIG_EXAMPLE_DHCPD_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_DHCPD_NETMASK=0xffffff00 # # Settings for examples/nx @@ -790,9 +790,9 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0" # CONFIG_EXAMPLE_WGET_NETMASK - Network mask CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html" CONFIG_EXAMPLE_WGET_NOMAC=y -CONFIG_EXAMPLE_WGET_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_WGET_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002 +CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/ez80f910200zco/nettest/defconfig b/nuttx/configs/ez80f910200zco/nettest/defconfig index afa4824c59..af65944364 100644 --- a/nuttx/configs/ez80f910200zco/nettest/defconfig +++ b/nuttx/configs/ez80f910200zco/nettest/defconfig @@ -64,14 +64,14 @@ # CONFIG_ARCH_BUTTONS - Provide button APIs. Unique to board architecture. # CONFIG_ARCH_TIMERHOOK - Provide board-specific hooks into periodic timer logic. # -CONFIG_ARCH=z80 +CONFIG_ARCH="z80" CONFIG_ARCH_Z80=y -CONFIG_ARCH_CHIP=ez80 +CONFIG_ARCH_CHIP="ez80" CONFIG_ARCH_CHIP_EZ80=y CONFIG_ARCH_CHIP_EZ80F91=y CONFIG_ARCH_CHIP_EZ80F92=n CONFIG_ARCH_CHIP_EZ80F93=n -CONFIG_ARCH_BOARD=ez80f910200zco +CONFIG_ARCH_BOARD="ez80f910200zco" CONFIG_ARCH_BOARD_EZ80F910200ZCO=y CONFIG_ARCH_NOINTC=n CONFIG_ARCH_IRQPRIO=n @@ -622,15 +622,15 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Settings for examples/poll CONFIG_EXAMPLE_POLL_NOMAC=y -CONFIG_EXAMPLE_POLL_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_POLL_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_POLL_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_POLL_IPADDR=0x0a000002 +CONFIG_EXAMPLE_POLL_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_POLL_NETMASK=0xffffff00 # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_UIP_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -650,10 +650,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -703,9 +703,9 @@ CONFIG_NSH_TELNET=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 @@ -775,9 +775,9 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0" # CONFIG_EXAMPLE_WGET_NETMASK - Network mask CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html" CONFIG_EXAMPLE_WGET_NOMAC=y -CONFIG_EXAMPLE_WGET_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_WGET_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002 +CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/ez80f910200zco/nsh/defconfig b/nuttx/configs/ez80f910200zco/nsh/defconfig index f3ad1191cd..c4d6c2dc1b 100644 --- a/nuttx/configs/ez80f910200zco/nsh/defconfig +++ b/nuttx/configs/ez80f910200zco/nsh/defconfig @@ -64,14 +64,14 @@ # CONFIG_ARCH_BUTTONS - Provide button APIs. Unique to board architecture. # CONFIG_ARCH_TIMERHOOK - Provide board-specific hooks into periodic timer logic. # -CONFIG_ARCH=z80 +CONFIG_ARCH="z80" CONFIG_ARCH_Z80=y -CONFIG_ARCH_CHIP=ez80 +CONFIG_ARCH_CHIP="ez80" CONFIG_ARCH_CHIP_EZ80=y CONFIG_ARCH_CHIP_EZ80F91=y CONFIG_ARCH_CHIP_EZ80F92=n CONFIG_ARCH_CHIP_EZ80F93=n -CONFIG_ARCH_BOARD=ez80f910200zco +CONFIG_ARCH_BOARD="ez80f910200zco" CONFIG_ARCH_BOARD_EZ80F910200ZCO=y CONFIG_ARCH_NOINTC=n CONFIG_ARCH_IRQPRIO=n @@ -622,15 +622,15 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Settings for examples/poll CONFIG_EXAMPLE_POLL_NOMAC=y -CONFIG_EXAMPLE_POLL_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_POLL_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_POLL_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_POLL_IPADDR=0x0a000002 +CONFIG_EXAMPLE_POLL_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_POLL_NETMASK=0xffffff00 # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_UIP_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -650,10 +650,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -703,9 +703,9 @@ CONFIG_NSH_TELNET=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 @@ -775,9 +775,9 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0" # CONFIG_EXAMPLE_WGET_NETMASK - Network mask CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html" CONFIG_EXAMPLE_WGET_NOMAC=y -CONFIG_EXAMPLE_WGET_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_WGET_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002 +CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/ez80f910200zco/ostest/defconfig b/nuttx/configs/ez80f910200zco/ostest/defconfig index 123f7e24b3..282851238e 100644 --- a/nuttx/configs/ez80f910200zco/ostest/defconfig +++ b/nuttx/configs/ez80f910200zco/ostest/defconfig @@ -64,14 +64,14 @@ # CONFIG_ARCH_BUTTONS - Provide button APIs. Unique to board architecture. # CONFIG_ARCH_TIMERHOOK - Provide board-specific hooks into periodic timer logic. # -CONFIG_ARCH=z80 +CONFIG_ARCH="z80" CONFIG_ARCH_Z80=y -CONFIG_ARCH_CHIP=ez80 +CONFIG_ARCH_CHIP="ez80" CONFIG_ARCH_CHIP_EZ80=y CONFIG_ARCH_CHIP_EZ80F91=y CONFIG_ARCH_CHIP_EZ80F92=n CONFIG_ARCH_CHIP_EZ80F93=n -CONFIG_ARCH_BOARD=ez80f910200zco +CONFIG_ARCH_BOARD="ez80f910200zco" CONFIG_ARCH_BOARD_EZ80F910200ZCO=y CONFIG_ARCH_NOINTC=n CONFIG_ARCH_IRQPRIO=n @@ -617,15 +617,15 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Settings for examples/poll CONFIG_EXAMPLE_POLL_NOMAC=y -CONFIG_EXAMPLE_POLL_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_POLL_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_POLL_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_POLL_IPADDR=0x0a000002 +CONFIG_EXAMPLE_POLL_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_POLL_NETMASK=0xffffff00 # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(192L<<24|168L<<16|0L<<8|128L) -CONFIG_EXAMPLE_UIP_DRIPADDR=(192L<<24|168L<<16|0L<<8|1L) -CONFIG_EXAMPLE_UIP_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -633,10 +633,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(192L<<24|168L<<16|0L<<8|128L) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(192L<<24|168L<<16|0L<<8|1L) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(192L<<24|168L<<16|0L<<8|106L) +CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a # # Settings for examples/ostest @@ -686,9 +686,9 @@ CONFIG_NSH_TELNET=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 @@ -758,9 +758,9 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0" # CONFIG_EXAMPLE_WGET_NETMASK - Network mask CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html" CONFIG_EXAMPLE_WGET_NOMAC=y -CONFIG_EXAMPLE_WGET_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_WGET_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002 +CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/ez80f910200zco/poll/defconfig b/nuttx/configs/ez80f910200zco/poll/defconfig index 7d9c95d3f0..05f5c96bc7 100644 --- a/nuttx/configs/ez80f910200zco/poll/defconfig +++ b/nuttx/configs/ez80f910200zco/poll/defconfig @@ -64,14 +64,14 @@ # CONFIG_ARCH_BUTTONS - Provide button APIs. Unique to board architecture. # CONFIG_ARCH_TIMERHOOK - Provide board-specific hooks into periodic timer logic. # -CONFIG_ARCH=z80 +CONFIG_ARCH="z80" CONFIG_ARCH_Z80=y -CONFIG_ARCH_CHIP=ez80 +CONFIG_ARCH_CHIP="ez80" CONFIG_ARCH_CHIP_EZ80=y CONFIG_ARCH_CHIP_EZ80F91=y CONFIG_ARCH_CHIP_EZ80F92=n CONFIG_ARCH_CHIP_EZ80F93=n -CONFIG_ARCH_BOARD=ez80f910200zco +CONFIG_ARCH_BOARD="ez80f910200zco" CONFIG_ARCH_BOARD_EZ80F910200ZCO=y CONFIG_ARCH_NOINTC=n CONFIG_ARCH_IRQPRIO=n @@ -622,15 +622,15 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Settings for examples/poll CONFIG_EXAMPLE_POLL_NOMAC=y -CONFIG_EXAMPLE_POLL_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_POLL_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_POLL_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_POLL_IPADDR=0x0a000002 +CONFIG_EXAMPLE_POLL_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_POLL_NETMASK=0xffffff00 # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_UIP_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -650,10 +650,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -703,9 +703,9 @@ CONFIG_NSH_TELNET=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 @@ -775,9 +775,9 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0" # CONFIG_EXAMPLE_WGET_NETMASK - Network mask CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html" CONFIG_EXAMPLE_WGET_NOMAC=y -CONFIG_EXAMPLE_WGET_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_WGET_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L) +CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002 +CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/hymini-stm32v/buttons/defconfig b/nuttx/configs/hymini-stm32v/buttons/defconfig index af9de4a125..8d8acf8ea0 100644 --- a/nuttx/configs/hymini-stm32v/buttons/defconfig +++ b/nuttx/configs/hymini-stm32v/buttons/defconfig @@ -69,12 +69,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F103VCT6=y -CONFIG_ARCH_BOARD=hymini-stm32v +CONFIG_ARCH_BOARD="hymini-stm32v" CONFIG_ARCH_BOARD_HYMINI_STM32V=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x0000C000 @@ -327,7 +327,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -359,7 +359,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -722,9 +722,9 @@ CONFIG_WATCHDOG=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -732,10 +732,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/buttons @@ -812,9 +812,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/hymini-stm32v/nsh/defconfig b/nuttx/configs/hymini-stm32v/nsh/defconfig index b8ad080fe5..56e6f8ecd4 100755 --- a/nuttx/configs/hymini-stm32v/nsh/defconfig +++ b/nuttx/configs/hymini-stm32v/nsh/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F103VCT6=y -CONFIG_ARCH_BOARD=hymini-stm32v +CONFIG_ARCH_BOARD="hymini-stm32v" CONFIG_ARCH_BOARD_HYMINI_STM32V=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x0000C000 @@ -323,7 +323,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -355,7 +355,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -725,9 +725,9 @@ CONFIG_WATCHDOG=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -735,10 +735,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -797,9 +797,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/hymini-stm32v/nsh2/defconfig b/nuttx/configs/hymini-stm32v/nsh2/defconfig index 0b0cbfda42..3d13db721a 100644 --- a/nuttx/configs/hymini-stm32v/nsh2/defconfig +++ b/nuttx/configs/hymini-stm32v/nsh2/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F103VCT6=y -CONFIG_ARCH_BOARD=hymini-stm32v +CONFIG_ARCH_BOARD="hymini-stm32v" CONFIG_ARCH_BOARD_HYMINI_STM32V=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x0000C000 @@ -327,7 +327,7 @@ CONFIG_RTC=y # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -364,7 +364,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y diff --git a/nuttx/configs/hymini-stm32v/nx/defconfig b/nuttx/configs/hymini-stm32v/nx/defconfig index f32afd1b91..ae925eca91 100644 --- a/nuttx/configs/hymini-stm32v/nx/defconfig +++ b/nuttx/configs/hymini-stm32v/nx/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F103VCT6=y -CONFIG_ARCH_BOARD=hymini-stm32v +CONFIG_ARCH_BOARD="hymini-stm32v" CONFIG_ARCH_BOARD_HYMINI_STM32V=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x0000C000 @@ -320,7 +320,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -353,7 +353,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -896,9 +896,9 @@ CONFIG_LCD_BACKLIGHT=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -906,10 +906,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -967,9 +967,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/hymini-stm32v/nxlines/defconfig b/nuttx/configs/hymini-stm32v/nxlines/defconfig index 1439b4d559..137897e324 100644 --- a/nuttx/configs/hymini-stm32v/nxlines/defconfig +++ b/nuttx/configs/hymini-stm32v/nxlines/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F103VCT6=y -CONFIG_ARCH_BOARD=hymini-stm32v +CONFIG_ARCH_BOARD="hymini-stm32v" CONFIG_ARCH_BOARD_HYMINI_STM32V=y CONFIG_BOARD_LOOPSPERMSEC=5483 @@ -324,7 +324,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -357,7 +357,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -950,9 +950,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/hymini-stm32v/usbserial/defconfig b/nuttx/configs/hymini-stm32v/usbserial/defconfig index c1abc15dc6..8ebf5bd381 100755 --- a/nuttx/configs/hymini-stm32v/usbserial/defconfig +++ b/nuttx/configs/hymini-stm32v/usbserial/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F103VCT6=y -CONFIG_ARCH_BOARD=hymini-stm32v +CONFIG_ARCH_BOARD="hymini-stm32v" CONFIG_ARCH_BOARD_HYMINI_STM32V=y CONFIG_BOARD_LOOPSPERMSEC=5483 @@ -326,7 +326,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -359,7 +359,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -789,9 +789,9 @@ CONFIG_WATCHDOG=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -799,10 +799,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -857,9 +857,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/hymini-stm32v/usbstorage/defconfig b/nuttx/configs/hymini-stm32v/usbstorage/defconfig index b783a1f6ae..fc5805f4d7 100755 --- a/nuttx/configs/hymini-stm32v/usbstorage/defconfig +++ b/nuttx/configs/hymini-stm32v/usbstorage/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F103VCT6=y -CONFIG_ARCH_BOARD=hymini-stm32v +CONFIG_ARCH_BOARD="hymini-stm32v" CONFIG_ARCH_BOARD_HYMINI_STM32V=y CONFIG_BOARD_LOOPSPERMSEC=5483 @@ -321,7 +321,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -354,7 +354,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -733,9 +733,9 @@ CONFIG_WATCHDOG=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -743,10 +743,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -808,9 +808,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/kwikstik-k40/ostest/defconfig b/nuttx/configs/kwikstik-k40/ostest/defconfig index 709a5585aa..0e299f938c 100755 --- a/nuttx/configs/kwikstik-k40/ostest/defconfig +++ b/nuttx/configs/kwikstik-k40/ostest/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM4=y -CONFIG_ARCH_CHIP=kinetis +CONFIG_ARCH_CHIP="kinetis" CONFIG_ARCH_CHIP_MK40X256VLQ100=y -CONFIG_ARCH_BOARD=kwikstik-k40 +CONFIG_ARCH_BOARD="kwikstik-k40" CONFIG_ARCH_BOARD_KWIKSTIK_K40=y CONFIG_BOARD_LOOPSPERMSEC=9535 CONFIG_DRAM_START=0x1fff8000 @@ -387,7 +387,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -419,7 +419,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -769,9 +769,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -779,10 +779,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -837,9 +837,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/lincoln60/nsh/defconfig b/nuttx/configs/lincoln60/nsh/defconfig index 4f3219e6d4..e4403b669f 100644 --- a/nuttx/configs/lincoln60/nsh/defconfig +++ b/nuttx/configs/lincoln60/nsh/defconfig @@ -68,15 +68,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lpc17xx +CONFIG_ARCH_CHIP="lpc17xx" CONFIG_ARCH_CHIP_LPC1769=y -CONFIG_ARCH_BOARD=lincoln60 +CONFIG_ARCH_BOARD="lincoln60" CONFIG_ARCH_BOARD_LINCOLN60=y CONFIG_BOARD_LOOPSPERMSEC=7982 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0x10000000 CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n @@ -311,7 +311,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -343,7 +343,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -674,9 +674,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -684,10 +684,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -742,9 +742,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/lincoln60/ostest/defconfig b/nuttx/configs/lincoln60/ostest/defconfig index b3087f3a72..04fd082a0a 100644 --- a/nuttx/configs/lincoln60/ostest/defconfig +++ b/nuttx/configs/lincoln60/ostest/defconfig @@ -68,15 +68,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lpc17xx +CONFIG_ARCH_CHIP="lpc17xx" CONFIG_ARCH_CHIP_LPC1769=y -CONFIG_ARCH_BOARD=lincoln60 +CONFIG_ARCH_BOARD="lincoln60" CONFIG_ARCH_BOARD_LINCOLN60=y CONFIG_BOARD_LOOPSPERMSEC=8111 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0x10000000 CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n @@ -318,7 +318,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -350,7 +350,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -722,9 +722,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -746,10 +746,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -826,9 +826,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/lm3s6432-s2e/nsh/defconfig b/nuttx/configs/lm3s6432-s2e/nsh/defconfig index b10e2a176f..67ed9cab8a 100644 --- a/nuttx/configs/lm3s6432-s2e/nsh/defconfig +++ b/nuttx/configs/lm3s6432-s2e/nsh/defconfig @@ -65,12 +65,12 @@ # the 100 second delay then adjust CONFIG_BOARD_LOOPSPERMSEC until # the delay actually is 100 seconds. # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lm3s +CONFIG_ARCH_CHIP="lm3s" CONFIG_ARCH_CHIP_LM3S6432=y -CONFIG_ARCH_BOARD=lm3s6432-s2e +CONFIG_ARCH_BOARD="lm3s6432-s2e" CONFIG_ARCH_BOARD_LM3S6432S2E=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00008000 @@ -492,9 +492,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip # -#CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -#CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -#CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +#CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +#CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +#CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=y # @@ -502,10 +502,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=y CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -560,9 +560,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/lm3s6432-s2e/ostest/defconfig b/nuttx/configs/lm3s6432-s2e/ostest/defconfig index 1e73dff550..fed09ef833 100644 --- a/nuttx/configs/lm3s6432-s2e/ostest/defconfig +++ b/nuttx/configs/lm3s6432-s2e/ostest/defconfig @@ -65,12 +65,12 @@ # the 100 second delay then adjust CONFIG_BOARD_LOOPSPERMSEC until # the delay actually is 100 seconds. # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lm3s +CONFIG_ARCH_CHIP="lm3s" CONFIG_ARCH_CHIP_LM3S6432=y -CONFIG_ARCH_BOARD=lm3s6432-s2e +CONFIG_ARCH_BOARD="lm3s6432-s2e" CONFIG_ARCH_BOARD_LM3S6432S2E=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00008000 @@ -489,9 +489,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -499,10 +499,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -557,9 +557,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/lm3s6965-ek/nsh/defconfig b/nuttx/configs/lm3s6965-ek/nsh/defconfig index e84f1b137f..ffa9d885c0 100755 --- a/nuttx/configs/lm3s6965-ek/nsh/defconfig +++ b/nuttx/configs/lm3s6965-ek/nsh/defconfig @@ -65,12 +65,12 @@ # the 100 second delay then adjust CONFIG_BOARD_LOOPSPERMSEC until # the delay actually is 100 seconds. # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lm3s +CONFIG_ARCH_CHIP="lm3s" CONFIG_ARCH_CHIP_LM3S6965=y -CONFIG_ARCH_BOARD=lm3s6965-ek +CONFIG_ARCH_BOARD="lm3s6965-ek" CONFIG_ARCH_BOARD_LM3S6965EK=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00010000 @@ -494,9 +494,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -504,10 +504,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -562,9 +562,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/lm3s6965-ek/nx/defconfig b/nuttx/configs/lm3s6965-ek/nx/defconfig index 4152534462..63c37ef44d 100755 --- a/nuttx/configs/lm3s6965-ek/nx/defconfig +++ b/nuttx/configs/lm3s6965-ek/nx/defconfig @@ -65,12 +65,12 @@ # the 100 second delay then adjust CONFIG_BOARD_LOOPSPERMSEC until # the delay actually is 100 seconds. # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lm3s +CONFIG_ARCH_CHIP="lm3s" CONFIG_ARCH_CHIP_LM3S6965=y -CONFIG_ARCH_BOARD=lm3s6965-ek +CONFIG_ARCH_BOARD="lm3s6965-ek" CONFIG_ARCH_BOARD_LM3S6965EK=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00010000 @@ -613,9 +613,9 @@ CONFIG_P14201_FRAMEBUFFER=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -623,10 +623,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -681,9 +681,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/lm3s6965-ek/ostest/defconfig b/nuttx/configs/lm3s6965-ek/ostest/defconfig index 6206284638..15eaa74eb8 100755 --- a/nuttx/configs/lm3s6965-ek/ostest/defconfig +++ b/nuttx/configs/lm3s6965-ek/ostest/defconfig @@ -65,12 +65,12 @@ # the 100 second delay then adjust CONFIG_BOARD_LOOPSPERMSEC until # the delay actually is 100 seconds. # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lm3s +CONFIG_ARCH_CHIP="lm3s" CONFIG_ARCH_CHIP_LM3S6965=y -CONFIG_ARCH_BOARD=lm3s6965-ek +CONFIG_ARCH_BOARD="lm3s6965-ek" CONFIG_ARCH_BOARD_LM3S6965EK=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00010000 @@ -489,9 +489,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -499,10 +499,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -557,9 +557,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/lm3s8962-ek/nsh/defconfig b/nuttx/configs/lm3s8962-ek/nsh/defconfig index cab96f28e5..46fb5e1175 100755 --- a/nuttx/configs/lm3s8962-ek/nsh/defconfig +++ b/nuttx/configs/lm3s8962-ek/nsh/defconfig @@ -65,12 +65,12 @@ # the 100 second delay then adjust CONFIG_BOARD_LOOPSPERMSEC until # the delay actually is 100 seconds. # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lm3s +CONFIG_ARCH_CHIP="lm3s" CONFIG_ARCH_CHIP_LM3S8962=y -CONFIG_ARCH_BOARD=lm3s8962-ek +CONFIG_ARCH_BOARD="lm3s8962-ek" CONFIG_ARCH_BOARD_LM3S8962EK=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00010000 @@ -492,9 +492,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -502,10 +502,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -560,9 +560,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/lm3s8962-ek/nx/defconfig b/nuttx/configs/lm3s8962-ek/nx/defconfig index 8336207a8d..ecd4632a4b 100755 --- a/nuttx/configs/lm3s8962-ek/nx/defconfig +++ b/nuttx/configs/lm3s8962-ek/nx/defconfig @@ -65,12 +65,12 @@ # the 100 second delay then adjust CONFIG_BOARD_LOOPSPERMSEC until # the delay actually is 100 seconds. # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lm3s +CONFIG_ARCH_CHIP="lm3s" CONFIG_ARCH_CHIP_LM3S8962=y -CONFIG_ARCH_BOARD=lm3s8962-ek +CONFIG_ARCH_BOARD="lm3s8962-ek" CONFIG_ARCH_BOARD_LM3S8962EK=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00010000 @@ -612,9 +612,9 @@ CONFIG_P14201_FRAMEBUFFER=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -622,10 +622,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -680,9 +680,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/lm3s8962-ek/ostest/defconfig b/nuttx/configs/lm3s8962-ek/ostest/defconfig index 9baeaf7803..1fbc67c52c 100755 --- a/nuttx/configs/lm3s8962-ek/ostest/defconfig +++ b/nuttx/configs/lm3s8962-ek/ostest/defconfig @@ -65,12 +65,12 @@ # the 100 second delay then adjust CONFIG_BOARD_LOOPSPERMSEC until # the delay actually is 100 seconds. # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lm3s +CONFIG_ARCH_CHIP="lm3s" CONFIG_ARCH_CHIP_LM3S8962=y -CONFIG_ARCH_BOARD=lm3s8962-ek +CONFIG_ARCH_BOARD="lm3s8962-ek" CONFIG_ARCH_BOARD_LM3S8962EK=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00010000 @@ -489,9 +489,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -499,10 +499,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -557,9 +557,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/lpc4330-xplorer/nsh/defconfig b/nuttx/configs/lpc4330-xplorer/nsh/defconfig index 3fdb53ad45..be5ece3511 100644 --- a/nuttx/configs/lpc4330-xplorer/nsh/defconfig +++ b/nuttx/configs/lpc4330-xplorer/nsh/defconfig @@ -73,15 +73,15 @@ # LPC43xx port using the ARMv7 common vector logic. There are two # variants # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM4=y -CONFIG_ARCH_CHIP=lpc43xx +CONFIG_ARCH_CHIP="lpc43xx" CONFIG_ARCH_CHIP_LPC4330FET100=y -CONFIG_ARCH_BOARD=lpc4330-xplorer +CONFIG_ARCH_BOARD="lpc4330-xplorer" CONFIG_ARCH_BOARD_LPC4330_XPLORER=y CONFIG_BOARD_LOOPSPERMSEC=18535 -CONFIG_DRAM_SIZE=(72*1024) +CONFIG_DRAM_SIZE=73728 CONFIG_DRAM_START=0x10080000 CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_FPU=n @@ -382,7 +382,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -420,7 +420,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=192 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=2048 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -976,9 +976,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -987,10 +987,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -1048,9 +1048,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/lpc4330-xplorer/ostest/defconfig b/nuttx/configs/lpc4330-xplorer/ostest/defconfig index 40ceb025f2..ad3afd6692 100644 --- a/nuttx/configs/lpc4330-xplorer/ostest/defconfig +++ b/nuttx/configs/lpc4330-xplorer/ostest/defconfig @@ -73,15 +73,15 @@ # LPC43xx port using the ARMv7 common vector logic. There are two # variants # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM4=y -CONFIG_ARCH_CHIP=lpc43xx +CONFIG_ARCH_CHIP="lpc43xx" CONFIG_ARCH_CHIP_LPC4330FET100=y -CONFIG_ARCH_BOARD=lpc4330-xplorer +CONFIG_ARCH_BOARD="lpc4330-xplorer" CONFIG_ARCH_BOARD_LPC4330_XPLORER=y CONFIG_BOARD_LOOPSPERMSEC=18535 -CONFIG_DRAM_SIZE=(72*1024) +CONFIG_DRAM_SIZE=73728 CONFIG_DRAM_START=0x10080000 CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_FPU=n @@ -375,7 +375,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -412,7 +412,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=192 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=2048 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=n @@ -932,9 +932,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -942,10 +942,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -1003,9 +1003,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig index 564d7c7964..598ce529b2 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig +++ b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig @@ -68,15 +68,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lpc17xx +CONFIG_ARCH_CHIP="lpc17xx" CONFIG_ARCH_CHIP_LPC1768=y -CONFIG_ARCH_BOARD=lpcxpresso-lpc1768 +CONFIG_ARCH_BOARD="lpcxpresso-lpc1768" CONFIG_ARCH_BOARD_LPCXPRESSO=y CONFIG_BOARD_LOOPSPERMSEC=8079 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0x10000000 CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n @@ -316,7 +316,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -348,7 +348,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -704,9 +704,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -728,18 +728,18 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/dhcpd # CONFIG_EXAMPLE_DHCPD_NOMAC=y -CONFIG_EXAMPLE_DHCPD_IPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_DHCPD_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_DHCPD_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_DHCPD_IPADDR=0x0a000001 +CONFIG_EXAMPLE_DHCPD_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_DHCPD_NETMASK=0xffffff00 # # Settings for examples/ostest @@ -794,9 +794,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig b/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig index e1376f7bc7..a8ef1ace9a 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig +++ b/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig @@ -68,15 +68,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lpc17xx +CONFIG_ARCH_CHIP="lpc17xx" CONFIG_ARCH_CHIP_LPC1768=y -CONFIG_ARCH_BOARD=lpcxpresso-lpc1768 +CONFIG_ARCH_BOARD="lpcxpresso-lpc1768" CONFIG_ARCH_BOARD_LPCXPRESSO=y CONFIG_BOARD_LOOPSPERMSEC=8079 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0x10000000 CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n @@ -324,7 +324,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -356,7 +356,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -744,9 +744,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -768,10 +768,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -826,9 +826,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig b/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig index 07851a6284..e34c6dd661 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig +++ b/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig @@ -68,15 +68,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lpc17xx +CONFIG_ARCH_CHIP="lpc17xx" CONFIG_ARCH_CHIP_LPC1768=y -CONFIG_ARCH_BOARD=lpcxpresso-lpc1768 +CONFIG_ARCH_BOARD="lpcxpresso-lpc1768" CONFIG_ARCH_BOARD_LPCXPRESSO=y CONFIG_BOARD_LOOPSPERMSEC=8079 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0x10000000 CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n @@ -320,7 +320,7 @@ CONFIG_SPI_CMDDATA=y # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -353,7 +353,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -832,9 +832,9 @@ CONFIG_UG9664HSWAG01_POWER=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -856,10 +856,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -914,9 +914,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig b/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig index 027cdc0dbb..653f208f93 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig +++ b/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig @@ -68,15 +68,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lpc17xx +CONFIG_ARCH_CHIP="lpc17xx" CONFIG_ARCH_CHIP_LPC1768=y -CONFIG_ARCH_BOARD=lpcxpresso-lpc1768 +CONFIG_ARCH_BOARD="lpcxpresso-lpc1768" CONFIG_ARCH_BOARD_LPCXPRESSO=y CONFIG_BOARD_LOOPSPERMSEC=8079 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0x10000000 CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n @@ -315,7 +315,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -346,7 +346,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -700,9 +700,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -724,10 +724,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -782,9 +782,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig b/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig index 76b0d97819..5e73edcdc5 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig +++ b/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig @@ -68,15 +68,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lpc17xx +CONFIG_ARCH_CHIP="lpc17xx" CONFIG_ARCH_CHIP_LPC1768=y -CONFIG_ARCH_BOARD=lpcxpresso-lpc1768 +CONFIG_ARCH_BOARD="lpcxpresso-lpc1768" CONFIG_ARCH_BOARD_LPCXPRESSO=y CONFIG_BOARD_LOOPSPERMSEC=8079 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0x10000000 CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n @@ -321,7 +321,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -353,7 +353,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -765,7 +765,7 @@ CONFIG_USBMSC_REMOVABLE=y # and verify referrers. # CONFIG_THTTPD_PORT=80 -CONFIG_THTTPD_IPADDR=(10<<24|0<<16|0<<8|2) +CONFIG_THTTPD_IPADDR=0x0a000002 CONFIG_THTTPD_SERVER_ADDRESS="http://www.nuttx.org" CONFIG_THTTPD_SERVER_SOFTWARE="thttpd/2.25b 29dec2003-NuttX" CONFIG_THTTPD_PATH="/mnt/www" @@ -793,15 +793,15 @@ CONFIG_THTTPD_URLPATTERN=n # Additional settings for examples/thttpd # CONFIG_EXAMPLE_THTTPD_NOMAC=y -CONFIG_EXAMPLE_THTTPD_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_THTTPD_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_THTTPD_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_THTTPD_NETMASK=0xffffff00 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -823,10 +823,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -881,9 +881,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig index ffc2a276f0..bffbd8c5a2 100755 --- a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig +++ b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig @@ -68,15 +68,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lpc17xx +CONFIG_ARCH_CHIP="lpc17xx" CONFIG_ARCH_CHIP_LPC1768=y -CONFIG_ARCH_BOARD=lpcxpresso-lpc1768 +CONFIG_ARCH_BOARD="lpcxpresso-lpc1768" CONFIG_ARCH_BOARD_LPCXPRESSO=y CONFIG_BOARD_LOOPSPERMSEC=8079 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0x10000000 CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n @@ -318,7 +318,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -351,7 +351,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -689,9 +689,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -713,10 +713,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -771,9 +771,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/m68332evb/defconfig b/nuttx/configs/m68332evb/defconfig index ac4df59953..cf983f79f5 100644 --- a/nuttx/configs/m68332evb/defconfig +++ b/nuttx/configs/m68332evb/defconfig @@ -47,10 +47,10 @@ # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=m68332evb +CONFIG_ARCH="m68332evb" CONFIG_ARCH_M68332=y CONFIG_ARCH_M68332EVB=y -CONFIG_ARCH_BOARD=m68332evb +CONFIG_ARCH_BOARD="m68332evb" CONFIG_ARCH_BOARD_M68332EVB=y CONFIG_DRAM_SIZE=0x003000 CONFIG_ARCH_STACKDUMP=y @@ -349,9 +349,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/mbed/hidkbd/defconfig b/nuttx/configs/mbed/hidkbd/defconfig index 4b15b76ad7..1bc5bf8499 100644 --- a/nuttx/configs/mbed/hidkbd/defconfig +++ b/nuttx/configs/mbed/hidkbd/defconfig @@ -68,15 +68,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lpc17xx +CONFIG_ARCH_CHIP="lpc17xx" CONFIG_ARCH_CHIP_LPC1768=y -CONFIG_ARCH_BOARD=mbed +CONFIG_ARCH_BOARD="mbed" CONFIG_ARCH_BOARD_MBED=y CONFIG_BOARD_LOOPSPERMSEC=7982 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0x10000000 CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n @@ -318,7 +318,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -351,7 +351,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -732,9 +732,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -755,10 +755,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -813,9 +813,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/mbed/nsh/defconfig b/nuttx/configs/mbed/nsh/defconfig index d0b8cf43c7..f015a4fc74 100755 --- a/nuttx/configs/mbed/nsh/defconfig +++ b/nuttx/configs/mbed/nsh/defconfig @@ -68,15 +68,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lpc17xx +CONFIG_ARCH_CHIP="lpc17xx" CONFIG_ARCH_CHIP_LPC1768=y -CONFIG_ARCH_BOARD=mbed +CONFIG_ARCH_BOARD="mbed" CONFIG_ARCH_BOARD_MBED=y CONFIG_BOARD_LOOPSPERMSEC=7982 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0x10000000 CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n @@ -311,7 +311,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -343,7 +343,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -674,9 +674,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -684,10 +684,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -742,9 +742,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/mcu123-lpc214x/composite/defconfig b/nuttx/configs/mcu123-lpc214x/composite/defconfig index 43da96fdf2..b2cce62b3e 100644 --- a/nuttx/configs/mcu123-lpc214x/composite/defconfig +++ b/nuttx/configs/mcu123-lpc214x/composite/defconfig @@ -58,12 +58,12 @@ # used during interrupt handling. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM7TDMI=y -CONFIG_ARCH_CHIP=lpc214x +CONFIG_ARCH_CHIP="lpc214x" CONFIG_ARCH_CHIP_LPC2148=y -CONFIG_ARCH_BOARD=mcu123-lpc214x +CONFIG_ARCH_BOARD="mcu123-lpc214x" CONFIG_ARCH_BOARD_MCU123=y CONFIG_BOARD_LOOPSPERMSEC=3270 CONFIG_ARCH_LEDS=y @@ -754,9 +754,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/mcu123-lpc214x/nsh/defconfig b/nuttx/configs/mcu123-lpc214x/nsh/defconfig index 3a7bfddb98..aa1742ed26 100644 --- a/nuttx/configs/mcu123-lpc214x/nsh/defconfig +++ b/nuttx/configs/mcu123-lpc214x/nsh/defconfig @@ -58,12 +58,12 @@ # used during interrupt handling. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM7TDMI=y -CONFIG_ARCH_CHIP=lpc214x +CONFIG_ARCH_CHIP="lpc214x" CONFIG_ARCH_CHIP_LPC2148=y -CONFIG_ARCH_BOARD=mcu123-lpc214x +CONFIG_ARCH_BOARD="mcu123-lpc214x" CONFIG_ARCH_BOARD_MCU123=y CONFIG_BOARD_LOOPSPERMSEC=3270 CONFIG_ARCH_LEDS=y @@ -630,9 +630,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/mcu123-lpc214x/ostest/defconfig b/nuttx/configs/mcu123-lpc214x/ostest/defconfig index 5a6107ce32..543462e6d7 100644 --- a/nuttx/configs/mcu123-lpc214x/ostest/defconfig +++ b/nuttx/configs/mcu123-lpc214x/ostest/defconfig @@ -58,12 +58,12 @@ # used during interrupt handling. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM7TDMI=y -CONFIG_ARCH_CHIP=lpc214x +CONFIG_ARCH_CHIP="lpc214x" CONFIG_ARCH_CHIP_LPC2148=y -CONFIG_ARCH_BOARD=mcu123-lpc214x +CONFIG_ARCH_BOARD="mcu123-lpc214x" CONFIG_ARCH_BOARD_MCU123=y CONFIG_BOARD_LOOPSPERMSEC=3270 CONFIG_ARCH_LEDS=y @@ -620,9 +620,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig index 19063f108f..6d3d85c67c 100644 --- a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig +++ b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig @@ -58,12 +58,12 @@ # used during interrupt handling. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM7TDMI=y -CONFIG_ARCH_CHIP=lpc214x +CONFIG_ARCH_CHIP="lpc214x" CONFIG_ARCH_CHIP_LPC2148=y -CONFIG_ARCH_BOARD=mcu123-lpc214x +CONFIG_ARCH_BOARD="mcu123-lpc214x" CONFIG_ARCH_BOARD_MCU123=y CONFIG_BOARD_LOOPSPERMSEC=3270 CONFIG_ARCH_LEDS=y @@ -621,9 +621,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig index f43eeda3fe..60554cfe04 100644 --- a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig +++ b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig @@ -58,12 +58,12 @@ # used during interrupt handling. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM7TDMI=y -CONFIG_ARCH_CHIP=lpc214x +CONFIG_ARCH_CHIP="lpc214x" CONFIG_ARCH_CHIP_LPC2148=y -CONFIG_ARCH_BOARD=mcu123-lpc214x +CONFIG_ARCH_BOARD="mcu123-lpc214x" CONFIG_ARCH_BOARD_MCU123=y CONFIG_BOARD_LOOPSPERMSEC=3270 CONFIG_ARCH_LEDS=y @@ -620,9 +620,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/micropendous3/hello/defconfig b/nuttx/configs/micropendous3/hello/defconfig index f41c228494..e83f5d4ae2 100644 --- a/nuttx/configs/micropendous3/hello/defconfig +++ b/nuttx/configs/micropendous3/hello/defconfig @@ -250,7 +250,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -608,9 +608,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -632,10 +632,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -690,9 +690,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/mirtoo/nsh/defconfig b/nuttx/configs/mirtoo/nsh/defconfig index 646375671b..373aa20a14 100644 --- a/nuttx/configs/mirtoo/nsh/defconfig +++ b/nuttx/configs/mirtoo/nsh/defconfig @@ -81,15 +81,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=mips +CONFIG_ARCH="mips" CONFIG_ARCH_MIPS=y CONFIG_ARCH_MIPS32=y -CONFIG_ARCH_CHIP=pic32mx +CONFIG_ARCH_CHIP="pic32mx" CONFIG_ARCH_CHIP_PIC32MX250F128D=y -CONFIG_ARCH_BOARD=mirtoo +CONFIG_ARCH_BOARD="mirtoo" CONFIG_ARCH_BOARD_MIRTOO=y CONFIG_BOARD_LOOPSPERMSEC=8079 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0xa0000000 CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y @@ -341,7 +341,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -380,7 +380,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=192 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -784,9 +784,9 @@ CONFIG_PGA11X_MULTIPLE=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -808,10 +808,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -870,9 +870,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/mirtoo/nxffs/defconfig b/nuttx/configs/mirtoo/nxffs/defconfig index f208034757..485fbf38cf 100644 --- a/nuttx/configs/mirtoo/nxffs/defconfig +++ b/nuttx/configs/mirtoo/nxffs/defconfig @@ -81,15 +81,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=mips +CONFIG_ARCH="mips" CONFIG_ARCH_MIPS=y CONFIG_ARCH_MIPS32=y -CONFIG_ARCH_CHIP=pic32mx +CONFIG_ARCH_CHIP="pic32mx" CONFIG_ARCH_CHIP_PIC32MX250F128D=y -CONFIG_ARCH_BOARD=mirtoo +CONFIG_ARCH_BOARD="mirtoo" CONFIG_ARCH_BOARD_MIRTOO=y CONFIG_BOARD_LOOPSPERMSEC=8079 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0xa0000000 CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y @@ -341,7 +341,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -380,7 +380,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=192 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=n @@ -786,9 +786,9 @@ CONFIG_PGA11X_MULTIPLE=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -810,10 +810,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -872,9 +872,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/mirtoo/ostest/defconfig b/nuttx/configs/mirtoo/ostest/defconfig index bba530c831..54cfda627c 100644 --- a/nuttx/configs/mirtoo/ostest/defconfig +++ b/nuttx/configs/mirtoo/ostest/defconfig @@ -81,15 +81,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=mips +CONFIG_ARCH="mips" CONFIG_ARCH_MIPS=y CONFIG_ARCH_MIPS32=y -CONFIG_ARCH_CHIP=pic32mx +CONFIG_ARCH_CHIP="pic32mx" CONFIG_ARCH_CHIP_PIC32MX250F128D=y -CONFIG_ARCH_BOARD=mirtoo +CONFIG_ARCH_BOARD="mirtoo" CONFIG_ARCH_BOARD_MIRTOO=y CONFIG_BOARD_LOOPSPERMSEC=8079 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0xa0000000 CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y @@ -333,7 +333,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -370,7 +370,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=192 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=n @@ -746,9 +746,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -770,10 +770,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -832,9 +832,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/mx1ads/ostest/defconfig b/nuttx/configs/mx1ads/ostest/defconfig index 8d9389d6a2..97368fb8b2 100644 --- a/nuttx/configs/mx1ads/ostest/defconfig +++ b/nuttx/configs/mx1ads/ostest/defconfig @@ -58,12 +58,12 @@ # used during interrupt handling. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM920T=y -CONFIG_ARCH_CHIP=imx +CONFIG_ARCH_CHIP="imx" CONFIG_ARCH_CHIP_IMX1=y -CONFIG_ARCH_BOARD=mx1ads +CONFIG_ARCH_BOARD="mx1ads" CONFIG_ARCH_BOARD_MX1ADS=y CONFIG_BOARD_LOOPSPERMSEC=16945 CONFIG_DRAM_SIZE=0x01000000 @@ -504,9 +504,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -514,10 +514,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/nsh @@ -527,9 +527,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # DM90x0 Driver Settings diff --git a/nuttx/configs/ne64badge/ostest/defconfig b/nuttx/configs/ne64badge/ostest/defconfig index f420b3976d..1e0b270035 100755 --- a/nuttx/configs/ne64badge/ostest/defconfig +++ b/nuttx/configs/ne64badge/ostest/defconfig @@ -71,12 +71,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=hc +CONFIG_ARCH="hc" CONFIG_ARCH_HC=y CONFIG_ARCH_HCS12=y -CONFIG_ARCH_CHIP=m9s12 +CONFIG_ARCH_CHIP="m9s12" CONFIG_ARCH_CHIP_MCS92S12NEC64=y -CONFIG_ARCH_BOARD=ne64badge +CONFIG_ARCH_BOARD="ne64badge" CONFIG_ARCH_BOARD_NE64BADGE=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 @@ -287,7 +287,7 @@ CONFIG_PASS1_OBJECT= # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -319,7 +319,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=256 CONFIG_SIG_SIGWORK=4 @@ -629,9 +629,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -639,10 +639,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -697,9 +697,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/ntosd-dm320/nettest/defconfig b/nuttx/configs/ntosd-dm320/nettest/defconfig index f2a8781e26..be9c619a43 100644 --- a/nuttx/configs/ntosd-dm320/nettest/defconfig +++ b/nuttx/configs/ntosd-dm320/nettest/defconfig @@ -58,12 +58,12 @@ # used during interrupt handling. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM7TDMI=y -CONFIG_ARCH_CHIP=dm320 +CONFIG_ARCH_CHIP="dm320" CONFIG_ARCH_CHIP_DM320=y -CONFIG_ARCH_BOARD=ntosd-dm320 +CONFIG_ARCH_BOARD="ntosd-dm320" CONFIG_ARCH_BOARD_NTOSD_DM320=y CONFIG_ARCH_NTOSD_DEVBOARD=n CONFIG_BOARD_LOOPSPERMSEC=16945 @@ -500,9 +500,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -510,10 +510,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/nsh @@ -523,9 +523,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # DM90x0 Driver Settings diff --git a/nuttx/configs/ntosd-dm320/nsh/defconfig b/nuttx/configs/ntosd-dm320/nsh/defconfig index 8b128fb450..75b3c43939 100644 --- a/nuttx/configs/ntosd-dm320/nsh/defconfig +++ b/nuttx/configs/ntosd-dm320/nsh/defconfig @@ -58,12 +58,12 @@ # used during interrupt handling. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM7TDMI=y -CONFIG_ARCH_CHIP=dm320 +CONFIG_ARCH_CHIP="dm320" CONFIG_ARCH_CHIP_DM320=y -CONFIG_ARCH_BOARD=ntosd-dm320 +CONFIG_ARCH_BOARD="ntosd-dm320" CONFIG_ARCH_BOARD_NTOSD_DM320=y CONFIG_ARCH_NTOSD_DEVBOARD=n CONFIG_BOARD_LOOPSPERMSEC=16945 @@ -507,9 +507,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -517,10 +517,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -569,9 +569,9 @@ CONFIG_NSH_TELNET=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/ntosd-dm320/ostest/defconfig b/nuttx/configs/ntosd-dm320/ostest/defconfig index b18449fb79..ed72d0f2da 100644 --- a/nuttx/configs/ntosd-dm320/ostest/defconfig +++ b/nuttx/configs/ntosd-dm320/ostest/defconfig @@ -58,12 +58,12 @@ # used during interrupt handling. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM7TDMI=y -CONFIG_ARCH_CHIP=dm320 +CONFIG_ARCH_CHIP="dm320" CONFIG_ARCH_CHIP_DM320=y -CONFIG_ARCH_BOARD=ntosd-dm320 +CONFIG_ARCH_BOARD="ntosd-dm320" CONFIG_ARCH_BOARD_NTOSD_DM320=y CONFIG_ARCH_NTOSD_DEVBOARD=n CONFIG_BOARD_LOOPSPERMSEC=16945 @@ -492,9 +492,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -502,10 +502,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/nsh @@ -515,9 +515,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # DM90x0 Driver Settings diff --git a/nuttx/configs/ntosd-dm320/poll/defconfig b/nuttx/configs/ntosd-dm320/poll/defconfig index 6ebf7aab59..5e643db4db 100644 --- a/nuttx/configs/ntosd-dm320/poll/defconfig +++ b/nuttx/configs/ntosd-dm320/poll/defconfig @@ -58,12 +58,12 @@ # used during interrupt handling. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM7TDMI=y -CONFIG_ARCH_CHIP=dm320 +CONFIG_ARCH_CHIP="dm320" CONFIG_ARCH_CHIP_DM320=y -CONFIG_ARCH_BOARD=ntosd-dm320 +CONFIG_ARCH_BOARD="ntosd-dm320" CONFIG_ARCH_BOARD_NTOSD_DM320=y CONFIG_ARCH_NTOSD_DEVBOARD=n CONFIG_BOARD_LOOPSPERMSEC=16945 @@ -501,15 +501,15 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/poll CONFIG_EXAMPLE_POLL_NOMAC=n -CONFIG_EXAMPLE_POLL_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_POLL_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_POLL_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_POLL_IPADDR=0x0a000002 +CONFIG_EXAMPLE_POLL_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_POLL_NETMASK=0xffffff00 # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -517,10 +517,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/nsh @@ -530,9 +530,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # DM90x0 Driver Settings diff --git a/nuttx/configs/ntosd-dm320/thttpd/defconfig b/nuttx/configs/ntosd-dm320/thttpd/defconfig index 74dd810729..db7b54f879 100644 --- a/nuttx/configs/ntosd-dm320/thttpd/defconfig +++ b/nuttx/configs/ntosd-dm320/thttpd/defconfig @@ -58,12 +58,12 @@ # used during interrupt handling. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM926EJS=y -CONFIG_ARCH_CHIP=dm320 +CONFIG_ARCH_CHIP="dm320" CONFIG_ARCH_CHIP_DM320=y -CONFIG_ARCH_BOARD=ntosd-dm320 +CONFIG_ARCH_BOARD="ntosd-dm320" CONFIG_ARCH_BOARD_NTOSD_DM320=y CONFIG_ARCH_NTOSD_DEVBOARD=n CONFIG_BOARD_LOOPSPERMSEC=16945 @@ -603,7 +603,7 @@ CONFIG_USBMSC_REMOVABLE=y # CONFIG_THTTPD_URLPATTERN - If defined, then it will be used to match # and verify referrers. CONFIG_THTTPD_PORT=80 -CONFIG_THTTPD_IPADDR=(10<<24|0<<16|0<<8|2) +CONFIG_THTTPD_IPADDR=0x0a000002 CONFIG_THTTPD_SERVER_ADDRESS="http://www.nuttx.org" CONFIG_THTTPD_SERVER_SOFTWARE="thttpd/2.25b 29dec2003-NuttX" CONFIG_THTTPD_PATH="/mnt/www" @@ -631,14 +631,14 @@ CONFIG_THTTPD_URLPATTERN=n # Additional settings for examples/thttpd # CONFIG_EXAMPLE_THTTPD_NOMAC=n -CONFIG_EXAMPLE_THTTPD_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_THTTPD_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_THTTPD_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_THTTPD_NETMASK=0xffffff00 # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -646,10 +646,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/nsh @@ -698,9 +698,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/ntosd-dm320/udp/defconfig b/nuttx/configs/ntosd-dm320/udp/defconfig index aceed47c4b..8939a27831 100644 --- a/nuttx/configs/ntosd-dm320/udp/defconfig +++ b/nuttx/configs/ntosd-dm320/udp/defconfig @@ -58,12 +58,12 @@ # used during interrupt handling. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM7TDMI=y -CONFIG_ARCH_CHIP=dm320 +CONFIG_ARCH_CHIP="dm320" CONFIG_ARCH_CHIP_DM320=y -CONFIG_ARCH_BOARD=ntosd-dm320 +CONFIG_ARCH_BOARD="ntosd-dm320" CONFIG_ARCH_BOARD_NTOSD_DM320=y CONFIG_ARCH_NTOSD_DEVBOARD=n CONFIG_BOARD_LOOPSPERMSEC=16945 @@ -499,9 +499,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -509,18 +509,18 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/udp CONFIG_EXAMPLE_UDP_SERVER=n -CONFIG_EXAMPLE_UDP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UDP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UDP_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_UDP_SERVERIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_UDP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UDP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UDP_NETMASK=0xffffff00 +CONFIG_EXAMPLE_UDP_SERVERIP=0x0a000001 # # Settings for examples/nsh @@ -530,9 +530,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # DM90x0 Driver Settings diff --git a/nuttx/configs/ntosd-dm320/uip/defconfig b/nuttx/configs/ntosd-dm320/uip/defconfig index 23d83b4260..362afc2f2b 100644 --- a/nuttx/configs/ntosd-dm320/uip/defconfig +++ b/nuttx/configs/ntosd-dm320/uip/defconfig @@ -58,12 +58,12 @@ # used during interrupt handling. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM7TDMI=y -CONFIG_ARCH_CHIP=dm320 +CONFIG_ARCH_CHIP="dm320" CONFIG_ARCH_CHIP_DM320=y -CONFIG_ARCH_BOARD=ntosd-dm320 +CONFIG_ARCH_BOARD="ntosd-dm320" CONFIG_ARCH_BOARD_NTOSD_DM320=y CONFIG_ARCH_NTOSD_DEVBOARD=n CONFIG_BOARD_LOOPSPERMSEC=16945 @@ -508,9 +508,9 @@ CONFIG_NETUTILS_HTTPD_DUMPPSTATE=n # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -518,10 +518,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/nsh @@ -531,9 +531,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # DM90x0 Driver Settings diff --git a/nuttx/configs/nucleus2g/nsh/defconfig b/nuttx/configs/nucleus2g/nsh/defconfig index 607eac73ca..5ecd0d0451 100755 --- a/nuttx/configs/nucleus2g/nsh/defconfig +++ b/nuttx/configs/nucleus2g/nsh/defconfig @@ -68,15 +68,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lpc17xx +CONFIG_ARCH_CHIP="lpc17xx" CONFIG_ARCH_CHIP_LPC1768=y -CONFIG_ARCH_BOARD=nucleus2g +CONFIG_ARCH_BOARD="nucleus2g" CONFIG_ARCH_BOARD_NUCLEUS2G=y CONFIG_BOARD_LOOPSPERMSEC=7982 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0x10000000 CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n @@ -314,7 +314,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -347,7 +347,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -726,9 +726,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -749,10 +749,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -807,9 +807,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/nucleus2g/ostest/defconfig b/nuttx/configs/nucleus2g/ostest/defconfig index 3363ffbc1c..465b207d71 100755 --- a/nuttx/configs/nucleus2g/ostest/defconfig +++ b/nuttx/configs/nucleus2g/ostest/defconfig @@ -68,15 +68,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lpc17xx +CONFIG_ARCH_CHIP="lpc17xx" CONFIG_ARCH_CHIP_LPC1768=y -CONFIG_ARCH_BOARD=nucleus2g +CONFIG_ARCH_BOARD="nucleus2g" CONFIG_ARCH_BOARD_NUCLEUS2G=y CONFIG_BOARD_LOOPSPERMSEC=7982 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0x10000000 CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n @@ -311,7 +311,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -343,7 +343,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -674,9 +674,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -684,10 +684,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -742,9 +742,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/nucleus2g/usbserial/defconfig b/nuttx/configs/nucleus2g/usbserial/defconfig index 01a8bd970d..8183198f6c 100755 --- a/nuttx/configs/nucleus2g/usbserial/defconfig +++ b/nuttx/configs/nucleus2g/usbserial/defconfig @@ -68,15 +68,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lpc17xx +CONFIG_ARCH_CHIP="lpc17xx" CONFIG_ARCH_CHIP_LPC1768=y -CONFIG_ARCH_BOARD=nucleus2g +CONFIG_ARCH_BOARD="nucleus2g" CONFIG_ARCH_BOARD_NUCLEUS2G=y CONFIG_BOARD_LOOPSPERMSEC=7982 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0x10000000 CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n @@ -311,7 +311,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -344,7 +344,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -675,9 +675,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -685,10 +685,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -743,9 +743,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/nucleus2g/usbstorage/defconfig b/nuttx/configs/nucleus2g/usbstorage/defconfig index bc29d45cc1..be4fcb8353 100755 --- a/nuttx/configs/nucleus2g/usbstorage/defconfig +++ b/nuttx/configs/nucleus2g/usbstorage/defconfig @@ -68,15 +68,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lpc17xx +CONFIG_ARCH_CHIP="lpc17xx" CONFIG_ARCH_CHIP_LPC1768=y -CONFIG_ARCH_BOARD=nucleus2g +CONFIG_ARCH_BOARD="nucleus2g" CONFIG_ARCH_BOARD_NUCLEUS2G=y CONFIG_BOARD_LOOPSPERMSEC=7982 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0x10000000 CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n @@ -311,7 +311,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -344,7 +344,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -675,9 +675,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -685,10 +685,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -743,9 +743,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig b/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig index 40c98ed970..e74769243d 100755 --- a/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig @@ -68,15 +68,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lpc17xx +CONFIG_ARCH_CHIP="lpc17xx" CONFIG_ARCH_CHIP_LPC1766=y -CONFIG_ARCH_BOARD=olimex-lpc1766stk +CONFIG_ARCH_BOARD="olimex-lpc1766stk" CONFIG_ARCH_BOARD_LPC1766STK=y CONFIG_BOARD_LOOPSPERMSEC=8111 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0x10000000 CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n @@ -321,7 +321,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -355,7 +355,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -851,7 +851,7 @@ CONFIG_USBMSC_REMOVABLE=y # and verify referrers. # CONFIG_THTTPD_PORT=80 -CONFIG_THTTPD_IPADDR=(10<<24|0<<16|0<<8|2) +CONFIG_THTTPD_IPADDR=0x0a000002 CONFIG_THTTPD_SERVER_ADDRESS="http://www.nuttx.org" CONFIG_THTTPD_SERVER_SOFTWARE="thttpd/2.25b 29dec2003-NuttX" CONFIG_THTTPD_PATH="/mnt/www" @@ -879,15 +879,15 @@ CONFIG_THTTPD_URLPATTERN=n # Additional settings for examples/thttpd # CONFIG_EXAMPLE_THTTPD_NOMAC=y -CONFIG_EXAMPLE_THTTPD_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_THTTPD_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_THTTPD_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_THTTPD_NETMASK=0xffffff00 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -908,10 +908,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -989,9 +989,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig b/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig index bc773c2d65..b2902da09b 100755 --- a/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig @@ -68,15 +68,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lpc17xx +CONFIG_ARCH_CHIP="lpc17xx" CONFIG_ARCH_CHIP_LPC1766=y -CONFIG_ARCH_BOARD=olimex-lpc1766stk +CONFIG_ARCH_BOARD="olimex-lpc1766stk" CONFIG_ARCH_BOARD_LPC1766STK=y CONFIG_BOARD_LOOPSPERMSEC=8111 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0x10000000 CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n @@ -324,7 +324,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -357,7 +357,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -778,9 +778,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -801,10 +801,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -881,9 +881,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/olimex-lpc1766stk/nettest/defconfig b/nuttx/configs/olimex-lpc1766stk/nettest/defconfig index f7c971d9f2..f19033a8f2 100755 --- a/nuttx/configs/olimex-lpc1766stk/nettest/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/nettest/defconfig @@ -68,15 +68,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lpc17xx +CONFIG_ARCH_CHIP="lpc17xx" CONFIG_ARCH_CHIP_LPC1766=y -CONFIG_ARCH_BOARD=olimex-lpc1766stk +CONFIG_ARCH_BOARD="olimex-lpc1766stk" CONFIG_ARCH_BOARD_LPC1766STK=y CONFIG_BOARD_LOOPSPERMSEC=8111 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0x10000000 CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n @@ -324,7 +324,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -357,7 +357,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -731,9 +731,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -754,10 +754,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -834,9 +834,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig index 90b4af8cd2..9b19e5efb6 100755 --- a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig @@ -68,15 +68,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lpc17xx +CONFIG_ARCH_CHIP="lpc17xx" CONFIG_ARCH_CHIP_LPC1766=y -CONFIG_ARCH_BOARD=olimex-lpc1766stk +CONFIG_ARCH_BOARD="olimex-lpc1766stk" CONFIG_ARCH_BOARD_LPC1766STK=y CONFIG_BOARD_LOOPSPERMSEC=8111 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0x10000000 CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n @@ -321,7 +321,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -358,7 +358,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -823,9 +823,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -846,10 +846,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -930,9 +930,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/olimex-lpc1766stk/nx/defconfig b/nuttx/configs/olimex-lpc1766stk/nx/defconfig index 5a5525c7f4..2d0fdb6bca 100755 --- a/nuttx/configs/olimex-lpc1766stk/nx/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/nx/defconfig @@ -68,15 +68,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lpc17xx +CONFIG_ARCH_CHIP="lpc17xx" CONFIG_ARCH_CHIP_LPC1766=y -CONFIG_ARCH_BOARD=olimex-lpc1766stk +CONFIG_ARCH_BOARD="olimex-lpc1766stk" CONFIG_ARCH_BOARD_LPC1766STK=y CONFIG_BOARD_LOOPSPERMSEC=8111 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0x10000000 CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n @@ -323,7 +323,7 @@ CONFIG_SPI_CMDDATA=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -361,7 +361,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -887,9 +887,9 @@ CONFIG_LCD_MAXPOWER=127 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -910,10 +910,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -990,9 +990,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/olimex-lpc1766stk/ostest/defconfig b/nuttx/configs/olimex-lpc1766stk/ostest/defconfig index c44d800e17..e4351bdb41 100755 --- a/nuttx/configs/olimex-lpc1766stk/ostest/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/ostest/defconfig @@ -68,15 +68,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lpc17xx +CONFIG_ARCH_CHIP="lpc17xx" CONFIG_ARCH_CHIP_LPC1766=y -CONFIG_ARCH_BOARD=olimex-lpc1766stk +CONFIG_ARCH_BOARD="olimex-lpc1766stk" CONFIG_ARCH_BOARD_LPC1766STK=y CONFIG_BOARD_LOOPSPERMSEC=8111 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0x10000000 CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n @@ -318,7 +318,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -350,7 +350,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -722,9 +722,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -746,10 +746,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -826,9 +826,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig b/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig index dcde1987e2..2a206daa17 100755 --- a/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig @@ -68,15 +68,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lpc17xx +CONFIG_ARCH_CHIP="lpc17xx" CONFIG_ARCH_CHIP_LPC1766=y -CONFIG_ARCH_BOARD=olimex-lpc1766stk +CONFIG_ARCH_BOARD="olimex-lpc1766stk" CONFIG_ARCH_BOARD_LPC1766STK=y CONFIG_BOARD_LOOPSPERMSEC=8111 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0x10000000 CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n @@ -320,7 +320,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -352,7 +352,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=2048 CONFIG_SIG_SIGWORK=4 @@ -804,7 +804,7 @@ CONFIG_USBMSC_REMOVABLE=y # and verify referrers. # CONFIG_THTTPD_PORT=80 -CONFIG_THTTPD_IPADDR=(10<<24|0<<16|0<<8|2) +CONFIG_THTTPD_IPADDR=0x0a000002 CONFIG_THTTPD_SERVER_ADDRESS="http://www.nuttx.org" CONFIG_THTTPD_SERVER_SOFTWARE="thttpd/2.25b 29dec2003-NuttX" CONFIG_THTTPD_PATH="/mnt/www" @@ -832,15 +832,15 @@ CONFIG_THTTPD_URLPATTERN=n # Additional settings for examples/thttpd # CONFIG_EXAMPLE_THTTPD_NOMAC=y -CONFIG_EXAMPLE_THTTPD_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_THTTPD_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_THTTPD_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_THTTPD_NETMASK=0xffffff00 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -861,10 +861,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -941,9 +941,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig b/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig index eadb386299..9d50689222 100755 --- a/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig @@ -68,15 +68,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lpc17xx +CONFIG_ARCH_CHIP="lpc17xx" CONFIG_ARCH_CHIP_LPC1766=y -CONFIG_ARCH_BOARD=olimex-lpc1766stk +CONFIG_ARCH_BOARD="olimex-lpc1766stk" CONFIG_ARCH_BOARD_LPC1766STK=y CONFIG_BOARD_LOOPSPERMSEC=8111 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0x10000000 CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n @@ -318,7 +318,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -350,7 +350,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -796,7 +796,7 @@ CONFIG_USBMSC_REMOVABLE=y # and verify referrers. # CONFIG_THTTPD_PORT=80 -CONFIG_THTTPD_IPADDR=(10<<24|0<<16|0<<8|2) +CONFIG_THTTPD_IPADDR=0x0a000002 CONFIG_THTTPD_SERVER_ADDRESS="http://www.nuttx.org" CONFIG_THTTPD_SERVER_SOFTWARE="thttpd/2.25b 29dec2003-NuttX" CONFIG_THTTPD_PATH="/mnt/www" @@ -824,15 +824,15 @@ CONFIG_THTTPD_URLPATTERN=n # Additional settings for examples/thttpd # CONFIG_EXAMPLE_THTTPD_NOMAC=y -CONFIG_EXAMPLE_THTTPD_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_THTTPD_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_THTTPD_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_THTTPD_NETMASK=0xffffff00 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -853,10 +853,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -933,9 +933,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig b/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig index 5adb89207f..d6f64bc1c5 100755 --- a/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig @@ -68,15 +68,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lpc17xx +CONFIG_ARCH_CHIP="lpc17xx" CONFIG_ARCH_CHIP_LPC1766=y -CONFIG_ARCH_BOARD=olimex-lpc1766stk +CONFIG_ARCH_BOARD="olimex-lpc1766stk" CONFIG_ARCH_BOARD_LPC1766STK=y CONFIG_BOARD_LOOPSPERMSEC=8111 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0x10000000 CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n @@ -318,7 +318,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -351,7 +351,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -723,9 +723,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -746,10 +746,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -826,9 +826,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig b/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig index ac2a4a3844..e2e28fddc1 100755 --- a/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig @@ -68,15 +68,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lpc17xx +CONFIG_ARCH_CHIP="lpc17xx" CONFIG_ARCH_CHIP_LPC1766=y -CONFIG_ARCH_BOARD=olimex-lpc1766stk +CONFIG_ARCH_BOARD="olimex-lpc1766stk" CONFIG_ARCH_BOARD_LPC1766STK=y CONFIG_BOARD_LOOPSPERMSEC=8111 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0x10000000 CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n @@ -318,7 +318,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -351,7 +351,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -723,9 +723,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -746,10 +746,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -826,9 +826,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/olimex-lpc1766stk/wlan/defconfig b/nuttx/configs/olimex-lpc1766stk/wlan/defconfig index d0f80b550a..c5bd22c75c 100755 --- a/nuttx/configs/olimex-lpc1766stk/wlan/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/wlan/defconfig @@ -68,15 +68,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=lpc17xx +CONFIG_ARCH_CHIP="lpc17xx" CONFIG_ARCH_CHIP_LPC1766=y -CONFIG_ARCH_BOARD=olimex-lpc1766stk +CONFIG_ARCH_BOARD="olimex-lpc1766stk" CONFIG_ARCH_BOARD_LPC1766STK=y CONFIG_BOARD_LOOPSPERMSEC=8111 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0x10000000 CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_INTERRUPTSTACK=n @@ -317,7 +317,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -351,7 +351,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -776,9 +776,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -799,19 +799,19 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for apps/examples/wlan # CONFIG_EXAMPLE_WLAN_DHCPC=n CONFIG_EXAMPLE_WLAN_NOMAC=n -CONFIG_EXAMPLE_WLAN_IPADDR=(192<<24|168<<16|0<<8|201) -CONFIG_EXAMPLE_WLAN_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_WLAN_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_WLAN_IPADDR=0xc0a800c9 +CONFIG_EXAMPLE_WLAN_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_WLAN_NETMASK=0xffffff00 # # Settings for examples/ostest @@ -866,9 +866,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/olimex-lpc2378/nsh/defconfig b/nuttx/configs/olimex-lpc2378/nsh/defconfig index b029dbc757..7f8b68369b 100755 --- a/nuttx/configs/olimex-lpc2378/nsh/defconfig +++ b/nuttx/configs/olimex-lpc2378/nsh/defconfig @@ -66,12 +66,12 @@ # used during interrupt handling. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM7TDMI=y -CONFIG_ARCH_CHIP=lpc2378 +CONFIG_ARCH_CHIP="lpc2378" CONFIG_ARCH_CHIP_LPC2378=y -CONFIG_ARCH_BOARD=olimex-lpc2378 +CONFIG_ARCH_BOARD="olimex-lpc2378" CONFIG_ARCH_BOARD_OLIMEXLPC2378=y CONFIG_ARCH_IRQPRIO=y CONFIG_BOARD_LOOPSPERMSEC=3270 @@ -394,9 +394,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/olimex-lpc2378/ostest/defconfig b/nuttx/configs/olimex-lpc2378/ostest/defconfig index f971212b5a..afc46eaab6 100755 --- a/nuttx/configs/olimex-lpc2378/ostest/defconfig +++ b/nuttx/configs/olimex-lpc2378/ostest/defconfig @@ -66,12 +66,12 @@ # used during interrupt handling. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM7TDMI=y -CONFIG_ARCH_CHIP=lpc2378 +CONFIG_ARCH_CHIP="lpc2378" CONFIG_ARCH_CHIP_LPC2378=y -CONFIG_ARCH_BOARD=olimex-lpc2378 +CONFIG_ARCH_BOARD="olimex-lpc2378" CONFIG_ARCH_BOARD_OLIMEXLPC2378=y CONFIG_ARCH_IRQPRIO=y CONFIG_BOARD_LOOPSPERMSEC=3270 @@ -394,9 +394,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/olimex-stm32-p107/nsh/defconfig b/nuttx/configs/olimex-stm32-p107/nsh/defconfig index e89cda44df..f12b7e560c 100644 --- a/nuttx/configs/olimex-stm32-p107/nsh/defconfig +++ b/nuttx/configs/olimex-stm32-p107/nsh/defconfig @@ -69,12 +69,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F107VC=y -CONFIG_ARCH_BOARD=olimex-stm32-p107 +CONFIG_ARCH_BOARD="olimex-stm32-p107" CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 @@ -374,7 +374,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -410,7 +410,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -841,9 +841,9 @@ CONFIG_WATCHDOG=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -851,10 +851,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -913,9 +913,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(192<<24|168<<16|2<<8|50) -CONFIG_NSH_DRIPADDR=(192<<24|168<<16|2<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0xc0a80232 +CONFIG_NSH_DRIPADDR=0xc0a80201 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/olimex-stm32-p107/ostest/defconfig b/nuttx/configs/olimex-stm32-p107/ostest/defconfig index 246f35665f..194e61e3ac 100644 --- a/nuttx/configs/olimex-stm32-p107/ostest/defconfig +++ b/nuttx/configs/olimex-stm32-p107/ostest/defconfig @@ -69,12 +69,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F107VC=y -CONFIG_ARCH_BOARD=olimex-stm32-p107 +CONFIG_ARCH_BOARD="olimex-stm32-p107" CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 @@ -403,7 +403,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -437,7 +437,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -799,9 +799,9 @@ CONFIG_WATCHDOG=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -809,10 +809,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -867,9 +867,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/olimex-strp711/nettest/defconfig b/nuttx/configs/olimex-strp711/nettest/defconfig index 6af2cb17ad..d89b03815a 100755 --- a/nuttx/configs/olimex-strp711/nettest/defconfig +++ b/nuttx/configs/olimex-strp711/nettest/defconfig @@ -65,12 +65,12 @@ # used during interrupt handling. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM7TDMI=y -CONFIG_ARCH_CHIP=str71x +CONFIG_ARCH_CHIP="str71x" CONFIG_ARCH_CHIP_STR71X=y -CONFIG_ARCH_BOARD=olimex-strp711 +CONFIG_ARCH_BOARD="olimex-strp711" CONFIG_ARCH_BOARD_OLIMEX_STRP711=y CONFIG_ARCH_NOINTC=n CONFIG_ARCH_IRQPRIO=y @@ -282,7 +282,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -314,7 +314,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -646,10 +646,10 @@ CONFIG_USBMSC_REMOVABLE=y CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -703,9 +703,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/olimex-strp711/nsh/defconfig b/nuttx/configs/olimex-strp711/nsh/defconfig index 85b4c503af..5a332d6152 100644 --- a/nuttx/configs/olimex-strp711/nsh/defconfig +++ b/nuttx/configs/olimex-strp711/nsh/defconfig @@ -65,12 +65,12 @@ # used during interrupt handling. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM7TDMI=y -CONFIG_ARCH_CHIP=str71x +CONFIG_ARCH_CHIP="str71x" CONFIG_ARCH_CHIP_STR71X=y -CONFIG_ARCH_BOARD=olimex-strp711 +CONFIG_ARCH_BOARD="olimex-strp711" CONFIG_ARCH_BOARD_OLIMEX_STRP711=y CONFIG_ARCH_NOINTC=n CONFIG_ARCH_IRQPRIO=y @@ -637,9 +637,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/olimex-strp711/ostest/defconfig b/nuttx/configs/olimex-strp711/ostest/defconfig index 250a68ad2f..ce86bcceaf 100644 --- a/nuttx/configs/olimex-strp711/ostest/defconfig +++ b/nuttx/configs/olimex-strp711/ostest/defconfig @@ -65,12 +65,12 @@ # used during interrupt handling. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM7TDMI=y -CONFIG_ARCH_CHIP=str71x +CONFIG_ARCH_CHIP="str71x" CONFIG_ARCH_CHIP_STR71X=y -CONFIG_ARCH_BOARD=olimex-strp711 +CONFIG_ARCH_BOARD="olimex-strp711" CONFIG_ARCH_BOARD_OLIMEX_STRP711=y CONFIG_ARCH_NOINTC=n CONFIG_ARCH_IRQPRIO=y @@ -638,9 +638,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/pcblogic-pic32mx/nsh/defconfig b/nuttx/configs/pcblogic-pic32mx/nsh/defconfig index e5f0a29096..754b621deb 100644 --- a/nuttx/configs/pcblogic-pic32mx/nsh/defconfig +++ b/nuttx/configs/pcblogic-pic32mx/nsh/defconfig @@ -81,15 +81,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=mips +CONFIG_ARCH="mips" CONFIG_ARCH_MIPS=y CONFIG_ARCH_MIPS32=y -CONFIG_ARCH_CHIP=pic32mx +CONFIG_ARCH_CHIP="pic32mx" CONFIG_ARCH_CHIP_PIC32MX460F512L=y -CONFIG_ARCH_BOARD=pcblogic-pic32mx +CONFIG_ARCH_BOARD="pcblogic-pic32mx" CONFIG_ARCH_BOARD_PCBLOGICPIC32MX=y CONFIG_BOARD_LOOPSPERMSEC=8079 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0xa0000000 CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y @@ -332,7 +332,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -368,7 +368,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -745,9 +745,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -769,10 +769,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -831,9 +831,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/pcblogic-pic32mx/ostest/defconfig b/nuttx/configs/pcblogic-pic32mx/ostest/defconfig index 802ab48ccf..42594155ff 100644 --- a/nuttx/configs/pcblogic-pic32mx/ostest/defconfig +++ b/nuttx/configs/pcblogic-pic32mx/ostest/defconfig @@ -81,15 +81,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=mips +CONFIG_ARCH="mips" CONFIG_ARCH_MIPS=y CONFIG_ARCH_MIPS32=y -CONFIG_ARCH_CHIP=pic32mx +CONFIG_ARCH_CHIP="pic32mx" CONFIG_ARCH_CHIP_PIC32MX460F512L=y -CONFIG_ARCH_BOARD=pcblogic-pic32mx +CONFIG_ARCH_BOARD="pcblogic-pic32mx" CONFIG_ARCH_BOARD_PCBLOGICPIC32MX=y CONFIG_BOARD_LOOPSPERMSEC=8079 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0xa0000000 CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y @@ -328,7 +328,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -360,7 +360,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -686,9 +686,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -710,10 +710,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -768,9 +768,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/pic32-starterkit/nsh/defconfig b/nuttx/configs/pic32-starterkit/nsh/defconfig index bdfeb770d9..ff7c056edc 100644 --- a/nuttx/configs/pic32-starterkit/nsh/defconfig +++ b/nuttx/configs/pic32-starterkit/nsh/defconfig @@ -80,15 +80,15 @@ # serves no purpose other than it allows you to calibrate # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=mips +CONFIG_ARCH="mips" CONFIG_ARCH_MIPS=y CONFIG_ARCH_MIPS32=y -CONFIG_ARCH_CHIP=pic32mx +CONFIG_ARCH_CHIP="pic32mx" CONFIG_ARCH_CHIP_PIC32MX795F512L=y -CONFIG_ARCH_BOARD=pic32-starterkit +CONFIG_ARCH_BOARD="pic32-starterkit" CONFIG_ARCH_BOARD_PIC32_STARTERKIT=y CONFIG_BOARD_LOOPSPERMSEC=7245 -CONFIG_DRAM_SIZE=(128*1024) +CONFIG_DRAM_SIZE=131072 CONFIG_DRAM_START=0xa0000000 CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y @@ -424,7 +424,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -464,7 +464,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=192 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -1147,9 +1147,9 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -1171,10 +1171,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -1233,9 +1233,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/pic32-starterkit/nsh2/defconfig b/nuttx/configs/pic32-starterkit/nsh2/defconfig index f3e754b7e4..8b620d6ffa 100644 --- a/nuttx/configs/pic32-starterkit/nsh2/defconfig +++ b/nuttx/configs/pic32-starterkit/nsh2/defconfig @@ -80,15 +80,15 @@ # serves no purpose other than it allows you to calibrate # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=mips +CONFIG_ARCH="mips" CONFIG_ARCH_MIPS=y CONFIG_ARCH_MIPS32=y -CONFIG_ARCH_CHIP=pic32mx +CONFIG_ARCH_CHIP="pic32mx" CONFIG_ARCH_CHIP_PIC32MX795F512L=y -CONFIG_ARCH_BOARD=pic32-starterkit +CONFIG_ARCH_BOARD="pic32-starterkit" CONFIG_ARCH_BOARD_PIC32_STARTERKIT=y CONFIG_BOARD_LOOPSPERMSEC=7245 -CONFIG_DRAM_SIZE=(128*1024) +CONFIG_DRAM_SIZE=131072 CONFIG_DRAM_START=0xa0000000 CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y @@ -424,7 +424,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -464,7 +464,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=192 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -1147,9 +1147,9 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -1171,10 +1171,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -1233,9 +1233,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/pic32-starterkit/ostest/defconfig b/nuttx/configs/pic32-starterkit/ostest/defconfig index 4f5c9d005a..0600860e83 100644 --- a/nuttx/configs/pic32-starterkit/ostest/defconfig +++ b/nuttx/configs/pic32-starterkit/ostest/defconfig @@ -80,15 +80,15 @@ # serves no purpose other than it allows you to calibrate # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=mips +CONFIG_ARCH="mips" CONFIG_ARCH_MIPS=y CONFIG_ARCH_MIPS32=y -CONFIG_ARCH_CHIP=pic32mx +CONFIG_ARCH_CHIP="pic32mx" CONFIG_ARCH_CHIP_PIC32MX795F512L=y -CONFIG_ARCH_BOARD=pic32-starterkit +CONFIG_ARCH_BOARD="pic32-starterkit" CONFIG_ARCH_BOARD_PIC32_STARTERKIT=y CONFIG_BOARD_LOOPSPERMSEC=7245 -CONFIG_DRAM_SIZE=(128*1024) +CONFIG_DRAM_SIZE=131072 CONFIG_DRAM_START=0xa0000000 CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y @@ -424,7 +424,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -462,7 +462,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=192 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=n @@ -1149,9 +1149,9 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -1173,10 +1173,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -1235,9 +1235,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/pic32mx7mmb/nsh/defconfig b/nuttx/configs/pic32mx7mmb/nsh/defconfig index 412e0a2dff..a52fca9870 100644 --- a/nuttx/configs/pic32mx7mmb/nsh/defconfig +++ b/nuttx/configs/pic32mx7mmb/nsh/defconfig @@ -80,15 +80,15 @@ # serves no purpose other than it allows you to calibrate # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=mips +CONFIG_ARCH="mips" CONFIG_ARCH_MIPS=y CONFIG_ARCH_MIPS32=y -CONFIG_ARCH_CHIP=pic32mx +CONFIG_ARCH_CHIP="pic32mx" CONFIG_ARCH_CHIP_PIC32MX795F512L=y -CONFIG_ARCH_BOARD=pic32mx7mmb +CONFIG_ARCH_BOARD="pic32mx7mmb" CONFIG_ARCH_BOARD_PIC32MX7MMB=y CONFIG_BOARD_LOOPSPERMSEC=7245 -CONFIG_DRAM_SIZE=(128*1024) +CONFIG_DRAM_SIZE=131072 CONFIG_DRAM_START=0xa0000000 CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y @@ -424,7 +424,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -470,7 +470,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=192 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=2048 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -1246,9 +1246,9 @@ CONFIG_LCD_RPORTRAIT=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -1270,10 +1270,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -1335,9 +1335,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/pic32mx7mmb/ostest/defconfig b/nuttx/configs/pic32mx7mmb/ostest/defconfig index 691dbab8e8..33ac1dbeab 100644 --- a/nuttx/configs/pic32mx7mmb/ostest/defconfig +++ b/nuttx/configs/pic32mx7mmb/ostest/defconfig @@ -80,15 +80,15 @@ # serves no purpose other than it allows you to calibrate # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=mips +CONFIG_ARCH="mips" CONFIG_ARCH_MIPS=y CONFIG_ARCH_MIPS32=y -CONFIG_ARCH_CHIP=pic32mx +CONFIG_ARCH_CHIP="pic32mx" CONFIG_ARCH_CHIP_PIC32MX795F512L=y -CONFIG_ARCH_BOARD=pic32mx7mmb +CONFIG_ARCH_BOARD="pic32mx7mmb" CONFIG_ARCH_BOARD_PIC32MX7MMB=y CONFIG_BOARD_LOOPSPERMSEC=7245 -CONFIG_DRAM_SIZE=(128*1024) +CONFIG_DRAM_SIZE=131072 CONFIG_DRAM_START=0xa0000000 CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y @@ -424,7 +424,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -462,7 +462,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=192 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=n @@ -1149,9 +1149,9 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -1173,10 +1173,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -1235,9 +1235,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/pjrc-8051/defconfig b/nuttx/configs/pjrc-8051/defconfig index 62dd5a6b1f..b987080fc8 100644 --- a/nuttx/configs/pjrc-8051/defconfig +++ b/nuttx/configs/pjrc-8051/defconfig @@ -44,11 +44,11 @@ # CONFIG_ARCH_BOARD_name - for use in C code # CONFIG_ENDIAN_BIG - define if big endian (default is little endian) # -CONFIG_ARCH=8051 +CONFIG_ARCH="8051" CONFIG_ARCH_8051=y CONFIG_ARCH_CHIP_8051=n CONFIG_ARCH_CHIP_8052=y -CONFIG_ARCH_BOARD=pjrc-8051 +CONFIG_ARCH_BOARD="pjrc-8051" CONFIG_ARCH_BOARD_PJRC_87C52=y # @@ -348,9 +348,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/qemu-i486/nsh/defconfig b/nuttx/configs/qemu-i486/nsh/defconfig index 9b9f1a3f26..b3f54ae5f6 100644 --- a/nuttx/configs/qemu-i486/nsh/defconfig +++ b/nuttx/configs/qemu-i486/nsh/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=x86 +CONFIG_ARCH="x86" CONFIG_ARCH_X86=y CONFIG_ARCH_I486=y -CONFIG_ARCH_CHIP=qemu +CONFIG_ARCH_CHIP="qemu" CONFIG_ARCH_CHIP_QEMU=y -CONFIG_ARCH_BOARD=qemu-i486 +CONFIG_ARCH_BOARD="qemu-i486" CONFIG_ARCH_BOARD_QEMU_I486=y CONFIG_BOARD_LOOPSPERMSEC=999 CONFIG_DRAM_SIZE=0x00100000 @@ -422,9 +422,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_UIP_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -432,10 +432,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(192<<24|168<<16|0<<8|106) +CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a # # Settings for examples/ostest @@ -488,9 +488,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/qemu-i486/ostest/defconfig b/nuttx/configs/qemu-i486/ostest/defconfig index 3bdef6c958..92a980be04 100644 --- a/nuttx/configs/qemu-i486/ostest/defconfig +++ b/nuttx/configs/qemu-i486/ostest/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=x86 +CONFIG_ARCH="x86" CONFIG_ARCH_X86=y CONFIG_ARCH_I486=y -CONFIG_ARCH_CHIP=qemu +CONFIG_ARCH_CHIP="qemu" CONFIG_ARCH_CHIP_QEMU=y -CONFIG_ARCH_BOARD=qemu-i486 +CONFIG_ARCH_BOARD="qemu-i486" CONFIG_ARCH_BOARD_QEMU_I486=y CONFIG_BOARD_LOOPSPERMSEC=999 CONFIG_DRAM_SIZE=0x00100000 @@ -338,9 +338,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_UIP_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -348,10 +348,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(192<<24|168<<16|0<<8|106) +CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a # # Settings for examples/ostest @@ -366,9 +366,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/rgmp/arm/default/defconfig b/nuttx/configs/rgmp/arm/default/defconfig index 11819ec2fa..2966ca8300 100644 --- a/nuttx/configs/rgmp/arm/default/defconfig +++ b/nuttx/configs/rgmp/arm/default/defconfig @@ -46,9 +46,9 @@ # CONFIG_ARCH_BOARD_name - for use in C code # CONFIG_ENDIAN_BIG - define if big endian (default is little endian) # -CONFIG_ARCH=rgmp +CONFIG_ARCH="rgmp" CONFIG_ARCH_RGMP=y -CONFIG_ARCH_BOARD=rgmp +CONFIG_ARCH_BOARD="rgmp" CONFIG_ARCH_BOARD_RGMP=y # @@ -324,9 +324,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(192<<24|168<<16|10<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(192<<24|168<<16|10<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80a02 +CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80a01 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -334,10 +334,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(192<<24|168<<16|0<<8|106) +CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a # # Settings for examples/nsh @@ -347,9 +347,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/rgmp/arm/nsh/defconfig b/nuttx/configs/rgmp/arm/nsh/defconfig index ec273ff19a..b4b96e5d7b 100644 --- a/nuttx/configs/rgmp/arm/nsh/defconfig +++ b/nuttx/configs/rgmp/arm/nsh/defconfig @@ -46,9 +46,9 @@ # CONFIG_ARCH_BOARD_name - for use in C code # CONFIG_ENDIAN_BIG - define if big endian (default is little endian) # -CONFIG_ARCH=rgmp +CONFIG_ARCH="rgmp" CONFIG_ARCH_RGMP=y -CONFIG_ARCH_BOARD=rgmp +CONFIG_ARCH_BOARD="rgmp" CONFIG_ARCH_BOARD_RGMP=y # @@ -324,9 +324,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_UIP_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -334,10 +334,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(192<<24|168<<16|0<<8|106) +CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a # # Settings for apps/nshlib @@ -376,9 +376,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(192<<24|168<<16|10<<8|2) -CONFIG_NSH_DRIPADDR=(192<<24|168<<16|10<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0xc0a80a02 +CONFIG_NSH_DRIPADDR=0xc0a80a01 +CONFIG_NSH_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/rgmp/x86/default/defconfig b/nuttx/configs/rgmp/x86/default/defconfig index d0fb56f5d5..0af87bb20e 100644 --- a/nuttx/configs/rgmp/x86/default/defconfig +++ b/nuttx/configs/rgmp/x86/default/defconfig @@ -46,9 +46,9 @@ # CONFIG_ARCH_BOARD_name - for use in C code # CONFIG_ENDIAN_BIG - define if big endian (default is little endian) # -CONFIG_ARCH=rgmp +CONFIG_ARCH="rgmp" CONFIG_ARCH_RGMP=y -CONFIG_ARCH_BOARD=rgmp +CONFIG_ARCH_BOARD="rgmp" CONFIG_ARCH_BOARD_RGMP=y # @@ -324,9 +324,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(192<<24|168<<16|10<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(192<<24|168<<16|10<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80a02 +CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80a01 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -334,10 +334,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(192<<24|168<<16|0<<8|106) +CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a # # Settings for examples/nsh @@ -347,9 +347,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/rgmp/x86/nsh/defconfig b/nuttx/configs/rgmp/x86/nsh/defconfig index fce0c7c751..d06c9e8f81 100644 --- a/nuttx/configs/rgmp/x86/nsh/defconfig +++ b/nuttx/configs/rgmp/x86/nsh/defconfig @@ -46,9 +46,9 @@ # CONFIG_ARCH_BOARD_name - for use in C code # CONFIG_ENDIAN_BIG - define if big endian (default is little endian) # -CONFIG_ARCH=rgmp +CONFIG_ARCH="rgmp" CONFIG_ARCH_RGMP=y -CONFIG_ARCH_BOARD=rgmp +CONFIG_ARCH_BOARD="rgmp" CONFIG_ARCH_BOARD_RGMP=y # @@ -324,9 +324,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_UIP_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -334,10 +334,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(192<<24|168<<16|0<<8|106) +CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a # # Settings for apps/nshlib @@ -376,9 +376,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(192<<24|168<<16|10<<8|2) -CONFIG_NSH_DRIPADDR=(192<<24|168<<16|10<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0xc0a80a02 +CONFIG_NSH_DRIPADDR=0xc0a80a01 +CONFIG_NSH_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/sam3u-ek/knsh/defconfig b/nuttx/configs/sam3u-ek/knsh/defconfig index 766eada4aa..9cfda50cc1 100755 --- a/nuttx/configs/sam3u-ek/knsh/defconfig +++ b/nuttx/configs/sam3u-ek/knsh/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=sam3u +CONFIG_ARCH_CHIP="sam3u" CONFIG_ARCH_CHIP_AT91SAM3U4E=y -CONFIG_ARCH_BOARD=sam3u-ek +CONFIG_ARCH_BOARD="sam3u-ek" CONFIG_ARCH_BOARD_SAM3UEK=y CONFIG_BOARD_LOOPSPERMSEC=4768 CONFIG_DRAM_SIZE=0x00008000 @@ -302,7 +302,7 @@ CONFIG_PASS1_OBJECT= # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -336,7 +336,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -745,9 +745,9 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -755,10 +755,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -813,9 +813,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/sam3u-ek/nsh/defconfig b/nuttx/configs/sam3u-ek/nsh/defconfig index 05c9f5ddd2..1b492d4592 100755 --- a/nuttx/configs/sam3u-ek/nsh/defconfig +++ b/nuttx/configs/sam3u-ek/nsh/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=sam3u +CONFIG_ARCH_CHIP="sam3u" CONFIG_ARCH_CHIP_AT91SAM3U4E=y -CONFIG_ARCH_BOARD=sam3u-ek +CONFIG_ARCH_BOARD="sam3u-ek" CONFIG_ARCH_BOARD_SAM3UEK=y CONFIG_BOARD_LOOPSPERMSEC=4768 CONFIG_DRAM_SIZE=0x00008000 @@ -284,7 +284,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -316,7 +316,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -715,9 +715,9 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -725,10 +725,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -783,9 +783,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/sam3u-ek/nx/defconfig b/nuttx/configs/sam3u-ek/nx/defconfig index 7d799b9ff5..76c7635b52 100755 --- a/nuttx/configs/sam3u-ek/nx/defconfig +++ b/nuttx/configs/sam3u-ek/nx/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=sam3u +CONFIG_ARCH_CHIP="sam3u" CONFIG_ARCH_CHIP_AT91SAM3U4E=y -CONFIG_ARCH_BOARD=sam3u-ek +CONFIG_ARCH_BOARD="sam3u-ek" CONFIG_ARCH_BOARD_SAM3UEK=y CONFIG_BOARD_LOOPSPERMSEC=4768 CONFIG_DRAM_SIZE=0x00008000 @@ -284,7 +284,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -317,7 +317,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -724,9 +724,9 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -734,10 +734,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -792,9 +792,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/sam3u-ek/ostest/defconfig b/nuttx/configs/sam3u-ek/ostest/defconfig index 832c96163f..68cfc8a592 100755 --- a/nuttx/configs/sam3u-ek/ostest/defconfig +++ b/nuttx/configs/sam3u-ek/ostest/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=sam3u +CONFIG_ARCH_CHIP="sam3u" CONFIG_ARCH_CHIP_AT91SAM3U4E=y -CONFIG_ARCH_BOARD=sam3u-ek +CONFIG_ARCH_BOARD="sam3u-ek" CONFIG_ARCH_BOARD_SAM3UEK=y CONFIG_BOARD_LOOPSPERMSEC=4768 CONFIG_DRAM_SIZE=0x00008000 @@ -285,7 +285,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -317,7 +317,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -713,9 +713,9 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -723,10 +723,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -781,9 +781,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/sam3u-ek/touchscreen/defconfig b/nuttx/configs/sam3u-ek/touchscreen/defconfig index 7e56a949ea..9469754479 100755 --- a/nuttx/configs/sam3u-ek/touchscreen/defconfig +++ b/nuttx/configs/sam3u-ek/touchscreen/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=sam3u +CONFIG_ARCH_CHIP="sam3u" CONFIG_ARCH_CHIP_AT91SAM3U4E=y -CONFIG_ARCH_BOARD=sam3u-ek +CONFIG_ARCH_BOARD="sam3u-ek" CONFIG_ARCH_BOARD_SAM3UEK=y CONFIG_BOARD_LOOPSPERMSEC=4768 CONFIG_DRAM_SIZE=0x00008000 @@ -288,7 +288,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -322,7 +322,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -768,9 +768,9 @@ CONFIG_LCD_PORTRAIT=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -778,10 +778,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -840,9 +840,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/sim/mount/defconfig b/nuttx/configs/sim/mount/defconfig index 529e5f9cf0..7073d8148f 100644 --- a/nuttx/configs/sim/mount/defconfig +++ b/nuttx/configs/sim/mount/defconfig @@ -44,9 +44,9 @@ # CONFIG_ARCH_BOARD_name - for use in C code # CONFIG_ENDIAN_BIG - define if big endian (default is little endian) # -CONFIG_ARCH=sim +CONFIG_ARCH="sim" CONFIG_ARCH_SIM=y -CONFIG_ARCH_BOARD=sim +CONFIG_ARCH_BOARD="sim" CONFIG_ARCH_BOARD_SIM=y # @@ -316,9 +316,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_UIP_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -326,10 +326,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(192<<24|168<<16|0<<8|106) +CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a # # Settings for examples/ostest @@ -344,9 +344,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # Settings for examples/mount diff --git a/nuttx/configs/sim/nettest/defconfig b/nuttx/configs/sim/nettest/defconfig index 61d44376f3..3dedd9a01c 100644 --- a/nuttx/configs/sim/nettest/defconfig +++ b/nuttx/configs/sim/nettest/defconfig @@ -44,9 +44,9 @@ # CONFIG_ARCH_BOARD_name - for use in C code # CONFIG_ENDIAN_BIG - define if big endian (default is little endian) # -CONFIG_ARCH=sim +CONFIG_ARCH="sim" CONFIG_ARCH_SIM=y -CONFIG_ARCH_BOARD=sim +CONFIG_ARCH_BOARD="sim" CONFIG_ARCH_BOARD_SIM=y # @@ -316,9 +316,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_UIP_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -326,10 +326,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(192<<24|168<<16|0<<8|106) +CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a # # Settings for examples/ostest @@ -344,9 +344,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # Settings for examples/mount diff --git a/nuttx/configs/sim/nsh/defconfig b/nuttx/configs/sim/nsh/defconfig index bf7646def3..3d3dc63142 100644 --- a/nuttx/configs/sim/nsh/defconfig +++ b/nuttx/configs/sim/nsh/defconfig @@ -44,9 +44,9 @@ # CONFIG_ARCH_BOARD_name - for use in C code # CONFIG_ENDIAN_BIG - define if big endian (default is little endian) # -CONFIG_ARCH=sim +CONFIG_ARCH="sim" CONFIG_ARCH_SIM=y -CONFIG_ARCH_BOARD=sim +CONFIG_ARCH_BOARD="sim" CONFIG_ARCH_BOARD_SIM=y # @@ -135,7 +135,7 @@ CONFIG_ARCH_BOARD_SIM=y # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -171,7 +171,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=192 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=n @@ -440,9 +440,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_UIP_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -450,10 +450,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(192<<24|168<<16|0<<8|106) +CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a # # Settings for examples/ostest @@ -502,9 +502,9 @@ CONFIG_NSH_TELNET=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=1 diff --git a/nuttx/configs/sim/nsh2/defconfig b/nuttx/configs/sim/nsh2/defconfig index 9d2e963c31..60f3b0d82b 100644 --- a/nuttx/configs/sim/nsh2/defconfig +++ b/nuttx/configs/sim/nsh2/defconfig @@ -44,9 +44,9 @@ # CONFIG_ARCH_BOARD_name - for use in C code # CONFIG_ENDIAN_BIG - define if big endian (default is little endian) # -CONFIG_ARCH=sim +CONFIG_ARCH="sim" CONFIG_ARCH_SIM=y -CONFIG_ARCH_BOARD=sim +CONFIG_ARCH_BOARD="sim" CONFIG_ARCH_BOARD_SIM=y # @@ -154,7 +154,7 @@ CONFIG_SIM_TOUCHSCREEN=y # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -191,7 +191,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SCHED_WAITPID=y CONFIG_SCHED_ATEXIT=n @@ -544,9 +544,9 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_UIP_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -555,10 +555,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(192<<24|168<<16|0<<8|106) +CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a # # Settings for examples/ostest @@ -616,9 +616,9 @@ CONFIG_NSH_TELNET=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=1 diff --git a/nuttx/configs/sim/nx/defconfig b/nuttx/configs/sim/nx/defconfig index 87b714a94d..ff4b231af2 100644 --- a/nuttx/configs/sim/nx/defconfig +++ b/nuttx/configs/sim/nx/defconfig @@ -44,9 +44,9 @@ # CONFIG_ARCH_BOARD_name - for use in C code # CONFIG_ENDIAN_BIG - define if big endian (default is little endian) # -CONFIG_ARCH=sim +CONFIG_ARCH="sim" CONFIG_ARCH_SIM=y -CONFIG_ARCH_BOARD=sim +CONFIG_ARCH_BOARD="sim" CONFIG_ARCH_BOARD_SIM=y # @@ -461,9 +461,9 @@ CONFIG_NXCONSOLE_MXCHARS=256 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_UIP_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -472,10 +472,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(192<<24|168<<16|0<<8|106) +CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a # # Settings for examples/ostest @@ -526,9 +526,9 @@ CONFIG_NSH_TELNET=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=1 diff --git a/nuttx/configs/sim/nx11/defconfig b/nuttx/configs/sim/nx11/defconfig index aa95af7f8d..bf167f6109 100644 --- a/nuttx/configs/sim/nx11/defconfig +++ b/nuttx/configs/sim/nx11/defconfig @@ -44,9 +44,9 @@ # CONFIG_ARCH_BOARD_name - for use in C code # CONFIG_ENDIAN_BIG - define if big endian (default is little endian) # -CONFIG_ARCH=sim +CONFIG_ARCH="sim" CONFIG_ARCH_SIM=y -CONFIG_ARCH_BOARD=sim +CONFIG_ARCH_BOARD="sim" CONFIG_ARCH_BOARD_SIM=y # @@ -468,9 +468,9 @@ CONFIG_NXCONSOLE_MXCHARS=256 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_UIP_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -479,10 +479,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(192<<24|168<<16|0<<8|106) +CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a # # Settings for examples/ostest @@ -533,9 +533,9 @@ CONFIG_NSH_TELNET=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=1 diff --git a/nuttx/configs/sim/nxffs/defconfig b/nuttx/configs/sim/nxffs/defconfig index 049ba42ba4..50362a8af4 100644 --- a/nuttx/configs/sim/nxffs/defconfig +++ b/nuttx/configs/sim/nxffs/defconfig @@ -44,9 +44,9 @@ # CONFIG_ARCH_BOARD_name - for use in C code # CONFIG_ENDIAN_BIG - define if big endian (default is little endian) # -CONFIG_ARCH=sim +CONFIG_ARCH="sim" CONFIG_ARCH_SIM=y -CONFIG_ARCH_BOARD=sim +CONFIG_ARCH_BOARD="sim" CONFIG_ARCH_BOARD_SIM=y # @@ -317,9 +317,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_UIP_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -327,10 +327,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(192<<24|168<<16|0<<8|106) +CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a # # Settings for examples/ostest @@ -346,9 +346,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # Various FS, NXFFS, RAMMTD and other settings needed for diff --git a/nuttx/configs/sim/nxwm/defconfig b/nuttx/configs/sim/nxwm/defconfig index 3daa60f668..603ec1a21c 100644 --- a/nuttx/configs/sim/nxwm/defconfig +++ b/nuttx/configs/sim/nxwm/defconfig @@ -44,9 +44,9 @@ # CONFIG_ARCH_BOARD_name - for use in C code # CONFIG_ENDIAN_BIG - define if big endian (default is little endian) # -CONFIG_ARCH=sim +CONFIG_ARCH="sim" CONFIG_ARCH_SIM=y -CONFIG_ARCH_BOARD=sim +CONFIG_ARCH_BOARD="sim" CONFIG_ARCH_BOARD_SIM=y # @@ -155,7 +155,7 @@ CONFIG_SIM_TOUCHSCREEN=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -192,7 +192,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=192 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=8192 CONFIG_SCHED_WAITPID=y CONFIG_SCHED_ATEXIT=n @@ -618,9 +618,9 @@ CONFIG_NXCONSOLE_MXCHARS=256 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_UIP_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -629,10 +629,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(192<<24|168<<16|0<<8|106) +CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a # # Settings for examples/ostest @@ -687,9 +687,9 @@ CONFIG_NSH_TELNET=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=1 diff --git a/nuttx/configs/sim/ostest/defconfig b/nuttx/configs/sim/ostest/defconfig index a0ea71557e..95798ced0e 100644 --- a/nuttx/configs/sim/ostest/defconfig +++ b/nuttx/configs/sim/ostest/defconfig @@ -44,9 +44,9 @@ # CONFIG_ARCH_BOARD_name - for use in C code # CONFIG_ENDIAN_BIG - define if big endian (default is little endian) # -CONFIG_ARCH=sim +CONFIG_ARCH="sim" CONFIG_ARCH_SIM=y -CONFIG_ARCH_BOARD=sim +CONFIG_ARCH_BOARD="sim" CONFIG_ARCH_BOARD_SIM=y # @@ -316,9 +316,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_UIP_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -326,10 +326,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(192<<24|168<<16|0<<8|106) +CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a # # Settings for examples/ostest @@ -344,9 +344,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/sim/pashello/defconfig b/nuttx/configs/sim/pashello/defconfig index ec0aa67eb3..40894c1d3d 100644 --- a/nuttx/configs/sim/pashello/defconfig +++ b/nuttx/configs/sim/pashello/defconfig @@ -44,9 +44,9 @@ # CONFIG_ARCH_BOARD_name - for use in C code # CONFIG_ENDIAN_BIG - define if big endian (default is little endian) # -CONFIG_ARCH=sim +CONFIG_ARCH="sim" CONFIG_ARCH_SIM=y -CONFIG_ARCH_BOARD=sim +CONFIG_ARCH_BOARD="sim" CONFIG_ARCH_BOARD_SIM=y # @@ -316,9 +316,9 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_UIP_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -326,10 +326,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(192<<24|168<<16|0<<8|106) +CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a # # Settings for examples/nsh @@ -339,9 +339,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/sim/touchscreen/defconfig b/nuttx/configs/sim/touchscreen/defconfig index 982bb29d14..707e9ff20b 100644 --- a/nuttx/configs/sim/touchscreen/defconfig +++ b/nuttx/configs/sim/touchscreen/defconfig @@ -44,9 +44,9 @@ # CONFIG_ARCH_BOARD_name - for use in C code # CONFIG_ENDIAN_BIG - define if big endian (default is little endian) # -CONFIG_ARCH=sim +CONFIG_ARCH="sim" CONFIG_ARCH_SIM=y -CONFIG_ARCH_BOARD=sim +CONFIG_ARCH_BOARD="sim" CONFIG_ARCH_BOARD_SIM=y # @@ -419,9 +419,9 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_UIP_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -429,10 +429,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(192<<24|168<<16|0<<8|128) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(192<<24|168<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(192<<24|168<<16|0<<8|106) +CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a # # Settings for examples/ostest @@ -481,9 +481,9 @@ CONFIG_NSH_TELNET=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=1 diff --git a/nuttx/configs/skp16c26/ostest/defconfig b/nuttx/configs/skp16c26/ostest/defconfig index f9fccf4bfe..a7013b672e 100644 --- a/nuttx/configs/skp16c26/ostest/defconfig +++ b/nuttx/configs/skp16c26/ostest/defconfig @@ -62,11 +62,11 @@ # CONFIG_ARCH_BUTTONS - Provide button APIs. Unique to skp16c26. # CONFIG_ARCH_LCD - Configure LCD. Unique to skp16c26. -CONFIG_ARCH=sh +CONFIG_ARCH="sh" CONFIG_ARCH_M16C=y -CONFIG_ARCH_CHIP=m16c +CONFIG_ARCH_CHIP="m16c" CONFIG_ARCH_CHIP_M30262F8=y -CONFIG_ARCH_BOARD=skp16c26 +CONFIG_ARCH_BOARD="skp16c26" CONFIG_ARCH_BOARD_SKP16C26=y CONFIG_ARCH_NOINTC=y CONFIG_ENDIAN_BIG=y @@ -493,9 +493,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -503,10 +503,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/nsh @@ -516,9 +516,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # DM90x0 Driver Settings diff --git a/nuttx/configs/stm3210e-eval/RIDE/defconfig b/nuttx/configs/stm3210e-eval/RIDE/defconfig index b7d628b502..abb5ee5d23 100755 --- a/nuttx/configs/stm3210e-eval/RIDE/defconfig +++ b/nuttx/configs/stm3210e-eval/RIDE/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F103ZET6=y -CONFIG_ARCH_BOARD=stm3210e-eval +CONFIG_ARCH_BOARD="stm3210e-eval" CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 @@ -341,7 +341,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -376,7 +376,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -738,9 +738,9 @@ CONFIG_WATCHDOG=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -748,10 +748,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -806,9 +806,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm3210e-eval/buttons/defconfig b/nuttx/configs/stm3210e-eval/buttons/defconfig index e1ea2cfc04..9f5d26b126 100644 --- a/nuttx/configs/stm3210e-eval/buttons/defconfig +++ b/nuttx/configs/stm3210e-eval/buttons/defconfig @@ -69,12 +69,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F103ZET6=y -CONFIG_ARCH_BOARD=stm3210e-eval +CONFIG_ARCH_BOARD="stm3210e-eval" CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 @@ -354,7 +354,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -388,7 +388,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -751,9 +751,9 @@ CONFIG_WATCHDOG=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -761,10 +761,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/buttons @@ -841,9 +841,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm3210e-eval/composite/defconfig b/nuttx/configs/stm3210e-eval/composite/defconfig index 62d9eb07f2..be80e7e67c 100755 --- a/nuttx/configs/stm3210e-eval/composite/defconfig +++ b/nuttx/configs/stm3210e-eval/composite/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F103ZET6=y -CONFIG_ARCH_BOARD=stm3210e-eval +CONFIG_ARCH_BOARD="stm3210e-eval" CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 @@ -347,7 +347,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -382,7 +382,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -900,9 +900,9 @@ CONFIG_COMPOSITE_VERSIONNO=0x0101 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -910,10 +910,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -975,9 +975,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm3210e-eval/nsh/defconfig b/nuttx/configs/stm3210e-eval/nsh/defconfig index c4245b133f..852c528930 100755 --- a/nuttx/configs/stm3210e-eval/nsh/defconfig +++ b/nuttx/configs/stm3210e-eval/nsh/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F103ZET6=y -CONFIG_ARCH_BOARD=stm3210e-eval +CONFIG_ARCH_BOARD="stm3210e-eval" CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 @@ -350,7 +350,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -384,7 +384,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -754,9 +754,9 @@ CONFIG_WATCHDOG=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -764,10 +764,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -826,9 +826,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm3210e-eval/nsh2/defconfig b/nuttx/configs/stm3210e-eval/nsh2/defconfig index 22afd76f91..d04bd814b6 100644 --- a/nuttx/configs/stm3210e-eval/nsh2/defconfig +++ b/nuttx/configs/stm3210e-eval/nsh2/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F103ZET6=y -CONFIG_ARCH_BOARD=stm3210e-eval +CONFIG_ARCH_BOARD="stm3210e-eval" CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 @@ -403,7 +403,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -443,7 +443,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -1124,9 +1124,9 @@ CONFIG_LCD_PWM=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -1134,10 +1134,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -1199,9 +1199,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm3210e-eval/nx/defconfig b/nuttx/configs/stm3210e-eval/nx/defconfig index a3514b096a..1f2453a4de 100644 --- a/nuttx/configs/stm3210e-eval/nx/defconfig +++ b/nuttx/configs/stm3210e-eval/nx/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F103ZET6=y -CONFIG_ARCH_BOARD=stm3210e-eval +CONFIG_ARCH_BOARD="stm3210e-eval" CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 @@ -347,7 +347,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -382,7 +382,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -974,9 +974,9 @@ CONFIG_LCD_PWM=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -984,10 +984,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -1045,9 +1045,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm3210e-eval/nxconsole/defconfig b/nuttx/configs/stm3210e-eval/nxconsole/defconfig index 261e09bb9e..73726999ac 100644 --- a/nuttx/configs/stm3210e-eval/nxconsole/defconfig +++ b/nuttx/configs/stm3210e-eval/nxconsole/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F103ZET6=y -CONFIG_ARCH_BOARD=stm3210e-eval +CONFIG_ARCH_BOARD="stm3210e-eval" CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 @@ -347,7 +347,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -382,7 +382,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -982,9 +982,9 @@ CONFIG_LCD_PWM=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -992,10 +992,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -1057,9 +1057,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm3210e-eval/nxlines/defconfig b/nuttx/configs/stm3210e-eval/nxlines/defconfig index 8e4ee57e73..ccb22ad5a9 100644 --- a/nuttx/configs/stm3210e-eval/nxlines/defconfig +++ b/nuttx/configs/stm3210e-eval/nxlines/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F103ZET6=y -CONFIG_ARCH_BOARD=stm3210e-eval +CONFIG_ARCH_BOARD="stm3210e-eval" CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 @@ -347,7 +347,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -382,7 +382,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -973,9 +973,9 @@ CONFIG_LCD_PWM=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -983,10 +983,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -1044,9 +1044,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm3210e-eval/nxtext/defconfig b/nuttx/configs/stm3210e-eval/nxtext/defconfig index b90364ec80..0b3289d94a 100644 --- a/nuttx/configs/stm3210e-eval/nxtext/defconfig +++ b/nuttx/configs/stm3210e-eval/nxtext/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F103ZET6=y -CONFIG_ARCH_BOARD=stm3210e-eval +CONFIG_ARCH_BOARD="stm3210e-eval" CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 @@ -347,7 +347,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -382,7 +382,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -973,9 +973,9 @@ CONFIG_LCD_PWM=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -983,10 +983,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -1044,9 +1044,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm3210e-eval/ostest/defconfig b/nuttx/configs/stm3210e-eval/ostest/defconfig index 9238a59a9c..df10dff3a8 100755 --- a/nuttx/configs/stm3210e-eval/ostest/defconfig +++ b/nuttx/configs/stm3210e-eval/ostest/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F103ZET6=y -CONFIG_ARCH_BOARD=stm3210e-eval +CONFIG_ARCH_BOARD="stm3210e-eval" CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 @@ -378,7 +378,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -412,7 +412,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -774,9 +774,9 @@ CONFIG_WATCHDOG=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -784,10 +784,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -842,9 +842,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm3210e-eval/pm/defconfig b/nuttx/configs/stm3210e-eval/pm/defconfig index f2b47598b4..8434abf1be 100644 --- a/nuttx/configs/stm3210e-eval/pm/defconfig +++ b/nuttx/configs/stm3210e-eval/pm/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F103ZET6=y -CONFIG_ARCH_BOARD=stm3210e-eval +CONFIG_ARCH_BOARD="stm3210e-eval" CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 @@ -413,7 +413,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -453,7 +453,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -1155,9 +1155,9 @@ CONFIG_LCD_PWM=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -1165,10 +1165,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/buttons @@ -1252,9 +1252,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm3210e-eval/usbserial/defconfig b/nuttx/configs/stm3210e-eval/usbserial/defconfig index 28af3b1caf..897efd166a 100755 --- a/nuttx/configs/stm3210e-eval/usbserial/defconfig +++ b/nuttx/configs/stm3210e-eval/usbserial/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F103ZET6=y -CONFIG_ARCH_BOARD=stm3210e-eval +CONFIG_ARCH_BOARD="stm3210e-eval" CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 @@ -352,7 +352,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -387,7 +387,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -828,9 +828,9 @@ CONFIG_WATCHDOG=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -838,10 +838,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -896,9 +896,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm3210e-eval/usbstorage/defconfig b/nuttx/configs/stm3210e-eval/usbstorage/defconfig index 0109f2da40..eab8e31f6f 100755 --- a/nuttx/configs/stm3210e-eval/usbstorage/defconfig +++ b/nuttx/configs/stm3210e-eval/usbstorage/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F103ZET6=y -CONFIG_ARCH_BOARD=stm3210e-eval +CONFIG_ARCH_BOARD="stm3210e-eval" CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 @@ -347,7 +347,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -382,7 +382,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -761,9 +761,9 @@ CONFIG_WATCHDOG=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -771,10 +771,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -836,9 +836,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm3220g-eval/dhcpd/defconfig b/nuttx/configs/stm3220g-eval/dhcpd/defconfig index c71d7cfede..27b6180071 100644 --- a/nuttx/configs/stm3220g-eval/dhcpd/defconfig +++ b/nuttx/configs/stm3220g-eval/dhcpd/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F207IG=y -CONFIG_ARCH_BOARD=stm3220g-eval +CONFIG_ARCH_BOARD="stm3220g-eval" CONFIG_ARCH_BOARD_STM3220G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 @@ -128,7 +128,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=(0x64000000+(2*1024*1024)) +CONFIG_HEAP2_END=0x64200000 # # Individual subsystems can be enabled: @@ -452,7 +452,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -488,7 +488,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -1096,9 +1096,9 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -1106,18 +1106,18 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/dhcpd # CONFIG_EXAMPLE_DHCPD_NOMAC=y -CONFIG_EXAMPLE_DHCPD_IPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_DHCPD_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_DHCPD_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_DHCPD_IPADDR=0x0a000001 +CONFIG_EXAMPLE_DHCPD_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_DHCPD_NETMASK=0xffffff00 # # Settings for examples/ostest @@ -1176,9 +1176,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm3220g-eval/nettest/defconfig b/nuttx/configs/stm3220g-eval/nettest/defconfig index 56a205e4b0..1c5889e902 100644 --- a/nuttx/configs/stm3220g-eval/nettest/defconfig +++ b/nuttx/configs/stm3220g-eval/nettest/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F207IG=y -CONFIG_ARCH_BOARD=stm3220g-eval +CONFIG_ARCH_BOARD="stm3220g-eval" CONFIG_ARCH_BOARD_STM3220G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 @@ -128,7 +128,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=(0x64000000+(2*1024*1024)) +CONFIG_HEAP2_END=0x64200000 # # Individual subsystems can be enabled: @@ -452,7 +452,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -488,7 +488,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -1096,9 +1096,9 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -1107,10 +1107,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=y CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -1169,9 +1169,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm3220g-eval/nsh/defconfig b/nuttx/configs/stm3220g-eval/nsh/defconfig index decc23e6ca..1fe4816063 100644 --- a/nuttx/configs/stm3220g-eval/nsh/defconfig +++ b/nuttx/configs/stm3220g-eval/nsh/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F207IG=y -CONFIG_ARCH_BOARD=stm3220g-eval +CONFIG_ARCH_BOARD="stm3220g-eval" CONFIG_ARCH_BOARD_STM3220G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 @@ -128,7 +128,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=(0x64000000+(2*1024*1024)) +CONFIG_HEAP2_END=0x64200000 # # Individual subsystems can be enabled: @@ -486,7 +486,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -534,7 +534,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=192 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=2048 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -1369,9 +1369,9 @@ CONFIG_STM32_ILI9325_DISABLE=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -1379,10 +1379,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -1441,9 +1441,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm3220g-eval/nsh2/defconfig b/nuttx/configs/stm3220g-eval/nsh2/defconfig index 08f0b0f265..0b157f91f6 100644 --- a/nuttx/configs/stm3220g-eval/nsh2/defconfig +++ b/nuttx/configs/stm3220g-eval/nsh2/defconfig @@ -69,12 +69,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F207IG=y -CONFIG_ARCH_BOARD=stm3220g-eval +CONFIG_ARCH_BOARD="stm3220g-eval" CONFIG_ARCH_BOARD_STM3220G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 @@ -129,7 +129,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=(0x64000000+(2*1024*1024)) +CONFIG_HEAP2_END=0x64200000 # # Individual subsystems can be enabled: @@ -487,7 +487,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -534,7 +534,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=192 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=2048 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -1334,9 +1334,9 @@ CONFIG_STM32_ILI9325_DISABLE=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -1344,10 +1344,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=((10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -1406,9 +1406,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm3220g-eval/nxwm/defconfig b/nuttx/configs/stm3220g-eval/nxwm/defconfig index d49b8c7658..fec79bd9fc 100644 --- a/nuttx/configs/stm3220g-eval/nxwm/defconfig +++ b/nuttx/configs/stm3220g-eval/nxwm/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F207IG=y -CONFIG_ARCH_BOARD=stm3220g-eval +CONFIG_ARCH_BOARD="stm3220g-eval" CONFIG_ARCH_BOARD_STM3220G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 @@ -128,7 +128,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=n CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=(0x64000000+(2*1024*1024)) +CONFIG_HEAP2_END=0x64200000 # # Individual subsystems can be enabled: @@ -486,7 +486,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -535,7 +535,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=192 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=2048 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -1366,9 +1366,9 @@ CONFIG_STM32_ILI9325_DISABLE=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -1376,10 +1376,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -1442,9 +1442,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm3220g-eval/ostest/defconfig b/nuttx/configs/stm3220g-eval/ostest/defconfig index 8eb5e5ec11..5d1d0e5e43 100644 --- a/nuttx/configs/stm3220g-eval/ostest/defconfig +++ b/nuttx/configs/stm3220g-eval/ostest/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F207IG=y -CONFIG_ARCH_BOARD=stm3220g-eval +CONFIG_ARCH_BOARD="stm3220g-eval" CONFIG_ARCH_BOARD_STM3220G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 @@ -128,7 +128,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=(0x64000000+(2*1024*1024)) +CONFIG_HEAP2_END=0x64200000 # # Individual subsystems can be enabled: @@ -452,7 +452,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -487,7 +487,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=n @@ -1115,9 +1115,9 @@ CONFIG_STM32_ILI9325_DISABLE=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -1125,10 +1125,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -1190,9 +1190,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm3220g-eval/telnetd/defconfig b/nuttx/configs/stm3220g-eval/telnetd/defconfig index f96f6d76a8..5b0157c412 100644 --- a/nuttx/configs/stm3220g-eval/telnetd/defconfig +++ b/nuttx/configs/stm3220g-eval/telnetd/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F207IG=y -CONFIG_ARCH_BOARD=stm3220g-eval +CONFIG_ARCH_BOARD="stm3220g-eval" CONFIG_ARCH_BOARD_STM3220G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 @@ -128,7 +128,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=(0x64000000+(2*1024*1024)) +CONFIG_HEAP2_END=0x64200000 # # Individual subsystems can be enabled: @@ -452,7 +452,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -488,7 +488,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -1096,9 +1096,9 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -1107,10 +1107,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=y CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/telnetd @@ -1135,9 +1135,9 @@ CONFIG_EXAMPLES_TELNETD_DAEMONSTACKSIZE=2048 CONFIG_EXAMPLES_TELNETD_CLIENTPRIO=128 CONFIG_EXAMPLES_TELNETD_CLIENTSTACKSIZE=2048 CONFIG_EXAMPLE_TELNETD_NOMAC=y -CONFIG_EXAMPLE_TELNETD_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_TELNETD_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_TELNETD_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_TELNETD_IPADDR=0x0a000002 +CONFIG_EXAMPLE_TELNETD_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_TELNETD_NETMASK=0xffffff00 # # Settings for examples/ostest @@ -1196,9 +1196,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm3240g-eval/dhcpd/defconfig b/nuttx/configs/stm3240g-eval/dhcpd/defconfig index a4c26bc4db..080c375121 100644 --- a/nuttx/configs/stm3240g-eval/dhcpd/defconfig +++ b/nuttx/configs/stm3240g-eval/dhcpd/defconfig @@ -70,12 +70,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM4=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F407IG=y -CONFIG_ARCH_BOARD=stm3240g-eval +CONFIG_ARCH_BOARD="stm3240g-eval" CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 @@ -139,7 +139,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=(0x64000000+(2*1024*1024)) +CONFIG_HEAP2_END=0x64200000 # # Individual subsystems can be enabled: @@ -462,7 +462,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -498,7 +498,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -1094,9 +1094,9 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -1104,18 +1104,18 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/dhcpd # CONFIG_EXAMPLE_DHCPD_NOMAC=y -CONFIG_EXAMPLE_DHCPD_IPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_DHCPD_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_DHCPD_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_DHCPD_IPADDR=0x0a000001 +CONFIG_EXAMPLE_DHCPD_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_DHCPD_NETMASK=0xffffff00 # # Settings for examples/ostest @@ -1174,9 +1174,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm3240g-eval/nettest/defconfig b/nuttx/configs/stm3240g-eval/nettest/defconfig index d3b2af33a8..9097f5b947 100644 --- a/nuttx/configs/stm3240g-eval/nettest/defconfig +++ b/nuttx/configs/stm3240g-eval/nettest/defconfig @@ -70,12 +70,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM4=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F407IG=y -CONFIG_ARCH_BOARD=stm3240g-eval +CONFIG_ARCH_BOARD="stm3240g-eval" CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 @@ -139,7 +139,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=(0x64000000+(2*1024*1024)) +CONFIG_HEAP2_END=0x64200000 # # Individual subsystems can be enabled: @@ -462,7 +462,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -498,7 +498,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -1094,9 +1094,9 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -1105,10 +1105,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=y CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -1167,9 +1167,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm3240g-eval/nsh/defconfig b/nuttx/configs/stm3240g-eval/nsh/defconfig index 2f4c323271..db00f0d54e 100644 --- a/nuttx/configs/stm3240g-eval/nsh/defconfig +++ b/nuttx/configs/stm3240g-eval/nsh/defconfig @@ -70,12 +70,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM4=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F407IG=y -CONFIG_ARCH_BOARD=stm3240g-eval +CONFIG_ARCH_BOARD="stm3240g-eval" CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 @@ -139,7 +139,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=(0x64000000+(2*1024*1024)) +CONFIG_HEAP2_END=0x64200000 # # Individual subsystems can be enabled: @@ -498,7 +498,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -545,7 +545,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=192 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=2048 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -1333,9 +1333,9 @@ CONFIG_STM32_ILI9325_DISABLE=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -1343,10 +1343,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -1405,9 +1405,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm3240g-eval/nsh2/defconfig b/nuttx/configs/stm3240g-eval/nsh2/defconfig index c4b9df773a..6698f487a3 100644 --- a/nuttx/configs/stm3240g-eval/nsh2/defconfig +++ b/nuttx/configs/stm3240g-eval/nsh2/defconfig @@ -70,12 +70,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM4=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F407IG=y -CONFIG_ARCH_BOARD=stm3240g-eval +CONFIG_ARCH_BOARD="stm3240g-eval" CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 @@ -140,7 +140,7 @@ CONFIG_STM32_CCMEXCLUDE=y # CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=(0x64000000+(2*1024*1024)) +CONFIG_HEAP2_END=0x64200000 # # Individual subsystems can be enabled: @@ -499,7 +499,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -545,7 +545,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=192 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -1195,9 +1195,9 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -1205,10 +1205,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -1267,9 +1267,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm3240g-eval/nxconsole/defconfig b/nuttx/configs/stm3240g-eval/nxconsole/defconfig index 3c9f15e2d4..308be59a06 100644 --- a/nuttx/configs/stm3240g-eval/nxconsole/defconfig +++ b/nuttx/configs/stm3240g-eval/nxconsole/defconfig @@ -70,12 +70,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM4=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F407IG=y -CONFIG_ARCH_BOARD=stm3240g-eval +CONFIG_ARCH_BOARD="stm3240g-eval" CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 @@ -139,7 +139,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=(0x64000000+(2*1024*1024)) +CONFIG_HEAP2_END=0x64200000 # # Individual subsystems can be enabled: @@ -498,7 +498,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -544,7 +544,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=192 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -1265,9 +1265,9 @@ CONFIG_STM32_ILI9325_DISABLE=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -1275,10 +1275,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -1340,9 +1340,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm3240g-eval/nxwm/defconfig b/nuttx/configs/stm3240g-eval/nxwm/defconfig index 3816279704..7d86671954 100644 --- a/nuttx/configs/stm3240g-eval/nxwm/defconfig +++ b/nuttx/configs/stm3240g-eval/nxwm/defconfig @@ -70,12 +70,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM4=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F407IG=y -CONFIG_ARCH_BOARD=stm3240g-eval +CONFIG_ARCH_BOARD="stm3240g-eval" CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 @@ -139,7 +139,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=n CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=(0x64000000+(2*1024*1024)) +CONFIG_HEAP2_END=0x64200000 # # Individual subsystems can be enabled: @@ -498,7 +498,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -546,7 +546,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=192 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=2048 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -1366,9 +1366,9 @@ CONFIG_STM32_ILI9325_DISABLE=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -1376,10 +1376,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -1442,9 +1442,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm3240g-eval/ostest/defconfig b/nuttx/configs/stm3240g-eval/ostest/defconfig index bfe63c1365..3afabeb69d 100644 --- a/nuttx/configs/stm3240g-eval/ostest/defconfig +++ b/nuttx/configs/stm3240g-eval/ostest/defconfig @@ -70,12 +70,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM4=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F407IG=y -CONFIG_ARCH_BOARD=stm3240g-eval +CONFIG_ARCH_BOARD="stm3240g-eval" CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 @@ -139,7 +139,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=(0x64000000+(2*1024*1024)) +CONFIG_HEAP2_END=0x64200000 # # Individual subsystems can be enabled: @@ -460,7 +460,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -495,7 +495,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=n @@ -1111,9 +1111,9 @@ CONFIG_STM32_ILI9325_DISABLE=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -1121,10 +1121,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -1186,9 +1186,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm3240g-eval/telnetd/defconfig b/nuttx/configs/stm3240g-eval/telnetd/defconfig index 3ca3dd87c1..27b6fc307a 100644 --- a/nuttx/configs/stm3240g-eval/telnetd/defconfig +++ b/nuttx/configs/stm3240g-eval/telnetd/defconfig @@ -70,12 +70,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM4=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F407IG=y -CONFIG_ARCH_BOARD=stm3240g-eval +CONFIG_ARCH_BOARD="stm3240g-eval" CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 @@ -139,7 +139,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n # CONFIG_STM32_FSMC_SRAM=y CONFIG_HEAP2_BASE=0x64000000 -CONFIG_HEAP2_END=(0x64000000+(2*1024*1024)) +CONFIG_HEAP2_END=0x64200000 # # Individual subsystems can be enabled: @@ -462,7 +462,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -498,7 +498,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -1094,9 +1094,9 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -1105,10 +1105,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=y CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/telnetd @@ -1133,9 +1133,9 @@ CONFIG_EXAMPLES_TELNETD_DAEMONSTACKSIZE=2048 CONFIG_EXAMPLES_TELNETD_CLIENTPRIO=128 CONFIG_EXAMPLES_TELNETD_CLIENTSTACKSIZE=2048 CONFIG_EXAMPLE_TELNETD_NOMAC=y -CONFIG_EXAMPLE_TELNETD_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_TELNETD_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_TELNETD_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_TELNETD_IPADDR=0x0a000002 +CONFIG_EXAMPLE_TELNETD_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_TELNETD_NETMASK=0xffffff00 # # Settings for examples/ostest @@ -1194,9 +1194,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm32f4discovery/nsh/defconfig b/nuttx/configs/stm32f4discovery/nsh/defconfig index 4be8ea7918..427e59c16d 100644 --- a/nuttx/configs/stm32f4discovery/nsh/defconfig +++ b/nuttx/configs/stm32f4discovery/nsh/defconfig @@ -70,12 +70,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM4=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F407VG=y -CONFIG_ARCH_BOARD=stm32f4discovery +CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 @@ -444,7 +444,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -489,7 +489,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -1169,9 +1169,9 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -1179,10 +1179,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -1276,9 +1276,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm32f4discovery/nxlines/defconfig b/nuttx/configs/stm32f4discovery/nxlines/defconfig index 28dd44adc1..1c3b13b63e 100644 --- a/nuttx/configs/stm32f4discovery/nxlines/defconfig +++ b/nuttx/configs/stm32f4discovery/nxlines/defconfig @@ -70,12 +70,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM4=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F407VG=y -CONFIG_ARCH_BOARD=stm32f4discovery +CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 @@ -444,7 +444,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -489,7 +489,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -1197,9 +1197,9 @@ CONFIG_LCD_RPORTRAIT=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -1208,10 +1208,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -1270,9 +1270,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm32f4discovery/ostest/defconfig b/nuttx/configs/stm32f4discovery/ostest/defconfig index 066fb4017f..8a03a9a343 100644 --- a/nuttx/configs/stm32f4discovery/ostest/defconfig +++ b/nuttx/configs/stm32f4discovery/ostest/defconfig @@ -70,12 +70,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM4=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F407VG=y -CONFIG_ARCH_BOARD=stm32f4discovery +CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 @@ -427,7 +427,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -462,7 +462,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=n @@ -1157,9 +1157,9 @@ CONFIG_STM32_R61580_DISABLE=n # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -1167,10 +1167,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -1232,9 +1232,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/stm32f4discovery/pm/defconfig b/nuttx/configs/stm32f4discovery/pm/defconfig index 136c5c1f2d..4b3edf3fc7 100644 --- a/nuttx/configs/stm32f4discovery/pm/defconfig +++ b/nuttx/configs/stm32f4discovery/pm/defconfig @@ -70,12 +70,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM4=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F407VG=y -CONFIG_ARCH_BOARD=stm32f4discovery +CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_SIZE=0x00030000 @@ -445,7 +445,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -490,7 +490,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -1188,9 +1188,9 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -1198,10 +1198,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -1295,9 +1295,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/sure-pic32mx/nsh/defconfig b/nuttx/configs/sure-pic32mx/nsh/defconfig index 926aac26b2..e850dca92e 100644 --- a/nuttx/configs/sure-pic32mx/nsh/defconfig +++ b/nuttx/configs/sure-pic32mx/nsh/defconfig @@ -80,17 +80,17 @@ # serves no purpose other than it allows you to calibrate # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=mips +CONFIG_ARCH="mips" CONFIG_ARCH_MIPS=y CONFIG_ARCH_MIPS32=y -CONFIG_ARCH_CHIP=pic32mx +CONFIG_ARCH_CHIP="pic32mx" CONFIG_ARCH_CHIP_PIC32MX440F512H=y -CONFIG_ARCH_BOARD=sure-pic32mx +CONFIG_ARCH_BOARD="sure-pic32mx" CONFIG_ARCH_BOARD_SUREPIC32MX=y CONFIG_ARCH_DBDP11215=y CONFIG_ARCH_DBDP11212=n CONFIG_BOARD_LOOPSPERMSEC=4275 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0xa0000000 CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y @@ -338,7 +338,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -380,7 +380,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=192 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -829,9 +829,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -853,10 +853,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -915,9 +915,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/sure-pic32mx/ostest/defconfig b/nuttx/configs/sure-pic32mx/ostest/defconfig index 4ddbdbc9ac..b51a982078 100644 --- a/nuttx/configs/sure-pic32mx/ostest/defconfig +++ b/nuttx/configs/sure-pic32mx/ostest/defconfig @@ -80,17 +80,17 @@ # serves no purpose other than it allows you to calibrate # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=mips +CONFIG_ARCH="mips" CONFIG_ARCH_MIPS=y CONFIG_ARCH_MIPS32=y -CONFIG_ARCH_CHIP=pic32mx +CONFIG_ARCH_CHIP="pic32mx" CONFIG_ARCH_CHIP_PIC32MX440F512H=y -CONFIG_ARCH_BOARD=sure-pic32mx +CONFIG_ARCH_BOARD="sure-pic32mx" CONFIG_ARCH_BOARD_SUREPIC32MX=y CONFIG_ARCH_DBDP11215=y CONFIG_ARCH_DBDP11212=n CONFIG_BOARD_LOOPSPERMSEC=4275 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0xa0000000 CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y @@ -328,7 +328,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -360,7 +360,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -686,9 +686,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -710,10 +710,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -768,9 +768,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/sure-pic32mx/usbnsh/defconfig b/nuttx/configs/sure-pic32mx/usbnsh/defconfig index 7571bee37d..0adaf1d91e 100644 --- a/nuttx/configs/sure-pic32mx/usbnsh/defconfig +++ b/nuttx/configs/sure-pic32mx/usbnsh/defconfig @@ -80,17 +80,17 @@ # serves no purpose other than it allows you to calibrate # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=mips +CONFIG_ARCH="mips" CONFIG_ARCH_MIPS=y CONFIG_ARCH_MIPS32=y -CONFIG_ARCH_CHIP=pic32mx +CONFIG_ARCH_CHIP="pic32mx" CONFIG_ARCH_CHIP_PIC32MX440F512H=y -CONFIG_ARCH_BOARD=sure-pic32mx +CONFIG_ARCH_BOARD="sure-pic32mx" CONFIG_ARCH_BOARD_SUREPIC32MX=y CONFIG_ARCH_DBDP11215=y CONFIG_ARCH_DBDP11212=n CONFIG_BOARD_LOOPSPERMSEC=4275 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0xa0000000 CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y @@ -338,7 +338,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -377,7 +377,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -826,9 +826,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -850,10 +850,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -912,9 +912,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/teensy/hello/defconfig b/nuttx/configs/teensy/hello/defconfig index dc5e58d650..897954923c 100644 --- a/nuttx/configs/teensy/hello/defconfig +++ b/nuttx/configs/teensy/hello/defconfig @@ -71,15 +71,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=avr +CONFIG_ARCH="avr" CONFIG_ARCH_AVR=y CONFIG_ARCH_AT90USB=y -CONFIG_ARCH_CHIP=at90usb +CONFIG_ARCH_CHIP="at90usb" CONFIG_ARCH_CHIP_AT90USB1286=y -CONFIG_ARCH_BOARD=teensy +CONFIG_ARCH_BOARD="teensy" CONFIG_ARCH_BOARD_TEENSY=y -CONFIG_BOARD_LOOPSPERMSEC=(8*108) -CONFIG_DRAM_SIZE=(8*1024) +CONFIG_BOARD_LOOPSPERMSEC=864 +CONFIG_DRAM_SIZE=8192 CONFIG_DRAM_START=0x800100 CONFIG_ARCH_NOINTC=y CONFIG_ARCH_IRQPRIO=n @@ -250,7 +250,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -282,7 +282,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -608,9 +608,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -632,10 +632,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -690,9 +690,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/teensy/nsh/defconfig b/nuttx/configs/teensy/nsh/defconfig index 68c2c97f5e..5325d0e7d5 100755 --- a/nuttx/configs/teensy/nsh/defconfig +++ b/nuttx/configs/teensy/nsh/defconfig @@ -71,15 +71,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=avr +CONFIG_ARCH="avr" CONFIG_ARCH_AVR=y CONFIG_ARCH_AT90USB=y -CONFIG_ARCH_CHIP=at90usb +CONFIG_ARCH_CHIP="at90usb" CONFIG_ARCH_CHIP_AT90USB1286=y -CONFIG_ARCH_BOARD=teensy +CONFIG_ARCH_BOARD="teensy" CONFIG_ARCH_BOARD_TEENSY=y -CONFIG_BOARD_LOOPSPERMSEC=(8*108) -CONFIG_DRAM_SIZE=(8*1024) +CONFIG_BOARD_LOOPSPERMSEC=864 +CONFIG_DRAM_SIZE=8192 CONFIG_DRAM_START=0x800100 CONFIG_ARCH_NOINTC=y CONFIG_ARCH_IRQPRIO=n @@ -253,7 +253,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -285,7 +285,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -637,9 +637,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -660,10 +660,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -718,9 +718,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/teensy/src/up_spi.c b/nuttx/configs/teensy/src/up_spi.c index 2ef0908f2a..e3284be081 100644 --- a/nuttx/configs/teensy/src/up_spi.c +++ b/nuttx/configs/teensy/src/up_spi.c @@ -50,7 +50,7 @@ #include "up_arch.h" #include "chip.h" -#include "at90Usb_internal.h" +#include "at90usb_internal.h" #include "teensy_internal.h" #ifdef CONFIG_AVR_SPI diff --git a/nuttx/configs/teensy/usbstorage/defconfig b/nuttx/configs/teensy/usbstorage/defconfig index 570c7f881b..7972993b73 100755 --- a/nuttx/configs/teensy/usbstorage/defconfig +++ b/nuttx/configs/teensy/usbstorage/defconfig @@ -71,15 +71,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=avr +CONFIG_ARCH="avr" CONFIG_ARCH_AVR=y CONFIG_ARCH_AT90USB=y -CONFIG_ARCH_CHIP=at90usb +CONFIG_ARCH_CHIP="at90usb" CONFIG_ARCH_CHIP_AT90USB1286=y -CONFIG_ARCH_BOARD=teensy +CONFIG_ARCH_BOARD="teensy" CONFIG_ARCH_BOARD_TEENSY=y -CONFIG_BOARD_LOOPSPERMSEC=(8*108) -CONFIG_DRAM_SIZE=(8*1024) +CONFIG_BOARD_LOOPSPERMSEC=864 +CONFIG_DRAM_SIZE=8192 CONFIG_DRAM_START=0x800100 CONFIG_ARCH_NOINTC=y CONFIG_ARCH_IRQPRIO=n @@ -250,7 +250,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -282,7 +282,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -641,9 +641,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -664,10 +664,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10L<<24|0L<<16|0L<<8|2L) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10L<<24|0L<<16|0L<<8|1L) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -722,9 +722,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=y -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/twr-k60n512/nsh/defconfig b/nuttx/configs/twr-k60n512/nsh/defconfig index 84359b388b..578b086798 100644 --- a/nuttx/configs/twr-k60n512/nsh/defconfig +++ b/nuttx/configs/twr-k60n512/nsh/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM4=y -CONFIG_ARCH_CHIP=kinetis +CONFIG_ARCH_CHIP="kinetis" CONFIG_ARCH_CHIP_MK60N512VMD100=y -CONFIG_ARCH_BOARD=twr-k60n512 +CONFIG_ARCH_BOARD="twr-k60n512" CONFIG_ARCH_BOARD_TWR_K60N512=y CONFIG_BOARD_LOOPSPERMSEC=9535 CONFIG_DRAM_START=0x1fff0000 @@ -387,7 +387,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -420,7 +420,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -771,9 +771,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -781,10 +781,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -843,9 +843,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/twr-k60n512/ostest/defconfig b/nuttx/configs/twr-k60n512/ostest/defconfig index e82877d529..239fb0a83f 100644 --- a/nuttx/configs/twr-k60n512/ostest/defconfig +++ b/nuttx/configs/twr-k60n512/ostest/defconfig @@ -68,12 +68,12 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM4=y -CONFIG_ARCH_CHIP=kinetis +CONFIG_ARCH_CHIP="kinetis" CONFIG_ARCH_CHIP_MK60N512VMD100=y -CONFIG_ARCH_BOARD=twr-k60n512 +CONFIG_ARCH_BOARD="twr-k60n512" CONFIG_ARCH_BOARD_TWR_K60N512=y CONFIG_BOARD_LOOPSPERMSEC=9535 CONFIG_DRAM_START=0x1fff0000 @@ -387,7 +387,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -419,7 +419,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 @@ -769,9 +769,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -779,10 +779,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -837,9 +837,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/ubw32/nsh/defconfig b/nuttx/configs/ubw32/nsh/defconfig index 3bd34a8de9..6f9b642e78 100644 --- a/nuttx/configs/ubw32/nsh/defconfig +++ b/nuttx/configs/ubw32/nsh/defconfig @@ -81,15 +81,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=mips +CONFIG_ARCH="mips" CONFIG_ARCH_MIPS=y CONFIG_ARCH_MIPS32=y -CONFIG_ARCH_CHIP=pic32mx +CONFIG_ARCH_CHIP="pic32mx" CONFIG_ARCH_CHIP_PIC32MX460F512L=y -CONFIG_ARCH_BOARD=ubw32 +CONFIG_ARCH_BOARD="ubw32" CONFIG_ARCH_BOARD_UBW32=y CONFIG_BOARD_LOOPSPERMSEC=8079 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0xa0000000 CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y @@ -328,7 +328,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -364,7 +364,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=192 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -813,9 +813,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -837,10 +837,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -899,9 +899,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/ubw32/ostest/defconfig b/nuttx/configs/ubw32/ostest/defconfig index 4f30de55d5..f623226980 100644 --- a/nuttx/configs/ubw32/ostest/defconfig +++ b/nuttx/configs/ubw32/ostest/defconfig @@ -81,15 +81,15 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=mips +CONFIG_ARCH="mips" CONFIG_ARCH_MIPS=y CONFIG_ARCH_MIPS32=y -CONFIG_ARCH_CHIP=pic32mx +CONFIG_ARCH_CHIP="pic32mx" CONFIG_ARCH_CHIP_PIC32MX460F512L=y -CONFIG_ARCH_BOARD=ubw32 +CONFIG_ARCH_BOARD="ubw32" CONFIG_ARCH_BOARD_UBW32=y CONFIG_BOARD_LOOPSPERMSEC=8079 -CONFIG_DRAM_SIZE=(32*1024) +CONFIG_DRAM_SIZE=32768 CONFIG_DRAM_START=0xa0000000 CONFIG_ARCH_NOINTC=n CONFIG_ARCH_VECNOTIRQ=y @@ -328,7 +328,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -363,7 +363,7 @@ CONFIG_FDCLONE_STDIO=n CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKPRIORITY=192 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=n @@ -812,9 +812,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -836,10 +836,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=y -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -898,9 +898,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/us7032evb1/nsh/defconfig b/nuttx/configs/us7032evb1/nsh/defconfig index 75a97f5c76..b6be4c7a24 100644 --- a/nuttx/configs/us7032evb1/nsh/defconfig +++ b/nuttx/configs/us7032evb1/nsh/defconfig @@ -64,11 +64,11 @@ # used during interrupt handling. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=sh +CONFIG_ARCH="sh" CONFIG_ARCH_SH1=y -CONFIG_ARCH_CHIP=sh1 +CONFIG_ARCH_CHIP="sh1" CONFIG_ARCH_CHIP_SH7032=y -CONFIG_ARCH_BOARD=us7032evb1 +CONFIG_ARCH_BOARD="us7032evb1" CONFIG_ARCH_BOARD_US7032EVB1=y CONFIG_ENDIAN_BIG=y CONFIG_ARCH_NOINTC=y @@ -555,9 +555,9 @@ CONFIG_NSH_TELNET=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/us7032evb1/ostest/defconfig b/nuttx/configs/us7032evb1/ostest/defconfig index f1b8998072..d084f8963a 100644 --- a/nuttx/configs/us7032evb1/ostest/defconfig +++ b/nuttx/configs/us7032evb1/ostest/defconfig @@ -64,11 +64,11 @@ # used during interrupt handling. # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions # -CONFIG_ARCH=sh +CONFIG_ARCH="sh" CONFIG_ARCH_SH1=y -CONFIG_ARCH_CHIP=sh1 +CONFIG_ARCH_CHIP="sh1" CONFIG_ARCH_CHIP_SH7032=y -CONFIG_ARCH_BOARD=us7032evb1 +CONFIG_ARCH_BOARD="us7032evb1" CONFIG_ARCH_BOARD_US7032EVB1=y CONFIG_ENDIAN_BIG=y CONFIG_ARCH_NOINTC=y @@ -555,9 +555,9 @@ CONFIG_NSH_TELNET=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/vsn/nsh/defconfig b/nuttx/configs/vsn/nsh/defconfig index 0282d31e78..47e670b58e 100755 --- a/nuttx/configs/vsn/nsh/defconfig +++ b/nuttx/configs/vsn/nsh/defconfig @@ -70,13 +70,13 @@ # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization # -CONFIG_ARCH=arm +CONFIG_ARCH="arm" CONFIG_ARCH_ARM=y CONFIG_ARCH_CORTEXM3=y -CONFIG_ARCH_CHIP=stm32 +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32F103RET6=y CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y -CONFIG_ARCH_BOARD=vsn +CONFIG_ARCH_BOARD="vsn" CONFIG_ARCH_BOARD_VSN=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DRAM_SIZE=0x00010000 @@ -382,7 +382,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker # thread. Default: 50 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for -# work in units of microseconds. Default: 50*1000 (50 MS). +# work in units of microseconds. Default: 50000 (50 MS). # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker # thread. Default: CONFIG_IDLETHREAD_STACKSIZE. # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up @@ -415,7 +415,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_NXFLAT=n CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_WORKPRIORITY=50 -CONFIG_SCHED_WORKPERIOD=(50*1000) +CONFIG_SCHED_WORKPERIOD=50000 CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 CONFIG_SCHED_WAITPID=y @@ -736,9 +736,9 @@ CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/uip # -CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002 +CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00 CONFIG_EXAMPLE_UIP_DHCPC=n # @@ -746,10 +746,10 @@ CONFIG_EXAMPLE_UIP_DHCPC=n CONFIG_EXAMPLE_NETTEST_SERVER=n CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n CONFIG_EXAMPLE_NETTEST_NOMAC=n -CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLE_NETTEST_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) +CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002 +CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001 +CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00 +CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001 # # Settings for examples/ostest @@ -807,9 +807,9 @@ CONFIG_NSH_ARCHINIT=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ARCHROMFS=y CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" diff --git a/nuttx/configs/xtrs/nsh/defconfig b/nuttx/configs/xtrs/nsh/defconfig index b592109231..c9f6245f6d 100644 --- a/nuttx/configs/xtrs/nsh/defconfig +++ b/nuttx/configs/xtrs/nsh/defconfig @@ -45,11 +45,11 @@ # CONFIG_ARCH_BOARD_name - for use in C code # CONFIG_DRAM_SIZE - Describes the installed DRAM. # -CONFIG_ARCH=z80 +CONFIG_ARCH="z80" CONFIG_ARCH_Z80=y -CONFIG_ARCH_CHIP=z80 +CONFIG_ARCH_CHIP="z80" CONFIG_ARCH_CHIP_Z80=y -CONFIG_ARCH_BOARD=xtrs +CONFIG_ARCH_BOARD="xtrs" CONFIG_ARCH_BOARD_XTRS=y CONFIG_DRAM_SIZE=65536 @@ -377,9 +377,9 @@ CONFIG_NSH_TELNET=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/xtrs/ostest/defconfig b/nuttx/configs/xtrs/ostest/defconfig index be9e82c73f..c7059876aa 100644 --- a/nuttx/configs/xtrs/ostest/defconfig +++ b/nuttx/configs/xtrs/ostest/defconfig @@ -45,11 +45,11 @@ # CONFIG_ARCH_BOARD_name - for use in C code # CONFIG_DRAM_SIZE - Describes the installed DRAM. # -CONFIG_ARCH=z80 +CONFIG_ARCH="z80" CONFIG_ARCH_Z80=y -CONFIG_ARCH_CHIP=z80 +CONFIG_ARCH_CHIP="z80" CONFIG_ARCH_CHIP_Z80=y -CONFIG_ARCH_BOARD=xtrs +CONFIG_ARCH_BOARD="xtrs" CONFIG_ARCH_BOARD_XTRS=y CONFIG_DRAM_SIZE=65536 @@ -343,9 +343,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/xtrs/pashello/defconfig b/nuttx/configs/xtrs/pashello/defconfig index dc5f45044d..349c254ad1 100644 --- a/nuttx/configs/xtrs/pashello/defconfig +++ b/nuttx/configs/xtrs/pashello/defconfig @@ -45,11 +45,11 @@ # CONFIG_ARCH_BOARD_name - for use in C code # CONFIG_DRAM_SIZE - Describes the installed DRAM. # -CONFIG_ARCH=z80 +CONFIG_ARCH="z80" CONFIG_ARCH_Z80=y -CONFIG_ARCH_CHIP=z80 +CONFIG_ARCH_CHIP="z80" CONFIG_ARCH_CHIP_Z80=y -CONFIG_ARCH_BOARD=xtrs +CONFIG_ARCH_BOARD="xtrs" CONFIG_ARCH_BOARD_XTRS=y CONFIG_DRAM_SIZE=65536 @@ -343,9 +343,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/z16f2800100zcog/ostest/defconfig b/nuttx/configs/z16f2800100zcog/ostest/defconfig index c8fb6d64d8..fd2fae82fc 100644 --- a/nuttx/configs/z16f2800100zcog/ostest/defconfig +++ b/nuttx/configs/z16f2800100zcog/ostest/defconfig @@ -62,15 +62,15 @@ # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to z16f. # -CONFIG_ARCH=z16 +CONFIG_ARCH="z16" CONFIG_ARCH_Z16=y -CONFIG_ARCH_CHIP=z16f +CONFIG_ARCH_CHIP="z16f" CONFIG_ARCH_CHIP_Z16F=y CONFIG_ARCH_CHIP_Z16F2810=n CONFIG_ARCH_CHIP_Z16F2811=y CONFIG_ARCH_CHIP_Z16F3211=n CONFIG_ARCH_CHIP_Z16F6411=n -CONFIG_ARCH_BOARD=z16f2800100zcog +CONFIG_ARCH_BOARD="z16f2800100zcog" CONFIG_ARCH_BOARD_Z16F2800100ZCOG=y CONFIG_ARCH_NOINTC=n CONFIG_ARCH_IRQPRIO=y @@ -371,9 +371,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/z16f2800100zcog/pashello/defconfig b/nuttx/configs/z16f2800100zcog/pashello/defconfig index d7639980fe..a52c6de0f3 100644 --- a/nuttx/configs/z16f2800100zcog/pashello/defconfig +++ b/nuttx/configs/z16f2800100zcog/pashello/defconfig @@ -62,15 +62,15 @@ # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to z16f. # -CONFIG_ARCH=z16 +CONFIG_ARCH="z16" CONFIG_ARCH_Z16=y -CONFIG_ARCH_CHIP=z16f +CONFIG_ARCH_CHIP="z16f" CONFIG_ARCH_CHIP_Z16F=y CONFIG_ARCH_CHIP_Z16F2810=n CONFIG_ARCH_CHIP_Z16F2811=y CONFIG_ARCH_CHIP_Z16F3211=n CONFIG_ARCH_CHIP_Z16F6411=n -CONFIG_ARCH_BOARD=z16f2800100zcog +CONFIG_ARCH_BOARD="z16f2800100zcog" CONFIG_ARCH_BOARD_Z16F2800100ZCOG=y CONFIG_ARCH_NOINTC=n CONFIG_ARCH_IRQPRIO=y @@ -371,9 +371,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/z80sim/nsh/defconfig b/nuttx/configs/z80sim/nsh/defconfig index 606bea4fe1..e7c700da19 100644 --- a/nuttx/configs/z80sim/nsh/defconfig +++ b/nuttx/configs/z80sim/nsh/defconfig @@ -45,11 +45,11 @@ # CONFIG_ARCH_BOARD_name - for use in C code # CONFIG_DRAM_SIZE - Describes the installed DRAM. # -CONFIG_ARCH=z80 +CONFIG_ARCH="z80" CONFIG_ARCH_Z80=y -CONFIG_ARCH_CHIP=z80 +CONFIG_ARCH_CHIP="z80" CONFIG_ARCH_CHIP_Z80=y -CONFIG_ARCH_BOARD=z80sim +CONFIG_ARCH_BOARD="z80sim" CONFIG_ARCH_BOARD_Z80SIM=y CONFIG_DRAM_SIZE=65536 @@ -367,9 +367,9 @@ CONFIG_NSH_TELNET=n CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=0 diff --git a/nuttx/configs/z80sim/ostest/defconfig b/nuttx/configs/z80sim/ostest/defconfig index e51a2fb48a..2748176431 100644 --- a/nuttx/configs/z80sim/ostest/defconfig +++ b/nuttx/configs/z80sim/ostest/defconfig @@ -45,11 +45,11 @@ # CONFIG_ARCH_BOARD_name - for use in C code # CONFIG_DRAM_SIZE - Describes the installed DRAM. # -CONFIG_ARCH=z80 +CONFIG_ARCH="z80" CONFIG_ARCH_Z80=y -CONFIG_ARCH_CHIP=z80 +CONFIG_ARCH_CHIP="z80" CONFIG_ARCH_CHIP_Z80=y -CONFIG_ARCH_BOARD=z80sim +CONFIG_ARCH_BOARD="z80sim" CONFIG_ARCH_BOARD_Z80SIM=y CONFIG_DRAM_SIZE=65536 @@ -333,9 +333,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/z80sim/pashello/defconfig b/nuttx/configs/z80sim/pashello/defconfig index 533bc4f96c..91c33174a3 100644 --- a/nuttx/configs/z80sim/pashello/defconfig +++ b/nuttx/configs/z80sim/pashello/defconfig @@ -45,11 +45,11 @@ # CONFIG_ARCH_BOARD_name - for use in C code # CONFIG_DRAM_SIZE - Describes the installed DRAM. # -CONFIG_ARCH=z80 +CONFIG_ARCH="z80" CONFIG_ARCH_Z80=y -CONFIG_ARCH_CHIP=z80 +CONFIG_ARCH_CHIP="z80" CONFIG_ARCH_CHIP_Z80=y -CONFIG_ARCH_BOARD=z80sim +CONFIG_ARCH_BOARD="z80sim" CONFIG_ARCH_BOARD_Z80SIM=y CONFIG_DRAM_SIZE=65536 @@ -333,9 +333,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/z8encore000zco/ostest/defconfig b/nuttx/configs/z8encore000zco/ostest/defconfig index 83b08c963e..3a1ae75603 100644 --- a/nuttx/configs/z8encore000zco/ostest/defconfig +++ b/nuttx/configs/z8encore000zco/ostest/defconfig @@ -56,15 +56,15 @@ # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to z8 board architecture. # -CONFIG_ARCH=z80 +CONFIG_ARCH="z80" CONFIG_ARCH_Z8=y -CONFIG_ARCH_CHIP=z8 +CONFIG_ARCH_CHIP="z8" CONFIG_ARCH_CHIP_Z8=y CONFIG_ARCH_CHIP_Z8F640X=y CONFIG_ARCH_CHIP_Z8F6403=y CONFIG_ARCH_CHIP_Z8F642X=n CONFIG_ARCH_CHIP_Z8F6423=n -CONFIG_ARCH_BOARD=z8encore000zco +CONFIG_ARCH_BOARD="z8encore000zco" CONFIG_ARCH_BOARD_Z8ENCORE000ZCO=y CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_ENDIAN_BIG=y @@ -372,9 +372,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # Stack and heap information diff --git a/nuttx/configs/z8f64200100kit/ostest/defconfig b/nuttx/configs/z8f64200100kit/ostest/defconfig index 4448f34ad5..540b6928a1 100644 --- a/nuttx/configs/z8f64200100kit/ostest/defconfig +++ b/nuttx/configs/z8f64200100kit/ostest/defconfig @@ -56,15 +56,15 @@ # CONFIG_DRAM_SIZE - Describes the installed DRAM. # CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to z8 board architecture. # -CONFIG_ARCH=z80 +CONFIG_ARCH="z80" CONFIG_ARCH_Z8=y -CONFIG_ARCH_CHIP=z8 +CONFIG_ARCH_CHIP="z8" CONFIG_ARCH_CHIP_Z8=y CONFIG_ARCH_CHIP_Z8F640X=n CONFIG_ARCH_CHIP_Z8F6403=n CONFIG_ARCH_CHIP_Z8F642X=y CONFIG_ARCH_CHIP_Z8F6423=y -CONFIG_ARCH_BOARD=z8f64200100kit +CONFIG_ARCH_BOARD="z8f64200100kit" CONFIG_ARCH_BOARD_Z8F64200100KIT=y CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_ENDIAN_BIG=y @@ -372,9 +372,9 @@ CONFIG_NSH_IOBUFFER_SIZE=512 CONFIG_NSH_CMD_SIZE=40 CONFIG_NSH_DHCPC=n CONFIG_NSH_NOMAC=n -CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_IPADDR=0x0a000002 +CONFIG_NSH_DRIPADDR=0x0a000001 +CONFIG_NSH_NETMASK=0xffffff00 # # Stack and heap information From 20c7cf9db9c06fb0f12bc4bc310c275a325665c9 Mon Sep 17 00:00:00 2001 From: patacongo Date: Fri, 24 Aug 2012 22:16:09 +0000 Subject: [PATCH 24/31] Update STM32 USB OTG FS host driver -- the driver is now marginally functional git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5051 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/ChangeLog | 4 + nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c | 8 +- nuttx/arch/arm/src/stm32/stm32_otgfshost.c | 64 ++++++++---- nuttx/drivers/usbhost/usbhost_storage.c | 113 +++++++++++---------- nuttx/include/nuttx/usb/usbhost.h | 8 +- 5 files changed, 120 insertions(+), 77 deletions(-) diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 502c0e352c..993719b11d 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -3173,3 +3173,7 @@ * arch/arm/src/stm32/stm32_otgfshost.c: Renamed from stm32_usbhost.c. This is nearly code complete and, with any luck, will be available in NuttX-6.22. + * configs/*/defconfig: Update all defconfig files to remove syntax + that is incompatible with the mconf configuration tool. + * arch/arm/src/stm32/stm32_otgfshost.c: This driver now appears to be + functional (although more testing is necesary). \ No newline at end of file diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c b/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c index 154b953b72..de880cac10 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c @@ -2194,7 +2194,13 @@ static int lpc17_ctrlout(FAR struct usbhost_driver_s *drvr, * * Returned Values: * On success, zero (OK) is returned. On a failure, a negated errno value is - * returned indicating the nature of the failure + * returned indicating the nature of the failure: + * + * EAGAIN - If devices NAKs the transfer (or NYET or other error where + * it may be appropriate to restart the entire transaction). + * EPERM - If the endpoint stalls + * EIO - On a TX or data toggle error + * EPIPE - Overrun errors * * Assumptions: * - Only a single class bound to a single device is supported. diff --git a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c index 06d35a04ac..d84ba68842 100644 --- a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c +++ b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c @@ -201,6 +201,7 @@ struct stm32_chan_s uint8_t epno; /* Device endpoint number (0-127) */ uint8_t eptype; /* See OTGFS_EPTYPE_* definitions */ uint8_t pid; /* Data PID */ + uint8_t npackets; /* Number of packets (for data toggle) */ bool inuse; /* True: This channel is "in use" */ volatile bool indata1; /* IN data toggle. True: DATA01 (Bulk and INTR only) */ volatile bool outdata1; /* OUT data toggle. True: DATA01 */ @@ -1057,6 +1058,13 @@ static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx) } #endif + /* Save the number of packets in the transfer. We will need this in + * order to set the next data toggle correctly when the transfer + * completes. + */ + + chan->npackets = (uint8_t)npackets; + /* Setup the HCTSIZn register */ regval = ((uint32_t)chan->buflen << OTGFS_HCTSIZ_XFRSIZ_SHIFT) | @@ -1387,7 +1395,7 @@ static void stm32_gint_wrpacket(FAR struct stm32_usbhost_s *priv, * OK - Transfer completed successfully * EAGAIN - If devices NAKs the transfer or NYET occurs * EPERM - If the endpoint stalls - * EIO - On a TX or data error + * EIO - On a TX or data toggle error * EPIPE - Frame overrun * * EBUSY in the result field indicates that the transfer has not completed. @@ -1405,8 +1413,8 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, * HCINTMSK register to get the set of enabled HC interrupts. */ - pending = stm32_getreg(STM32_OTGFS_HCINT(chidx)); - regval = stm32_getreg(STM32_OTGFS_HCINTMSK(chidx)); + pending = stm32_getreg(STM32_OTGFS_HCINT(chidx)); + regval = stm32_getreg(STM32_OTGFS_HCINTMSK(chidx)); /* AND the two to get the set of enabled, pending HC interrupts */ @@ -1588,11 +1596,18 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, else if ((pending & OTGFS_HCINT_NAK) != 0) { + /* For a BULK tranfer, the hardware is capable of retrying + * automatically on a NAK. However, this is not always + * what we need to do. So we always halt the transfer and + * return control to high level logic in the even of a NAK. + */ + +#if 0 /* Halt the interrupt channel */ if (chan->eptype == OTGFS_EPTYPE_CTRL) { - /* Halt the channel -- the CHH interrrupt is expected next */ + /* Halt the channel -- the CHH interrrupt is expected next */ stm32_chan_halt(priv, chidx, CHREASON_NAK); } @@ -1611,7 +1626,11 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, regval &= ~OTGFS_HCCHAR_CHDIS; stm32_putreg(STM32_OTGFS_HCCHAR(chidx), regval); } +#else + /* Halt all transfers on the NAK -- the CHH interrrupt is expected next */ + stm32_chan_halt(priv, chidx, CHREASON_NAK); +#endif /* Clear the NAK condition */ stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_NAK); @@ -1634,7 +1653,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, * OK - Transfer completed successfully * EAGAIN - If devices NAKs the transfer or NYET occurs * EPERM - If the endpoint stalls - * EIO - On a TX or data error + * EIO - On a TX or data toggle error * EPIPE - Frame overrun * * EBUSY in the result field indicates that the transfer has not completed. @@ -1652,8 +1671,8 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, * HCINTMSK register to get the set of enabled HC interrupts. */ - pending = stm32_getreg(STM32_OTGFS_HCINT(chidx)); - regval = stm32_getreg(STM32_OTGFS_HCINTMSK(chidx)); + pending = stm32_getreg(STM32_OTGFS_HCINT(chidx)); + regval = stm32_getreg(STM32_OTGFS_HCINTMSK(chidx)); /* AND the two to get the set of enabled, pending HC interrupts */ @@ -1798,11 +1817,14 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, regval = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); - /* Is it a bulk endpoint */ + /* Is it a bulk endpoint? Were an odd number of packets + * transferred? + */ - if ((regval & OTGFS_HCCHAR_EPTYP_MASK) == OTGFS_HCCHAR_EPTYP_BULK) + if ((regval & OTGFS_HCCHAR_EPTYP_MASK) == OTGFS_HCCHAR_EPTYP_BULK && + (chan->npackets & 1) != 0) { - /* Yes... toggle the data out PID */ + /* Yes to both... toggle the data out PID */ chan->outdata1 ^= true; } @@ -3405,7 +3427,13 @@ static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, * * Returned Values: * On success, zero (OK) is returned. On a failure, a negated errno value is - * returned indicating the nature of the failure + * returned indicating the nature of the failure: + * + * EAGAIN - If devices NAKs the transfer (or NYET or other error where + * it may be appropriate to restart the entire transaction). + * EPERM - If the endpoint stalls + * EIO - On a TX or data toggle error + * EPIPE - Overrun errors * * Assumptions: * - Only a single class bound to a single device is supported. @@ -3528,22 +3556,14 @@ static int stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, ret = stm32_chan_wait(priv, chan); - /* EGAIN indicates that the device NAKed the transfer and we need + /* EAGAIN indicates that the device NAKed the transfer and we need * do try again. Anything else (success or other errors) will * cause use to return */ - if (ret != -EAGAIN) + if (ret != OK) { - /* Output some debug info on an error */ - - if (ret < 0) - { - udbg("Transfer failed: %d\n", ret); - } - - /* Break out and return this result */ - + udbg("Transfer failed: %d\n", ret); break; } } diff --git a/nuttx/drivers/usbhost/usbhost_storage.c b/nuttx/drivers/usbhost/usbhost_storage.c index 2817c24462..853287371d 100644 --- a/nuttx/drivers/usbhost/usbhost_storage.c +++ b/nuttx/drivers/usbhost/usbhost_storage.c @@ -1,8 +1,8 @@ /**************************************************************************** * drivers/usbhost/usbhost_storage.c * - * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Copyright (C) 2010-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -123,7 +123,7 @@ struct usbhost_state_s struct usbhost_driver_s *drvr; /* The remainder of the fields are provide to the mass storage class */ - + char sdchar; /* Character identifying the /dev/sd[n] device */ volatile bool disconnected; /* TRUE: Device has been disconnected */ uint8_t ifno; /* Interface number */ @@ -217,7 +217,7 @@ static inline int usbhost_tfree(FAR struct usbhost_state_s *priv); static FAR struct usbmsc_cbw_s *usbhost_cbwalloc(FAR struct usbhost_state_s *priv); /* struct usbhost_registry_s methods */ - + static struct usbhost_class_s *usbhost_create(FAR struct usbhost_driver_s *drvr, FAR const struct usbhost_id_s *id); @@ -248,7 +248,7 @@ static int usbhost_ioctl(FAR struct inode *inode, int cmd, * Private Data ****************************************************************************/ -/* This structure provides the registry entry ID informatino that will be +/* This structure provides the registry entry ID informatino that will be * used to associate the USB host mass storage class to a connected USB * device. */ @@ -416,7 +416,7 @@ static inline void usbhost_freeclass(FAR struct usbhost_state_s *class) flags = irqsave(); class->class.flink = g_freelist; g_freelist = class; - irqrestore(flags); + irqrestore(flags); } #else static inline void usbhost_freeclass(FAR struct usbhost_state_s *class) @@ -700,16 +700,16 @@ static inline int usbhost_testunitready(FAR struct usbhost_state_s *priv) int result; /* Initialize a CBW (re-using the allocated transfer buffer) */ - + cbw = usbhost_cbwalloc(priv); if (!cbw) { udbg("ERROR: Failed to create CBW\n"); return -ENOMEM; } - + /* Construct and send the CBW */ - + usbhost_testunitreadycbw(cbw); result = DRVR_TRANSFER(priv->drvr, priv->bulkout, (uint8_t*)cbw, USBMSC_CBW_SIZEOF); @@ -733,7 +733,7 @@ static inline int usbhost_requestsense(FAR struct usbhost_state_s *priv) int result; /* Initialize a CBW (re-using the allocated transfer buffer) */ - + cbw = usbhost_cbwalloc(priv); if (!cbw) { @@ -742,7 +742,7 @@ static inline int usbhost_requestsense(FAR struct usbhost_state_s *priv) } /* Construct and send the CBW */ - + usbhost_requestsensecbw(cbw); result = DRVR_TRANSFER(priv->drvr, priv->bulkout, (uint8_t*)cbw, USBMSC_CBW_SIZEOF); @@ -775,7 +775,7 @@ static inline int usbhost_readcapacity(FAR struct usbhost_state_s *priv) int result; /* Initialize a CBW (re-using the allocated transfer buffer) */ - + cbw = usbhost_cbwalloc(priv); if (!cbw) { @@ -784,7 +784,7 @@ static inline int usbhost_readcapacity(FAR struct usbhost_state_s *priv) } /* Construct and send the CBW */ - + usbhost_readcapacitycbw(cbw); result = DRVR_TRANSFER(priv->drvr, priv->bulkout, (uint8_t*)cbw, USBMSC_CBW_SIZEOF); @@ -823,7 +823,7 @@ static inline int usbhost_inquiry(FAR struct usbhost_state_s *priv) int result; /* Initialize a CBW (re-using the allocated transfer buffer) */ - + cbw = usbhost_cbwalloc(priv); if (!cbw) { @@ -832,7 +832,7 @@ static inline int usbhost_inquiry(FAR struct usbhost_state_s *priv) } /* Construct and send the CBW */ - + usbhost_inquirycbw(cbw); result = DRVR_TRANSFER(priv->drvr, priv->bulkout, (uint8_t*)cbw, USBMSC_CBW_SIZEOF); @@ -885,7 +885,7 @@ static void usbhost_destroy(FAR void *arg) DEBUGASSERT(priv != NULL); uvdbg("crefs: %d\n", priv->crefs); - + /* Unregister the block driver */ usbhost_mkdevname(priv, devname); @@ -965,10 +965,10 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, uint8_t found = 0; int ret; - DEBUGASSERT(priv != NULL && + DEBUGASSERT(priv != NULL && configdesc != NULL && desclen >= sizeof(struct usb_cfgdesc_s)); - + /* Verify that we were passed a configuration descriptor */ cfgdesc = (FAR struct usb_cfgdesc_s *)configdesc; @@ -1004,7 +1004,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, case USB_DESC_TYPE_INTERFACE: { FAR struct usb_ifdesc_s *ifdesc = (FAR struct usb_ifdesc_s *)configdesc; - + uvdbg("Interface descriptor\n"); DEBUGASSERT(remaining >= USB_SIZEOF_IFDESC); @@ -1078,7 +1078,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, found |= USBHOST_BINFOUND; /* Save the bulk IN endpoint information */ - + bindesc.addr = epdesc->addr & USB_EP_ADDR_NUMBER_MASK; bindesc.in = 1; bindesc.funcaddr = funcaddr; @@ -1108,7 +1108,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, } /* Increment the address of the next descriptor */ - + configdesc += desc->len; remaining -= desc->len; } @@ -1116,7 +1116,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, /* Sanity checking... did we find all of things that we need? Hmmm.. I wonder.. * can we work read-only or write-only if only one bulk endpoint found? */ - + if (found != USBHOST_ALLFOUND) { ulldbg("ERROR: Found IF:%s BIN:%s BOUT:%s\n", @@ -1202,7 +1202,7 @@ static inline int usbhost_initvolume(FAR struct usbhost_state_s *priv) uvdbg("Test unit ready, retries=%d\n", retries); /* Send TESTUNITREADY to see the unit is ready */ - + ret = usbhost_testunitready(priv); if (ret == OK) { @@ -1585,7 +1585,7 @@ static FAR struct usbmsc_cbw_s *usbhost_cbwalloc(FAR struct usbhost_state_s *pri * Name: usbhost_create * * Description: - * This function implements the create() method of struct usbhost_registry_s. + * This function implements the create() method of struct usbhost_registry_s. * The create() method is a callback into the class implementation. It is * used to (1) create a new instance of the USB host class state and to (2) * bind a USB host driver "session" to the class instance. Use of this @@ -1644,9 +1644,9 @@ static FAR struct usbhost_class_s *usbhost_create(FAR struct usbhost_driver_s *d priv->drvr = drvr; /* NOTE: We do not yet know the geometry of the USB mass storage device */ - + /* Return the instance of the USB mass storage class */ - + return &priv->class; } } @@ -1701,7 +1701,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *class, FAR struct usbhost_state_s *priv = (FAR struct usbhost_state_s *)class; int ret; - DEBUGASSERT(priv != NULL && + DEBUGASSERT(priv != NULL && configdesc != NULL && desclen >= sizeof(struct usb_cfgdesc_s)); @@ -1722,7 +1722,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *class, udbg("usbhost_initvolume() failed: %d\n", ret); } } - + return ret; } @@ -1792,7 +1792,7 @@ static int usbhost_disconnected(struct usbhost_class_s *class) } } - irqrestore(flags); + irqrestore(flags); return OK; } @@ -1945,45 +1945,52 @@ static ssize_t usbhost_read(FAR struct inode *inode, unsigned char *buffer, ret = -ENOMEM; /* Initialize a CBW (re-using the allocated transfer buffer) */ - + cbw = usbhost_cbwalloc(priv); if (cbw) { - /* Assume some device failure */ + /* Loop in the event that EAGAIN is returned (mean that the + * transaction was NAKed and we should try again. + */ - ret = -ENODEV; - - /* Construct and send the CBW */ - - usbhost_readcbw(startsector, priv->blocksize, nsectors, cbw); - result = DRVR_TRANSFER(priv->drvr, priv->bulkout, - (uint8_t*)cbw, USBMSC_CBW_SIZEOF); - if (result == OK) + do { - /* Receive the user data */ + /* Assume some device failure */ - result = DRVR_TRANSFER(priv->drvr, priv->bulkin, - buffer, priv->blocksize * nsectors); + ret = -ENODEV; + + /* Construct and send the CBW */ + + usbhost_readcbw(startsector, priv->blocksize, nsectors, cbw); + result = DRVR_TRANSFER(priv->drvr, priv->bulkout, + (uint8_t*)cbw, USBMSC_CBW_SIZEOF); if (result == OK) { - /* Receive the CSW */ + /* Receive the user data */ result = DRVR_TRANSFER(priv->drvr, priv->bulkin, - priv->tbuffer, USBMSC_CSW_SIZEOF); + buffer, priv->blocksize * nsectors); if (result == OK) { - FAR struct usbmsc_csw_s *csw; + /* Receive the CSW */ - /* Check the CSW status */ - - csw = (FAR struct usbmsc_csw_s *)priv->tbuffer; - if (csw->status == 0) + result = DRVR_TRANSFER(priv->drvr, priv->bulkin, + priv->tbuffer, USBMSC_CSW_SIZEOF); + if (result == OK) { - ret = nsectors; + FAR struct usbmsc_csw_s *csw; + + /* Check the CSW status */ + + csw = (FAR struct usbmsc_csw_s *)priv->tbuffer; + if (csw->status == 0) + { + ret = nsectors; + } } } } - } + } while (result == -EAGAIN); } usbhost_givesem(&priv->exclsem); @@ -2037,7 +2044,7 @@ static ssize_t usbhost_write(FAR struct inode *inode, const unsigned char *buffe ret = -ENOMEM; /* Initialize a CBW (re-using the allocated transfer buffer) */ - + cbw = usbhost_cbwalloc(priv); if (cbw) { @@ -2046,7 +2053,7 @@ static ssize_t usbhost_write(FAR struct inode *inode, const unsigned char *buffe ret = -ENODEV; /* Construct and send the CBW */ - + usbhost_writecbw(startsector, priv->blocksize, nsectors, cbw); result = DRVR_TRANSFER(priv->drvr, priv->bulkout, (uint8_t*)cbw, USBMSC_CBW_SIZEOF); diff --git a/nuttx/include/nuttx/usb/usbhost.h b/nuttx/include/nuttx/usb/usbhost.h index b28db95511..acfe9a829f 100644 --- a/nuttx/include/nuttx/usb/usbhost.h +++ b/nuttx/include/nuttx/usb/usbhost.h @@ -448,7 +448,13 @@ * * Returned Values: * On success, zero (OK) is returned. On a failure, a negated errno value is - * returned indicating the nature of the failure + * returned indicating the nature of the failure: + * + * EAGAIN - If devices NAKs the transfer (or NYET or other error where + * it may be appropriate to restart the entire transaction). + * EPERM - If the endpoint stalls + * EIO - On a TX or data toggle error + * EPIPE - Overrun errors * * Assumptions: * This function will *not* be called from an interrupt handler. From d6b8fcdcf0834d1515ae254143eaf6ac9f2e4307 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sat, 25 Aug 2012 16:40:31 +0000 Subject: [PATCH 25/31] Prep for 6.21 release git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5052 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- apps/ChangeLog.txt | 10 +- nuttx/ChangeLog | 27 +- nuttx/Documentation/NuttX.html | 728 +++++++++++++++------ nuttx/ReleaseNotes | 64 ++ nuttx/arch/arm/src/stm32/Kconfig | 53 ++ nuttx/arch/arm/src/stm32/stm32_otgfshost.c | 6 +- 6 files changed, 676 insertions(+), 212 deletions(-) diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index 01ef090a04..20895f07b6 100755 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -248,7 +248,7 @@ being set to the priority of the parent thread; losing its configured priority. Reported by Mike Smith. -6.21 2012-xx-xx Gregory Nutt +6.21 2012-08-25 Gregory Nutt * apps/include/: Stylistic clean-up of all header files. * apps/modbus and apps/include/modbus: A port of freemodbus-v1.5.0 @@ -259,9 +259,9 @@ * apps/modbus: Add CONFIG_MB_TERMIOS. If the driver doesn't support termios ioctls, then don't bother trying to configure the baud, parity etc. - * apps/nslib: If waitpid() is supported, then NSH not catches the + * apps/nshlib: If waitpid() is supported, then NSH now catches the return value from spawned applications (provided by Mike Smith) - * apps/nslib: Lock the schedule while starting built-in applications + * apps/nshlib: Lock the scheduler while starting built-in applications in order to eliminate race conditions (also from Mike Smith). * apps/examples/adc, pwm, and qencoder: Add support for testing devices with multiple ADC, PWM, and QE devices. @@ -272,9 +272,11 @@ properties of mounted file systems. * apps/nshlib/nsh_parse.c: Extend help command options. 'help' with no arguments outputs a short list of commands. With -v lists all - command line details. And command name can be added to just get + command line details. A command name can be added to just get help on one command. * system/readline.c: If character input/output is interrupted by a signal, then readline() will try the read/write again. * apps/*/Make.defs: Numerous fixes needed to use the automated configuration (from Richard Cochran). + +6.22 2012-xx-xx Gregory Nutt diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 993719b11d..7a6e3f6eb0 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -2280,7 +2280,7 @@ the particular condition that revealed the bug occurred. My impression is that this latter bugfix also fixes some STM32 USB performance problems. * configs/hymini-stm32v: A configuration for the HY-Mini STM32v board contributed - by Laurent Latil. Theses changes also include support for the STM32F103VCT6. + by Laurent Latil. These changes also include support for the STM32F103VCT6. * arch/configs/stm3240g-eval/src/up_pwm.c: Add hooks needed to use the new apps/examples/pwm test of the STM32 PWM driver. * drivers/mtd/mp25x.c: Add ability to use different SPI modes and different @@ -2977,7 +2977,7 @@ * configs/lpc4330-xplorer/nsh: Add an NSH configuration for the LPC4330 Xplorer board. -6.21 2012-xx-xx Gregory Nutt +6.21 2012-08-25 Gregory Nutt * configs/lpc4330-xplorer/up_nsh.c: Add support for a basic SPIFI block driver for use by NSH. Does not work! Crashes on first SPIFI write. @@ -3024,7 +3024,7 @@ but the driver still does not work. * arch/arm/src/stm32 and arch/arm/include/stm32: Make name of RTC ALARM interrupt common on STM32 F1,2,4 - * arch/arm/src/stm32 and arch/arm/include/stm32: Add add support for the + * arch/arm/src/stm32 and arch/arm/include/stm32: Add support for the STM32F100x "Value Line" devices. This includes changes to stm32F10xx_rcc.c that add the ability to run the chip off the internal oscillator. There is no open board configuration for this part yet (the STM32VLDiscovery would be a candidate). @@ -3050,7 +3050,7 @@ * include/termios.h and lib/termios/*: Redesigned yet again (this is getting painful. NuttX now supports the BOTHER baud setting just as Linux does. termios Bxxx definitions are again encoded; cf[set|get][o|i]speed now deal with only the - encoded values. If the encode baud is set to BOTHER, then the values in the (non- + encoded values. If the encoded baud is set to BOTHER, then the values in the (non- standard) c_ispeed and c_ospeed baud values may be accessed directly. * arch/arm/src/stm32/stm32_serial.c: Add minimal termios support for the STM32 (BOTHER style baud settings only). Contributed by Mike Smith. @@ -3063,8 +3063,7 @@ * arch/arm/src/stm32/stm32_sdio.c and chip/stm32f20xx_pinmap.h: STM32 F2 SDIO fixes from Gary Teravskis and Scott Rondestvedt. * include/termios.h and lib/termios/*: Replace cfsetispeed and cfsetospeed with - cfsetspeed (with definitions for the input/outputs in termios.h). Same for - cfgetispeed and cfgetospeed. + cfsetspeed (with definitions for the input/outputs in termios.h). * configs/stm32f4discovery/src and configs/stm32f4discovery/pm: Add a power management configuration for the STM32F4Discovery and supporting logic. This check-in also includes some fixes for the F4 RTC alarm logic. @@ -3090,10 +3089,10 @@ * arch/mips/src/pic32mx/pic32mx-gpio.c: Now supports the PIC32MX1/2 ANSEL IOPORT register. * lib/string/lib_memchr.c: Add support for memchr() (contributed by Mike Smith) - * lib/string/lib_memccpy.c: Add support for memcpy() + * lib/string/lib_memccpy.c: Add support for memccpy() * arch/arm/src/lpc17xx/lpc17_serial.c: Now supports ioctl commands to change the baud using tcsetattr() (contributed by Chris Taglia). - * arch/*/src/*_serial.c: Fix ioctl method return values. Theses methods + * arch/*/src/*_serial.c: Fix ioctl method return values. These methods should return a negated errno value; they should not set the errno variable. * sched/on_exit.c, sched/task_exithook.c, and include/nuttx/sched.c: Add @@ -3118,7 +3117,7 @@ * arch/arm/src/stm32/stm32*_rcc.c and .h: If CONFIG_PM is defined, add a function called stm32_clockenable() that can be used by PM logic to re-start the PLL after re-awakening from deep sleep modes. - * fs/fs_foreachinode.c and fs/fs_foreachmountpoint.c: All logic to traverse + * fs/fs_foreachinode.c and fs/fs_foreachmountpoint.c: Add logic to traverse inodes and mountpoints in the NuttX pseudo-file system. * fs/fat/fs_fat32.c: Max. filename length reported by statfs() was wrong if FAT long file names were enabled. @@ -3137,7 +3136,7 @@ LPC31xx has the same USB IP, but will require some additional initialization (and lots of testing) before it can be used with the LPC43xx. * nuttx/Documentation/NuttShell.html: Added a section covering ways to - customize the behavior or NSH. + customize the behavior of NSH. * arch/arm/src/stm32/chip/stm32f1*_pinmap.h: STM32 CAN TX/RX pins reversed; inconsistent conditional compilation. Reported by Max Holtzberg. * arch/arm/*/stm32: Add support for STM32 F107 "Connectivity Line" @@ -3166,14 +3165,16 @@ for all 8-bit AVR platforms (Thanks Richard Cochran). * lib/stdio/lib_*stream.c: Revised to handle new error return values from serial.c. - * arch/arm/src/stm32/stm32_spi.c: SPI driver can now survice re- + * arch/arm/src/stm32/stm32_spi.c: SPI driver can now service re- initialization (Mike Smith). * tools/mkconfig.c: If CONFIG_DRAM_END is not specified, this tool will provide default definition of (CONFIG_DRAM_START + CONFIG_DRAM_SIZE) * arch/arm/src/stm32/stm32_otgfshost.c: Renamed from stm32_usbhost.c. This is nearly code complete and, with any luck, will be available - in NuttX-6.22. + in NuttX-6.21. * configs/*/defconfig: Update all defconfig files to remove syntax that is incompatible with the mconf configuration tool. * arch/arm/src/stm32/stm32_otgfshost.c: This driver now appears to be - functional (although more testing is necesary). \ No newline at end of file + functional (although more testing is necesary). + +6.22 2012-xx-xx Gregory Nutt diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index 042042890e..446ccd26f0 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -8,7 +8,7 @@

NuttX RTOS

-

Last Updated: August 10, 2012

+

Last Updated: August 25, 2012

@@ -407,6 +407,13 @@

+ +
+ +

+

  • Generic system logging (SYSLOG) support.
    • +

    +
    @@ -967,106 +974,261 @@ -

    NuttX-6.20 Release Notes

    +

    NuttX-6.21 Release Notes

    - The 87th release of NuttX, Version 6.20, was made on July 12, 2012, and is available for download from the + The 88th release of NuttX, Version 6.21, was made on August 25, 2012, and is available for download from the SourceForge website. - Note that the release consists of two tarballs: nuttx-6.20.tar.gz and apps-6.20.tar.gz. + Note that the release consists of two tarballs: nuttx-6.21.tar.gz and apps-6.21.tar.gz. Both may be needed (see the top-level nuttx/README.txt file for build information) The change log associated with the release is available here. Unreleased changes after this release are available in SVN. These unreleased changes are also listed here.

    - This release corresponds with SVN release number: r4937 + This release corresponds with SVN release number: r5052

    Additional new features and extended functionality

      -
    • Power Management -

      - An evolving power management example is being created by Diego Sanchez. - This effort currently involves on the STM32 F1 but clearly demonstrates the NuttX power management system which will automatically drive the system to lower power usage states due to lack of use. +

    • Core +
        +
      • + Add support for multiple registered atexit() functions. +
        • +
      • + Syslog extended: + Now any character driver may be used for the debug logging device. + Mountpoint traversal logic. +
        • +
      • -
    • Drivers -

      - Added a driver for the SST 25 SPI-based FLASH parts. -

      • -
    • PIC32 -

      - Added support for the PIC32MX1 and PIC32MX2 families. - Added support for the microchipOpen and Pinguino toolchains. +

    • Common Drivers +
        +
      • + Added support for the TI PGA112-7 amplifier/multiplexor. +
        • +
    • NXP LPC43XX -

      - Added support for the entire LPC43xx family +

        +
      • + Added clock ramp-up logic to run at 204 MHz. +
        • +
      • -
    • PIC32 boards -

      - Added support for the DTX1-4000L "Mirtoo" module/ - See the Dimitech website for further information. - (PIC32MX2). +

    • NXP LPC43XX Drivers +
        +
      • + SPIFI block driver +
        • +
      • + RS-485 support +
        • +
      • + Minimal termios support +
        • +
      • + Framework for USB0 device controller driver. +
        • +
      • -
    • NXP LPC43XX Boards -

      - Added support for NGX Technologies LPC4330-Xplorer board. +

    • NXP LPC17XX Drivers +
        +
      • + Minimal termios support +
        • +
      • -
    • NXP LPC17XX Boards -

      - Added support for Micromint Lincoln60 board (LPC1769). -

      • -
    • LM3S Boards -

      - Add a configuration to support the TI/Stellaris EKK-LM3S3B96 development board. - Contributed by Jose Pablo Rojas V. -

      • -
    • Library -

      - NuttX now supports platform-specific stdarg.h header files. -

      • -
    - -

    Work in progress. - This release includes some partially completed work that is still not ready for prime time. -

    - -
      -
    • Automated Configuration -

      - Automated configuration based on the kconfig-frontends tool is being incorporated into the build system. - The configuration is still not complete enough for general use in this release. -

      +
    • STM32 +
        +
      • + Support for STM32 F1 "Value Line" (contributed by Mike Smith). +
        • +
      • + Add support for STM32 F107 "Connectivity Line" (contributed by Max Holtzberg). +
        • +
      • + Clock restart logic needed for recovery from low power modes. +
        • +
    • STM32 Drivers -

      - Added files that will (eventually) hold an STM32 OTG FS host driver. This is still a work in progress. -

      +
        +
      • + RTC alarm support. Usable for wakeup from sleep mode. +
        • +
      • + Minimal serial termios support. +
        • +
      • + USB OTG FS host driver (alpha). +
        • +
      +
      • +
    • STM32 Boards +
        +
      • + Add power management hooks for the STM32F4Discovery +
        • +
      • + Add support for the Olimex STM32-P107 (contributed by Max Holtzberg) +
        • +
      +
      • +
    • PIC32 +
        +
      • + Add support for the Pinguino MIPS toolchain +
        • +
      +
      • +
    • PIC32 Drivers +
        +
      • + GPIO driver now supports F1 analog regiaters (ANSEL) +
        • +
      +
      • +
    • PIC32 Boards +
        +
      • + Add support for the PGA117 on the Mirtoo module +
        • +
      +
      • +
    • Calypso +
        +
      • + Add support for the SSD1783 LCD on the Compal E99 +
        • +
      +
      • + +
    • Library +
        +
      • + cfsetispeed(), cfsetospeed(), tcflush(), memchr(), and memccpy(). +
        • +
      +
      • +
    • Applications +
        +
      • + Port of freemodbus-v1.5.0. +
        • +
      • + Add support for testing devices with multiple ADC, PWM, and QE devices. +
        • +
      • + NSH mount command (with no arguments) will now show mounted volumes. +
        • +
      • + Added new NSH df command to show file system usage. +
        • +
      • + Extended NSH 'help' support. +
        • +
      • + NSH now catches the return value from spawned applications (provided by Mike Smith). +
        • +
      +
      • +
    • Build System +
        +
      • + mkconfig will not define CONFIG_DRAM_END. +
        • +
      • + A lot of progress has been made on the automated NuttX configuration logic (Thanks go to Richard Cochran). +
        • +
      +
      • +
    • Documentation +
        +
      • + Document ways to customize the behavior of NSH +
        • +

    Bugfixes (see the change log for details):

      -
    • PIC32 -

      - GPIO output configuration (critical bug) -

      +
    • Serial drivers (all) +
        +
      • + Fix ioctl() return value. +
        • +
      • + Common "upper half" serial driver will now return with EINTR if a serial wait is interrupted by a signal. +
        • +
      +
      • +
    • FAT +
        +
      • + Fix statfs() file name length +
        • +
      +
      • +
    • NXP LPC43xx +
        +
      • + Clock configuration +
        • +
    • STM32 -

      - Typos in pin mapping files. -

      +
        +
      • + Pinmap fixes +
        • +
      • + SPI driver re-initialization +
        • +
      • -
    • LM3S -

      - Fixed an optimization related but that caused slow start-up times if optimization was disabled. -

      +
    • STM32 Boards +
        +
      • + Correct and lower SDIO frequency for F2 and f4 boards +
        • +
      +
      • +
    • AVR +
        +
      • + C++ build issues +
        • +
      +
      • +
    • Power Management (PM) +
        +
      • + Fix a place where interrupts were not be re-enabled +
        • +
      +
      • +
    • Applications +
        +
      • + Fix NSH application start-up race condition +
        • +
    • Library -

      - Fixed signed extension but in all limit.h files(reported by Lorenz Meier). - Fixed inet_ntoa compilation failure on with SDCC. -

      +
        +
      • + Fieldwidth and justification for %s format. +
        • +
      • + Fixed several issues with presenting floating point numbers. +
        • +
      • + NULL definition for C++ +
        • +

    @@ -1909,23 +2071,34 @@ This port uses the STMicro STM3240G-EVAL board featuring the STM32F407IGH6 MCU. Refer to the STMicro web site for further information about this board.

    -
      -

      - STATUS: - As of this writing, the basic port is complete and first appeared in NuttX-6.12. - The port passes the NuttX OS test and includes a validated configuration for the NuttShell (NSH, see the - NSH User Guide) as well as several other configurations. - Additional drivers and configurations were added in NuttX 6.13-6.16. - Drivers include an Ethernet driver, ADC driver, DAC driver, PWM driver, CAN driver, F4 RTC driver, Quadrature Encoder, DMA, SDIO with DMA - (these should all be compatible with the STM32 F2 family and many should also be compatible with the STM32 F1 family as well). - The NuttX6.16 release also includes and logic for saving/restoring F4 FPU registers in context switches. - Networking intensions include support for Telnet NSH sessions and new configurations for DHPCD and the networking test (nettest). - A more complete port would include support for SDIO and USB OTG which are not available in NuttX 6.13. - The USB OTG device controller driver, and LCD driver and a function I2C driver were added in NuttX 6.17. - STM32 IWDG and WWDG watchdog timer drivers were added in NuttX 6.18 (should be compatible with F1 and F2). - An LCD driver and a touchscreen driver for the STM3240G-EVAL based on the STMPE811 I/O expander were also added in NuttX 6.18. +

      + STATUS: +

        +
      • NuttX-6.12 + The basic port is complete and first appeared in NuttX-6.12. + The initial port passes the NuttX OS test and includes a validated configuration for the NuttShell (NSH, see the + NSH User Guide) as well as several other configurations. +
        • +
      • NuttX-6.13-6.16 + Additional drivers and configurations were added in NuttX 6.13-6.16. + Drivers include an Ethernet driver, ADC driver, DAC driver, PWM driver, CAN driver, F4 RTC driver, Quadrature Encoder, DMA, SDIO with DMA + (these should all be compatible with the STM32 F2 family and many should also be compatible with the STM32 F1 family as well). +
        • +
      • NuttX-6.16 + The NuttX 6.16 release also includes and logic for saving/restoring F4 FPU registers in context switches. + Networking intensions include support for Telnet NSH sessions and new configurations for DHPCD and the networking test (nettest). +
        • +
      • NuttX-6.17 + The USB OTG device controller driver, and LCD driver and a function I2C driver were added in NuttX 6.17. +
        • +
      • NuttX-6.18 + STM32 IWDG and WWDG watchdog timer drivers were added in NuttX 6.18 (should be compatible with F1 and F2). + An LCD driver and a touchscreen driver for the STM3240G-EVAL based on the STMPE811 I/O expander were also added in NuttX 6.18. +
        • +
      • NuttX-6.21 + A USB OTG host controller driver was added in NuttX 6.21. +

        • -
      @@ -1944,6 +2117,7 @@

      STATUS: The basic port for the STM32F4-Discovery was contributed by Mike Smith and was first released in NuttX-6.14. + Drivers listed for the STM3240G-EVAL may be usable on this plaform as well.

    @@ -1960,36 +2134,44 @@ This NuttX port is for the LPC4330-Xplorer board from NGX Technologies featuring the NXP LPC4330FET100 MCU. See the NXG website for further information about this board.

    +

    + STATUS: +

      -

      - STATUS: - The basic port is complete. - The OS test configuration and the basic NSH configurations are present and fully verified. - This includes verified support for: SYSTICK system time, pin and GPIO configuration, and a serial console. -

      -

      - Several drivers have been copied from the related LPC17xx port but require integration into the LPC43xx: ADC, DAC, GPDMA, I2C, SPI, and SSP. - The registers for these blocks are the same in both the LPC43xx and the LPC17xx and they should integrate into the LPC43xx very easily by simply adapting the clocking and pin configuration logic. -

      -

      - Other LPC17xx drivers were not brought into the LPC43xx port because these peripherals have been completely redesigned: CAN, Ethernet, USB device, and USB host. -

      -

      - So then there is no support for the following LPC43xx peripherals: SD/MMC, EMC, USB0,USB1, Ethernet, LCD, SCT, Timers 0-3, MCPWM, QEI, Alarm timer, WWDT, RTC, Event monitor, and CAN. -

      -

      - Some of these can be leveraged from other MCUs that appear to support the same peripheral IP: -

        -
      • - The LPC43xx USB0 peripheral appears to be the same as the USB OTG peripheral for the LPC31xx. - The LPC31xx USB0 device-side driver has been copied from the LPC31xx port but also integration into the LPC43xx (clocking and pin configuration). - It should be possible to complete poriting of this LPC31xx driver with a small porting effort. -
        • -
      • - The Ethernet block looks to be based on the same IP as the STM32 Ethernet and, as a result, it should be possible to leverage the NuttX STM32 Ethernet driver with a little more effort. -
        • -
      -

      +
    • +

      NuttX-6.20 + The basic port is complete. + The OS test configuration and the basic NSH configurations are present and fully verified. + This includes verified support for: SYSTICK system time, pin and GPIO configuration, and a serial console. +

      +

      + Several drivers have been copied from the related LPC17xx port but require integration into the LPC43xx: ADC, DAC, GPDMA, I2C, SPI, and SSP. + The registers for these blocks are the same in both the LPC43xx and the LPC17xx and they should integrate into the LPC43xx very easily by simply adapting the clocking and pin configuration logic. +

      +

      + Other LPC17xx drivers were not brought into the LPC43xx port because these peripherals have been completely redesigned: CAN, Ethernet, USB device, and USB host. +

      +

      + So then there is no support for the following LPC43xx peripherals: SD/MMC, EMC, USB0,USB1, Ethernet, LCD, SCT, Timers 0-3, MCPWM, QEI, Alarm timer, WWDT, RTC, Event monitor, and CAN. +

      +

      + Some of these can be leveraged from other MCUs that appear to support the same peripheral IP: +

        +
      • + The LPC43xx USB0 peripheral appears to be the same as the USB OTG peripheral for the LPC31xx. + The LPC31xx USB0 device-side driver has been copied from the LPC31xx port but also integration into the LPC43xx (clocking and pin configuration). + It should be possible to complete poriting of this LPC31xx driver with a small porting effort. +
        • +
      • + The Ethernet block looks to be based on the same IP as the STM32 Ethernet and, as a result, it should be possible to leverage the NuttX STM32 Ethernet driver with a little more effort. +
        • +
      +

      +
      • +
    • +

      NuttX-6.21 + Added support for a SPIFI block driver and for RS-485 option to the serial driver. +

    @@ -2443,9 +2625,17 @@

    Development Environment: - These ports uses the LITE version of the PIC32MX toolchain available - for download from the MicroChip website. + These ports uses either:

    +
      +
    1. + The LITE version of the PIC32MX toolchain available + for download from the MicroChip website, or +
      2. +
    2. + The Pinguino MIPS ELF toolchain avaiable from the Pinquino website. +
      3. +
    @@ -3011,86 +3201,236 @@ Other memory: 
      -nuttx-6.20 2012-07-12 Gregory Nutt <gnutt@nuttx.org>
+nuttx-6.21 2012-08-25 Gregory Nutt <gnutt@nuttx.org>
 
-    * configs/stm3210e-eval/src and arch/arm/src/stm32/: Add beginnings of
-      power management support for the STM32 and the STM3210E-EVAL board, in
-      particular.
-    * Documentation/NfsHowTo.html:  Add a How-To document for the new NFS
-      client feature.
-    * arch/mips/include/pic32mx and arch/mips/src/pic32mx:  Add support for the
-      PIC32MX1 and PIC32MX2 families.
-    * configs/mirtoo:  Add a board configuration to support the DTX1-4000L
-      "Mirtoo" module from http://www.dimitech.com/
-    * tools/pic32mx:  All of the duplicate directories containing the same
-      same PIC32 tools were move to this single location.
-    * configs/mirtoo:  The basic Mirtoo port is now functional.
-    * configs/mirtoo/ostest:  Added support for the microchipOpen toolchain
-      (see http://sourceforge.net/projects/microchipopen/).
-    * configs/mirtoo/nsh:  Added a NuttShell (NSH) configuration for
-      the Mirtoo module.
-    * configs/mirtoo/scripts:  Move all Mirtoo linker scripts to a common
-      directory.
-    * arch/mips/src/pic32mx/pic32mx-gpio.c:  All digital inputs were being
-      configured as outputs.  This is a *critical* bug fix and needs to be
-      incorporated by any PIC32 users.
-    * drivers/mtd/sst25.c:  Added a driver for the SST 25 SPI-based FLASH
-      parts.
-    * configs/mirtoo/src/up_nsh.c:  The Mirtoo NSH configuration can now
-      mount the SST 25 devices so that it can be used for a FAT file system.
-      There are are, however, some NSH memory usage issues if this configuration
-      enabled now.  Some tuning is still needed.
-    * configs/mirtoo/nxffs:  Add an alternative NSH configure for the Mirtoo
-      module for testing the on-module SST 25 chip using the NXFFS file system.
-    * arch/arm/src/lpc43xx and arch/arm/include/lpc43xx:  The NXP LPC43xx port
-      is slowly evolving in these directories.
-    * configs/stm3210e-eval/pm:  Add a new configuration for testing STM32 power
-      management.
-    * configs/stm3210e-eval/scripts:  Moved all of the duplicate ST3210-EVAL 
-      linker scripts into one set of linker scripts at this location.
-    * configs/stm3210e-eval/src/up_buttons.c, up_lcd.c, and up_pm.c:  New logic
-      for testing STM32 power management.
-    * configs/lincoln60:  Add a configuration to support the Micromint Lincoln60
-      board.
-    * configs/ekk-lm3s3b96:  Add a configuration to support the TI/Stellaris
-      EKK-LM3S3B96 development board.  Contributed by Jose Pablo Rojas V.
-    * arch/arm/src/lpc43xx/chip:  Created header files for *all* (really)
-      lpc43xx registers and all bit-fields.
-    * configs/lpc4330-xplorer:  Added a configuration for the NXP LPC43XX
-      Xplorer board.  This is just to facilitate testing of the LPC43xx
-      port but will, with any luck, become proper board support for that
-      board.
-    * arch/arm/src/lm3s/lm3s_syscontrol.c:  Fix an optimization related problem
-      by adding a volatile qualifier to a timing loop.  Oddly, the consequence
-      of the bug is that when debug was off, the LM3S platform too a long time
-      to boot.  It now boots rapidly whether debug is on or off.
-    * arch/*/include/limits.h:  Change all values in all limits.h for all
-      architectures to signed decimal; the hex values were not sign extending
-      appropriate in most uses (reported by Lorenz Meier).
-    * arch/arm/src/stm32/chip/stm32f103/7vc_pinmap:  Fix typographical error in
-      two pinmap definition files.
-    * lib/net/lib_inetntoa.c:  Fix typographical error that cause compilation
-      failure on platforms that do not support passing of structures as
-      parameters.
-    * arch/arm/*/lpc43xx and configs/lpc4330-xplorer and code complete and
-      ready for testing.  Hopefully, verified LPC43xx support will appear
-      in NuttX-6.20.
-    * include/nuttx/stdarg.h:  If CONFIG_ARCH_STDARG_H=y is defined, the top-level
-      makefile will copy the generic (GCC-only) stdarg.h header file from
-      include/nuttx/stdarg.h to include/stdarg.h.  So for the architectures
-      that cannot use their GCC toolchain's stdarg.h file, they can use this
-      alternative by defining CONFIG_ARCH_STDARG_H=y.  If CONFIG_ARCH_STDARG_H,
-      is not defined, then the redirecting stdarg.h header file will stay
-      out-of-the-way in include/nuttx/.
-    * configs/lpc4330-xplorer/nsh:  Add an NSH configuration for the LPC4330
-      Xplorer board.
+    * configs/lpc4330-xplorer/up_nsh.c:  Add support for a basic SPIFI block
+      driver for use by NSH.  Does not work!  Crashes on first SPIFI write.
+    * configs/lpc4330-xplorer/*/defconfig: Calibrate delay loops (this is
+      based on the current "slow" 72MHz M4 clock and will need to be
+      re-calibrated when this is increased).
+    * configs/stm3220g-eval/include/board.h and configs/stm3240g-eval/include/board.h:
+      The SDIOCLK frequency in the F2 and F4 derives for PLL48CLK and not HCLK
+      so that the SDIOCLK input frequency should always be 48MHz.
+    * sched/os_internal.h, sched_setupidlefiles.c, sched_setuptaskfiles.c, and
+      sched_setupidlefiles.c:  Detangle some conditional compilation.  Allow for
+      a perverse configuration that has socket descriptors and streams but no file
+      descriptors (sure, why not?).
+    * sched/: Stylistic clean-up of all files.  Some of these files are pretty old
+      and do not follow current NuttX coding standards in detail.
+    * fs/: More stylistic file clean-up.
+    * mm/: More stylistic file clean-up.
+    * drivers/ and drivers/serial/: More stylistic file clean-up.
+    * arch/arm/src/lpc43xx/lpc43_clockconfig.c:  Fix PLL1 bit manipulation logic.
+      Critical bugfix! This would often cause the LPC43xx to fail to boot.
+    * arch/arm/src/lpc43xx/lpc43_rgu.c:  The soft reset logic called from the
+      beginning of __start seems cause problems.  A magic delay seems to improve
+      the logic some.  But I suspect that real fix is to get rid of all of the
+      soft reset logic.  This would also be a critical bugfix if I believed
+      that it really fixed all of the issues.
+    * arch/arm/src/lpc43xx/chip/lpc43_cgu.h:  Fix a bit mask in the PLL1
+      control register.  Critical bugfix.
+    * arch/arm/src/lpc43xx/lpc43_clockconfig.c and configs/lpc4330-xplorer/include/board.h:
+      Implement PLL1 ramp-up logic; Now the LPC43xx is running at 204MHz.
+    * configs/lpc4330-xplorer/*/defconfig:  Re-calibrated delay loops using
+      the 204MHz clock.  The LPC43xx ripping rips!  This calibration was performed
+      with symbols enabled and all optimization disabled.  It will need to be
+      better recalibrated again down the road.
+    * arch/arm/src/stm32/stm32_exti.c:  Renamed to rch/arm/src/stm32/stm32_exti_gpio.c
+      to make a little room in the file name space.
+    * arch/arm/src/stm32/stm32_exti_alarm.c:  Add initial logic to attached the
+      RTC alarm EXTI interrupt.  This is work be performed mostly by Diego Sanchez.
+    * include/: More stylistic file clean-up.
+    * arch/arm/src/lpc43xx/lpc43_spifi.c, lpc43_spifi.h, and chip/lpc43_spifi.h:  Add
+      logic to configure and initialize the SPIFI device (does not yet work).
+    * configs/lpc4330-xplorer/include/board.h:  Reduce SPI SCLK value.
+    * arch/arm/src/lpc43xx/lpc43_spifi.c, lpc43_spifi.h, and chip/lpc43_spifi.h:
+      Logic completely redesigned.  It now creates an MTD driver to access SPIFI...
+      but the driver still does not work.
+    * arch/arm/src/stm32 and arch/arm/include/stm32: Make name of RTC ALARM interrupt
+      common on STM32 F1,2,4
+    * arch/arm/src/stm32 and arch/arm/include/stm32: Add support for the
+      STM32F100x "Value Line" devices. This includes changes to stm32F10xx_rcc.c that
+      add the ability to run the chip off the internal oscillator.  There is no open
+      board configuration for this part yet (the STM32VLDiscovery would be a candidate).
+      Contributed by Mike Smith.
+    * arch/arm/src/stm32: Fixed typos in conditional compilation in the CAN and DMA
+      and some pin configuration.  This would have caused problems for STM32 F107xx.
+      Typos noted by Mike Smith.
+    * arch/arm/src/lpc43xx/lpc43_serial.c:  Add support for certain RS-485 features
+    * lib/termios/lib_cfsetispeed.c, lib_cfsetospeed.c, lib_tcflush.c:  Add
+      simple implementations of cfsetispeed(), cfsetospeed(), and tcflush().
+    * include/sys/str_tty.h, lib/lib_setspeed.c, lib_getspeed.c, and lib_resetspeed.c:
+      Add APIs to support setting non-standard BAUD values not supported by POSIX
+      termios.  These are non-standard interfaces but have a precedence:  There are
+      similar interfaces in AIX.
+    * include/sys/str_tty.h, lib/lib_setspeed.c, lib_getspeed.c, and lib_resetspeed.c:
+      Sigh... removed.  We don't need any more almost standard interfaces!  (SVN
+      revision 4968 if you want the short-lived code).
+    * include/termios.h and lib/termios/*:  Open the existing, standard termios
+      interfaces to permit some non-standard baud settings.  The new termios definitions
+      still supports the POSIX standard except that it does not strictly enforce
+      baud rate settings, permitting some non-portable, but useful baud rate settings
+      (this is what the short-lived AIX-like interfaces would have accomplished as well).
+    * include/termios.h and lib/termios/*:  Redesigned yet again (this is getting
+      painful.  NuttX now supports the BOTHER baud setting just as Linux does.  termios
+      Bxxx definitions are again encoded; cf[set|get][o|i]speed now deal with only the
+      encoded values.  If the encoded baud is set to BOTHER, then the values in the (non-
+      standard) c_ispeed and c_ospeed baud values may be accessed directly.
+    * arch/arm/src/stm32/stm32_serial.c:  Add minimal termios support for the STM32
+      (BOTHER style baud settings only).  Contributed by Mike Smith.
+    * configs/lpc4343-xplorer/src:  Clean up SPIFI-library based build to that it
+      actually works.
+    * arch/arm/src/lpc43xx/lpc43_spifi.c:  Add support for verification to writes.
+      Add debug option to dump buffers.  Several bugfixes... almost works.
+    * include/termios.h, lib/termios/*, and arch/arm/src/stm32/stm32_serial.c: :
+      BOTHER is gone again.
+    * arch/arm/src/stm32/stm32_sdio.c and chip/stm32f20xx_pinmap.h:  STM32 F2 SDIO
+      fixes from Gary Teravskis and Scott Rondestvedt.
+    * include/termios.h and lib/termios/*:  Replace cfsetispeed and cfsetospeed with
+      cfsetspeed (with definitions for the input/outputs in termios.h).
+    * configs/stm32f4discovery/src and configs/stm32f4discovery/pm:  Add a power
+      management configuration for the STM32F4Discovery and supporting logic.  This
+      check-in also includes some fixes for the F4 RTC alarm logic.
+    * drivers/input/pga11x.c and include/nuttx/input/pga11x.h:  Add support for the
+      TI PGA112/3/6/7 amplifier/multiplexer parts.
+    * configs/mirtoo/README.txt, nsh/defconfig, and nxffs/defconfig:  Add support
+      for the PGA117 on the Mirtoo module.
+    * drivers/analog/pga11x.c and include/nuttx/analog/pga11x.h:  These belong in
+      the analog subdirectories, not input.
+    * configs/compal_e99/src/ssd1783.c and /ssd1783.h:  Drivers for the SSD1783
+      LCD found in the Motorola C155 telephone.  The driver is specific to the C155
+      because it uses the uwire transport.  Contributed by Denis Carilki and
+      Alan Carvalho de Assis.
+    * drivers/power/pm_changestate.c.  Correct a case where interrupts were not
+      being re-enabled.  Found by Diego Sanchez.
+    * configs/mirtoo/nxffs/defconfig:  This Mirtoo NXFFS configuration now uses the
+      open Pinguino toolchain by default.  This is necessary because the free C32
+      toolchain does not support any optimization and the unoptimized NXFFS image
+      hits the PIC32MX2 FLASH size (128K).  There is plenty of room to grow using
+      the Pinguino toolchain with -O2 optimization.
+    * configs/mirtoo/src/up_adc.c.  This is just a stub for now, but this is
+      where Mirtoo ADC logic will eventually need to go.
+    * arch/mips/src/pic32mx/pic32mx-gpio.c:  Now supports the PIC32MX1/2 ANSEL
+      IOPORT register.
+    * lib/string/lib_memchr.c:  Add support for memchr() (contributed by Mike Smith)
+    * lib/string/lib_memccpy.c:  Add support for memccpy()
+    * arch/arm/src/lpc17xx/lpc17_serial.c:  Now supports ioctl commands to change
+      the baud using tcsetattr() (contributed by Chris Taglia).
+    * arch/*/src/*_serial.c: Fix ioctl method return values.  These methods
+      should return a negated errno value; they should not set the errno
+      variable.
+    * sched/on_exit.c, sched/task_exithook.c, and include/nuttx/sched.c:  Add
+      support for multiple registered on_exit() functions if CONFIG_SCHED_ONEXIT_MAX
+      is defined.
+    * drivers/syslog/ramlog.c: Move the RAM SYSLOG device into drivers/syslog
+      so that it will be in the same directory as some new SYSLOGing devices
+      in the works.
+    * include/nuttx/syslog.h and drivers/syslog/ramlog.c:  The SYSLOG putc function
+      now has a common name that is independent of the device that provides the
+      SYSLOG.
+    * include/nuttx/syslog.h and drivers/syslog/syslog.c:  This is a new, generic
+      SYSLOG device that can redirect debug output to any character device or file.
+      So you can log debug output to a file or you can put the console on /dev/ttyS0
+      and the debug output on /dev/ttyS1.
+    * arch/arm/src/lpc43xxl/lpc43_spifi.c: Correct an addressing error in the LPC43
+      SPIFI MTD driver
+    * drivers/syslog/syslog.c and fs/fs_syslog.c:  Moved the generic syslog logic
+      from drivers/syslog to fs/ where is belongs.  Especially after realizing that
+      the syslog logic is going to have to some internal FS operations in order
+      to realize a totally thread-independent SYSLOG interface.
+    * arch/arm/src/stm32/stm32*_rcc.c and .h:  If CONFIG_PM is defined, add a
+      function called stm32_clockenable() that can be used by PM logic to re-start
+      the PLL after re-awakening from deep sleep modes.
+    * fs/fs_foreachinode.c and fs/fs_foreachmountpoint.c:  Add logic to traverse
+      inodes and mountpoints in the NuttX pseudo-file system.
+    * fs/fat/fs_fat32.c: Max. filename length reported by statfs() was wrong
+      if FAT long file names were enabled.
+    * lib/stdio/lib_libvsprintf.c:  Fieldwidth and justification were not
+      supported for the %s format.  As a result, %s, %12s, and %-12s all
+      produced the same output.
+    * lib/stdio/lib_libdtoa.c:  Fix several issues with presenting floating
+      point numbers (conversions are fine, but presentation was bad).  This
+      is a critical bug fix if you use printf or sprintf to deal with floating
+      point numbers.
+    * lib/stdio/lib_libdtoa.c and lib_libvsprintf.c:  Correct some floating
+      point options.
+    * arch/arm/lpc43xx/lpc32_usb0dev.c:  Add framework for development of
+      an USB0, device-side driver for the LPC43XX.  The initial check-in,
+      however, is simply for the LPC31xx driver with name changes.  The
+      LPC31xx has the same USB IP, but will require some additional initialization
+      (and lots of testing) before it can be used with the LPC43xx.
+    * nuttx/Documentation/NuttShell.html:  Added a section covering ways to
+      customize the behavior of NSH.
+    * arch/arm/src/stm32/chip/stm32f1*_pinmap.h: STM32 CAN TX/RX pins reversed;
+      inconsistent conditional compilation.  Reported by Max Holtzberg.
+    * arch/arm/*/stm32:  Add support for STM32 F107 "Connectivity Line" 
+      Ethernet (contributed by Max Holtzberg).
+    * configs/olimex-stm32-p107:  Add board support for the Olimiex STM32-P107
+       board (contributed by Max Holtzberg).
+    * arch/arm/src/stm32/stm32f2xx_dma.c, stm32f4xx_dma.c, stm32_serial.c, and
+      stm32_spic.c:  DMA priority was getting zeroed by STM32 F2/F4 DMA drivers
+      so that all DMAs ran at the lowest priority.
+    * configs/stm3240g-eval/include/board.h and configs/stm3220:  Drop SD card
+      frequency from 24 to 16 MHz.  Apparently 24 MHz is too fast for the board.
+      This (plus the change to the STM32 DMA (above) fixes SDIO DMA on the
+      STM3240G-EVAL (and probably STM3220G-EVAL -- untested).
+    * arch/arm/src/stm32/stm32f2xx_dma.c and stm32f4xx_dma.c: Backed out the
+      DMA priority change just above.  The reduced SD card frequency was
+      necessary and sufficient to resolve the problem.
+    * drivers/serial/serial.c:  open, read, write, and poll methods may now
+      abort return EINTR (or a short transfer size) if a signal is received
+      while waiting to receive or send serial data.  This behavior is required
+      by POSIX.
+    * include/sys/types.h:  Define NULL to be (0) if __cplusplus is defined.
+      (contributed by Mike Smith)
+    * include/ctype.h: Remove a stray semi-colon in a definitions (Thanks
+      Mike Smith).
+    * configs/.../Make.defs.  Fix C++ include path set-up in Make.defs file
+      for all 8-bit AVR platforms (Thanks Richard Cochran).
+    * lib/stdio/lib_*stream.c:  Revised to handle new error return values from
+      serial.c.
+    * arch/arm/src/stm32/stm32_spi.c:  SPI driver can now service re-
+      initialization (Mike Smith).
+    * tools/mkconfig.c:  If CONFIG_DRAM_END is not specified, this tool
+      will provide default definition of (CONFIG_DRAM_START + CONFIG_DRAM_SIZE)
+    * arch/arm/src/stm32/stm32_otgfshost.c:  Renamed from stm32_usbhost.c.
+      This is nearly code complete and, with any luck, will be available
+      in NuttX-6.21.
+    * configs/*/defconfig:  Update all defconfig files to remove syntax
+      that is incompatible with the mconf configuration tool.
+    * arch/arm/src/stm32/stm32_otgfshost.c:  This driver now appears to be
+      functional (although more testing is necesary).
 
-apps-6.19 2012-07-12 Gregory Nutt <gnutt@nuttx.org>
+apps-6.21 2012-08-25 Gregory Nutt <gnutt@nuttx.org>
 
-    * namedapp/exec_namedapp.c - Correct an error when round robin scheduling
-      is enabled.  The priority of the new, named application was erroneously
-      being set to the priority of the parent thread; losing its configured
-      priority.  Reported by Mike Smith.
+    * apps/include/: Stylistic clean-up of all header files.
+    * apps/modbus and apps/include/modbus:  A port of freemodbus-v1.5.0
+      has been added to the NuttX apps/ source tree.
+    * apps/examples/modbus:  A port of the freemodbus-v1.5.0 "demo"
+      program that will be used to verify the FreeModBus port
+    * apps/modbus:  Don't use strerror().  It is just too big.
+    * apps/modbus:  Add CONFIG_MB_TERMIOS.  If the driver doesn't support
+      termios ioctls, then don't bother trying to configure the baud, parity
+      etc.
+    * apps/nshlib:  If waitpid() is supported, then NSH now catches the
+      return value from spawned applications (provided by Mike Smith)
+    * apps/nshlib:  Lock the scheduler while starting built-in applications
+      in order to eliminate race conditions (also from Mike Smith).
+    * apps/examples/adc, pwm, and qencoder:  Add support for testing
+      devices with multiple ADC, PWM, and QE devices.
+    * apps/nshlib/nsh_mntcmds.c:  Separated mount-related commands out of
+      nsh_fscmds.c.  Extended to the mount command so that if no arguments
+      are provided, then the current mountpoints are enumerated.
+    * apps/nshlib/nsh_mntcmds.c:  Add an NSH df command to list the
+      properties of mounted file systems.
+    * apps/nshlib/nsh_parse.c:  Extend help command options.  'help' with
+      no arguments outputs a short list of commands.  With -v lists all
+      command line details.  A command name can be added to just get
+      help on one command.
+    * system/readline.c:  If character input/output is interrupted by a
+      signal, then readline() will try the read/write again.
+    * apps/*/Make.defs:  Numerous fixes needed to use the automated
+      configuration (from Richard Cochran).
 
 NxWidgets-1.2 2012-06-15 Gregory Nutt <gnutt@nuttx.org>
 
diff --git a/nuttx/ReleaseNotes b/nuttx/ReleaseNotes
index 26af0e38d4..98e71614cd 100644
--- a/nuttx/ReleaseNotes
+++ b/nuttx/ReleaseNotes
@@ -2999,3 +2999,67 @@ Bugfixes (see the change log for details) :
       on Z80.
 
 As well as other, less critical bugs (see the ChangeLog for details)
+
+NuttX-6.21
+^^^^^^^^^^
+
+The 88th release of NuttX, Version 6.21, was made on August 25, 2012,
+and is available for download from the SourceForge website.  Note
+that release consists of two tarballs:  nuttx-6.21.tar.gz and
+apps-6.21.tar.gz.  Both may be needed (see the top-level nuttx/README.txt
+file for build information).
+
+This release corresponds with SVN release number: r5052
+
+Additional new features and extended functionality:
+
+    * Core: Add support for multiple registered atexit() functions.  Syslog
+      extended:  Now any character driver may be used for the debug logging
+      device.  Mountpoint traversal logic.
+    * Drivers: Added support for the TI PGA112-7 amplifier/multiplexor.
+    * LPC43xx:  Added clock ramp-up logic to run at 204 MHz
+    * LPC43xx Drivers:  SPIFI block driver, RS-485 support, Minimal termios
+      support.  Framework for USB0 device controller driver.
+    * LPC17xx Drivers:  Minimal termios support
+    * STM32: Support for STM32 F1 "Value Line" (contributed by Mike Smith).
+      Add support for STM32 F107 "Connectivity Line" (contributed by Max
+      Holtzberg).
+      Clock restart logic needed for recovery from low power modes.
+    * STM32 Drivers:  RTC alarm support.  Usable for wakeup from sleep mode,
+      Minimal serial termios support.  USB OTG FS host driver (alpha).
+    * STM32 Boards: Add power management hooks for the STM32F4Discovery,
+      Add support for the Olimex STM32-P107 (contributed by Max Holtzberg).
+    * PIC32:  Add support for the Pinguino MIPS toolchain.
+    * PIC32 Drivers:  GPIO driver now supports F1 analog regiaters (ANSEL).
+    * PIC32 Boards: Add support for the PGA117 on the Mirtoo module.
+    * Calypso:  Add support for the SSD1783 LCD on the Compal E99.
+    * Library:  cfsetispeed(), cfsetospeed(), tcflush(), memchr(), and
+      memccpy().
+    * Applications:  Port of freemodbus-v1.5.0. Add support for testing
+      devices with multiple ADC, PWM, and QE devices.  
+      NSH: NSH 'mount' command (with no arguments) will now show mounted
+      volumes.  Add new NSH 'df' command.  Extended 'help' support. NSH
+      now catches the return value from spawned applications (provided
+      by Mike Smith).
+    * Build System: mkconfig will not define CONFIG_DRAM_END.  A lot of 
+      progress has been made on the automated NuttX configuration logic
+      (Thanks go to Richard Cochran).
+    * Documentation: Document ways to customize the behavior of NSH.
+
+Bugfixes (see the change log for details) :
+
+    * Serial drivers (all): Fix ioctl return value. Common "upper half"
+      serial driver will now return with EINTR if a serial wait is
+      interrupted by a signal.
+    * FAT: Fix statfs() file name length.
+    * LPC43xx: Clock configuration.
+    * STM32: Pinmap fixes, SPI driver re-initialization
+    * STM32 Boards: Correct and lower SDIO frequency for F2 and f4 boards.
+    * AVR: C++ build issues.
+    * PM: Fix a place where interrupts were not be re-enabled.
+    * Applications: NSH application start-up race conditions.
+    * Library: Fieldwidth and justification for %s format.  Fixed several
+      issues with presenting floating point numbers.  NULL definition
+      for C++
+
+As well as other, less critical bugs (see the ChangeLog for details)
diff --git a/nuttx/arch/arm/src/stm32/Kconfig b/nuttx/arch/arm/src/stm32/Kconfig
index 5d0d48f880..bf7c59c11a 100644
--- a/nuttx/arch/arm/src/stm32/Kconfig
+++ b/nuttx/arch/arm/src/stm32/Kconfig
@@ -1910,3 +1910,56 @@ config STM32_MII_MCO1
 	bool
 	default y if !STM32_MII_MCO2
 	depends on STM32_MII
+
+menu "USB Host Configuration"
+
+config STM32_OTGFS_RXFIFO_SIZE
+	int "Rx Packet Size"
+	default 128
+	depends on USBHOST && STM32_OTGFS
+	---help---
+		Size of the RX FIFO in 32-bit words. Default 128 (512 bytes)
+
+config STM32_OTGFS_NPTXFIFO_SIZE
+	int "Non-periodic Tx FIFO Size"
+	default 96
+	depends on USBHOST && STM32_OTGFS
+	---help---
+		Size of the non-periodic Tx FIFO in 32-bit words.  Default 96 (384 bytes)
+ 
+config STM32_OTGFS_PTXFIFO_SIZE
+	int "Periodic Tx FIFO size"
+	default 128
+	depends on USBHOST && STM32_OTGFS
+	---help---
+		Size of the periodic Tx FIFO in 32-bit words.  Default 96 (384 bytes)
+ 
+config STM32_OTGFS_DESCSIZE
+	int "Descriptor Size"
+	default 128
+	depends on USBHOST && STM32_OTGFS
+	---help---
+		Maximum size to allocate for descriptor memory descriptor.  Default: 128
+
+config STM32_OTGFS_SOFINTR
+	bool "Enable SOF interrupts"
+	default n
+	depends on USBHOST && STM32_OTGFS
+	---help---
+		Enable SOF interrupts.  Why would you ever want to do that?
+ 
+config STM32_USBHOST_REGDEBUG
+	bool "Register-Level Debug"
+	default n
+	depends on USBHOST && STM32_OTGFS
+	---help---
+		Enable very low-level register access debug.  Depends on CONFIG_DEBUG.
+ 
+config STM32_USBHOST_PKTDUMP
+	bool "Packet Dump Debug"
+	default n
+	depends on USBHOST && STM32_OTGFS
+	---help---
+		Dump all incoming and outgoing USB packets. Depends on CONFIG_DEBUG.
+
+endmenu
diff --git a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c
index d84ba68842..0b09070dc6 100644
--- a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c
+++ b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c
@@ -191,7 +191,11 @@ enum stm32_chreason_e
   CHREASON_FRMOR         /* Frame overrun */
 };
 
-/* This structure retains the state of one host channel */
+/* This structure retains the state of one host channel.  NOTE: Since there
+ * is only one channel operation active at a time, some of the fields in
+ * in the structure could be moved in struct stm32_ubhost_s to achieve
+ * some memory savings.
+ */
 
 struct stm32_chan_s
 {

From fe493d8bb89c6f052f2cd8a66c00f50fd77ad442 Mon Sep 17 00:00:00 2001
From: patacongo 
Date: Sun, 26 Aug 2012 21:35:14 +0000
Subject: [PATCH 26/31] Fix some list handling associated with priority
 inheritance

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5053 7fd9a85b-ad96-42d3-883c-3090e2eb8679
---
 apps/examples/ostest/prioinherit.c     |  14 ++-
 nuttx/ChangeLog                        |   5 ++
 nuttx/configs/stm3220g-eval/README.txt |   2 +-
 nuttx/configs/stm3240g-eval/README.txt |   2 +-
 nuttx/include/semaphore.h              |  23 +++--
 nuttx/lib/semaphore/sem_init.c         |   9 +-
 nuttx/sched/os_start.c                 |  21 +++--
 nuttx/sched/sem_holder.c               | 116 +++++++++++++------------
 8 files changed, 113 insertions(+), 79 deletions(-)

diff --git a/apps/examples/ostest/prioinherit.c b/apps/examples/ostest/prioinherit.c
index 993c9e14a2..87849abcfd 100644
--- a/apps/examples/ostest/prioinherit.c
+++ b/apps/examples/ostest/prioinherit.c
@@ -58,12 +58,22 @@
 #ifndef CONFIG_SEM_PREALLOCHOLDERS
 #  define CONFIG_SEM_PREALLOCHOLDERS 0
 #endif
-#define NLOWPRI_THREADS  (CONFIG_SEM_PREALLOCHOLDERS+1)
+
+#if CONFIG_SEM_PREALLOCHOLDERS > 3
+#  define NLOWPRI_THREADS 3
+#else
+#  define NLOWPRI_THREADS (CONFIG_SEM_PREALLOCHOLDERS+1)
+#endif
 
 #ifndef CONFIG_SEM_NNESTPRIO
 #  define CONFIG_SEM_NNESTPRIO 0
 #endif
-#define NHIGHPRI_THREADS (CONFIG_SEM_NNESTPRIO+1)
+
+#if CONFIG_SEM_NNESTPRIO > 3
+#  define NHIGHPRI_THREADS 3
+#else
+#  define NHIGHPRI_THREADS (CONFIG_SEM_NNESTPRIO+1)
+#endif
 
 /****************************************************************************
  * Private Data
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 7a6e3f6eb0..4135bd19ae 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3178,3 +3178,8 @@
 	  functional (although more testing is necesary).
 
 6.22 2012-xx-xx Gregory Nutt 
+
+	* include/semaphore.h, sched/sem_holders.c, and lib/semaphore/sem_init.c:
+	  Fix some strange (and probably wrong) list handling when
+	  CONFIG_PRIORITY_INHERITANCE and CONFIG_SEM_PREALLOCHOLDERS are defined.
+	  This list handling was probably causing errors reported by Mike Smith
diff --git a/nuttx/configs/stm3220g-eval/README.txt b/nuttx/configs/stm3220g-eval/README.txt
index da29b15922..64a86c4dd7 100644
--- a/nuttx/configs/stm3220g-eval/README.txt
+++ b/nuttx/configs/stm3220g-eval/README.txt
@@ -860,7 +860,7 @@ Where  is one of the following:
 
     8. USB OTG FS Device or Host Support
  
-       CONFIG_USBDEV          - Enable USB device support
+       CONFIG_USBDEV          - Enable USB device support, OR
        CONFIG_USBHOST         - Enable USB host support
        CONFIG_STM32_OTGFS     - Enable the STM32 USB OTG FS block
        CONFIG_STM32_SYSCFG    - Needed
diff --git a/nuttx/configs/stm3240g-eval/README.txt b/nuttx/configs/stm3240g-eval/README.txt
index 908fb93c85..949db18913 100755
--- a/nuttx/configs/stm3240g-eval/README.txt
+++ b/nuttx/configs/stm3240g-eval/README.txt
@@ -1023,7 +1023,7 @@ Where  is one of the following:
 
     8. USB OTG FS Device or Host Support
  
-       CONFIG_USBDEV          - Enable USB device support
+       CONFIG_USBDEV          - Enable USB device support, OR
        CONFIG_USBHOST         - Enable USB host support
        CONFIG_STM32_OTGFS     - Enable the STM32 USB OTG FS block
        CONFIG_STM32_SYSCFG    - Needed
diff --git a/nuttx/include/semaphore.h b/nuttx/include/semaphore.h
index 85214b9c20..257a5826f3 100644
--- a/nuttx/include/semaphore.h
+++ b/nuttx/include/semaphore.h
@@ -60,16 +60,16 @@ extern "C" {
  * Public Type Declarations
  ****************************************************************************/
 
-/* This structure contains the holder of a semaphore */
+/* This structure contains information about the holder of a semaphore */
 
 #ifdef CONFIG_PRIORITY_INHERITANCE
 struct semholder_s
 {
 #if CONFIG_SEM_PREALLOCHOLDERS > 0
-  struct semholder_s *flink;    /* Implements singly linked list */
+  struct semholder_s *flink;     /* Implements singly linked list */
 #endif
-  void   *holder;               /* Holder TCB (actual type is _TCB) */
-  int16_t counts;               /* Number of counts owned by this holder */
+  void *htcb;                    /* Holder TCB (actual type is _TCB) */
+  int16_t counts;                /* Number of counts owned by this holder */
 };
 
 #if CONFIG_SEM_PREALLOCHOLDERS > 0
@@ -83,12 +83,21 @@ struct semholder_s
 
 struct sem_s
 {
-  int16_t semcount;             /* >0 -> Num counts available */
-                                /* <0 -> Num tasks waiting for semaphore */
+  int16_t semcount;              /* >0 -> Num counts available */
+                                 /* <0 -> Num tasks waiting for semaphore */
+  /* If priority inheritance is enabled, then we have to keep track of which
+   * tasks hold references to the semaphore.
+   */
+
 #ifdef CONFIG_PRIORITY_INHERITANCE
-  struct semholder_s hlist;     /* List of holders of semaphore counts */
+# if CONFIG_SEM_PREALLOCHOLDERS > 0
+  FAR struct semholder_s *hhead; /* List of holders of semaphore counts */
+# else
+  struct semholder_s holder;     /* Single holder */
+# endif
 #endif
 };
+
 typedef struct sem_s sem_t;
 
 /* Initializers */
diff --git a/nuttx/lib/semaphore/sem_init.c b/nuttx/lib/semaphore/sem_init.c
index ea1c6e84ea..bc14415f97 100644
--- a/nuttx/lib/semaphore/sem_init.c
+++ b/nuttx/lib/semaphore/sem_init.c
@@ -103,16 +103,17 @@ int sem_init(FAR sem_t *sem, int pshared, unsigned int value)
     {
       /* Initialize the seamphore count */
 
-      sem->semcount     = (int16_t)value;
+      sem->semcount      = (int16_t)value;
 
       /* Initialize to support priority inheritance */
 
 #ifdef CONFIG_PRIORITY_INHERITANCE
 #  if CONFIG_SEM_PREALLOCHOLDERS > 0
-      sem->hlist.flink  = NULL;
+      sem->hhead         = NULL;
+#  else
+      sem->holder.htcb   = NULL;
+      sem->holder.counts = 0;
 #  endif
-      sem->hlist.holder = NULL;
-      sem->hlist.counts = 0;
 #endif
       return OK;
     }
diff --git a/nuttx/sched/os_start.c b/nuttx/sched/os_start.c
index 6cd508b8ca..c0b16236dd 100644
--- a/nuttx/sched/os_start.c
+++ b/nuttx/sched/os_start.c
@@ -289,6 +289,18 @@ void os_start(void)
   g_idletcb.flags = TCB_FLAG_TTYPE_KERNEL;
   up_initial_state(&g_idletcb);
 
+  /* Initialize the semaphore facility(if in link).  This has to be done
+   * very early because many subsystems depend upon fully functional
+   * semaphores.
+   */
+
+#ifdef CONFIG_HAVE_WEAKFUNCTIONS
+  if (sem_initialize != NULL)
+#endif
+    {
+      sem_initialize();
+    }
+
   /* Initialize the memory manager */
 
 #ifndef CONFIG_HEAP_BASE
@@ -351,15 +363,6 @@ void os_start(void)
     }
 #endif
 
-  /* Initialize the semaphore facility. (if in link) */
-
-#ifdef CONFIG_HAVE_WEAKFUNCTIONS
-  if (sem_initialize != NULL)
-#endif
-    {
-      sem_initialize();
-    }
-
   /* Initialize the named message queue facility (if in link) */
 
 #ifndef CONFIG_DISABLE_MQUEUE
diff --git a/nuttx/sched/sem_holder.c b/nuttx/sched/sem_holder.c
index 6003c563dc..34f88185a9 100644
--- a/nuttx/sched/sem_holder.c
+++ b/nuttx/sched/sem_holder.c
@@ -99,32 +99,31 @@ static inline FAR struct semholder_s *sem_allocholder(sem_t *sem)
    * used to implement mutexes.
    */
 
-  if (!sem->hlist.holder)
+#if CONFIG_SEM_PREALLOCHOLDERS > 0
+  pholder = g_freeholders;
+  if (pholder)
     {
-      pholder          = &sem->hlist;
+      /* Remove the holder from the free list an put it into the semaphore's holder list */
+
+      g_freeholders    = pholder->flink;
+      pholder->flink   = sem->hhead;
+      sem->hhead       = pholder;
+
+      /* Make sure the initial count is zero */
+
       pholder->counts  = 0;
     }
+#else
+  if (!sem->holder.htcb)
+    {
+      pholder          = &sem->holder;
+      pholder->counts  = 0;
+    }
+#endif
   else
     {
-#if CONFIG_SEM_PREALLOCHOLDERS > 0
-      pholder = g_freeholders;
-      if (pholder)
-        {
-          /* Remove the holder from the free list an put it into the semaphore's holder list */
-
-          g_freeholders    = pholder->flink;
-          pholder->flink   = sem->hlist.flink;
-          sem->hlist.flink = pholder;
-
-          /* Make sure the initial count is zero */
-
-          pholder->counts  = 0;
-        }
-      else
-#else
-      pholder = NULL;
-#endif
       sdbg("Insufficient pre-allocated holders\n");
+      pholder = NULL;
     }
 
   return pholder;
@@ -140,12 +139,13 @@ static FAR struct semholder_s *sem_findholder(sem_t *sem, FAR _TCB *htcb)
 
   /* Try to find the holder in the list of holders associated with this semaphore */
 
-  pholder = &sem->hlist;
 #if CONFIG_SEM_PREALLOCHOLDERS > 0
-  for (; pholder; pholder = pholder->flink)
+  for (pholder = sem->hhead; pholder; pholder = pholder->flink)
+#else
+  pholder = &sem->holder;
 #endif
     {
-      if (pholder->holder == htcb)
+      if (pholder->htcb == htcb)
         {
           /* Got it! */
 
@@ -186,31 +186,33 @@ static inline void sem_freeholder(sem_t *sem, FAR struct semholder_s *pholder)
 
   /* Release the holder and counts */
 
-  pholder->holder = 0;
+  pholder->htcb   = NULL;
   pholder->counts = 0;
 
 #if CONFIG_SEM_PREALLOCHOLDERS > 0
-  /* If this is the holder inside the semaphore, then do nothing more */
+  /* Search the list for the matching holder */
 
-  if (pholder != &sem->hlist)
+  for (prev = NULL, curr = sem->hhead;
+       curr && curr != pholder;
+       prev = curr, curr = curr->flink);
+
+  if (curr)
     {
-      /* Otherwise, search the list for the matching holder */
+      /* Remove the holder from the list */
 
-      for (prev = &sem->hlist, curr = sem->hlist.flink;
-           curr && curr != pholder;
-           prev = curr, curr = curr->flink);
-
-      if (curr)
+      if (prev)
         {
-          /* Remove the holder from the list */
-
           prev->flink = pholder->flink;
-
-          /* And put it in the free list */
-
-          pholder->flink = g_freeholders;
-          g_freeholders  = pholder;
         }
+      else
+        {
+          sem->hhead = pholder->flink;
+        }
+
+      /* And put it in the free list */
+
+      pholder->flink = g_freeholders;
+      g_freeholders  = pholder;
     }
 #endif
 }
@@ -221,14 +223,16 @@ static inline void sem_freeholder(sem_t *sem, FAR struct semholder_s *pholder)
 
 static int sem_foreachholder(FAR sem_t *sem, holderhandler_t handler, FAR void *arg)
 {
-  FAR struct semholder_s *pholder = &sem->hlist;
+  FAR struct semholder_s *pholder;
 #if CONFIG_SEM_PREALLOCHOLDERS > 0
   FAR struct semholder_s *next;
 #endif
   int ret = 0;
 
 #if CONFIG_SEM_PREALLOCHOLDERS > 0
-  for (; pholder && ret == 0; pholder = next)
+  for (pholder = sem->hhead; pholder && ret == 0; pholder = next)
+#else
+  pholder = &sem->holder;
 #endif
     {
 #if CONFIG_SEM_PREALLOCHOLDERS > 0
@@ -238,7 +242,7 @@ static int sem_foreachholder(FAR sem_t *sem, holderhandler_t handler, FAR void *
 #endif
       /* The initial "built-in" container may hold a NULL holder */
 
-      if (pholder->holder)
+      if (pholder->htcb)
         {
           /* Call the handler */
 
@@ -268,7 +272,7 @@ static int sem_recoverholders(FAR struct semholder_s *pholder, FAR sem_t *sem, F
 static int sem_boostholderprio(FAR struct semholder_s *pholder,
                                FAR sem_t *sem, FAR void *arg)
 {
-  FAR _TCB *htcb = (FAR _TCB *)pholder->holder;
+  FAR _TCB *htcb = (FAR _TCB *)pholder->htcb;
   FAR _TCB *rtcb = (FAR _TCB*)arg;
 
   /* Make sure that the thread is still active.  If it exited without releasing
@@ -371,7 +375,7 @@ static int sem_boostholderprio(FAR struct semholder_s *pholder,
 static int sem_verifyholder(FAR struct semholder_s *pholder, FAR sem_t *sem, FAR void *arg)
 {
 #if 0 // Need to revisit this, but these assumptions seem to be untrue -- OR there is a bug???
-  FAR _TCB *htcb = (FAR _TCB *)pholder->holder;
+  FAR _TCB *htcb = (FAR _TCB *)pholder->htcb;
 
   /* Called after a semaphore has been released (incremented), the semaphore
    * could is non-negative, and there is no thread waiting for the count.
@@ -396,9 +400,9 @@ static int sem_dumpholder(FAR struct semholder_s *pholder, FAR sem_t *sem, FAR v
 {
 #if CONFIG_SEM_PREALLOCHOLDERS > 0
   dbg("  %08x: %08x %08x %04x\n",
-      pholder, pholder->flink, pholder->holder, pholder->counts);
+      pholder, pholder->flink, pholder->htcb, pholder->counts);
 #else
-  dbg("  %08x: %08x %04x\n", pholder, pholder->holder, pholder->counts);
+  dbg("  %08x: %08x %04x\n", pholder, pholder->htcb, pholder->counts);
 #endif
   return 0;
 }
@@ -410,7 +414,7 @@ static int sem_dumpholder(FAR struct semholder_s *pholder, FAR sem_t *sem, FAR v
 
 static int sem_restoreholderprio(FAR struct semholder_s *pholder, FAR sem_t *sem, FAR void *arg)
 {
-  FAR _TCB *htcb = (FAR _TCB *)pholder->holder;
+  FAR _TCB *htcb = (FAR _TCB *)pholder->htcb;
 #if CONFIG_SEM_NNESTPRIO > 0
   FAR _TCB *stcb = (FAR _TCB *)arg;
   int rpriority;
@@ -510,6 +514,7 @@ static int sem_restoreholderprio(FAR struct semholder_s *pholder, FAR sem_t *sem
                     {
                       htcb->pend_reprios[i] = htcb->pend_reprios[j];
                     }
+
                    htcb->npend_reprio = j;
                    break;
                 }
@@ -534,7 +539,7 @@ static int sem_restoreholderprio(FAR struct semholder_s *pholder, FAR sem_t *sem
 static int sem_restoreholderprioA(FAR struct semholder_s *pholder, FAR sem_t *sem, FAR void *arg)
 {
   FAR _TCB *rtcb = (FAR _TCB*)g_readytorun.head;
-  if (pholder->holder != rtcb)
+  if (pholder->htcb != rtcb)
     {
       return sem_restoreholderprio(pholder, sem, arg);
     }
@@ -545,7 +550,7 @@ static int sem_restoreholderprioA(FAR struct semholder_s *pholder, FAR sem_t *se
 static int sem_restoreholderprioB(FAR struct semholder_s *pholder, FAR sem_t *sem, FAR void *arg)
 {
   FAR _TCB *rtcb = (FAR _TCB*)g_readytorun.head;
-  if (pholder->holder == rtcb)
+  if (pholder->htcb == rtcb)
     {
       (void)sem_restoreholderprio(pholder, sem, arg);
       return 1;
@@ -586,6 +591,7 @@ void sem_initholders(void)
     {
       g_holderalloc[i].flink = &g_holderalloc[i+1];
     }
+
   g_holderalloc[CONFIG_SEM_PREALLOCHOLDERS-1].flink = NULL;
 #endif
 }
@@ -609,8 +615,8 @@ void sem_initholders(void)
 
 void sem_destroyholder(FAR sem_t *sem)
 {
-  /* It is an error is a semaphore is destroyed while there are any holders
-   * (except perhaps the thread releas the semaphore itself).  Hmmm.. but
+  /* It is an error if a semaphore is destroyed while there are any holders
+   * (except perhaps the thread release the semaphore itself).  Hmmm.. but
    * we actually have to assume that the caller knows what it is doing because
    * could have killed another thread that is the actual holder of the semaphore.
    * We cannot make any assumptions about the state of the semaphore or the
@@ -621,18 +627,18 @@ void sem_destroyholder(FAR sem_t *sem)
    */
 
 #if CONFIG_SEM_PREALLOCHOLDERS > 0
-  if (sem->hlist.holder || sem->hlist.flink)
+  if (sem->hhead)
     {
       sdbg("Semaphore destroyed with holders\n");
       (void)sem_foreachholder(sem, sem_recoverholders, NULL);
     }
 #else
-  if (sem->hlist.holder)
+  if (sem->holder.htcb)
     {
       sdbg("Semaphore destroyed with holder\n");
     }
 
-  sem->hlist.holder = NULL;
+  sem->holder.htcb = NULL;
 #endif
 }
 
@@ -664,7 +670,7 @@ void sem_addholder(FAR sem_t *sem)
     {
       /* Then set the holder and increment the number of counts held by this holder */
 
-      pholder->holder = rtcb;
+      pholder->htcb = rtcb;
       pholder->counts++;
     }
 }

From 61fccacd853fbdc872deab875012b67fd85240be Mon Sep 17 00:00:00 2001
From: patacongo 
Date: Sun, 26 Aug 2012 22:00:38 +0000
Subject: [PATCH 27/31] waitpid():  Move some logic inside of a critical
 section

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5054 7fd9a85b-ad96-42d3-883c-3090e2eb8679
---
 nuttx/ChangeLog             | 2 ++
 nuttx/sched/sched_waitpid.c | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 4135bd19ae..cb7f4079df 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3183,3 +3183,5 @@
 	  Fix some strange (and probably wrong) list handling when
 	  CONFIG_PRIORITY_INHERITANCE and CONFIG_SEM_PREALLOCHOLDERS are defined.
 	  This list handling was probably causing errors reported by Mike Smith
+	* sched/sched_waitpid.c: Fix a possible issue with logic logic that
+	  should be brought into a critical section (suggested by Mike Smith)
diff --git a/nuttx/sched/sched_waitpid.c b/nuttx/sched/sched_waitpid.c
index e8e2f61a23..692ef64102 100644
--- a/nuttx/sched/sched_waitpid.c
+++ b/nuttx/sched/sched_waitpid.c
@@ -178,7 +178,7 @@
 
 pid_t waitpid(pid_t pid, int *stat_loc, int options)
 {
-  _TCB *tcb = sched_gettcb(pid);
+  _TCB *tcb;
   bool mystat;
   int err;
   int ret;
@@ -186,6 +186,7 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options)
   /* Disable pre-emption so that nothing changes in the following tests */
 
   sched_lock();
+  tcb = sched_gettcb(pid);
   if (!tcb)
     {
       err = ECHILD;

From 029bbeb3dbf2c51e86fe5a67424a356fb2d17aa1 Mon Sep 17 00:00:00 2001
From: patacongo 
Date: Sun, 26 Aug 2012 22:28:21 +0000
Subject: [PATCH 28/31] Add terminating NULL to argv[] list

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5055 7fd9a85b-ad96-42d3-883c-3090e2eb8679
---
 apps/ChangeLog.txt                | 4 ++++
 apps/netutils/thttpd/thttpd_cgi.c | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index 20895f07b6..6c151ae50f 100755
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -280,3 +280,7 @@
 	  configuration (from Richard Cochran).
 
 6.22 2012-xx-xx Gregory Nutt 
+
+	* apps/netutils/thttpd/thttpd_cgi.c:  Missing NULL in argv[]
+	  list (contributed by Kate).
+
diff --git a/apps/netutils/thttpd/thttpd_cgi.c b/apps/netutils/thttpd/thttpd_cgi.c
index 3d2eb57b8b..0c23a2587f 100755
--- a/apps/netutils/thttpd/thttpd_cgi.c
+++ b/apps/netutils/thttpd/thttpd_cgi.c
@@ -988,7 +988,7 @@ errout:
 int cgi(httpd_conn *hc)
 {
   char arg[16];
-  char *argv[1];
+  char *argv[2];
   pid_t child;
   int   retval = ERROR;
 
@@ -1019,6 +1019,7 @@ int cgi(httpd_conn *hc)
 
       snprintf(arg, 16, "%p", hc); /* task_create doesn't handle binary arguments. */
       argv[0] = arg;
+      argv[1] = NULL;
 
 #ifndef CONFIG_CUSTOM_STACK
       child = task_create("CGI child", CONFIG_THTTPD_CGI_PRIORITY,

From 22b390a9eb994671191432339b692dabb3b4a0fc Mon Sep 17 00:00:00 2001
From: px4dev 
Date: Sun, 26 Aug 2012 17:56:11 -0700
Subject: [PATCH 29/31] Play with kconfig a bit.  Not ready for use yet.

---
 nuttx/configs/Kconfig        | 703 +----------------------------------
 nuttx/configs/px4fmu/Kconfig |  26 ++
 2 files changed, 40 insertions(+), 689 deletions(-)
 create mode 100644 nuttx/configs/px4fmu/Kconfig

diff --git a/nuttx/configs/Kconfig b/nuttx/configs/Kconfig
index fc5cf7a0ff..b67c11ab33 100644
--- a/nuttx/configs/Kconfig
+++ b/nuttx/configs/Kconfig
@@ -12,703 +12,28 @@ choice
 		be available for selection.  Use ARCH_BOARD_CUSTOM to create a new
 		board configuration.
 
-config ARCH_BOARD_AMBER
-	bool "Amber Web Server"
-	depends on ARCH_CHIP_ATMEGA128
+config ARCH_BOARD_PX4FMU
+	bool "PX4FMU board"
+	depends on ARCH_CHIP_STM32F405RG
 	---help---
-		This is placeholder for the SoC Robotics Amber Web Server that is based
-		on the Atmel AVR ATMega128 MCU.  There is not much there yet and what is
-		there is untested due to tool-related issues.
+		PX4 system Flight Management Unit
 
-config ARCH_BOARD_AVR32DEV1
-	bool "Atmel AVR32DEV1 board"
-	depends on ARCH_CHIP_AT32UC3B0256
+config ARCH_BOARD_PX4IO
+	bool "PX4IO board"
+	depends on ARCH_CHIP_STM32F100C8
 	---help---
-		This is a port of NuttX to the Atmel AVR32DEV1 board.  That board is
-		based on the Atmel AT32UC3B0256 MCU and uses a specially patched
-		version of the GNU toolchain:  The patches provide support for the
-		AVR32 family.  That patched GNU toolchain is available only from the
-		Atmel website.  STATUS: This port is functional but very basic.  There
-		are configurations for NSH and the OS test.
-
-config ARCH_BOARD_C5471EVM
-	bool "Spectrum Digital C5471 evaluation board"
-	depends on ARCH_CHIP_C5471
-	---help---
-		This is a port to the Spectrum Digital C5471 evaluation board.  The
-		TMS320C5471 is a dual core processor from TI with an ARM7TDMI general
-		purpose processor and a c54 DSP.  It is also known as TMS320DA180 or just DA180. 
-		NuttX runs on the ARM core and is built with a GNU arm-elf toolchain*.
-		This port is complete and verified.
-
-config ARCH_BOARD_COMPALE88
-	bool "Compal e88 phone"
-	depends on ARCH_CHIP_CALYPSO
-	---help---
-		These directories contain the board support for compal e88 and e99 phones.
-		These ports are based on patches contributed by Denis Carikli for both the
-		compal e99 and e88.  The patches were made by Alan Carvalho de Assis and
-		Denis Carikli using the Stefan Richter's Osmocom-bb patches.
-
-config ARCH_BOARD_COMPALE99
-	bool "Compal e99 phone"
-	depends on ARCH_CHIP_CALYPSO
-	---help---
-		These directories contain the board support for compal e88 and e99 phones.
-		These ports are based on patches contributed by Denis Carikli for both the
-		compal e99 and e88.  The patches were made by Alan Carvalho de Assis and
-		Denis Carikli using the Stefan Richter's Osmocom-bb patches.
-
-config ARCH_BOARD_DEMOS92S12NEC64
-	bool "Freescale DMO9S12NE64 board"
-	depends on ARCH_CHIP_MCS92S12NEC64
-	---help---
-	Freescale DMO9S12NE64 board based on the MC9S12NE64 hcs12 cpu.  This
-	port uses the m9s12x GCC toolchain.  STATUS:  (Still) under development; it
-	is code complete but has not yet been verified.
-
-config ARCH_BOARD_EA3131
-	bool "Embedded Artists EA3131 Development board"
-	depends on ARCH_CHIP_LPC3131
-	---help---
-		Embedded Artists EA3131 Development board.  This board is based on the 
-		an NXP LPC3131 MCU. This OS is built with the arm-elf toolchain*.
-		STATUS:  This port is complete and mature.
-
-config ARCH_BOARD_EA3152
-	bool "Embedded Artists EA3152 Development board"
-	depends on ARCH_CHIP_LPC3152
-	---help---
-		Embedded Artists EA3152 Development board.  This board is based on the 
-		an NXP LPC3152 MCU. This OS is built with the arm-elf toolchain*.
-		STATUS:  This port is has not be exercised well, but since it is
-		a simple derivative of the ea3131, it should be fully functional.
-
-config ARCH_BOARD_EAGLE100
-	bool "Micromint Eagle-100 Development board"
-	depends on ARCH_CHIP_LM3S6918
-	---help---
-		Micromint Eagle-100 Development board.  This board is based on the 
-		an ARM Cortex-M3 MCU, the Luminary LM3S6918. This OS is built with the
-		arm-elf toolchain*.  STATUS:  This port is complete and mature.
-
-config ARCH_BOARD_EKK_LM3S9B96
-	bool "TI/Stellaris EKK-LM3S9B96"
-	depends on ARCH_CHIP_LM3S9B96
-	---help---
-		TI/Stellaris EKK-LM3S9B96 board.  This board is based on the 
-		an EKK-LM3S9B96 which is a Cortex-M3.
-
-config ARCH_BOARD_EZ80F910200KITG
-	bool "ZiLOG ez80f0910200kitg development kit"
-	depends on ARCH_CHIP_EZ80F91
-	---help---
-		ez80Acclaim! Microcontroller.  This port use the ZiLOG ez80f0910200kitg
-		development kit, eZ80F091 part, and the Zilog ZDS-II Windows command line
-		tools.  The development environment is Cygwin under WinXP.
-
-config ARCH_BOARD_EZ80F910200ZCO
-	bool "ZiLOG ez80f0910200zco development kit"
-	depends on ARCH_CHIP_EZ80F91
-	---help---
-		ez80Acclaim! Microcontroller.  This port use the Zilog ez80f0910200zco
-		development kit, eZ80F091 part, and the Zilog ZDS-II Windows command line
-		tools.  The development environment is Cygwin under WinXP.
-
-config ARCH_BOARD_HYMINI_STM32V
-	bool "HY-Mini STM32v board"
-	depends on ARCH_CHIP_STM32F103VCT
-	---help---
-		A configuration for the HY-Mini STM32v board.  This board is based on the
-		STM32F103VCT chip.
-
-config ARCH_BOARD_LINCOLN60
-	bool "Micromint Lincoln 60 board"
-	depends on ARCH_CHIP_LPC1769
-	---help---
-		Micromint Lincoln 60 board using the NXP LPC1769 MCU.
-
-config ARCH_BOARD_KWIKSTIK_K40
-	bool "FreeScale KwikStik-K40 development board"
-	depends on ARCH_CHIP_MK40X256VLQ100
-	---help---
-		Kinetis K40 Cortex-M4 MCU.  This port uses the FreeScale KwikStik-K40
-		development board.
-
-config ARCH_BOARD_LM3S6432S2E
-	bool "Stellaris RDK-S2E Reference Design Kit"
-	depends on ARCH_CHIP_LM3S6432
-	---help---
-		Stellaris RDK-S2E Reference Design Kit and the MDL-S2E Ethernet to
-		Serial module.
-
-config ARCH_BOARD_LM3S6965EK
-	bool "Stellaris LM3S6965 Evaluation Kit"
-	depends on ARCH_CHIP_LM3S6965
-	---help---
-		Stellaris LM3S6965 Evaluation Kit.  This board is based on the 
-		an ARM Cortex-M3 MCU, the Luminary/TI LM3S6965. This OS is built with the
-		arm-elf toolchain*.  STATUS:  This port is complete and mature.
-
-config ARCH_BOARD_LM3S8962EK
-	bool "Stellaris LMS38962 Evaluation Kit"
-	depends on ARCH_CHIP_LM3S8962
-	---help---
-		Stellaris LMS38962 Evaluation Kit.
-
-config ARCH_BOARD_LPCXPRESSO
-	bool "NXP LPCExpresso LPC1768"
-	depends on ARCH_CHIP_LPC1768
-	---help---
-		Embedded Artists base board with NXP LPCExpresso LPC1768.  This board
-		is based on the NXP LPC1768.  The Code Red toolchain is used by default.
-
-config ARCH_BOARD_LPC4330_XPLORER
-	bool "NXG LPC4330-Xplorer"
-	depends on ARCH_CHIP_LPC4330FET100
-	---help---
-		NXG Technologoies LPC4330 Xplorer board.  This board is based on the
-		LPC4330FET100.  The Code Red toolchain is used by default.
-
-config ARCH_BOARD_M68332EVB
-	bool "Motoroloa M68332EVB"
-	depends on ARCH_M68332
-	---help---
-		This is a work in progress for the venerable m68322evb board from
-		Motorola. This OS is also built with the arm-elf toolchain.  STATUS:
-		This port was never completed.
-
-config ARCH_BOARD_MBED
-	bool "mbed LCP1768"
-	depends on ARCH_CHIP_LPC1768
-	---help---
-		The configurations in this directory support the mbed board (http://mbed.org)
-		that features the NXP LPC1768 microcontroller. This OS is also built
-		with the arm-elf toolchain*.  STATUS:  Contributed.
-
-config ARCH_BOARD_MCU123
-	bool "mcu123.com LPC2148 Development Board"
-	depends on ARCH_CHIP_LPC2148
-	---help---
-		This port is for the NXP LPC2148 as provided on the mcu123.com
-		lpc214x development board. This OS is also built with the arm-elf
-		toolchain*.  The port supports serial, timer0, spi, and usb.
-
-config ARCH_BOARD_MICROPENDOUS3
-	bool "Opendous Micropendous 3 board"
-	depends on ARCH_CHIP_AT90USB646 || ARCH_CHIP_AT90USB647 || ARCH_CHIP_AT90USB1286 || ARCH_CHIP_AT90USB1287
-	---help---
-		This is a port to the Opendous Micropendous 3 board. This board may
-		be populated with either an AVR AT90USB646, 647, 1286, or 1287 MCU.
-		Support is configured for the AT90USB647.
-
-config ARCH_BOARD_MX1ADS
-	bool "Motorola MX1ADS development board"
-	depends on ARCH_CHIP_IMX1
-	---help---
-		This is a port to the Motorola MX1ADS development board.  That board
-		is based on the Freescale i.MX1 processor.  The i.MX1 is an ARM920T.
-		STATUS:  This port is nearly code complete but was never fully
-		integrated due to tool-related issues.
-
-config ARCH_BOARD_NE64BADGE
-	bool "FEG NE64 /PoE Badge board"
-	depends on ARCH_CHIP_MCS92S12NEC64
-	---help---
-		Future Electronics Group NE64 /PoE Badge board based on the
-		MC9S12NE64 hcs12 cpu.  This port uses the m9s12x GCC toolchain.
-		STATUS:  Under development.  The port is code-complete but has
-		not yet been fully tested.
-
-config ARCH_BOARD_NTOSD_DM320
-	bool "Neuros OSD v1.0 Dev Board"
-	depends on ARCH_CHIP_DM320
-	---help---
-		This port uses the Neuros OSD v1.0 Dev Board with a GNU arm-elf
-		toolchain*: see
-
-			http://wiki.neurostechnology.com/index.php/OSD_1.0_Developer_Home
- 
-		There are some differences between the Dev Board and the currently
-		available commercial v1.0 Boards.  See
-
-			http://wiki.neurostechnology.com/index.php/OSD_Developer_Board_v1
-
-		NuttX operates on the ARM9EJS of this dual core processor.
-		STATUS: This port is code complete, verified, and included in the
-		NuttX 0.2.1 release.
-
-config  ARCH_BOARD_NUCLEUS2G
-	bool "Nucleus 2G board"
-	depends on ARCH_CHIP_LPC1768
-	---help---
-		This port uses the Nucleus 2G board (with Babel CAN board).  This board
-		features an NXP LPC1768 processor.  See the 2G website (http://www.2g-eng.com/)
-		for more information about the Nucleus 2G.
-
-config ARCH_BOARD_LPC1766STK
-	bool "Olimex LPC1766-STK board"
-	depends on ARCH_CHIP_LPC1766
-	---help---
-		This port uses the Olimex LPC1766-STK board and a GNU GCC toolchain* under
-		Linux or Cygwin.  STATUS: Complete and mature.
-
-config ARCH_BOARD_MIRTOO
-	bool "Mirtoo PIC32 Module from Dimitech"
-	depends on ARCH_CHIP_PIC32MX250F128D
-	---help---
-		This is the port to the DTX1-4000L "Mirtoo" module.  This module uses MicroChip
-		PIC32MX250F128D.  See http://www.dimitech.com/ for further information.
-
-config ARCH_BOARD_OLIMEXLPC2378
-	bool "Olimex-lpc2378 board"
-	depends on ARCH_CHIP_LPC2378
-	---help---
-		This port uses the Olimex-lpc2378 board and a GNU arm-elf toolchain* under
-		Linux or Cygwin.  STATUS: ostest and NSH configurations available.
-		This port for the NXP LPC2378 was contributed by Rommel Marcelo.
-
-config ARCH_BOARD_OLIMEX_STRP711
-	bool "Olimex STR-P711 board"
-	depends on ARCH_CHIP_STR71X
-	---help---
-		This port uses the Olimex STR-P711 board and a GNU arm-elf toolchain* under
-		Linux or Cygwin. See the http://www.olimex.com/dev/str-p711.html" for
-		further information.  STATUS: Configurations for the basic OS test and NSH
-		are complete and verified.
-
-config ARCH_BOARD_PCBLOGICPIC32MX
-	bool "PIC32MX board from PCB Logic Design Co"
-	depends on ARCH_CHIP_PIC32MX460F512L
-	---help---
-		This is the port of NuttX to the PIC32MX board from PCB Logic Design Co.
-		This board features the MicroChip PIC32MX460F512L.
-		The board is a very simple -- little more than a carrier for the PIC32
-		MCU plus voltage regulation, debug interface, and an OTG connector.
-		STATUS:  Code complete but testing has been stalled due to tool related problems
-		(PICkit 2 does not work with the PIC32).
-
-config ARCH_BOARD_PIC32_STARTERKIT
-	bool "Microchip PIC32 Ethernet Starter Kit (DM320004)"
-	depends on ARCH_CHIP_PIC32MX795F512L
-	---help---
-		This is the port of NuttX to the Microchip PIC32 Ethernet Starter Kit
-		(DM320004) with the Multimedia Expansion Board (MEB, DM320005).
-		See www.microchip.com for further information.
-
-config ARCH_BOARD_PIC32_PIC32MX7MMB
-	bool "Mikroelektronika PIC32MX7 MMB"
-	depends on ARCH_CHIP_PIC32MX795F512L
-	---help---
-		This is the port NuttX to the Mikroelektronika PIC32MX7 Multimedia Board
-		(MMB).  See http://www.mikroe.com/ for further information.
-
-config ARCH_BOARD_PJRC_87C52
-	bool "PJRC 87C52 development system"
-	depends on ARCH_CHIP_8052
-	---help---
-		8051 Microcontroller.  This port uses the PJRC 87C52 development system
-		and the SDCC toolchain.   This port is not quite ready for prime time.
-
-config ARCH_BOARD_QEMU_I486
-	bool "Qemu i486 Mode"
-	depends on ARCH_QEMU
-	---help---
-		Port of NuttX to QEMU in i486 mode.  This port will also run on real i486
-		hardwared (Google the Bifferboard).
-
-config ARCH_BOARD_RGMP
-	bool "RGMP"
-	depends on ARCH_RGMP
-	---help---
-		RGMP stands for RTOS and GPOS on Multi-Processor.  RGMP is a project for 
-		running GPOS and RTOS simultaneously on multi-processor platforms. You can
-		port your favorite RTOS to RGMP together with an unmodified Linux to form a
-		hybrid operating system. This makes your application able to use both RTOS
-		and GPOS features.
-
-		See http://rgmp.sourceforge.net/wiki/index.php/Main_Page for further information
-		about RGMP.
-
-config ARCH_BOARD_SAM3UEK
-	bool "Atmel SAM3U-EK development board"
-	depends on ARCH_CHIP_AT91SAM3U4E
-	---help---
-		The port of NuttX to the Atmel SAM3U-EK development board.
-
-config ARCH_BOARD_SKP16C26
-	bool "Renesas SKP16C26 StarterKit"
-	depends on ARCH_CHIP_M30262F8
-	---help---
-		Renesas M16C processor on the Renesas SKP16C26 StarterKit.  This port
-		uses the GNU m32c toolchain.  STATUS:  The port is complete but untested
-		due to issues with compiler internal errors.
-
-config ARCH_BOARD_STM3210E_EVAL
-	bool "STMicro STM3210E-EVAL development board"
-	depends on ARCH_CHIP_STM32F103ZET6
-	---help---
-		STMicro STM3210E-EVAL development board based on the STMicro STM32F103ZET6
-		microcontroller (ARM Cortex-M3).  This port uses the GNU Cortex-M3
-		toolchain.
-
-config ARCH_BOARD_STM3220G_EVAL
-	bool "STMicro STM3220G-EVAL development board"
-	depends on ARCH_CHIP_STM32F207IG
-	---help---
-		STMicro STM3220G-EVAL development board based on the STMicro STM32F407IG
-		microcontroller (ARM Cortex-M3).
-
-config ARCH_BOARD_STM3240G_EVAL
-	bool "STMicro STM3240G-EVAL development board"
-	depends on ARCH_CHIP_STM32F407IG
-	---help---
-		STMicro STM3240G-EVAL development board based on the STMicro STM32F103ZET6
-		microcontroller (ARM Cortex-M4 with FPU).  This port uses a GNU Cortex-M4
-		toolchain (such as CodeSourcery).
-
-config ARCH_BOARD_STM32F4_DISCOVERY
-	bool "STMicro STM32F4-Discovery board"
-	depends on ARCH_CHIP_STM32F407VG
-	---help---
-		STMicro STM32F4-Discovery board boased on the STMIcro STM32F407VGT6 MCU.
-
-config ARCH_BOARD_SUREPIC32MX
-	bool "Sure PIC32MX boards"
-	depends on ARCH_CHIP_PIC32MX440F512H
-	---help---
-		The "Advanced USB Storage Demo Board," Model DB-DP11215, from Sure
-		Electronics (http://www.sureelectronics.net/).  This board features
-		the MicroChip PIC32MX440F512H.  See also
-		http://www.sureelectronics.net/goods.php?id=1168 for further
-		information about the Sure DB-DP11215 board.
-
-config ARCH_BOARD_TEENSY
-	bool "PJRC Teensy++ 2.0 board"
-	depends on ARCH_CHIP_AT90USB1286
-	---help---
-		This is the port of NuttX to the PJRC Teensy++ 2.0 board.  This board is
-		developed by http://pjrc.com/teensy/.  The Teensy++ 2.0 is based
-		on an Atmel AT90USB1286 MCU.
-
-config ARCH_BOARD_TWR_K60N512
-	bool "FreeScale TWR-K60N512d evelopment board"
-	depends on ARCH_CHIP_MK60N512VMD100
-	---help---
-		Kinetis K60 Cortex-M4 MCU.  This port uses the FreeScale TWR-K60N512
-		development board.
-
-config ARCH_BOARD_UBW32
-	bool "UBW32 v2.4 board from Sparkfun"
-	depends on ARCH_CHIP_PIC32MX460F512L
-	---help---
-		This is the port to the Sparkfun UBW32 board.  This port uses the original v2.4
-		board which is based on the MicroChip PIC32MX460F512L.  See
-		http://www.sparkfun.com/products/8971.  This older version has been replaced
-		with this board http://www.sparkfun.com/products/9713. See also
-		http://www.schmalzhaus.com/UBW32/.
-
-config ARCH_BOARD_US7032EVB1
-	bool "Hitachi SH-1/US7032EVB1 board"
-	depends on ARCH_CHIP_SH7032
-	---help---
-		This is a port of the Hitachi SH-1 on the Hitachi SH-1/US7032EVB1 board.
-		STATUS:  Work has just began on this port.
-
-config ARCH_BOARD_VSN
-	bool "SOTEL NetClamps VSN sensor network platform"
-	depends on ARCH_CHIP_STM32F103RET6
-	---help---
-		ISOTEL NetClamps VSN V1.2 ready2go sensor network platform based on the
-		STMicro STM32F103RET6.  Contributed by Uros Platise.  See
-		http://isotel.eu/NetClamps/
-
-config ARCH_BOARD_XTRS
-	bool "XTRS TRS80 Model 3 emulation"
-	depends on ARCH_CHIP_Z80
-	---help---
-		TRS80 Model 3.  This port uses a vintage computer based on the Z80.
-		An emulator for this computer is available to run TRS80 programs on a 
-		linux platform (http://www.tim-mann.org/xtrs.html).
-
-config ARCH_BOARD_Z16F2800100ZCOG
-	bool "Zilog Z16F2800100ZCOG Development Kit"
-	depends on ARCH_CHIP_Z16F281
-	---help---
-		z16f Microcontroller.  This port use the ZiLIG z16f2800100zcog
-		development kit and the Zilog ZDS-II Windows command line tools.  The
-		development environment is Cygwin under WinXP.
-
-config ARCH_BOARD_Z80SIM
-	bool "Z80 Instruction Set Simulator"
-	depends on ARCH_CHIP_Z80
-	---help---
-		z80 Microcontroller.  This port uses a Z80 instruction set simulator.
-		That simulator can be found in the NuttX SVN at
-		http://nuttx.svn.sourceforge.net/viewvc/nuttx/trunk/misc/sims/z80sim.
-		This port also uses the SDCC toolchain (http://sdcc.sourceforge.net/")
-		(verified with version 2.6.0).
-
-config ARCH_BOARD_Z8ENCORE000ZCO
-	bool "ZiLOG z8encore000zco Development Kit"
-	depends on ARCH_CHIP_Z8F6403
-	---help---
-		z8Encore! Microcontroller.  This port use the ZiLOG z8encore000zco
-		development kit, Z8F6403 part, and the Zilog ZDS-II Windows command line
-		tools.  The development environment is Cygwin under WinXP.
-
-config ARCH_BOARD_Z8F64200100KI
-	bool "ZiLOG Z8F64200100KIT Development Kit"
-	depends on ARCH_CHIP_Z8F642X
-	---help---
-		z8Encore! Microcontroller.  This port use the Zilog z8f64200100kit
-		development kit, Z8F6423 part, and the Zilog ZDS-II Windows command line
-		tools.  The development environment is Cygwin under WinXP.
-
-config ARCH_BOARD_SIM
-	bool "User mode simulation"
-	depends on ARCH_SIM
-	---help---
-		A user-mode port of NuttX to the x86 Linux/Cygwin platform is available.
-		The purpose of this port is primarily to support OS feature development.
-		This port does not support interrupts or a real timer (and hence no
-		round robin scheduler)  Otherwise, it is complete.
-
-config ARCH_BOARD_CUSTOM
-	bool "Custom development board"
-	---help---
-		Select this option if there is no directory for the board under configs/.
-
-		Don't see the board you want?  You must first select the exact MCU part
-		number, then the boards supporting that part will be available for selection.
-
+		PX4 system I/O expansion board
 endchoice
 
 config ARCH_BOARD
 	string
-	default "amber"              if ARCH_BOARD_AMBER
-	default "avr32dev1"          if ARCH_BOARD_AVR32DEV1
-	default "c5471evm"           if ARCH_BOARD_C5471EVM
-	default "compal_e88"         if ARCH_BOARD_COMPALE88
-	default "compal_e99"         if ARCH_BOARD_COMPALE99
-	default "demo9s12ne64"       if ARCH_BOARD_DEMOS92S12NEC64
-	default "ea3131"             if ARCH_BOARD_EA3131
-	default "ea3152"             if ARCH_BOARD_EA3152
-	default "eagle100"           if ARCH_BOARD_EAGLE100
-	default "ekk-lm3s9b96"       if ARCH_BOARD_EKK_LM3S9B96
-	default "ez80f0910200kitg"   if ARCH_BOARD_EZ80F910200KITG
-	default "ez80f0910200zco"    if ARCH_BOARD_EZ80F910200ZCO
-	default "hymini-stm32v"      if ARCH_BOARD_HYMINI_STM32V
-	default "kwikstik-k40"       if ARCH_BOARD_KWIKSTIK_K40
-	default "lincoln60"          if ARCH_BOARD_LINCOLN60
-	default "lm3s6432-s2e"       if ARCH_BOARD_LM3S6432S2E
-	default "lm3s6965-ek"        if ARCH_BOARD_LM3S6965EK
-	default "lm3s8962-ek"        if ARCH_BOARD_LM3S8962EK
-	default "lpc4330-xplorer"    if ARCH_BOARD_LPC4330_XPLORER
-	default "lpcxpresso-lpc1768" if ARCH_BOARD_LPCXPRESSO
-	default "m68322evb"          if ARCH_BOARD_M68332EVB
-	default "mbed"               if ARCH_BOARD_MBED
-	default "mcu123-lpc214x"     if ARCH_BOARD_MCU123
-	default "micropendous3"      if ARCH_BOARD_MICROPENDOUS3
-	default "mirtoo"             if ARCH_BOARD_MIRTOO
-	default "mx1ads"             if ARCH_BOARD_MX1ADS
-	default "ne64badge"          if ARCH_BOARD_NE64BADGE
-	default "ntosd-dm320"        if ARCH_BOARD_NTOSD_DM320
-	default "nucleus2g"          if ARCH_BOARD_NUCLEUS2G
-	default "olimex-lpc1766stk"  if ARCH_BOARD_LPC1766STK
-	default "olimex-lpc2378"     if ARCH_BOARD_OLIMEXLPC2378
-	default "olimex-strp711"     if ARCH_BOARD_OLIMEX_STRP711
-	default "pcblogic-pic32mx"   if ARCH_BOARD_PCBLOGICPIC32MX
-	default "pic32-starterkit"   if ARCH_BOARD_PIC32_STARTERKIT
-	default "pic32mx7mmb"        if ARCH_BOARD_PIC32_PIC32MX7MMB
-	default "pjrc-8051"          if ARCH_BOARD_PJRC_87C52
-	default "qemu-i486"          if ARCH_BOARD_QEMU_I486
-	default "rgmp"               if ARCH_BOARD_RGMP
-	default "sam3u-ek"           if ARCH_BOARD_SAM3UEK
-	default "skp16c26"           if ARCH_BOARD_SKP16C26
-	default "stm3210e-eval"      if ARCH_BOARD_STM3210E_EVAL
-	default "stm3220g-eval"      if ARCH_BOARD_STM3220G_EVAL
-	default "stm3240g-eval"      if ARCH_BOARD_STM3240G_EVAL
-	default "stm32f4discovery"   if ARCH_BOARD_STM32F4_DISCOVERY
-	default "sure-pic32mx"       if ARCH_BOARD_SUREPIC32MX
-	default "teensy"             if ARCH_BOARD_TEENSY
-	default "twr-k60n512"        if ARCH_BOARD_TWR_K60N512
-	default "ubw32"              if ARCH_BOARD_UBW32
-	default "us7032evb1"         if ARCH_BOARD_US7032EVB1
-	default "vsn"                if ARCH_BOARD_VSN
-	default "xtrs"               if ARCH_BOARD_XTRS
-	default "z16f2800100zcog"    if ARCH_BOARD_Z16F2800100ZCOG
-	default "z80sim"             if ARCH_BOARD_Z80SIM
-	default "z8encore000zco"     if ARCH_BOARD_Z8ENCORE000ZCO
-	default "z8f64200100kit"     if ARCH_BOARD_Z8F64200100KI
-	default "sim"                if ARCH_BOARD_SIM
+	default "px4fmu"             if ARCH_BOARD_PX4FMU
+	default "px4io"              if ARCH_BOARD_PX4IO
 	default ""                   if ARCH_BOARD_CUSTOM
 
-if ARCH_BOARD_AMBER
-source "configs/amber/Kconfig"
+if ARCH_BOARD_PX4FMU
+source "configs/px4fmu/Kconfig"
 endif
-if ARCH_BOARD_AVR32DEV1
-source "configs/avr32dev1/Kconfig"
-endif
-if ARCH_BOARD_C5471EVM
-source "configs/c5471evm/Kconfig"
-endif
-if ARCH_BOARD_COMPALE88
-source "configs/compal_e88/Kconfig"
-endif
-if ARCH_BOARD_COMPALE99
-source "configs/compal_e99/Kconfig"
-endif
-if ARCH_BOARD_DEMOS92S12NEC64
-source "configs/demo9s12ne64/Kconfig"
-endif
-if ARCH_BOARD_EA3131
-source "configs/ea3131/Kconfig"
-endif
-if ARCH_BOARD_EA3152
-source "configs/ea3152/Kconfig"
-endif
-if ARCH_BOARD_EAGLE100
-source "configs/eagle100/Kconfig"
-endif
-if ARCH_BOARD_EKK_LM3S9B96
-source "configs/ekk-lm3s9b96/Kconfig"
-endif
-if ARCH_BOARD_EZ80F910200KITG
-source "configs/ez80f910200kitg/Kconfig"
-endif
-if ARCH_BOARD_EZ80F910200ZCO
-source "configs/ez80f910200zco/Kconfig"
-endif
-if ARCH_BOARD_HYMINI_STM32V
-source "configs/hymini-stm32v/Kconfig"
-endif
-if ARCH_BOARD_KWIKSTIK_K40
-source "configs/kwikstik-k40/Kconfig"
-endif
-if ARCH_BOARD_LINCOLN60
-source "configs/lincoln60/Kconfig"
-endif
-if ARCH_BOARD_LM3S6432S2E
-source "configs/lm3s6432-s2e/Kconfig"
-endif
-if ARCH_BOARD_LM3S6965EK
-source "configs/lm3s6965-ek/Kconfig"
-endif
-if ARCH_BOARD_LM3S8962EK
-source "configs/lm3s8962-ek/Kconfig"
-endif
-if ARCH_BOARD_LPC4330_XPLORER
-source "configs/lpc4330-xplorer/Kconfig"
-endif
-if ARCH_BOARD_LPCXPRESSO
-source "configs/lpcxpresso-lpc1768/Kconfig"
-endif
-if ARCH_BOARD_M68332EVB
-source "configs/m68332evb/Kconfig"
-endif
-if ARCH_BOARD_MBED
-source "configs/mbed/Kconfig"
-endif
-if ARCH_BOARD_MCU123
-source "configs/mcu123-lpc214x/Kconfig"
-endif
-if ARCH_BOARD_MICROPENDOUS3
-source "configs/micropendous3/Kconfig"
-endif
-if ARCH_BOARD_MIRTOO
-source "configs/mirtoo/Kconfig"
-endif
-if ARCH_BOARD_MX1ADS
-source "configs/mx1ads/Kconfig"
-endif
-if ARCH_BOARD_NE64BADGE
-source "configs/ne64badge/Kconfig"
-endif
-if ARCH_BOARD_NTOSD_DM320
-source "configs/ntosd-dm320/Kconfig"
-endif
-if ARCH_BOARD_NUCLEUS2G
-source "configs/nucleus2g/Kconfig"
-endif
-if ARCH_BOARD_LPC1766STK
-source "configs/olimex-lpc1766stk/Kconfig"
-endif
-if ARCH_BOARD_OLIMEXLPC2378
-source "configs/olimex-lpc2378/Kconfig"
-endif
-if ARCH_BOARD_OLIMEX_STRP711
-source "configs/olimex-strp711/Kconfig"
-endif
-if ARCH_BOARD_PCBLOGICPIC32MX
-source "configs/pcblogic-pic32mx/Kconfig"
-endif
-if ARCH_BOARD_PIC32_STARTERKIT
-source "configs/pic32-starterkit/Kconfig"
-endif
-if ARCH_BOARD_PIC32_PIC32MX7MMB
-source "configs/pic32mx7mmb/Kconfig"
-endif
-if ARCH_BOARD_PJRC_87C52
-source "configs/pjrc-8051/Kconfig"
-endif
-if ARCH_BOARD_QEMU_I486
-source "configs/qemu-i486/Kconfig"
-endif
-if ARCH_BOARD_RGMP
-source "configs/rgmp/Kconfig"
-endif
-if ARCH_BOARD_SAM3UEK
-source "configs/sam3u-ek/Kconfig"
-endif
-if ARCH_BOARD_SKP16C26
-source "configs/skp16c26/Kconfig"
-endif
-if ARCH_BOARD_STM3210E_EVAL
-source "configs/stm3210e-eval/Kconfig"
-endif
-if ARCH_BOARD_STM3220G_EVAL
-source "configs/stm3220g-eval/Kconfig"
-endif
-if ARCH_BOARD_STM3240G_EVAL
-source "configs/stm3240g-eval/Kconfig"
-endif
-if ARCH_BOARD_STM32F4_DISCOVERY
-source "configs/stm32f4discovery/Kconfig"
-endif
-if ARCH_BOARD_SUREPIC32MX
-source "configs/sure-pic32mx/Kconfig"
-endif
-if ARCH_BOARD_TEENSY
-source "configs/teensy/Kconfig"
-endif
-if ARCH_BOARD_TWR_K60N512
-source "configs/twr-k60n512/Kconfig"
-endif
-if ARCH_BOARD_UBW32
-source "configs/ubw32/Kconfig"
-endif
-if ARCH_BOARD_US7032EVB1
-source "configs/us7032evb1/Kconfig"
-endif
-if ARCH_BOARD_VSN
-source "configs/vsn/Kconfig"
-endif
-if ARCH_BOARD_XTRS
-source "configs/xtrs/Kconfig"
-endif
-if ARCH_BOARD_Z16F2800100ZCOG
-source "configs/z16f2800100zcog/Kconfig"
-endif
-if ARCH_BOARD_Z80SIM
-source "configs/z80sim/Kconfig"
-endif
-if ARCH_BOARD_Z8ENCORE000ZCO
-source "configs/z8encore000zco/Kconfig"
-endif
-if ARCH_BOARD_Z8F64200100KI
-source "configs/z8f64200100kit/Kconfig"
-endif
-if ARCH_BOARD_SIM
-source "configs/sim/Kconfig"
+if ARCH_BOARD_PX4IO
+source "configs/px4io/Kconfig"
 endif
diff --git a/nuttx/configs/px4fmu/Kconfig b/nuttx/configs/px4fmu/Kconfig
new file mode 100644
index 0000000000..b5e6d5515f
--- /dev/null
+++ b/nuttx/configs/px4fmu/Kconfig
@@ -0,0 +1,26 @@
+#
+# For a description of the syntax of this configuration file,
+# see misc/tools/kconfig-language.txt.
+#
+
+if ARCH_BOARD_PX4FMU
+config ARCH_LEDS
+	bool "NuttX LED support"
+	default n
+	---help---
+		"Support control of board LEDs by NuttX to indicate system state"
+
+config ARCH_BUTTONS
+	bool "Button support"
+	default n
+	---help---
+		"Support interfaces to use buttons provided by the board."
+
+config ARCH_IRQBUTTONS
+	bool "Button interrupt support"
+	default n
+	depends on ARCH_BUTTONS
+	---help---
+		"Support EXTI interrupts on button presses and releases."
+
+endif

From e352171029df7a88414adc61d9608dec839fce2d Mon Sep 17 00:00:00 2001
From: px4dev 
Date: Sun, 26 Aug 2012 17:56:46 -0700
Subject: [PATCH 30/31] Pull configurations into line with current NuttX
 layout.

---
 nuttx/configs/px4fmu/include/board.h |   2 +-
 nuttx/configs/px4fmu/nsh/Make.defs   |   2 +-
 nuttx/configs/px4fmu/nsh/appconfig   |   3 -
 nuttx/configs/px4fmu/nsh/defconfig   | 266 +++++++++++----------------
 nuttx/configs/px4io/io/Make.defs     |   2 +-
 nuttx/configs/px4io/io/defconfig     |  53 ++++--
 6 files changed, 149 insertions(+), 179 deletions(-)

diff --git a/nuttx/configs/px4fmu/include/board.h b/nuttx/configs/px4fmu/include/board.h
index 0db8580ba9..994a3cfa5f 100755
--- a/nuttx/configs/px4fmu/include/board.h
+++ b/nuttx/configs/px4fmu/include/board.h
@@ -106,7 +106,7 @@
 #define STM32_PLLCFG_PLLM       RCC_PLLCFG_PLLM(24)
 #define STM32_PLLCFG_PLLN       RCC_PLLCFG_PLLN(336)
 #define STM32_PLLCFG_PLLP       RCC_PLLCFG_PLLP_2
-#define STM32_PLLCFG_PPQ        RCC_PLLCFG_PLLQ(7)
+#define STM32_PLLCFG_PLLQ       RCC_PLLCFG_PLLQ(7)
 
 #define STM32_SYSCLK_FREQUENCY  168000000ul
 
diff --git a/nuttx/configs/px4fmu/nsh/Make.defs b/nuttx/configs/px4fmu/nsh/Make.defs
index 87508e22ec..3e6f88bd3a 100644
--- a/nuttx/configs/px4fmu/nsh/Make.defs
+++ b/nuttx/configs/px4fmu/nsh/Make.defs
@@ -1,3 +1,3 @@
 include ${TOPDIR}/.config
 
-include $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/common/Make.defs
+include $(TOPDIR)/configs/px4fmu/common/Make.defs
diff --git a/nuttx/configs/px4fmu/nsh/appconfig b/nuttx/configs/px4fmu/nsh/appconfig
index 3323d19986..369a40f95c 100644
--- a/nuttx/configs/px4fmu/nsh/appconfig
+++ b/nuttx/configs/px4fmu/nsh/appconfig
@@ -62,10 +62,7 @@ CONFIGURED_APPS += systemcmds/mixer
 
 CONFIGURED_APPS += uORB
 
-ifeq ($(CONFIG_MAVLINK),y)
 CONFIGURED_APPS += mavlink
-endif
-
 CONFIGURED_APPS += gps
 CONFIGURED_APPS += commander
 #CONFIGURED_APPS += sdlog
diff --git a/nuttx/configs/px4fmu/nsh/defconfig b/nuttx/configs/px4fmu/nsh/defconfig
index a87ce7ffac..c2c67bf41a 100755
--- a/nuttx/configs/px4fmu/nsh/defconfig
+++ b/nuttx/configs/px4fmu/nsh/defconfig
@@ -1,7 +1,8 @@
 ############################################################################
 # configs/px4fmu/nsh/defconfig
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2012 PX4 Development Team. All rights reserved.
+#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt 
 #
 # Redistribution and use in source and binary forms, with or without
@@ -41,7 +42,7 @@
 #   particular chip family that the architecture is implemented
 #   in.
 # CONFIG_ARCH_architecture - for use in C code.  This identifies the
-#   specific architecture within the chip familyl.
+#   specific architecture within the chip family.
 # CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 # CONFIG_ARCH_CHIP_name - For use in C code
 # CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
@@ -51,7 +52,6 @@
 # CONFIG_BOARD_LOOPSPERMSEC - for delay loops
 # CONFIG_DRAM_SIZE - Describes the installed DRAM.
 # CONFIG_DRAM_START - The start address of DRAM (physical)
-# CONFIG_DRAM_END - Last address+1 of installed RAM
 # CONFIG_ARCH_IRQPRIO - The STM3240xxx supports interrupt prioritization
 # CONFIG_ARCH_FPU - The STM3240xxx supports a floating point unit (FPU).
 # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
@@ -70,17 +70,16 @@
 #   the delay actually is 100 seconds.
 # CONFIG_ARCH_DMA - Support DMA initialization
 #
-CONFIG_ARCH=arm
+CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_CORTEXM4=y
-CONFIG_ARCH_CHIP=stm32
+CONFIG_ARCH_CHIP="stm32"
 CONFIG_ARCH_CHIP_STM32F405RG=y
-CONFIG_ARCH_BOARD=px4fmu
+CONFIG_ARCH_BOARD="px4fmu"
 CONFIG_ARCH_BOARD_PX4FMU=y
 CONFIG_BOARD_LOOPSPERMSEC=16717
 CONFIG_DRAM_SIZE=0x00030000
 CONFIG_DRAM_START=0x20000000
-CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE)
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_FPU=y
 CONFIG_ARCH_INTERRUPTSTACK=n
@@ -94,25 +93,8 @@ CONFIG_ARCH_MATH_H=y
 
 CONFIG_ARMV7M_CMNVECTOR=y
 
-#
-# LIBC printf() options
-#   
-#   CONFIG_LIBC_FLOATINGPOINT - Enables printf("%f")
-#   CONFIG_LIBC_FIXEDPRECISION - Sets 7 digits after dot for printing:
-#                                5.1234567
-#   CONFIG_HAVE_LONG_LONG - Enabled printf("%llu)
-#
-CONFIG_LIBC_FLOATINGPOINT=y
-CONFIG_HAVE_LONG_LONG=y
-#CONFIG_LIBC_FIXEDPRECISION=7
 
-#
-# CMSIS options
-#
-#    CONFIG_DSPLIB_TARGET - Target for the CMSIS DSP library, one of
-#   CortexM0, CortexM3 or CortexM4 (with fpu)
-#
-CONFIG_CMSIS_DSPLIB_TARGET=CortexM4
+
 
 #
 # JTAG Enable settings (by default JTAG-DP and SW-DP are enabled):
@@ -131,6 +113,14 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 CONFIG_STM32_JTAG_NOJNTRST_ENABLE=n
 CONFIG_STM32_JTAG_SW_ENABLE=n
 
+#
+# On-chip CCM SRAM configuration
+#
+# CONFIG_STM32_CCMEXCLUDE - Exclude CCM SRAM from the HEAP.  You would need
+#   to do this if DMA is enabled to prevent non-DMA-able CCM memory from
+#   being a part of the stack.
+#
+
 #
 # On-board FSMC SRAM configuration
 #
@@ -181,6 +171,7 @@ CONFIG_STM32_TIM12=y
 CONFIG_STM32_TIM13=y
 CONFIG_STM32_TIM14=y
 CONFIG_STM32_WWDG=y
+CONFIG_STM32_IWDG=n
 CONFIG_STM32_SPI2=n
 CONFIG_STM32_SPI3=y
 CONFIG_STM32_USART2=y
@@ -211,40 +202,6 @@ CONFIG_STM32_TIM9=y
 CONFIG_STM32_TIM10=y
 CONFIG_STM32_TIM11=y
 
-#
-# Configure the ADC
-#
-CONFIG_ADC=y
-# select trigger timer 
-CONFIG_STM32_TIM4_ADC3=y
-# select sample frequency  1^=1.5Msamples/second
-# 65535^=10samples/second 16bit-timer runs at 84/128 MHz
-CONFIG_STM32_ADC3_SAMPLE_FREQUENCY=6000
-# select timer channel 0=CC1,...,3=CC4
-CONFIG_STM32_ADC3_TIMTRIG=3
-CONFIG_ADC_DMA=y
-# only 4 places usable!
-CONFIG_ADC_FIFOSIZE=5
-
-#
-# Timer and I2C devices may need to the following to force power to be applied:
-#
-#CONFIG_STM32_FORCEPOWER=y
-
-#
-# I2C configuration
-#
-CONFIG_I2C=y
-CONFIG_I2C_POLLED=y
-CONFIG_I2C_TRANSFER=y
-CONFIG_I2C_WRITEREAD=y
-CONFIG_I2C_TRACE=n
-# Allow 180 us per byte, a wide margin for the 400 KHz clock we're using
-# e.g. 9.6 ms for an EEPROM page write, 0.9 ms for a MAG update
-CONFIG_STM32_I2CTIMEOUS_PER_BYTE=200
-# Constant overhead for generating I2C start / stop conditions
-CONFIG_STM32_I2CTIMEOUS_START_STOP=700
-CONFIG_DEBUG_I2C=n
 
 #
 # STM32F40xxx specific serial device driver settings
@@ -356,13 +313,6 @@ CONFIG_TONE_ALARM=y
 CONFIG_PWM_SERVO=n
 CONFIG_MULTIPORT=n
 
-#
-# CONFIG_UART2_RTS_CTS_AS_GPIO
-#   If set, enables RTS and CTS pins as additional GPIOs 2 and 3
-# 
-CONFIG_PX4_UART2_RTS_CTS_AS_GPIO=y
-
-
 #
 # STM32F40xxx specific SPI device driver settings
 #
@@ -375,6 +325,8 @@ CONFIG_SPI_EXCHANGE=y
 #
 # CONFIG_CAN - Enables CAN support (one or both of CONFIG_STM32_CAN1 or
 #   CONFIG_STM32_CAN2 must also be defined)
+# CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
+#   Standard 11-bit IDs.
 # CONFIG_CAN_FIFOSIZE - The size of the circular buffer of CAN messages.
 #   Default: 8
 # CONFIG_CAN_NPENDINGRTR - The size of the list of pending RTR requests.
@@ -383,14 +335,53 @@ CONFIG_SPI_EXCHANGE=y
 #   mode for testing. The STM32 CAN driver does support loopback mode.
 # CONFIG_CAN1_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN1 is defined.
 # CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN2 is defined.
+# CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
+# CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
 #
 CONFIG_CAN=n
+CONFIG_CAN_EXTID=n
 #CONFIG_CAN_FIFOSIZE
 #CONFIG_CAN_NPENDINGRTR
 CONFIG_CAN_LOOPBACK=n
 CONFIG_CAN1_BAUD=700000
 CONFIG_CAN2_BAUD=700000
 
+#
+# I2C configuration
+#
+CONFIG_I2C=y
+CONFIG_I2C_POLLED=y
+CONFIG_I2C_TRANSFER=y
+CONFIG_I2C_TRACE=n
+# Allow 180 us per byte, a wide margin for the 400 KHz clock we're using
+# e.g. 9.6 ms for an EEPROM page write, 0.9 ms for a MAG update
+CONFIG_STM32_I2CTIMEOUS_PER_BYTE=200
+# Constant overhead for generating I2C start / stop conditions
+CONFIG_STM32_I2CTIMEOUS_START_STOP=700
+# XXX this is bad and we want it gone
+CONFIG_I2C_WRITEREAD=y
+
+#
+# ADC configuration
+#
+# Enable ADC driver support.
+#
+# CONFIG_ADC=y             : Enable the generic ADC infrastructure
+# CONFIG_STM32_TIM1_ADC=y  : Indicate that timer 1 will be used to trigger an ADC
+# CONFIG_STM32_TIM1_ADC3=y : Assign timer 1 to drive ADC3 sampling
+# CONFIG_STM32_ADC3_SAMPLE_FREQUENCY=100 : Select a sampling frequency
+#
+CONFIG_ADC=y
+CONFIG_STM32_TIM4_ADC3=y
+# select sample frequency  1^=1.5Msamples/second
+# 65535^=10samples/second 16bit-timer runs at 84/128 MHz
+CONFIG_STM32_ADC3_SAMPLE_FREQUENCY=6000
+# select timer channel 0=CC1,...,3=CC4
+CONFIG_STM32_ADC3_TIMTRIG=3
+CONFIG_ADC_DMA=y
+# only 4 places usable!
+CONFIG_ADC_FIFOSIZE=5
+
 #
 # General build options
 #
@@ -408,7 +399,7 @@ CONFIG_CAN2_BAUD=700000
 # CONFIG_HAVE_LIBM - toolchain supports libm.a
 #
 CONFIG_RRLOAD_BINARY=n
-CONFIG_INTELHEX_BINARY=y
+CONFIG_INTELHEX_BINARY=n
 CONFIG_MOTOROLA_SREC=n
 CONFIG_RAW_BINARY=y
 CONFIG_HAVE_LIBM=y
@@ -423,6 +414,9 @@ CONFIG_HAVE_LIBM=y
 # CONFIG_DEBUG_SYMBOLS - build without optimization and with
 #   debug symbols (needed for use with a debugger).
 # CONFIG_HAVE_CXX - Enable support for C++
+# CONFIG_HAVE_CXXINITIALIZE - The platform-specific logic includes support
+#   for initialization of static C++ instances for this architecture
+#   and for the selected toolchain (via up_cxxinitialize()).
 # CONFIG_MM_REGIONS - If the architecture includes multiple
 #   regions of memory to allocate from, this specifies the
 #   number of memory regions that the memory manager must
@@ -497,7 +491,7 @@ CONFIG_HAVE_LIBM=y
 # CONFIG_SCHED_WORKPRIORITY - The execution priority of the worker
 #  thread.  Default: 50
 # CONFIG_SCHED_WORKPERIOD - How often the worker thread checks for
-#  work in units of microseconds.  Default: 50*1000 (50 MS).
+#  work in units of microseconds.  Default: 50000 (50 MS).
 # CONFIG_SCHED_WORKSTACKSIZE - The stack size allocated for the worker
 #  thread.  Default: CONFIG_IDLETHREAD_STACKSIZE.
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
@@ -509,14 +503,20 @@ CONFIG_HAVE_LIBM=y
 CONFIG_DEBUG=y
 CONFIG_DEBUG_VERBOSE=y
 CONFIG_DEBUG_SYMBOLS=y
-CONFIG_DEBUG_ANALOG=n
 CONFIG_DEBUG_FS=n
 CONFIG_DEBUG_GRAPHICS=n
 CONFIG_DEBUG_LCD=n
 CONFIG_DEBUG_USB=n
 CONFIG_DEBUG_NET=n
 CONFIG_DEBUG_RTC=n
+CONFIG_DEBUG_ANALOG=n
+CONFIG_DEBUG_PWM=n
+CONFIG_DEBUG_CAN=n
+CONFIG_DEBUG_I2C=n
+CONFIG_DEBUG_INPUT=n
+
 CONFIG_HAVE_CXX=y
+CONFIG_HAVE_CXXINITIALIZE=n
 CONFIG_MM_REGIONS=2
 CONFIG_ARCH_LOWPUTC=y
 CONFIG_MSEC_PER_TICK=1
@@ -538,13 +538,45 @@ CONFIG_FDCLONE_DISABLE=n
 CONFIG_FDCLONE_STDIO=y
 CONFIG_SDCLONE_DISABLE=y
 CONFIG_SCHED_WORKQUEUE=y
-CONFIG_SCHED_WORKPRIORITY=199
+CONFIG_SCHED_WORKPRIORITY=192
 CONFIG_SCHED_WORKPERIOD=(5*1000)
 CONFIG_SCHED_WORKSTACKSIZE=2048
 CONFIG_SIG_SIGWORK=4
 CONFIG_SCHED_WAITPID=y
 CONFIG_SCHED_ATEXIT=n
 
+#
+# System Logging
+#
+# CONFIG_SYSLOG - Enables the System Logging feature.
+# CONFIG_RAMLOG - Enables the RAM logging feature
+# CONFIG_RAMLOG_CONSOLE - Use the RAM logging device as a system console.
+#   If this feature is enabled (along with CONFIG_DEV_CONSOLE), then all
+#   console output will be re-directed to a circular buffer in RAM.  This
+#   is useful, for example, if the only console is a Telnet console.  Then
+#   in that case, console output from non-Telnet threads will go to the
+#   circular buffer and can be viewed using the NSH 'dmesg' command.
+# CONFIG_RAMLOG_SYSLOG - Use the RAM logging device for the syslogging
+#   interface.  If this feature is enabled (along with CONFIG_SYSLOG),
+#   then all debug output (only) will be re-directed to the circular
+#   buffer in RAM.  This RAM log can be view from NSH using the 'dmesg'
+#   command.
+# CONFIG_RAMLOG_NPOLLWAITERS - The number of threads than can be waiting
+#   for this driver on poll().  Default: 4
+#
+# If CONFIG_RAMLOG_CONSOLE or CONFIG_RAMLOG_SYSLOG is selected, then the
+# following may also be provided:
+#
+# CONFIG_RAMLOG_CONSOLE_BUFSIZE - Size of the console RAM log.  Default: 1024
+#
+
+CONFIG_SYSLOG=n
+CONFIG_RAMLOG=n
+CONFIG_RAMLOG_CONSOLE=n
+CONFIG_RAMLOG_SYSLOG=n
+#CONFIG_RAMLOG_NPOLLWAITERS
+#CONFIG_RAMLOG_CONSOLE_BUFSIZE
+
 #
 # The following can be used to disable categories of
 # APIs supported by the OS.  If the compiler supports
@@ -574,8 +606,14 @@ CONFIG_DISABLE_POLL=n
 #
 # CONFIG_NOPRINTF_FIELDWIDTH - sprintf-related logic is a
 #   little smaller if we do not support fieldwidthes
+# CONFIG_LIBC_FLOATINGPOINT - Enables printf("%f")
+# CONFIG_LIBC_FIXEDPRECISION - Sets 7 digits after dot for printing:
+#   5.1234567
+# CONFIG_HAVE_LONG_LONG - Enabled printf("%llu)
 #
 CONFIG_NOPRINTF_FIELDWIDTH=n
+CONFIG_LIBC_FLOATINGPOINT=y
+CONFIG_HAVE_LONG_LONG=y
 
 #
 # Allow for architecture optimized implementations
@@ -788,42 +826,6 @@ CONFIG_USBDEV_MAXPOWER=500
 CONFIG_USBDEV_TRACE=n
 CONFIG_USBDEV_TRACE_NRECORDS=512
 
-#
-# USB Serial Device Configuration (Prolifics PL2303 emulation)
-#
-# CONFIG_PL2303
-#   Enable compilation of the USB serial driver
-# CONFIG_PL2303_EPINTIN
-#   The logical 7-bit address of a hardware endpoint that supports
-#   interrupt IN operation
-# CONFIG_PL2303_EPBULKOUT
-#   The logical 7-bit address of a hardware endpoint that supports
-#   bulk OUT operation
-# CONFIG_PL2303_EPBULKIN
-#   The logical 7-bit address of a hardware endpoint that supports
-#   bulk IN operation
-# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
-#   The number of write/read requests that can be in flight
-# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
-#   The vendor ID code/string
-# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
-#   The product ID code/string
-# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
-#   Size of the serial receive/transmit buffers
-#
-CONFIG_PL2303=n
-CONFIG_PL2303_EPINTIN=1
-CONFIG_PL2303_EPBULKOUT=2
-CONFIG_PL2303_EPBULKIN=3
-CONFIG_PL2303_NWRREQS=4
-CONFIG_PL2303_NRDREQS=4
-CONFIG_PL2303_VENDORID=0x067b
-CONFIG_PL2303_PRODUCTID=0x2303
-CONFIG_PL2303_VENDORSTR="Nuttx"
-CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
-CONFIG_PL2303_RXBUFSIZE=512
-CONFIG_PL2303_TXBUFSIZE=512
-
 #
 # USB serial device class driver (Standard CDC ACM class)
 #
@@ -896,44 +898,6 @@ CONFIG_CDCACM_PRODUCTSTR="PX4 FMU v1.6"
 #CONFIG_CDCACM_RXBUFSIZE
 #CONFIG_CDCACM_TXBUFSIZE
 
-#
-# USB Storage Device Configuration
-#
-# CONFIG_USBMSC
-#   Enable compilation of the USB storage driver
-# CONFIG_USBMSC_EP0MAXPACKET
-#   Max packet size for endpoint 0
-# CONFIG_USBMSC_EPBULKOUT and CONFIG_USBMSC_EPBULKIN
-#   The logical 7-bit address of a hardware endpoints that support
-#   bulk OUT and IN operations
-# CONFIG_USBMSC_NWRREQS and CONFIG_USBMSC_NRDREQS
-#   The number of write/read requests that can be in flight
-# CONFIG_USBMSC_BULKINREQLEN and CONFIG_USBMSC_BULKOUTREQLEN
-#   The size of the buffer in each write/read request.  This
-#   value needs to be at least as large as the endpoint
-#   maxpacket and ideally as large as a block device sector.
-# CONFIG_USBMSC_VENDORID and CONFIG_USBMSC_VENDORSTR
-#   The vendor ID code/string
-# CONFIG_USBMSC_PRODUCTID and CONFIG_USBMSC_PRODUCTSTR
-#   The product ID code/string
-# CONFIG_USBMSC_REMOVABLE
-#   Select if the media is removable
-#
-CONFIG_USBMSC=n
-CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBMSC_REMOVABLE=y
-
 
 #
 # Settings for apps/nshlib
@@ -944,7 +908,6 @@ CONFIG_USBMSC_REMOVABLE=y
 # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
 # CONFIG_NSH_STRERROR - Use strerror(errno)
 # CONFIG_NSH_LINELEN - Maximum length of one command line
-# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
 # CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
 # CONFIG_NSH_DISABLESCRIPT - Disable scripting support
 # CONFIG_NSH_DISABLEBG - Disable background commands
@@ -989,9 +952,9 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_IOBUFFER_SIZE=512
 CONFIG_NSH_DHCPC=n
 CONFIG_NSH_NOMAC=y
-CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_IPADDR=0x0a000002
+CONFIG_NSH_DRIPADDR=0x0a000001
+CONFIG_NSH_NETMASK=0xffffff00
 CONFIG_NSH_ROMFSMOUNTPT="/etc"
 CONFIG_NSH_INITSCRIPT="init.d/rcS"
 CONFIG_NSH_ROMFSDEVNO=0
@@ -1008,13 +971,6 @@ CONFIG_NSH_MMCSDSPIPORTNO=3
 CONFIG_NSH_MMCSDSLOTNO=0
 CONFIG_NSH_MMCSDMINOR=0
 
-#
-# Settings for  mavlink
-#
-# CONFIG_MAVLINK - Enable MAVLINK app
-# CONFIG_NSH_BUILTIN_APPS - Build the ADC test as an NSH built-in function.
-#   Default: Built as a standalone problem
-CONFIG_MAVLINK=y
 
 #
 # Stack and heap information
diff --git a/nuttx/configs/px4io/io/Make.defs b/nuttx/configs/px4io/io/Make.defs
index 87508e22ec..369772d03f 100644
--- a/nuttx/configs/px4io/io/Make.defs
+++ b/nuttx/configs/px4io/io/Make.defs
@@ -1,3 +1,3 @@
 include ${TOPDIR}/.config
 
-include $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/common/Make.defs
+include $(TOPDIR)/configs/px4io/common/Make.defs
diff --git a/nuttx/configs/px4io/io/defconfig b/nuttx/configs/px4io/io/defconfig
index 8ae6afe3cb..6f3131bf1b 100755
--- a/nuttx/configs/px4io/io/defconfig
+++ b/nuttx/configs/px4io/io/defconfig
@@ -1,7 +1,8 @@
 ############################################################################
 # configs/px4io/nsh/defconfig
 #
-#   Copyright (C) 2009-2012 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2012 PX4 Development Team. All rights reserved.
+#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt 
 #
 # Redistribution and use in source and binary forms, with or without
@@ -41,7 +42,7 @@
 #   particular chip family that the architecture is implemented
 #   in.
 # CONFIG_ARCH_architecture - for use in C code.  This identifies the
-#   specific architecture within the chip familyl.
+#   specific architecture within the chip family.
 # CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 # CONFIG_ARCH_CHIP_name - For use in C code
 # CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
@@ -51,7 +52,6 @@
 # CONFIG_BOARD_LOOPSPERMSEC - for delay loops
 # CONFIG_DRAM_SIZE - Describes the installed DRAM.
 # CONFIG_DRAM_START - The start address of DRAM (physical)
-# CONFIG_DRAM_END - Last address+1 of installed RAM
 # CONFIG_ARCH_IRQPRIO - The ST32F100CB supports interrupt prioritization
 # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
 #   stack. If defined, this symbol is the size of the interrupt
@@ -69,17 +69,16 @@
 #   the delay actually is 100 seconds.
 # CONFIG_ARCH_DMA - Support DMA initialization
 #
-CONFIG_ARCH=arm
+CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_CORTEXM3=y
-CONFIG_ARCH_CHIP=stm32
+CONFIG_ARCH_CHIP="stm32"
 CONFIG_ARCH_CHIP_STM32F100C8=y
-CONFIG_ARCH_BOARD=px4io
+CONFIG_ARCH_BOARD="px4io"
 CONFIG_ARCH_BOARD_PX4IO=y
 CONFIG_BOARD_LOOPSPERMSEC=2000
 CONFIG_DRAM_SIZE=0x00002000
 CONFIG_DRAM_START=0x20000000
-CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE)
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=n
 CONFIG_ARCH_STACKDUMP=y
@@ -109,6 +108,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=n
 
 #
 # Individual subsystems can be enabled:
+#
 # AHB: 
 CONFIG_STM32_DMA1=n
 CONFIG_STM32_DMA2=n
@@ -140,10 +140,6 @@ CONFIG_STM32_TIM8=n
 CONFIG_STM32_USART1=y
 CONFIG_STM32_ADC3=n
 
-#
-# Timer and I2C devices may need to the following to force power to be applied:
-#
-#CONFIG_STM32_FORCEPOWER=y
 
 #
 # STM32F100 specific serial device driver settings
@@ -306,9 +302,6 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SDCLONE_DISABLE. Disable cloning of all socket
 #   desciptors by task_create() when a new task is started. If
 #   set, all sockets will appear to be closed in the new task.
-# CONFIG_NXFLAT. Enable support for the NXFLAT binary format.
-#  This format will support execution of NuttX binaries located
-#  in a ROMFS filesystem (see examples/nxflat).
 # CONFIG_SCHED_WORKQUEUE.  Create a dedicated "worker" thread to
 #  handle delayed processing from interrupt handlers.  This feature
 #  is required for some drivers but, if there are not complaints,
@@ -327,11 +320,25 @@ CONFIG_HAVE_LIBM=n
 #  thread.  Default: CONFIG_IDLETHREAD_STACKSIZE.
 # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
 #  the worker thread.  Default: 4
+# CONFIG_SCHED_WAITPID - Enable the waitpid() API
+# CONFIG_SCHED_ATEXIT - Enabled the atexit() API
 #
 #CONFIG_APPS_DIR=
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=y
+CONFIG_DEBUG_FS=n
+CONFIG_DEBUG_GRAPHICS=n
+CONFIG_DEBUG_LCD=n
+CONFIG_DEBUG_USB=n
+CONFIG_DEBUG_NET=n
+CONFIG_DEBUG_RTC=n
+CONFIG_DEBUG_ANALOG=n
+CONFIG_DEBUG_PWM=n
+CONFIG_DEBUG_CAN=n
+CONFIG_DEBUG_I2C=n
+CONFIG_DEBUG_INPUT=n
+
 CONFIG_HAVE_CXX=n
 CONFIG_HAVE_CXXINITIALIZE=n
 CONFIG_MM_REGIONS=1
@@ -340,9 +347,9 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_RR_INTERVAL=200
 CONFIG_SCHED_INSTRUMENTATION=n
 CONFIG_TASK_NAME_SIZE=0
-CONFIG_START_YEAR=2009
-CONFIG_START_MONTH=9
-CONFIG_START_DAY=21
+CONFIG_START_YEAR=1970
+CONFIG_START_MONTH=1
+CONFIG_START_DAY=1
 CONFIG_GREGORIAN_TIME=n
 CONFIG_JULIAN_TIME=n
 CONFIG_DEV_CONSOLE=y
@@ -354,12 +361,13 @@ CONFIG_SEM_NNESTPRIO=0
 CONFIG_FDCLONE_DISABLE=n
 CONFIG_FDCLONE_STDIO=y
 CONFIG_SDCLONE_DISABLE=y
-CONFIG_NXFLAT=n
 CONFIG_SCHED_WORKQUEUE=n
 CONFIG_SCHED_WORKPRIORITY=50
 CONFIG_SCHED_WORKPERIOD=(50*1000)
 CONFIG_SCHED_WORKSTACKSIZE=1024
 CONFIG_SIG_SIGWORK=4
+CONFIG_SCHED_WAITPID=n
+CONFIG_SCHED_ATEXIT=n
 
 #
 # The following can be used to disable categories of
@@ -427,6 +435,14 @@ CONFIG_ARCH_BZERO=n
 # CONFIG_NAME_MAX - The maximum size of a file name.
 # CONFIG_STDIO_BUFFER_SIZE - Size of the buffer to allocate
 #   on fopen. (Only if CONFIG_NFILE_STREAMS > 0)
+# CONFIG_STDIO_LINEBUFFER - If standard C buffered I/O is enabled
+#   (CONFIG_STDIO_BUFFER_SIZE > 0), then this option may be added
+#   to force automatic, line-oriented flushing the output buffer
+#   for putc(), fputc(), putchar(), puts(), fputs(), printf(),
+#   fprintf(), and vfprintf().  When a newline is encountered in
+#   the output string, the output buffer will be flushed.  This
+#   (slightly) increases the NuttX footprint but supports the kind
+#   of behavior that people expect for printf().
 # CONFIG_NUNGET_CHARS - Number of characters that can be
 #   buffered by ungetc() (Only if CONFIG_NFILE_STREAMS > 0)
 # CONFIG_PREALLOC_MQ_MSGS - The number of pre-allocated message
@@ -452,6 +468,7 @@ CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NFILE_STREAMS=0
 CONFIG_NAME_MAX=32
 CONFIG_STDIO_BUFFER_SIZE=64
+CONFIG_STDIO_LINEBUFFER=n
 CONFIG_NUNGET_CHARS=2
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32

From 4636d41390d0e8afa80da3f9a53600a80ed672bf Mon Sep 17 00:00:00 2001
From: px4dev 
Date: Sun, 26 Aug 2012 18:16:31 -0700
Subject: [PATCH 31/31] Because kconfig can't do arithmetic.

---
 nuttx/configs/px4fmu/nsh/defconfig | 2 +-
 nuttx/configs/px4io/io/defconfig   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nuttx/configs/px4fmu/nsh/defconfig b/nuttx/configs/px4fmu/nsh/defconfig
index c2c67bf41a..fdabb13c50 100755
--- a/nuttx/configs/px4fmu/nsh/defconfig
+++ b/nuttx/configs/px4fmu/nsh/defconfig
@@ -539,7 +539,7 @@ CONFIG_FDCLONE_STDIO=y
 CONFIG_SDCLONE_DISABLE=y
 CONFIG_SCHED_WORKQUEUE=y
 CONFIG_SCHED_WORKPRIORITY=192
-CONFIG_SCHED_WORKPERIOD=(5*1000)
+CONFIG_SCHED_WORKPERIOD=5000
 CONFIG_SCHED_WORKSTACKSIZE=2048
 CONFIG_SIG_SIGWORK=4
 CONFIG_SCHED_WAITPID=y
diff --git a/nuttx/configs/px4io/io/defconfig b/nuttx/configs/px4io/io/defconfig
index 6f3131bf1b..d710f398da 100755
--- a/nuttx/configs/px4io/io/defconfig
+++ b/nuttx/configs/px4io/io/defconfig
@@ -363,7 +363,7 @@ CONFIG_FDCLONE_STDIO=y
 CONFIG_SDCLONE_DISABLE=y
 CONFIG_SCHED_WORKQUEUE=n
 CONFIG_SCHED_WORKPRIORITY=50
-CONFIG_SCHED_WORKPERIOD=(50*1000)
+CONFIG_SCHED_WORKPERIOD=50000
 CONFIG_SCHED_WORKSTACKSIZE=1024
 CONFIG_SIG_SIGWORK=4
 CONFIG_SCHED_WAITPID=n