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

Check for return of nxsem_wait_uninterruptible. This commit is for files under arch/sim

Browse Source
This commit is contained in:
Alan Carvalho de Assis 2020-04-01 15:50:39 -03:00 committed by GitHub
parent 9ff1795760
commit 30ca00c0a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sim/src/sim/up_internal.h
View File

@ -291,8 +291,8 @@ int up_x11cmap(unsigned short first, unsigned short len,
/* up_touchscreen.c *********************************************************/
#ifdef CONFIG_SIM_TOUCHSCREEN
int sim_tsc_initialize(int minor);
void sim_tsc_uninitialize(void);
int sim_tsc_initialize(int minor);
int sim_tsc_uninitialize(void);
#endif
/* up_eventloop.c ***********************************************************/

16
arch/sim/src/sim/up_touchscreen.c
View File

@ -66,6 +66,7 @@
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/* Configuration ************************************************************/
#ifndef CONFIG_SIM_TCNWAITERS
@ -73,6 +74,7 @@
#endif
/* Driver support ***********************************************************/
/* This format is used to construct the /dev/input[n] device driver path. It
* defined here so that it will be used consistently in all places.
*/
@ -675,19 +677,23 @@ errout_with_priv:
* None
*
* Returned Value:
* None.
* Return OK if success or negative value of the error.
*
****************************************************************************/
void sim_tsc_uninitialize(void)
int sim_tsc_uninitialize(void)
{
FAR struct up_dev_s *priv = (FAR struct up_dev_s *)&g_simtouchscreen;
char devname[DEV_NAMELEN];
int ret;
int ret = OK;
/* Get exclusive access */
nxsem_wait_uninterruptible(&priv->devsem);
ret = nxsem_wait_uninterruptible(&priv->devsem);
if (ret < 0)
{
return ret;
}
/* Stop the event loop (Hmm.. the caller must be sure that there are no
* open references to the touchscreen driver. This might better be
@ -711,6 +717,8 @@ void sim_tsc_uninitialize(void)
nxsem_destroy(&priv->waitsem);
nxsem_destroy(&priv->devsem);
return ret;
}
/****************************************************************************