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

Author: P-R-O-C-H-Y

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 */

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 */

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 */

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 */

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 */

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 */

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 */

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_ */

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 */

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 */