From e40082e1d66e963a16ef36ad2231dd40b56bdf7c Mon Sep 17 00:00:00 2001 From: gdisirio Date: Thu, 27 Nov 2014 15:07:26 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7543 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/include/hal_files.h | 16 ++++++++-------- os/hal/include/rtc.h | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'os/hal/include') diff --git a/os/hal/include/hal_files.h b/os/hal/include/hal_files.h index c07e91bb7..aba8a7271 100644 --- a/os/hal/include/hal_files.h +++ b/os/hal/include/hal_files.h @@ -46,17 +46,17 @@ /** * @brief No error return code. */ -#define FILE_OK (fileoffset_t)STM_OK +#define FILE_OK STM_OK /** * @brief Error code from the file stream methods. */ -#define FILE_ERROR (fileoffset_t)STM_TIMEOUT +#define FILE_ERROR STM_TIMEOUT /** * @brief End-of-file condition for file get/put methods. */ -#define FILE_EOF (fileoffset_t)STM_RESET +#define FILE_EOF STM_RESET /** @} */ /** @@ -70,15 +70,15 @@ typedef uint32_t fileoffset_t; #define _file_stream_methods \ _base_sequential_stream_methods \ /* File close method.*/ \ - uint32_t (*close)(void *instance); \ + msg_t (*close)(void *instance); \ /* Get last error code method.*/ \ - int (*geterror)(void *instance); \ + msg_t (*geterror)(void *instance); \ /* File get size method.*/ \ - fileoffset_t (*getsize)(void *instance); \ + msg_t (*getsize)(void *instance); \ /* File get current position method.*/ \ - fileoffset_t (*getposition)(void *instance); \ + msg_t (*getposition)(void *instance); \ /* File seek method.*/ \ - uint32_t (*lseek)(void *instance, fileoffset_t offset); + msg_t (*lseek)(void *instance, fileoffset_t offset); /** * @brief @p FileStream specific data. diff --git a/os/hal/include/rtc.h b/os/hal/include/rtc.h index 2038ca9a9..a6730c2b2 100644 --- a/os/hal/include/rtc.h +++ b/os/hal/include/rtc.h @@ -115,6 +115,7 @@ typedef struct { extern "C" { #endif void rtcInit(void); + void rtcObjectInit(RTCDriver *rtcp); void rtcSetTime(RTCDriver *rtcp, const RTCDateTime *timespec); void rtcGetTime(RTCDriver *rtcp, RTCDateTime *timespec); #if RTC_ALARMS > 0 -- cgit v1.2.3