Skip to content

Commit e5fdcd4

Browse files
committed
mass replace of header file paths
1 parent 50a6d9a commit e5fdcd4

14 files changed

+23
-23
lines changed

cores/esp32/Esp.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#include "Arduino.h"
2121
#include "Esp.h"
22-
#include "rom/spi_flash.h"
22+
#include "esp32/rom/spi_flash.h"
2323
#include "esp_sleep.h"
2424
#include "esp_spi_flash.h"
2525
#include <memory>

cores/esp32/MD5Builder.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include <WString.h>
2323
#include <Stream.h>
24-
#include "rom/md5_hash.h"
24+
#include "esp32/rom/md5_hash.h"
2525

2626
class MD5Builder
2727
{

cores/esp32/esp32-hal-adc.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
#include "esp32-hal-adc.h"
1616
#include "freertos/FreeRTOS.h"
1717
#include "freertos/task.h"
18-
#include "rom/ets_sys.h"
18+
#include "esp32/rom/ets_sys.h"
1919
#include "esp_attr.h"
20-
#include "esp_intr.h"
20+
#include "esp_intr_alloc.h"
2121
#include "soc/rtc_io_reg.h"
2222
#include "soc/rtc_cntl_reg.h"
2323
#include "soc/sens_reg.h"

cores/esp32/esp32-hal-cpu.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "esp_log.h"
2222
#include "soc/rtc.h"
2323
#include "soc/rtc_cntl_reg.h"
24-
#include "rom/rtc.h"
24+
#include "esp32/rom/rtc.h"
2525
#include "soc/apb_ctrl_reg.h"
2626
#include "soc/efuse_reg.h"
2727
#include "esp32-hal.h"

cores/esp32/esp32-hal-dac.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
#include "esp32-hal-dac.h"
1616
#include "freertos/FreeRTOS.h"
1717
#include "freertos/task.h"
18-
#include "rom/ets_sys.h"
18+
#include "esp32/rom/ets_sys.h"
1919
#include "esp_attr.h"
20-
#include "esp_intr.h"
20+
#include "esp_intr_alloc.h"
2121
#include "soc/rtc_io_reg.h"
2222
#include "soc/rtc_cntl_reg.h"
2323
#include "soc/sens_reg.h"

cores/esp32/esp32-hal-gpio.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
#include "esp32-hal-gpio.h"
1616
#include "freertos/FreeRTOS.h"
1717
#include "freertos/task.h"
18-
#include "rom/ets_sys.h"
18+
#include "esp32/rom/ets_sys.h"
1919
#include "esp_attr.h"
20-
#include "esp_intr.h"
21-
#include "rom/gpio.h"
20+
#include "esp_intr_alloc.h"
21+
#include "esp32/rom/gpio.h"
2222
#include "soc/gpio_reg.h"
2323
#include "soc/io_mux_reg.h"
2424
#include "soc/gpio_struct.h"

cores/esp32/esp32-hal-i2c.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "freertos/task.h"
1919
#include "freertos/semphr.h"
2020
#include "freertos/event_groups.h"
21-
#include "rom/ets_sys.h"
21+
#include "esp32/rom/ets_sys.h"
2222
#include "driver/periph_ctrl.h"
2323
#include "soc/i2c_reg.h"
2424
#include "soc/i2c_struct.h"

cores/esp32/esp32-hal-ledc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "freertos/FreeRTOS.h"
1717
#include "freertos/task.h"
1818
#include "freertos/semphr.h"
19-
#include "rom/ets_sys.h"
19+
#include "esp32/rom/ets_sys.h"
2020
#include "esp32-hal-matrix.h"
2121
#include "soc/dport_reg.h"
2222
#include "soc/ledc_reg.h"

cores/esp32/esp32-hal-matrix.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include "esp32-hal-matrix.h"
1616
#include "esp_attr.h"
17-
#include "rom/gpio.h"
17+
#include "esp32/rom/gpio.h"
1818

1919
#define MATRIX_DETACH_OUT_SIG 0x100
2020
#define MATRIX_DETACH_IN_LOW_PIN 0x30

cores/esp32/esp32-hal-misc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include "soc/rtc.h"
3232
#include "soc/rtc_cntl_reg.h"
3333
#include "soc/apb_ctrl_reg.h"
34-
#include "rom/rtc.h"
34+
#include "esp32/rom/rtc.h"
3535
#include "esp_task_wdt.h"
3636
#include "esp32-hal.h"
3737

cores/esp32/esp32-hal-sigmadelta.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "freertos/FreeRTOS.h"
1717
#include "freertos/task.h"
1818
#include "freertos/semphr.h"
19-
#include "rom/ets_sys.h"
19+
#include "esp32/rom/ets_sys.h"
2020
#include "esp32-hal-matrix.h"
2121
#include "soc/gpio_sd_reg.h"
2222
#include "soc/gpio_sd_struct.h"

cores/esp32/esp32-hal-timer.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
#include "freertos/FreeRTOS.h"
1717
#include "freertos/xtensa_api.h"
1818
#include "freertos/task.h"
19-
#include "rom/ets_sys.h"
19+
#include "esp32/rom/ets_sys.h"
2020
#include "soc/timer_group_struct.h"
2121
#include "soc/dport_reg.h"
2222
#include "esp_attr.h"
23-
#include "esp_intr.h"
23+
#include "esp_intr_alloc.h"
2424

2525
#define HWTIMER_LOCK() portENTER_CRITICAL(timer->lock)
2626
#define HWTIMER_UNLOCK() portEXIT_CRITICAL(timer->lock)

cores/esp32/esp32-hal-touch.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
#include "esp32-hal-touch.h"
1616
#include "freertos/FreeRTOS.h"
1717
#include "freertos/task.h"
18-
#include "rom/ets_sys.h"
18+
#include "esp32/rom/ets_sys.h"
1919
#include "esp_attr.h"
20-
#include "esp_intr.h"
20+
#include "esp_intr_alloc.h"
2121
#include "soc/rtc_io_reg.h"
2222
#include "soc/rtc_cntl_reg.h"
2323
#include "soc/sens_reg.h"

cores/esp32/esp32-hal-uart.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
#include "freertos/task.h"
1919
#include "freertos/queue.h"
2020
#include "freertos/semphr.h"
21-
#include "rom/ets_sys.h"
21+
#include "esp32/rom/ets_sys.h"
2222
#include "esp_attr.h"
23-
#include "esp_intr.h"
24-
#include "rom/uart.h"
23+
#include "esp_intr_alloc.h"
24+
#include "esp32/rom/uart.h"
2525
#include "soc/uart_reg.h"
2626
#include "soc/uart_struct.h"
2727
#include "soc/io_mux_reg.h"
@@ -253,7 +253,7 @@ size_t uartResizeRxBuffer(uart_t * uart, size_t new_size) {
253253
vQueueDelete(uart->queue);
254254
uart->queue = xQueueCreate(new_size, sizeof(uint8_t));
255255
if(uart->queue == NULL) {
256-
return NULL;
256+
return (size_t)NULL;
257257
}
258258
}
259259
UART_MUTEX_UNLOCK();

0 commit comments

Comments
 (0)