ARMmbed · gpsimenos · Jul 23, 2019 · Jul 25, 2019 · Jul 25, 2019 · Jul 25, 2019
diff --git a/TESTS/mbed_hal_fpga_ci_test_shield/uart/main.cpp b/TESTS/mbed_hal_fpga_ci_test_shield/uart/main.cpp
@@ -27,6 +27,8 @@
 #include "unity/unity.h"
 #include "greentea-client/test_env.h"
 
+#include "platform/mbed_critical.h"
+
 using namespace utest::v1;
 
 #include <stdlib.h>

diff --git a/UNITTESTS/drivers/Watchdog/unittest.cmake b/UNITTESTS/drivers/Watchdog/unittest.cmake
@@ -12,7 +12,7 @@ set(unittest-includes ${unittest-includes}
 
 # Source files
 set(unittest-sources
-  ../drivers/Watchdog.cpp
+  ../drivers/source/Watchdog.cpp
 )
 
 # Test files

diff --git a/...s/source/usb/device/utilities/AsyncOp.cpp → drivers/source/usb/AsyncOp.cpp b/...s/source/usb/device/utilities/AsyncOp.cpp → drivers/source/usb/AsyncOp.cpp
diff --git a/...ource/usb/device/utilities/ByteBuffer.cpp → drivers/source/usb/ByteBuffer.cpp b/...ource/usb/device/utilities/ByteBuffer.cpp → drivers/source/usb/ByteBuffer.cpp
@@ -149,4 +149,3 @@ bool ByteBuffer::empty()
 {
     return _head == _tail;
 }
-
diff --git a/...rs/source/usb/device/EndpointResolver.cpp → drivers/source/usb/EndpointResolver.cpp b/...rs/source/usb/device/EndpointResolver.cpp → drivers/source/usb/EndpointResolver.cpp
diff --git a/...e/usb/device/utilities/LinkedListBase.cpp → drivers/source/usb/LinkedListBase.cpp b/...e/usb/device/utilities/LinkedListBase.cpp → drivers/source/usb/LinkedListBase.cpp
diff --git a/...sb/device/utilities/OperationListBase.cpp → drivers/source/usb/OperationListBase.cpp b/...sb/device/utilities/OperationListBase.cpp → drivers/source/usb/OperationListBase.cpp
diff --git a/...b/device/utilities/events/PolledQueue.cpp → drivers/source/usb/PolledQueue.cpp b/...b/device/utilities/events/PolledQueue.cpp → drivers/source/usb/PolledQueue.cpp
diff --git a/.../usb/device/utilities/events/TaskBase.cpp → drivers/source/usb/TaskBase.cpp b/.../usb/device/utilities/events/TaskBase.cpp → drivers/source/usb/TaskBase.cpp
diff --git a/drivers/source/usb/device/USBAudio.cpp → drivers/source/usb/USBAudio.cpp b/drivers/source/usb/device/USBAudio.cpp → drivers/source/usb/USBAudio.cpp
@@ -998,4 +998,3 @@ void USBAudio::_send_isr()
         _tx_done.call(Transfer);
     }
 }
-
diff --git a/drivers/source/usb/device/USBCDC.cpp → drivers/source/usb/USBCDC.cpp b/drivers/source/usb/device/USBCDC.cpp → drivers/source/usb/USBCDC.cpp
diff --git a/drivers/source/usb/device/USBCDC_ECM.cpp → drivers/source/usb/USBCDC_ECM.cpp b/drivers/source/usb/device/USBCDC_ECM.cpp → drivers/source/usb/USBCDC_ECM.cpp
diff --git a/drivers/source/usb/device/USBDevice.cpp → drivers/source/usb/USBDevice.cpp b/drivers/source/usb/device/USBDevice.cpp → drivers/source/usb/USBDevice.cpp
diff --git a/drivers/source/usb/device/USBHID.cpp → drivers/source/usb/USBHID.cpp b/drivers/source/usb/device/USBHID.cpp → drivers/source/usb/USBHID.cpp
diff --git a/drivers/source/usb/device/USBKeyboard.cpp → drivers/source/usb/USBKeyboard.cpp b/drivers/source/usb/device/USBKeyboard.cpp → drivers/source/usb/USBKeyboard.cpp
diff --git a/drivers/source/usb/device/USBMIDI.cpp → drivers/source/usb/USBMIDI.cpp b/drivers/source/usb/device/USBMIDI.cpp → drivers/source/usb/USBMIDI.cpp
diff --git a/drivers/source/usb/device/USBMSD.cpp → drivers/source/usb/USBMSD.cpp b/drivers/source/usb/device/USBMSD.cpp → drivers/source/usb/USBMSD.cpp
diff --git a/drivers/source/usb/device/USBMouse.cpp → drivers/source/usb/USBMouse.cpp b/drivers/source/usb/device/USBMouse.cpp → drivers/source/usb/USBMouse.cpp
diff --git a/...rs/source/usb/device/USBMouseKeyboard.cpp → drivers/source/usb/USBMouseKeyboard.cpp b/...rs/source/usb/device/USBMouseKeyboard.cpp → drivers/source/usb/USBMouseKeyboard.cpp
diff --git a/drivers/source/usb/device/USBSerial.cpp → drivers/source/usb/USBSerial.cpp b/drivers/source/usb/device/USBSerial.cpp → drivers/source/usb/USBSerial.cpp
diff --git a/drivers/source/usb/mbed_lib.json b/drivers/source/usb/mbed_lib.json
@@ -0,0 +1,3 @@
+{
+    "name": "usb"
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -149,4 +149,3 @@ bool ByteBuffer::empty()
		{
		return _head == _tail;
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -998,4 +998,3 @@ void USBAudio::_send_isr()
		_tx_done.call(Transfer);
		}
		}