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

lpc40xx device work, moving Chip_USB_Init out of tinyusb

Browse Source
This commit is contained in:
hathach
2018-12-05 08:47:23 +07:00
parent fe8346e642
commit dd9c7b4249
7 changed files with 70 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/portable/nxp/lpc17_40/dcd_lpc17_40.c
View File

@@ -103,7 +103,7 @@ typedef struct
} dcd_data_t;
ATTR_ALIGNED(128) static dcd_data_t _dcd;
CFG_TUSB_MEM_SECTION ATTR_ALIGNED(128) static dcd_data_t _dcd;
//--------------------------------------------------------------------+

24
src/portable/nxp/lpc17_40/hal_lpc17_40.c
View File

@@ -59,30 +59,6 @@ void tusb_hal_int_disable(uint8_t rhport)
//--------------------------------------------------------------------+
bool tusb_hal_init(void)
{
enum {
USBCLK_DEVCIE = 0x12, // AHB + Device
USBCLK_HOST = 0x19, // AHB + Host + OTG (!)
};
Chip_USB_Init();
#if MODE_HOST_SUPPORTED
// TODO move pin config to BSP
PINSEL_ConfigPin( &(PINSEL_CFG_Type) { .Portnum = 1, .Pinnum = 22, .Funcnum = 2} ); // P1.22 as USB_PWRD
PINSEL_ConfigPin( &(PINSEL_CFG_Type) { .Portnum = 1, .Pinnum = 19, .Funcnum = 2} ); // P1.19 as USB_PPWR
// Enable host
LPC_USB->USBClkCtrl = USBCLK_HOST;
while ((LPC_USB->USBClkSt & USBCLK_HOST) != USBCLK_HOST);
LPC_USB->OTGClkSt = 0x3;
#endif
#if TUSB_OPT_DEVICE_ENABLED
// Enable Device
LPC_USB->USBClkCtrl = USBCLK_DEVCIE;
while ((LPC_USB->USBClkSt & USBCLK_DEVCIE) != USBCLK_DEVCIE);
#endif
return true;
}

4
src/tusb_option.h
View File

@@ -153,6 +153,10 @@
#define CFG_TUSB_MEM_SECTION
#endif
#ifndef CFG_TUSB_MEM_ALIGN
#define CFG_TUSB_MEM_ALIGN ATTR_ALIGNED(4)
#endif
#ifndef CFG_TUSB_OS
#define CFG_TUSB_OS OPT_OS_NONE
#endif