You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gu...@apache.org on 2021/11/26 18:23:51 UTC
[incubator-nuttx] branch master updated (66023da -> 251b8a3)
This is an automated email from the ASF dual-hosted git repository.
gustavonihei pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 66023da risc-v/esp32c3: Refactor ADC calibration
new af11cf6 esp32xx_rtc.c: Fix a duplicated assignment.
new 251b8a3 esp32xx_rtc: Include "clock/clock.h" to have a declaration of g_basetime.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arch/risc-v/src/esp32c3/esp32c3_rtc.c | 8 +++++---
arch/xtensa/src/esp32/esp32_rtc.c | 10 ++++++----
2 files changed, 11 insertions(+), 7 deletions(-)
[incubator-nuttx] 01/02: esp32xx_rtc.c: Fix a duplicated assignment.
Posted by gu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gustavonihei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit af11cf6cd10914617051455dab4f6a719a7245a7
Author: Abdelatif Guettouche <ab...@espressif.com>
AuthorDate: Fri Nov 26 14:25:38 2021 +0100
esp32xx_rtc.c: Fix a duplicated assignment.
Signed-off-by: Abdelatif Guettouche <ab...@espressif.com>
---
arch/risc-v/src/esp32c3/esp32c3_rtc.c | 3 +--
arch/xtensa/src/esp32/esp32_rtc.c | 5 ++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/arch/risc-v/src/esp32c3/esp32c3_rtc.c b/arch/risc-v/src/esp32c3/esp32c3_rtc.c
index 539a9bc..fa37b6f 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_rtc.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_rtc.c
@@ -2464,8 +2464,7 @@ int up_rtc_gettime(struct timespec *tp)
}
else
{
- time_us = = esp32c3_rtc_get_time_us() +
- esp32c3_rtc_get_boot_time();
+ time_us = esp32c3_rtc_get_time_us() + esp32c3_rtc_get_boot_time();
}
tp->tv_sec = time_us / USEC_PER_SEC;
diff --git a/arch/xtensa/src/esp32/esp32_rtc.c b/arch/xtensa/src/esp32/esp32_rtc.c
index da65492..07c0153 100644
--- a/arch/xtensa/src/esp32/esp32_rtc.c
+++ b/arch/xtensa/src/esp32/esp32_rtc.c
@@ -2066,8 +2066,7 @@ int up_rtc_gettime(struct timespec *tp)
}
else
{
- time_us = = esp32_rtc_get_time_us() +
- esp32_rtc_get_boot_time();
+ time_us = esp32_rtc_get_time_us() + esp32_rtc_get_boot_time();
}
tp->tv_sec = time_us / USEC_PER_SEC;
@@ -2270,4 +2269,4 @@ int up_rtc_timer_init(void)
return OK;
}
-#endif /* CONFIG_RTC_DRIVER */
\ No newline at end of file
+#endif /* CONFIG_RTC_DRIVER */
[incubator-nuttx] 02/02: esp32xx_rtc: Include "clock/clock.h" to have a declaration of g_basetime.
Posted by gu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gustavonihei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 251b8a3445604d7c0d6f975ee160723d12f3f72c
Author: Abdelatif Guettouche <ab...@espressif.com>
AuthorDate: Fri Nov 26 17:45:24 2021 +0100
esp32xx_rtc: Include "clock/clock.h" to have a declaration of
g_basetime.
Signed-off-by: Abdelatif Guettouche <ab...@espressif.com>
---
arch/risc-v/src/esp32c3/esp32c3_rtc.c | 5 ++++-
arch/xtensa/src/esp32/esp32_rtc.c | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/arch/risc-v/src/esp32c3/esp32c3_rtc.c b/arch/risc-v/src/esp32c3/esp32c3_rtc.c
index fa37b6f..b23ff0c 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_rtc.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_rtc.c
@@ -29,6 +29,8 @@
#include <nuttx/arch.h>
#include <nuttx/spinlock.h>
+#include "clock/clock.h"
+
#include "riscv_arch.h"
#include "hardware/esp32c3_rtccntl.h"
@@ -47,11 +49,12 @@
#include "hardware/extmem_reg.h"
#include "hardware/spi_mem_reg.h"
-#include "esp32c3_rtc.h"
#include "esp32c3_clockconfig.h"
#include "esp32c3_attr.h"
#include "esp32c3_rt_timer.h"
+#include "esp32c3_rtc.h"
+
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
diff --git a/arch/xtensa/src/esp32/esp32_rtc.c b/arch/xtensa/src/esp32/esp32_rtc.c
index 07c0153..b8b3637 100644
--- a/arch/xtensa/src/esp32/esp32_rtc.c
+++ b/arch/xtensa/src/esp32/esp32_rtc.c
@@ -29,7 +29,8 @@
#include <nuttx/arch.h>
#include <nuttx/spinlock.h>
-#include "esp32_rtc.h"
+#include "clock/clock.h"
+
#include "esp32_clockconfig.h"
#include "esp32_rt_timer.h"
@@ -40,6 +41,8 @@
#include "xtensa.h"
#include "xtensa_attr.h"
+#include "esp32_rtc.h"
+
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/