RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

drivers/mtd_sdcard: support unaligned reads & writes

Browse Source
This commit is contained in:
Benjamin Valentin 2022-02-05 01:00:34 +01:00
parent a45a868651
commit ac9de922c5
1 changed files with 92 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
drivers/mtd_sdcard/mtd_sdcard.c
View File

@ -28,6 +28,9 @@
#include <inttypes.h>
#include <errno.h>
#include <string.h>
#define MIN(a, b) ((a) > (b) ? (b) : (a))
static int mtd_sdcard_init(mtd_dev_t *dev)
{
@ -47,80 +50,92 @@ static int mtd_sdcard_init(mtd_dev_t *dev)
return -EIO;
}
static int mtd_sdcard_read(mtd_dev_t *dev, void *buff, uint32_t addr,
uint32_t size)
{
DEBUG("mtd_sdcard_read: addr:%" PRIu32 " size:%" PRIu32 "\n", addr, size);
mtd_sdcard_t *mtd_sd = (mtd_sdcard_t*)dev;
sd_rw_response_t err;
sdcard_spi_read_blocks(mtd_sd->sd_card, addr / SD_HC_BLOCK_SIZE,
buff, SD_HC_BLOCK_SIZE,
size / SD_HC_BLOCK_SIZE, &err);
if (err == SD_RW_OK) {
return 0;
}
return -EIO;
}
static int mtd_sdcard_read_page(mtd_dev_t *dev, void *buff, uint32_t page,
uint32_t offset, uint32_t size)
{
sd_rw_response_t err;
mtd_sdcard_t *mtd_sd = (mtd_sdcard_t*)dev;
DEBUG("mtd_sdcard_read_page: page:%" PRIu32 " offset:%" PRIu32 " size:%" PRIu32 "\n",
page, offset, size);
if (offset) {
if (offset || size % SD_HC_BLOCK_SIZE) {
#if IS_USED(MODULE_MTD_WRITE_PAGE)
if (dev->work_area == NULL) {
DEBUG("mtd_sdcard_read_page: no work area\n");
return -ENOTSUP;
}
sdcard_spi_read_blocks(mtd_sd->sd_card, page,
dev->work_area, SD_HC_BLOCK_SIZE,
1, &err);
if (err != SD_RW_OK) {
return -EIO;
}
size = MIN(size, SD_HC_BLOCK_SIZE - offset);
DEBUG("mtd_sdcard_read_page: read %" PRIu32 " bytes at offset %" PRIu32 "\n",
size, offset);
memcpy(buff, (uint8_t *)dev->work_area + offset, size);
return size;
#else
return -ENOTSUP;
#endif
}
mtd_sdcard_t *mtd_sd = (mtd_sdcard_t*)dev;
sd_rw_response_t err;
int res = sdcard_spi_read_blocks(mtd_sd->sd_card, page,
buff, SD_HC_BLOCK_SIZE,
size / SD_HC_BLOCK_SIZE, &err);
sdcard_spi_read_blocks(mtd_sd->sd_card, page,
buff, SD_HC_BLOCK_SIZE,
size / SD_HC_BLOCK_SIZE, &err);
if (err != SD_RW_OK) {
return -EIO;
}
return res * SD_HC_BLOCK_SIZE;
}
static int mtd_sdcard_write(mtd_dev_t *dev, const void *buff, uint32_t addr,
uint32_t size)
{
DEBUG("mtd_sdcard_write: addr:%" PRIu32 " size:%" PRIu32 "\n", addr, size);
mtd_sdcard_t *mtd_sd = (mtd_sdcard_t*)dev;
sd_rw_response_t err;
sdcard_spi_write_blocks(mtd_sd->sd_card, addr / SD_HC_BLOCK_SIZE,
buff, SD_HC_BLOCK_SIZE,
size / SD_HC_BLOCK_SIZE, &err);
if (err == SD_RW_OK) {
return 0;
}
return -EIO;
return size;
}
static int mtd_sdcard_write_page(mtd_dev_t *dev, const void *buff, uint32_t page,
uint32_t offset, uint32_t size)
{
sd_rw_response_t err;
mtd_sdcard_t *mtd_sd = (mtd_sdcard_t*)dev;
DEBUG("mtd_sdcard_write_page: page:%" PRIu32 " offset:%" PRIu32 " size:%" PRIu32 "\n",
page, offset, size);
if (offset) {
return -ENOTSUP;
}
if (offset || size % SD_HC_BLOCK_SIZE) {
#if IS_USED(MODULE_MTD_WRITE_PAGE)
if (dev->work_area == NULL) {
DEBUG("mtd_sdcard_write_page: no work area\n");
return -ENOTSUP;
}
mtd_sdcard_t *mtd_sd = (mtd_sdcard_t*)dev;
sd_rw_response_t err;
int res = sdcard_spi_write_blocks(mtd_sd->sd_card, page,
buff, SD_HC_BLOCK_SIZE,
size / SD_HC_BLOCK_SIZE, &err);
sdcard_spi_read_blocks(mtd_sd->sd_card, page,
dev->work_area, SD_HC_BLOCK_SIZE,
1, &err);
if (err != SD_RW_OK) {
return -EIO;
}
size = MIN(size, SD_HC_BLOCK_SIZE - offset);
DEBUG("mtd_sdcard_write_page: write %" PRIu32 " bytes at offset %" PRIu32 "\n",
size, offset);
memcpy((uint8_t *)dev->work_area + offset, buff, size);
sdcard_spi_write_blocks(mtd_sd->sd_card, page,
dev->work_area, SD_HC_BLOCK_SIZE,
1, &err);
#else
return -ENOTSUP;
#endif
} else {
sdcard_spi_write_blocks(mtd_sd->sd_card, page,
buff, SD_HC_BLOCK_SIZE,
size / SD_HC_BLOCK_SIZE, &err);
}
if (err != SD_RW_OK) {
printf("err: %d\n", err);
return -EIO;
}
return res * SD_HC_BLOCK_SIZE;
return size;
}
static int mtd_sdcard_erase(mtd_dev_t *dev,
@ -150,6 +165,34 @@ static int mtd_sdcard_power(mtd_dev_t *dev, enum mtd_power_state power)
return -ENOTSUP; /* currently not supported */
}
static int mtd_sdcard_read(mtd_dev_t *dev, void *buff, uint32_t addr,
uint32_t size)
{
int res = mtd_sdcard_read_page(dev, buff, addr / SD_HC_BLOCK_SIZE,
addr % SD_HC_BLOCK_SIZE, size);
if (res < 0) {
return res;
}
if (res == (int)size) {
return 0;
}
return -EOVERFLOW;
}
static int mtd_sdcard_write(mtd_dev_t *dev, const void *buff, uint32_t addr,
uint32_t size)
{
int res = mtd_sdcard_write_page(dev, buff, addr / SD_HC_BLOCK_SIZE,
addr % SD_HC_BLOCK_SIZE, size);
if (res < 0) {
return res;
}
if (res == (int)size) {
return 0;
}
return -EOVERFLOW;
}
const mtd_desc_t mtd_sdcard_driver = {
.init = mtd_sdcard_init,
.read = mtd_sdcard_read,
@ -158,5 +201,4 @@ const mtd_desc_t mtd_sdcard_driver = {
.write_page = mtd_sdcard_write_page,
.erase = mtd_sdcard_erase,
.power = mtd_sdcard_power,
.flags = MTD_DRIVER_FLAG_DIRECT_WRITE,
};