Move kfile interface to the io/ directory.

[bertos.git] / bertos / struct / kfile_fifo.c

diff --git a/bertos/struct/kfile_fifo.c b/bertos/struct/kfile_fifo.c
index d09ae1e7e7662420190511420223efad298a8369..66264eb4fbbabc815e0d96e39d92cf0aa8111d8e 100644 (file)
--- a/bertos/struct/kfile_fifo.c
+++ b/bertos/struct/kfile_fifo.c
@@ -39,7 +39,7 @@
 #include "kfile_fifo.h"
 #include "fifobuf.h"
 
-#include <kern/kfile.h>
+#include <io/kfile.h>
 
 #include <string.h>
 
@@ -51,7 +51,7 @@ static size_t kfilefifo_read(struct KFile *_fd, void *_buf, size_t size)
        while (size-- && !fifo_isempty_locked(fd->fifo))
                *buf++ = fifo_pop_locked(fd->fifo);
 
-       return (void *)buf - _buf;
+       return buf - (uint8_t *)_buf;
 }
 
 static size_t kfilefifo_write(struct KFile *_fd, const void *_buf, size_t size)
@@ -62,7 +62,7 @@ static size_t kfilefifo_write(struct KFile *_fd, const void *_buf, size_t size)
        while (size-- && !fifo_isfull_locked(fd->fifo))
                fifo_push_locked(fd->fifo, *buf++);
 
-       return (void *)buf - _buf;
+       return buf - (const uint8_t *)_buf;
 }
 
 void kfilefifo_init(KFileFifo *kf, FIFOBuffer *fifo)