diff --git a/cpu/esp_common/periph/flash.c b/cpu/esp_common/periph/flash.c index b501600b27..c777f027ef 100644 --- a/cpu/esp_common/periph/flash.c +++ b/cpu/esp_common/periph/flash.c @@ -508,7 +508,7 @@ static int _flash_read (mtd_dev_t *dev, void *buff, uint32_t addr, uint32_t siz /* size must be within the flash address space */ CHECK_PARAM_RET (_flash_beg + addr + size <= _flash_end, -EOVERFLOW); - return (spi_flash_read(_flash_beg + addr, buff, size) == ESP_OK) ? (int)size : -EIO; + return (spi_flash_read(_flash_beg + addr, buff, size) == ESP_OK) ? 0 : -EIO; } static int _flash_write (mtd_dev_t *dev, const void *buff, uint32_t addr, uint32_t size) @@ -525,7 +525,7 @@ static int _flash_write (mtd_dev_t *dev, const void *buff, uint32_t addr, uint32 CHECK_PARAM_RET (size <= _flashchip->page_size, -EOVERFLOW); CHECK_PARAM_RET ((addr % _flashchip->page_size) + size <= _flashchip->page_size, -EOVERFLOW); - return (spi_flash_write(_flash_beg + addr, buff, size) == ESP_OK) ? (int)size : -EIO; + return (spi_flash_write(_flash_beg + addr, buff, size) == ESP_OK) ? 0 : -EIO; } static int _flash_erase (mtd_dev_t *dev, uint32_t addr, uint32_t size) diff --git a/cpu/native/mtd/mtd_native.c b/cpu/native/mtd/mtd_native.c index fd353a913c..1abdd0b4bc 100644 --- a/cpu/native/mtd/mtd_native.c +++ b/cpu/native/mtd/mtd_native.c @@ -69,10 +69,10 @@ static int _read(mtd_dev_t *dev, void *buff, uint32_t addr, uint32_t size) return -EIO; } real_fseek(f, addr, SEEK_SET); - size = real_fread(buff, 1, size, f); + size_t nread = real_fread(buff, 1, size, f); real_fclose(f); - return size; + return (nread == size) ? 0 : -EIO; } static int _write(mtd_dev_t *dev, const void *buff, uint32_t addr, uint32_t size) @@ -101,7 +101,7 @@ static int _write(mtd_dev_t *dev, const void *buff, uint32_t addr, uint32_t size } real_fclose(f); - return size; + return 0; } static int _erase(mtd_dev_t *dev, uint32_t addr, uint32_t size) diff --git a/drivers/include/mtd.h b/drivers/include/mtd.h index ce1641ad05..5ec7c18271 100644 --- a/drivers/include/mtd.h +++ b/drivers/include/mtd.h @@ -93,7 +93,7 @@ struct mtd_desc { * @param[in] addr Starting address * @param[in] size Number of bytes * - * @return the number of bytes actually read + * @return 0 on success * @return < 0 value on error */ int (*read)(mtd_dev_t *dev, @@ -112,7 +112,7 @@ struct mtd_desc { * @param[in] addr Starting address * @param[in] size Number of bytes * - * @return the number of bytes actually written + * @return 0 on success * @return < 0 value on error */ int (*write)(mtd_dev_t *dev, @@ -167,7 +167,7 @@ int mtd_init(mtd_dev_t *mtd); * @param[in] addr the start address to read from * @param[in] count the number of bytes to read * - * @return the number of byte actually read + * @return 0 on success * @return < 0 if an error occurred * @return -ENODEV if @p mtd is not a valid device * @return -ENOTSUP if operation is not supported on @p mtd @@ -188,7 +188,7 @@ int mtd_read(mtd_dev_t *mtd, void *dest, uint32_t addr, uint32_t count); * @param[in] addr the start address to write to * @param[in] count the number of bytes to write * - * @return the number of byte actually written + * @return 0 on success * @return < 0 if an error occurred * @return -ENODEV if @p mtd is not a valid device * @return -ENOTSUP if operation is not supported on @p mtd diff --git a/drivers/mtd/mtd-vfs.c b/drivers/mtd/mtd-vfs.c index f2d384f201..4a0a649616 100644 --- a/drivers/mtd/mtd-vfs.c +++ b/drivers/mtd/mtd-vfs.c @@ -100,12 +100,12 @@ static ssize_t mtd_vfs_read(vfs_file_t *filp, void *dest, size_t nbytes) nbytes = size - src; } int res = mtd_read(mtd, dest, src, nbytes); - if (res < 0) { - return res; + if (res != 0) { + return -EIO; } /* Advance file position */ - filp->pos += res; - return res; + filp->pos += nbytes; + return nbytes; } static ssize_t mtd_vfs_write(vfs_file_t *filp, const void *src, size_t nbytes) @@ -124,12 +124,12 @@ static ssize_t mtd_vfs_write(vfs_file_t *filp, const void *src, size_t nbytes) nbytes = size - dest; } int res = mtd_write(mtd, src, dest, nbytes); - if (res < 0) { - return res; + if (res != 0) { + return -EIO; } /* Advance file position */ - filp->pos += res; - return res; + filp->pos += nbytes; + return nbytes; } /** @} */ diff --git a/drivers/mtd_flashpage/mtd_flashpage.c b/drivers/mtd_flashpage/mtd_flashpage.c index 05ca88a060..b6935bcdbe 100644 --- a/drivers/mtd_flashpage/mtd_flashpage.c +++ b/drivers/mtd_flashpage/mtd_flashpage.c @@ -54,7 +54,7 @@ static int _read(mtd_dev_t *dev, void *buf, uint32_t addr, uint32_t size) memcpy(buf, (void *)dst_addr, size); - return size; + return 0; } static int _write(mtd_dev_t *dev, const void *buf, uint32_t addr, uint32_t size) @@ -82,7 +82,7 @@ static int _write(mtd_dev_t *dev, const void *buf, uint32_t addr, uint32_t size) flashpage_write_raw((void *)dst_addr, buf, size); - return size; + return 0; } int _erase(mtd_dev_t *dev, uint32_t addr, uint32_t size) diff --git a/drivers/mtd_sdcard/mtd_sdcard.c b/drivers/mtd_sdcard/mtd_sdcard.c index b240ceae9e..a55258974d 100644 --- a/drivers/mtd_sdcard/mtd_sdcard.c +++ b/drivers/mtd_sdcard/mtd_sdcard.c @@ -69,12 +69,12 @@ static int mtd_sdcard_read(mtd_dev_t *dev, void *buff, uint32_t addr, 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; - int res = sdcard_spi_read_blocks(mtd_sd->sd_card, addr / SD_HC_BLOCK_SIZE, - buff, SD_HC_BLOCK_SIZE, - size / SD_HC_BLOCK_SIZE, &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 res * SD_HC_BLOCK_SIZE; + return 0; } return -EIO; } @@ -85,12 +85,12 @@ static int mtd_sdcard_write(mtd_dev_t *dev, const void *buff, uint32_t addr, 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; - int res = sdcard_spi_write_blocks(mtd_sd->sd_card, addr / SD_HC_BLOCK_SIZE, - buff, SD_HC_BLOCK_SIZE, - size / SD_HC_BLOCK_SIZE, &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 res * SD_HC_BLOCK_SIZE; + return 0; } return -EIO; } diff --git a/drivers/mtd_spi_nor/mtd_spi_nor.c b/drivers/mtd_spi_nor/mtd_spi_nor.c index bb1f9804b5..c195c2adcc 100644 --- a/drivers/mtd_spi_nor/mtd_spi_nor.c +++ b/drivers/mtd_spi_nor/mtd_spi_nor.c @@ -432,7 +432,7 @@ static int mtd_spi_nor_read(mtd_dev_t *mtd, void *dest, uint32_t addr, uint32_t mtd_spi_cmd_addr_read(dev, dev->params->opcode->read, addr_be, dest, size); mtd_spi_release(dev); - return size; + return 0; } static int mtd_spi_nor_write(mtd_dev_t *mtd, const void *src, uint32_t addr, uint32_t size) @@ -470,7 +470,7 @@ static int mtd_spi_nor_write(mtd_dev_t *mtd, const void *src, uint32_t addr, uin wait_for_write_complete(dev, 0); mtd_spi_release(dev); - return size; + return 0; } static int mtd_spi_nor_erase(mtd_dev_t *mtd, uint32_t addr, uint32_t size) diff --git a/pkg/fatfs/fatfs_diskio/mtd/mtd_diskio.c b/pkg/fatfs/fatfs_diskio/mtd/mtd_diskio.c index e0df082dd6..d218276de1 100644 --- a/pkg/fatfs/fatfs_diskio/mtd/mtd_diskio.c +++ b/pkg/fatfs/fatfs_diskio/mtd/mtd_diskio.c @@ -95,16 +95,16 @@ DRESULT disk_read(BYTE pdrv, BYTE *buff, DWORD sector, UINT count) return RES_PARERR; } + uint32_t nread = count * fatfs_mtd_devs[pdrv]->page_size; int res = mtd_read(fatfs_mtd_devs[pdrv], buff, sector * fatfs_mtd_devs[pdrv]->page_size, - count * fatfs_mtd_devs[pdrv]->page_size); + nread); - if (res >= 0) { - uint32_t r_sect = ((unsigned)res) / fatfs_mtd_devs[pdrv]->page_size; - return ((r_sect == count) ? RES_OK : RES_ERROR); + if (res != 0) { + return RES_ERROR; } - - return RES_ERROR; + assert((nread / fatfs_mtd_devs[pdrv]->page_size) == count); + return RES_OK; } /** @@ -135,16 +135,16 @@ DRESULT disk_write(BYTE pdrv, const BYTE *buff, DWORD sector, UINT count) return RES_ERROR; /* erase failed! */ } + uint32_t nwrite = count * fatfs_mtd_devs[pdrv]->page_size; res = mtd_write(fatfs_mtd_devs[pdrv], buff, sector * fatfs_mtd_devs[pdrv]->page_size, - count * fatfs_mtd_devs[pdrv]->page_size); + nwrite); - if (res >= 0) { - uint32_t w_sect = ((unsigned)res) / fatfs_mtd_devs[pdrv]->page_size; - return ((w_sect == count) ? RES_OK : RES_ERROR); + if (res != 0) { + return RES_ERROR; } - - return RES_ERROR; + assert((nwrite / fatfs_mtd_devs[pdrv]->page_size) == count); + return RES_OK; } /** diff --git a/pkg/littlefs/fs/littlefs_fs.c b/pkg/littlefs/fs/littlefs_fs.c index 0d7d61294f..c7700614b8 100644 --- a/pkg/littlefs/fs/littlefs_fs.c +++ b/pkg/littlefs/fs/littlefs_fs.c @@ -72,12 +72,7 @@ static int _dev_read(const struct lfs_config *c, lfs_block_t block, DEBUG("lfs_read: c=%p, block=%" PRIu32 ", off=%" PRIu32 ", buf=%p, size=%" PRIu32 "\n", (void *)c, block, off, buffer, size); - int ret = mtd_read(mtd, buffer, ((fs->base_addr + block) * c->block_size) + off, size); - if (ret >= 0) { - return 0; - } - - return ret; + return mtd_read(mtd, buffer, ((fs->base_addr + block) * c->block_size) + off, size); } static int _dev_write(const struct lfs_config *c, lfs_block_t block, @@ -94,12 +89,9 @@ static int _dev_write(const struct lfs_config *c, lfs_block_t block, for (const uint8_t *part = buf; part < buf + size; part += c->prog_size, addr += c->prog_size) { int ret = mtd_write(mtd, part, addr, c->prog_size); - if (ret < 0) { + if (ret != 0) { return ret; } - else if ((unsigned)ret != c->prog_size) { - return -EIO; - } } return 0; diff --git a/pkg/littlefs2/fs/littlefs2_fs.c b/pkg/littlefs2/fs/littlefs2_fs.c index 2bcf2f125f..d90a910a2f 100644 --- a/pkg/littlefs2/fs/littlefs2_fs.c +++ b/pkg/littlefs2/fs/littlefs2_fs.c @@ -72,12 +72,7 @@ static int _dev_read(const struct lfs_config *c, lfs_block_t block, DEBUG("lfs_read: c=%p, block=%" PRIu32 ", off=%" PRIu32 ", buf=%p, size=%" PRIu32 "\n", (void *)c, block, off, buffer, size); - int ret = mtd_read(mtd, buffer, ((fs->base_addr + block) * c->block_size) + off, size); - if (ret >= 0) { - return 0; - } - - return ret; + return mtd_read(mtd, buffer, ((fs->base_addr + block) * c->block_size) + off, size); } static int _dev_write(const struct lfs_config *c, lfs_block_t block, @@ -94,12 +89,9 @@ static int _dev_write(const struct lfs_config *c, lfs_block_t block, for (const uint8_t *part = buf; part < buf + size; part += c->prog_size, addr += c->prog_size) { int ret = mtd_write(mtd, part, addr, c->prog_size); - if (ret < 0) { + if (ret != 0) { return ret; } - else if ((unsigned)ret != c->prog_size) { - return -EIO; - } } return 0; diff --git a/pkg/spiffs/fs/spiffs_fs.c b/pkg/spiffs/fs/spiffs_fs.c index 3a7d959468..3c85e1db1b 100644 --- a/pkg/spiffs/fs/spiffs_fs.c +++ b/pkg/spiffs/fs/spiffs_fs.c @@ -39,12 +39,7 @@ static int32_t _dev_read(struct spiffs_t *fs, u32_t addr, u32_t size, u8_t *dst) DEBUG("spiffs: read: from addr 0x%" PRIx32 " size 0x%" PRIx32 "\n", addr, size); - if (mtd_read(dev, dst, addr, size) > 0) { - return 0; - } - else { - return -EIO; - } + return mtd_read(dev, dst, addr, size); } static int32_t _dev_write(struct spiffs_t *fs, u32_t addr, u32_t size, const u8_t *src) @@ -53,12 +48,7 @@ static int32_t _dev_write(struct spiffs_t *fs, u32_t addr, u32_t size, const u8_ DEBUG("spiffs: write: from addr 0x%" PRIx32 " size 0x%" PRIx32 "\n", addr, size); - if (mtd_write(dev, src, addr, size) > 0) { - return 0; - } - else { - return -EIO; - } + return mtd_write(dev, src, addr, size); } static int32_t _dev_erase(struct spiffs_t *fs, u32_t addr, u32_t size) @@ -77,24 +67,14 @@ static int32_t _dev_read(u32_t addr, u32_t size, u8_t *dst) { DEBUG("spiffs: read: from addr 0x%" PRIx32 " size 0x%" PRIx32 "\n", addr, size); - if (mtd_read(SPIFFS_MTD_DEV, dst, addr, size) > 0) { - return 0; - } - else { - return -EIO; - } + return mtd_read(SPIFFS_MTD_DEV, dst, addr, size); } static int32_t _dev_write(u32_t addr, u32_t size, const u8_t *src) { DEBUG("spiffs: write: from addr 0x%" PRIx32 " size 0x%" PRIx32 "\n", addr, size); - if (mtd_write(SPIFFS_MTD_DEV, src, addr, size) > 0) { - return 0; - } - else { - return -EIO; - } + return mtd_write(SPIFFS_MTD_DEV, src, addr, size); } static int32_t _dev_erase(u32_t addr, u32_t size) diff --git a/tests/mtd_at25xxx/main.c b/tests/mtd_at25xxx/main.c index 408697138f..58c7f9e869 100644 --- a/tests/mtd_at25xxx/main.c +++ b/tests/mtd_at25xxx/main.c @@ -68,7 +68,7 @@ static void test_mtd_write_erase(void) memset(buf_read, 0, sizeof(buf_read)); int ret = mtd_write(dev, buf, TEST_ADDRESS, sizeof(buf)); - TEST_ASSERT_EQUAL_INT(sizeof(buf), ret); + TEST_ASSERT_EQUAL_INT(0, ret); ret = mtd_erase(dev, TEST_ADDRESS, dev->pages_per_sector * dev->page_size); TEST_ASSERT_EQUAL_INT(0, ret); @@ -76,7 +76,7 @@ static void test_mtd_write_erase(void) uint8_t expected[sizeof(buf_read)]; memset(expected, 0, sizeof(expected)); ret = mtd_read(dev, buf_read, TEST_ADDRESS, sizeof(buf_read)); - TEST_ASSERT_EQUAL_INT(sizeof(buf_read), ret); + TEST_ASSERT_EQUAL_INT(0, ret); TEST_ASSERT_EQUAL_INT(0, memcmp(expected, buf_read, sizeof(buf_read))); } @@ -90,10 +90,10 @@ static void test_mtd_write_read(void) /* Basic write / read */ int ret = mtd_write(dev, buf, TEST_ADDRESS, sizeof(buf)); - TEST_ASSERT_EQUAL_INT(sizeof(buf), ret); + TEST_ASSERT_EQUAL_INT(0, ret); ret = mtd_read(dev, buf_read, TEST_ADDRESS, sizeof(buf_read)); - TEST_ASSERT_EQUAL_INT(sizeof(buf_read), ret); + TEST_ASSERT_EQUAL_INT(0, ret); TEST_ASSERT_EQUAL_INT(0, memcmp(buf, buf_read, sizeof(buf))); TEST_ASSERT_EQUAL_INT(0, memcmp(buf_empty, buf_read + sizeof(buf), sizeof(buf_empty))); diff --git a/tests/mtd_flashpage/main.c b/tests/mtd_flashpage/main.c index b7c178f867..62e3a2438f 100644 --- a/tests/mtd_flashpage/main.c +++ b/tests/mtd_flashpage/main.c @@ -98,7 +98,7 @@ static void test_mtd_write_erase(void) memset(buf_read, 0, sizeof(buf_read)); int ret = mtd_write(dev, buf, TEST_ADDRESS1, sizeof(buf)); - TEST_ASSERT_EQUAL_INT(sizeof(buf), ret); + TEST_ASSERT_EQUAL_INT(0, ret); ret = mtd_erase(dev, TEST_ADDRESS1, dev->pages_per_sector * dev->page_size); TEST_ASSERT_EQUAL_INT(0, ret); @@ -110,7 +110,7 @@ static void test_mtd_write_erase(void) memset(expected, 0xff, sizeof(expected)); #endif ret = mtd_read(dev, buf_read, TEST_ADDRESS1, sizeof(buf_read)); - TEST_ASSERT_EQUAL_INT(sizeof(buf_read), ret); + TEST_ASSERT_EQUAL_INT(0, ret); TEST_ASSERT_EQUAL_INT(0, memcmp(expected, buf_read, sizeof(buf_read))); } @@ -129,10 +129,10 @@ static void test_mtd_write_read(void) /* Basic write / read */ int ret = mtd_write(dev, buf, TEST_ADDRESS1, sizeof(buf)); - TEST_ASSERT_EQUAL_INT(sizeof(buf), ret); + TEST_ASSERT_EQUAL_INT(0, ret); ret = mtd_read(dev, buf_read, TEST_ADDRESS1, sizeof(buf_read)); - TEST_ASSERT_EQUAL_INT(sizeof(buf_read), ret); + TEST_ASSERT_EQUAL_INT(0, ret); TEST_ASSERT_EQUAL_INT(0, memcmp(buf, buf_read, sizeof(buf))); TEST_ASSERT_EQUAL_INT(0, memcmp(buf_empty, buf_read + sizeof(buf), sizeof(buf_empty))); diff --git a/tests/mtd_mapper/main.c b/tests/mtd_mapper/main.c index bb5980a581..e103fac797 100644 --- a/tests/mtd_mapper/main.c +++ b/tests/mtd_mapper/main.c @@ -62,7 +62,7 @@ static int _read(mtd_dev_t *dev, void *buff, uint32_t addr, uint32_t size) } memcpy(buff, _dummy_memory + addr, size); - return size; + return 0; } static int _write(mtd_dev_t *dev, const void *buff, uint32_t addr, @@ -78,7 +78,7 @@ static int _write(mtd_dev_t *dev, const void *buff, uint32_t addr, } memcpy(_dummy_memory + addr, buff, size); - return size; + return 0; } static int _erase(mtd_dev_t *dev, uint32_t addr, uint32_t size) diff --git a/tests/pkg_littlefs/main.c b/tests/pkg_littlefs/main.c index ed4e86c4f6..fccc7c5ae3 100644 --- a/tests/pkg_littlefs/main.c +++ b/tests/pkg_littlefs/main.c @@ -56,7 +56,7 @@ static int _read(mtd_dev_t *dev, void *buff, uint32_t addr, uint32_t size) } memcpy(buff, dummy_memory + addr, size); - return size; + return 0; } static int _write(mtd_dev_t *dev, const void *buff, uint32_t addr, uint32_t size) @@ -71,7 +71,7 @@ static int _write(mtd_dev_t *dev, const void *buff, uint32_t addr, uint32_t size } memcpy(dummy_memory + addr, buff, size); - return size; + return 0; } static int _erase(mtd_dev_t *dev, uint32_t addr, uint32_t size) diff --git a/tests/pkg_littlefs2/main.c b/tests/pkg_littlefs2/main.c index 949c2c44db..36fad708a3 100644 --- a/tests/pkg_littlefs2/main.c +++ b/tests/pkg_littlefs2/main.c @@ -56,7 +56,7 @@ static int _read(mtd_dev_t *dev, void *buff, uint32_t addr, uint32_t size) } memcpy(buff, dummy_memory + addr, size); - return size; + return 0; } static int _write(mtd_dev_t *dev, const void *buff, uint32_t addr, uint32_t size) @@ -71,7 +71,7 @@ static int _write(mtd_dev_t *dev, const void *buff, uint32_t addr, uint32_t size } memcpy(dummy_memory + addr, buff, size); - return size; + return 0; } static int _erase(mtd_dev_t *dev, uint32_t addr, uint32_t size) diff --git a/tests/pkg_spiffs/main.c b/tests/pkg_spiffs/main.c index 8a6a9a200d..3c695cd0b5 100644 --- a/tests/pkg_spiffs/main.c +++ b/tests/pkg_spiffs/main.c @@ -54,7 +54,7 @@ static int _read(mtd_dev_t *dev, void *buff, uint32_t addr, uint32_t size) } memcpy(buff, dummy_memory + addr, size); - return size; + return 0; } static int _write(mtd_dev_t *dev, const void *buff, uint32_t addr, uint32_t size) @@ -69,7 +69,7 @@ static int _write(mtd_dev_t *dev, const void *buff, uint32_t addr, uint32_t size } memcpy(dummy_memory + addr, buff, size); - return size; + return 0; } static int _erase(mtd_dev_t *dev, uint32_t addr, uint32_t size) @@ -400,34 +400,34 @@ static void tests_spiffs_partition(void) /* if SPIFFS_USE_MAGIC is used, a magic word is written in each sector */ uint8_t buf[4]; const uint8_t buf_erased[4] = {0xff, 0xff, 0xff, 0xff}; - int nread; + int ret; res = 0; for (size_t i = 0; i < _dev->page_size * _dev->pages_per_sector; i += sizeof(buf)) { - nread = mtd_read(_dev, buf, _dev->page_size * _dev->pages_per_sector + i, sizeof(buf)); - TEST_ASSERT_EQUAL_INT(sizeof(buf), nread); + ret = mtd_read(_dev, buf, _dev->page_size * _dev->pages_per_sector + i, sizeof(buf)); + TEST_ASSERT_EQUAL_INT(0, ret); res |= memcmp(buf, buf_erased, sizeof(buf)); } TEST_ASSERT(res != 0); res = 0; for (size_t i = 0; i < _dev->page_size * _dev->pages_per_sector; i += sizeof(buf)) { - nread = mtd_read(_dev, buf, (2 * _dev->page_size * _dev->pages_per_sector) + i, sizeof(buf)); - TEST_ASSERT_EQUAL_INT(sizeof(buf), nread); + ret = mtd_read(_dev, buf, (2 * _dev->page_size * _dev->pages_per_sector) + i, sizeof(buf)); + TEST_ASSERT_EQUAL_INT(0, ret); res |= memcmp(buf, buf_erased, sizeof(buf)); } TEST_ASSERT(res != 0); /* Check previous sector (must be erased) */ res = 0; for (size_t i = 0; i < _dev->page_size * _dev->pages_per_sector; i += sizeof(buf)) { - nread = mtd_read(_dev, buf, i, sizeof(buf)); - TEST_ASSERT_EQUAL_INT(sizeof(buf), nread); + ret = mtd_read(_dev, buf, i, sizeof(buf)); + TEST_ASSERT_EQUAL_INT(0, ret); res |= memcmp(buf, buf_erased, sizeof(buf)); } TEST_ASSERT(res == 0); /* Check next sector (must be erased) */ res = 0; for (size_t i = 0; i < _dev->page_size * _dev->pages_per_sector; i += sizeof(buf)) { - nread = mtd_read(_dev, buf, (3 * _dev->page_size * _dev->pages_per_sector) + i, sizeof(buf)); - TEST_ASSERT_EQUAL_INT(sizeof(buf), nread); + ret = mtd_read(_dev, buf, (3 * _dev->page_size * _dev->pages_per_sector) + i, sizeof(buf)); + TEST_ASSERT_EQUAL_INT(0, ret); res |= memcmp(buf, buf_erased, sizeof(buf)); } TEST_ASSERT(res == 0); diff --git a/tests/unittests/tests-mtd/tests-mtd.c b/tests/unittests/tests-mtd/tests-mtd.c index 17cbaf28ff..9fa8fa1f00 100644 --- a/tests/unittests/tests-mtd/tests-mtd.c +++ b/tests/unittests/tests-mtd/tests-mtd.c @@ -59,7 +59,7 @@ static int read(mtd_dev_t *dev, void *buff, uint32_t addr, uint32_t size) } memcpy(buff, dummy_memory + addr, size); - return size; + return 0; } static int write(mtd_dev_t *dev, const void *buff, uint32_t addr, uint32_t size) @@ -74,7 +74,7 @@ static int write(mtd_dev_t *dev, const void *buff, uint32_t addr, uint32_t size) } memcpy(dummy_memory + addr, buff, size); - return size; + return 0; } static int erase(mtd_dev_t *dev, uint32_t addr, uint32_t size) @@ -165,7 +165,7 @@ static void test_mtd_write_erase(void) memset(buf_read, 0, sizeof(buf_read)); int ret = mtd_write(dev, buf, sizeof(buf_empty), sizeof(buf)); - TEST_ASSERT_EQUAL_INT(sizeof(buf), ret); + TEST_ASSERT_EQUAL_INT(0, ret); ret = mtd_erase(dev, 0, dev->pages_per_sector * dev->page_size); TEST_ASSERT_EQUAL_INT(0, ret); @@ -173,7 +173,7 @@ static void test_mtd_write_erase(void) uint8_t expected[sizeof(buf_read)]; memset(expected, 0xff, sizeof(expected)); ret = mtd_read(dev, buf_read, 0, sizeof(buf_read)); - TEST_ASSERT_EQUAL_INT(sizeof(buf_read), ret); + TEST_ASSERT_EQUAL_INT(0, ret); TEST_ASSERT_EQUAL_INT(0, memcmp(expected, buf_read, sizeof(buf_read))); } @@ -187,19 +187,19 @@ static void test_mtd_write_read(void) /* Basic write / read */ int ret = mtd_write(dev, buf, 0, sizeof(buf)); - TEST_ASSERT_EQUAL_INT(sizeof(buf), ret); + TEST_ASSERT_EQUAL_INT(0, ret); ret = mtd_read(dev, buf_read, 0, sizeof(buf_read)); - TEST_ASSERT_EQUAL_INT(sizeof(buf_read), ret); + TEST_ASSERT_EQUAL_INT(0, ret); TEST_ASSERT_EQUAL_INT(0, memcmp(buf, buf_read, sizeof(buf))); TEST_ASSERT_EQUAL_INT(0, memcmp(buf_empty, buf_read + sizeof(buf), sizeof(buf_empty))); /* Unaligned write / read */ ret = mtd_write(dev, buf, dev->page_size + sizeof(buf_empty), sizeof(buf)); - TEST_ASSERT_EQUAL_INT(sizeof(buf), ret); + TEST_ASSERT_EQUAL_INT(0, ret); ret = mtd_read(dev, buf_read, dev->page_size, sizeof(buf_read)); - TEST_ASSERT_EQUAL_INT(sizeof(buf_read), ret); + TEST_ASSERT_EQUAL_INT(0, ret); TEST_ASSERT_EQUAL_INT(0, memcmp(buf_empty, buf_read, sizeof(buf_empty))); TEST_ASSERT_EQUAL_INT(0, memcmp(buf, buf_read + sizeof(buf_empty), sizeof(buf))); @@ -224,12 +224,12 @@ static void test_mtd_write_read(void) ret = mtd_erase(dev, 0, dev->page_size * dev->pages_per_sector); TEST_ASSERT_EQUAL_INT(0, ret); ret = mtd_write(dev, buf_page, 0, dev->page_size); - TEST_ASSERT_EQUAL_INT(dev->page_size, ret); + TEST_ASSERT_EQUAL_INT(0, ret); ret = mtd_write(dev, buf_page, dev->page_size, dev->page_size); - TEST_ASSERT_EQUAL_INT(dev->page_size, ret); + TEST_ASSERT_EQUAL_INT(0, ret); memset(buf_page, 0, sizeof(buf_page)); ret = mtd_read(dev, buf_page, 0, sizeof(buf_page)); - TEST_ASSERT_EQUAL_INT(sizeof(buf_page), ret); + TEST_ASSERT_EQUAL_INT(0, ret); TEST_ASSERT_EQUAL_INT(1, buf_page[0]); TEST_ASSERT_EQUAL_INT(1, buf_page[sizeof(buf_page) - 1]); @@ -254,12 +254,12 @@ static void test_mtd_write_read_flash(void) /* Basic write / read */ int ret = mtd_write(dev, buf1, 0, sizeof(buf1)); - TEST_ASSERT_EQUAL_INT(sizeof(buf1), ret); + TEST_ASSERT_EQUAL_INT(0, ret); ret = mtd_write(dev, buf2, 0, sizeof(buf2)); - TEST_ASSERT_EQUAL_INT(sizeof(buf2), ret); + TEST_ASSERT_EQUAL_INT(0, ret); ret = mtd_read(dev, buf_read, 0, sizeof(buf_read)); - TEST_ASSERT_EQUAL_INT(sizeof(buf_read), ret); + TEST_ASSERT_EQUAL_INT(0, ret); TEST_ASSERT_EQUAL_INT(0, memcmp(buf_expected, buf_read, sizeof(buf_expected))); TEST_ASSERT_EQUAL_INT(0, memcmp(buf_empty, buf_read + sizeof(buf_expected), sizeof(buf_empty))); }