commit 5f22dab17aada4c8213ed1e2140d3b7c7abd534c
author Leandro Pereira <leandro.pereira@intel.com> Fri Sep 15 16:52:36 2017 -0700
committer Anas Nashif <nashif@linux.intel.com> Mon Oct 09 20:53:22 2017 -0400
tree ebff3693a6437afdc5ba9677dec725627d154901
parent 095424c41635039e64ab4a62448f5357c55bf63e

esp32: Prefix ROM routines with `esp32_rom_`

Also provide their prototypes in `soc.h`.  This should help
readability, since some ROM functions, with their names as provided by
Espressif, have sometimes the same prefix as Zephyr APIs.

Signed-off-by: Leandro Pereira <leandro.pereira@intel.com>

drivers/gpio/gpio_esp32.c

diff --git a/drivers/gpio/gpio_esp32.c b/drivers/gpio/gpio_esp32.c
index d7f8bbf..e925244 100644
--- a/drivers/gpio/gpio_esp32.c
+++ b/drivers/gpio/gpio_esp32.c
@@ -5,12 +5,12 @@
  */
 
 /* Include esp-idf headers first to avoid redefining BIT() macro */
-#include <rom/ets_sys.h>
 #include <soc/dport_reg.h>
 #include <soc/gpio_reg.h>
 #include <soc/io_mux_reg.h>
 #include <soc/soc.h>
 
+#include <soc.h>
 #include <errno.h>
 #include <device.h>
 #include <gpio.h>
@@ -272,8 +272,8 @@
 		IRQ_CONNECT(CONFIG_GPIO_ESP32_IRQ, 1, gpio_esp32_isr,
 			    NULL, 0);
 
-		intr_matrix_set(0, ETS_GPIO_INTR_SOURCE,
-				CONFIG_GPIO_ESP32_IRQ);
+		esp32_rom_intr_matrix_set(0, ETS_GPIO_INTR_SOURCE,
+					  CONFIG_GPIO_ESP32_IRQ);
 
 		irq_enable(CONFIG_GPIO_ESP32_IRQ);
 

drivers/serial/uart_esp32.c

diff --git a/drivers/serial/uart_esp32.c b/drivers/serial/uart_esp32.c
index 58325a8..dd93de3 100644
--- a/drivers/serial/uart_esp32.c
+++ b/drivers/serial/uart_esp32.c
@@ -5,9 +5,9 @@
  */
 
 /* Include esp-idf headers first to avoid redefining BIT() macro */
-#include <rom/uart.h>
 #include <rom/ets_sys.h>
 
+#include <soc.h>
 #include <uart.h>
 #include <errno.h>
 
@@ -16,7 +16,7 @@
 {
 	ARG_UNUSED(dev);
 
-	uart_tx_one_char(c);
+	esp32_rom_uart_tx_one_char(c);
 
 	return c;
 }
@@ -25,7 +25,7 @@
 {
 	ARG_UNUSED(dev);
 
-	switch (uart_rx_one_char(p_char)) {
+	switch (esp32_rom_uart_rx_one_char(p_char)) {
 	case OK:
 		return 0;
 	case PENDING:
@@ -43,7 +43,7 @@
 {
 	ARG_UNUSED(dev);
 
-	uartAttach();
+	esp32_rom_uart_attach();
 
 	return 0;
 }

drivers/watchdog/wdt_esp32.c

diff --git a/drivers/watchdog/wdt_esp32.c b/drivers/watchdog/wdt_esp32.c
index 7bf526b..2307805 100644
--- a/drivers/watchdog/wdt_esp32.c
+++ b/drivers/watchdog/wdt_esp32.c
@@ -5,10 +5,10 @@
  */
 
 /* Include esp-idf headers first to avoid redefining BIT() macro */
-#include <rom/ets_sys.h>
 #include <soc/rtc_cntl_reg.h>
 #include <soc/timer_group_reg.h>
 
+#include <soc.h>
 #include <string.h>
 #include <watchdog.h>
 #include <device.h>
@@ -212,7 +212,8 @@
 	 * located in xtensa_vectors.S.
 	 */
 	irq_disable(CONFIG_WDT_ESP32_IRQ);
-	intr_matrix_set(0, ETS_TG1_WDT_LEVEL_INTR_SOURCE, CONFIG_WDT_ESP32_IRQ);
+	esp32_rom_intr_matrix_set(0, ETS_TG1_WDT_LEVEL_INTR_SOURCE,
+				  CONFIG_WDT_ESP32_IRQ);
 
 	return 0;
 }