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/platforms/STM32/RTCv1 | |
| 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/platforms/STM32/RTCv1')
| -rw-r--r-- | os/hal/platforms/STM32/RTCv1/rtc_lld.c | 4 | ||||
| -rw-r--r-- | os/hal/platforms/STM32/RTCv1/rtc_lld.h | 24 |
2 files changed, 23 insertions, 5 deletions
diff --git a/os/hal/platforms/STM32/RTCv1/rtc_lld.c b/os/hal/platforms/STM32/RTCv1/rtc_lld.c index 1a6c85d8b..1330e106e 100644 --- a/os/hal/platforms/STM32/RTCv1/rtc_lld.c +++ b/os/hal/platforms/STM32/RTCv1/rtc_lld.c @@ -280,8 +280,8 @@ void rtc_lld_set_alarm(RTCDriver *rtcp, *
* @note Default value after BKP domain reset is 0xFFFFFFFF.
*
- * @param[in] rtcp pointer to RTC driver structure
- * @param[in] alarm alarm identifier
+ * @param[in] rtcp pointer to RTC driver structure
+ * @param[in] alarm alarm identifier
* @param[out] alarmspec pointer to a @p RTCAlarm structure
*
* @notapi
diff --git a/os/hal/platforms/STM32/RTCv1/rtc_lld.h b/os/hal/platforms/STM32/RTCv1/rtc_lld.h index e3ce0e365..6e682db61 100644 --- a/os/hal/platforms/STM32/RTCv1/rtc_lld.h +++ b/os/hal/platforms/STM32/RTCv1/rtc_lld.h @@ -20,7 +20,7 @@ /**
* @file STM32/RTCv1/rtc_lld.h
- * @brief STM32 RTC subsystem low level driver header.
+ * @brief STM32F1xx RTC subsystem low level driver header.
*
* @addtogroup RTC
* @{
@@ -67,12 +67,18 @@ /*===========================================================================*/
/**
- * @brief Type of a structure representing an RTC alarm stamp.
+ * @brief Type of a structure representing an RTC alarm time stamp.
*/
typedef struct RTCAlarm RTCAlarm;
/**
+ * @brief Type of a structure representing an RTC callbacks config.
+ */
+typedef struct RTCCallbackConfig RTCCallbackConfig;
+
+/**
* @brief Type of an RTC alarm.
+ * @details Meaningful on platforms with more than 1 alarm comparator.
*/
typedef uint32_t rtcalarm_t;
@@ -91,6 +97,18 @@ typedef enum { typedef void (*rtccb_t)(RTCDriver *rtcp, rtcevent_t event);
/**
+ * @brief Structure representing an RTC callbacks config.
+ */
+struct RTCCallbackConfig{
+#if RTC_SUPPORTS_CALLBACKS
+ /**
+ * @brief Generic RTC callback pointer.
+ */
+ rtccb_t rtc_cb;
+#endif /* RTC_SUPPORTS_CALLBACKS */
+};
+
+/**
* @brief Structure representing an RTC time stamp.
*/
struct RTCTime {
@@ -105,7 +123,7 @@ struct RTCTime { };
/**
- * @brief Structure representing an RTC alarm specification.
+ * @brief Structure representing an RTC alarm time stamp.
*/
struct RTCAlarm {
/**
|