You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gu...@apache.org on 2021/10/19 11:03:19 UTC
[incubator-nuttx] 01/02: fs/partition: Make read_partition_block
callable outside ptable
This is an automated email from the ASF dual-hosted git repository.
gustavonihei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit eb720388ca50caffea2a78dc3a1c9435bb0b4651
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Thu Sep 30 01:02:27 2021 +0800
fs/partition: Make read_partition_block callable outside ptable
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
fs/partition/fs_partition.c | 15 +++++++++++++++
fs/partition/fs_ptable.c | 19 -------------------
fs/partition/partition.h | 8 ++++++++
3 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/fs/partition/fs_partition.c b/fs/partition/fs_partition.c
index d40e968..110bacd 100644
--- a/fs/partition/fs_partition.c
+++ b/fs/partition/fs_partition.c
@@ -108,6 +108,21 @@ static int parse_partition(FAR struct partition_state_s *state,
* Public Functions
****************************************************************************/
+int read_partition_block(FAR struct partition_state_s *state,
+ FAR void *buffer, size_t startblock,
+ size_t nblocks)
+{
+ if (state->blk)
+ {
+ return state->blk->u.i_bops->read(state->blk,
+ buffer, startblock, nblocks);
+ }
+ else
+ {
+ return state->mtd->bread(state->mtd, startblock, nblocks, buffer);
+ }
+}
+
/****************************************************************************
* Name: parse_block_partition
*
diff --git a/fs/partition/fs_ptable.c b/fs/partition/fs_ptable.c
index b83b123..5417768 100644
--- a/fs/partition/fs_ptable.c
+++ b/fs/partition/fs_ptable.c
@@ -60,25 +60,6 @@ struct ptable_s
};
/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-static int read_partition_block(FAR struct partition_state_s *state,
- FAR void *buffer, size_t startblock,
- size_t nblocks)
-{
- if (state->blk)
- {
- return state->blk->u.i_bops->read(state->blk,
- buffer, startblock, nblocks);
- }
- else
- {
- return state->mtd->bread(state->mtd, startblock, nblocks, buffer);
- }
-}
-
-/****************************************************************************
* Public Functions
****************************************************************************/
diff --git a/fs/partition/partition.h b/fs/partition/partition.h
index df5d917..2c8348f 100644
--- a/fs/partition/partition.h
+++ b/fs/partition/partition.h
@@ -44,6 +44,14 @@ struct partition_state_s
size_t erasesize;
};
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+int read_partition_block(FAR struct partition_state_s *state,
+ FAR void *buffer, size_t startblock,
+ size_t nblocks);
+
#endif /* CONFIG_DISABLE_MOUNTPOINT */
#endif /* __FS_PARTITION_PARTITION_H */