ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #9539 from c1728p9/fix_travis 

Remove inclusion of mbed.h from USB
feature-hal-spec-usb-device
Cruz Monrreal 2019-01-29 21:26:31 -06:00 committed by GitHub
parent e23e57de68 f8864ae307
commit 2ba1cdd4cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 108 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TESTS/usb_device/basic/USBEndpointTester.cpp
View File

@ -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();

2
TESTS/usb_device/basic/USBEndpointTester.h
View File

@ -78,7 +78,7 @@ public:
};
protected:
EventQueue *queue;
events::EventQueue *queue;
rtos::EventFlags flags;
uint8_t ctrl_buf[2048];

2
TESTS/usb_device/basic/USBTester.cpp
View File

@ -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);

32
TESTS/usb_device/basic/USBTester.h
View File

@ -47,12 +47,30 @@ public:
const char *get_serial_desc_string();
const char *get_iproduct_desc_string();
const char *get_iinterface_desc_string();
uint32_t get_reset_count() const { return reset_count; }
uint32_t get_suspend_count() const { return suspend_count; }
uint32_t get_resume_count() const { return resume_count; }
void clear_reset_count() { reset_count = 0; }
void clear_suspend_count() { suspend_count = 0; }
void clear_resume_count() { resume_count = 0; }
uint32_t get_reset_count() const
{
return reset_count;
}
uint32_t get_suspend_count() const
{
return suspend_count;
}
uint32_t get_resume_count() const
{
return resume_count;
}
void clear_reset_count()
{
reset_count = 0;
}
void clear_suspend_count()
{
suspend_count = 0;
}
void clear_resume_count()
{
resume_count = 0;
}
private:
@ -106,7 +124,7 @@ protected:
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;

16
usb/device/USBAudio/USBAudio.cpp
View File

@ -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();

12
usb/device/USBAudio/USBAudio.h
View File

@ -222,21 +222,21 @@ public:
* @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 @@ private:
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;

4
usb/device/USBDevice/EndpointResolver.cpp
View File

