andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

moving irq to bsp for lpc17/40

Browse Source
This commit is contained in:
hathach
2019-11-21 23:19:38 +07:00
parent bbec47b647
commit f5d737aa7e
14 changed files with 91 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/device/dcd.h
View File

@@ -88,6 +88,9 @@ typedef struct TU_ATTR_ALIGNED(4)
// Initialize controller to device mode
void dcd_init (uint8_t rhport);
// Interrupt Handler
void dcd_isr (uint8_t rhport);
// Enable device interrupt
void dcd_int_enable (uint8_t rhport);

21
src/portable/nxp/lpc17_40/hal_lpc17_40.c → src/portable/nxp/lpc17_40/hcd_lpc17_40.c
View File

@@ -1,7 +1,7 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2019 Ha Thach (tinyusb.org)
* Copyright (c) 2019, Ha Thach (tinyusb.org)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -24,27 +24,12 @@
* This file is part of the TinyUSB stack.
*/
#include "common/tusb_common.h"
#include "tusb_option.h"
#if (CFG_TUSB_MCU == OPT_MCU_LPC175X_6X || CFG_TUSB_MCU == OPT_MCU_LPC40XX)
#include "chip.h"
extern void hcd_isr(uint8_t hostid);
extern void dcd_isr(uint8_t rhport);
void USB_IRQHandler(void)
{
#if TUSB_OPT_HOST_ENABLED
hcd_isr(0);
#endif
#if TUSB_OPT_DEVICE_ENABLED
dcd_isr(0);
#endif
}
//FIXME move later
void hcd_int_enable(uint8_t rhport)
{
(void) rhport;
@@ -57,5 +42,5 @@ void hcd_int_disable(uint8_t rhport)
NVIC_DisableIRQ(USB_IRQn);
}
#endif

70
src/portable/nxp/lpc18_43/hal_lpc18_43.c
View File

@@ -1,70 +0,0 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2019 Ha Thach (tinyusb.org)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* This file is part of the TinyUSB stack.
*/
#include "tusb.h"
#if (CFG_TUSB_MCU == OPT_MCU_LPC18XX || CFG_TUSB_MCU == OPT_MCU_LPC43XX || CFG_TUSB_MCU == OPT_MCU_RT10XX)
#include "chip.h"
extern void dcd_isr(uint8_t rhport);
extern void hcd_isr(uint8_t hostid);
#if CFG_TUSB_RHPORT0_MODE
#if CFG_TUSB_MCU == OPT_MCU_RT10XX
void USB_OTG1_IRQHandler(void)
#else
void USB0_IRQHandler(void)
#endif
{
#if TUSB_OPT_HOST_ENABLED
hcd_isr(0);
#endif
#if TUSB_OPT_DEVICE_ENABLED
dcd_isr(0);
#endif
}
#endif
#if CFG_TUSB_RHPORT1_MODE
#if CFG_TUSB_MCU == OPT_MCU_RT10XX
void USB_OTG2_IRQHandler(void)
#else
void USB1_IRQHandler(void)
#endif
{
#if TUSB_OPT_HOST_ENABLED
hcd_isr(1);
#endif
#if TUSB_OPT_DEVICE_ENABLED
dcd_isr(1);
#endif
}
#endif
#endif