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

rename OPT_MCU_KINETIS_K64 to OPT_MCU_KINETIS_K

Browse Source
This commit is contained in:
hathach
2023-08-28 17:34:22 +07:00
parent e2f28bc134
commit 588b758717
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hw/bsp/board_mcu.h
View File

@@ -47,7 +47,7 @@
#elif TU_CHECK_MCU(OPT_MCU_LPC51UXX, OPT_MCU_LPC54XXX, OPT_MCU_LPC55XX, OPT_MCU_MCXN9) #elif TU_CHECK_MCU(OPT_MCU_LPC51UXX, OPT_MCU_LPC54XXX, OPT_MCU_LPC55XX, OPT_MCU_MCXN9)
#include "fsl_device_registers.h" #include "fsl_device_registers.h"
#elif TU_CHECK_MCU(OPT_MCU_KINETIS_KL, OPT_MCU_KINETIS_K32L, OPT_MCU_KINETIS_K64) #elif TU_CHECK_MCU(OPT_MCU_KINETIS_KL, OPT_MCU_KINETIS_K32L, OPT_MCU_KINETIS_K)
#include "fsl_device_registers.h" #include "fsl_device_registers.h"
#elif CFG_TUSB_MCU == OPT_MCU_NRF5X #elif CFG_TUSB_MCU == OPT_MCU_NRF5X

2
src/common/tusb_mcu.h
View File

@@ -97,7 +97,7 @@
#define TUP_DCD_ENDPOINT_MAX 8 #define TUP_DCD_ENDPOINT_MAX 8
#define TUP_RHPORT_HIGHSPEED 1 #define TUP_RHPORT_HIGHSPEED 1
#elif TU_CHECK_MCU(OPT_MCU_KINETIS_KL, OPT_MCU_KINETIS_K32L, OPT_MCU_KINETIS_K64) #elif TU_CHECK_MCU(OPT_MCU_KINETIS_KL, OPT_MCU_KINETIS_K32L, OPT_MCU_KINETIS_K)
#define TUP_USBIP_CHIPIDEA_FS #define TUP_USBIP_CHIPIDEA_FS
#define TUP_USBIP_CHIPIDEA_FS_KINETIS #define TUP_USBIP_CHIPIDEA_FS_KINETIS
#define TUP_DCD_ENDPOINT_MAX 16 #define TUP_DCD_ENDPOINT_MAX 16

6
src/portable/nxp/khci/dcd_khci.c
View File

@@ -269,10 +269,10 @@ void dcd_init(uint8_t rhport)
{ {
(void) rhport; (void) rhport;
#if (CFG_TUSB_MCU == OPT_MCU_KINETIS_K64) #if (CFG_TUSB_MCU == OPT_MCU_KINETIS_K)
uint32_t clk_recover_irc_en; uint32_t clk_recover_irc_en;
uint32_t clk_recover_ctrl; uint32_t clk_recover_ctrl;
clk_recover_irc_en = KHCI->CLK_RECOVER_IRC_EN; clk_recover_irc_en = KHCI->CLK_RECOVER_IRC_EN;
clk_recover_ctrl = KHCI->CLK_RECOVER_CTRL; clk_recover_ctrl = KHCI->CLK_RECOVER_CTRL;
@@ -284,7 +284,7 @@ void dcd_init(uint8_t rhport)
#else #else
KHCI->USBTRC0 |= USB_USBTRC0_USBRESET_MASK; KHCI->USBTRC0 |= USB_USBTRC0_USBRESET_MASK;
while (KHCI->USBTRC0 & USB_USBTRC0_USBRESET_MASK); while (KHCI->USBTRC0 & USB_USBTRC0_USBRESET_MASK);
#endif #endif
tu_memclr(&_dcd, sizeof(_dcd)); tu_memclr(&_dcd, sizeof(_dcd));
KHCI->USBTRC0 |= TU_BIT(6); /* software must set this bit to 1 */ KHCI->USBTRC0 |= TU_BIT(6); /* software must set this bit to 1 */

2
src/tusb_option.h
View File

@@ -121,7 +121,7 @@
#define OPT_MCU_KINETIS_KL 1200 ///< NXP KL series #define OPT_MCU_KINETIS_KL 1200 ///< NXP KL series
#define OPT_MCU_KINETIS_K32L 1201 ///< NXP K32L series #define OPT_MCU_KINETIS_K32L 1201 ///< NXP K32L series
#define OPT_MCU_KINETIS_K32 1201 ///< Alias to K32L #define OPT_MCU_KINETIS_K32 1201 ///< Alias to K32L
#define OPT_MCU_KINETIS_K64 1202 ///< NXP K64 series #define OPT_MCU_KINETIS_K 1202 ///< NXP K series
#define OPT_MCU_MKL25ZXX 1200 ///< Alias to KL (obsolete) #define OPT_MCU_MKL25ZXX 1200 ///< Alias to KL (obsolete)
#define OPT_MCU_K32L2BXX 1201 ///< Alias to K32 (obsolete) #define OPT_MCU_K32L2BXX 1201 ///< Alias to K32 (obsolete)