nuttx/nuttx-mirror
1
2
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-01-13 10:58:49 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

drivers/lcd : add ioctl passthrough for LCD driver

Browse source 
Some LCD vendors support unit test commands, we should passthrough the ioctl
commands to drivers.

Signed-off-by: rongyichang <rongyichang@xiaomi.com>
This commit is contained in:
rongyichang 2023-08-11 06:37:12 +08:00 committed by Xiang Xiao
parent 709301cbfd
commit 917634446e
3 changed files with 50 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/lcd/lcd_dev.c
View file

@ -292,7 +292,17 @@ static int lcddev_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
}
break;
default:
ret = -EINVAL;
{
if (priv->lcd_ptr->ioctl)
{
ret = priv->lcd_ptr->ioctl(priv->lcd_ptr, cmd, arg);
}
else
{
gerr("ERROR: Unsupported IOCTL command: %d\n", cmd);
ret = -ENOTTY;
}
}
break;
}

37
drivers/lcd/lcd_framebuffer.c
View file

@ -400,7 +400,7 @@ static int lcdfb_putcmap(FAR struct fb_vtable_s *vtable,
#ifdef CONFIG_FB_HWCURSOR
static int lcdfb_getcursor(FAR struct fb_vtable_s *vtable,
FAR struct fb_cursorattrib_s *attrib)
FAR struct fb_cursorattrib_s *attrib)
{
lcdinfo("vtable=%p attrib=%p\n", vtable, attrib);
FAR struct lcdfb_dev_s *priv;
@ -435,7 +435,7 @@ static int lcdfb_getcursor(FAR struct fb_vtable_s *vtable,
#ifdef CONFIG_FB_HWCURSOR
static int lcdfb_setcursor(FAR struct fb_vtable_s *vtable,
FAR struct fb_setcursor_s *settings)
FAR struct fb_setcursor_s *settings)
{
FAR struct lcdfb_dev_s *priv;
FAR struct lcd_dev_s *lcd;
@ -492,6 +492,38 @@ static int lcdfb_setpower(FAR struct fb_vtable_s *vtable, FAR int power)
return ret;
}
/****************************************************************************
* Name: lcdfb_ioctl
****************************************************************************/
static int lcdfb_ioctl(FAR struct fb_vtable_s *vtable,
int cmd, unsigned long arg)
{
int ret = -EINVAL;
FAR struct lcdfb_dev_s *priv;
FAR struct lcd_dev_s *lcd;
DEBUGASSERT(vtable != NULL);
priv = (FAR struct lcdfb_dev_s *)vtable;
if (priv != NULL)
{
lcd = priv->lcd;
if (lcd->ioctl)
{
ret = lcd->ioctl(lcd, cmd, arg);
}
else
{
ret = -ENOTTY;
}
}
return ret;
}
/****************************************************************************
* Public Functions
****************************************************************************/
@ -548,6 +580,7 @@ int up_fbinitialize(int display)
#endif
priv->vtable.updatearea = lcdfb_updateearea,
priv->vtable.setpower = lcdfb_setpower,
priv->vtable.ioctl = lcdfb_ioctl,
#ifdef CONFIG_LCD_EXTERNINIT
/* Use external graphics driver initialization */

4
include/nuttx/lcd/lcd.h
View file

@ -264,6 +264,10 @@ struct lcd_dev_s
int (*getareaalign)(FAR struct lcd_dev_s *dev,
FAR struct lcddev_area_align_s *align);
/* Passthrough unknown ioctl commands. */
int (*ioctl)(FAR struct lcd_dev_s *dev, int cmd, unsigned long arg);
};
/****************************************************************************