X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fkfile.h;h=44c32b06b00e97b4342accf364550246e98a05f2;hb=47dfe44ebab1698c1dee6757b6ce0f19b5e030a3;hp=4f1d8fc85f9b70ce367fea015b5786aee72be246;hpb=2b1c24c738e96986e79867c3b188afa6c7e9a677;p=bertos.git

diff --git a/bertos/kern/kfile.h b/bertos/kern/kfile.h
index 4f1d8fc8..44c32b06 100644
--- a/bertos/kern/kfile.h
+++ b/bertos/kern/kfile.h
@@ -92,6 +92,10 @@
  * \author Bernie Innocenti <bernie@codewiz.org>
  * \author Francesco Sacchi <batt@develer.com>
  * \author Daniele Basile <asterix@develer.com>
+ *
+ * $WIZ$ module_name = "kfile"
+ * $WIZ$ module_configuration = "bertos/cfg/cfg_kfile.h"
+ * $WIZ$ module_depends = "timer", "formatwr"
  */
 
 #ifndef KERN_KFILE_H
@@ -105,7 +109,6 @@
 struct KFile;
 
 typedef int32_t kfile_off_t;     ///< KFile offset type, used by kfile_seek().
-typedef uint32_t kfile_size_t;   ///< KFile size type, used in struct KFile.
 
 /**
  * Costants for repositioning read/write file offset.
@@ -195,8 +198,8 @@ typedef struct KFile
 	DB(id_t _type); ///< Used to keep track, at runtime, of the class type.
 
 	/* NOTE: these must _NOT_ be size_t on 16bit CPUs! */
-	kfile_off_t  seek_pos;
-	kfile_size_t size; // FIXME: should be kfile_off_t
+	kfile_off_t    seek_pos;
+	kfile_off_t    size;
 } KFile;
 
 /**
@@ -209,12 +212,16 @@ kfile_off_t kfile_genericSeek(struct KFile *fd, kfile_off_t offset, KSeekMode wh
  */
 struct KFile * kfile_genericReopen(struct KFile *fd);
 
+int kfile_genericClose(struct KFile *fd);
+
 int kfile_putc(int c, struct KFile *fd); ///< Generic putc implementation using kfile_write.
 int kfile_getc(struct KFile *fd);  ///< Generic getc implementation using kfile_read.
 int kfile_printf(struct KFile *fd, const char *format, ...);
 int kfile_print(struct KFile *fd, const char *s);
 int kfile_gets(struct KFile *fd, char *buf, int size);
 int kfile_gets_echo(struct KFile *fd, char *buf, int size, bool echo);
+void kfile_resync(KFile *fd, mtime_t delay);
+void kfile_init(struct KFile *fd);
 
 /**
  * Interface functions for KFile access.
@@ -273,8 +280,10 @@ INLINE void kfile_clearerr(struct KFile *fd)
 /**
  * Kfile test function.
  */
-int kfile_testSetUp(void);
-int kfile_testRun(KFile *fd, uint8_t *test_buf, uint8_t *save_buf, size_t size);
+int kfile_testSetup(void);
+int kfile_testRun(void);
+int kfile_testRunGeneric(KFile *fd, uint8_t *test_buf, uint8_t *save_buf, size_t size);
 int kfile_testTearDown(void);
 
+
 #endif /* KERN_KFILE_H */