X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fdataflash.c;fp=bertos%2Fdrv%2Fdataflash.c;h=20844aa96e7b71b73bfa8b3eff92a63f308e6d96;hb=44f501a2cd0ff526d5a0c46a20f0940c5656d402;hp=c2ba9b070f1bd4606e7da6d86eaefe45fe4dd84c;hpb=998fdab28f0ed880acb8770382fd79a3ed783bd9;p=bertos.git

diff --git a/bertos/drv/dataflash.c b/bertos/drv/dataflash.c
index c2ba9b07..20844aa9 100644
--- a/bertos/drv/dataflash.c
+++ b/bertos/drv/dataflash.c
@@ -348,7 +348,7 @@ static size_t dataflash_read(struct KFile *_fd, void *buf, size_t size)
 
 
 	ASSERT(fd->fd.seek_pos + size <= fd->fd.size);
-	size = MIN((uint32_t)size, fd->fd.size - fd->fd.seek_pos);
+	size = MIN((kfile_size_t)size, fd->fd.size - fd->fd.seek_pos);
 
 	kprintf("Reading at pos[%lu]\n", fd->fd.seek_pos);
 
@@ -399,7 +399,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 <= fd->fd.size);
-	size = MIN((uint32_t)size, fd->fd.size - fd->fd.seek_pos);
+	size = MIN((kfile_size_t)size, fd->fd.size - fd->fd.seek_pos);
 
 	kprintf("Writing at pos[%lu]\n", fd->fd.seek_pos);
 
@@ -412,7 +412,7 @@ static size_t dataflash_write(struct KFile *_fd, const void *_buf, size_t size)
 		offset = fd->fd.seek_pos % mem_info[fd->dev].page_size;
 
 
-		size_t wr_len = MIN(size, mem_info[fd->dev].page_size - offset);
+		size_t wr_len = MIN((dataflash_size_t)size, mem_info[fd->dev].page_size - offset);
 
 		kprintf(" [page-<%ld>, byte-<%ld>]",new_page, offset);