sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

STM32 OTG FS device fix from Petteri Aimonen

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5318 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-11-07 16:04:10 +00:00
parent bad470ae32
commit 07bf00b775
4 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -3576,4 +3576,4 @@
added by Freddie Chopin. added by Freddie Chopin.
* configs/stm32f100_generic: Support for generic STM32F100RC board * configs/stm32f100_generic: Support for generic STM32F100RC board
contributed by Freddie Chopin. contributed by Freddie Chopin.
* arch/arm/src/stm32_otgfsdev.c: Partial fix from Petteri Aimonen.

11
README.txt
View File

@ -205,7 +205,8 @@ Instantiating "Canned" Configurations
Where <board-name> is the name of your development board and <config-dir>. Where <board-name> is the name of your development board and <config-dir>.
Configuring NuttX requires only copying three files from the <config-dir> Configuring NuttX requires only copying three files from the <config-dir>
to the directly where you installed NuttX (TOPDIR): to the directory where you installed NuttX (TOPDIR) (and sometimes one
additional file to the directory the NuttX application package (APPSDIR)):
Copy configs/<board-name>/<config-dir>/Make.def to ${TOPDIR}/Make.defs Copy configs/<board-name>/<config-dir>/Make.def to ${TOPDIR}/Make.defs
@ -227,6 +228,14 @@ to the directly where you installed NuttX (TOPDIR):
included in the build and what is not. This file is also used included in the build and what is not. This file is also used
to generate a C configuration header at include/nuttx/config.h. to generate a C configuration header at include/nuttx/config.h.
Copy configs/<board-name>/<config-dir>/appconfig to ${APPSDIR}/.config
The appconfig file describes the applications that need to be
built in the appliction directory (APPSDIR). Not all configurations
have an appconfig file. This file is deprecated and will not be
used with new defconfig files produced with the mconf configuration
tool.
General information about configuring NuttX can be found in: General information about configuring NuttX can be found in:
${TOPDIR}/configs/README.txt ${TOPDIR}/configs/README.txt

13
arch/arm/src/stm32/stm32_otgfsdev.c
View File

@ -3900,7 +3900,7 @@ static void stm32_epout_disable(FAR struct stm32_ep_s *privep)
* Name: stm32_epin_disable * Name: stm32_epin_disable
* *
* Description: * Description:
* Diable an IN endpoint will no longer be used * Disable an IN endpoint when it will no longer be used
* *
*******************************************************************************/ *******************************************************************************/
@ -3912,6 +3912,17 @@ static void stm32_epin_disable(FAR struct stm32_ep_s *privep)
usbtrace(TRACE_EPDISABLE, privep->epphy); usbtrace(TRACE_EPDISABLE, privep->epphy);
/* After USB reset, the endpoint will already be deactivated by the
* hardware. Trying to disable again will just hang in the wait.
*/
regaddr = STM32_OTGFS_DIEPCTL(privep->epphy);
regval = stm32_getreg(regaddr);
if ((regval & OTGFS_DIEPCTL_USBAEP) == 0)
{
return;
}
/* Make sure that there is no pending IPEPNE interrupt (because we are /* Make sure that there is no pending IPEPNE interrupt (because we are
* to poll this bit below). * to poll this bit below).
*/ */

2
drivers/lcd/ug-9664hswag01.c
View File

@ -182,7 +182,7 @@
#define UG_BPP 1 #define UG_BPP 1
#define UG_COLORFMT FB_FMT_Y1 #define UG_COLORFMT FB_FMT_Y1
/* Bytes per logical row andactual device row */ /* Bytes per logical row and actual device row */
#define UG_XSTRIDE (UG_XRES >> 3) /* Pixels arrange "horizontally for user" */ #define UG_XSTRIDE (UG_XRES >> 3) /* Pixels arrange "horizontally for user" */
#define UG_YSTRIDE (UG_YRES >> 3) /* But actual device arrangement is "vertical" */ #define UG_YSTRIDE (UG_YRES >> 3) /* But actual device arrangement is "vertical" */