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

Merge branch 'master' of https://bitbucket.org/ziggurat29/nuttx

Browse Source
This commit is contained in:
ziggurat29 2016-04-23 14:18:57 -05:00
commit 4f51a83358
2 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/src/stm32l4/stm32l4_qspi.c
View File

@ -141,9 +141,9 @@
#endif #endif
#ifdef CONFIG_STM32L4_QSPI_DMA #ifdef CONFIG_STM32L4_QSPI_DMA
#if !defined(DMACHAN_QUADSPI) # if !defined(DMACHAN_QUADSPI)
# error QSPI DMA channel must be specified via DMACHAN_QUADSPI in your board.h # error QSPI DMA channel must be specified via DMACHAN_QUADSPI in your board.h
#endif # endif
#endif #endif
#ifndef BOARD_AHB_FREQUENCY #ifndef BOARD_AHB_FREQUENCY
@ -1360,6 +1360,7 @@ static uint32_t qspi_setfrequency(struct qspi_dev_s *dev, uint32_t frequency)
/* XXX we have no better return here, but the caller will find out /* XXX we have no better return here, but the caller will find out
* in their subsequent calls. * in their subsequent calls.
*/ */
return 0; return 0;
} }

2
graphics/vnc/server/vnc_fbdev.c
View File

@ -489,7 +489,7 @@ static inline int vnc_wait_start(int display)
*/ */
while (g_vnc_sessions[display] == NULL || while (g_vnc_sessions[display] == NULL ||
g_vnc_sessions[display]->state != VNCSERVER_UNINITIALIZED) g_vnc_sessions[display]->state == VNCSERVER_UNINITIALIZED)
{ {
/* The server is not yet running. Wait for the server to post the FB /* The server is not yet running. Wait for the server to post the FB
* semaphore. In certain error situations, the server may post the * semaphore. In certain error situations, the server may post the