Changeset 374 for asp3_tinet_ecnl_arm/trunk/asp3_dcre/mbed/targets/TARGET_RENESAS/TARGET_RZA1XX/rtc_api.c

Timestamp:

Apr 5, 2019, 9:26:53 PM (5 years ago)

Author:

coas-nagasima

Message:

mbed関連を更新
シリアルドライバをmbedのHALを使うよう変更
ファイルディスクリプタの処理を更新

Location:

asp3_tinet_ecnl_arm/trunk/asp3_dcre/mbed/targets/TARGET_RENESAS/TARGET_RZA1XX

Files:

• . (added)
• rtc_api.c (copied) (copied from asp3_tinet_ecnl_arm/trunk/asp3_dcre/mbed/targets/TARGET_RENESAS/TARGET_RZ_A1H/rtc_api.c ) (16 diffs)

asp3_tinet_ecnl_arm/trunk/asp3_dcre/mbed/targets/TARGET_RENESAS/TARGET_RZA1XX/rtc_api.c

@@ -21 +21 @@
 
 #include "rtc_api.h"
-#include "rtc_iodefine.h"
-
+#include "iodefine.h"
+#include "mbed_drv_cfg.h"
+#include "mbed_mktime.h"
 
 #define RCR1_VAL_ON      (0x08u) // AIE = 1
 #define RCR1_VAL_OFF     (0x00u)
+#define RCR3_VAL         (0x00u)
+#define RCR5_VAL                 (0x00u)
+
+#ifdef USE_RTCX1_CLK
+#define RCR2_VAL_ALLSTOP (0x08u)
+#define RCR2_VAL_START   (0x09u) // START = 1
+#define RCR2_VAL_RESET   (0x0Au) // RESET = 1
+#define RCR5_VAL_RTCX1   (0x00u) // RCKSEL = clock rtc from RTCX1(32.768 kHz)
+#elif defined(USE_EXTAL_CLK)
 #define RCR2_VAL_ALLSTOP (0x00u)
 #define RCR2_VAL_START   (0x01u) // START = 1
 #define RCR2_VAL_RESET   (0x02u) // RESET = 1
-#define RCR3_VAL         (0x00u)
-#define RCR5_VAL_EXTAL   (0x01u) // RCKSEL = connect EXTAL
-#define RCR5_VAL_RTCX1   (0x00u) // RCKSEL = disconnect EXTAL
+#define RCR5_VAL_EXTAL   (0x01u) // RCKSEL = clock rtc from EXTAL
 #define RFRH_VAL_13333   (0x8003u) // 13.3333MHz (= 64Hz * 0x32DCD) 
 #define RFRL_VAL_13333   (0x2DCDu) //
+#elif defined(USE_RTCX3_CLK)
+#define RCR2_VAL_ALLSTOP (0x08u)
+#define RCR2_VAL_START   (0x09u) // START = 1
+#define RCR2_VAL_RESET   (0x0Au) // RESET = 1
+#define RCR5_VAL_RTCX3   (0x02u) // RCKSEL = clock rtc from RTCX3(4.000 MHz)
+#define RFRH_VAL_4000   (0x8000u) // 4.000MHz (= 64Hz * 0xF424)
+#define RFRL_VAL_4000   (0xF424u) //
+#else
+#error Select RTC clock input !
+#endif
+
 #define RFRH_VAL_MAX     (0x0007u) // MAX value (= 128Hz * 0x7FFFF)
 #define RFRL_VAL_MAX     (0xFFFFu) //
@@ -48 +67 @@
 #define SHIFT_2BYTE      (16u)
 
-#define TIME_ERROR_VAL   (0xFFFFFFFFu)
+#define TIME_ERROR_VAL   (0u)
 
 static int rtc_dec8_to_hex(uint8_t dec_val, uint8_t offset, int *hex_val);
@@ -64 +83 @@
  * None.
  */
