Fix formatting in ETH and USB

espressif · Oct 17, 2024 · 8570b3d · 8570b3d
1 parent 9e48d9f
commit 8570b3d
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 15 deletions.
diff --git a/libraries/Ethernet/src/ETH.cpp b/libraries/Ethernet/src/ETH.cpp
@@ -152,22 +152,38 @@ void ETHClass::setTaskStackSize(size_t size) {
 #if CONFIG_IDF_TARGET_ESP32
 #define ETH_EMAC_DEFAULT_CONFIG() ETH_ESP32_EMAC_DEFAULT_CONFIG()
 #elif CONFIG_IDF_TARGET_ESP32P4
-#define ETH_EMAC_DEFAULT_CONFIG() \
- { \
- .smi_gpio = {.mdc_num = 31, .mdio_num = 52}, .interface = EMAC_DATA_INTERFACE_RMII, \
- .clock_config = {.rmii = {.clock_mode = EMAC_CLK_EXT_IN, .clock_gpio = (emac_rmii_clock_gpio_t)ETH_RMII_CLK}}, .dma_burst_len = ETH_DMA_BURST_LEN_32, \
- .intr_priority = 0, \
- .emac_dataif_gpio = \
- {.rmii = \
- {.tx_en_num = ETH_RMII_TX_EN, \
- .txd0_num = ETH_RMII_TX0, \
- .txd1_num = ETH_RMII_TX1, \
- .crs_dv_num = ETH_RMII_CRS_DV, \
- .rxd0_num = ETH_RMII_RX0, \
- .rxd1_num = ETH_RMII_RX1_EN}}, \
- .clock_config_out_in = {.rmii = {.clock_mode = EMAC_CLK_EXT_IN, .clock_gpio = (emac_rmii_clock_gpio_t) - 1}}, \
+// clang-format off
+#define ETH_EMAC_DEFAULT_CONFIG() \
+ { \
+ .smi_gpio = {.mdc_num = 31, .mdio_num = 52}, \
+ .interface = EMAC_DATA_INTERFACE_RMII, \
+ .clock_config = { \
+ .rmii = { \
+ .clock_mode = EMAC_CLK_EXT_IN, \
+ .clock_gpio = (emac_rmii_clock_gpio_t)ETH_RMII_CLK \
+ } \
+ }, \
+ .dma_burst_len = ETH_DMA_BURST_LEN_32, \
+ .intr_priority = 0, \
+ .emac_dataif_gpio = { \
+ .rmii = { \
+ .tx_en_num = ETH_RMII_TX_EN, \
+ .txd0_num = ETH_RMII_TX0, \
+ .txd1_num = ETH_RMII_TX1, \
+ .crs_dv_num = ETH_RMII_CRS_DV, \
+ .rxd0_num = ETH_RMII_RX0, \
+ .rxd1_num = ETH_RMII_RX1_EN \
+ } \
+ }, \
+ .clock_config_out_in = { \
+ .rmii = { \
+ .clock_mode = EMAC_CLK_EXT_IN, \
+ .clock_gpio = (emac_rmii_clock_gpio_t) - 1 \
+ } \
+ }, \
  }
 #endif
+// clang-format on
 
 bool ETHClass::begin(eth_phy_type_t type, int32_t phy_addr, int mdc, int mdio, int power, eth_clock_mode_t clock_mode) {
  esp_err_t ret = ESP_OK;

diff --git a/libraries/USB/src/USBHID.cpp b/libraries/USB/src/USBHID.cpp
@@ -206,7 +206,9 @@ extern "C" uint16_t tusb_hid_load_descriptor(uint8_t *dst, uint8_t *itf) {
  uint8_t descriptor[TUD_HID_INOUT_DESC_LEN] = {
  // HID Input & Output descriptor
  // Interface number, string index, protocol, report descriptor len, EP OUT & IN address, size & polling interval
- TUD_HID_INOUT_DESCRIPTOR(*itf, str_index, tinyusb_interface_protocol, tinyusb_hid_device_descriptor_len, ep_out, (uint8_t)(0x80 | ep_in), CFG_TUD_ENDOINT_SIZE, 1)
+ TUD_HID_INOUT_DESCRIPTOR(
+ *itf, str_index, tinyusb_interface_protocol, tinyusb_hid_device_descriptor_len, ep_out, (uint8_t)(0x80 | ep_in), CFG_TUD_ENDOINT_SIZE, 1
+ )
  };
  *itf += 1;
  memcpy(dst, descriptor, TUD_HID_INOUT_DESC_LEN);