diff options
| author | Reinhard Panhuber <[email protected]> | 2020-08-16 14:08:24 +0200 |
|---|---|---|
| committer | Reinhard Panhuber <[email protected]> | 2020-08-16 14:08:24 +0200 |
| commit | 630936472237f319b46d51f691bf6c36d80610b3 (patch) | |
| tree | ae7e1eef805073b2fc0e3bd9bf3801b8f557e356 /test | |
| parent | 444e4d282137953e6834360a9fb866331d21d954 (diff) | |
| parent | e90cf7a676eddcbd9c35d2d99a0a9cd14686e2ce (diff) | |
Merge remote-tracking branch 'upstream/master' into uac2
Conflicts:
src/device/usbd.c
src/device/usbd.h
src/portable/st/synopsys/dcd_synopsys.c
Diffstat (limited to 'test')
| -rw-r--r-- | test/test/device/msc/test_msc_device.c | 1 | ||||
| -rw-r--r-- | test/test/device/usbd/test_usbd.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/test/test/device/msc/test_msc_device.c b/test/test/device/msc/test_msc_device.c index 0382fb327..a01ef153a 100644 --- a/test/test/device/msc/test_msc_device.c +++ b/test/test/device/msc/test_msc_device.c @@ -199,7 +199,6 @@ void setUp(void) if ( !tusb_inited() ) { dcd_init_Expect(rhport); - dcd_connect_Expect(rhport); tusb_init(); } diff --git a/test/test/device/usbd/test_usbd.c b/test/test/device/usbd/test_usbd.c index 1bb32c1e5..06372b2e4 100644 --- a/test/test/device/usbd/test_usbd.c +++ b/test/test/device/usbd/test_usbd.c @@ -127,7 +127,6 @@ void setUp(void) { mscd_init_Expect(); dcd_init_Expect(rhport); - dcd_connect_Expect(rhport); tusb_init(); } } |