Add checks for SOC defines (#8351)

* Add checks for SOC defines * Add SoC checks to BLE library * fix i2c compilation error * fix wrong placement of include * add check to SPI library * add check to USB library * add checks to Wire library
espressif · Jun 30, 2023 · 5364216 · 5364216
1 parent 42f216f
commit 5364216
Show file tree

Hide file tree

Showing 99 changed files with 444 additions and 66 deletions.
diff --git a/cores/esp32/USB.cpp b/cores/esp32/USB.cpp
@@ -11,8 +11,10 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 #include "USB.h"
 
+#if SOC_USB_OTG_SUPPORTED
 #if CONFIG_TINYUSB_ENABLED
 
 #include "pins_arduino.h"
@@ -357,3 +359,4 @@ const char * ESPUSB::webUSBURL(void){
 ESPUSB USB;
 
 #endif /* CONFIG_TINYUSB_ENABLED */
+#endif /* SOC_USB_OTG_SUPPORTED */
diff --git a/cores/esp32/USB.h b/cores/esp32/USB.h
@@ -14,9 +14,11 @@
 #pragma once
 
 #include "soc/soc_caps.h"
-
 #if SOC_USB_OTG_SUPPORTED
 
+#include "sdkconfig.h"
+#if CONFIG_TINYUSB_ENABLED
+
 #include "esp_event.h"
 #include "USBCDC.h"
 
@@ -116,4 +118,6 @@ class ESPUSB {
 
 extern ESPUSB USB;
 
+
+#endif /* CONFIG_TINYUSB_ENABLED */
 #endif /* SOC_USB_OTG_SUPPORTED */
diff --git a/cores/esp32/USBCDC.cpp b/cores/esp32/USBCDC.cpp
@@ -11,10 +11,14 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
+#include "USBCDC.h"
+
+#if SOC_USB_OTG_SUPPORTED
 #include "USB.h"
 #if CONFIG_TINYUSB_CDC_ENABLED
 
-#include "USBCDC.h"
+
 #include "esp32-hal-tinyusb.h"
 #include "rom/ets_sys.h"
 
@@ -456,3 +460,4 @@ USBCDC Serial(0);
 #endif
 
 #endif /* CONFIG_TINYUSB_CDC_ENABLED */
+#endif /* SOC_USB_OTG_SUPPORTED */
diff --git a/cores/esp32/USBCDC.h b/cores/esp32/USBCDC.h
@@ -13,6 +13,9 @@
 // limitations under the License.
 #pragma once
 
+#include "soc/soc_caps.h"
+#if SOC_USB_OTG_SUPPORTED
+
 #include "sdkconfig.h"
 #if CONFIG_TINYUSB_CDC_ENABLED
 
@@ -143,3 +146,4 @@ extern USBCDC Serial;
 #endif
 
 #endif /* CONFIG_TINYUSB_CDC_ENABLED */
+#endif /* SOC_USB_OTG_SUPPORTED */
diff --git a/cores/esp32/USBMSC.cpp b/cores/esp32/USBMSC.cpp
@@ -11,8 +11,10 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 #include "USBMSC.h"
 
+#if SOC_USB_OTG_SUPPORTED
 #if CONFIG_TINYUSB_MSC_ENABLED
 
 #include "esp32-hal-tinyusb.h"
@@ -258,3 +260,4 @@ void USBMSC::mediaPresent(bool media_present){
 }
 
 #endif /* CONFIG_TINYUSB_MSC_ENABLED */
+#endif /* SOC_USB_OTG_SUPPORTED */
diff --git a/cores/esp32/USBMSC.h b/cores/esp32/USBMSC.h
@@ -13,6 +13,10 @@
 // limitations under the License.
 
 #pragma once
+
+#include "soc/soc_caps.h"
+#if SOC_USB_OTG_SUPPORTED
+
 #include <stdint.h>
 #include <stdbool.h>
 #include "sdkconfig.h"
@@ -49,3 +53,4 @@ class USBMSC
 };
 
 #endif /* CONFIG_TINYUSB_MSC_ENABLED */
+#endif /* SOC_USB_OTG_SUPPORTED */
diff --git a/cores/esp32/esp32-hal-bt.c b/cores/esp32/esp32-hal-bt.c
@@ -14,6 +14,7 @@
 
 #include "esp32-hal-bt.h"
 
+#if SOC_BT_SUPPORTED
 #ifdef CONFIG_BT_ENABLED
 
 // user may want to change it to free resources
@@ -97,5 +98,6 @@ bool btStop()
     return false;
 }
 
-#endif // CONFIG_BT_ENABLED
+#endif /* CONFIG_BT_ENABLED */
 
+#endif /* SOC_BT_SUPPORTED */
diff --git a/cores/esp32/esp32-hal-bt.h b/cores/esp32/esp32-hal-bt.h
@@ -15,6 +15,9 @@
 #ifndef _ESP32_ESP32_HAL_BT_H_
 #define _ESP32_ESP32_HAL_BT_H_
 
+#include "soc/soc_caps.h"
+#if SOC_BT_SUPPORTED
+
 #include "esp32-hal.h"
 
 #ifdef __cplusplus
@@ -29,4 +32,6 @@ bool btStop();
 }
 #endif
 
