Skip to content

Commit

Permalink
nuttx: add open and close callback functions for the mouse.
Browse files Browse the repository at this point in the history
Signed-off-by: liuhongchao <[email protected]>
  • Loading branch information
HongChao6 authored and xiaoxiang781216 committed Jan 17, 2025
1 parent 6bfec7e commit 1e2c002
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 5 deletions.
6 changes: 3 additions & 3 deletions drivers/input/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ endif # FF_AW86225
endif # INPUT_FF

config INPUT_MOUSE
bool "Enable mouse support"
bool
default n
---help---
Enable support for mouse devices.
Expand All @@ -82,11 +82,11 @@ config INPUT_MOUSE_WHEEL
endif # INPUT_MOUSE

config INPUT_TOUCHSCREEN
bool "Enable touchscreen support"
bool
default n

config INPUT_KEYBOARD
bool "Enable keyboard support"
bool
default n

config INPUT_UINPUT
Expand Down
12 changes: 12 additions & 0 deletions drivers/input/mouse_upper.c
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ static int mouse_open(FAR struct file *filep)
FAR struct mouse_openpriv_s *openpriv;
FAR struct inode *inode = filep->f_inode;
FAR struct mouse_upperhalf_s *upper = inode->i_private;
FAR struct mouse_lowerhalf_s *lower = upper->lower;
int ret;

ret = nxmutex_lock(&upper->lock);
Expand Down Expand Up @@ -131,6 +132,11 @@ static int mouse_open(FAR struct file *filep)
nxmutex_init(&openpriv->lock);
list_add_tail(&upper->head, &openpriv->node);

if (lower->open && list_is_singular(&openpriv->node))
{
ret = lower->open(lower);
}

/* Save the buffer node pointer so that it can be used directly
* in the read operation.
*/
Expand All @@ -149,6 +155,7 @@ static int mouse_close(FAR struct file *filep)
FAR struct mouse_openpriv_s *openpriv = filep->f_priv;
FAR struct inode *inode = filep->f_inode;
FAR struct mouse_upperhalf_s *upper = inode->i_private;
FAR struct mouse_lowerhalf_s *lower = upper->lower;
int ret;

ret = nxmutex_lock(&upper->lock);
Expand All @@ -157,6 +164,11 @@ static int mouse_close(FAR struct file *filep)
return ret;
}

if (lower->close && list_is_singular(&openpriv->node))
{
ret = lower->close(lower);
}

list_delete(&openpriv->node);
circbuf_uninit(&openpriv->circbuf);
nxsem_destroy(&openpriv->waitsem);
Expand Down
41 changes: 39 additions & 2 deletions include/nuttx/input/mouse.h
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,7 @@ struct mouse_report_s
/* Possibly padded with 1 byte here */
int16_t x; /* X coordinate of the mouse position */
int16_t y; /* Y coordinate of the mouse position */
#ifdef CONFIG_INPUT_MOUSE_WHEEL
int16_t wheel; /* Mouse wheel position */
#endif
};

/* This structure is for mouse lower half driver */
Expand All @@ -143,6 +141,45 @@ struct mouse_lowerhalf_s

CODE int (*control)(FAR struct mouse_lowerhalf_s *lower,
int cmd, unsigned long arg);

/**************************************************************************
* Name: open
*
* Description:
* This function pointer is used to open a connection to the mouse driver
* instance. It initializes the mouse and prepares it for subsequent
* interactions with the user. This function typically sets up the state
* of the driver and allocates any necessary resources.
*
* Input Parameters:
* lower - A pointer to the instance of the lower half mouse driver.
* filep - A pointer to the file structure representing the user.
*
* Returned Value:
* It returns zero (OK) on success; a negative errno value on failure.
**************************************************************************/

CODE int (*open)(FAR struct mouse_lowerhalf_s *lower);

/**************************************************************************
* Name: close
*
* Description:
* This function pointer is used to close the connection to the mouse
* driver instance. It performs any necessary cleanup operations, such as
* releasing resources and resetting the state of the mouse driver,
* before ending theinteraction with the user.
*
* Input Parameters:
* lower - A pointer to the instance of the lower half mouse driver.
* filep - A pointer to the file structure representing the user closing
* the mouse connection.
*
* Returned Value:
* Returns zero (OK) on success; a negative errno value on failure.
**************************************************************************/

CODE int (*close)(FAR struct mouse_lowerhalf_s *lower);
};

/****************************************************************************
Expand Down

0 comments on commit 1e2c002

Please sign in to comment.