You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by GitBox <gi...@apache.org> on 2018/09/21 14:47:06 UTC
[GitHub] ccollins476ad closed pull request #1411: hw/hal:
hal_flash_isempty_no_buf()
ccollins476ad closed pull request #1411: hw/hal: hal_flash_isempty_no_buf()
URL: https://github.com/apache/mynewt-core/pull/1411
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/hw/hal/include/hal/hal_flash.h b/hw/hal/include/hal/hal_flash.h
index d945147e3e..429837e437 100644
--- a/hw/hal/include/hal/hal_flash.h
+++ b/hw/hal/include/hal/hal_flash.h
@@ -42,6 +42,24 @@ int hal_flash_erase_sector(uint8_t flash_id, uint32_t sector_address);
int hal_flash_erase(uint8_t flash_id, uint32_t address, uint32_t num_bytes);
int hal_flash_isempty(uint8_t flash_id, uint32_t address, void *dst,
uint32_t num_bytes);
+
+/**
+ * @brief Determines if the specified region of flash is completely unwritten.
+ *
+ * This function is like `hal_flash_isempty()`, except the caller does not need
+ * to provide a buffer. Instead, a buffer of size
+ * MYNEWT_VAL(HAL_FLASH_VERIFY_BUF_SZ) is allocated on the stack.
+ *
+ * @param id The ID of the flash hardware to inspect.
+ * @param address The starting address of the procedure.
+ * @param num_bytes The number of bytes of flash to check.
+ *
+ * @return 1 if the specified region is empty;
+ * 0 if the specified region is *not* empty;
+ * -1 on error.
+ */
+int hal_flash_isempty_no_buf(uint8_t id, uint32_t address, uint32_t num_bytes);
+
uint8_t hal_flash_align(uint8_t flash_id);
uint8_t hal_flash_erased_val(uint8_t flash_id);
int hal_flash_init(void);
diff --git a/hw/hal/src/hal_flash.c b/hw/hal/src/hal_flash.c
index 283dde3f57..ac26a05fb9 100644
--- a/hw/hal/src/hal_flash.c
+++ b/hw/hal/src/hal_flash.c
@@ -106,49 +106,6 @@ hal_flash_read(uint8_t id, uint32_t address, void *dst, uint32_t num_bytes)
return hf->hf_itf->hff_read(hf, address, dst, num_bytes);
}
-#if MYNEWT_VAL(HAL_FLASH_VERIFY_ERASES)
-/**
- * Verifies that the specified range of flash is erased.
- *
- * @return 0 on success;
- * nonzero on error or unexpected contents.
- */
-static int
-hal_flash_cmp_erased(const struct hal_flash *hf, uint32_t address,
- uint32_t num_bytes)
-{
- uint8_t buf[MYNEWT_VAL(HAL_FLASH_VERIFY_BUF_SZ)];
-
- uint32_t off;
- uint32_t rem;
- int chunk_sz;
- int rc;
- int i;
-
- for (off = 0; off < num_bytes; off += sizeof buf) {
- rem = num_bytes - off;
- if (rem >= sizeof buf) {
- chunk_sz = sizeof buf;
- } else {
- chunk_sz = rem;
- }
-
- rc = hf->hf_itf->hff_read(hf, address + off, buf, chunk_sz);
- if (rc != 0) {
- return rc;
- }
-
- for (i = 0; i < chunk_sz; i++) {
- if (buf[i] != hf->hf_erased_val) {
- return -1;
- }
- }
- }
-
- return 0;
-}
-#endif
-
#if MYNEWT_VAL(HAL_FLASH_VERIFY_WRITES)
/**
* Verifies that the specified range of flash contains the given contents.
@@ -253,7 +210,7 @@ hal_flash_erase_sector(uint8_t id, uint32_t sector_address)
assert(rc == 0);
if (sector_address == start) {
- assert(hal_flash_cmp_erased(hf, start, size) == 0);
+ assert(hal_flash_isempty_no_buf(id, start, size) == 1);
break;
}
}
@@ -303,7 +260,7 @@ hal_flash_erase(uint8_t id, uint32_t address, uint32_t num_bytes)
}
#if MYNEWT_VAL(HAL_FLASH_VERIFY_ERASES)
- assert(hal_flash_cmp_erased(hf, start, size) == 0);
+ assert(hal_flash_isempty_no_buf(id, start, size) == 1);
#endif
}
}
@@ -350,6 +307,32 @@ hal_flash_isempty(uint8_t id, uint32_t address, void *dst, uint32_t num_bytes)
}
}
+int
+hal_flash_isempty_no_buf(uint8_t id, uint32_t address, uint32_t num_bytes)
+{
+ uint8_t buf[MYNEWT_VAL(HAL_FLASH_VERIFY_BUF_SZ)];
+ uint32_t blksz;
+ uint32_t rem;
+ uint32_t off;
+ int empty;
+
+ for (off = 0; off < num_bytes; off += sizeof buf) {
+ rem = num_bytes - off;
+
+ blksz = sizeof buf;
+ if (blksz > rem) {
+ blksz = rem;
+ }
+
+ empty = hal_flash_isempty(id, address + off, buf, blksz);
+ if (empty != 1) {
+ return empty;
+ }
+ }
+
+ return 1;
+}
+
int
hal_flash_ioctl(uint8_t id, uint32_t cmd, void *args)
{
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services