+#endif /* SOC_BT_SUPPORTED */
+
 #endif /* _ESP32_ESP32_HAL_BT_H_ */
diff --git a/cores/esp32/esp32-hal-i2c-slave.c b/cores/esp32/esp32-hal-i2c-slave.c
@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "soc/soc_caps.h"
+
+#if SOC_I2C_SUPPORT_SLAVE
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -874,3 +877,5 @@ static bool i2cSlaveDetachBus(void * bus_i2c_num){
     }
     return true;
 }
+
+#endif /* SOC_I2C_SUPPORT_SLAVE */
diff --git a/cores/esp32/esp32-hal-i2c-slave.h b/cores/esp32/esp32-hal-i2c-slave.h
@@ -14,6 +14,9 @@
 
 #pragma once
 
+#include "soc/soc_caps.h"
+#if SOC_I2C_SUPPORT_SLAVE
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -33,3 +36,5 @@ size_t i2cSlaveWrite(uint8_t num, const uint8_t *buf, uint32_t len, uint32_t tim
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* SOC_I2C_SUPPORT_SLAVE */
diff --git a/cores/esp32/esp32-hal-i2c.c b/cores/esp32/esp32-hal-i2c.c
@@ -13,6 +13,8 @@
 // limitations under the License.
 
 #include "esp32-hal-i2c.h"
+
+#if SOC_I2C_SUPPORTED
 #include "esp32-hal.h"
 #if !CONFIG_DISABLE_HAL_LOCKS
 #include "freertos/FreeRTOS.h"
@@ -390,3 +392,5 @@ esp_err_t i2cGetClock(uint8_t i2c_num, uint32_t * frequency){
     *frequency = bus[i2c_num].frequency;
     return ESP_OK;
 }
+
+#endif /* SOC_I2C_SUPPORTED */
diff --git a/cores/esp32/esp32-hal-i2c.h b/cores/esp32/esp32-hal-i2c.h
@@ -17,6 +17,9 @@
 #ifndef _ESP32_HAL_I2C_H_
 #define _ESP32_HAL_I2C_H_
 
+#include "soc/soc_caps.h"
+#if SOC_I2C_SUPPORTED
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -38,4 +41,5 @@ bool i2cIsInit(uint8_t i2c_num);
 }
 #endif
 
+#endif /* SOC_I2C_SUPPORTED */
 #endif /* _ESP32_HAL_I2C_H_ */
diff --git a/cores/esp32/esp32-hal-ledc.c b/cores/esp32/esp32-hal-ledc.c
@@ -12,8 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "esp32-hal.h"
 #include "soc/soc_caps.h"
+
+#if SOC_LEDC_SUPPORTED
+#include "esp32-hal.h"
+#include "esp32-hal-ledc.h"
 #include "driver/ledc.h"
 #include "esp32-hal-periman.h"
 
@@ -382,3 +385,5 @@ void analogWriteResolution(uint8_t pin, uint8_t resolution) {
     }
     analog_resolution = resolution;
 }
+
+#endif /* SOC_LEDC_SUPPORTED */
diff --git a/cores/esp32/esp32-hal-ledc.h b/cores/esp32/esp32-hal-ledc.h
@@ -15,6 +15,9 @@
 #ifndef _ESP32_HAL_LEDC_H_
 #define _ESP32_HAL_LEDC_H_
 
+#include "soc/soc_caps.h"
+#if SOC_LEDC_SUPPORTED
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -59,4 +62,5 @@ bool ledcFadeWithInterruptArg(uint8_t pin, uint32_t start_duty, uint32_t target_
 }
 #endif
 
+#endif /* SOC_LEDC_SUPPORTED */
 #endif /* _ESP32_HAL_LEDC_H_ */
diff --git a/cores/esp32/esp32-hal-misc.c b/cores/esp32/esp32-hal-misc.c
@@ -38,23 +38,26 @@
 
 #include "esp_system.h"
 #ifdef ESP_IDF_VERSION_MAJOR // IDF 4+
+
 #if CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4
 #include "esp32/rom/rtc.h"
 #elif CONFIG_IDF_TARGET_ESP32S2
 #include "esp32s2/rom/rtc.h"
-#include "driver/temperature_sensor.h"
 #elif CONFIG_IDF_TARGET_ESP32S3
 #include "esp32s3/rom/rtc.h"
-#include "driver/temperature_sensor.h"
 #elif CONFIG_IDF_TARGET_ESP32C3
 #include "esp32c3/rom/rtc.h"
-#include "driver/temperature_sensor.h"
 #elif CONFIG_IDF_TARGET_ESP32C6
 #include "esp32c6/rom/rtc.h"
-#include "driver/temperature_sensor.h"
+
 #else 
 #error Target CONFIG_IDF_TARGET is not supported
 #endif
