Remove inclusion of mbed.h from USB

c1728p9 · c1728p9 · commit 8d731561cfa8 · 2019-02-22T10:53:23.000-06:00
Remove mbed.h from USB files and fix the build errors this causes.
This is required to pass CI.
diff --git a/TESTS/usb_device/basic/USBEndpointTester.cpp b/TESTS/usb_device/basic/USBEndpointTester.cpp
@@ -16,6 +16,7 @@
  */
 
 #include "stdint.h"
+#include "stdlib.h"
 #include "USBEndpointTester.h"
 #include "mbed_shared_queues.h"
 #include "EndpointResolver.h"
@@ -167,7 +168,7 @@ USBEndpointTester::USBEndpointTester(USBPhy *phy, uint16_t vendor_id, uint16_t p
     }
     MBED_ASSERT(resolver.valid());
 
-    queue = mbed_highprio_event_queue();
+    queue = mbed::mbed_highprio_event_queue();
     configuration_desc(0);
     init();
     USBDevice::connect();
diff --git a/TESTS/usb_device/basic/USBEndpointTester.h b/TESTS/usb_device/basic/USBEndpointTester.h
@@ -78,7 +78,7 @@ class USBEndpointTester: public USBDevice {
     };
 
 protected:
-    EventQueue *queue;
+    events::EventQueue *queue;
     rtos::EventFlags flags;
     uint8_t ctrl_buf[2048];
 
