Skip to content

storage: flash_map: Don't generate flash area when no device #81240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
henrikbrixandersen merged 1 commit into from
Nov 21, 2024
+10 −6
Merged

storage: flash_map: Don't generate flash area when no device #81240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion subsys/storage/flash_map/flash_map.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ int flash_area_open(uint8_t id, const struct flash_area **fap)
return -ENOENT;
}

if (!area->fa_dev || !device_is_ready(area->fa_dev)) {
if (!device_is_ready(area->fa_dev)) {
return -ENODEV;
}

Expand Down
10 changes: 7 additions & 3 deletions subsys/storage/flash_map/flash_map_default.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,22 @@
#define FLASH_AREA_FOO(part) \
{.fa_id = DT_FIXED_PARTITION_ID(part), \
.fa_off = DT_REG_ADDR(part), \
.fa_dev = DEVICE_DT_GET_OR_NULL(DT_MTD_FROM_FIXED_PARTITION(part)), \
.fa_dev = DEVICE_DT_GET(DT_MTD_FROM_FIXED_PARTITION(part)), \
.fa_size = DT_REG_SIZE(part), \
.fa_label = DT_PROP_OR(part, label, NULL), },
#else
#define FLASH_AREA_FOO(part) \
{.fa_id = DT_FIXED_PARTITION_ID(part), \
.fa_off = DT_REG_ADDR(part), \
.fa_dev = DEVICE_DT_GET_OR_NULL(DT_MTD_FROM_FIXED_PARTITION(part)), \
.fa_dev = DEVICE_DT_GET(DT_MTD_FROM_FIXED_PARTITION(part)), \
.fa_size = DT_REG_SIZE(part), },
#endif

#define FOREACH_PARTITION(n) DT_FOREACH_CHILD(DT_DRV_INST(n), FLASH_AREA_FOO)
#define FLASH_AREA_FOOO(part) \
COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_MTD_FROM_FIXED_PARTITION(part)), \

Check notice on line 31 in subsys/storage/flash_map/flash_map_default.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

subsys/storage/flash_map/flash_map_default.c:31 
-#define FLASH_AREA_FOO(part)							\
-	{.fa_id = DT_FIXED_PARTITION_ID(part),					\
-	 .fa_off = DT_REG_ADDR(part),						\
-	 .fa_dev = DEVICE_DT_GET(DT_MTD_FROM_FIXED_PARTITION(part)),	        \
-	 .fa_size = DT_REG_SIZE(part),						\
-	 .fa_label = DT_PROP_OR(part, label, NULL),	},
+#define FLASH_AREA_FOO(part)                                                                       \
+	{                                                                                          \
+		.fa_id = DT_FIXED_PARTITION_ID(part),                                              \
+		.fa_off = DT_REG_ADDR(part),                                                       \
+		.fa_dev = DEVICE_DT_GET(DT_MTD_FROM_FIXED_PARTITION(part)),                        \
+		.fa_size = DT_REG_SIZE(part),                                                      \
+		.fa_label = DT_PROP_OR(part, label, NULL),                                         \
+	},
 #else
-#define FLASH_AREA_FOO(part)							\
-	{.fa_id = DT_FIXED_PARTITION_ID(part),					\
-	 .fa_off = DT_REG_ADDR(part),						\
-	 .fa_dev = DEVICE_DT_GET(DT_MTD_FROM_FIXED_PARTITION(part)),	        \
-	 .fa_size = DT_REG_SIZE(part), },
+#define FLASH_AREA_FOO(part)                                                                       \
+	{                                                                                          \
+		.fa_id = DT_FIXED_PARTITION_ID(part),                                              \
+		.fa_off = DT_REG_ADDR(part),                                                       \
+		.fa_dev = DEVICE_DT_GET(DT_MTD_FROM_FIXED_PARTITION(part)),                        \
+		.fa_size = DT_REG_SIZE(part),                                                      \
+	},
 #endif
 
-#define FLASH_AREA_FOOO(part)	\
+#define FLASH_AREA_FOOO(part)                                                                      \
(FLASH_AREA_FOO(part)), ())

#define FOREACH_PARTITION(n) DT_FOREACH_CHILD(DT_DRV_INST(n), FLASH_AREA_FOOO)

/* We iterate over all compatible 'fixed-partitions' nodes and
* use DT_FOREACH_CHILD to iterate over all the partitions for that
Expand Down
4 changes: 2 additions & 2 deletions tests/subsys/storage/flash_map/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ ZTEST(flash_map, test_flash_area_disabled_device)

/* Test that attempting to open a disabled flash area fails */
rc = flash_area_open(FIXED_PARTITION_ID(disabled_a), &fa);
zassert_equal(rc, -ENODEV, "Open did not fail");
zassert_equal(rc, -ENOENT, "Open did not fail");
rc = flash_area_open(FIXED_PARTITION_ID(disabled_b), &fa);
zassert_equal(rc, -ENODEV, "Open did not fail");
zassert_equal(rc, -ENOENT, "Open did not fail");
}

/**
Expand Down
Loading