Skip to content

Commit

Permalink
[fixed]serial_v2.c兼容DFS_V2接口
Browse files Browse the repository at this point in the history
  • Loading branch information
ComerLater committed Jul 8, 2024
1 parent b171877 commit ffdf5cf
Showing 1 changed file with 16 additions and 11 deletions.
27 changes: 16 additions & 11 deletions components/drivers/serial/serial_v2.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,11 @@ static int serial_fops_ioctl(struct dfs_file *fd, int cmd, void *args)
return rt_device_control(device, cmd, args);
}

static int serial_fops_read(struct dfs_file *fd, void *buf, size_t count)
#ifdef RT_USING_DFS_V2
static ssize_t serial_fops_read(struct dfs_file *fd, void *buf, size_t count, off_t *pos)
#else
static ssize_t serial_fops_read(struct dfs_file *fd, void *buf, size_t count)
#endif
{
int size = 0;
rt_device_t device;
Expand All @@ -143,7 +147,11 @@ static int serial_fops_read(struct dfs_file *fd, void *buf, size_t count)
return size;
}

static int serial_fops_write(struct dfs_file *fd, const void *buf, size_t count)
#ifdef RT_USING_DFS_V2
static ssize_t serial_fops_write(struct dfs_file *fd, const void *buf, size_t count, off_t *pos)
#else
static ssize_t serial_fops_write(struct dfs_file *fd, const void *buf, size_t count)
#endif
{
rt_device_t device;

Expand Down Expand Up @@ -186,15 +194,12 @@ static int serial_fops_poll(struct dfs_file *fd, struct rt_pollreq *req)

const static struct dfs_file_ops _serial_fops =
{
serial_fops_open,
serial_fops_close,
serial_fops_ioctl,
serial_fops_read,
serial_fops_write,
RT_NULL, /* flush */
RT_NULL, /* lseek */
RT_NULL, /* getdents */
serial_fops_poll,
.open = serial_fops_open,
.close = serial_fops_close,
.ioctl = serial_fops_ioctl,
.read = serial_fops_read,
.write = serial_fops_write,
.poll = serial_fops_poll,
};
#endif /* RT_USING_POSIX_STDIO */

Expand Down

0 comments on commit ffdf5cf

Please sign in to comment.