Move kfile to kern/ directory; remove duplicate file.h.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@804 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/kern/kfile.h b/kern/kfile.h
new file mode 100755 (executable)
index 0000000..974502e
--- /dev/null
+++ b/kern/kfile.h
@@ -0,0 +1,73 @@
+/**
+ * \file
+ * <!--
+ * Copyright 2004 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 1999, 2000, 2001, 2003 Bernardo Innocenti <bernie@develer.com>
+ * This file is part of DevLib - See README.devlib for information.
+ * -->
+ *
+ * \brief Virtual KFile I/O interface.
+ *
+ * \version $Id$
+ * \author Bernardo Innocenti <bernie@develer.com>
+ */
+
+/*#*
+ *#* $Log$
+ *#* Revision 1.1  2007/06/14 14:42:48  batt
+ *#* Move kfile to kern/ directory; remove duplicate file.h.
+ *#*
+ *#* Revision 1.7  2007/06/08 14:25:43  batt
+ *#* Merge from project_ks.
+ *#*
+ *#* Revision 1.6  2006/07/19 12:56:28  bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.5  2005/11/04 16:20:02  bernie
+ *#* Fix reference to README.devlib in header.
+ *#*
+ *#* Revision 1.4  2005/04/11 19:10:28  bernie
+ *#* Include top-level headers from cfg/ subdir.
+ *#*
+ *#* Revision 1.3  2004/12/31 16:43:23  bernie
+ *#* Move seek function last in VT.
+ *#*
+ *#* Revision 1.2  2004/08/25 14:12:09  rasky
+ *#* Aggiornato il comment block dei log RCS
+ *#*
+ *#* Revision 1.1  2004/08/04 02:40:25  bernie
+ *#* Add virtual file I/O interface.
+ *#*
+ *#*/
+#ifndef MWARE_KFILE_H
+#define MWARE_KFILE_H
+
+#include <cfg/compiler.h>
+
+/* fwd decl */
+struct _KFile;
+
+typedef size_t (*ReadFunc_t)   (struct _KFile *fd, char *buf, size_t size);
+typedef size_t (*WriteFunc_t)  (struct _KFile *fd, const char *buf, size_t size);
+typedef        bool    (*SeekFunc_t)   (struct _KFile *fd, int32_t offset);
+typedef bool   (*OpenFunc_t)   (struct _KFile *fd, const char *name, int mode);
+typedef bool   (*CloseFunc_t)  (struct _KFile *fd);
+
+
+/* Context data for callback functions which operate on
+ * pseudo files.
+ */
+typedef struct _KFile
+{
+       ReadFunc_t              read;
+       WriteFunc_t             write;
+       OpenFunc_t              open;
+       CloseFunc_t             close;
+       SeekFunc_t              seek;
+
+       /* NOTE: these must _NOT_ be size_t on 16bit CPUs! */
+       uint32_t                seek_pos;
+       uint32_t                size;
+} KFile;
+
+#endif /* MWARE_KFILE_H */

diff --git a/mware/prog.h b/mware/prog.h
index f197975d5d86a571864f6c2f2f141f64a182763e..ee9c6caef4a935e39eb481c69a6297776ad6b7c1 100755 (executable)
--- a/mware/prog.h
+++ b/mware/prog.h
@@ -21,7 +21,7 @@
 #define PROG_H
 
 #include <cfg/compiler.h>
-#include <mware/kfile.h>
+#include <kern/kfile.h>
 #include <algos/rotating_hash.h>
 
 /**

diff --git a/mware/xmodem.h b/mware/xmodem.h
index d1b5e724c59f9638b4b816c51440cb0fc2a0a5a2..79824b8b825ed4daaec7860d4cbfb9a973ebcb84 100755 (executable)
--- a/mware/xmodem.h
+++ b/mware/xmodem.h
@@ -14,6 +14,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.7  2007/06/14 14:42:28  batt
+ *#* Move kfile to kern/ directory; remove duplicate file.h.
+ *#*
  *#* Revision 1.6  2007/06/07 09:10:44  batt
  *#* Fix some todos.
  *#*
@@ -39,7 +42,7 @@
 #ifndef MWARE_XMODEM_H
 #define MWARE_XMODEM_H
 #include <cfg/compiler.h>
-#include "kfile.h"
+#include <kern/kfile.h>
 
 /**
  * Called to know if we want to abort data tranfer.