kingkevin
/
espressif_tinyusb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename SAM7X to SAMX7X 

Signed-off-by: MasterPhi <admin@hifiphile.com>
This commit is contained in:
MasterPhi 2021-06-12 12:28:28 +02:00
parent f039607afc
commit 85fc423569
10 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/device/cdc_dual_ports/src/tusb_config.h
View File

@ -48,7 +48,7 @@
// Default to Highspeed for MCU with internal HighSpeed PHY (can be port specific), otherwise FullSpeed // Default to Highspeed for MCU with internal HighSpeed PHY (can be port specific), otherwise FullSpeed
#ifndef BOARD_DEVICE_RHPORT_SPEED #ifndef BOARD_DEVICE_RHPORT_SPEED
#if (CFG_TUSB_MCU == OPT_MCU_LPC18XX || CFG_TUSB_MCU == OPT_MCU_LPC43XX || CFG_TUSB_MCU == OPT_MCU_MIMXRT10XX || \ #if (CFG_TUSB_MCU == OPT_MCU_LPC18XX || CFG_TUSB_MCU == OPT_MCU_LPC43XX || CFG_TUSB_MCU == OPT_MCU_MIMXRT10XX || \
CFG_TUSB_MCU == OPT_MCU_NUC505 || CFG_TUSB_MCU == OPT_MCU_CXD56 || CFG_TUSB_MCU == OPT_MCU_SAM7X) CFG_TUSB_MCU == OPT_MCU_NUC505 || CFG_TUSB_MCU == OPT_MCU_CXD56 || CFG_TUSB_MCU == OPT_MCU_SAMX7X)
#define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_HIGH_SPEED #define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_HIGH_SPEED
#else #else
#define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_FULL_SPEED #define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_FULL_SPEED

2
examples/device/cdc_dual_ports/src/usb_descriptors.c
View File

@ -94,7 +94,7 @@ enum
#define EPNUM_CDC_1_OUT 0x05 #define EPNUM_CDC_1_OUT 0x05
#define EPNUM_CDC_1_IN 0x85 #define EPNUM_CDC_1_IN 0x85
#elif CFG_TUSB_MCU == OPT_MCU_SAMG || CFG_TUSB_MCU == OPT_MCU_SAM7X #elif CFG_TUSB_MCU == OPT_MCU_SAMG || CFG_TUSB_MCU == OPT_MCU_SAMX7X
// SAMG & SAME70 don't support a same endpoint number with different direction IN and OUT // SAMG & SAME70 don't support a same endpoint number with different direction IN and OUT
// e.g EP1 OUT & EP1 IN cannot exist together // e.g EP1 OUT & EP1 IN cannot exist together
#define EPNUM_CDC_0_NOTIF 0x81 #define EPNUM_CDC_0_NOTIF 0x81

2
examples/device/cdc_msc/src/msc_disk.c
View File

@ -23,7 +23,7 @@
* *
*/ */
#include "bsp/board.h" //#include "bsp/board.h"
#include "tusb.h" #include "tusb.h"
#if CFG_TUD_MSC #if CFG_TUD_MSC

2
examples/device/cdc_msc/src/tusb_config.h
View File

@ -48,7 +48,7 @@
// Default to Highspeed for MCU with internal HighSpeed PHY (can be port specific), otherwise FullSpeed // Default to Highspeed for MCU with internal HighSpeed PHY (can be port specific), otherwise FullSpeed
#ifndef BOARD_DEVICE_RHPORT_SPEED #ifndef BOARD_DEVICE_RHPORT_SPEED
#if (CFG_TUSB_MCU == OPT_MCU_LPC18XX || CFG_TUSB_MCU == OPT_MCU_LPC43XX || CFG_TUSB_MCU == OPT_MCU_MIMXRT10XX || \ #if (CFG_TUSB_MCU == OPT_MCU_LPC18XX || CFG_TUSB_MCU == OPT_MCU_LPC43XX || CFG_TUSB_MCU == OPT_MCU_MIMXRT10XX || \
CFG_TUSB_MCU == OPT_MCU_NUC505 || CFG_TUSB_MCU == OPT_MCU_CXD56 || CFG_TUSB_MCU == OPT_MCU_SAM7X) CFG_TUSB_MCU == OPT_MCU_NUC505 || CFG_TUSB_MCU == OPT_MCU_CXD56 || CFG_TUSB_MCU == OPT_MCU_SAMX7X)
#define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_HIGH_SPEED #define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_HIGH_SPEED
#else #else
#define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_FULL_SPEED #define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_FULL_SPEED

