X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fflash25.c;h=e2356bdf7d0c1d32398e7d8ef529abba0eccb1a3;hb=a2fc2366ad564f11e705703ed1f42b7dc499a47c;hp=25d9ac618f91040e40a58abd9912080e4bf69a1c;hpb=c22fe24a0da896a52dbc3882390ec18a440ef56a;p=bertos.git

diff --git a/bertos/drv/flash25.c b/bertos/drv/flash25.c
index 25d9ac61..e2356bdf 100644
--- a/bertos/drv/flash25.c
+++ b/bertos/drv/flash25.c
@@ -59,7 +59,7 @@
 #include <kern/proc.h>
 #endif
 
-#warning this file was change, but is untest!
+#warning FIXME:This file was change, but is untest!
 
 /**
  * Wait until flash memory is ready.
@@ -178,7 +178,7 @@ static size_t flash25_read(struct KFile *_fd, void *buf, size_t size)
 
 	KFileFlash25 *fd = KFILEFLASH25(_fd);
 
-	ASSERT(fd->fd.seek_pos + size <= fd->fd.size);
+	ASSERT(fd->fd.seek_pos + (kfile_size_t)size <= fd->fd.size);
 	size = MIN((kfile_size_t)size, fd->fd.size - fd->fd.seek_pos);
 
 	//kprintf("Reading at addr[%lu], size[%d]\n", fd->seek_pos, size);
@@ -231,7 +231,7 @@ static size_t flash25_write(struct KFile *_fd, const void *_buf, size_t size)
 
 	KFileFlash25 *fd = KFILEFLASH25(_fd);
 
-	ASSERT(fd->fd.seek_pos + size <= fd->fd.size);
+	ASSERT(fd->fd.seek_pos + (kfile_size_t)size <= fd->fd.size);
 
 	size = MIN((kfile_size_t)size, fd->fd.size - fd->fd.seek_pos);
 
@@ -282,7 +282,7 @@ static size_t flash25_write(struct KFile *_fd, const void *_buf, size_t size)
 		total_write += wr_len;
 	}
 
-	kprintf("written %u bytes\n", total_write);
+	kprintf("written %lu bytes\n", total_write);
 	return total_write;
 }
 
@@ -330,7 +330,7 @@ void flash25_sectorErase(KFileFlash25 *fd, Flash25Sector sector)
 	 */
 	flash25_waitReady(fd);
 
-	DB(kprintf("Erased sector [%d] in %d ms\n", sector, ticks_to_ms(timer_clock() - start_time)));
+	DB(kprintf("Erased sector [%ld] in %d ms\n", sector, ticks_to_ms(timer_clock() - start_time)));
 
 }
 
@@ -364,7 +364,7 @@ void flash25_chipErase(KFileFlash25 *fd)
 	 */
 	flash25_waitReady(fd);
 
-	DB(kprintf("Erased all memory in %d ms\n", ticks_to_ms(timer_clock() - start_time)));
+	DB(kprintf("Erased all memory in %ld ms\n", ticks_to_ms(timer_clock() - start_time)));
 
 }