Skip to content

Commit d6f51fa

Browse files
committed
more workaround for esp32 core, skip vendor_device.c entirely
1 parent 102ff12 commit d6f51fa

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/class/vendor/vendor_device.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,15 @@
3535

3636
//--------------------------------------------------------------------+
3737
// ESP32 out-of-sync
38+
// Somehow we have linking issue: multiple definition of vendor APIs with arduino-esp32 master
39+
// skip this driver entirely and used the pre-compiled libarduino_tinyusb.a instead
3840
//--------------------------------------------------------------------+
3941
#if defined(ARDUINO_ARCH_ESP32) && !defined(tu_static)
4042
#define tu_static static
4143
static inline int tu_memset_s(void *dest, size_t destsz, int ch, size_t count) { if (count > destsz) { return -1; } memset(dest, ch, count); return 0; }
4244
static inline int tu_memcpy_s(void *dest, size_t destsz, const void * src, size_t count ) { if (count > destsz) { return -1; } memcpy(dest, src, count); return 0; }
43-
#endif
45+
46+
#else
4447

4548
#ifndef CFG_TUD_MEM_SECTION
4649
#define CFG_TUD_MEM_SECTION CFG_TUSB_MEM_SECTION
@@ -302,3 +305,4 @@ bool vendord_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint
302305
}
303306

304307
#endif
308+
#endif

0 commit comments

Comments
 (0)