+
+#if SOC_TEMP_SENSOR_SUPPORTED
+#include "driver/temperature_sensor.h"
+#endif
+
 #else // ESP32 Before IDF 4.0
 #include "rom/rtc.h"
 #endif
@@ -68,7 +71,7 @@ float temperatureRead()
 {
     return (temprature_sens_read() - 32) / 1.8;
 }
-#else
+#elif SOC_TEMP_SENSOR_SUPPORTED
 static temperature_sensor_handle_t temp_sensor = NULL;
 
 static bool temperatureReadInit()

diff --git a/cores/esp32/esp32-hal-rmt.c b/cores/esp32/esp32-hal-rmt.c
@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "soc/soc_caps.h"
+
+#if SOC_RMT_SUPPORTED
 #include "esp32-hal.h"
 #include "driver/gpio.h"
 #include "driver/rmt_tx.h"
@@ -568,3 +571,5 @@ bool rmtInit(int pin, rmt_ch_dir_t channel_direction, rmt_reserve_memsize_t mem_
   _rmtDetachBus((void *)bus);
   return false;
 }
+
+#endif /* SOC_RMT_SUPPORTED */
diff --git a/cores/esp32/esp32-hal-rmt.h b/cores/esp32/esp32-hal-rmt.h
@@ -15,6 +15,9 @@
 #ifndef MAIN_ESP32_HAL_RMT_H_
 #define MAIN_ESP32_HAL_RMT_H_
 
+#include "soc/soc_caps.h"
+#if SOC_RMT_SUPPORTED
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -214,4 +217,5 @@ bool rmtDeinit(int pin);
 }
 #endif
 
-#endif /* MAIN_ESP32_HAL_RMT_H_ */
+#endif /* SOC_RMT_SUPPORTED */
+#endif /* MAIN_ESP32_HAL_RMT_H_ */
diff --git a/cores/esp32/esp32-hal-spi.c b/cores/esp32/esp32-hal-spi.c
@@ -13,6 +13,8 @@
 // limitations under the License.
 
 #include "esp32-hal-spi.h"
+
+#if SOC_GPSPI_SUPPORTED
 #include "esp32-hal.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
@@ -1577,3 +1579,5 @@ uint32_t spiFrequencyToClockDiv(uint32_t freq)
     }
     return bestReg.value;
 }
+
+#endif /* SOC_GPSPI_SUPPORTED */
diff --git a/cores/esp32/esp32-hal-spi.h b/cores/esp32/esp32-hal-spi.h
@@ -15,6 +15,9 @@
 #ifndef MAIN_ESP32_HAL_SPI_H_
 #define MAIN_ESP32_HAL_SPI_H_
 
+#include "soc/soc_caps.h"
+#if SOC_GPSPI_SUPPORTED
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -146,4 +149,5 @@ uint32_t spiClockDivToFrequency(uint32_t freq);
 }
 #endif
 
+#endif /* SOC_GPSPI_SUPPORTED */
 #endif /* MAIN_ESP32_HAL_SPI_H_ */
diff --git a/cores/esp32/esp32-hal-timer.c b/cores/esp32/esp32-hal-timer.c
@@ -13,8 +13,9 @@
 // limitations under the License.
 
 #include "esp32-hal-timer.h"
+
+#if SOC_GPTIMER_SUPPORTED
 #include "driver/gptimer.h"
-#include "soc/soc_caps.h"
 #if defined __has_include && __has_include ("clk_tree.h")
 #include "clk_tree.h"
 #else
@@ -212,3 +213,5 @@ double timerReadSeconds(hw_timer_t * timer){
     uint32_t frequency = timerGetFrequency(timer);
     return (double)timer_val / frequency;
 }
+
+#endif /* SOC_GPTIMER_SUPPORTED */
diff --git a/cores/esp32/esp32-hal-timer.h b/cores/esp32/esp32-hal-timer.h
@@ -19,6 +19,9 @@
 
 #pragma once
 
+#include "soc/soc_caps.h"
+#if SOC_GPTIMER_SUPPORTED
+
 #include "esp32-hal.h"
 #include "driver/gptimer_types.h"
 
@@ -53,3 +56,5 @@ void timerAlarm(hw_timer_t * timer, uint64_t alarm_value, bool autoreload, uint6
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* SOC_GPTIMER_SUPPORTED */
diff --git a/cores/esp32/esp32-hal-tinyusb.c b/cores/esp32/esp32-hal-tinyusb.c
@@ -1,4 +1,6 @@
+#include "soc/soc_caps.h"
 
+#if SOC_USB_OTG_SUPPORTED
 #include "sdkconfig.h"
 #if CONFIG_TINYUSB_ENABLED
 #include <stdlib.h>
@@ -794,3 +796,4 @@ uint8_t tinyusb_get_free_out_endpoint(void){
 }
 
 #endif /* CONFIG_TINYUSB_ENABLED */
+#endif /* SOC_USB_OTG_SUPPORTED */