You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2024/04/02 17:51:05 UTC

(nuttx) 01/03: esp32: Remove outdated/unnecessary code

This is an automated email from the ASF dual-hosted git repository.

acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit 6b73782c273284a8e11c78eb0a4644978fff7323
Author: Tiago Medicci Serrano <ti...@espressif.com>
AuthorDate: Fri Mar 22 16:59:16 2024 -0300

    esp32: Remove outdated/unnecessary code
    
    These functions are no more used directly by NuttX. There is no
    need to keep them.
---
 arch/xtensa/src/esp32/esp32_clockconfig.c | 39 -------------------------------
 arch/xtensa/src/esp32/esp32_clockconfig.h | 34 ++-------------------------
 arch/xtensa/src/esp32/esp32_rtc.c         |  3 ---
 3 files changed, 2 insertions(+), 74 deletions(-)

diff --git a/arch/xtensa/src/esp32/esp32_clockconfig.c b/arch/xtensa/src/esp32/esp32_clockconfig.c
index cadddb76d6..54675e151e 100644
--- a/arch/xtensa/src/esp32/esp32_clockconfig.c
+++ b/arch/xtensa/src/esp32/esp32_clockconfig.c
@@ -216,42 +216,3 @@ void esp32_clockconfig(void)
   esp32_rtc_bbpll_configure(xtal_freq, source_freq_mhz);
   esp32_set_cpu_freq(freq_mhz);
 }
-
-/****************************************************************************
- * Name:  esp_clk_cpu_freq
- *
- * Description:
- *   Get CPU frequency
- *
- * Input Parameters:
- *   None
- *
- * Returned Value:
- *   CPU frequency
- *
- ****************************************************************************/
-
-int IRAM_ATTR esp_clk_cpu_freq(void)
-{
-  return g_ticks_per_us_pro * MHZ;
-}
-
-/****************************************************************************
- * Name:  esp_clk_apb_freq
- *
- * Description:
- *   Return current APB clock frequency.
- *
- * Input Parameters:
- *   None
- *
- * Returned Value:
- *   APB clock frequency, in Hz
- *
- ****************************************************************************/
-
-int IRAM_ATTR esp_clk_apb_freq(void)
-{
-  return MIN(g_ticks_per_us_pro, 80) * MHZ;
-}
-
diff --git a/arch/xtensa/src/esp32/esp32_clockconfig.h b/arch/xtensa/src/esp32/esp32_clockconfig.h
index 4393210b55..39b6490b04 100644
--- a/arch/xtensa/src/esp32/esp32_clockconfig.h
+++ b/arch/xtensa/src/esp32/esp32_clockconfig.h
@@ -27,6 +27,8 @@
 
 #include <nuttx/config.h>
 
+#include "esp_private/esp_clk.h"
+
 /****************************************************************************
  * Public Function Prototypes
  ****************************************************************************/
@@ -77,36 +79,4 @@ void esp32_set_cpu_freq(int cpu_freq_mhz);
 
 void esp32_clockconfig(void);
 
-/****************************************************************************
- * Name:  esp_clk_cpu_freq
- *
- * Description:
- *   Get CPU frequency
- *
- * Input Parameters:
- *   None
- *
- * Returned Value:
- *   CPU frequency
- *
- ****************************************************************************/
-
-int esp_clk_cpu_freq(void);
-
-/****************************************************************************
- * Name:  esp_clk_apb_freq
- *
- * Description:
- *   Return current APB clock frequency.
- *
- * Input Parameters:
- *   None
- *
- * Returned Value:
- *   APB clock frequency, in Hz
- *
- ****************************************************************************/
-
-int esp_clk_apb_freq(void);
-
 #endif /* __ARCH_XTENSA_SRC_ESP32_ESP32_CLOCKCONFIG_H */
diff --git a/arch/xtensa/src/esp32/esp32_rtc.c b/arch/xtensa/src/esp32/esp32_rtc.c
index 1c73282d35..779ced3df3 100644
--- a/arch/xtensa/src/esp32/esp32_rtc.c
+++ b/arch/xtensa/src/esp32/esp32_rtc.c
@@ -865,9 +865,6 @@ uint32_t IRAM_ATTR esp32_rtc_clk_cal(enum esp32_rtc_cal_sel_e cal_clk,
   return period;
 }
 
-enum esp32_rtc_xtal_freq_e rtc_get_xtal(void)
-                __attribute__((alias("esp32_rtc_clk_xtal_freq_get")));
-
 /****************************************************************************
  * Name: esp32_rtc_clk_xtal_freq_get
  *