projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename myself
[bertos.git]
/
bertos
/
kern
/
kfile.h
diff --git
a/bertos/kern/kfile.h
b/bertos/kern/kfile.h
index 4bb7a2380946748f6063e3d6bc56cc689ba0d707..0fbfcd3bda4d13f43d768f8d62fe17c2e79ef2cd 100644
(file)
--- a/
bertos/kern/kfile.h
+++ b/
bertos/kern/kfile.h
@@
-27,7
+27,7
@@
* the GNU General Public License.
*
* Copyright 2004 Develer S.r.l. (http://www.develer.com/)
* the GNU General Public License.
*
* Copyright 2004 Develer S.r.l. (http://www.develer.com/)
- * Copyright 1999, 2000, 2001, 2003 Bern
ardo Innocenti <bernie@develer.com
>
+ * Copyright 1999, 2000, 2001, 2003 Bern
ie Innocenti <bernie@codewiz.org
>
*
* -->
*
*
* -->
*
@@
-45,8
+45,8
@@
* \code
* typedef struct KFileSerial
* {
* \code
* typedef struct KFileSerial
* {
- * KFile fd;
- * Serial *ser;
+ *
KFile fd;
+ *
Serial *ser;
* } KFileSerial;
* \endcode
*
* } KFileSerial;
* \endcode
*
@@
-55,8
+55,8
@@
* \code
* INLINE KFileSerial * KFILESERIAL(KFile *fd)
* {
* \code
* INLINE KFileSerial * KFILESERIAL(KFile *fd)
* {
- * ASSERT(fd->_type == KFT_SERIAL);
- * return (KFileSerial *)fd;
+ *
ASSERT(fd->_type == KFT_SERIAL);
+ *
return (KFileSerial *)fd;
* }
* \endcode
*
* }
* \endcode
*
@@
-67,9
+67,9
@@
* \code
* static int ser_kfile_close(struct KFile *fd)
* {
* \code
* static int ser_kfile_close(struct KFile *fd)
* {
- * KFileSerial *fds = KFILESERIAL(fd);
- * ser_close(fds->ser);
- * return 0;
+ *
KFileSerial *fds = KFILESERIAL(fd);
+ *
ser_close(fds->ser);
+ *
return 0;
* }
* \endcode
* KFILESERIAL macro helps to ensure that obj passed is really a Serial.
* }
* \endcode
* KFILESERIAL macro helps to ensure that obj passed is really a Serial.
@@
-80,7
+80,8
@@
* are demanded to specific driver implementation.
*
* \version $Id$
* are demanded to specific driver implementation.
*
* \version $Id$
- * \author Bernardo Innocenti <bernie@develer.com>
+ *
+ * \author Bernie Innocenti <bernie@codewiz.org>
* \author Francesco Sacchi <batt@develer.com>
* \author Daniele Basile <asterix@develer.com>
*/
* \author Francesco Sacchi <batt@develer.com>
* \author Daniele Basile <asterix@develer.com>
*/
@@
-95,7
+96,8
@@
/* fwd decl */
struct KFile;
/* fwd decl */
struct KFile;
-typedef int32_t kfile_off_t; ///< KFile offset type, used by kfile_seek function.
+typedef int32_t kfile_off_t; ///< KFile offset type, used by kfile_seek function.
+typedef uint32_t kfile_size_t; ///< KFile size type, used in kfile struct.
/**
* Costants for repositioning read/write file offset.
/**
* Costants for repositioning read/write file offset.
@@
-183,8
+185,8
@@
typedef struct KFile
DB(id_t _type); ///< Used to keep trace, at runtime, of obj type.
/* NOTE: these must _NOT_ be size_t on 16bit CPUs! */
DB(id_t _type); ///< Used to keep trace, at runtime, of obj type.
/* NOTE: these must _NOT_ be size_t on 16bit CPUs! */
-
uint32_t
seek_pos;
-
uint32
_t size;
+
kfile_off_t
seek_pos;
+
kfile_size
_t size;
} KFile;
/**
} KFile;
/**
@@
-261,6
+263,8
@@
INLINE void kfile_clearerr(struct KFile *fd)
/**
* Kfile test function.
*/
/**
* Kfile test function.
*/
-bool kfile_test(KFile *fd, uint8_t *test_buf, uint8_t *save_buf, size_t size);
+int kfile_testSetUp(void);
+int kfile_testRun(KFile *fd, uint8_t *test_buf, uint8_t *save_buf, size_t size);
+int kfile_testTearDown(void);
#endif /* KERN_KFILE_H */
#endif /* KERN_KFILE_H */