summaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
authorwdfk-prog <[email protected]>2023-03-20 20:07:36 +0800
committerMan, Jianting (Meco) <[email protected]>2023-03-20 18:58:10 -0400
commit87c57f86f73af132ed12a9092ff8c03d95d58791 (patch)
treed59105585f20437ef0bab426690be8a0c218634d /components
parent7f03e2b5ebab4f49e9023f84c87d3e4049312970 (diff)
[device]修改mtd_nor读写函数返回类型为rt_ssize_t
Diffstat (limited to 'components')
-rw-r--r--components/drivers/include/drivers/mtd_nor.h16
-rw-r--r--components/drivers/mtd/mtd_nor.c10
2 files changed, 13 insertions, 13 deletions
diff --git a/components/drivers/include/drivers/mtd_nor.h b/components/drivers/include/drivers/mtd_nor.h
index caaba83bbd..96efe05266 100644
--- a/components/drivers/include/drivers/mtd_nor.h
+++ b/components/drivers/include/drivers/mtd_nor.h
@@ -1,5 +1,5 @@
/*
- * COPYRIGHT (C) 2011-2021, Real-Thread Information Technology Ltd
+ * COPYRIGHT (C) 2011-2023, Real-Thread Information Technology Ltd
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -32,18 +32,18 @@ struct rt_mtd_nor_driver_ops
{
rt_err_t (*read_id) (struct rt_mtd_nor_device* device);
- rt_size_t (*read) (struct rt_mtd_nor_device* device, rt_off_t offset, rt_uint8_t* data, rt_uint32_t length);
- rt_size_t (*write) (struct rt_mtd_nor_device* device, rt_off_t offset, const rt_uint8_t* data, rt_uint32_t length);
+ rt_ssize_t (*read) (struct rt_mtd_nor_device* device, rt_off_t offset, rt_uint8_t* data, rt_size_t length);
+ rt_ssize_t (*write) (struct rt_mtd_nor_device* device, rt_off_t offset, const rt_uint8_t* data, rt_size_t length);
- rt_err_t (*erase_block)(struct rt_mtd_nor_device* device, rt_off_t offset, rt_uint32_t length);
+ rt_err_t (*erase_block)(struct rt_mtd_nor_device* device, rt_off_t offset, rt_size_t length);
};
rt_err_t rt_mtd_nor_register_device(const char* name, struct rt_mtd_nor_device* device);
rt_uint32_t rt_mtd_nor_read_id(struct rt_mtd_nor_device* device);
-rt_size_t rt_mtd_nor_read(struct rt_mtd_nor_device* device,
- rt_off_t offset, rt_uint8_t* data, rt_uint32_t length);
-rt_size_t rt_mtd_nor_write(struct rt_mtd_nor_device* device,
- rt_off_t offset, const rt_uint8_t* data, rt_uint32_t length);
+rt_ssize_t rt_mtd_nor_read(struct rt_mtd_nor_device* device,
+ rt_off_t offset, rt_uint8_t* data, rt_size_t length);
+rt_ssize_t rt_mtd_nor_write(struct rt_mtd_nor_device* device,
+ rt_off_t offset, const rt_uint8_t* data, rt_size_t length);
rt_err_t rt_mtd_nor_erase_block(struct rt_mtd_nor_device* device,
rt_off_t offset, rt_size_t length);
diff --git a/components/drivers/mtd/mtd_nor.c b/components/drivers/mtd/mtd_nor.c
index 6824190475..299ffdf205 100644
--- a/components/drivers/mtd/mtd_nor.c
+++ b/components/drivers/mtd/mtd_nor.c
@@ -1,5 +1,5 @@
/*
- * COPYRIGHT (C) 2011-2021, Real-Thread Information Technology Ltd
+ * COPYRIGHT (C) 2011-2023, Real-Thread Information Technology Ltd
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -96,14 +96,14 @@ rt_uint32_t rt_mtd_nor_read_id(struct rt_mtd_nor_device* device)
return device->ops->read_id(device);
}
-rt_size_t rt_mtd_nor_read(struct rt_mtd_nor_device* device,
- rt_off_t offset, rt_uint8_t* data, rt_uint32_t length)
+rt_ssize_t rt_mtd_nor_read(struct rt_mtd_nor_device* device,
+ rt_off_t offset, rt_uint8_t* data, rt_size_t length)
{
return device->ops->read(device, offset, data, length);
}
-rt_size_t rt_mtd_nor_write(struct rt_mtd_nor_device* device,
- rt_off_t offset, const rt_uint8_t* data, rt_uint32_t length)
+rt_ssize_t rt_mtd_nor_write(struct rt_mtd_nor_device* device,
+ rt_off_t offset, const rt_uint8_t* data, rt_size_t length)
{
return device->ops->write(device, offset, data, length);
}