diff --git a/TESTS/usb_device/basic/USBTester.cpp b/TESTS/usb_device/basic/USBTester.cpp
@@ -54,7 +54,7 @@ USBTester::USBTester(USBPhy *phy, uint16_t vendor_id, uint16_t product_id, uint1
     int_in = resolver.endpoint_in(USB_EP_TYPE_INT, 64);
     int_out = resolver.endpoint_out(USB_EP_TYPE_INT, 64);
     MBED_ASSERT(resolver.valid());
-    queue = mbed_highprio_event_queue();
+    queue = mbed::mbed_highprio_event_queue();
 
     configuration_desc(0);
 
diff --git a/TESTS/usb_device/basic/USBTester.h b/TESTS/usb_device/basic/USBTester.h
@@ -106,7 +106,7 @@ class USBTester: public USBDevice {
     uint8_t int_in;
     uint8_t int_out;
     uint8_t int_buf[64];
-    EventQueue *queue;
+    events::EventQueue *queue;
     rtos::EventFlags flags;
     volatile uint32_t reset_count;
     volatile uint32_t suspend_count;
diff --git a/usb/device/USBAudio/USBAudio.cpp b/usb/device/USBAudio/USBAudio.cpp
@@ -145,9 +145,9 @@ void USBAudio::_init(uint32_t frequency_rx, uint8_t channel_count_rx, uint32_t f
     _vol_max = 0x0100;
     _vol_res = 0x0004;
 
-    _update_vol = callback(stub_volume);
-    _tx_done = callback(stub_handler);
-    _rx_done = callback(stub_handler);
+    _update_vol = mbed::callback(stub_volume);
+    _tx_done = mbed::callback(stub_handler);
+    _rx_done = mbed::callback(stub_handler);
 
     _rx_overflow = 0;
     _tx_underflow = 0;
@@ -348,7 +348,7 @@ float USBAudio::get_volume()
     return ret;
 }
 
-void USBAudio::attach(Callback<void()> &cb)
+void USBAudio::attach(mbed::Callback<void()> &cb)
 {
     lock();
 
@@ -360,25 +360,25 @@ void USBAudio::attach(Callback<void()> &cb)
     unlock();
 }
 
-void USBAudio::attach_tx(Callback<void(AudioEvent)> &cb)
+void USBAudio::attach_tx(mbed::Callback<void(AudioEvent)> &cb)
 {
     lock();
 
     _tx_done = cb;
     if (!_tx_done) {
-        _tx_done = callback(stub_handler);
+        _tx_done = mbed::callback(stub_handler);
     }
 
     unlock();
 }
 
-void USBAudio::attach_rx(Callback<void(AudioEvent)> &cb)
+void USBAudio::attach_rx(mbed::Callback<void(AudioEvent)> &cb)
 {
     lock();
 
     _rx_done = cb;
     if (!_rx_done) {
-        _rx_done = callback(stub_handler);
+        _rx_done = mbed::callback(stub_handler);
     }
 
     unlock();
diff --git a/usb/device/USBAudio/USBAudio.h b/usb/device/USBAudio/USBAudio.h
@@ -222,21 +222,21 @@ class USBAudio: protected USBDevice {
      * @param cb Callback to attach
      *
      */
-    void attach(Callback<void()> &cb);
+    void attach(mbed::Callback<void()> &cb);
 
     /** attach a Callback to Tx Done
      *
      * @param cb Callback to attach
      *
      */
-    void attach_tx(Callback<void(AudioEvent)> &cb);
+    void attach_tx(mbed::Callback<void(AudioEvent)> &cb);
 
     /** attach a Callback to Rx Done
      *
      * @param cb Callback to attach
      *
      */
-    void attach_rx(Callback<void(AudioEvent)> &cb);
+    void attach_rx(mbed::Callback<void(AudioEvent)> &cb);
 
 protected:
 
@@ -303,13 +303,13 @@ class USBAudio: protected USBDevice {
     uint16_t _vol_res;
 
     // callback to update volume
-    Callback<void()> _update_vol;
+    mbed::Callback<void()> _update_vol;
 
     // callback transmit Done
-    Callback<void(AudioEvent)> _tx_done;
+    mbed::Callback<void(AudioEvent)> _tx_done;
 
     // callback receive Done
-    Callback<void(AudioEvent)> _rx_done;
+    mbed::Callback<void(AudioEvent)> _rx_done;
 
     // Number of times data was dropped due to an overflow
     uint32_t _rx_overflow;
diff --git a/usb/device/USBDevice/EndpointResolver.cpp b/usb/device/USBDevice/EndpointResolver.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include "mbed.h"
 #include "EndpointResolver.h"
 
 static uint32_t logical_to_index(uint32_t logical, bool in_not_out)
diff --git a/usb/device/USBDevice/EndpointResolver.h b/usb/device/USBDevice/EndpointResolver.h
@@ -17,8 +17,6 @@
 #ifndef ENDPOINT_RESOLVER_H
 #define ENDPOINT_RESOLVER_H
 
-#include "mbed.h"
-
 #include "USBPhy.h"
 
 /**
diff --git a/usb/device/USBDevice/USBDevice.cpp b/usb/device/USBDevice/USBDevice.cpp
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-#include "stdint.h"
+#include <stdint.h>
+#include <string.h>
 
 #include "USBDevice.h"
 #include "USBDescriptor.h"
 #include "usb_phy_api.h"
+#include "mbed_assert.h"
 
 //#define DEBUG
 
diff --git a/usb/device/USBDevice/USBDevice.h b/usb/device/USBDevice/USBDevice.h
@@ -17,7 +17,6 @@
 #ifndef USBDEVICE_H
 #define USBDEVICE_H
 
-#include "mbed.h"
 #include "USBDevice_Types.h"
 #include "USBPhy.h"
 #include "mbed_critical.h"
diff --git a/usb/device/USBHID/USBKeyboard.h b/usb/device/USBHID/USBKeyboard.h
@@ -94,7 +94,7 @@ enum FUNCTION_KEY {
  *
  * @note Synchronization level: Thread safe
  */
-class USBKeyboard: public USBHID, public Stream {
+class USBKeyboard: public USBHID, public mbed::Stream {
 public:
 
     /**
diff --git a/usb/device/USBHID/USBMouse.cpp b/usb/device/USBHID/USBMouse.cpp
@@ -18,6 +18,7 @@
 #include "USBMouse.h"
 #include "PlatformMutex.h"
 #include "usb_phy_api.h"
+#include "mbed_wait_api.h"
 
 
 USBMouse::USBMouse(bool connect_blocking, MOUSE_TYPE mouse_type, uint16_t vendor_id, uint16_t product_id, uint16_t product_release):
diff --git a/usb/device/USBHID/USBMouseKeyboard.cpp b/usb/device/USBHID/USBMouseKeyboard.cpp
@@ -17,6 +17,7 @@
 #include "stdint.h"
 #include "USBMouseKeyboard.h"
 #include "usb_phy_api.h"
+#include "mbed_wait_api.h"
 
 typedef struct {
     unsigned char usage;
diff --git a/usb/device/USBHID/USBMouseKeyboard.h b/usb/device/USBHID/USBMouseKeyboard.h
@@ -68,7 +68,7 @@
  *
  * @note Synchronization level: Thread safe
  */
-class USBMouseKeyboard: public USBHID, public Stream
+class USBMouseKeyboard: public USBHID, public mbed::Stream
 {
 public:
 
diff --git a/usb/device/USBMIDI/MIDIMessage.h b/usb/device/USBMIDI/MIDIMessage.h
@@ -17,7 +17,7 @@
 #ifndef MIDIMESSAGE_H
 #define MIDIMESSAGE_H
 
-#include "mbed.h"
+#include <stdint.h>
 
 #define MAX_MIDI_MESSAGE_SIZE 256 // Max message size. SysEx can be up to 65536 but 256 should be fine for most usage
 
diff --git a/usb/device/USBMIDI/USBMIDI.cpp b/usb/device/USBMIDI/USBMIDI.cpp
@@ -172,7 +172,7 @@ bool USBMIDI::read(MIDIMessage *m)
     return true;
 }
 
-void USBMIDI::attach(Callback<void()> callback)
+void USBMIDI::attach(mbed::Callback<void()> callback)
 {
     lock();
 
diff --git a/usb/device/USBMIDI/USBMIDI.h b/usb/device/USBMIDI/USBMIDI.h
@@ -134,7 +134,7 @@ class USBMIDI: public USBDevice {
      *
      * @param callback code to call when a packet is received
      */
-    void attach(Callback<void()> callback);
+    void attach(mbed::Callback<void()> callback);
 
 
 protected:
@@ -173,7 +173,7 @@ class USBMIDI: public USBDevice {
     usb_ep_t _bulk_out;
     uint8_t _config_descriptor[0x65];
 
-    Callback<void()> _callback;
+    mbed::Callback<void()> _callback;
 
     void _init();
     void _in_callback();
diff --git a/usb/device/USBMSD/USBMSD.cpp b/usb/device/USBMSD/USBMSD.cpp
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-#include "stdint.h"
+#include <stdint.h>
+#include <stdlib.h>
 #include "USBMSD.h"
 #include "EndpointResolver.h"
 #include "usb_phy_api.h"
@@ -86,11 +87,11 @@ void USBMSD::_init()
 {
     _bd->init();
 
-    _in_task = callback(this, &USBMSD::_in);
-    _out_task = callback(this, &USBMSD::_out);
-    _reset_task = callback(this, &USBMSD::_reset);
-    _control_task = callback(this, &USBMSD::_control);
-    _configure_task = callback(this, &USBMSD::_configure);
+    _in_task = mbed::callback(this, &USBMSD::_in);
+    _out_task = mbed::callback(this, &USBMSD::_out);
+    _reset_task = mbed::callback(this, &USBMSD::_reset);
+    _control_task = mbed::callback(this, &USBMSD::_control);
+    _configure_task = mbed::callback(this, &USBMSD::_configure);
 
     EndpointResolver resolver(endpoint_table());
 
diff --git a/usb/device/USBMSD/USBMSD.h b/usb/device/USBMSD/USBMSD.h
@@ -237,12 +237,12 @@ class USBMSD: public USBDevice {
     uint32_t _bulk_out_size;
 
     // Interrupt to thread deferral
-    PolledQueue _queue;
-    Task<void()> _in_task;
-    Task<void()> _out_task;
-    Task<void()> _reset_task;
-    Task<void(const setup_packet_t *)> _control_task;
-    Task<void()> _configure_task;
+    events::PolledQueue _queue;
+    events::Task<void()> _in_task;
+    events::Task<void()> _out_task;
+    events::Task<void()> _reset_task;
+    events::Task<void(const setup_packet_t *)> _control_task;
+    events::Task<void()> _configure_task;
 
     BlockDevice *_bd;
     rtos::Mutex _mutex_init;
diff --git a/usb/device/USBSerial/USBSerial.h b/usb/device/USBSerial/USBSerial.h
@@ -41,7 +41,7 @@
 * }
 * @endcode
 */
-class USBSerial: public USBCDC, public Stream {
+class USBSerial: public USBCDC, public mbed::Stream {
 public:
 
     /**
@@ -149,7 +149,7 @@ class USBSerial: public USBCDC, public Stream {
         USBCDC::lock();
 
         if ((mptr != NULL) && (tptr != NULL)) {
-            rx = Callback<void()>(mptr, tptr);
+            rx = mbed::Callback<void()>(mptr, tptr);
         }
 
         USBCDC::unlock();
@@ -165,7 +165,7 @@ class USBSerial: public USBCDC, public Stream {
         USBCDC::lock();
 
         if (fptr != NULL) {
-            rx = Callback<void()>(fptr);
+            rx = mbed::Callback<void()>(fptr);
         }
 
         USBCDC::unlock();
@@ -176,7 +176,7 @@ class USBSerial: public USBCDC, public Stream {
      *
      * @param cb Callback to attach
      */
-    void attach(Callback<void()> &cb)
+    void attach(mbed::Callback<void()> &cb)
     {
         USBCDC::lock();
 
@@ -211,7 +211,7 @@ class USBSerial: public USBCDC, public Stream {
     }
 
 private:
-    Callback<void()> rx;
+    mbed::Callback<void()> rx;
     void (*_settings_changed_callback)(int baud, int bits, int parity, int stop);
 };
 
diff --git a/usb/device/utilities/events/TaskBase.cpp b/usb/device/utilities/events/TaskBase.cpp
@@ -18,7 +18,7 @@
 #include "events/TaskQueue.h"
 #include "events/mbed_events.h"
 #include "rtos/Semaphore.h"
-#include "mbed.h"
+#include "platform/mbed_critical.h"
 
 TaskBase::TaskBase(TaskQueue *q)
     : _queue(q), _posted(false), _start_count(0), _flush_sem(NULL)

Original file line number	Diff line number	Diff line change
`@@ -145,9 +145,9 @@ void USBAudio::_init(uint32_t frequency_rx, uint8_t channel_count_rx, uint32_t f`
`145`	`145`	`_vol_max = 0x0100;`
`146`	`146`	`_vol_res = 0x0004;`
`147`	`147`
`148`		`- _update_vol = callback(stub_volume);`
`149`		`- _tx_done = callback(stub_handler);`
`150`		`- _rx_done = callback(stub_handler);`
	`148`	`+ _update_vol = mbed::callback(stub_volume);`
	`149`	`+ _tx_done = mbed::callback(stub_handler);`
	`150`	`+ _rx_done = mbed::callback(stub_handler);`
`151`	`151`
`152`	`152`	`_rx_overflow = 0;`
`153`	`153`	`_tx_underflow = 0;`
`@@ -348,7 +348,7 @@ float USBAudio::get_volume()`
`348`	`348`	`return ret;`
`349`	`349`	`}`
`350`	`350`
`351`		`-void USBAudio::attach(Callback<void()> &cb)`
	`351`	`+void USBAudio::attach(mbed::Callback<void()> &cb)`
`352`	`352`	`{`
`353`	`353`	`lock();`
`354`	`354`
`@@ -360,25 +360,25 @@ void USBAudio::attach(Callback<void()> &cb)`
`360`	`360`	`unlock();`
`361`	`361`	`}`
`362`	`362`
`363`		`-void USBAudio::attach_tx(Callback<void(AudioEvent)> &cb)`
	`363`	`+void USBAudio::attach_tx(mbed::Callback<void(AudioEvent)> &cb)`
`364`	`364`	`{`
`365`	`365`	`lock();`
`366`	`366`
`367`	`367`	`_tx_done = cb;`
`368`	`368`	`if (!_tx_done) {`
`369`		`- _tx_done = callback(stub_handler);`
	`369`	`+ _tx_done = mbed::callback(stub_handler);`
`370`	`370`	`}`
`371`	`371`
`372`	`372`	`unlock();`
`373`	`373`	`}`
`374`	`374`
`375`		`-void USBAudio::attach_rx(Callback<void(AudioEvent)> &cb)`
	`375`	`+void USBAudio::attach_rx(mbed::Callback<void(AudioEvent)> &cb)`
`376`	`376`	`{`
`377`	`377`	`lock();`
`378`	`378`
`379`	`379`	`_rx_done = cb;`
`380`	`380`	`if (!_rx_done) {`
`381`		`- _rx_done = callback(stub_handler);`
	`381`	`+ _rx_done = mbed::callback(stub_handler);`
`382`	`382`	`}`
`383`	`383`
`384`	`384`	`unlock();`