diff options
| author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-05-19 01:01:00 +0000 |
|---|---|---|
| committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-05-19 01:01:00 +0000 |
| commit | dd202a4aa7991e9e4db32265c9bd4ee42de7b3f6 (patch) | |
| tree | b60235b0a038088298aa0f5497411fcb453c424d /nuttx/include | |
| parent | 2acf00c2cde3fd8f42d0ae7eb9df787310b85c41 (diff) | |
| download | px4-firmware-dd202a4aa7991e9e4db32265c9bd4ee42de7b3f6.tar.gz px4-firmware-dd202a4aa7991e9e4db32265c9bd4ee42de7b3f6.tar.bz2 px4-firmware-dd202a4aa7991e9e4db32265c9bd4ee42de7b3f6.zip | |
NxWM: Add a missing part of the message blocking logic
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4748 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx/include')
| -rw-r--r-- | nuttx/include/nuttx/nx/nx.h | 9 | ||||
| -rw-r--r-- | nuttx/include/nuttx/nx/nxtk.h | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/nuttx/include/nuttx/nx/nx.h b/nuttx/include/nuttx/nx/nx.h index 4a228de25..153c34a3e 100644 --- a/nuttx/include/nuttx/nx/nx.h +++ b/nuttx/include/nuttx/nx/nx.h @@ -209,8 +209,9 @@ struct nx_callback_s * * Input Parameters: * hwnd - Window handle of the blocked window - * arg - User provided argument (see nx_openwindow, nx_requestbkgd, + * arg1 - User provided argument (see nx_openwindow, nx_requestbkgd, * nxtk_openwindow, or nxtk_opentoolbar) + * arg2 - User provided argument (see nx_block or nxtk_block) * * Returned Value: * None @@ -218,7 +219,7 @@ struct nx_callback_s **************************************************************************/ #ifdef CONFIG_NX_MULTIUSER - void (*blocked)(NXWINDOW hwnd, FAR void *arg); + void (*blocked)(NXWINDOW hwnd, FAR void *arg1, FAR void *arg2); #endif }; @@ -487,6 +488,8 @@ EXTERN int nx_closewindow(NXWINDOW hwnd); * * Input Parameters: * wnd - The window to be blocked + * arg - An argument that will accompany the block messages (This is arg2 + * in the blocked callback). * * Return: * OK on success; ERROR on failure with errno set appropriately @@ -494,7 +497,7 @@ EXTERN int nx_closewindow(NXWINDOW hwnd); ****************************************************************************/ #ifdef CONFIG_NX_MULTIUSER -EXTERN int nx_block(NXWINDOW hwnd); +EXTERN int nx_block(NXWINDOW hwnd, FAR void *arg); #endif /**************************************************************************** diff --git a/nuttx/include/nuttx/nx/nxtk.h b/nuttx/include/nuttx/nx/nxtk.h index a69d17775..60080e47f 100644 --- a/nuttx/include/nuttx/nx/nxtk.h +++ b/nuttx/include/nuttx/nx/nxtk.h @@ -173,6 +173,8 @@ EXTERN int nxtk_closewindow(NXTKWINDOW hfwnd); * * Input Parameters: * hfwnd - The window to be blocked + * arg - An argument that will accompany the block messages (This is arg2 + * in the blocked callback). * * Return: * OK on success; ERROR on failure with errno set appropriately @@ -180,7 +182,7 @@ EXTERN int nxtk_closewindow(NXTKWINDOW hfwnd); ****************************************************************************/ #ifdef CONFIG_NX_MULTIUSER -EXTERN int nxtk_block(NXTKWINDOW hfwnd); +EXTERN int nxtk_block(NXTKWINDOW hfwnd, FAR void *arg); #endif /**************************************************************************** |