Skip to content

Commit 8570b3d

Browse files
committed
Fix formatting in ETH and USB
1 parent 9e48d9f commit 8570b3d

File tree

2 files changed

+33
-15
lines changed

2 files changed

+33
-15
lines changed

libraries/Ethernet/src/ETH.cpp

+30-14
Original file line numberDiff line numberDiff line change
@@ -152,22 +152,38 @@ void ETHClass::setTaskStackSize(size_t size) {
152152
#if CONFIG_IDF_TARGET_ESP32
153153
#define ETH_EMAC_DEFAULT_CONFIG() ETH_ESP32_EMAC_DEFAULT_CONFIG()
154154
#elif CONFIG_IDF_TARGET_ESP32P4
155-
#define ETH_EMAC_DEFAULT_CONFIG() \
156-
{ \
157-
.smi_gpio = {.mdc_num = 31, .mdio_num = 52}, .interface = EMAC_DATA_INTERFACE_RMII, \
158-
.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, \
159-
.intr_priority = 0, \
160-
.emac_dataif_gpio = \
161-
{.rmii = \
162-
{.tx_en_num = ETH_RMII_TX_EN, \
163-
.txd0_num = ETH_RMII_TX0, \
164-
.txd1_num = ETH_RMII_TX1, \
165-
.crs_dv_num = ETH_RMII_CRS_DV, \
166-
.rxd0_num = ETH_RMII_RX0, \
167-
.rxd1_num = ETH_RMII_RX1_EN}}, \
168-
.clock_config_out_in = {.rmii = {.clock_mode = EMAC_CLK_EXT_IN, .clock_gpio = (emac_rmii_clock_gpio_t) - 1}}, \
155+
// clang-format off
156+
#define ETH_EMAC_DEFAULT_CONFIG() \
157+
{ \
158+
.smi_gpio = {.mdc_num = 31, .mdio_num = 52}, \
159+
.interface = EMAC_DATA_INTERFACE_RMII, \
160+
.clock_config = { \
161+
.rmii = { \
162+
.clock_mode = EMAC_CLK_EXT_IN, \
163+
.clock_gpio = (emac_rmii_clock_gpio_t)ETH_RMII_CLK \
164+
} \
165+
}, \
166+
.dma_burst_len = ETH_DMA_BURST_LEN_32, \
167+
.intr_priority = 0, \
168+
.emac_dataif_gpio = { \
169+
.rmii = { \
170+
.tx_en_num = ETH_RMII_TX_EN, \
171+
.txd0_num = ETH_RMII_TX0, \
172+
.txd1_num = ETH_RMII_TX1, \
173+
.crs_dv_num = ETH_RMII_CRS_DV, \
174+
.rxd0_num = ETH_RMII_RX0, \
175+
.rxd1_num = ETH_RMII_RX1_EN \
176+
} \
177+
}, \
178+
.clock_config_out_in = { \
179+
.rmii = { \
180+
.clock_mode = EMAC_CLK_EXT_IN, \
181+
.clock_gpio = (emac_rmii_clock_gpio_t) - 1 \
182+
} \
183+
}, \
169184
}
170185
#endif
186+
// clang-format on
171187

172188
bool ETHClass::begin(eth_phy_type_t type, int32_t phy_addr, int mdc, int mdio, int power, eth_clock_mode_t clock_mode) {
173189
esp_err_t ret = ESP_OK;

libraries/USB/src/USBHID.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,9 @@ extern "C" uint16_t tusb_hid_load_descriptor(uint8_t *dst, uint8_t *itf) {
206206
uint8_t descriptor[TUD_HID_INOUT_DESC_LEN] = {
207207
// HID Input & Output descriptor
208208
// Interface number, string index, protocol, report descriptor len, EP OUT & IN address, size & polling interval
209-
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)
209+
TUD_HID_INOUT_DESCRIPTOR(
210+
*itf, str_index, tinyusb_interface_protocol, tinyusb_hid_device_descriptor_len, ep_out, (uint8_t)(0x80 | ep_in), CFG_TUD_ENDOINT_SIZE, 1
211+
)
210212
};
211213
*itf += 1;
212214
memcpy(dst, descriptor, TUD_HID_INOUT_DESC_LEN);

0 commit comments

Comments
 (0)