X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fdataflash.c;h=0f0d06041e39ca6142f5cbca7dba2eef95a0ba12;hb=c5478437ae3b87dd00978e2644d635559e0a1f92;hp=68047d5b5cac4e1743ea14df89140aadf84dd666;hpb=81ac20d5d87b2262381f15e0a2d1cdb46ea80791;p=bertos.git diff --git a/bertos/drv/dataflash.c b/bertos/drv/dataflash.c index 68047d5b..0f0d0604 100644 --- a/bertos/drv/dataflash.c +++ b/bertos/drv/dataflash.c @@ -343,8 +343,8 @@ static size_t dataflash_read(struct KFile *_fd, void *buf, size_t size) uint8_t *data = (uint8_t *)buf; - ASSERT(fd->fd.seek_pos + size <= (kfile_size_t)fd->fd.size); - size = MIN((kfile_size_t)size, fd->fd.size - fd->fd.seek_pos); + ASSERT(fd->fd.seek_pos + size <= (kfile_off_t)fd->fd.size); + size = MIN((kfile_off_t)size, fd->fd.size - fd->fd.seek_pos); LOG_INFO("Reading at pos[%lu]\n", fd->fd.seek_pos); @@ -395,7 +395,7 @@ static size_t dataflash_write(struct KFile *_fd, const void *_buf, size_t size) const uint8_t *data = (const uint8_t *) _buf; ASSERT(fd->fd.seek_pos + size <= (kfile_off_t)fd->fd.size); - size = MIN((kfile_size_t)size, fd->fd.size - fd->fd.seek_pos); + size = MIN((kfile_off_t)size, fd->fd.size - fd->fd.seek_pos); LOG_INFO("Writing at pos[%lu]\n", fd->fd.seek_pos);