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

Merge remote-tracking branch 'origin/master' into CCRX_Port

Browse Source 
# Conflicts:
#	src/portable/renesas/usba/dcd_usba.c
#	src/tusb_option.h
This commit is contained in:
Wini-Buh
2021-06-29 00:19:30 +02:00
parent 970da35fb3 6e939de9d6
commit cb0f1d98db
50 changed files with 1196 additions and 885 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/portable/renesas/usba/dcd_usba.c
View File

@@ -26,8 +26,13 @@
#include "tusb_option.h"
<<<<<<< HEAD
#if TUSB_OPT_DEVICE_ENABLED && (( CFG_TUSB_MCU == OPT_MCU_RX63X ) || ( CFG_TUSB_MCU == OPT_MCU_RX72N ))
=======
#if TUSB_OPT_DEVICE_ENABLED && ( CFG_TUSB_MCU == OPT_MCU_RX63X || \
CFG_TUSB_MCU == OPT_MCU_RX65X)
>>>>>>> origin/master
#include "device/dcd.h"
#include "iodefine.h"