2
examples/device/cdc_msc/src/usb_descriptors.c
View File

@ -94,7 +94,7 @@ enum
#define EPNUM_MSC_OUT 0x05 #define EPNUM_MSC_OUT 0x05
#define EPNUM_MSC_IN 0x85 #define EPNUM_MSC_IN 0x85
#elif CFG_TUSB_MCU == OPT_MCU_SAMG || CFG_TUSB_MCU == OPT_MCU_SAM7X #elif CFG_TUSB_MCU == OPT_MCU_SAMG || CFG_TUSB_MCU == OPT_MCU_SAMX7X
// SAMG & SAME70 don't support a same endpoint number with different direction IN and OUT // SAMG & SAME70 don't support a same endpoint number with different direction IN and OUT
// e.g EP1 OUT & EP1 IN cannot exist together // e.g EP1 OUT & EP1 IN cannot exist together
#define EPNUM_CDC_NOTIF 0x81 #define EPNUM_CDC_NOTIF 0x81

0
examples/device/cdc_msc_freertos/.skip.MCU_SAM7X → examples/device/cdc_msc_freertos/.skip.MCU_SAMX7X
View File

0
examples/device/hid_composite_freertos/.skip.MCU_SAM7X → examples/device/hid_composite_freertos/.skip.MCU_SAMX7X
View File

4
hw/bsp/same70_xplained/board.mk
View File

@ -8,7 +8,7 @@ CFLAGS += \
-mfpu=fpv4-sp-d16 \ -mfpu=fpv4-sp-d16 \
-nostdlib -nostartfiles \ -nostdlib -nostartfiles \
-D__SAME70Q21B__ \ -D__SAME70Q21B__ \
-DCFG_TUSB_MCU=OPT_MCU_SAM7X -DCFG_TUSB_MCU=OPT_MCU_SAMX7X
# suppress following warnings from mcu driver # suppress following warnings from mcu driver
CFLAGS += -Wno-error=unused-parameter -Wno-error=cast-align CFLAGS += -Wno-error=unused-parameter -Wno-error=cast-align
@ -19,7 +19,7 @@ ASF_DIR = hw/mcu/microchip/same70
LD_FILE = $(ASF_DIR)/same70b/gcc/gcc/same70q21b_flash.ld LD_FILE = $(ASF_DIR)/same70b/gcc/gcc/same70q21b_flash.ld
SRC_C += \ SRC_C += \
src/portable/microchip/sam7x/dcd_sam7x.c \ src/portable/microchip/samx7x/dcd_samx7x.c \
$(ASF_DIR)/same70b/gcc/gcc/startup_same70q21b.c \ $(ASF_DIR)/same70b/gcc/gcc/startup_same70q21b.c \
$(ASF_DIR)/same70b/gcc/system_same70q21b.c \ $(ASF_DIR)/same70b/gcc/system_same70q21b.c \
$(ASF_DIR)/hpl/core/hpl_init.c \ $(ASF_DIR)/hpl/core/hpl_init.c \

2
src/portable/microchip/sam7x/dcd_sam7x.c → src/portable/microchip/samx7x/dcd_samx7x.c
View File

@ -27,7 +27,7 @@
#include "tusb_option.h" #include "tusb_option.h"
#if TUSB_OPT_DEVICE_ENABLED && CFG_TUSB_MCU == OPT_MCU_SAM7X #if TUSB_OPT_DEVICE_ENABLED && CFG_TUSB_MCU == OPT_MCU_SAMX7X
#include "device/dcd.h" #include "device/dcd.h"

2
src/tusb_option.h
View File

@ -61,7 +61,7 @@
#define OPT_MCU_SAME5X 203 ///< MicroChip SAM E5x #define OPT_MCU_SAME5X 203 ///< MicroChip SAM E5x
#define OPT_MCU_SAMD11 204 ///< MicroChip SAMD11 #define OPT_MCU_SAMD11 204 ///< MicroChip SAMD11
#define OPT_MCU_SAML22 205 ///< MicroChip SAML22 #define OPT_MCU_SAML22 205 ///< MicroChip SAML22
#define OPT_MCU_SAM7X 206 ///< MicroChip SAME70, S70, V70, V71 family #define OPT_MCU_SAMX7X 206 ///< MicroChip SAME70, S70, V70, V71 family
// STM32 // STM32