diff options
| -rw-r--r-- | nuttx/ChangeLog | 5 | ||||
| -rwxr-xr-x | nuttx/arch/arm/src/stm32/stm32_otgfsdev.c | 3 | ||||
| -rw-r--r-- | nuttx/configs/stm3220g-eval/README.txt | 15 |
3 files changed, 21 insertions, 2 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 9d5096aac..a39dfad89 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -2831,4 +2831,7 @@ touchscreen, and LCD support. * configs/stm3220g-eval/: Add a NxWM configuration for the STM3220G-EVAL. * stmpe11*: Fix a massive naming problem. All references to STMPE11 should be - STMPE811. + STMPE812. + * arch/arm/src/stm32/stm32_otgfsdev.c: Need to enabled USB reset interrupt + (contricuted by Erik Van Der Zalm). + diff --git a/nuttx/arch/arm/src/stm32/stm32_otgfsdev.c b/nuttx/arch/arm/src/stm32/stm32_otgfsdev.c index 0d46f9010..39c40d80a 100755 --- a/nuttx/arch/arm/src/stm32/stm32_otgfsdev.c +++ b/nuttx/arch/arm/src/stm32/stm32_otgfsdev.c @@ -3443,6 +3443,7 @@ static int stm32_usbinterrupt(int irq, FAR void *context) stm32_usbreset(priv); usbtrace(TRACE_INTEXIT(STM32_TRACEINTID_USB), 0); + stm32_putreg(OTGFS_GINT_USBRST, STM32_OTGFS_GINTSTS); return OK; } @@ -5104,7 +5105,7 @@ static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv) /* Enable the interrupts in the INTMSK */ regval = (OTGFS_GINT_RXFLVL | OTGFS_GINT_USBSUSP | OTGFS_GINT_ENUMDNE | - OTGFS_GINT_IEP | OTGFS_GINT_OEP | regval); + OTGFS_GINT_IEP | OTGFS_GINT_OEP | OTGFS_GINT_USBRST); #ifdef CONFIG_USBDEV_ISOCHRONOUS regval |= (OTGFS_GINT_IISOIXFR | OTGFS_GINT_IISOOXFR); diff --git a/nuttx/configs/stm3220g-eval/README.txt b/nuttx/configs/stm3220g-eval/README.txt index 4a75d5a1a..2b5211708 100644 --- a/nuttx/configs/stm3220g-eval/README.txt +++ b/nuttx/configs/stm3220g-eval/README.txt @@ -913,6 +913,21 @@ Where <subdir> is one of the following: There is nothing in the DMA driver to prevent this now. + nxwm + ---- + This is a special configuration setup for the NxWM window manager + UnitTest. The NxWM window manager can be found here: + + trunk/NxWidgets/nxwm + + The NxWM unit test can be found at: + + trunk/NxWidgets/UnitTests/nxwm + + Documentation for installing the NxWM unit test can be found here: + + trunk/NxWidgets/UnitTests/READEM.txt + ostest: ------ This configuration directory, performs a simple OS test using |