Skip to content

Commit 261c375

Browse files
committed
USBHost: removed wrong init() calls
USBHost used to have an init() method that now is incorporated in Init(). The leftover init() calls in the library were calling the init() function in the variant files instead (that has nothing to do with the USBHost library). Removing the calls to init() fix it. Fix arduino#115
1 parent d89aaf1 commit 261c375

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

CHANGELOG

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ SAMD CORE 1.6.4
55
* USBHost: fixed blocking USBHost.Task(). Thanks @bbx10
66
* USBHost: fixed some ASCII Control codes in keyboard controller. Thanks @bbx10
77
* USBHost: ported some minor fix from upstream UHS2. Thanks @bbx10
8+
* USBHost: fixed wrong library initialization. Thanks @bbx10 @ladyada
89

910
SAMD CORE 1.6.3 2016.02.15
1011

libraries/USBHost/src/Usb.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ USBHost::USBHost() : bmHubPre(0) {
3636
uint32_t USBHost::Init() {
3737
//devConfigIndex = 0;
3838
// Init host stack
39-
init();
4039
bmHubPre = 0;
4140
UHD_Init();
4241
return 0;
@@ -507,7 +506,6 @@ void USBHost::Task(void) //USB state machine
507506

508507
// Init USB stack and driver
509508
UHD_Init();
510-
init();
511509

512510
// Free all USB resources
513511
for (uint32_t i = 0; i < USB_NUMDEVICES; ++i)

0 commit comments

Comments
 (0)