X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fkfile.h;h=0e375cf3f4fcb8d2967b3cb509fa5e03e4e25bd3;hb=eb8b43262e8b6d98f3af877a86c142a83a1c6ce5;hp=4bb7a2380946748f6063e3d6bc56cc689ba0d707;hpb=791e167e053bdd9250d34a9a5ccae6ccde4d6679;p=bertos.git diff --git a/bertos/kern/kfile.h b/bertos/kern/kfile.h index 4bb7a238..0e375cf3 100644 --- a/bertos/kern/kfile.h +++ b/bertos/kern/kfile.h @@ -45,8 +45,8 @@ * \code * typedef struct KFileSerial * { - * KFile fd; - * Serial *ser; + * KFile fd; + * Serial *ser; * } KFileSerial; * \endcode * @@ -55,8 +55,8 @@ * \code * INLINE KFileSerial * KFILESERIAL(KFile *fd) * { - * ASSERT(fd->_type == KFT_SERIAL); - * return (KFileSerial *)fd; + * ASSERT(fd->_type == KFT_SERIAL); + * return (KFileSerial *)fd; * } * \endcode * @@ -67,9 +67,9 @@ * \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. @@ -80,6 +80,7 @@ * are demanded to specific driver implementation. * * \version $Id$ + * * \author Bernardo Innocenti * \author Francesco Sacchi * \author Daniele Basile @@ -95,7 +96,8 @@ /* 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. @@ -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! */ - uint32_t seek_pos; - uint32_t size; + kfile_off_t seek_pos; + kfile_size_t size; } KFile; /** @@ -261,6 +263,8 @@ INLINE void kfile_clearerr(struct KFile *fd) /** * 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 */