@ -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)
@ -74,7 +73,8 @@ bool EndpointResolver::valid()
return _valid && (_cost <= _table->resources);
}
void EndpointResolver::reset() {
void EndpointResolver::reset()
{
_cost = 0;
_used = 0;
_valid = true;

2
usb/device/USBDevice/EndpointResolver.h
View File

@ -17,8 +17,6 @@
#ifndef ENDPOINT_RESOLVER_H
#define ENDPOINT_RESOLVER_H
#include "mbed.h"
#include "USBPhy.h"
/**

25
usb/device/USBDevice/USBDevice.cpp
View File

@ -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
@ -62,8 +64,7 @@ bool USBDevice::_request_get_descriptor()
printf("get descr: type: %d\r\n", DESCRIPTOR_TYPE(_transfer.setup.wValue));
#endif
switch (DESCRIPTOR_TYPE(_transfer.setup.wValue)) {
case DEVICE_DESCRIPTOR:
{
case DEVICE_DESCRIPTOR: {
if (device_desc() != NULL) {
if ((device_desc()[0] == DEVICE_DESCRIPTOR_LENGTH) \
&& (device_desc()[1] == DEVICE_DESCRIPTOR)) {
@ -78,8 +79,7 @@ bool USBDevice::_request_get_descriptor()
}
break;
}
case CONFIGURATION_DESCRIPTOR:
{
case CONFIGURATION_DESCRIPTOR: {
const uint8_t idx = DESCRIPTOR_INDEX(_transfer.setup.wValue);
if (configuration_desc(idx) != NULL) {
if ((configuration_desc(idx)[0] == CONFIGURATION_DESCRIPTOR_LENGTH) \
@ -98,8 +98,7 @@ bool USBDevice::_request_get_descriptor()
}
break;
}
case STRING_DESCRIPTOR:
{
case STRING_DESCRIPTOR: {
#ifdef DEBUG
printf("str descriptor\r\n");
#endif
@ -161,23 +160,20 @@ bool USBDevice::_request_get_descriptor()
}
break;
}
case INTERFACE_DESCRIPTOR:
{
case INTERFACE_DESCRIPTOR: {
#ifdef DEBUG
printf("interface descr\r\n");
#endif
break;
}
case ENDPOINT_DESCRIPTOR:
{
case ENDPOINT_DESCRIPTOR: {
#ifdef DEBUG
printf("endpoint descr\r\n");
#endif
/* TODO: Support is optional, not implemented here */
break;
}
default:
{
default: {
#ifdef DEBUG
printf("ERROR\r\n");
#endif
@ -1587,7 +1583,8 @@ void USBDevice::assert_locked()
MBED_ASSERT(_locked > 0);
}
void USBDevice::_change_state(DeviceState new_state) {
void USBDevice::_change_state(DeviceState new_state)
{
assert_locked();
DeviceState old_state = _device.state;

1
usb/device/USBDevice/USBDevice.h
View File

@ -17,7 +17,6 @@
#ifndef USBDEVICE_H
#define USBDEVICE_H
#include "mbed.h"
#include "USBDevice_Types.h"
#include "USBPhy.h"
#include "mbed_critical.h"

2
usb/device/USBHID/USBKeyboard.h
View File

@ -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:
/**

1
usb/device/USBHID/USBMouse.cpp
View File

@ -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):

1
usb/device/USBHID/USBMouseKeyboard.cpp
View File

@ -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;

3
usb/device/USBHID/USBMouseKeyboard.h
View File

@ -68,8 +68,7 @@
*
* @note Synchronization level: Thread safe
*/
class USBMouseKeyboard: public USBHID, public Stream
{
class USBMouseKeyboard: public USBHID, public mbed::Stream {
public:
/**

2
usb/device/USBMIDI/MIDIMessage.h
View File

@ -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

2
usb/device/USBMIDI/USBMIDI.cpp
View File

@ -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();

4
usb/device/USBMIDI/USBMIDI.h
View File

@ -134,7 +134,7 @@ public:
*
* @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 @@ private:
usb_ep_t _bulk_out;
uint8_t _config_descriptor[0x65];
Callback<void()> _callback;
mbed::Callback<void()> _callback;
void _init();
void _in_callback();

13
usb/device/USBMSD/USBMSD.cpp
View File

@ -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());

18
usb/device/USBMSD/USBMSD.h
View File

@ -181,7 +181,8 @@ private:
};
// Bulk-only CBW
typedef MBED_PACKED(struct) {
typedef MBED_PACKED(struct)
{
uint32_t Signature;
uint32_t Tag;
uint32_t DataLength;
@ -192,7 +193,8 @@ private:
} CBW;
// Bulk-only CSW
typedef MBED_PACKED(struct) {
typedef MBED_PACKED(struct)
{
uint32_t Signature;
uint32_t Tag;
uint32_t DataResidue;
@ -237,12 +239,12 @@ private:
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;

10
usb/device/USBSerial/USBSerial.h
View File

@ -41,7 +41,7 @@
* }
* @endcode
*/
class USBSerial: public USBCDC, public Stream {
class USBSerial: public USBCDC, public mbed::Stream {
public:
/**
@ -149,7 +149,7 @@ public:
USBCDC::lock();
if ((mptr != NULL) && (tptr != NULL)) {
rx = Callback<void()>(mptr, tptr);
rx = mbed::Callback<void()>(mptr, tptr);
}
USBCDC::unlock();
@ -165,7 +165,7 @@ public:
USBCDC::lock();
if (fptr != NULL) {
rx = Callback<void()>(fptr);
rx = mbed::Callback<void()>(fptr);
}
USBCDC::unlock();
@ -176,7 +176,7 @@ public:
*
* @param cb Callback to attach
*/
void attach(Callback<void()> &cb)
void attach(mbed::Callback<void()> &cb)
{
USBCDC::lock();
@ -211,7 +211,7 @@ protected:
}
private:
Callback<void()> rx;
mbed::Callback<void()> rx;
void (*_settings_changed_callback)(int baud, int bits, int parity, int stop);
};

2
usb/device/utilities/events/TaskBase.cpp
View File

@ -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)