Skip to content

Fix BlockDevice example #909

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
merged 2 commits into from
Jan 10, 2019
Merged

Fix BlockDevice example #909

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a63f5b6
Fix BlockDevice example
theamirocohen Jan 10, 2019
7374a0e
Add remarks
theamirocohen Jan 10, 2019
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
74 changes: 21 additions & 53 deletions docs/api/storage/BlockDevice.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,38 +59,26 @@ For details regarding how to configure the default block device please refer to
* limitations under the License.
*/
#include "mbed.h"
#include "BlockDevice.h"
#include <stdio.h>
#include <algorithm>

// Block devices
#include "SPIFBlockDevice.h"
#include "DataFlashBlockDevice.h"
#include "SDBlockDevice.h"
#include "HeapBlockDevice.h"


// Physical block device, can be any device that supports the BlockDevice API
SPIFBlockDevice bd(
MBED_CONF_SPIF_DRIVER_SPI_MOSI,
MBED_CONF_SPIF_DRIVER_SPI_MISO,
MBED_CONF_SPIF_DRIVER_SPI_CLK,
MBED_CONF_SPIF_DRIVER_SPI_CS);

BlockDevice *bd = BlockDevice::get_default_instance();

// Entry point for the example
int main() {
printf("--- Mbed OS block device example ---\n");

// Initialize the block device
printf("bd.init()\n");
int err = bd.init();
printf("bd.init -> %d\n", err);
printf("bd->init()\n");
int err = bd->init();
printf("bd->init -> %d\n", err);

// Get device geometry
bd_size_t read_size = bd.get_read_size();
bd_size_t program_size = bd.get_program_size();
bd_size_t erase_size = bd.get_erase_size();
bd_size_t size = bd.size();
bd_size_t read_size = bd->get_read_size();
bd_size_t program_size = bd->get_program_size();
bd_size_t erase_size = bd->get_erase_size();
bd_size_t size = bd->size();

printf("--- Block device geometry ---\n");
printf("read_size: %lld B\n", read_size);
Expand All @@ -106,47 +94,27 @@ int main() {
buffer_size = buffer_size - (buffer_size % program_size);
char *buffer = new char[buffer_size];

// Read what is currently stored on the block device. We haven't written
// yet so this may be garbage
printf("bd.read(%p, %d, %d)\n", buffer, 0, buffer_size);
err = bd.read(buffer, 0, buffer_size);
printf("bd.read -> %d\n", err);

printf("--- Stored data ---\n");
for (size_t i = 0; i < buffer_size; i += 16) {
for (size_t j = 0; j < 16; j++) {
if (i+j < buffer_size) {
printf("%02x ", buffer[i+j]);
} else {
printf(" ");
}
}

printf(" %.*s\n", buffer_size - i, &buffer[i]);
}
printf("---\n");

// Update buffer with our string we want to store
strncpy(buffer, "Hello Storage!", buffer_size);

// Write data to first block, write occurs in two parts,
// an erase followed by a program
printf("bd.erase(%d, %lld)\n", 0, erase_size);
err = bd.erase(0, erase_size);
printf("bd.erase -> %d\n", err);
printf("bd->erase(%d, %lld)\n", 0, erase_size);
err = bd->erase(0, erase_size);
printf("bd->erase -> %d\n", err);

printf("bd.program(%p, %d, %d)\n", buffer, 0, buffer_size);
err = bd.program(buffer, 0, buffer_size);
printf("bd.program -> %d\n", err);
printf("bd->program(%p, %d, %d)\n", buffer, 0, buffer_size);
err = bd->program(buffer, 0, buffer_size);
printf("bd->program -> %d\n", err);

// Clobber the buffer so we don't get old data
memset(buffer, 0xcc, buffer_size);

// Read the data from the first block, note that the program_size must be
// a multiple of the read_size, so we don't have to check for alignment
printf("bd.read(%p, %d, %d)\n", buffer, 0, buffer_size);
err = bd.read(buffer, 0, buffer_size);
printf("bd.read -> %d\n", err);
printf("bd->read(%p, %d, %d)\n", buffer, 0, buffer_size);
err = bd->read(buffer, 0, buffer_size);
printf("bd->read -> %d\n", err);

printf("--- Stored data ---\n");
for (size_t i = 0; i < buffer_size; i += 16) {
Expand All @@ -163,9 +131,9 @@ int main() {
printf("---\n");

// Deinitialize the block device
printf("bd.deinit()\n");
err = bd.deinit();
printf("bd.deinit -> %d\n", err);
printf("bd->deinit()\n");
err = bd->deinit();
printf("bd->deinit -> %d\n", err);

printf("--- done! ---\n");
}
Expand Down