diff options
author | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-12-12 11:07:30 +0000 |
---|---|---|
committer | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-12-12 11:07:30 +0000 |
commit | 527ef56ed39ada4b393062184144c33a86dbac2c (patch) | |
tree | 8e03bcc822333215cb61f109dac03ab9bca38d65 /os/hal/include/rtc.h | |
parent | a8115a6060dc7ef4a54d6bc27459b722ee7d1f57 (diff) | |
parent | facfe77b186a05dde255b4c66d22cdddaf0fd0f6 (diff) | |
download | ChibiOS-527ef56ed39ada4b393062184144c33a86dbac2c.tar.gz ChibiOS-527ef56ed39ada4b393062184144c33a86dbac2c.tar.bz2 ChibiOS-527ef56ed39ada4b393062184144c33a86dbac2c.zip |
Merging changes from rtc_dev branch.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3601 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/include/rtc.h')
-rw-r--r-- | os/hal/include/rtc.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/os/hal/include/rtc.h b/os/hal/include/rtc.h index 1264c5bd8..ddb495205 100644 --- a/os/hal/include/rtc.h +++ b/os/hal/include/rtc.h @@ -85,15 +85,18 @@ extern "C" { void rtcInit(void);
void rtcSetTime(RTCDriver *rtcp, const RTCTime *timespec);
void rtcGetTime(RTCDriver *rtcp, RTCTime *timespec);
+
#if RTC_ALARMS > 0
void rtcSetAlarm(RTCDriver *rtcp,
rtcalarm_t alarm,
const RTCAlarm *alarmspec);
void rtcGetAlarm(RTCDriver *rtcp, rtcalarm_t alarm, RTCAlarm *alarmspec);
-#endif
+#endif /* RTC_ALARMS > 0 */
+
#if RTC_SUPPORTS_CALLBACKS
- void rtcSetCallback(RTCDriver *rtcp, rtccb_t callback);
-#endif
+ void rtcSetCallback(RTCDriver *rtcp, RTCCallbackConfig *cb_cfg);
+#endif /* RTC_SUPPORTS_CALLBACKS */
+
#ifdef __cplusplus
}
#endif
|