From e879ad1e6f6535768ebcf05f02f30a8266518276 Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 8 Apr 2020 16:42:36 +0700 Subject: [PATCH] move irq from msp430 --- hw/bsp/msp_exp430f5529lp/msp_exp430f5529lp.c | 11 +++++++++++ src/portable/ti/msp430x5xx/dcd_msp430x5xx.c | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/hw/bsp/msp_exp430f5529lp/msp_exp430f5529lp.c b/hw/bsp/msp_exp430f5529lp/msp_exp430f5529lp.c index bcae4b09e..621d21d55 100644 --- a/hw/bsp/msp_exp430f5529lp/msp_exp430f5529lp.c +++ b/hw/bsp/msp_exp430f5529lp/msp_exp430f5529lp.c @@ -28,6 +28,17 @@ #include "msp430.h" +//--------------------------------------------------------------------+ +// Forward USB interrupt events to TinyUSB IRQ Handler +//--------------------------------------------------------------------+ +void __attribute__ ((interrupt(USB_UBM_VECTOR))) USB_UBM_ISR(void) +{ + tud_irq_handler(0); +} + +//--------------------------------------------------------------------+ +// MACRO TYPEDEF CONSTANT ENUM +//--------------------------------------------------------------------+ #define LED_PORT P1OUT #define LED_PIN BIT0 #define LED_STATE_ON 1 diff --git a/src/portable/ti/msp430x5xx/dcd_msp430x5xx.c b/src/portable/ti/msp430x5xx/dcd_msp430x5xx.c index d50fa17fe..edccec33f 100644 --- a/src/portable/ti/msp430x5xx/dcd_msp430x5xx.c +++ b/src/portable/ti/msp430x5xx/dcd_msp430x5xx.c @@ -539,8 +539,10 @@ static void handle_setup_packet(void) dcd_event_setup_received(0, (uint8_t*) &_setup_packet[0], true); } -void __attribute__ ((interrupt(USB_UBM_VECTOR))) USB_UBM_ISR(void) +void dcd_irq_handler(uint8_t rhport) { + (void) rhport; + // Setup is special- reading USBVECINT to handle setup packets is done to // stop hardware-generated NAKs on EP0. uint8_t setup_status = USBIFG & SETUPIFG;