rusefi
/
ChibiOS
mirror of https://github.com/rusefi/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RTC. Code compiles but not tested. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/rtc_dev@3588 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
barthess 2011-12-09 13:58:19 +00:00
parent da68de0d34 28cb4b4849
commit e7e63d88db
4 changed files with 55 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
os/hal/platforms/STM32F4xx/hal_lld.h
View File

@ -218,6 +218,12 @@
#define STM32_MCO2SEL_HSE (2U << 30) /**< HSE clock on MCO2 pin. */ #define STM32_MCO2SEL_HSE (2U << 30) /**< HSE clock on MCO2 pin. */
#define STM32_MCO2SEL_PLL (3U << 30) /**< PLL clock on MCO2 pin. */ #define STM32_MCO2SEL_PLL (3U << 30) /**< PLL clock on MCO2 pin. */
#define STM32_RTC_NOCLOCK (0 << 8) /**< No clock. */
#define STM32_RTC_LSE (1 << 8) /**< LSE used as RTC clock. */
#define STM32_RTC_LSI (2 << 8) /**< LSI used as RTC clock. */
#define STM32_RTC_HSE (3 << 8) /**< HSE divided by programmable
prescaler used as RTC clock*/
/** /**
* @name RCC_PLLI2SCFGR register bits definitions * @name RCC_PLLI2SCFGR register bits definitions
* @{ * @{

128
os/hal/platforms/STM32F4xx/rtc_lld.c
View File

@ -58,34 +58,13 @@ RTCDriver RTCD1;
static void rtc_lld_serve_interrupt(RTCDriver *rtcp) { static void rtc_lld_serve_interrupt(RTCDriver *rtcp) {
chSysLockFromIsr(); chSysLockFromIsr();
rtcp->rtc_cb(rtcp, RTC_EVENT_SECOND);
if ((RTC->CRH & RTC_CRH_SECIE) && (RTC->CRL & RTC_CRL_SECF)) { rtcp->rtc_cb(rtcp, RTC_EVENT_ALARM);
rtcp->rtc_cb(rtcp, RTC_EVENT_SECOND); rtcp->rtc_cb(rtcp, RTC_EVENT_OVERFLOW);
RTC->CRL &= ~RTC_CRL_SECF;
}
if ((RTC->CRH & RTC_CRH_ALRIE) && (RTC->CRL & RTC_CRL_ALRF)) {
rtcp->rtc_cb(rtcp, RTC_EVENT_ALARM);
RTC->CRL &= ~RTC_CRL_ALRF;
}
if ((RTC->CRH & RTC_CRH_OWIE) && (RTC->CRL & RTC_CRL_OWF)) {
rtcp->rtc_cb(rtcp, RTC_EVENT_OVERFLOW);
RTC->CRL &= ~RTC_CRL_OWF;
}
chSysUnlockFromIsr(); chSysUnlockFromIsr();
} }
/**
* @brief Waits for the previous registers write to finish.
*
* @notapi
*/
static void rtc_lld_wait_write(void) {
/* Waits registers write completion.*/
while (!(RTC->CRL & RTC_CRL_RTOFF))
;
}
/*===========================================================================*/ /*===========================================================================*/
/* Driver interrupt handlers. */ /* Driver interrupt handlers. */
@ -120,8 +99,6 @@ CH_IRQ_HANDLER(RTC_IRQHandler) {
void rtc_lld_init(void){ void rtc_lld_init(void){
uint32_t preload; uint32_t preload;
rccEnableBKPInterface(FALSE);
/* Enables access to BKP registers.*/ /* Enables access to BKP registers.*/
PWR->CR |= PWR_CR_DBP; PWR->CR |= PWR_CR_DBP;
@ -160,29 +137,23 @@ void rtc_lld_init(void){
/* RTC enabled regardless its previous status.*/ /* RTC enabled regardless its previous status.*/
RCC->BDCR |= RCC_BDCR_RTCEN; RCC->BDCR |= RCC_BDCR_RTCEN;
/* Ensure that RTC_CNT and RTC_DIV contain actual values after enabling /* Calendar not init yet. */
clocking on APB1, because these values only update when APB1 if (!(RTC->ISR & RTC_ISR_INITS)){
functioning.*/ /* Disable write protection on RTC registers. */
RTC->CRL = 0; RTC->WPR = 0xCA;
while (!(RTC->CRL & RTC_CRL_RSF)) RTC->WPR = 0x53;
; /* Enter in init mode. */
RTC->ISR |= RTC_ISR_INIT;
/* Write preload register only if its value differs.*/ while(!(RTC->ISR & RTC_ISR_INITF))
if (preload != ((((uint32_t)(RTC->PRLH)) << 16) + (uint32_t)RTC->PRLL)) { ;
/* Prescaler registers must be written in by two separate writes. */
rtc_lld_wait_write(); RTC->PRER = 0;
RTC->PRER = 0x007F00FF;
/* Enters configuration mode and writes PRLx registers then leaves the /* Wait until calendar data will updated. */
configuration mode.*/ while(!(RTC->ISR & RTC_ISR_RSF))
RTC->CRL |= RTC_CRL_CNF; ;
RTC->PRLH = (uint16_t)(preload >> 16);
RTC->PRLL = (uint16_t)(preload & 0xFFFF);
RTC->CRL &= ~RTC_CRL_CNF;
} }
/* All interrupts initially disabled.*/
RTC->CRH = 0;
/* Callback initially disabled.*/ /* Callback initially disabled.*/
RTCD1.rtc_cb = NULL; RTCD1.rtc_cb = NULL;
} }
@ -198,15 +169,18 @@ void rtc_lld_init(void){
* @notapi * @notapi
*/ */
void rtc_lld_set_time(RTCDriver *rtcp, const RTCTime *timespec) { void rtc_lld_set_time(RTCDriver *rtcp, const RTCTime *timespec) {
(void)rtcp; (void)rtcp;
rtc_lld_wait_write(); RTC->ISR |= RTC_ISR_INIT;
while(!(RTC->ISR & RTC_ISR_INITF))
;
RTC->CRL |= RTC_CRL_CNF; RTC->TR = timespec->tv_time;
RTC->CNTH = (uint16_t)(timespec->tv_sec >> 16); RTC->DR = timespec->tv_date;
RTC->CNTL = (uint16_t)(timespec->tv_sec & 0xFFFF);
RTC->CRL &= ~RTC_CRL_CNF; /* Wait until calendar data will updated. */
while(!(RTC->ISR & RTC_ISR_RSF))
;
} }
/** /**
@ -218,14 +192,17 @@ void rtc_lld_set_time(RTCDriver *rtcp, const RTCTime *timespec) {
* @notapi * @notapi
*/ */
void rtc_lld_get_time(RTCDriver *rtcp, RTCTime *timespec) { void rtc_lld_get_time(RTCDriver *rtcp, RTCTime *timespec) {
uint32_t time_frac;
(void)rtcp; (void)rtcp;
time_frac = (((uint32_t)RTC->DIVH) << 16) + (uint32_t)RTC->DIVL; /* TODO: If the frequency of the APB1 clock is less than seven times
timespec->tv_msec = (uint16_t)(((STM32_LSECLK - time_frac) * 1000) / * the frequency of RTCCLK, BYPSHAD must be set to ‘1’ .*/
STM32_LSECLK);
timespec->tv_sec = (RTC->CNTH << 16) + RTC->CNTL; /* Wait until calendar data will updated. */
while(!(RTC->ISR & RTC_ISR_RSF))
;
timespec->tv_time = RTC->TR;
timespec->tv_date = RTC->DR;
} }
/** /**
@ -245,21 +222,7 @@ void rtc_lld_set_alarm(RTCDriver *rtcp,
(void)rtcp; (void)rtcp;
(void)alarm; (void)alarm;
(void)alarmspec;
rtc_lld_wait_write();
/* Enters configuration mode and writes ALRHx registers then leaves the
configuration mode.*/
RTC->CRL |= RTC_CRL_CNF;
if (alarmspec != NULL) {
RTC->ALRH = (uint16_t)(alarmspec->tv_sec >> 16);
RTC->ALRL = (uint16_t)(alarmspec->tv_sec & 0xFFFF);
}
else {
RTC->ALRH = 0;
RTC->ALRL = 0;
}
RTC->CRL &= ~RTC_CRL_CNF;
} }
/** /**
@ -281,8 +244,7 @@ void rtc_lld_get_alarm(RTCDriver *rtcp,
(void)rtcp; (void)rtcp;
(void)alarm; (void)alarm;
(void)alarmspec;
alarmspec->tv_sec = ((RTC->ALRH << 16) + RTC->ALRL);
} }
/** /**
@ -296,22 +258,10 @@ void rtc_lld_get_alarm(RTCDriver *rtcp,
* @notapi * @notapi
*/ */
void rtc_lld_set_callback(RTCDriver *rtcp, rtccb_t callback) { void rtc_lld_set_callback(RTCDriver *rtcp, rtccb_t callback) {
if (callback != NULL) { if (callback != NULL) {
rtcp->rtc_cb = callback; rtcp->rtc_cb = callback;
NVICEnableVector(RTC_IRQn, CORTEX_PRIORITY_MASK(STM32_RTC_IRQ_PRIORITY));
/* Interrupts are enabled only after setting up the callback, this
way there is no need to check for the NULL callback pointer inside
the IRQ handler.*/
RTC->CRL &= ~(RTC_CRL_OWF | RTC_CRL_ALRF | RTC_CRL_SECF);
RTC->CRH |= RTC_CRH_OWIE | RTC_CRH_ALRIE | RTC_CRH_SECIE;
}
else {
NVICDisableVector(RTC_IRQn);
RTC->CRL = 0;
RTC->CRH = 0;
} }
return;
} }
#endif /* HAL_USE_RTC */ #endif /* HAL_USE_RTC */

