From 0b08eb3243a52370912409affeec4ca87dabc85d Mon Sep 17 00:00:00 2001 From: patacongo Date: Wed, 14 Dec 2011 19:59:06 +0000 Subject: STM32 RTC driver now compiles and links without error (still untested) git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4177 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/arch/arm/src/stm32/Make.defs | 6 ++- nuttx/arch/arm/src/stm32/chip/stm32_exti.h | 2 +- nuttx/arch/arm/src/stm32/stm32f40xxx_rtc.c | 77 +++++++++++++++++------------- 3 files changed, 50 insertions(+), 35 deletions(-) (limited to 'nuttx/arch/arm/src/stm32') diff --git a/nuttx/arch/arm/src/stm32/Make.defs b/nuttx/arch/arm/src/stm32/Make.defs index 1fc0c1829..402a32533 100644 --- a/nuttx/arch/arm/src/stm32/Make.defs +++ b/nuttx/arch/arm/src/stm32/Make.defs @@ -57,7 +57,7 @@ CHIP_CSRCS = stm32_allocateheap.c stm32_start.c stm32_rcc.c stm32_lse.c \ stm32_gpio.c stm32_exti.c stm32_flash.c stm32_irq.c \ stm32_timerisr.c stm32_dma.c stm32_lowputc.c stm32_serial.c \ stm32_spi.c stm32_usbdev.c stm32_sdio.c stm32_tim.c stm32_i2c.c \ - stm32_pwr.c stm32_idle.c stm32_waste.c + stm32_idle.c stm32_waste.c ifeq ($(CONFIG_STM32_ETHMAC),y) CHIP_CSRCS += stm32_eth.c @@ -67,6 +67,10 @@ ifeq ($(CONFIG_STM32_RCCLOCK),y) CHIP_CSRCS += stm32_rcclock.c endif +ifeq ($(CONFIG_STM32_PWR),y) +CHIP_CSRCS += stm32_pwr.c +endif + ifeq ($(CONFIG_RTC),y) CHIP_CSRCS += stm32_rtc.c endif diff --git a/nuttx/arch/arm/src/stm32/chip/stm32_exti.h b/nuttx/arch/arm/src/stm32/chip/stm32_exti.h index 31b50136d..d3fb6b3fe 100644 --- a/nuttx/arch/arm/src/stm32/chip/stm32_exti.h +++ b/nuttx/arch/arm/src/stm32/chip/stm32_exti.h @@ -99,7 +99,7 @@ # define EXTI_OTGHS_WAKEUP (1 << 20) /* EXTI line 20 is connected to the USB OTG HS Wakeup event */ # define EXTI_RTC_TAMPER (1 << 21) /* EXTI line 21 is connected to the RTC Tamper and TimeStamp events */ # define EXTI_RTC_TIMESTAMP (1 << 22) /* EXTI line 21 is connected to the RTC Tamper and TimeStamp events */ -# define EXTI_RTC_WAKEUP (1 << 23) /* EXTI line 22 is connected to the RTC Wakeup event +# define EXTI_RTC_WAKEUP (1 << 23) /* EXTI line 22 is connected to the RTC Wakeup event */ #endif /* Interrupt mask register */ diff --git a/nuttx/arch/arm/src/stm32/stm32f40xxx_rtc.c b/nuttx/arch/arm/src/stm32/stm32f40xxx_rtc.c index e249dc27b..7eb1a896b 100644 --- a/nuttx/arch/arm/src/stm32/stm32f40xxx_rtc.c +++ b/nuttx/arch/arm/src/stm32/stm32f40xxx_rtc.c @@ -43,6 +43,9 @@ #include #include +#include +#include + #include #include "up_arch.h" @@ -61,10 +64,14 @@ # error "CONFIG_RTC_DATETIME must be set to use this driver" #endif -#ifndef CONFIG_RTC_HIRES +#ifdef CONFIG_RTC_HIRES # error "CONFIG_RTC_HIRES must NOT be set with this driver" #endif +#ifndef CONFIG_STM32_PWR +# error "CONFIG_STM32_PWR must selected to use this driver" +#endif + /* Constants ************************************************************************/ #define SYNCHRO_TIMEOUT (0x00020000) @@ -226,24 +233,25 @@ static int rtc_enterinit(void) ret = OK; if ((regval & RTC_ISR_INITF) == 0) - { - /* Set the Initialization mode */ + { + /* Set the Initialization mode */ - putreg32(RTC_ISR_INIT, STM32_RTC_ISR); + putreg32(RTC_ISR_INIT, STM32_RTC_ISR); - /* Wait until the RTC is in the INIT state (or a timeout occurs) */ + /* Wait until the RTC is in the INIT state (or a timeout occurs) */ - ret = -ETIMEDOUT; - for (timeout = 0; timeout < INITMODE_TIMEOUT; timeout++) - { - regval = getreg32(STM32_RTC_ISR); - if ((regval & RTC_ISR_INITF) != 0) - { - ret = OK; - break; - } - } - + ret = -ETIMEDOUT; + for (timeout = 0; timeout < INITMODE_TIMEOUT; timeout++) + { + regval = getreg32(STM32_RTC_ISR); + if ((regval & RTC_ISR_INITF) != 0) + { + ret = OK; + break; + } + } + } + return ret; } @@ -357,7 +365,7 @@ static int rtc_setup(void) /* Set Initialization mode */ - ret = rtc_enterinit() + ret = rtc_enterinit(); if (ret == OK) { /* Set the 24 hour format by clearing the FMT bit in the RTC @@ -365,7 +373,7 @@ static int rtc_setup(void) */ regval = getreg32(STM32_RTC_CR); - regval &= ~RTC_CR_FMT + regval &= ~RTC_CR_FMT; putreg32(regval, STM32_RTC_CR); /* Configure RTC pre-scaler to the required, default values for @@ -405,7 +413,9 @@ static int rtc_setup(void) static int rtc_resume(void) { +#ifdef CONFIG_RTC_ALARM uint32_t regval; +#endif int ret; /* Wait for the RTC Time and Date registers to be syncrhonized with RTC APB @@ -473,6 +483,7 @@ static int rtc_interrupt(int irq, void *context) int up_rtcinitialize(void) { uint32_t regval; + int ret; /* Clocking for the PWR block must be provided. However, this is done * unconditionally in stm32f40xxx_rcc.c on power up. This done unconditionally @@ -551,7 +562,7 @@ int up_rtcinitialize(void) * ************************************************************************************/ -int up_rtc_getdatetime(FAR const struct tm *tp) +int up_rtc_getdatetime(FAR struct tm *tp) { uint32_t dr; uint32_t tr; @@ -575,13 +586,13 @@ int up_rtc_getdatetime(FAR const struct tm *tp) * register. */ - tmp = (uint8_t)(tr & (RTC_TR_SU_MASK|RTC_TR_ST_MASK)) >> RTC_TR_SU_SHIFT; + tmp = (tr & (RTC_TR_SU_MASK|RTC_TR_ST_MASK)) >> RTC_TR_SU_SHIFT; tp->tm_sec = rtc_bcd2bin(tmp); - tmp = (tr & RTC_TR_MNU_MASK|RTC_TR_MNT_MASK) >> RTC_TR_MNU_SHIFT; + tmp = (tr & (RTC_TR_MNU_MASK|RTC_TR_MNT_MASK)) >> RTC_TR_MNU_SHIFT; tp->tm_min = rtc_bcd2bin(tmp); - tmp = (tr & RTC_TR_HU_MASK|RTC_TR_HT_MASK) >> RTC_TR_HU_SHIFT; + tmp = (tr & (RTC_TR_HU_MASK|RTC_TR_HT_MASK)) >> RTC_TR_HU_SHIFT; tp->tm_hour = rtc_bcd2bin(tmp); /* Now convert the RTC date to fields in struct tm format: @@ -593,13 +604,13 @@ int up_rtc_getdatetime(FAR const struct tm *tp) * years 2000-2099? I'll assume so. */ - tmp = (dr & RTC_DR_DU_MASK|RTC_DR_DT_MASK) >> RTC_DR_DU_SHIFT; + tmp = (dr & (RTC_DR_DU_MASK|RTC_DR_DT_MASK)) >> RTC_DR_DU_SHIFT; tp->tm_mday = rtc_bcd2bin(tmp); - tmp = (dr & RTC_DR_MU_MASK|RTC_DR_MT) >> RTC_DR_MU_SHIFT; + tmp = (dr & (RTC_DR_MU_MASK|RTC_DR_MT)) >> RTC_DR_MU_SHIFT; tp->tm_mon = rtc_bcd2bin(tmp) - 1; - tmp = (dr & RTC_DR_YU_MASK|RTC_DR_YT_MASK) >> RTC_DR_YU_SHIFT; /* Year units, BCD 0-99 */ + tmp = (dr & (RTC_DR_YU_MASK|RTC_DR_YT_MASK)) >> RTC_DR_YU_SHIFT; tp->tm_year = rtc_bcd2bin(tmp) + 100; return OK; } @@ -637,9 +648,9 @@ int up_rtc_settime(FAR const struct timespec *tp) * register. */ - tr = (rtc_bin2bcd(tp->tm_sec) << RTC_TR_SU_SHIFT) | - (rtc_bin2bcd(tp->tm_min) << RTC_TR_MNU_SHIFT) | - (rtc_bin2bcd(tp->tm_hour) << RTC_TR_HU_SHIFT); + tr = (rtc_bin2bcd(newtime.tm_sec) << RTC_TR_SU_SHIFT) | + (rtc_bin2bcd(newtime.tm_min) << RTC_TR_MNU_SHIFT) | + (rtc_bin2bcd(newtime.tm_hour) << RTC_TR_HU_SHIFT); tr &= ~RTC_TR_RESERVED_BITS; /* Now convert the fields in struct tm format to the RTC date register fields: @@ -651,9 +662,9 @@ int up_rtc_settime(FAR const struct timespec *tp) * years 2000-2099? I'll assume so. */ - dr = (rtc_bin2bcd(tp->tm_mday) << RTC_DR_DU_SHIFT) | - ((rtc_bin2bcd(tp->tm_mon) + 1) << RTC_DR_MU_SHIFT) | - ((rtc_bin2bcd(tp->tm_year) - 100) << RTC_DR_YU_SHIFT); + dr = (rtc_bin2bcd(newtime.tm_mday) << RTC_DR_DU_SHIFT) | + ((rtc_bin2bcd(newtime.tm_mon) + 1) << RTC_DR_MU_SHIFT) | + ((rtc_bin2bcd(newtime.tm_year) - 100) << RTC_DR_YU_SHIFT); dr &= ~RTC_DR_RESERVED_BITS; /* Disable the write protection for RTC registers */ @@ -662,7 +673,7 @@ int up_rtc_settime(FAR const struct timespec *tp) /* Set Initialization mode */ - ret = rtc_enterinit() + ret = rtc_enterinit(); if (ret == OK) { /* Set the RTC TR and DR registers */ @@ -674,7 +685,7 @@ int up_rtc_settime(FAR const struct timespec *tp) * registers to be synchronized with RTC APB clock. */ - rtc_enterinit() + rtc_exitinit(); ret = rtc_synchwait(); } -- cgit v1.2.3