sam3n-ek example: fix led macros

[bertos.git] / bertos / drv / dataflash.c

diff --git a/bertos/drv/dataflash.c b/bertos/drv/dataflash.c
index b2fb9c869c2935cd2c3ebd769ad3af1919502177..8c29d168959d35ff82a536ffc7d62c052581aa65 100644 (file)
--- a/bertos/drv/dataflash.c
+++ b/bertos/drv/dataflash.c
@@ -31,7 +31,6 @@
  *
  * \brief Function library for dataflash AT45DB family (implementation).
  *
- * \version $Id: dataflash.c 21658 2008-06-05 16:42:54Z asterix $
  * \author Daniele Basile <asterix@develer.com>
  * \author Francesco Sacchi <batt@develer.com>
  */
@@ -52,7 +51,7 @@
 
 #include <fs/battfs.h>
 
-#include <kern/kfile.h>
+#include <io/kfile.h>
 
 #include <cpu/power.h> /* cpu_relax() */
 
@@ -278,7 +277,7 @@ static void dataflash_loadPage(DataFlash *fd, dataflash_page_t page_addr)
 }
 
 /* Battfs disk interface section */
-
+#if 0
 static size_t dataflash_disk_page_read(struct BattFsSuper *d, pgcnt_t page, pgaddr_t addr, void *buf, size_t len)
 {
        DataFlash *fd = DATAFLASH_CAST((KFile *)d->disk_ctx);
@@ -297,7 +296,7 @@ static size_t dataflash_disk_buffer_write(struct BattFsSuper *d, pgaddr_t addr,
 {
        DataFlash *fd = DATAFLASH_CAST((KFile *)d->disk_ctx);
        dataflash_writeBlock(fd, addr, buf, len);
-       return true;
+       return len;
 }
 
 static size_t dataflash_disk_buffer_read(struct BattFsSuper *d, pgaddr_t addr, void *buf, size_t len)
@@ -364,6 +363,7 @@ bool dataflash_diskInit(struct BattFsSuper *d, DataFlash *fd, pgcnt_t *page_arra
        d->page_array = page_array;
        return d->page_array && fd;
 }
+#endif
 
 /* Kfile interface section */