From 1f1cc18019bbaf2509ab5f11096bd019bb9c780b Mon Sep 17 00:00:00 2001 From: batt Date: Thu, 14 Jun 2007 14:42:48 +0000 Subject: [PATCH] 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 --- kern/kfile.h | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++ mware/prog.h | 2 +- mware/xmodem.h | 5 +++- 3 files changed, 78 insertions(+), 2 deletions(-) create mode 100755 kern/kfile.h diff --git a/kern/kfile.h b/kern/kfile.h new file mode 100755 index 00000000..974502e6 --- /dev/null +++ b/kern/kfile.h @@ -0,0 +1,73 @@ +/** + * \file + * + * + * \brief Virtual KFile I/O interface. + * + * \version $Id$ + * \author Bernardo Innocenti + */ + +/*#* + *#* $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 + +/* 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 f197975d..ee9c6cae 100755 --- a/mware/prog.h +++ b/mware/prog.h @@ -21,7 +21,7 @@ #define PROG_H #include -#include +#include #include /** diff --git a/mware/xmodem.h b/mware/xmodem.h index d1b5e724..79824b8b 100755 --- 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 -#include "kfile.h" +#include /** * Called to know if we want to abort data tranfer. -- 2.25.1