projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cast some variable to corret size type.
[bertos.git]
/
bertos
/
drv
/
dataflash.c
diff --git
a/bertos/drv/dataflash.c
b/bertos/drv/dataflash.c
index c2ba9b070f1bd4606e7da6d86eaefe45fe4dd84c..20844aa96e7b71b73bfa8b3eff92a63f308e6d96 100644
(file)
--- 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);
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);
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);
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);
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;
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);
kprintf(" [page-<%ld>, byte-<%ld>]",new_page, offset);