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:18 UTC
[incubator-nuttx] branch master updated (b513456 -> 970cbff)
This is an automated email from the ASF dual-hosted git repository.
gustavonihei pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from b513456 arch:xtens:mpu: modify acc and memtype to uint32_t
new eb72038 fs/partition: Make read_partition_block callable outside ptable
new 970cbff fs/partition: Make parse_ptable_partition to partition.h
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
fs/partition/fs_partition.c | 25 +++++++++++++++----------
fs/partition/fs_ptable.c | 19 -------------------
fs/partition/partition.h | 14 ++++++++++++++
3 files changed, 29 insertions(+), 29 deletions(-)
[incubator-nuttx] 02/02: fs/partition: Make parse_ptable_partition
to partition.h
Posted by gu...@apache.org.
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 970cbff6389955ca58971b3e86dcbd3c4dc19668
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Oct 19 11:12:04 2021 +0800
fs/partition: Make parse_ptable_partition to partition.h
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
fs/partition/fs_partition.c | 10 ----------
fs/partition/partition.h | 6 ++++++
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/fs/partition/fs_partition.c b/fs/partition/fs_partition.c
index 110bacd..4a9287d 100644
--- a/fs/partition/fs_partition.c
+++ b/fs/partition/fs_partition.c
@@ -44,16 +44,6 @@ static int parse_partition(FAR struct partition_state_s *state,
FAR void *arg);
/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-#ifdef CONFIG_PTABLE_PARTITION
-int parse_ptable_partition(FAR struct partition_state_s *state,
- partition_handler_t handler,
- FAR void *arg);
-#endif
-
-/****************************************************************************
* Private Data
****************************************************************************/
diff --git a/fs/partition/partition.h b/fs/partition/partition.h
index 2c8348f..8c05c14 100644
--- a/fs/partition/partition.h
+++ b/fs/partition/partition.h
@@ -52,6 +52,12 @@ int read_partition_block(FAR struct partition_state_s *state,
FAR void *buffer, size_t startblock,
size_t nblocks);
+#ifdef CONFIG_PTABLE_PARTITION
+int parse_ptable_partition(FAR struct partition_state_s *state,
+ partition_handler_t handler,
+ FAR void *arg);
+#endif
+
#endif /* CONFIG_DISABLE_MOUNTPOINT */
#endif /* __FS_PARTITION_PARTITION_H */
[incubator-nuttx] 01/02: fs/partition: Make read_partition_block
callable outside ptable
Posted by gu...@apache.org.
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 */