summaryrefslogtreecommitdiff
path: root/nuttx/configs/shenzhou
diff options
context:
space:
mode:
Diffstat (limited to 'nuttx/configs/shenzhou')
-rw-r--r--nuttx/configs/shenzhou/README.txt12
-rw-r--r--nuttx/configs/shenzhou/include/board.h4
-rw-r--r--nuttx/configs/shenzhou/nsh/Make.defs2
-rw-r--r--nuttx/configs/shenzhou/nxwm/Make.defs2
-rw-r--r--nuttx/configs/shenzhou/src/Makefile2
-rw-r--r--nuttx/configs/shenzhou/src/shenzhou-internal.h2
-rw-r--r--nuttx/configs/shenzhou/src/up_buttons.c2
-rw-r--r--nuttx/configs/shenzhou/src/up_ili93xx.c40
-rw-r--r--nuttx/configs/shenzhou/src/up_ssd1289.c8
-rw-r--r--nuttx/configs/shenzhou/src/up_userleds.c2
-rw-r--r--nuttx/configs/shenzhou/thttpd/Make.defs2
11 files changed, 39 insertions, 39 deletions
diff --git a/nuttx/configs/shenzhou/README.txt b/nuttx/configs/shenzhou/README.txt
index bd25099e2..8cb75d9d3 100644
--- a/nuttx/configs/shenzhou/README.txt
+++ b/nuttx/configs/shenzhou/README.txt
@@ -409,7 +409,7 @@ NXFLAT Toolchain
tools -- just the NXFLAT tools. The buildroot with the NXFLAT tools can
be downloaded from the NuttX SourceForge download site
(https://sourceforge.net/projects/nuttx/files/).
-
+
This GNU toolchain builds and executes in the Linux or Cygwin environment.
1. You must have already configured Nuttx in <some-dir>/nuttx.
@@ -717,14 +717,14 @@ Shenzhou-specific Configuration Options
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
@@ -777,7 +777,7 @@ Where <subdir> is one of the following:
ADC1_IN10(PC0) Potentiometer
External signals are also available on CON5 CN14:
-
+
ADC_IN8 (PB0) CON5 CN14 Pin2
ADC_IN9 (PB1) CON5 CN14 Pin1
@@ -872,7 +872,7 @@ Where <subdir> is one of the following:
-CONFIG_NX_WRITEONLY=y
+# CONFIG_NX_WRITEONLY is not set
-
+
thttpd
------
diff --git a/nuttx/configs/shenzhou/include/board.h b/nuttx/configs/shenzhou/include/board.h
index 818e99ca6..dd0c8f957 100644
--- a/nuttx/configs/shenzhou/include/board.h
+++ b/nuttx/configs/shenzhou/include/board.h
@@ -111,7 +111,7 @@
/* MCO output driven by PLL3. From above, we already have PLL3 input frequency as:
*
- * STM32_PLL_PREDIV2 = 5, 25MHz / 5 => 5MHz
+ * STM32_PLL_PREDIV2 = 5, 25MHz / 5 => 5MHz
*/
#if defined(CONFIG_STM32_MII_MCO) || defined(CONFIG_STM32_RMII_MCO)
@@ -199,7 +199,7 @@
* 56 PD9 MII_RXD0 Ethernet PHY. Requires CONFIG_STM32_ETH_REMAP
* 57 PD10 MII_RXD1 Ethernet PHY. Requires CONFIG_STM32_ETH_REMAP
*
- * The board desdign can support a 50MHz external clock to drive the PHY
+ * The board desdign can support a 50MHz external clock to drive the PHY
* (U9). However, on my board, U9 is not present.
*
* 67 PA8 MCO DM9161AEP
diff --git a/nuttx/configs/shenzhou/nsh/Make.defs b/nuttx/configs/shenzhou/nsh/Make.defs
index b86405db2..2bf31972e 100644
--- a/nuttx/configs/shenzhou/nsh/Make.defs
+++ b/nuttx/configs/shenzhou/nsh/Make.defs
@@ -54,7 +54,7 @@ ifeq ($(WINTOOL),y)
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
else
- # Linux/Cygwin-native toolchain
+ # Linux/Cygwin-native toolchain
MKDEP = $(TOPDIR)/tools/mkdeps.sh
ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
diff --git a/nuttx/configs/shenzhou/nxwm/Make.defs b/nuttx/configs/shenzhou/nxwm/Make.defs
index 4bf903e1b..16a4e8dd9 100644
--- a/nuttx/configs/shenzhou/nxwm/Make.defs
+++ b/nuttx/configs/shenzhou/nxwm/Make.defs
@@ -54,7 +54,7 @@ ifeq ($(WINTOOL),y)
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
else
- # Linux/Cygwin-native toolchain
+ # Linux/Cygwin-native toolchain
MKDEP = $(TOPDIR)/tools/mkdeps.sh
ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
diff --git a/nuttx/configs/shenzhou/src/Makefile b/nuttx/configs/shenzhou/src/Makefile
index 28c42c392..888e470d7 100644
--- a/nuttx/configs/shenzhou/src/Makefile
+++ b/nuttx/configs/shenzhou/src/Makefile
@@ -37,7 +37,7 @@
CFLAGS += -I$(TOPDIR)/sched
-ASRCS =
+ASRCS =
AOBJS = $(ASRCS:.S=$(OBJEXT))
CSRCS = up_boot.c up_spi.c up_mmcsd.c up_chipid.c
diff --git a/nuttx/configs/shenzhou/src/shenzhou-internal.h b/nuttx/configs/shenzhou/src/shenzhou-internal.h
index f28abcf60..35b6a27eb 100644
--- a/nuttx/configs/shenzhou/src/shenzhou-internal.h
+++ b/nuttx/configs/shenzhou/src/shenzhou-internal.h
@@ -83,7 +83,7 @@
* 56 PD9 MII_RXD0 Ethernet PHY. Requires CONFIG_STM32_ETH_REMAP
* 57 PD10 MII_RXD1 Ethernet PHY. Requires CONFIG_STM32_ETH_REMAP
*
- * The board desdign can support a 50MHz external clock to drive the PHY
+ * The board desdign can support a 50MHz external clock to drive the PHY
* (U9). However, on my board, U9 is not present.
*
* 67 PA8 MCO DM9161AEP
diff --git a/nuttx/configs/shenzhou/src/up_buttons.c b/nuttx/configs/shenzhou/src/up_buttons.c
index 7d4a7f04e..ec84824c6 100644
--- a/nuttx/configs/shenzhou/src/up_buttons.c
+++ b/nuttx/configs/shenzhou/src/up_buttons.c
@@ -87,7 +87,7 @@ void board_button_initialize(void)
{
int i;
- /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are
+ /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are
* configured for some pins but NOT used in this file
*/
diff --git a/nuttx/configs/shenzhou/src/up_ili93xx.c b/nuttx/configs/shenzhou/src/up_ili93xx.c
index be56a6d66..19ab2c014 100644
--- a/nuttx/configs/shenzhou/src/up_ili93xx.c
+++ b/nuttx/configs/shenzhou/src/up_ili93xx.c
@@ -220,7 +220,7 @@
/* Display/Color Properties ***********************************************************/
/* Display Resolution */
-#if defined(CONFIG_LCD_LANDSCAPE) || defined(CONFIG_LCD_RLANDSCAPE)
+#if defined(CONFIG_LCD_LANDSCAPE) || defined(CONFIG_LCD_RLANDSCAPE)
# define STM32_XRES 320
# define STM32_YRES 240
#else
@@ -509,9 +509,9 @@ static const uint32_t g_lcdout[16] =
static const uint32_t g_lcdin[16] =
{
- GPIO_LCD_D0IN, GPIO_LCD_D1IN, GPIO_LCD_D2IN, GPIO_LCD_D3IN,
- GPIO_LCD_D4IN, GPIO_LCD_D5IN, GPIO_LCD_D6IN, GPIO_LCD_D7IN,
- GPIO_LCD_D8IN, GPIO_LCD_D9IN, GPIO_LCD_D10IN, GPIO_LCD_D11IN,
+ GPIO_LCD_D0IN, GPIO_LCD_D1IN, GPIO_LCD_D2IN, GPIO_LCD_D3IN,
+ GPIO_LCD_D4IN, GPIO_LCD_D5IN, GPIO_LCD_D6IN, GPIO_LCD_D7IN,
+ GPIO_LCD_D8IN, GPIO_LCD_D9IN, GPIO_LCD_D10IN, GPIO_LCD_D11IN,
GPIO_LCD_D12IN, GPIO_LCD_D13IN, GPIO_LCD_D14IN, GPIO_LCD_D15IN
};
#endif
@@ -548,7 +548,7 @@ static const struct fb_videoinfo_s g_videoinfo =
/* This is the standard, NuttX Plane information object */
-static const struct lcd_planeinfo_s g_planeinfo =
+static const struct lcd_planeinfo_s g_planeinfo =
{
.putrun = stm32_putrun, /* Put a run into LCD memory */
.getrun = stm32_getrun, /* Get a run from LCD memory */
@@ -558,12 +558,12 @@ static const struct lcd_planeinfo_s g_planeinfo =
/* This is the standard, NuttX LCD driver object */
-static struct stm32_dev_s g_lcddev =
+static struct stm32_dev_s g_lcddev =
{
.dev =
{
/* LCD Configuration */
-
+
.getvideoinfo = stm32_getvideoinfo,
.getplaneinfo = stm32_getplaneinfo,
@@ -674,9 +674,9 @@ static uint16_t stm32_readreg(FAR struct stm32_dev_s *priv, uint8_t regaddr)
putreg32(1, LCD_RS_SET);
putreg32(1, LCD_RD_CLEAR);
putreg32(1, LCD_RD_SET);
- regval = (uint16_t)getreg32(LCD_IDR);
+ regval = (uint16_t)getreg32(LCD_IDR);
putreg32(1, LCD_CS_SET);
-
+
return regval;
}
@@ -750,9 +750,9 @@ static inline uint16_t stm32_readgram(FAR struct stm32_dev_s *priv)
putreg32(1, LCD_RS_SET);
putreg32(1, LCD_RD_CLEAR);
putreg32(1, LCD_RD_SET);
- regval = (uint16_t)getreg32(LCD_IDR);
+ regval = (uint16_t)getreg32(LCD_IDR);
putreg32(1, LCD_CS_SET);
-
+
return regval;
}
@@ -767,7 +767,7 @@ static inline uint16_t stm32_readgram(FAR struct stm32_dev_s *priv)
* - ILI932x: Discard first dummy read; no shift in the return data
*
************************************************************************************/
-
+
static void stm32_readnosetup(FAR struct stm32_dev_s *priv, FAR uint16_t *accum)
{
/* Read-ahead one pixel */
@@ -782,7 +782,7 @@ static void stm32_readnosetup(FAR struct stm32_dev_s *priv, FAR uint16_t *accum)
* Read one correctly aligned pixel from the GRAM memory. Possibly shifting the
* data and possibly swapping red and green components.
*
- * - ILI932x: Unknown -- assuming colors are in the color order
+ * - ILI932x: Unknown -- assuming colors are in the color order
*
************************************************************************************/
@@ -866,7 +866,7 @@ static int stm32_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffe
FAR struct stm32_dev_s *priv = &g_lcddev;
FAR const uint16_t *src = (FAR const uint16_t*)buffer;
int i;
-
+
/* Buffer must be provided and aligned to a 16-bit address boundary */
lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
@@ -933,7 +933,7 @@ static int stm32_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffe
/* Convert coordinates */
row = (STM32_YRES-1) - row;
-
+
/* Then write the GRAM data, manually incrementing Y (which is col) */
for (i = 0; i < npixels; i++)
@@ -975,7 +975,7 @@ static int stm32_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
uint16_t (*readgram)(FAR struct stm32_dev_s *priv, FAR uint16_t *accum);
uint16_t accum;
int i;
-
+
/* Buffer must be provided and aligned to a 16-bit address boundary */
lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
@@ -1001,7 +1001,7 @@ static int stm32_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
default: /* Shouldn't happen */
return -ENOSYS;
}
-
+
/* Read the run from GRAM */
#ifdef CONFIG_LCD_LANDSCAPE
@@ -1071,7 +1071,7 @@ static int stm32_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
/* Convert coordinates */
row = (STM32_YRES-1) - row;
-
+
/* Then write the GRAM data, manually incrementing Y (which is col) */
for (i = 0; i < npixels; i++)
@@ -1158,7 +1158,7 @@ static int stm32_poweroff(FAR struct stm32_dev_s *priv)
{
/* Turn the display off */
- stm32_writereg(priv, LCD_REG_7, 0);
+ stm32_writereg(priv, LCD_REG_7, 0);
/* Remember the power off state */
@@ -1963,7 +1963,7 @@ void stm32_lcdclear(uint16_t color)
FAR struct stm32_dev_s *priv = &g_lcddev;
uint32_t i = 0;
- stm32_setcursor(priv, 0, 0);
+ stm32_setcursor(priv, 0, 0);
stm32_gramselect(priv);
/* Make sure that we are configured for output */
diff --git a/nuttx/configs/shenzhou/src/up_ssd1289.c b/nuttx/configs/shenzhou/src/up_ssd1289.c
index 0443d970e..ed30bebd3 100644
--- a/nuttx/configs/shenzhou/src/up_ssd1289.c
+++ b/nuttx/configs/shenzhou/src/up_ssd1289.c
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
************************************************************************************/
-
+
/************************************************************************************
* Included Files
************************************************************************************/
@@ -230,9 +230,9 @@ static const uint32_t g_lcdout[16] =
static const uint32_t g_lcdin[16] =
{
- GPIO_LCD_D0IN, GPIO_LCD_D1IN, GPIO_LCD_D2IN, GPIO_LCD_D3IN,
- GPIO_LCD_D4IN, GPIO_LCD_D5IN, GPIO_LCD_D6IN, GPIO_LCD_D7IN,
- GPIO_LCD_D8IN, GPIO_LCD_D9IN, GPIO_LCD_D10IN, GPIO_LCD_D11IN,
+ GPIO_LCD_D0IN, GPIO_LCD_D1IN, GPIO_LCD_D2IN, GPIO_LCD_D3IN,
+ GPIO_LCD_D4IN, GPIO_LCD_D5IN, GPIO_LCD_D6IN, GPIO_LCD_D7IN,
+ GPIO_LCD_D8IN, GPIO_LCD_D9IN, GPIO_LCD_D10IN, GPIO_LCD_D11IN,
GPIO_LCD_D12IN, GPIO_LCD_D13IN, GPIO_LCD_D14IN, GPIO_LCD_D15IN
};
#endif
diff --git a/nuttx/configs/shenzhou/src/up_userleds.c b/nuttx/configs/shenzhou/src/up_userleds.c
index 60fa7d9c3..0fc83fd1e 100644
--- a/nuttx/configs/shenzhou/src/up_userleds.c
+++ b/nuttx/configs/shenzhou/src/up_userleds.c
@@ -75,7 +75,7 @@
****************************************************************************/
/* This array maps an LED number to GPIO pin configuration */
-static uint32_t g_ledcfg[BOARD_NLEDS] =
+static uint32_t g_ledcfg[BOARD_NLEDS] =
{
GPIO_LED1, GPIO_LED2, GPIO_LED3, GPIO_LED4
};
diff --git a/nuttx/configs/shenzhou/thttpd/Make.defs b/nuttx/configs/shenzhou/thttpd/Make.defs
index a1be960ef..1acc6b2a2 100644
--- a/nuttx/configs/shenzhou/thttpd/Make.defs
+++ b/nuttx/configs/shenzhou/thttpd/Make.defs
@@ -54,7 +54,7 @@ ifeq ($(WINTOOL),y)
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
else
- # Linux/Cygwin-native toolchain
+ # Linux/Cygwin-native toolchain
MKDEP = $(TOPDIR)/tools/mkdeps.sh
ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-18 03:47:11 +0000