-void rtc_init(void) {
+void rtc_init(void)
+{
     volatile uint8_t dummy_read;
+
+    CPG.STBCR6 &= ~(CPG_STBCR6_BIT_MSTP60);
 
     // Set control register
@@ -71 +93 @@
     RTC.RCR1 = RCR1_VAL_ON;
     RTC.RCR3 = RCR3_VAL;
+
+#ifdef USE_RTCX1_CLK
+    RTC.RCR5 = RCR5_VAL_RTCX1;
+    RTC.RFRH = 0;
+    RTC.RFRL = 0;
+#elif defined(USE_EXTAL_CLK)
     RTC.RCR5 = RCR5_VAL_EXTAL;
     RTC.RFRH = RFRH_VAL_13333;
     RTC.RFRL = RFRL_VAL_13333;
-
+#else
+    RTC.RCR5 = RCR5_VAL_RTCX3;
+    RTC.RFRH = RFRH_VAL_4000;
+    RTC.RFRL = RFRL_VAL_4000;
+#endif
     // Dummy read
     dummy_read = RTC.RCR2;
     dummy_read = RTC.RCR2;
 
-    RTC.RCR2 = RCR2_VAL_RESET; // RESET = 1
+    RTC.RCR2 = RCR2_VAL_START; // SRART = 1
 
     // Dummy read
@@ -85 +117 @@
     dummy_read = RTC.RCR2;
 
-    // Set timer and alarm. Default value :01-01-1970 00:00:00
-    RTC.RSECCNT = 0;
-    RTC.RMINCNT = 0;
-    RTC.RHRCNT  = 0;
-    RTC.RWKCNT  = 0;
-    RTC.RDAYCNT = 1;
-    RTC.RMONCNT = 1;
-    RTC.RYRCNT  = 0x1970;
-    RTC.RSECAR  = 0;
-    RTC.RMINAR  = 0;
-    RTC.RHRAR   = 0;
-    RTC.RWKAR   = 0;
-    RTC.RDAYAR  = 1;
-    RTC.RMONAR  = 1;
-    RTC.RYRAR   = 0x1970;
-
-    // Dummy read
-    dummy_read = RTC.RYRCNT;
-    dummy_read = RTC.RYRCNT;
+    (void)dummy_read;
 
 }
@@ -110 +124 @@
 /*
  * Release the RTC based on a time structure.
- * [in]
- * None.
- * [out]
- * None.
- */
-void rtc_free(void) {
-    volatile uint8_t dummy_read;
-
-    // Set control register
-    RTC.RCR2 = RCR2_VAL_ALLSTOP;
-    RTC.RCR1 = RCR1_VAL_OFF;
-    RTC.RCR3 = RCR3_VAL;
-    RTC.RCR5 = RCR5_VAL_RTCX1;
-    RTC.RFRH = RFRH_VAL_MAX;
-    RTC.RFRL = RFRL_VAL_MAX;
-
-    // Dummy read
-    dummy_read = RTC.RCR2;
-    dummy_read = RTC.RCR2;
-    RTC.RCR2 = RCR2_VAL_RESET; // RESET = 1
-
-    // Dummy read
-    dummy_read = RTC.RCR2;
-    dummy_read = RTC.RCR2;
-
-    // Set timer and alarm. Default value :01-01-1970 00:00:00
-    RTC.RSECCNT = 0;
-    RTC.RMINCNT = 0;
-    RTC.RHRCNT  = 0;
-    RTC.RWKCNT  = 0;
-    RTC.RDAYCNT = 1;
-    RTC.RMONCNT = 1;
-    RTC.RYRCNT  = 0x1970;
-    RTC.RSECAR  = 0;
-    RTC.RMINAR  = 0;
-    RTC.RHRAR   = 0;
-    RTC.RWKAR   = 0;
-    RTC.RDAYAR  = 1;
-    RTC.RMONAR  = 1;
-    RTC.RYRAR   = 0x1970;
-
-    // Dummy read
-    dummy_read = RTC.RYRCNT;
-    dummy_read = RTC.RYRCNT;
-
+ * @note This function does not stop the RTC from counting 
+ * [in]
+ * None.
+ * [out]
+ * None.
+ */
+void rtc_free(void)
+{
 }
 
@@ -166 +143 @@
  * 0:Disabled, 1:Enabled.
  */
-int rtc_isenabled(void) {
+int rtc_isenabled(void)
+{
     int ret_val = 0;
 
@@ -184 +162 @@
  * UNIX timestamp value.
  */
-time_t rtc_read(void) {
+time_t rtc_read(void)
+{
 
     struct tm timeinfo;
@@ -214 +193 @@
     if (err == 0) {
         // Convert to timestamp
-        t = mktime(&timeinfo);
+        if (_rtc_maketime(&timeinfo, &t, RTC_FULL_LEAP_YEAR_SUPPORT) == false) {
+            return TIME_ERROR_VAL;
+        }
     } else {
         // Error
@@ -233 +214 @@
  * 1:Error
  */
-static int rtc_dec8_to_hex(uint8_t dec_val, uint8_t offset, int *hex_val) {
+static int rtc_dec8_to_hex(uint8_t dec_val, uint8_t offset, int *hex_val)
+{
     int err = 0;
     uint8_t ret_val;
@@ -267 +249 @@
  * 1:Error
  */
-static int rtc_dec16_to_hex(uint16_t dec_val, uint16_t offset, int *hex_val) {
+static int rtc_dec16_to_hex(uint16_t dec_val, uint16_t offset, int *hex_val)
+{
     int err = 0;
     uint16_t ret_val;
@@ -302 +285 @@
  * None.
  */
-void rtc_write(time_t t) {
-
-    struct tm *timeinfo = localtime(&t);
+void rtc_write(time_t t)
+{
+
+    struct tm timeinfo;
+    if (_rtc_localtime(t, &timeinfo, RTC_FULL_LEAP_YEAR_SUPPORT) == false) {
+        return;
+    }
+
     volatile uint16_t dummy_read;
 
@@ -315 +303 @@
         dummy_read  = (uint16_t)RTC.RCR2;
 
-        RTC.RSECCNT = rtc_hex8_to_dec(timeinfo->tm_sec);
-        RTC.RMINCNT = rtc_hex8_to_dec(timeinfo->tm_min);
-        RTC.RHRCNT  = rtc_hex8_to_dec(timeinfo->tm_hour);
-        RTC.RDAYCNT = rtc_hex8_to_dec(timeinfo->tm_mday);
-        RTC.RMONCNT = rtc_hex8_to_dec(timeinfo->tm_mon + 1);
-        RTC.RYRCNT  = rtc_hex16_to_dec(timeinfo->tm_year + 1900);
+        RTC.RSECCNT = rtc_hex8_to_dec(timeinfo.tm_sec);
+        RTC.RMINCNT = rtc_hex8_to_dec(timeinfo.tm_min);
+        RTC.RHRCNT  = rtc_hex8_to_dec(timeinfo.tm_hour);
+        RTC.RDAYCNT = rtc_hex8_to_dec(timeinfo.tm_mday);
+        RTC.RMONCNT = rtc_hex8_to_dec(timeinfo.tm_mon + 1);
+        RTC.RYRCNT  = rtc_hex16_to_dec(timeinfo.tm_year + 1900);
         dummy_read  = (uint16_t)RTC.RYRCNT;
         dummy_read  = (uint16_t)RTC.RYRCNT;
@@ -328 +316 @@
         dummy_read  = (uint16_t)RTC.RCR2;
         dummy_read  = (uint16_t)RTC.RCR2;
+        (void)dummy_read;
     }
 }
@@ -338 +327 @@
  * decimal value:From 0x00 to 0x99.
  */
-static uint8_t rtc_hex8_to_dec(uint8_t hex_val) {
+static uint8_t rtc_hex8_to_dec(uint8_t hex_val)
+{
     uint32_t calc_data;
 
@@ -358 +348 @@
  * decimal value:From 0x0000 to 0x9999.
  */
-static uint16_t rtc_hex16_to_dec(uint16_t hex_val) {
+static uint16_t rtc_hex16_to_dec(uint16_t hex_val)
+{
     uint32_t calc_data;
     calc_data  =   hex_val / 1000       * 0x1000;