summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhathach <[email protected]>2020-04-10 15:27:23 +0700
committerhathach <[email protected]>2020-04-10 15:27:23 +0700
commit30945ab9f3f7c96725e1cabbe084836b48a113b5 (patch)
treef8755398395af2217f1c4c2edd1e23cfb1d87740 /src
parentc0695b4b55ba0a01117d7e9f544735c117fcb14b (diff)
revert name to dcd_int_handler due to function prototype warning
Diffstat (limited to 'src')
-rw-r--r--src/portable/espressif/esp32s2/dcd_esp32s2.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/portable/espressif/esp32s2/dcd_esp32s2.c b/src/portable/espressif/esp32s2/dcd_esp32s2.c
index d34e1c123..328ec2fb9 100644
--- a/src/portable/espressif/esp32s2/dcd_esp32s2.c
+++ b/src/portable/espressif/esp32s2/dcd_esp32s2.c
@@ -123,7 +123,7 @@ static void bus_reset(void)
static void enum_done_processing(void)
{
- ESP_EARLY_LOGV(TAG, "dcd_irq_handler - Speed enumeration done! Sending DCD_EVENT_BUS_RESET then");
+ ESP_EARLY_LOGV(TAG, "dcd_int_handler - Speed enumeration done! Sending DCD_EVENT_BUS_RESET then");
// On current silicon on the Full Speed core, speed is fixed to Full Speed.
// However, keep for debugging and in case Low Speed is ever supported.
uint32_t enum_spd = (USB0.dsts >> USB_ENUMSPD_S) & (USB_ENUMSPD_V);
@@ -648,28 +648,28 @@ static void handle_epin_ints(void)
}
-void dcd_irq_handler(uint32_t rhport)
+static void dcd_int_handler(void* arg)
{
- (void) rhport;
+ (void) arg;
const uint32_t int_status = USB0.gintsts;
//const uint32_t int_msk = USB0.gintmsk;
if (int_status & USB_DISCONNINT_M) {
- ESP_EARLY_LOGV(TAG, "dcd_irq_handler - disconnected");
+ ESP_EARLY_LOGV(TAG, "dcd_int_handler - disconnected");
USB0.gintsts = USB_DISCONNINT_M;
dcd_event_bus_signal(0, DCD_EVENT_UNPLUGGED, true);
}
if (int_status & USB_USBRST_M) {
// start of reset
- ESP_EARLY_LOGV(TAG, "dcd_irq_handler - reset");
+ ESP_EARLY_LOGV(TAG, "dcd_int_handler - reset");
USB0.gintsts = USB_USBRST_M;
bus_reset();
}
if (int_status & USB_RESETDET_M) {
- ESP_EARLY_LOGV(TAG, "dcd_irq_handler - reset while suspend");
+ ESP_EARLY_LOGV(TAG, "dcd_int_handler - reset while suspend");
USB0.gintsts = USB_RESETDET_M;
bus_reset();
}
@@ -691,7 +691,7 @@ void dcd_irq_handler(uint32_t rhport)
#endif
if (int_status & USB_RXFLVI_M) {
- ESP_EARLY_LOGV(TAG, "dcd_irq_handler - rx!");
+ ESP_EARLY_LOGV(TAG, "dcd_int_handler - rx!");
USB0.gintsts = USB_RXFLVI_M;
// disable RXFLVI interrupt until we read data from FIFO
@@ -705,13 +705,13 @@ void dcd_irq_handler(uint32_t rhport)
// OUT endpoint interrupt handling.
if (int_status & USB_OEPINT_M) {
- ESP_EARLY_LOGV(TAG, "dcd_irq_handler - OUT endpoint!");
+ ESP_EARLY_LOGV(TAG, "dcd_int_handler - OUT endpoint!");
handle_epout_ints();
}
// IN endpoint interrupt handling.
if (int_status & USB_IEPINT_M) {
- ESP_EARLY_LOGV(TAG, "dcd_irq_handler - IN endpoint!");
+ ESP_EARLY_LOGV(TAG, "dcd_int_handler - IN endpoint!");
handle_epin_ints();
}
@@ -736,7 +736,7 @@ void dcd_irq_handler(uint32_t rhport)
void dcd_int_enable (uint8_t rhport)
{
(void) rhport;
- esp_intr_alloc(ETS_USB_INTR_SOURCE, ESP_INTR_FLAG_LOWMED, (intr_handler_t) dcd_irq_handler, NULL, &usb_ih);
+ esp_intr_alloc(ETS_USB_INTR_SOURCE, ESP_INTR_FLAG_LOWMED, (intr_handler_t) dcd_int_handler, NULL, &usb_ih);
}
void dcd_int_disable (uint8_t rhport)