This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 3834597df6610b20aaa302ba100d23625bfaee9e Author: wangmingrong1 <[email protected]> AuthorDate: Mon Sep 22 18:02:17 2025 +0800 driver/dev_mem: Support seek function Use filep->f_pos to record the offset instead of the memory address Signed-off-by: wangmingrong1 <[email protected]> Signed-off-by: wangjianyu3 <[email protected]> --- drivers/misc/dev_mem.c | 52 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 7 deletions(-) diff --git a/drivers/misc/dev_mem.c b/drivers/misc/dev_mem.c index 8395fce3bb3..d4793373deb 100644 --- a/drivers/misc/dev_mem.c +++ b/drivers/misc/dev_mem.c @@ -67,6 +67,7 @@ static ssize_t devmem_read(FAR struct file *filep, FAR char *buffer, size_t buflen); static ssize_t devmem_write(FAR struct file *filep, FAR const char *buffer, size_t buflen); +static off_t devmem_seek(FAR struct file *filep, off_t offset, int whence); static int devmem_mmap(FAR struct file *filep, FAR struct mm_map_entry_s *map); @@ -80,7 +81,7 @@ static const struct file_operations g_devmem_fops = NULL, /* close */ devmem_read, /* read */ devmem_write, /* write */ - NULL, /* seek */ + devmem_seek, /* seek */ NULL, /* ioctl */ devmem_mmap, /* mmap */ }; @@ -97,7 +98,6 @@ static ssize_t devmem_read(FAR struct file *filep, FAR char *buffer, size_t buflen) { FAR struct memory_region_s *region = filep->f_inode->i_private; - uintptr_t src = filep->f_pos; uintptr_t start; uintptr_t end; ssize_t len; @@ -105,13 +105,13 @@ static ssize_t devmem_read(FAR struct file *filep, FAR char *buffer, for (i = 0; region[i].start != 0 && region[i].end != 0; i++) { - start = MAX(src, region[i].start); + start = region[i].start + filep->f_pos; end = MIN(start + buflen, region[i].end); len = end - start; if (len > 0 && (region[i].flags & PROT_READ)) { memcpy(buffer, (FAR const void *)start, len); - filep->f_pos = end; + filep->f_pos += len; return len; } } @@ -127,7 +127,6 @@ static ssize_t devmem_write(FAR struct file *filep, FAR const char *buffer, size_t buflen) { FAR struct memory_region_s *region = filep->f_inode->i_private; - uintptr_t dest = filep->f_pos; uintptr_t start; uintptr_t end; ssize_t len; @@ -135,13 +134,13 @@ static ssize_t devmem_write(FAR struct file *filep, FAR const char *buffer, for (i = 0; region[i].start != 0 && region[i].end != 0; i++) { - start = MAX(dest, region[i].start); + start = region[i].start + filep->f_pos; end = MIN(start + buflen, region[i].end); len = end - start; if (len > 0 && (region[i].flags & PROT_WRITE)) { memcpy((FAR void *)start, buffer, len); - filep->f_pos = end; + filep->f_pos += len; return len; } } @@ -149,6 +148,45 @@ static ssize_t devmem_write(FAR struct file *filep, FAR const char *buffer, return -EINVAL; } +/**************************************************************************** + * Name: devmem_seek + ****************************************************************************/ + +static off_t devmem_seek(FAR struct file *filep, off_t offset, int whence) +{ + FAR struct memory_region_s *region = filep->f_inode->i_private; + int i; + + switch (whence) + { + case SEEK_CUR: + offset += filep->f_pos; + break; + + case SEEK_SET: + break; + + case SEEK_END: + for (i = 0; region[i].start != 0 && region[i].end != 0; i++) + { + offset += region[i].end - region[i].start; + } + + break; + + default: + return -EINVAL; + } + + if (offset < 0) + { + return -EINVAL; + } + + filep->f_pos = offset; + return filep->f_pos; +} + /**************************************************************************** * Name: devmem_mmap ****************************************************************************/
