flash: Rename copy_flash to flash_copy
Change-Id: If449889fca3370e25a65719d2f5c5ec90258d633
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
diff --git a/vpnor/flash.cpp b/vpnor/flash.cpp
index b2e0134..e18f3b8 100644
--- a/vpnor/flash.cpp
+++ b/vpnor/flash.cpp
@@ -108,16 +108,16 @@
}
/*
- * copy_flash() - Copy data from the virtual pnor into a provided buffer
+ * flash_copy() - Copy data from the virtual pnor into a provided buffer
* @context: The mbox context pointer
* @offset: The pnor offset to copy from (bytes)
* @mem: The buffer to copy into (must be of atleast 'size' bytes)
* @size: The number of bytes to copy
* Return: Number of bytes copied on success, otherwise negative error
- * code. copy_flash will copy at most 'size' bytes, but it may
+ * code. flash_copy will copy at most 'size' bytes, but it may
* copy less.
*/
-int64_t copy_flash(struct mbox_context* context, uint32_t offset, void* mem,
+int64_t flash_copy(struct mbox_context* context, uint32_t offset, void* mem,
uint32_t size)
{
vpnor::partition::Table* table;
diff --git a/vpnor/mboxd_pnor_partition_table.cpp b/vpnor/mboxd_pnor_partition_table.cpp
index 228ae5b..bc78609 100644
--- a/vpnor/mboxd_pnor_partition_table.cpp
+++ b/vpnor/mboxd_pnor_partition_table.cpp
@@ -102,14 +102,14 @@
size_t tocOffset = 0;
// Copy TOC
- copy_flash(&local, tocOffset,
+ flash_copy(&local, tocOffset,
static_cast<uint8_t *>(context->mem) + tocStart,
blTable.capacity());
const pnor_partition &partition = blTable.partition(blPartitionName);
size_t hbbOffset = partition.data.base * eraseSize;
uint32_t hbbSize = partition.data.actual;
// Copy HBB
- copy_flash(&local, hbbOffset,
+ flash_copy(&local, hbbOffset,
static_cast<uint8_t *>(context->mem) + hbbOffset, hbbSize);
}
catch (err::InternalFailure &e)