10
os/hal/platforms/STM32F4xx/rtc_lld.h
View File

@ -95,15 +95,17 @@ typedef void (*rtccb_t)(RTCDriver *rtcp, rtcevent_t event);
*/ */
struct RTCTime { struct RTCTime {
/** /**
* @brief Seconds since UNIX epoch. * @brief RTC date register in BCD format.
*/ */
uint32_t tv_sec; uint32_t tv_date;
/** /**
* @brief Fractional part. * @brief RTC time register in BCD format.
*/ */
uint32_t tv_msec; uint32_t tv_time;
}; };
/** /**
* @brief Structure representing an RTC alarm specification. * @brief Structure representing an RTC alarm specification.
*/ */

4
os/hal/src/i2c.c
View File

@ -168,6 +168,8 @@ msg_t i2cMasterTransmit(I2CDriver *i2cp,
((rxbytes == 0) || ((rxbytes > 0) && (rxbuf != NULL))) && ((rxbytes == 0) || ((rxbytes > 0) && (rxbuf != NULL))) &&
(timeout > TIME_IMMEDIATE) && (errors != NULL), (timeout > TIME_IMMEDIATE) && (errors != NULL),
"i2cMasterTransmit"); "i2cMasterTransmit");
i2c_lld_wait_bus_free(i2cp);
i2cp->errors = I2CD_NO_ERROR; /* clear error flags from previous run */ i2cp->errors = I2CD_NO_ERROR; /* clear error flags from previous run */
chDbgAssert(i2cp->id_state == I2C_READY, chDbgAssert(i2cp->id_state == I2C_READY,
"i2cMasterTransmit(), #1", "not ready"); "i2cMasterTransmit(), #1", "not ready");
@ -209,6 +211,8 @@ msg_t i2cMasterReceive(I2CDriver *i2cp,
(rxbytes > 0) && (rxbuf != NULL) && (rxbytes > 0) && (rxbuf != NULL) &&
(timeout > TIME_IMMEDIATE) && (errors != NULL), (timeout > TIME_IMMEDIATE) && (errors != NULL),
"i2cMasterReceive"); "i2cMasterReceive");
i2c_lld_wait_bus_free(i2cp);
i2cp->errors = I2CD_NO_ERROR; /* clear error flags from previous run */ i2cp->errors = I2CD_NO_ERROR; /* clear error flags from previous run */
chDbgAssert(i2cp->id_state == I2C_READY, chDbgAssert(i2cp->id_state == I2C_READY,
"i2cMasterReceive(), #1", "not ready"); "i2cMasterReceive(), #1", "not ready");