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

rpmsgdev: rpmsgdegv ioctl and seek buf fix

Browse Source 
1. rpmsgdev ioctl: should assgin back the client return value to
   cookie->result, then this return value can be returned to the
   application;
2. rpmsgdev seek: the type "off_t" may be 64bit, so modify the offset
   in "struct rpmsgdev_lseek" to int64_t too;
3. rpmsgdev_seek: the rpmsgdev_seek in client should update the
   filep->f_pos after the seek operation;

Signed-off-by: wangbowen6 <wangbowen6@xiaomi.com>
This commit is contained in:
wangbowen6 2022-12-01 21:17:47 +08:00 committed by Xiang Xiao
parent b6c148e763
commit 84fa994f51
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/misc/rpmsgdev.c
View File

@ -574,6 +574,7 @@ static off_t rpmsgdev_seek(FAR struct file *filep, off_t offset, int whence)
FAR struct rpmsgdev_s *dev; FAR struct rpmsgdev_s *dev;
FAR struct rpmsgdev_priv_s *priv; FAR struct rpmsgdev_priv_s *priv;
struct rpmsgdev_lseek_s msg; struct rpmsgdev_lseek_s msg;
int ret;
/* Sanity checks */ /* Sanity checks */
@ -591,8 +592,14 @@ static off_t rpmsgdev_seek(FAR struct file *filep, off_t offset, int whence)
msg.offset = offset; msg.offset = offset;
msg.whence = whence; msg.whence = whence;
return rpmsgdev_send_recv(dev, RPMSGDEV_LSEEK, true, &msg.header, ret = rpmsgdev_send_recv(dev, RPMSGDEV_LSEEK, true, &msg.header,
sizeof(msg), NULL); sizeof(msg), NULL);
if (ret >= 0)
{
filep->f_pos = msg.offset;
}
return ret;
} }
/**************************************************************************** /****************************************************************************
@ -953,6 +960,7 @@ static int rpmsgdev_ioctl_handler(FAR struct rpmsg_endpoint *ept,
(FAR struct rpmsgdev_cookie_s *)(uintptr_t)header->cookie; (FAR struct rpmsgdev_cookie_s *)(uintptr_t)header->cookie;
FAR struct rpmsgdev_ioctl_s *rsp = data; FAR struct rpmsgdev_ioctl_s *rsp = data;
cookie->result = header->result;
if (cookie->result >= 0 && rsp->arglen > 0) if (cookie->result >= 0 && rsp->arglen > 0)
{ {
memcpy(cookie->data, (FAR void *)(uintptr_t)rsp->buf, rsp->arglen); memcpy(cookie->data, (FAR void *)(uintptr_t)rsp->buf, rsp->arglen);

2
drivers/misc/rpmsgdev.h
View File

@ -85,8 +85,8 @@ begin_packed_struct struct rpmsgdev_lseek_s
{ {
struct rpmsgdev_header_s header; struct rpmsgdev_header_s header;
uint64_t filep; uint64_t filep;
int64_t offset;
int32_t whence; int32_t whence;
int32_t offset;
} end_packed_struct; } end_packed_struct;
begin_packed_struct struct rpmsgdev_ioctl_s begin_packed_struct struct rpmsgdev_ioctl_s

7
drivers/misc/rpmsgdev_server.c
View File

@ -280,7 +280,12 @@ static int rpmsgdev_lseek_handler(FAR struct rpmsg_endpoint *ept,
FAR struct rpmsgdev_lseek_s *msg = data; FAR struct rpmsgdev_lseek_s *msg = data;
FAR struct file *filep = (FAR struct file *)(uintptr_t)msg->filep; FAR struct file *filep = (FAR struct file *)(uintptr_t)msg->filep;
msg->header.result = file_seek(filep, msg->offset, msg->whence); msg->header.result = 0;
msg->offset = file_seek(filep, msg->offset, msg->whence);
if (msg->offset < 0)
{
msg->header.result = (int32_t)msg->offset;
}
return rpmsg_send(ept, msg, len); return rpmsg_send(ept, msg, len);
} }