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

drivers/video: fb_read/fb_write need consider the current file position

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
Change-Id: Id3a475dac928ed3dff4eee96150badadf5210f44
This commit is contained in:
Xiang Xiao 2020-07-22 18:11:01 +08:00 committed by Alin Jerpelea
parent f044c82dae
commit a5ef3731b1
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/video/fb.c
View File

@ -173,7 +173,7 @@ static ssize_t fb_read(FAR struct file *filep, FAR char *buffer, size_t len)
/* And transfer the data from the frame buffer */
memcpy(buffer, fb->fbmem, size);
memcpy(buffer, fb->fbmem + start, size);
filep->f_pos += size;
return size;
}
@ -217,7 +217,7 @@ static ssize_t fb_write(FAR struct file *filep, FAR const char *buffer,
/* And transfer the data into the frame buffer */
memcpy(fb->fbmem, buffer, size);
memcpy(fb->fbmem + start, buffer, size);
filep->f_pos += size;
return size;
}
@ -264,6 +264,7 @@ static off_t fb_seek(FAR struct file *filep, off_t offset, int whence)
break;
default:
/* Return EINVAL if the whence argument is invalid */
return -EINVAL;
@ -271,15 +272,14 @@ static off_t fb_seek(FAR struct file *filep, off_t offset, int whence)
/* Opengroup.org:
*
* "The lseek() function shall allow the file offset to be set beyond the end
* of the existing data in the file. If data is later written at this point,
* subsequent reads of data in the gap shall return bytes with the value 0
* until data is actually written into the gap."
* "The lseek() function shall allow the file offset to be set beyond the
* end of the existing data in the file. If data is later written at this
* point, subsequent reads of data in the gap shall return bytes with the
* value 0 until data is actually written into the gap."
*
* We can conform to the first part, but not the second. But return EINVAL if
*
* "...the resulting file offset would be negative for a regular file, block
* special file, or directory."
* We can conform to the first part, but not the second. Return EINVAL if
* "...the resulting file offset would be negative for a regular file,
* block special file, or directory."
*/
if (newpos >= 0)
@ -409,7 +409,8 @@ static int fb_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
(FAR struct nxgl_rect_s *)((uintptr_t)arg);
struct fb_planeinfo_s pinfo;
DEBUGASSERT(fb->vtable != NULL && fb->vtable->getplaneinfo != NULL);
DEBUGASSERT(fb->vtable != NULL &&
fb->vtable->getplaneinfo != NULL);
ret = fb->vtable->getplaneinfo(fb->vtable, fb->plane, &pinfo);
if (ret >= 0)
{
@ -432,7 +433,8 @@ static int fb_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
{
struct fb_overlayinfo_s oinfo;
DEBUGASSERT(fb->vtable != NULL && fb->vtable->getoverlayinfo != NULL);
DEBUGASSERT(fb->vtable != NULL &&
fb->vtable->getoverlayinfo != NULL);
ret = fb->vtable->getoverlayinfo(fb->vtable, arg, &oinfo);
if (ret == OK)
{
@ -450,7 +452,8 @@ static int fb_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
DEBUGASSERT(oinfo != 0 && fb->vtable != NULL &&
fb->vtable->getoverlayinfo != NULL);
ret = fb->vtable->getoverlayinfo(fb->vtable, oinfo->overlay, oinfo);
ret = fb->vtable->getoverlayinfo(fb->vtable,
oinfo->overlay, oinfo);
}
break;
@ -595,7 +598,8 @@ int fb_register(int display, int plane)
ret = up_fbinitialize(display);
if (ret < 0)
{
gerr("ERROR: up_fbinitialize() failed for display %d: %d\n", display, ret);
gerr("ERROR: up_fbinitialize() failed for display %d: %d\n",
display, ret);
goto errout_with_fb;
}